Skip to content

Commit 7feec51

Browse files
authored
Merge branch 'MicrosoftDocs:main' into master
2 parents ffd9418 + d4e5ed4 commit 7feec51

File tree

5,563 files changed

+90614
-47941
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,563 files changed

+90614
-47941
lines changed

.openpublishing.publish.config.json

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -437,7 +437,7 @@
437437
{
438438
"path_to_root": "media-services-video-indexer",
439439
"url": "https://github.com/Azure-Samples/media-services-video-indexer",
440-
"branch": "main",
440+
"branch": "master",
441441
"branch_mapping": {}
442442
},
443443
{
@@ -931,6 +931,18 @@
931931
"url": "https://github.com/Azure-Samples/cosmos-db-sql-api-dotnet-samples",
932932
"branch": "v3",
933933
"branch_mapping": {}
934+
},
935+
{
936+
"path_to_root": "azure-cosmos-db-table-dotnet-v12",
937+
"url": "https://github.com/Azure-Samples/cosmos-db-table-api-dotnet-samples",
938+
"branch": "v12",
939+
"branch_mapping": {}
940+
},
941+
{
942+
"path_to_root": "azure-cosmos-mongodb-dotnet",
943+
"url": "https://github.com/Azure-Samples/cosmos-db-mongodb-api-dotnet-samples",
944+
"branch": "quickstart-test",
945+
"branch_mapping": {}
934946
}
935947
],
936948
"branch_target_mapping": {
@@ -950,6 +962,7 @@
950962
".openpublishing.redirection.json",
951963
".openpublishing.redirection.azure-arc-data.json",
952964
".openpublishing.redirection.active-directory.json",
965+
".openpublishing.redirection.azure-attestation.json",
953966
".openpublishing.redirection.azure-blob.json",
954967
"articles/data-factory/.openpublishing.redirection.data-factory.json",
955968
".openpublishing.redirection.defender-for-cloud.json",

.openpublishing.redirection.active-directory.json

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2790,6 +2790,7 @@
27902790
"redirect_url": "/azure/active-directory/develop/howto-authenticate-service-principal-powershell",
27912791
"redirect_document_id": false
27922792
},
2793+
27932794
{
27942795
"source_path_from_root": "/articles/active-directory/develop/active-directory-devhowto-multi-tenant-overview.md",
27952796
"redirect_url": "/azure/active-directory/develop/howto-convert-app-to-be-multi-tenant",
@@ -4515,6 +4516,11 @@
45154516
"redirect_url": "azure/active-directory/hybrid/what-is-inter-directory-provisioning",
45164517
"redirect_document_id": false
45174518
},
4519+
{
4520+
"source_path_from_root": "/articles/active-directory/hybrid/how-to-connect-group-writeback.md",
4521+
"redirect_url": "/azure/active-directory/hybrid/how-to-connect-group-writeback-v2",
4522+
"redirect_document_id": false
4523+
},
45184524
{
45194525
"source_path_from_root": "/articles/active-directory/cloud-provisioning/tutorial-single-forest.md",
45204526
"redirect_url": "/azure/active-directory/cloud-sync/tutorial-single-forest",
@@ -8787,13 +8793,13 @@
87878793
},
87888794
{
87898795
"source_path_from_root": "/articles/active-directory/active-directory-saas-linkedinlearning-provisioning-tutorial.md",
8790-
"redirect_url": "/azure/active-directory/saas-apps/linkedinlearning-provisioning-tutorial",
8796+
"redirect_url": "/azure/active-directory/saas-apps/linkedin-learning-provisioning-tutorial",
87918797
"redirect_document_id": false
87928798
},
87938799
{
87948800
"source_path_from_root": "/articles/active-directory/active-directory-saas-linkedin-learning-provisioning-tutorial.md",
8795-
"redirect_url": "/azure/active-directory/saas-apps/linkedin-learning-provisioning-tutorial",
8796-
"redirect_document_id": true
8801+
"redirect_url": "/azure",
8802+
"redirect_document_id": false
87978803
},
87988804
{
87998805
"source_path_from_root": "/articles/active-directory/active-directory-saas-linkedinlearning-tutorial.md",
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/attestation/audit-logs.md",
5+
"redirect_url": "/azure/attestation/view-logs",
6+
"redirect_document_id": true
7+
}
8+
]
9+
}

.openpublishing.redirection.azure-monitor.json

