Skip to content

Commit 65b0dd9

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into multir
2 parents cd20062 + 9045f09 commit 65b0dd9

File tree

8,810 files changed

+164598
-109371
lines changed

Some content is hidden

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

8,810 files changed

+164598
-109371
lines changed

.openpublishing.publish.config.json

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -813,8 +813,8 @@
813813
"branch_mapping": {}
814814
},
815815
{
816-
"path_to_root": "azure-spring-cloud-reference-architecture",
817-
"url": "https://github.com/Azure/azure-spring-cloud-reference-architecture",
816+
"path_to_root": "azure-spring-apps-reference-architecture",
817+
"url": "https://github.com/Azure/azure-spring-apps-reference-architecture",
818818
"branch": "main",
819819
"branch_mapping": {}
820820
},
@@ -978,6 +978,7 @@
978978
".openpublishing.redirection.app-service.json",
979979
".openpublishing.redirection.key-vault.json",
980980
".openpublishing.redirection.sql-database.json",
981+
".openpublishing.redirection.machine-configuration.json",
981982
".openpublishing.redirection.security-benchmark.json",
982983
"articles/synapse-analytics/.openpublishing.redirection.synapse-analytics.json",
983984
".openpublishing.redirection.azure-web-pubsub.json",
@@ -989,6 +990,7 @@
989990
"articles/azure-netapp-files/.openpublishing.redirection.azure-netapp-files.json",
990991
"articles/azure-relay/.openpublishing.redirection.relay.json",
991992
"articles/communication-services/.openpublishing.redirection.communication-services.json",
993+
"articles/confidential-computing/.openpublishing.redirection.json",
992994
"articles/cosmos-db/.openpublishing.redirection.cosmos-db.json",
993995
"articles/cost-management-billing/.openpublishing.redirection.cost-management-billing.json",
994996
"articles/data-catalog/.openpublishing.redirection.data-catalog.json",
@@ -1016,9 +1018,14 @@
10161018
"articles/mysql/.openpublishing.redirection.mysql.json",
10171019
"articles/container-apps/.openpublishing.redirection.container-apps.json",
10181020
"articles/spring-cloud/.openpublishing.redirection.spring-cloud.json",
1021+
"articles/spring-apps/.openpublishing.redirection.spring-apps.json",
10191022
"articles/load-testing/.openpublishing.redirection.azure-load-testing.json",
10201023
"articles/azure-video-indexer/.openpublishing.redirection.azure-video-indexer.json",
10211024
"articles/machine-learning/.openpublishing.redirection.machine-learning.json",
1022-
"articles/static-web-apps/.openpublishing.redirection.static-web-apps.json"
1025+
"articles/static-web-apps/.openpublishing.redirection.static-web-apps.json",
1026+
".openpublishing.redirection.virtual-desktop.json",
1027+
"articles/applied-ai-services/.openpublishing.redirection.applied-ai-services.json",
1028+
"articles/applied-ai-services/.openpublishing.archived.json",
1029+
"articles/cognitive-services/.openpublishing.redirection.cognitive-services.json"
10231030
]
10241031
}

.openpublishing.redirection.active-directory.json

