Skip to content

Commit 656daf9

Browse files
jonburcheljonburchel
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into 2022-06-22-add-troubleshooting-displayname-hints
2 parents 9cf78b9 + 295ddb2 commit 656daf9

File tree

4,195 files changed

+52349
-34478
lines changed

Some content is hidden

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

4,195 files changed

+52349
-34478
lines changed

‎.openpublishing.publish.config.json

Lines changed: 6 additions & 3 deletions
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
{
@@ -473,7 +473,7 @@
473473
{
474474
"path_to_root": "azureml-examples-online-endpoint-vnet",
475475
"url": "https://github.com/azure/azureml-examples",
476-
"branch": "rsethur/mvnet",
476+
"branch": "main",
477477
"branch_mapping": {}
478478
},
479479
{
@@ -948,13 +948,15 @@
948948
},
949949
"redirection_files": [
950950
".openpublishing.redirection.json",
951+
".openpublishing.redirection.azure-arc-data.json",
951952
".openpublishing.redirection.active-directory.json",
952953
".openpublishing.redirection.azure-blob.json",
953954
"articles/data-factory/.openpublishing.redirection.data-factory.json",
954955
".openpublishing.redirection.defender-for-cloud.json",
955956
".openpublishing.redirection.defender-for-iot.json",
956957
".openpublishing.redirection.healthcare-apis.json",
957958
".openpublishing.redirection.iot-hub.json",
959+
".openpublishing.redirection.app-service.json",
958960
".openpublishing.redirection.key-vault.json",
959961
".openpublishing.redirection.sql-database.json",
960962
".openpublishing.redirection.security-benchmark.json",
@@ -997,6 +999,7 @@
997999
"articles/spring-cloud/.openpublishing.redirection.spring-cloud.json",
9981000
"articles/load-testing/.openpublishing.redirection.azure-load-testing.json",
9991001
"articles/azure-video-indexer/.openpublishing.redirection.azure-video-indexer.json",
1000-
"articles/machine-learning/.openpublishing.redirection.machine-learning.json"
1002+
"articles/machine-learning/.openpublishing.redirection.machine-learning.json",
1003+
"articles/static-web-apps/.openpublishing.redirection.static-web-apps.json"
10011004
]
10021005
}

