Skip to content

Commit cdffcb3

Browse files
khelanmodikhelanmodi
authored
Merge branch 'main' into vCore-data-encryption
2 parents f10f5eb + d5003ab commit cdffcb3

File tree

5,340 files changed

+82455
-67108
lines changed

Some content is hidden

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

5,340 files changed

+82455
-67108
lines changed

‎.acrolinx-config.edn

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
{:allowed-branchname-matches ["main" "release-.*"]
2-
:allowed-filename-matches ["(?i)articles/(?:(?!active-directory/saas-apps/toc.yml|role-based-access-control/resource-provider-operations.md))" "includes/"]}
2+
:allowed-filename-matches ["(?i)articles/(?:(?!active-directory/saas-apps/toc.yml|role-based-access-control/resource-provider-operations.md|.*policy/samples/|.*resource-graph/samples/))" "(?i)includes/(?:(?!policy/reference/|policy/standards/))"]}

‎.openpublishing.publish.config.json

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -176,12 +176,24 @@
176176
"branch": "master",
177177
"branch_mapping": {}
178178
},
179+
{
180+
"path_to_root": "azure_powershell_scripts",
181+
"url": "https://github.com/Azure-Samples/azure-docs-powershell-samples",
182+
"branch": "main",
183+
"branch_mapping": {}
184+
},
179185
{
180186
"path_to_root": "powershell_scripts",
181187
"url": "https://github.com/Azure/azure-docs-powershell-samples",
182188
"branch": "master",
183189
"branch_mapping": {}
184190
},
191+
{
192+
"path_to_root": "new_powershell_scripts",
193+
"url": "https://github.com/Azure-Samples/azure-docs-powershell-samples",
194+
"branch": "main",
195+
"branch_mapping": {}
196+
},
185197
{
186198
"path_to_root": "policy-templates",
187199
"url": "https://github.com/Azure/azure-policy",
@@ -509,7 +521,7 @@
509521
{
510522
"path_to_root": "azureml-examples-temp-fix",
511523
"url": "https://github.com/Azure/azureml-examples",
512-
"branch": "temp-fix-doc-error",
524+
"branch": "temp-fix",
513525
"branch_mapping": {}
514526
},
515527
{
@@ -1242,9 +1254,11 @@
12421254
"articles/spring-apps/.openpublishing.redirection.spring-apps.json",
12431255
"articles/spring-cloud/.openpublishing.redirection.spring-cloud.json",
12441256
"articles/static-web-apps/.openpublishing.redirection.static-web-apps.json",
1257+
"articles/storsimple/.openpublishing.redirection.storsimple.json",
12451258
"articles/stream-analytics/.openpublishing.redirection.stream-analytics.json",
12461259
"articles/synapse-analytics/.openpublishing.redirection.synapse-analytics.json",
12471260
"articles/virtual-machine-scale-sets/.openpublishing.redirection.virtual-machine-scale-sets.json",
1248-
"articles/virtual-machines/.openpublishing.redirection.virtual-machines.json"
1261+
"articles/virtual-machines/.openpublishing.redirection.virtual-machines.json",
1262+
"articles/operator-nexus/.openpublishing.redirection.operator-nexus.json"
12491263
]
12501264
}

‎.openpublishing.redirection.api-management.json