Lines changed: 25 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,11 @@
5555
"redirect_url": "/azure/active-directory/authentication/how-to-mfa-registration-campaign",
5656
"redirect_document_id": false
5757
},
58+
{
59+
"source_path_from_root": "/articles/active-directory/develop/workload-identity-federation-create-trust-github.md",
60+
"redirect_url": "/azure/active-directory/develop/workload-identity-federation-create-trust",
61+
"redirect_document_id": false
62+
},
5863
{
5964
"source_path_from_root": "/articles/active-directory/develop/active-directory-v2-limitations.md",
6065
"redirect_url": "/azure/active-directory/azuread-dev/azure-ad-endpoint-comparison",
@@ -2033,7 +2038,7 @@
20332038
{
20342039
"source_path_from_root": "/articles/active-directory/conditional-access/conditional-access-for-exo-and-spo.md",
20352040
"redirect_url": "/azure/active-directory/conditional-access/block-legacy-authentication",
2036-
"redirect_document_id": true
2041+
"redirect_document_id": false
20372042
},
20382043
{
20392044
"source_path_from_root": "/articles/active-directory/conditional-access/baseline-protection.md",
@@ -2422,7 +2427,7 @@
24222427
},
24232428
{
24242429
"source_path_from_root": "/articles/active-directory/develop/active-directory-graph-api.md",
2425-
"redirect_url": "https://docs.microsoft.com/graph/migrate-azure-ad-graph-planning-checklist",
2430+
"redirect_url": "/graph/migrate-azure-ad-graph-planning-checklist",
24262431
"redirect_document_id": false
24272432
},
24282433
{
@@ -2795,7 +2800,7 @@
27952800
"redirect_url": "/azure/active-directory/develop/howto-authenticate-service-principal-powershell",
27962801
"redirect_document_id": false
27972802
},
2798-
2803+
27992804
{
28002805
"source_path_from_root": "/articles/active-directory/develop/active-directory-devhowto-multi-tenant-overview.md",
28012806
"redirect_url": "/azure/active-directory/develop/howto-convert-app-to-be-multi-tenant",
@@ -4248,7 +4253,12 @@
42484253
},
42494254
{
42504255
"source_path_from_root": "/articles/active-directory/conditional-access/concept-conditional-access-block-legacy-authentication.md",
4251-
"redirect_url": "/azure/active-directory/fundamentals/concept-fundamentals-block-legacy-authentication",
4256+
"redirect_url": "/azure/active-directory/conditional-access/block-legacy-authentication",
4257+
"redirect_document_id": false
4258+
},
4259+
{
4260+
"source_path_from_root": "/articles/active-directory/fundamentals/concept-fundamentals-block-legacy-authentication.md",
4261+
"redirect_url": "/azure/active-directory/conditional-access/block-legacy-authentication",
42524262
"redirect_document_id": true
42534263
},
42544264
{
@@ -10825,7 +10835,18 @@
1082510835
"source_path": "articles/active-directory/manage-apps/howto-enforce-signed-saml-authentication.md",
1082610836
"redirect_url": "/azure/active-directory/manage-apps/howto-saml-token-encryption",
1082710837
"redirect_document_id": true
10838+
},
10839+
{
10840+
"source_path": "articles/active-directory/manage-apps/recover-deleted-apps-faq.md",
10841+
"redirect_url": "/azure/active-directory/manage-apps/delete-recover-faq",
10842+
"redirect_document_id": false
10843+
},
10844+
{
10845+
"source_path": "articles/azure-percept/voice-control-your-inventory-then-visualize-with-power-bi-dashboard.md",
10846+
"redirect_url": "/azure/azure-percept/index",
10847+
"redirect_document_id": false
1082810848
}
1082910849

10850+
1083010851
]
1083110852
}

.openpublishing.redirection.azure-monitor.json

