Skip to content

Commit 31857e4

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into rolyon-aadroles-roles-security-operator-mde
2 parents f60e1a7 + ef0a722 commit 31857e4

File tree

3,057 files changed

+40004
-28145
lines changed

Some content is hidden

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

3,057 files changed

+40004
-28145
lines changed

.openpublishing.publish.config.json

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -849,9 +849,15 @@
849849
"branch_mapping": {}
850850
},
851851
{
852-
"path_to_root": "azure-cosmos-dotnet-v3",
853-
"url": "https://github.com/Azure-Samples/cosmos-db-sql-api-dotnet-samples",
854-
"branch": "v3",
852+
"path_to_root": "cosmos-db-nosql-dotnet-samples",
853+
"url": "https://github.com/azure-samples/cosmos-db-nosql-dotnet-samples",
854+
"branch": "main",
855+
"branch_mapping": {}
856+
},
857+
{
858+
"path_to_root": "cosmos-db-nosql-python-samples",
859+
"url": "https://github.com/azure-samples/cosmos-db-nosql-python-samples",
860+
"branch": "main",
855861
"branch_mapping": {}
856862
},
857863
{
@@ -908,6 +914,7 @@
908914
".openpublishing.redirection.azure-percept.json",
909915
".openpublishing.redirection.azure-productivity.json",
910916
".openpublishing.redirection.azure-australia.json",
917+
".openpublishing.redirection.iot-hub-device-update.json",
911918
"articles/azure-fluid-relay/.openpublishing.redirection.fluid-relay.json",
912919
"articles/azure-netapp-files/.openpublishing.redirection.azure-netapp-files.json",
913920
"articles/azure-relay/.openpublishing.redirection.relay.json",

.openpublishing.redirection.active-directory.json

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3433,17 +3433,17 @@
34333433
},
34343434
{
34353435
"source_path_from_root": "/articles/active-directory/develop/active-directory-permissions.md",
3436-
"redirect_url": "/azure/active-directory/develop/v2-permissions-and-consent",
3436+
"redirect_url": "/azure/active-directory/develop/permissions-consent-overview",
34373437
"redirect_document_id": false
34383438
},
34393439
{
34403440
"source_path_from_root": "/articles/active-directory/develop/active-directory-v2-scopes.md",
3441-
"redirect_url": "/azure/active-directory/develop/v2-permissions-and-consent",
3441+
"redirect_url": "/azure/active-directory/develop/permissions-consent-overview",
34423442
"redirect_document_id": false
34433443
},
34443444
{
34453445
"source_path_from_root": "/articles/active-directory/develop/v1-permissions-and-consent.md",
3446-
"redirect_url": "/azure/active-directory/develop/v2-permissions-and-consent",
3446+
"redirect_url": "/azure/active-directory/develop/permissions-consent-overview",
34473447
"redirect_document_id": false
34483448
},
34493449
{
@@ -5536,6 +5536,21 @@
55365536
"redirect_url": "/azure/active-directory/app-proxy/application-proxy-add-on-premises-application",
55375537
"redirect_document_id": true
55385538
},
5539+
{
5540+
"source_path_from_root": "/articles/active-directory/develop/consent-framework.md",
5541+
"redirect_url": "/azure/active-directory/develop/application-consent-experience",
5542+
"redirect_document_id": false
5543+
},
5544+
{
5545+
"source_path_from_root": "/articles/active-directory/develop/v2-permissions-and-consent.md",
5546+
"redirect_url": "/azure/active-directory/develop/permissions-consent-overview",
5547+
"redirect_document_id": false
5548+
},
5549+
{
5550+
"source_path_from_root": "/articles/active-directory/manage-apps/consent-and-permissions-overview.md",
5551+
"redirect_url": "/azure/active-directory/manage-apps/user-admin-consent-overview",
5552+
"redirect_document_id": false
5553+
},
55395554
{
55405555
"source_path_from_root": "/articles/active-directory/manage-apps/application-proxy-enable.md",
55415556
"redirect_url": "/azure/active-directory/app-proxy/application-proxy-add-on-premises-application",

.openpublishing.redirection.azure-monitor.json

Lines changed: 42 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -278,12 +278,27 @@
278278
},
279279
{
280280
"source_path_from_root": "/articles/azure-monitor/alerts/itsmc-service-manager-script.md",
281-
"redirect_url": "/azure/azure-monitor/alerts/itsmc-connections",
281+
"redirect_url": "/azure/azure-monitor/alerts/itsmc-overview",
282+
"redirect_document_id": false
283+
},
284+
{
285+
"source_path_from_root": "/articles/azure-monitor/alerts/itsmc-connections.md",
286+
"redirect_url": "/azure/azure-monitor/alerts/itsmc-overview",
287+
"redirect_document_id": false
288+
},
289+
{
290+
"source_path_from_root": "/articles/azure-monitor/alerts/itsmc-connections-cherwell.md",
291+
"redirect_url": "/azure/azure-monitor/alerts/itsmc-overview",
292+
"redirect_document_id": false
293+
},
294+
{
295+
"source_path_from_root": "/articles/azure-monitor/alerts/itsmc-connections-provance.md",
296+
"redirect_url": "/azure/azure-monitor/alerts/itsmc-overview",
282297
"redirect_document_id": false
283298
},
284299
{
285300
"source_path_from_root": "/articles/azure-monitor/alerts/itsmc-connections-scsm.md" ,
286-
"redirect_url": "/azure/azure-monitor/alerts/itsmc-connections",
301+
"redirect_url": "/azure/azure-monitor/alerts/itsmc-overview",
287302
"redirect_document_id": false
288303
},
289304
{
@@ -2908,13 +2923,13 @@
29082923
},
29092924
{
29102925
"source_path_from_root": "/articles/log-analytics/log-analytics-itsmc-connections.md",
2911-
"redirect_url": "/azure/azure-monitor/platform/itsmc-connections",
2926+
"redirect_url": "/azure/azure-monitor/platform/itsmc-overview",
29122927
"redirect_document_id": true
29132928
},
29142929
{
29152930
"source_path_from_root": "/articles/log-analytics/log-analytics-itsmc-overview.md",
29162931
"redirect_url": "/azure/azure-monitor/platform/itsmc-overview",
2917-
"redirect_document_id": true
2932+
"redirect_document_id": false
29182933
},
29192934
{
29202935
"source_path_from_root": "/articles/log-analytics/log-analytics-itsmc-service-manager-script.md",
@@ -3571,6 +3586,12 @@
35713586
"redirect_url": "/azure/service-health/alerts-activity-log-service-notifications",
35723587
"redirect_document_id": false
35733588
},
3589+
{
3590+
"source_path_from_root": "/articles/azure-monitor/logs/azure-data-explorer-monitor-proxy.md",
3591+
"redirect_url": "/azure/data-explorer/query-monitor-data",
3592+
"redirect_document_id": false
3593+
},
3594+
35743595
{
35753596
"source_path_from_root": "/articles/azure-monitor/platform/service-notifications.md",
35763597
"redirect_url": "/azure/service-health/service-notifications",
@@ -5108,17 +5129,17 @@
51085129
},
51095130
{
51105131
"source_path_from_root": "/articles/azure-monitor/platform/itsmc-connections-cherwell.md",
5111-
"redirect_url": "/azure/azure-monitor/alerts/itsmc-connections-cherwell",
5132+
"redirect_url": "/azure/azure-monitor/alerts/itsmc-overview",
51125133
"redirect_document_id": false
51135134
},
51145135
{
51155136
"source_path_from_root": "/articles/azure-monitor/platform/itsmc-connections-provance.md",
5116-
"redirect_url": "/azure/azure-monitor/alerts/itsmc-connections-provance",
5137+
"redirect_url": "/azure/azure-monitor/alerts/itsmc-overview",
51175138
"redirect_document_id": false
51185139
},
51195140
{
51205141
"source_path_from_root": "/articles/azure-monitor/platform/itsmc-connections-scsm.md",
5121-
"redirect_url": "/azure/azure-monitor/alerts/itsmc-connections-scsm",
5142+
"redirect_url": "/azure/azure-monitor/alerts/itsmc-overview",
51225143
"redirect_document_id": false
51235144
},
51245145
{
@@ -5465,30 +5486,36 @@
54655486
"source_path_from_root": "/articles/azure-monitor/containers/container-insights-update-metrics.md",
54665487
"redirect_url": "/azure/azure-monitor/containers/container-insights-custom-metrics",
54675488
"redirect_document_id": false
5468-
}
5469-
,
5489+
},
54705490
{
54715491
"source_path_from_root": "/articles/automation/migrate-oms-update-deployments.md",
54725492
"redirect_url": "/azure/azure-monitor/terminology#april-2018---retirement-of-operations-management-suite-brand",
54735493
"redirect_document_id": false
5474-
}
5475-
,
5494+
},
54765495
{
54775496
"source_path_from_root": "/articles/azure-monitor/autoscale/autoscale-virtual-machine-scale-sets.md",
54785497
"redirect_url": "/azure/virtual-machine-scale-sets/tutorial-autoscale-template",
54795498
"redirect_document_id": false
5480-
}
5481-
,
5499+
},
54825500
{
54835501
"source_path_from_root": "/articles/azure-monitor/alerts/alerts-common-schema-integrations.md",
54845502
"redirect_url": "/azure/azure-monitor/alerts/alerts-logic-apps",
54855503
"redirect_document_id": false
5486-
}
5487-
,
5504+
},
54885505
{
54895506
"source_path_from_root": "/articles/azure-monitor/alerts/action-groups-logic-app.md",
54905507
"redirect_url": "/azure/azure-monitor/alerts/alerts-logic-apps",
54915508
"redirect_document_id": false
5509+
},
5510+
{
5511+
"source_path_from_root": "/articles/azure-monitor/containers/container-insights-prometheus-metrics-addon.md",
5512+
"redirect_url": "/azure/azure-monitor/essentials/prometheus-metrics-enable",
5513+
"redirect_document_id": false
5514+
},
5515+
{
5516+
"source_path_from_root": "/articles/azure-monitor/containers/container-insights-prometheus-monitoring-addon.md",
5517+
"redirect_url": "/azure/azure-monitor/containers/container-insights-prometheus",
5518+
"redirect_document_id": false
54925519
}
54935520
]
54945521
}

