Skip to content

Commit 400e025

Browse files
authored
Merge branch 'main' into default-tenat-size
2 parents cd6df81 + a44a3bb commit 400e025

File tree

11,980 files changed

+178591
-98343
lines changed

Some content is hidden

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

11,980 files changed

+178591
-98343
lines changed

.openpublishing.publish.config.json

Lines changed: 37 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,12 @@
152152
"branch": "master",
153153
"branch_mapping": {}
154154
},
155+
{
156+
"path_to_root": "functions-azure-product",
157+
"url": "https://github.com/Azure/Azure-Functions",
158+
"branch": "main",
159+
"branch_mapping": {}
160+
},
155161
{
156162
"path_to_root": "functions-pytorch",
157163
"url": "https://github.com/Azure-Samples/functions-python-pytorch-tutorial",
@@ -164,6 +170,12 @@
164170
"branch": "dev",
165171
"branch_mapping": {}
166172
},
173+
{
174+
"path_to_root": "functions-quickstart-templates-v1",
175+
"url": "https://github.com/Azure/azure-functions-templates",
176+
"branch": "v1.x",
177+
"branch_mapping": {}
178+
},
167179
{
168180
"path_to_root": "azure-functions-samples-java",
169181
"url": "https://github.com/Azure-Samples/azure-functions-samples-java",
@@ -212,6 +224,12 @@
212224
"branch": "main",
213225
"branch_mapping": {}
214226
},
227+
{
228+
"path_to_root": "azure-functions-durable-js",
229+
"url": "https://github.com/Azure/azure-functions-durable-js",
230+
"branch": "main",
231+
"branch_mapping": {}
232+
},
215233
{
216234
"path_to_root": "azure-functions-kafka-extension",
217235
"url": "https://github.com/Azure/azure-functions-kafka-extension",
@@ -849,9 +867,15 @@
849867
"branch_mapping": {}
850868
},
851869
{
852-
"path_to_root": "azure-cosmos-dotnet-v3",
853-
"url": "https://github.com/Azure-Samples/cosmos-db-sql-api-dotnet-samples",
854-
"branch": "v3",
870+
"path_to_root": "cosmos-db-nosql-dotnet-samples",
871+
"url": "https://github.com/azure-samples/cosmos-db-nosql-dotnet-samples",
872+
"branch": "main",
873+
"branch_mapping": {}
874+
},
875+
{
876+
"path_to_root": "cosmos-db-nosql-python-samples",
877+
"url": "https://github.com/azure-samples/cosmos-db-nosql-python-samples",
878+
"branch": "main",
855879
"branch_mapping": {}
856880
},
857881
{
@@ -871,6 +895,12 @@
871895
"url": "https://github.com/MicrosoftDocs/reusable-content",
872896
"branch": "main",
873897
"branch_mapping": {}
898+
},
899+
{
900+
"path_to_root": "azure-cosmos-db-mongodb-python-getting-started",
901+
"url": "https://github.com/Azure-Samples/azure-cosmos-db-mongodb-python-getting-started",
902+
"branch": "main",
903+
"branch_mapping": {}
874904
}
875905
],
876906
"branch_target_mapping": {
@@ -926,6 +956,7 @@
926956
"articles/iot-accelerators/.openpublishing.redirection.iot-accelerators.json",
927957
"articles/iot-develop/.openpublishing.redirection.iot-develop.json",
928958
"articles/iot-edge/.openpublishing.redirection.iot-edge.json",
959+
"articles/iot-fundamentals/.openpublishing.redirection.iot-fundamentals.json",
929960
"articles/mariadb/.openpublishing.redirection.mariadb.json",
930961
"articles/marketplace/.openpublishing.redirection.marketplace.json",
931962
"articles/mysql/.openpublishing.redirection.mysql.json",
@@ -952,6 +983,8 @@
952983
"articles/applied-ai-services/.openpublishing.redirection.applied-ai-old.json",
953984
"articles/cognitive-services/.openpublishing.redirection.cognitive-services.json",
954985
".openpublishing.redirection.baremetal-infrastructure.json",
955-
"articles/iot-dps/.openpublishing.redirection.iot-dps.json"
986+
"articles/iot-dps/.openpublishing.redirection.iot-dps.json",
987+
"articles/cloud-shell/.openpublishing.redirection.cloud-shell.json",
988+
".openpublishing.redirection.azure-vmware.json"
956989
]
957990
}

.openpublishing.redirection.active-directory.json