Lines changed: 99 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -148,27 +148,27 @@
148148
},
149149
{
150150
"source_path_from_root": "/articles/azure-monitor/app/java-2x-troubleshoot.md",
151-
"redirect_url": "https://docs.microsoft.com/troubleshoot/azure/azure-monitor/app-insights/java-2x-troubleshoot",
151+
"redirect_url": "/troubleshoot/azure/azure-monitor/app-insights/java-2x-troubleshoot",
152152
"redirect_document_id": false
153153
},
154154
{
155155
"source_path_from_root": "/articles/azure-monitor/app/status-monitor-v2-troubleshoot.md",
156-
"redirect_url": "https://docs.microsoft.com/troubleshoot/azure/azure-monitor/app-insights/status-monitor-v2-troubleshoot",
156+
"redirect_url": "/troubleshoot/azure/azure-monitor/app-insights/status-monitor-v2-troubleshoot",
157157
"redirect_document_id": false
158158
},
159159
{
160160
"source_path_from_root": "/articles/azure-monitor/app/asp-net-troubleshoot-no-data.md",
161-
"redirect_url": "https://docs.microsoft.com/troubleshoot/azure/azure-monitor/app-insights/asp-net-troubleshoot-no-data",
161+
"redirect_url": "/troubleshoot/azure/azure-monitor/app-insights/asp-net-troubleshoot-no-data",
162162
"redirect_document_id": false
163163
},
164164
{
165165
"source_path_from_root": "/articles/azure-monitor/app/java-standalone-troubleshoot.md",
166-
"redirect_url": "https://docs.microsoft.com/troubleshoot/azure/azure-monitor/app-insights/java-standalone-troubleshoot",
166+
"redirect_url": "/troubleshoot/azure/azure-monitor/app-insights/java-standalone-troubleshoot",
167167
"redirect_document_id": false
168168
},
169169
{
170170
"source_path_from_root": "/articles/azure-monitor/app/troubleshoot-availability.md",
171-
"redirect_url": "https://docs.microsoft.com/troubleshoot/azure/azure-monitor/app-insights/troubleshoot-availability",
171+
"redirect_url": "/troubleshoot/azure/azure-monitor/app-insights/troubleshoot-availability",
172172
"redirect_document_id": false
173173
},
174174
{
@@ -178,7 +178,7 @@
178178
},
179179
{
180180
"source_path_from_root": "/articles/azure-monitor/app/usage-troubleshoot.md",
181-
"redirect_url": "https://docs.microsoft.com/troubleshoot/azure/azure-monitor/app-insights/usage-troubleshoot",
181+
"redirect_url": "/troubleshoot/azure/azure-monitor/app-insights/usage-troubleshoot",
182182
"redirect_document_id": false
183183
},
184184
{
@@ -233,27 +233,27 @@
233233
},
234234
{
235235
"source_path_from_root": "/articles/azure-monitor/visualize/view-designer-conversion-examples.md",
236-
"redirect_url": "/azure/azure-monitor/visualize/workbooks-overview",
236+
"redirect_url": "/azure/azure-monitor/visualize/workbooks-view-designer-conversion-overview",
237237
"redirect_document_id": false
238238
},
239239
{
240240
"source_path_from_root": "/articles/azure-monitor/visualize/view-designer-conversion-options.md",
241-
"redirect_url": "/azure/azure-monitor/visualize/workbooks-overview",
241+
"redirect_url": "/azure/azure-monitor/visualize/workbooks-view-designer-conversion-overview",
242242
"redirect_document_id": false
243243
},
244244
{
245245
"source_path_from_root": "/articles/azure-monitor/visualize/view-designer-conversion-overview.md",
246-
"redirect_url": "/azure/azure-monitor/visualize/workbooks-overview",
246+
"redirect_url": "/azure/azure-monitor/visualize/workbooks-view-designer-conversion-overview",
247247
"redirect_document_id": false
248248
},
249249
{
250250
"source_path_from_root": "/articles/azure-monitor/visualize/view-designer-conversion-tasks.md",
251-
"redirect_url": "/azure/azure-monitor/visualize/workbooks-overview",
251+
"redirect_url": "/azure/azure-monitor/visualize/workbooks-view-designer-conversion-overview",
252252
"redirect_document_id": false
253253
},
254254
{
255255
"source_path_from_root": "/articles/azure-monitor/visualize/view-designer-conversion-tiles.md",
256-
"redirect_url": "/azure/azure-monitor/visualize/workbooks-overview",
256+
"redirect_url": "/azure/azure-monitor/visualize/workbooks-view-designer-conversion-overview",
257257
"redirect_document_id": false
258258
},
259259
{
@@ -268,7 +268,7 @@
268268
},
269269
{
270270
"source_path_from_root": "/articles/azure-monitor/visualize/workbooks-add-text.md",
271-
"redirect_url": "/azure/azure-monitor/visualize/workbooks-add-workbook-elements",
271+
"redirect_url": "/azure/azure-monitor/visualize/workbooks-create-workbook",
272272
"redirect_document_id": false
273273
},
274274
{
@@ -301,14 +301,34 @@
301301
"redirect_url": "/azure/azure-monitor/alerts/alerts-types",
302302
"redirect_document_id": false
303303
},
304+
{
305+
"source_path_from_root": "/articles/azure-monitor/alerts/alerts-page.md" ,
306+
"redirect_url": "/azure/azure-monitor/alerts/alerts-manage-alert-instances",
307+
"redirect_document_id": false
308+
},
304309
{
305310
"source_path_from_root": "/articles/azure-monitor/alerts/alerts-managing-alert-instances.md" ,
306-
"redirect_url": "/azure/azure-monitor/alerts/alerts-page",
311+
"redirect_url": "/azure/azure-monitor/alerts/alerts-manage-alert-instances",
307312
"redirect_document_id": false
308313
},
309314
{
310315
"source_path_from_root": "/articles/azure-monitor/alerts/alerts-managing-alert-states.md" ,
311-
"redirect_url": "/azure/azure-monitor/alerts/alerts-page",
316+
"redirect_url": "/azure/azure-monitor/alerts/alerts-manage-alert-instances",
317+
"redirect_document_id": false
318+
},
319+
{
320+
"source_path_from_root": "/articles/azure-monitor/alerts/alerts-metric.md" ,
321+
"redirect_url": "/azure/azure-monitor/alerts/alerts-create-new-alert-rule",
322+
"redirect_document_id": false
323+
},
324+
{
325+
"source_path_from_root": "/articles/azure-monitor/alerts/alerts-log.md" ,
326+
"redirect_url": "/azure/azure-monitor/alerts/alerts-create-new-alert-rule",
327+
"redirect_document_id": false
328+
},
329+
{
330+
"source_path_from_root": "/articles/azure-monitor/alerts/alerts-activity-log.md" ,
331+
"redirect_url": "/azure/azure-monitor/alerts/alerts-create-new-alert-rule",
312332
"redirect_document_id": false
313333
},
314334
{
@@ -341,11 +361,21 @@
341361
"redirect_url": "/azure/data-explorer/data-explorer-insights",
342362
"redirect_document_id": false
343363
},
364+
{
365+
"source_path_from_root": "/articles/azure-monitor/insights/troubleshoot-workbooks.md" ,
366+
"redirect_url": "/azure/azure-monitor/visualize/workbooks-overview",
367+
"redirect_document_id": false
368+
},
344369
{
345370
"source_path_from_root": "/articles/azure-monitor/vm/vminsights-ga-release-faq.md" ,
346371
"redirect_url": "/azure/azure-monitor/faq#vm-insights",
347372
"redirect_document_id": false
348373
},
374+
{
375+
"source_path_from_root": "/articles/azure-monitor/app/proactive-cloud-services.md" ,
376+
"redirect_url": "/azure/azure-monitor/alerts/alerts-overview",
377+
"redirect_document_id": false
378+
},
349379
{
350380
"source_path_from_root": "/articles/azure-monitor/vm/vminsights-log-search.md" ,
351381
"redirect_url": "/azure/azure-monitor/alerts/vminsights-log-query",
@@ -425,6 +455,61 @@
425455
"source_path_from_root": "/articles/azure-monitor/insights/key-vault-insights-overview.md" ,
426456
"redirect_url": "/azure/key-vault/key-vault-insights-overview",
427457
"redirect_document_id": false
458+
},
459+
{
460+
"source_path_from_root": "/articles/azure-monitor/app/proactive-diagnostics.md" ,
461+
"redirect_url": "/azure/azure-monitor/alerts/proactive-diagnostics",
462+
"redirect_document_id": false
463+
},
464+
{
465+
"source_path_from_root": "/articles/azure-monitor/app/proactive-failure-diagnostics.md" ,
466+
"redirect_url": "/azure/azure-monitor/alerts/proactive-failure-diagnostics",
467+
"redirect_document_id": false
468+
},
469+
{
470+
"source_path_from_root": "/articles/azure-monitor/app/proactive-performance-diagnostics.md" ,
471+
"redirect_url": "/azure/azure-monitor/alerts/proactive-performance-diagnostics",
472+
"redirect_document_id": false
473+
},
474+
{
475+
"source_path_from_root": "/articles/azure-monitor/app/proactive-trace-severity.md" ,
476+
"redirect_url": "/azure/azure-monitor/alerts/proactive-trace-severity",
477+
"redirect_document_id": false
478+
},
479+
{
480+
"source_path_from_root": "/articles/azure-monitor/app/proactive-exception-volume.md" ,
481+
"redirect_url": "/azure/azure-monitor/alerts/proactive-exception-volume",
482+
"redirect_document_id": false
483+
},
484+
{
485+
"source_path_from_root": "/articles/azure-monitor/app/proactive-potential-memory-leak.md" ,
486+
"redirect_url": "/azure/azure-monitor/alerts/proactive-potential-memory-leak",
487+
"redirect_document_id": false
488+
},
489+
{
490+
"source_path_from_root": "/articles/azure-monitor/app/proactive-application-security-detection-pack.md" ,
491+
"redirect_url": "/azure/azure-monitor/alerts/proactive-application-security-detection-pack",
492+
"redirect_document_id": false
493+
},
494+
{
495+
"source_path_from_root": "/articles/azure-monitor/app/proactive-arm-config.md" ,
496+
"redirect_url": "/azure/azure-monitor/alerts/proactive-arm-config",
497+
"redirect_document_id": false
498+
},
499+
{
500+
"source_path_from_root": "/articles/azure-monitor/app/proactive-email-notification.md" ,
501+
"redirect_url": "/azure/azure-monitor/alerts/proactive-email-notification",
502+
"redirect_document_id": false
503+
},
504+
{
505+
"source_path_from_root": "/articles/azure-monitor/app/cloudservices.md" ,
506+
"redirect_url": "/azure/azure-monitor/app/azure-web-apps-net-core",
507+
"redirect_document_id": false
508+
},
509+
{
510+
"source_path_from_root": "/articles/azure-monitor/logs/workspace-design-service-providers.md" ,
511+
"redirect_url": "/azure/azure-monitor/logs/workspace-design",
512+
"redirect_document_id": false
428513
}
429514
]
430515
}