‎.openpublishing.redirection.active-directory.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8787,13 +8787,13 @@
87878787
},
87888788
{
87898789
"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",
8790+
"redirect_url": "/azure/active-directory",
87918791
"redirect_document_id": false
87928792
},
87938793
{
87948794
"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
8795+
"redirect_url": "/azure/active-directory",
8796+
"redirect_document_id": false
87978797
},
87988798
{
87998799
"source_path_from_root": "/articles/active-directory/active-directory-saas-linkedinlearning-tutorial.md",

‎.openpublishing.redirection.app-service.json

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
{
2+
"redirections": [
3+
{
4+
"source_path_from_root": "/articles/app-service-web/web-sites-restore.md",
5+
"redirect_url": "/azure/app-service/manage-backup",
6+
"redirect_document_id": false
7+
},
8+
{
9+
"source_path_from_root": "/articles/app-service/web-sites-restore.md",
10+
"redirect_url": "/azure/app-service/manage-backup",
11+
"redirect_document_id": false
12+
},
13+
{
14+
"source_path_from_root": "/articles/app-service/app-service-web-restore-snapshots.md",
15+
"redirect_url": "/azure/app-service/manage-backup",
16+
"redirect_document_id": false
17+
}
18+
]
19+
}

‎.openpublishing.redirection.azure-arc-data.json

Lines changed: 169 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,169 @@
1+
{
2+
"redirections": [
3+
{
4+
"source_path_from_root": "/articles/azure-arc/data/deploy-byok-active-directory-connector.md",
5+
"redirect_url": "/azure/azure-arc/data/deploy-customer-managed-keytab-active-directory-connector",
6+
"redirect_document_id": false
7+
},
8+
{
9+
"source_path_from_root": "/articles/azure-arc/data/reference/reference-az-sql-mi-arc-dag.md",
10+
"redirect_url": "/cli/azure/sql/instance-failover-group-arc",
11+
"redirect_document_id":false
12+
},
13+
{
14+
"source_path_from_root": "/articles/azure-arc/data/retrieve-the-username-password-for-data-controller.md",
15+
"redirect_url": "/azure/azure-arc/data/update-service-principal-credentials",
16+
"redirect_document_id": false
17+
},
18+
{
19+
"source_path_from_root": "/articles/azure-arc/data/create-aks-cluster-data-controller.md",
20+
"redirect_url": "/azure/azure-arc/data/create-complete-managed-instance-indirectly-connected",
21+
"redirect_document_id": false
22+
},
23+
{
24+
"source_path_from_root": "/articles/azure-arc/data/how-to-apply-security-context-constraint.md",
25+
"redirect_url": "/azure/azure-arc/data",
26+
"redirect_document_id": false
27+
},
28+
{
29+
"source_path_from_root": "/articles/azure-arc/data/deploy-data-controller-direct-mode-prerequisites.md",
30+
"redirect_url": "/azure/azure-arc/data/create-data-controller-direct-cli",
31+
"redirect_document_id": false
32+
},
33+
{
34+
"source_path_from_root": "/articles/azure-arc/data/deploy-data-controller-direct-mode.md",
35+
"redirect_url": "/azure/azure-arc/data/create-data-controller-direct-cli",
36+
"redirect_document_id": false
37+
},
38+
{
39+
"source_path_from_root": "/articles/azure-arc/data/create-data-controller.md",
40+
"redirect_url": "/azure/azure-arc/data/plan-azure-arc-data-services",
41+
"redirect_document_id": false
42+
},
43+
{
44+
"source_path_from_root": "/articles/azure-arc/data/create-data-controller-azure-data-studio.md",
45+
"redirect_url": "/azure/azure-arc/data/create-data-controller-indirect-azure-data-studio",
46+
"redirect_document_id": false
47+
},
48+
{
49+
"source_path_from_root": "/articles/azure-arc/data/data-controller-resource-in-azure-portal.md",
50+
"redirect_url": "/azure/azure-arc/data/create-data-controller-indirect-azure-portal",
51+
"redirect_document_id": false
52+
},
53+
{
54+
"source_path_from_root": "/articles/azure-arc/data/create-data-controller-using-cli.md",
55+
"redirect_url": "/azure/azure-arc/data/create-data-controller-indirect-cli",
56+
"redirect_document_id": false
57+
},
58+
{
59+
"source_path_from_root": "/articles/azure-arc/data/create-data-controller-using-azdata.md",
60+
"redirect_url": "/azure/azure-arc/data/create-data-controller-using-cli",
61+
"redirect_document_id": false
62+
},
63+
{
64+
"source_path_from_root": "/articles/azure-arc/data/scale-out-postgresql-hyperscale-server-group.md",
65+
"redirect_url": "/azure/azure-arc/data/scale-out-in-postgresql-hyperscale-server-group",
66+
"redirect_document_id": false
67+
},
68+
{
69+
"source_path_from_root": "/articles/azure-arc/data/known-issues.md",
70+
"redirect_url": "/azure/azure-arc/data/release-notes",
71+
"redirect_document_id": false
72+
},
73+
{
74+
"source_path_from_root": "/articles/azure-arc/data/reference/overview.md",
75+
"redirect_url": "/azure/azure-arc/data/reference/reference-az-arcdata",
76+
"redirect_document_id": false
77+
},
78+
{
79+
"source_path_from_root": "/articles/azure-arc/data/create-data-controller-using-k8s-native-tools.md",
80+
"redirect_url": "/azure/azure-arc/data/create-data-controller-using-kubernetes-native-tools",
81+
"redirect_document_id": false
82+
},
83+
{
84+
"source_path_from_root": "/articles/azure-arc/data/create-postgresql-hyperscale-server-group-k8s-native-tools.md",
85+
"redirect_url": "/azure/azure-arc/data/create-postgresql-hyperscale-server-group-kubernetes-native-tools",
86+
"redirect_document_id": false
87+
},
88+
{
89+
"source_path_from_root": "/articles/azure-arc/data/create-sql-managed-instance-using-k8s-native-tools.md",
90+
"redirect_url": "/azure/azure-arc/data/create-sql-managed-instance-using-kubernetes-native-tools",
91+
"redirect_document_id": false
92+
},
93+
{
94+
"source_path_from_root": "/articles/azure-arc/data/reference/reference-az-arcdata.md",
95+
"redirect_url": "/cli/azure/arcdata",
96+
"redirect_document_id": false
97+
},
98+
{
99+
"source_path_from_root": "/articles/azure-arc/data/reference/reference-az-arcdata-ad-connector.md",
100+
"redirect_url": "/cli/azure/arcdata",
101+
"redirect_document_id": false
102+
},
103+
{
104+
"source_path_from_root": "/articles/azure-arc/data/reference/reference-az-arcdata-dc.md",
105+
"redirect_url": "/cli/azure/arcdata/dc",
106+
"redirect_document_id": false
107+
},
108+
{
109+
"source_path_from_root": "/articles/azure-arc/data/reference/reference-az-arcdata-dc-config.md",
110+
"redirect_url": "/cli/azure/arcdata/dc/config",
111+
"redirect_document_id": false
112+
},
113+
{
114+
"source_path_from_root": "/articles/azure-arc/data/reference/reference-az-arcdata-dc-debug.md",
115+
"redirect_url": "/cli/azure/arcdata/dc/debug",
116+
"redirect_document_id": false
117+
},
118+
{
119+
"source_path_from_root": "/articles/azure-arc/data/reference/reference-az-arcdata-dc-endpoint.md",
120+
"redirect_url": "/cli/azure/arcdata/dc/debug",
121+
"redirect_document_id": false
122+
},
123+
{
124+
"source_path_from_root": "/articles/azure-arc/data/reference/reference-az-arcdata-dc-status.md",
125+
"redirect_url": "/cli/azure/arcdata/dc/status",
126+
"redirect_document_id": false
127+
},
128+
{
129+
"source_path_from_root": "/articles/azure-arc/data/reference/reference-az-arcdata-resource-kind.md",
130+
"redirect_url": "/cli/azure/arcdata/resource-kind",
131+
"redirect_document_id": false
132+
},
133+
{
134+
"source_path_from_root": "/articles/azure-arc/data/reference/reference-az-postgres-arc-server.md",
135+
"redirect_url": "/cli/azure/postgres/arc-server",
136+
"redirect_document_id": false
137+
},
138+
{
139+
"source_path_from_root": "/articles/azure-arc/data/reference/reference-az-postgres-arc-server-endpoint.md",
140+
"redirect_url": "/cli/azure/postgres/arc-server/endpoint",
141+
"redirect_document_id": false
142+
},
143+
{
144+
"source_path_from_root": "/articles/azure-arc/data/reference/reference-az-sql-instance-failover-group-arc.md",
145+
"redirect_url": "/cli/azure/sql/instance-failover-group-arc",
146+
"redirect_document_id": false
147+
},
148+
{
149+
"source_path_from_root": "/articles/azure-arc/data/reference/reference-az-sql-mi-arc.md",
150+
"redirect_url": "/cli/azure/sql/mi-arc",
151+
"redirect_document_id": false
152+
},
153+
{
154+
"source_path_from_root": "/articles/azure-arc/data/reference/reference-az-sql-mi-arc-config.md",
155+
"redirect_url": "/cli/azure/sql/mi-arc/config",
156+
"redirect_document_id": false
157+
},
158+
{
159+
"source_path_from_root": "/articles/azure-arc/data/reference/reference-az-sql-mi-arc-endpoint.md",
160+
"redirect_url": "/cli/azure/sql/mi-arc/endpoint",
161+
"redirect_document_id": false
162+
},
163+
{
164+
"source_path_from_root": "/articles/azure-arc/data/reference/reference-az-sql-midb-arc.md",
165+
"redirect_url": "/cli/azure/sql/midb-arc",
166+
"redirect_document_id": false
167+
}
168+
]
169+
}

‎.openpublishing.redirection.azure-monitor.json

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -141,11 +141,46 @@
141141
"redirect_url": "https://docs.microsoft.com/troubleshoot/azure/azure-monitor/app-insights/troubleshoot-portal-connectivity",
142142
"redirect_document_id": false
143143
},
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",
167+
"redirect_document_id": false
168+
},
144169
{
145170
"source_path_from_root": "/articles/azure-monitor/app/auto-instrumentation-troubleshoot.md",
146171
"redirect_url": "https://docs.microsoft.com/troubleshoot/azure/azure-monitor/app-insights/auto-instrumentation-troubleshoot",
147172
"redirect_document_id": false
148173
},
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",
182+
"redirect_document_id": false
183+
},
149184
{
150185
"source_path_from_root": "/articles/azure-monitor/app/change-analysis-troubleshoot.md",
151186
"redirect_url": "/azure/azure-monitor/change/change-analysis-troubleshoot",
@@ -176,6 +211,21 @@
176211
"redirect_url": "/azure/azure-monitor/agents/data-sources-custom-logs",
177212
"redirect_document_id": false
178213
},
214+
{
215+
"source_path_from_root": "/articles/azure-monitor/visualize/workbooks-access-control.md",
216+
"redirect_url": "/azure/azure-monitor/visualize/workbooks-overview",
217+
"redirect_document_id": false
218+
},
219+
{
220+
"source_path_from_root": "/articles/azure-monitor/visualize/workbooks-add-text.md",
221+
"redirect_url": "/azure/azure-monitor/visualize/workbooks-add-workbook-elements",
222+
"redirect_document_id": false
223+
},
224+
{
225+
"source_path_from_root": "/articles/azure-monitor/visualize/workbooks-combine-data.md",
226+
"redirect_url": "/azure/azure-monitor/visualize/workbooks-data-sources",
227+
"redirect_document_id": false
228+
},
179229
{
180230
"source_path_from_root": "/articles/azure-monitor/alerts/itsmc-service-manager-script.md",
181231
"redirect_url": "/azure/azure-monitor/alerts/itsmc-connections",

‎.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",

0 commit comments

Comments
 (0)