Lines changed: 23 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,26 @@
4545
"redirect_url": "/azure/active-directory/saas-apps/tutorial-list",
4646
"redirect_document_id": false
4747
},
48+
{
49+
"source_path_from_root": "/articles/active-directory/saas-apps/iauditor-tutorial.md",
50+
"redirect_url": "/azure/active-directory/saas-apps/safety-culture-tutorial",
51+
"redirect_document_id": false
52+
},
53+
{
54+
"source_path_from_root": "/articles/active-directory/saas-apps/icertisicm-tutorial.md",
55+
"redirect_url": "/azure/active-directory/saas-apps/tutorial-list",
56+
"redirect_document_id": false
57+
},
4858
{
4959
"source_path_from_root": "/articles/active-directory/governance/tutorial-onboard-custom-workflow-graph.md",
5060
"redirect_url": "/graph/tutorial-lifecycle-workflows-onboard-custom-workflow",
5161
"redirect_document_id": false
5262
},
63+
{
64+
"source_path_from_root": "/articles/active-directory/governance/lifecycle-workflows-developer-reference.md",
65+
"redirect_url": "/graph/api/resources/identitygovernance-workflow",
66+
"redirect_document_id": false
67+
},
5368
{
5469
"source_path_from_root": "/articles/active-directory/governance/tutorial-offboard-custom-workflow-graph.md",
5570
"redirect_url": "/graph/tutorial-lifecycle-workflows-offboard-custom-workflow",
@@ -112,7 +127,7 @@
112127
},
113128
{
114129
"source_path_from_root": "/articles/active-directory/develop/active-directory-v2-limitations.md",
115-
"redirect_url": "/azure/active-directory/azuread-dev/azure-ad-endpoint-comparison",
130+
"redirect_url": "/azure/active-directory/develop/v2-overview",
116131
"redirect_document_id": false
117132
},
118133
{
@@ -1897,7 +1912,7 @@
18971912
},
18981913
{
18991914
"source_path_from_root": "/articles/active-directory/develop/azure-ad-endpoint-comparison.md",
1900-
"redirect_url": "/azure/active-directory/azuread-dev/azure-ad-endpoint-comparison",
1915+
"redirect_url": "/azure/active-directory/develop/v2-overview",
19011916
"redirect_document_id": false
19021917
},
19031918
{
@@ -10911,6 +10926,11 @@
1091110926
"redirect_url": "/azure/azure-percept/index",
1091210927
"redirect_document_id": false
1091310928
},
10929+
{
10930+
"source_path_from_root": "/articles/active-directory/reports-monitoring/howto-install-use-log-analytics-views.md",
10931+
"redirect_url": "/azure/azure-monitor/visualize/workbooks-view-designer-conversion-overview",
10932+
"redirect_document_id": false
10933+
},
1091410934
{
1091510935
"source_path_from_root": "/articles/active-directory/fundamentals/active-directory-groups-create-azure-portal.md",
1091610936
"redirect_url": "/azure/active-directory/fundamentals/how-to-manage-groups",
@@ -10948,7 +10968,7 @@
1094810968
},
1094910969
{
1095010970
"source_path_from_root": "/articles/active-directory/fundamentals/keep-me-signed-in.md",
10951-
"redirect_url": "/azure/active-directory/fundamentals/customize-branding",
10971+
"redirect_url": "/azure/active-directory/fundamentals/active-directory-users-profile-azure-portal",
1095210972
"redirect_document_id": false
1095310973
},
1095410974
{
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/high-performance-compute/index.yml",
5+
"redirect_url": "/articles/high-performance-computing",
6+
"redirect_document_id": false
7+
}
8+
]
9+
}

.openpublishing.redirection.azure-monitor.json