.openpublishing.redirection.azure-percept.json

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,28 @@
44
"source_path_from_root": "/articles/azure-percept/how-to-select-update-package.md",
55
"redirect_url": "/azure/azure-percept/how-to-determine-your-update-strategy",
66
"redirect_document_id": false
7+
},
8+
{
9+
"source_path_from_root": "/articles/azure-percept/deepstream/azure-percept-for-deepstream-overview.md",
10+
"redirect_url": "/azure/azure-percept/index",
11+
"redirect_document_id": false
12+
},
13+
{
14+
"source_path_from_root": "/articles/azure-percept/hci/azure-percept-on-azure-stack-hci-overview.md",
15+
"redirect_url": "/azure/azure-percept/index",
16+
"redirect_document_id": false
17+
},
18+
{
19+
"source_path_from_root": "/articles/azure-percept/studio/azure-percept-studio-overview.md",
20+
"redirect_url": "/azure/azure-percept/index",
21+
"redirect_document_id": false
22+
},
23+
{
24+
"source_path_from_root": "/articles/azure-percept/open-source/azure-percept-open-source-project-overview.md",
25+
"redirect_url": "/azure/azure-percept/index",
26+
"redirect_document_id": false
727
}
28+
829
]
930
}
31+

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
{
22
"redirections": [
3+
{
4+
"source_path_from_root": "/articles/defender-for-iot/organizations/resources-frequently-asked-questions.md",
5+
"redirect_url": "/azure/defender-for-iot/organizations/faqs-general",
6+
"redirect_document_id": false
7+
},
38
{
49
"source_path_from_root": "/articles/defender-for-iot/organizations/appliance-catalog/appliance-catalog-overview.md",
510
"redirect_url": "/azure/defender-for-iot/organizations/appliance-catalog/index",

0 commit comments

Comments
 (0)