.openpublishing.redirection.azure-productivity.json

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,11 @@
2929
"source_path_from_root": "/articles/devtest-labs/scripts/set-allowed-vm-sizes-in-lab.md",
3030
"redirect_url": "/azure/devtest-labs/samples-powershell",
3131
"redirect_document_id": false
32-
}
32+
},
33+
{
34+
"source_path": "articles/dev-box/tutorial-connect-to-dev-box-with-remote-desktop-app.md",
35+
"redirect_url": "/azure/dev-box/quickstart-connect-to-dev-box-with-remote-desktop-app",
36+
"redirect_document_id": false
37+
}
3338
]
3439
}

.openpublishing.redirection.communication-services.json

Lines changed: 0 additions & 9 deletions
This file was deleted.

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -744,6 +744,16 @@
744744
"source_path_from_root": "/articles/defender-for-cloud/detect-credential-leaks.md",
745745
"redirect_url": "/azure/defender-for-cloud/detect-exposed-secrets",
746746
"redirect_document_id": true
747+
},
748+
{
749+
"source_path_from_root": "/articles/defender-for-cloud/defender-for-containers-va-ecr.md",
750+
"redirect_url": "/azure/defender-for-cloud/defender-for-containers-vulnerability-assessment-elastic",
751+
"redirect_document_id": true
752+
},
753+
{
754+
"source_path_from_root": "/articles/defender-for-cloud/defender-for-containers-va-acr.md",
755+
"redirect_url": "/azure/defender-for-cloud/defender-for-containers-vulnerability-assessment-azure",
756+
"redirect_document_id": true
747757
}
748758

749759
]
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{
2+
"redirections": [
3+
{
4+
"source_path_from_root": "/articles/iot-hub-device-update/migration-pp-to-ppr.md",
5+
"redirect_url": "/azure/iot-hub-device-update/migration-public-preview-refresh-to-ga",
6+
"redirect_document_id": true
7+
}
8+
]
9+
}

0 commit comments

Comments
 (0)