Lines changed: 92 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -138,12 +138,47 @@
138138
},
139139
{
140140
"source_path_from_root": "/articles/azure-monitor/app/troubleshoot-portal-connectivity.md",
141-
"redirect_url": "https://docs.microsoft.com/troubleshoot/azure/azure-monitor/app-insights/troubleshoot-portal-connectivity",
141+
"redirect_url": "/troubleshoot/azure/azure-monitor/app-insights/troubleshoot-portal-connectivity",
142+
"redirect_document_id": false
143+
},
144+
{
145+
"source_path_from_root": "/articles/azure-monitor/app/java-2x-troubleshoot.md",
146+
"redirect_url": "https://docs.microsoft.com/troubleshoot/azure/azure-monitor/app-insights/java-2x-troubleshoot",
147+
"redirect_document_id": false
148+
},
149+
{
150+
"source_path_from_root": "/articles/azure-monitor/app/status-monitor-v2-troubleshoot.md",
151+
"redirect_url": "https://docs.microsoft.com/troubleshoot/azure/azure-monitor/app-insights/status-monitor-v2-troubleshoot",
152+
"redirect_document_id": false
153+
},
154+
{
155+
"source_path_from_root": "/articles/azure-monitor/app/asp-net-troubleshoot-no-data.md",
156+
"redirect_url": "https://docs.microsoft.com/troubleshoot/azure/azure-monitor/app-insights/asp-net-troubleshoot-no-data",
157+
"redirect_document_id": false
158+
},
159+
{
160+
"source_path_from_root": "/articles/azure-monitor/app/java-standalone-troubleshoot.md",
161+
"redirect_url": "https://docs.microsoft.com/troubleshoot/azure/azure-monitor/app-insights/java-standalone-troubleshoot",
162+
"redirect_document_id": false
163+
},
164+
{
165+
"source_path_from_root": "/articles/azure-monitor/app/troubleshoot-availability.md",
166+
"redirect_url": "https://docs.microsoft.com/troubleshoot/azure/azure-monitor/app-insights/troubleshoot-availability",
142167
"redirect_document_id": false
143168
},
144169
{
145170
"source_path_from_root": "/articles/azure-monitor/app/auto-instrumentation-troubleshoot.md",
146-
"redirect_url": "https://docs.microsoft.com/troubleshoot/azure/azure-monitor/app-insights/auto-instrumentation-troubleshoot",
171+
"redirect_url": "/troubleshoot/azure/azure-monitor/app-insights/auto-instrumentation-troubleshoot",
172+
"redirect_document_id": false
173+
},
174+
{
175+
"source_path_from_root": "/articles/azure-monitor/app/usage-troubleshoot.md",
176+
"redirect_url": "https://docs.microsoft.com/troubleshoot/azure/azure-monitor/app-insights/usage-troubleshoot",
177+
"redirect_document_id": false
178+
},
179+
{
180+
"source_path_from_root": "/articles/azure-monitor/app/java-on-premises.md",
181+
"redirect_url": "/azure/azure-monitor/app/java-in-process-agent",
147182
"redirect_document_id": false
148183
},
149184
{
@@ -181,6 +216,56 @@
181216
"redirect_url": "/azure/azure-monitor/visualize/workbooks-overview",
182217
"redirect_document_id": false
183218
},
219+
{
220+
"source_path_from_root": "/articles/azure-monitor/visualize/view-designer-conversion-access.md",
221+
"redirect_url": "/azure/azure-monitor/visualize/workbooks-overview",
222+
"redirect_document_id": false
223+
},
224+
{
225+
"source_path_from_root": "/articles/azure-monitor/visualize/view-designer-conversion-examples.md",
226+
"redirect_url": "/azure/azure-monitor/visualize/workbooks-overview",
227+
"redirect_document_id": false
228+
},
229+
{
230+
"source_path_from_root": "/articles/azure-monitor/visualize/view-designer-conversion-options.md",
231+
"redirect_url": "/azure/azure-monitor/visualize/workbooks-overview",
232+
"redirect_document_id": false
233+
},
234+
{
235+
"source_path_from_root": "/articles/azure-monitor/visualize/view-designer-conversion-overview.md",
236+
"redirect_url": "/azure/azure-monitor/visualize/workbooks-overview",
237+
"redirect_document_id": false
238+
},
239+
{
240+
"source_path_from_root": "/articles/azure-monitor/visualize/view-designer-conversion-tasks.md",
241+
"redirect_url": "/azure/azure-monitor/visualize/workbooks-overview",
242+
"redirect_document_id": false
243+
},
244+
{
245+
"source_path_from_root": "/articles/azure-monitor/visualize/view-designer-conversion-tiles.md",
246+
"redirect_url": "/azure/azure-monitor/visualize/workbooks-overview",
247+
"redirect_document_id": false
248+
},
249+
{
250+
"source_path_from_root": "/articles/azure-monitor/visualize/workbooks-interactive.md",
251+
"redirect_url": "/azure/azure-monitor/visualize/workbooks-configurations",
252+
"redirect_document_id": false
253+
},
254+
{
255+
"source_path_from_root": "/articles/azure-monitor/visualize/workbooks-groups.md",
256+
"redirect_url": "/azure/azure-monitor/visualize/workbooks-create-workbook",
257+
"redirect_document_id": false
258+
},
259+
{
260+
"source_path_from_root": "/articles/azure-monitor/visualize/workbooks-add-text.md",
261+
"redirect_url": "/azure/azure-monitor/visualize/workbooks-add-workbook-elements",
262+
"redirect_document_id": false
263+
},
264+
{
265+
"source_path_from_root": "/articles/azure-monitor/visualize/workbooks-combine-data.md",
266+
"redirect_url": "/azure/azure-monitor/visualize/workbooks-data-sources",
267+
"redirect_document_id": false
268+
},
184269
{
185270
"source_path_from_root": "/articles/azure-monitor/alerts/itsmc-service-manager-script.md",
186271
"redirect_url": "/azure/azure-monitor/alerts/itsmc-connections",
@@ -236,6 +321,11 @@
236321
"redirect_url": "/azure/azure-monitor/alerts/alerts-types",
237322
"redirect_document_id": false
238323
},
324+
{
325+
"source_path_from_root": "/articles/azure-monitor/alerts/alerts-action-rules.md" ,
326+
"redirect_url": "/azure/azure-monitor/alerts/alerts-processing-rules",
327+
"redirect_document_id": false
328+
},
239329
{
240330
"source_path_from_root": "/articles/azure-monitor/insights/data-explorer.md" ,
241331
"redirect_url": "/azure/data-explorer/data-explorer-insights",
@@ -268,4 +358,3 @@
268358
}
269359
]
270360
}
271-

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -585,6 +585,16 @@
585585
"redirect_url": "/azure/defender-for-cloud/quickstart-onboard-aws",
586586
"redirect_document_id": true
587587
},
588+
{
589+
"source_path_from_root": "/articles/defender-for-cloud/defender-for-sql-enable-azure-sql-protections.md",
590+
"redirect_url": "/azure/defender-for-cloud/quickstart-enable-database-protections",
591+
"redirect_document_id": true
592+
},
593+
{
594+
"source_path_from_root": "/articles/defender-for-cloud/quickstart-enable-defender-for-cosmos.md",
595+
"redirect_url": "/azure/defender-for-cloud/defender-for-databases-enable-cosmos-protections",
596+
"redirect_document_id": true
597+
},
588598
{
589599
"source_path_from_root": "/articles/security-center/auto-deploy-vulnerability-assessment.md",
590600
"redirect_url": "/azure/defender-for-cloud/auto-deploy-vulnerability-assessment",

.openpublishing.redirection.defender-for-iot.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
{
22
"redirections": [
33
{
4-
"source_path_from_root": "/articles/defender-for-iot/organizations/how-to-identify-required-appliances.md",
5-
"redirect_url": "/azure/defender-for-iot/organizations/ot-appliance-sizing",
4+
"source_path_from_root": "/articles/defender-for-iot/organizations/plan-network-monitoring.md",
5+
"redirect_url": "/azure/defender-for-iot/organizations/best-practices/plan-network-monitoring",
66
"redirect_document_id": false
77
},
88
{
9-
"source_path_from_root": "/articles/defender-for-iot/organizations/resources-manage-proprietary-protocols.md",
10-
"redirect_url": "/azure/defender-for-iot/organizations/overview#extend-support-to-proprietary-protocols",
9+
"source_path_from_root": "/articles/defender-for-iot/organizations/how-to-identify-required-appliances.md",
10+
"redirect_url": "/azure/defender-for-iot/organizations/ot-appliance-sizing",
1111
"redirect_document_id": false
1212
},
1313
{

0 commit comments

Comments
 (0)