Lines changed: 75 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5516,6 +5516,81 @@
55165516
"source_path_from_root": "/articles/azure-monitor/containers/container-insights-prometheus-monitoring-addon.md",
55175517
"redirect_url": "/azure/azure-monitor/containers/container-insights-prometheus",
55185518
"redirect_document_id": false
5519+
},
5520+
{
5521+
"source_path_from_root": "/articles/azure-monitor/app/powershell-azure-diagnostics.md",
5522+
"redirect_url": "/azure/azure-monitor/agents/diagnostics-extension-to-application-insights",
5523+
"redirect_document_id": false
5524+
},
5525+
{
5526+
"source_path_from_root": "/articles/azure-monitor/app/platforms.md",
5527+
"redirect_url": "/azure/azure-monitor/app/app-insights-overview",
5528+
"redirect_document_id": false
5529+
},
5530+
{
5531+
"source_path_from_root": "/articles/azure-monitor/app/export-data-model.md",
5532+
"redirect_url": "/azure/azure-monitor/app/export-telemetry",
5533+
"redirect_document_id": false
5534+
},
5535+
{
5536+
"source_path_from_root": "/articles/azure-monitor/app/auto-collect-dependencies.md",
5537+
"redirect_url": "/azure/azure-monitor/app/asp-net-dependencies",
5538+
"redirect_document_id": false
5539+
},
5540+
{
5541+
"source_path_from_root": "/articles/azure-monitor/app/custom-endpoints.md",
5542+
"redirect_url": "/azure/azure-monitor/app/create-new-resource",
5543+
"redirect_document_id": false
5544+
},
5545+
{
5546+
"source_path_from_root": "/articles/azure-monitor/logs/api/authentication-authorization.md",
5547+
"redirect_url": "/azure/azure-monitor/logs/api/access-api",
5548+
"redirect_document_id": false
5549+
},
5550+
{
5551+
"source_path_from_root": "/articles/azure-monitor/app/java-2x-get-started.md",
5552+
"redirect_url": "/azure/azure-monitor/app/deprecated-java-2x",
5553+
"redirect_document_id": false
5554+
},
5555+
{
5556+
"source_path_from_root": "/articles/azure-monitor/app/java-2x-trace-logs.md",
5557+
"redirect_url": "/azure/azure-monitor/app/deprecated-java-2x",
5558+
"redirect_document_id": false
5559+
},
5560+
{
5561+
"source_path_from_root": "/articles/azure-monitor/app/java-2x-agent.md",
5562+
"redirect_url": "/azure/azure-monitor/app/deprecated-java-2x",
5563+
"redirect_document_id": false
5564+
},
5565+
{
5566+
"source_path_from_root": "/articles/azure-monitor/app/java-2x-filter-telemetry.md",
5567+
"redirect_url": "/azure/azure-monitor/app/deprecated-java-2x",
5568+
"redirect_document_id": false
5569+
},
5570+
{
5571+
"source_path_from_root": "/articles/azure-monitor/app/java-2x-collectd.md",
5572+
"redirect_url": "/azure/azure-monitor/app/deprecated-java-2x",
5573+
"redirect_document_id": false
5574+
},
5575+
{
5576+
"source_path_from_root": "/articles/azure-monitor/app/java-2x-micrometer.md",
5577+
"redirect_url": "/azure/azure-monitor/app/deprecated-java-2x",
5578+
"redirect_document_id": false
5579+
},
5580+
{
5581+
"source_path_from_root": "/articles/azure-monitor/vm/tutorial-monitor-vm-alert.md",
5582+
"redirect_url": "/azure/azure-monitor/vm/tutorial-monitor-vm-alert-availability",
5583+
"redirect_document_id": false
5584+
},
5585+
{
5586+
"source_path_from_root": "/articles/azure-monitor/vm/tutorial-monitor-vm-enable.md",
5587+
"redirect_url": "/azure/azure-monitor/vm/tutorial-monitor-vm-enable-insights",
5588+
"redirect_document_id": false
5589+
},
5590+
{
5591+
"source_path_from_root": "/articles/azure-monitor/logs/collect-sccm.md",
5592+
"redirect_url": "/mem/configmgr/core/plan-design/changes/deprecated/removed-and-deprecated-cmfeatures",
5593+
"redirect_document_id": false
55195594
}
55205595
]
55215596
}
Lines changed: 88 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,89 @@
11
{
2-
"redirections": [
3-
{
4-
"source_path_from_root": "/articles/lab-services/classroom-labs-overview.md",
5-
"redirect_url": "/azure/lab-services/lab-services-overview",
6-
"redirect_document_id": false
7-
},
8-
{
9-
"source_path_from_root": "/articles/devtest-labs/scripts/add-external-user-to-lab.md",
10-
"redirect_url": "/azure/devtest-labs/samples-powershell",
11-
"redirect_document_id": false
12-
},
13-
{
14-
"source_path_from_root": "/articles/devtest-labs/scripts/add-marketplace-images-to-lab.md",
15-
"redirect_url": "/azure/devtest-labs/samples-powershell",
16-
"redirect_document_id": false
17-
},
18-
{
19-
"source_path_from_root": "/articles/devtest-labs/scripts/create-custom-image-from-vhd.md",
20-
"redirect_url": "/azure/devtest-labs/samples-powershell",
21-
"redirect_document_id": false
22-
},
23-
{
24-
"source_path_from_root": "/articles/devtest-labs/scripts/create-custom-role-in-lab.md",
25-
"redirect_url": "/azure/devtest-labs/samples-powershell",
26-
"redirect_document_id": false
27-
},
28-
{
29-
"source_path_from_root": "/articles/devtest-labs/scripts/set-allowed-vm-sizes-in-lab.md",
30-
"redirect_url": "/azure/devtest-labs/samples-powershell",
31-
"redirect_document_id": false
32-
}
33-
]
34-
}
2+
"redirections": [
3+
{
4+
"source_path_from_root": "/articles/lab-services/classroom-labs-overview.md",
5+
"redirect_url": "/azure/lab-services/lab-services-overview",
6+
"redirect_document_id": false
7+
},
8+
{
9+
"source_path_from_root": "/articles/devtest-labs/scripts/add-external-user-to-lab.md",
10+
"redirect_url": "/azure/devtest-labs/samples-powershell",
11+
"redirect_document_id": false
12+
},
13+
{
14+
"source_path_from_root": "/articles/devtest-labs/scripts/add-marketplace-images-to-lab.md",
15+
"redirect_url": "/azure/devtest-labs/samples-powershell",
16+
"redirect_document_id": false
17+
},
18+
{
19+
"source_path_from_root": "/articles/devtest-labs/scripts/create-custom-image-from-vhd.md",
20+
"redirect_url": "/azure/devtest-labs/samples-powershell",
21+
"redirect_document_id": false
22+
},
23+
{
24+
"source_path_from_root": "/articles/devtest-labs/scripts/create-custom-role-in-lab.md",
25+
"redirect_url": "/azure/devtest-labs/samples-powershell",
26+
"redirect_document_id": false
27+
},
28+
{
29+
"source_path_from_root": "/articles/devtest-labs/scripts/set-allowed-vm-sizes-in-lab.md",
30+
"redirect_url": "/azure/devtest-labs/samples-powershell",
31+
"redirect_document_id": false
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+
},
38+
{
39+
"source_path": "articles/lab-services/how-to-create-schedules-within-teams.md",
40+
"redirect_url": "/azure/lab-services/how-to-manage-labs-within-teams",
41+
"redirect_document_id": false
42+
},
43+
{
44+
"source_path": "articles/lab-services/how-to-delete-lab-within-teams.md",
45+
"redirect_url": "/azure/lab-services/how-to-manage-labs-within-teams",
46+
"redirect_document_id": false
47+
},
48+
{
49+
"source_path": "articles/lab-services/how-to-manage-user-lists-within-teams.md",
50+
"redirect_url": "/azure/lab-services/how-to-manage-labs-within-teams",
51+
"redirect_document_id": false
52+
},
53+
{
54+
"source_path": "articles/lab-services/how-to-manage-vm-pool-within-teams.md",
55+
"redirect_url": "/azure/lab-services/how-to-manage-labs-within-teams",
56+
"redirect_document_id": false
57+
},
58+
{
59+
"source_path": "articles/lab-services/how-to-get-started-create-lab-within-teams.md",
60+
"redirect_url": "/azure/lab-services/how-to-configure-teams-for-lab-plans",
61+
"redirect_document_id": true
62+
},
63+
{
64+
"source_path": "articles/lab-services/how-to-get-started-create-lab-within-canvas.md",
65+
"redirect_url": "/azure/lab-services/how-to-configure-canvas-for-lab-plans",
66+
"redirect_document_id": true
67+
},
68+
{
69+
"source_path": "articles/lab-services/how-to-create-schedules-within-canvas.md",
70+
"redirect_url": "/azure/lab-services/how-to-manage-labs-within-canvas",
71+
"redirect_document_id": false
72+
},
73+
{
74+
"source_path": "articles/lab-services/how-to-delete-lab-within-canvas.md",
75+
"redirect_url": "/azure/lab-services/how-to-manage-labs-within-canvas",
76+
"redirect_document_id": false
77+
},
78+
{
79+
"source_path": "articles/lab-services/how-to-manage-user-lists-within-canvas.md",
80+
"redirect_url": "/azure/lab-services/how-to-manage-labs-within-canvas",
81+
"redirect_document_id": false
82+
},
83+
{
84+
"source_path": "articles/lab-services/how-to-manage-vm-pool-within-canvas.md",
85+
"redirect_url": "/azure/lab-services/how-to-manage-labs-within-canvas",
86+
"redirect_document_id": false
87+
}
88+
]
89+
}
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/azure-vmware/send-logs-to-log-analytics.md",
5+
"redirect_url": "/azure/azure-vmware/configure-vmware-syslogs",
6+
"redirect_document_id": false
7+
}
8+
]
9+
}

.openpublishing.redirection.communication-services.json

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

0 commit comments

Comments
 (0)