Skip to content

Commit 2f94583

Browse files
huypubhuypub
authored
Merge pull request #193885 from MicrosoftDocs/main
4/4 OOB Publish
2 parents 36bb044 + 2f62a93 commit 2f94583

File tree

86 files changed

+948
-710
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

86 files changed

+948
-710
lines changed

‎.openpublishing.publish.config.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -441,6 +441,12 @@
441441
"branch": "main",
442442
"branch_mapping": {}
443443
},
444+
{
445+
"path_to_root": "azureml-examples-march-cli-preview",
446+
"url": "https://github.com/azure/azureml-examples",
447+
"branch": "march-cli-preview",
448+
"branch_mapping": {}
449+
},
444450
{
445451
"path_to_root": "terraform",
446452
"url": "https://github.com/Azure/terraform",

‎.openpublishing.redirection.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43538,6 +43538,16 @@
4353843538
"redirect_url": "reference-yaml-endpoint-managed-online",
4353943539
"redirect_document_id": true
4354043540
},
43541+
{
43542+
"source_path_from_root": "/articles/machine-learning/reference-yaml-job-component.md",
43543+
"redirect_url": "reference-yaml-job-command",
43544+
"redirect_document_id": true
43545+
},
43546+
{
43547+
"source_path_from_root": "/articles/machine-learning/reference-yaml-dataset.md",
43548+
"redirect_url": "reference-yaml-data",
43549+
"redirect_document_id": true
43550+
},
4354143551
{
4354243552
"source_path_from_root": "/articles/store-sendgrid-nodejs-how-to-send-email.md",
4354343553
"redirect_url": "https://docs.sendgrid.com/for-developers/partners/microsoft-azure-2021#create-a-twilio-sendgrid-account",

‎articles/azure-monitor/alerts/alerts-metric-create-templates.md

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ author: harelbr
55
ms.author: harelbr
66
services: azure-monitor
77
ms.topic: conceptual
8-
ms.date: 2/23/2022
8+
ms.date: 4/4/2022
99
ms.custom: devx-track-azurepowershell
1010
---
1111
# Create a metric alert with a Resource Manager template
@@ -32,7 +32,7 @@ Save the json below as simplestaticmetricalert.json for the purpose of this walk
3232

3333
```json
3434
{
35-
"$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
35+
"$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#",
3636
"contentVersion": "1.0.0.0",
3737
"parameters": {
3838
"alertName": {
@@ -205,7 +205,7 @@ Save the json below as simplestaticmetricalert.parameters.json and modify it as
205205

206206
```json
207207
{
208-
"$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentParameters.json#",
208+
"$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
209209
"contentVersion": "1.0.0.0",
210210
"parameters": {
211211
"alertName": {
@@ -280,7 +280,7 @@ Save the json below as simpledynamicmetricalert.json for the purpose of this wal
280280

281281
```json
282282
{
283-
"$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
283+
"$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#",
284284
"contentVersion": "1.0.0.0",
285285
"parameters": {
286286
"alertName": {
@@ -478,7 +478,7 @@ Save the json below as simpledynamicmetricalert.parameters.json and modify it as
478478

479479
```json
480480
{
481-
"$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentParameters.json#",
481+
"$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
482482
"contentVersion": "1.0.0.0",
483483
"parameters": {
484484
"alertName": {
@@ -568,7 +568,7 @@ Save the json below as advancedstaticmetricalert.json for the purpose of this wa
568568

569569
```json
570570
{
571-
"$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
571+
"$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#",
572572
"contentVersion": "1.0.0.0",
573573
"parameters": {
574574
"alertName": {
@@ -703,7 +703,7 @@ Save and modify the json below as advancedstaticmetricalert.parameters.json for
703703

704704
```json
705705
{
706-
"$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentParameters.json#",
706+
"$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
707707
"contentVersion": "1.0.0.0",
708708
"parameters": {
709709
"alertName": {
@@ -812,7 +812,7 @@ Save the json below as multidimensionalstaticmetricalert.json for the purpose of
812812

813813
```json
814814
{
815-
"$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
815+
"$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#",
816816
"contentVersion": "1.0.0.0",
817817
"parameters": {
818818
"alertName": {
@@ -939,7 +939,7 @@ Save and modify the json below as multidimensionalstaticmetricalert.parameters.j
939939

940940
```json
941941
{
942-
"$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentParameters.json#",
942+
"$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
943943
"contentVersion": "1.0.0.0",
944944
"parameters": {
945945
"alertName": {
@@ -1036,7 +1036,7 @@ Save the json below as advanceddynamicmetricalert.json for the purpose of this w
10361036

10371037
```json
10381038
{
1039-
"$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
1039+
"$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#",
10401040
"contentVersion": "1.0.0.0",
10411041
"parameters": {
10421042
"alertName": {
@@ -1158,7 +1158,7 @@ Save and modify the json below as advanceddynamicmetricalert.parameters.json for
11581158

11591159
```json
11601160
{
1161-
"$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentParameters.json#",
1161+
"$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
11621162
"contentVersion": "1.0.0.0",
11631163
"parameters": {
11641164
"alertName": {
@@ -1252,7 +1252,7 @@ Save the json below as customstaticmetricalert.json for the purpose of this walk
12521252

12531253
```json
12541254
{
1255-
"$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
1255+
"$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#",
12561256
"contentVersion": "1.0.0.0",
12571257
"parameters": {
12581258
"alertName": {
@@ -1431,7 +1431,7 @@ Save and modify the json below as customstaticmetricalert.parameters.json for th
14311431

14321432
```json
14331433
{
1434-
"$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentParameters.json#",
1434+
"$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
14351435
"contentVersion": "1.0.0.0",
14361436
"parameters": {
14371437
"alertName": {
@@ -1528,7 +1528,7 @@ Save the json below as all-vms-in-resource-group-static.json for the purpose of
15281528

15291529
```json
15301530
{
1531-
"$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
1531+
"$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#",
15321532
"contentVersion": "1.0.0.0",
15331533
"parameters": {
15341534
"alertName": {
@@ -1760,7 +1760,7 @@ Save and modify the json below as all-vms-in-resource-group-static.parameters.js
17601760

17611761
```json
17621762
{
1763-
"$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentParameters.json#",
1763+
"$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
17641764
"contentVersion": "1.0.0.0",
17651765
"parameters": {
17661766
"alertName": {
@@ -1839,7 +1839,7 @@ Save the json below as all-vms-in-resource-group-dynamic.json for the purpose of
18391839

18401840
```json
18411841
{
1842-
"$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
1842+
"$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#",
18431843
"contentVersion": "1.0.0.0",
18441844
"parameters": {
18451845
"alertName": {
@@ -2089,7 +2089,7 @@ Save and modify the json below as all-vms-in-resource-group-dynamic.parameters.j
20892089

20902090
```json
20912091
{
2092-
"$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentParameters.json#",
2092+
"$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
20932093
"contentVersion": "1.0.0.0",
20942094
"parameters": {
20952095
"alertName": {
@@ -2174,7 +2174,7 @@ Save the json below as all-vms-in-subscription-static.json for the purpose of th
21742174

21752175
```json
21762176
{
2177-
"$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
2177+
"$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#",
21782178
"contentVersion": "1.0.0.0",
21792179
"parameters": {
21802180
"alertName": {
@@ -2407,7 +2407,7 @@ Save and modify the json below as all-vms-in-subscription-static.parameters.json
24072407

24082408
```json
24092409
{
2410-
"$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentParameters.json#",
2410+
"$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
24112411
"contentVersion": "1.0.0.0",
24122412
"parameters": {
24132413
"alertName": {
@@ -2483,7 +2483,7 @@ Save the json below as all-vms-in-subscription-dynamic.json for the purpose of t
24832483

24842484
```json
24852485
{
2486-
"$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
2486+
"$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#",
24872487
"contentVersion": "1.0.0.0",
24882488
"parameters": {
24892489
"alertName": {
@@ -2733,7 +2733,7 @@ Save and modify the json below as all-vms-in-subscription-dynamic.parameters.jso
27332733

27342734
```json
27352735
{
2736-
"$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentParameters.json#",
2736+
"$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
27372737
"contentVersion": "1.0.0.0",
27382738
"parameters": {
27392739
"alertName": {
@@ -2815,7 +2815,7 @@ Save the json below as list-of-vms-static.json for the purpose of this walk-thro
28152815

28162816
```json
28172817
{
2818-
"$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
2818+
"$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#",
28192819
"contentVersion": "1.0.0.0",
28202820
"parameters": {
28212821
"alertName": {
@@ -3048,7 +3048,7 @@ Save and modify the json below as list-of-vms-static.parameters.json for the pur
30483048

30493049
```json
30503050
{
3051-
"$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentParameters.json#",
3051+
"$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
30523052
"contentVersion": "1.0.0.0",
30533053
"parameters": {
30543054
"alertName": {
@@ -3127,7 +3127,7 @@ Save the json below as list-of-vms-dynamic.json for the purpose of this walk-thr
31273127

31283128
```json
31293129
{
3130-
"$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
3130+
"$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#",
31313131
"contentVersion": "1.0.0.0",
31323132
"parameters": {
31333133
"alertName": {
@@ -3377,7 +3377,7 @@ Save and modify the json below as list-of-vms-dynamic.parameters.json for the pu
33773377

33783378
```json
33793379
{
3380-
"$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentParameters.json#",
3380+
"$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
33813381
"contentVersion": "1.0.0.0",
33823382
"parameters": {
33833383
"alertName": {
@@ -3463,7 +3463,7 @@ Save the json below as availabilityalert.json for the purpose of this walkthroug
34633463

34643464
```json
34653465
{
3466-
"$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
3466+
"$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#",
34673467
"contentVersion": "1.0.0.0",
34683468
"parameters": {
34693469
"appName": {
@@ -3571,7 +3571,7 @@ Save the json below as availabilityalert.parameters.json and modify it as requir
35713571

35723572
```json
35733573
{
3574-
"$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentParameters.json#",
3574+
"$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
35753575
"contentVersion": "1.0.0.0",
35763576
"parameters": {
35773577
"appName": {

‎articles/azure-monitor/logs/log-analytics-workspace-overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ The following table summarizes the differences between the plans.
4141
| Category | Analytics Logs | Basic Logs |
4242
|:---|:---|:---|
4343
| Ingestion | Cost for ingestion. | Reduced cost for ingestion. |
44-
| Log queries | No additional cost. Full query language. | Additional cost. Subset of query language. |
44+
| Log queries | No additional cost. Full query capabilities. | Additional cost. [Subset of query capabilities](basic-logs-query.md#limitations). |
4545
| Retention | Configure retention from 30 days to 730 days. | Retention fixed at 8 days. |
4646
| Alerts | Supported. | Not supported. |
4747

‎articles/azure-monitor/logs/private-storage.md

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,10 @@
22
title: Using customer-managed storage accounts in Azure Monitor Log Analytics
33
description: Use your own storage account for Log Analytics scenarios
44
ms.topic: conceptual
5-
author: noakup
6-
ms.author: noakuper
7-
ms.date: 09/03/2020
5+
author: guywi-ms
6+
ms.author: guywild
7+
ms.reviewer: noakuper
8+
ms.date: 04/04/2022
89
---
910

1011
# Using customer-managed storage accounts in Azure Monitor Log Analytics
@@ -107,4 +108,4 @@ Storage accounts are charged by the volume of stored data, the type of the stora
107108
## Next steps
108109

109110
- Learn about [using Azure Private Link to securely connect networks to Azure Monitor](private-link-security.md)
110-
- Learn about [Azure Monitor customer-managed keys](../logs/customer-managed-keys.md)
111+
- Learn about [Azure Monitor customer-managed keys](../logs/customer-managed-keys.md)

‎articles/azure-resource-manager/management/resource-name-rules.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Resource naming restrictions
33
description: Shows the rules and restrictions for naming Azure resources.
44
ms.topic: conceptual
5-
ms.date: 04/02/2022
5+
ms.date: 04/04/2022
66
---
77

88
# Naming rules and restrictions for Azure resources
@@ -689,13 +689,13 @@ In the following tables, the term alphanumeric refers to:
689689
> [!div class="mx-tableFixed"]
690690
> | Entity | Scope | Length | Valid Characters |
691691
> | --- | --- | --- | --- |
692-
> | managedInstances | global | 1-63 | Lowercase letters, numbers, and hyphens.<br><br> Can't have any special characters, such as `@`.<br><br> Can't start or end with hyphen.<br><br> Can’t have hyphen twice in both third and fourth place. For example, `ab--cde` is not allowed. |
693-
> | servers | global | 1-63 | Lowercase letters, numbers, and hyphens.<br><br> Can't have any special characters, such as `@`.<br><br> Can't start or end with hyphen.<br><br> Can’t have hyphen twice in both third and fourth place. For example, `ab--cde` is not allowed. |
692+
> | managedInstances | global | 1-63 | Lowercase letters, numbers, and hyphens.<br><br> Can't start or end with hyphen. |
693+
> | servers | global | 1-63 | Lowercase letters, numbers, and hyphens.<br><br>Can't start or end with hyphen. |
694694
> | servers / administrators | server | | Must be `ActiveDirectory`. |
695695
> | servers / databases | server | 1-128 | Can't use:<br>`<>*%&:\/?` or control characters<br><br>Can't end with period or space. |
696696
> | servers / databases / syncGroups | database | 1-150 | Alphanumerics, hyphens, and underscores. |
697697
> | servers / elasticPools | server | 1-128 | Can't use:<br>`<>*%&:\/?` or control characters<br><br>Can't end with period or space. |
698-
> | servers | failoverGroups | 1-63 | Lowercase letters, numbers, and hyphens.<br><br> Can't have any special characters, such as `@`.<br><br> Can't start or end with hyphen.<br><br> Can’t have hyphen twice in both third and fourth place. For example, `ab--cde` is not allowed. |
698+
> | servers / failoverGroups | global | 1-63 | Lowercase letters, numbers, and hyphens.<br><br>Can't start or end with hyphen. |
699699
> | servers / firewallRules | server | 1-128 | Can't use:<br>`<>*%&:;\/?` or control characters<br><br>Can't end with period. |
700700
> | servers / keys | server | | Must be in format:<br>`VaultName_KeyName_KeyVersion`. |
701701

‎articles/azure-vmware/deploy-arc-for-azure-vmware-solution.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -347,7 +347,7 @@ Use the following steps to perform a manual upgrade for Arc appliance virtual ma
347347
1. Power off the VM.
348348
1. Delete the VM.
349349
1. Delete the download template corresponding to the VM.
350-
1. Delete the appliance ARM resource.
350+
1. Delete the resource bridge ARM resource.
351351
1. Get the previous script `Config_avs` file and add the following configuration item:
352352
1. `"register":false`
353353
1. Download the latest version of the Azure VMware Solution onboarding script.

‎articles/batch/batch-apis-tools.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ Your applications and services can issue direct REST API calls or use one or mor
4242
| **Batch REST** |[Azure REST API - Docs](/rest/api/batchservice/) |N/A |- |- | [Supported versions](/rest/api/batchservice/batch-service-rest-api-versioning) |
4343
| **Batch .NET** |[Azure SDK for .NET - Docs](/dotnet/api/overview/azure/batch) |[NuGet](https://www.nuget.org/packages/Microsoft.Azure.Batch/) |[Tutorial](tutorial-parallel-dotnet.md) |[GitHub](https://github.com/Azure-Samples/azure-batch-samples/tree/master/CSharp) | [Release notes](https://aka.ms/batch-net-dataplane-changelog) |
4444
| **Batch Python** |[Azure SDK for Python - Docs](/python/api/overview/azure/batch/client) |[PyPI](https://pypi.org/project/azure-batch/) |[Tutorial](tutorial-parallel-python.md)|[GitHub](https://github.com/Azure-Samples/azure-batch-samples/tree/master/Python/Batch) | [Readme](https://github.com/Azure/azure-sdk-for-python/blob/master/sdk/batch/azure-batch/README.md) |
45-
| **Batch JavaScript** |[Azure SDK for JavaScript - Docs](/javascript/api/overview/azure/batch/client) |[npm](https://www.npmjs.com/package/@azure/batch) |[Tutorial](batch-js-get-started.md) |- | [Readme](https://github.com/Azure/azure-sdk-for-js/tree/main/sdk/batch/batch) |
45+
| **Batch JavaScript** |[Azure SDK for JavaScript - Docs](/javascript/api/overview/azure/batch) |[npm](https://www.npmjs.com/package/@azure/batch) |[Tutorial](batch-js-get-started.md) |- | [Readme](https://github.com/Azure/azure-sdk-for-js/tree/main/sdk/batch/batch) |
4646
| **Batch Java** |[Azure SDK for Java - Docs](/java/api/overview/azure/batch) |[Maven](https://search.maven.org/search?q=a:azure-batch) |- |[GitHub](https://github.com/Azure-Samples/azure-batch-samples/tree/master/Java) | [Readme](https://github.com/Azure/azure-batch-sdk-for-java)|
4747

4848
## Batch Management APIs

‎articles/defender-for-cloud/TOC.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@
136136
- name: Protect your machines
137137
displayName: hybrid, arc, Azure Defender for machines
138138
items:
139-
- name: Overview of Defender for servers
139+
- name: Overview of Defender for Servers
140140
displayName: VM
141141
href: defender-for-servers-introduction.md
142142
- name: Apply Azure security baselines

0 commit comments

Comments
 (0)