Lines changed: 75 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,80 @@
11
{
22
"redirections": [
3+
{
4+
"source_path": "articles/api-management/set-graphql-resolver-policy.md",
5+
"redirect_url": "/previous-versions/azure/api-management/set-graphql-resolver-policy",
6+
"redirect_document_id": false
7+
},
8+
{
9+
"source_path": "articles/api-management/api-management-api-templates.md",
10+
"redirect_url": "/previous-versions/azure/api-management/api-management-api-templates",
11+
"redirect_document_id": false
12+
},
13+
{
14+
"source_path": "articles/api-management/api-management-application-templates.md",
15+
"redirect_url": "/previous-versions/azure/api-management/api-management-application-templates",
16+
"redirect_document_id": false
17+
},
18+
{
19+
"source_path": "articles/api-management/api-management-customize-styles.md",
20+
"redirect_url": "/previous-versions/azure/api-management/api-management-customize-styles",
21+
"redirect_document_id": false
22+
},
23+
{
24+
"source_path": "articles/api-management/api-management-developer-portal-templates-reference.md",
25+
"redirect_url": "/previous-versions/azure/api-management/api-management-developer-portal-templates-reference",
26+
"redirect_document_id": false
27+
},
28+
{
29+
"source_path": "articles/api-management/api-management-developer-portal-templates.md",
30+
"redirect_url": "/previous-versions/azure/api-management/api-management-developer-portal-templates",
31+
"redirect_document_id": false
32+
},
33+
{
34+
"source_path": "articles/api-management/api-management-issue-templates.md",
35+
"redirect_url": "/previous-versions/azure/api-management/api-management-issue-templates",
36+
"redirect_document_id": false
37+
},
38+
{
39+
"source_path": "articles/api-management/api-management-modify-content-layout.md",
40+
"redirect_url": "/previous-versions/azure/api-management/api-management-modify-content-layout",
41+
"redirect_document_id": false
42+
},
43+
{
44+
"source_path": "articles/api-management/api-management-page-controls.md",
45+
"redirect_url": "/previous-versions/azure/api-management/api-management-page-controls",
46+
"redirect_document_id": false
47+
},
48+
{
49+
"source_path": "articles/api-management/api-management-page-templates.md",
50+
"redirect_url": "/previous-versions/azure/api-management/api-management-page-templates",
51+
"redirect_document_id": false
52+
},
53+
{
54+
"source_path": "articles/api-management/api-management-product-templates.md",
55+
"redirect_url": "/previous-versions/azure/api-management/api-management-product-templates",
56+
"redirect_document_id": false
57+
},
58+
{
59+
"source_path": "articles/api-management/api-management-template-data-model-reference.md",
60+
"redirect_url": "/previous-versions/azure/api-management/api-management-template-data-model-reference",
61+
"redirect_document_id": false
62+
},
63+
{
64+
"source_path": "articles/api-management/api-management-template-resources.md",
65+
"redirect_url": "/previous-versions/azure/api-management/api-management-template-resources",
66+
"redirect_document_id": false
67+
},
68+
{
69+
"source_path": "articles/api-management/api-management-user-profile-templates.md",
70+
"redirect_url": "/previous-versions/azure/api-management/api-management-user-profile-templates",
71+
"redirect_document_id": false
72+
},
73+
{
74+
"source_path": "articles/api-management/developer-portal-deprecated-migration.md",
75+
"redirect_url": "/previous-versions/azure/api-management/developer-portal-deprecated-migration",
76+
"redirect_document_id": false
77+
},
378
{
479
"source_path_from_root": "/articles/api-management/authorizations-overview.md",
580
"redirect_url": "/azure/api-management/credentials-overview",

‎.openpublishing.redirection.azure-monitor.json

Lines changed: 47 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -425,6 +425,16 @@
425425
"redirect_url": "/azure/azure-monitor/visualize/workbooks-data-sources",
426426
"redirect_document_id": false
427427
},
428+
{
429+
"source_path_from_root": "/articles/azure-monitor/visualize/workbooks-view-designer-conversion-overview.md",
430+
"redirect_url": "/previous-versions/azure/azure-monitor/visualize/workbooks-view-designer-conversion-overview",
431+
"redirect_document_id": false
432+
},
433+
{
434+
"source_path_from_root": "/articles/azure-monitor/visualize/workbooks-view-designer-conversions.md",
435+
"redirect_url": "/previous-versions/azure/azure-monitor/visualize/workbooks-view-designer-conversions",
436+
"redirect_document_id": false
437+
},
428438
{
429439
"source_path_from_root": "/articles/azure-monitor/alerts/itsmc-service-manager-script.md",
430440
"redirect_url": "/azure/azure-monitor/alerts/itsmc-overview",
@@ -475,6 +485,11 @@
475485
"redirect_url": "/azure/azure-monitor/alerts/alerts-types",
476486
"redirect_document_id": false
477487
},
488+
{
489+
"source_path_from_root": "/articles/azure-monitor/alerts/alerts-create-new-alert-rule.md",
490+
"redirect_url": "/azure/azure-monitor/alerts/alerts-create-metric-alert-rule",
491+
"redirect_document_id": false
492+
},
478493
{
479494
"source_path_from_root": "/articles/azure-monitor/alerts/alerts-page.md",
480495
"redirect_url": "/azure/azure-monitor/alerts/alerts-manage-alert-instances",
@@ -492,17 +507,17 @@
492507
},
493508
{
494509
"source_path_from_root": "/articles/azure-monitor/alerts/alerts-metric.md",
495-
"redirect_url": "/azure/azure-monitor/alerts/alerts-create-new-alert-rule",
510+
"redirect_url": "/azure/azure-monitor/alerts/alerts-create-metric-alert-rule",
496511
"redirect_document_id": false
497512
},
498513
{
499514
"source_path_from_root": "/articles/azure-monitor/alerts/alerts-log.md",
500-
"redirect_url": "/azure/azure-monitor/alerts/alerts-create-new-alert-rule",
515+
"redirect_url": "/azure/azure-monitor/alerts/alerts-create-log-alert-rule",
501516
"redirect_document_id": false
502517
},
503518
{
504519
"source_path_from_root": "/articles/azure-monitor/alerts/alerts-activity-log.md",
505-
"redirect_url": "/azure/azure-monitor/alerts/alerts-create-new-alert-rule",
520+
"redirect_url": "/azure/azure-monitor/alerts/alerts-create-activity-log-alert-rule",
506521
"redirect_document_id": false
507522
},
508523
{
@@ -2601,22 +2616,22 @@
26012616
},
26022617
{
26032618
"source_path_from_root": "/articles/azure-monitor/platform/quick-alerts-classic-metric-portal.md",
2604-
"redirect_url": "/azure/azure-monitor/alerts/alerts-metric",
2619+
"redirect_url": "/azure/azure-monitor/alerts/alerts-create-metric-alert-rule",
26052620
"redirect_document_id": false
26062621
},
26072622
{
26082623
"source_path_from_root": "/articles/monitoring-and-diagnostics/alert-metric.md",
2609-
"redirect_url": "/azure/azure-monitor/alerts/alerts-metric",
2624+
"redirect_url": "/azure/azure-monitor/alerts/alerts-create-metric-alert-rule",
26102625
"redirect_document_id": true
26112626
},
26122627
{
26132628
"source_path_from_root": "/articles/monitoring-and-diagnostics/monitor-quick-resource-metric-alert-portal.md",
2614-
"redirect_url": "/azure/azure-monitor/alerts/alerts-metric",
2629+
"redirect_url": "/azure/azure-monitor/alerts/alerts-create-metric-alert-rule",
26152630
"redirect_document_id": false
26162631
},
26172632
{
26182633
"source_path_from_root": "/articles/monitoring-and-diagnostics/monitoring-create-metric-alerts-with-templates.md",
2619-
"redirect_url": "/azure/azure-monitor/alerts/alerts-metric-create-templates",
2634+
"redirect_url": "/azure/azure-monitor/alerts/alerts-create-rule-cli-powershell-arm",
26202635
"redirect_document_id": true
26212636
},
26222637
{
@@ -2631,7 +2646,7 @@
26312646
},
26322647
{
26332648
"source_path_from_root": "/articles/monitoring-and-diagnostics/alert-metric-overview.md",
2634-
"redirect_url": "/azure/azure-monitor/alerts/alerts-metric-overview",
2649+
"redirect_url": "/azure/azure-monitor/alerts/alerts-types",
26352650
"redirect_document_id": true
26362651
},
26372652
{
@@ -4001,17 +4016,17 @@
40014016
},
40024017
{
40034018
"source_path_from_root": "/articles/azure-monitor/platform/alerts-metric.md",
4004-
"redirect_url": "/azure/azure-monitor/alerts/alerts-metric",
4019+
"redirect_url": "/azure/azure-monitor/alerts/alerts-create-metric-alert-rule",
40054020
"redirect_document_id": false
40064021
},
40074022
{
40084023
"source_path_from_root": "/articles/azure-monitor/platform/alerts-metric-create-templates.md",
4009-
"redirect_url": "/azure/azure-monitor/alerts/alerts-metric-create-templates",
4024+
"redirect_url": "/azure/azure-monitor/alerts/alerts-create-rule-cli-powershell-arm",
40104025
"redirect_document_id": false
40114026
},
40124027
{
40134028
"source_path_from_root": "/articles/azure-monitor/alerts/alerts-metric-create-templates.md",
4014-
"redirect_url": "/azure/azure-monitor/alerts/alerts-create-new-alert-rule",
4029+
"redirect_url": "/azure/azure-monitor/alerts/alerts-create-rule-cli-powershell-arm",
40154030
"redirect_document_id": false
40164031
},
40174032
{
@@ -4021,7 +4036,7 @@
40214036
},
40224037
{
40234038
"source_path_from_root": "/articles/azure-monitor/alerts/alerts-log-create-templates.md",
4024-
"redirect_url": "/azure/azure-monitor/alerts/alerts-create-new-alert-rule",
4039+
"redirect_url": "/azure/azure-monitor/alerts/alerts-create-rule-cli-powershell-arm",
40254040
"redirect_document_id": false
40264041
},
40274042
{
@@ -6433,6 +6448,26 @@
64336448
"source_path_from_root": "/articles/azure-monitor/faq.yml",
64346449
"redirect_url": "/azure/azure-monitor/overview#frequently-asked-questions",
64356450
"redirect_document_id": false
6451+
},
6452+
{
6453+
"source_path_from_root": "/articles/azure-monitor/logs/app-expression.md",
6454+
"redirect_url": "/azure/azure-monitor/logs/cross-workspace-query",
6455+
"redirect_document_id": false
6456+
},
6457+
{
6458+
"source_path_from_root": "/articles/azure-monitor/logs/workspace-expression.md",
6459+
"redirect_url": "/azure/azure-monitor/logs/cross-workspace-query",
6460+
"redirect_document_id": false
6461+
},
6462+
{
6463+
"source_path_from_root": "/articles/azure-monitor/logs/resource-expression.md",
6464+
"redirect_url": "/azure/azure-monitor/logs/cross-workspace-query",
6465+
"redirect_document_id": false
6466+
},
6467+
{
6468+
"source_path_from_root": "/articles/azure-monitor/vm/vminsights-configure-workspace.md",
6469+
"redirect_url": "/azure/azure-monitor/vm/vminsights-enable-overview",
6470+
"redirect_document_id": false
64366471
}
64376472
]
64386473
}

‎.openpublishing.redirection.defender-for-cloud.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -890,6 +890,16 @@
890890
"redirect_url": "/azure/defender-for-cloud/defender-for-storage-classic-enable#exclude-a-storage-account-from-a-protected-subscription-in-the-per-transaction-plan",
891891
"redirect_document_id": true
892892
},
893+
{
894+
"source_path_from_root": "/articles/defender-for-cloud/agentless-container-registry-vulnerability-assessment.md",
895+
"redirect_url": "/azure/defender-for-cloud/agentless-vulnerability-assessment-azure",
896+
"redirect_document_id": true
897+
},
898+
{
899+
"source_path_from_root": "/articles/defender-for-cloud/view-and-remediate-vulnerabilities-for-images-running-on-aks.md",
900+
"redirect_url": "/azure/defender-for-cloud/view-and-remediate-vulnerabilities-for-images",
901+
"redirect_document_id": true
902+
},
893903
{
894904
"source_path_from_root": "/articles/defender-for-cloud/attack-path-reference.md",
895905
"redirect_url": "/azure/defender-for-cloud/how-to-manage-attack-path",

0 commit comments

Comments
 (0)