Skip to content

Commit f954747

Browse files
authored
Merge branch 'main' into Az-VM
2 parents 32f4a4f + 70c4ac5 commit f954747

File tree

10,188 files changed

+148305
-190785
lines changed

Some content is hidden

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

10,188 files changed

+148305
-190785
lines changed

.openpublishing.publish.config.json

Lines changed: 26 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,7 @@
88
"locale": "en-us",
99
"monikers": [],
1010
"moniker_ranges": [],
11-
"xref_query_tags": [
12-
"/dotnet",
13-
"/python"
14-
],
11+
"xref_query_tags": ["/dotnet", "/python"],
1512
"open_to_public_contributors": true,
1613
"type_mapping": {
1714
"ZonePivotGroups": "Toc",
@@ -26,12 +23,8 @@
2623
"version": 0
2724
}
2825
],
29-
"notification_subscribers": [
30-
31-
],
32-
"sync_notification_subscribers": [
33-
34-
],
26+
"notification_subscribers": ["[email protected]"],
27+
"sync_notification_subscribers": ["[email protected]"],
3528
"branches_to_filter": [],
3629
"git_repository_url_open_to_public_contributors": "https://github.com/MicrosoftDocs/azure-docs",
3730
"git_repository_branch_open_to_public_contributors": "main",
@@ -249,6 +242,12 @@
249242
"branch": "main",
250243
"branch_mapping": {}
251244
},
245+
{
246+
"path_to_root": "azure-functions-kafka-extension",
247+
"url": "https://github.com/Azure/azure-functions-kafka-extension",
248+
"branch": "dev",
249+
"branch_mapping": {}
250+
},
252251
{
253252
"path_to_root": "azure-functions-python-worker-extension",
254253
"url": "https://github.com/Azure-Samples/python-worker-extension-timer",
@@ -813,12 +812,24 @@
813812
"branch": "master",
814813
"branch_mapping": {}
815814
},
815+
{
816+
"path_to_root": "ms-identity-b2c-javascript-spa",
817+
"url": "https://github.com/Azure-Samples/ms-identity-b2c-javascript-spa",
818+
"branch": "main",
819+
"branch_mapping": {}
820+
},
816821
{
817822
"path_to_root": "ms-identity-dotnetcore-b2c-account-management",
818823
"url": "https://github.com/Azure-Samples/ms-identity-dotnetcore-b2c-account-management",
819824
"branch": "master",
820825
"branch_mapping": {}
821826
},
827+
{
828+
"path_to_root": "ms-identity-javascript-v2",
829+
"url": "https://github.com/Azure-Samples/ms-identity-javascript-v2",
830+
"branch": "master",
831+
"branch_mapping": {}
832+
},
822833
{
823834
"path_to_root": "msdocs-python-flask-webapp-quickstart",
824835
"url": "https://github.com/Azure-Samples/msdocs-python-flask-webapp-quickstart",
@@ -870,14 +881,8 @@
870881

871882
],
872883
"branch_target_mapping": {
873-
"live": [
874-
"Publish",
875-
"PDF"
876-
],
877-
"main": [
878-
"Publish",
879-
"PDF"
880-
]
884+
"live": ["Publish", "PDF"],
885+
"main": ["Publish", "PDF"]
881886
},
882887
"need_generate_pdf_url_template": true,
883888
"targets": {
@@ -892,15 +897,14 @@
892897
".openpublishing.redirection.json",
893898
".openpublishing.redirection.active-directory.json",
894899
".openpublishing.redirection.azure-blob.json",
895-
".openpublishing.redirection.azure-sql.json",
896900
"articles/data-factory/.openpublishing.redirection.data-factory.json",
897901
".openpublishing.redirection.defender-for-cloud.json",
898902
".openpublishing.redirection.defender-for-iot.json",
899903
".openpublishing.redirection.healthcare-apis.json",
900904
".openpublishing.redirection.iot-hub.json",
901905
".openpublishing.redirection.key-vault.json",
902-
".openpublishing.redirection.security-benchmark.json",
903906
".openpublishing.redirection.sql-database.json",
907+
".openpublishing.redirection.security-benchmark.json",
904908
"articles/synapse-analytics/.openpublishing.redirection.synapse-analytics.json",
905909
".openpublishing.redirection.azure-web-pubsub.json",
906910
".openpublishing.redirection.azure-monitor.json",
@@ -937,6 +941,7 @@
937941
"articles/mysql/.openpublishing.redirection.mysql.json",
938942
"articles/container-apps/.openpublishing.redirection.container-apps.json",
939943
"articles/spring-cloud/.openpublishing.redirection.spring-cloud.json",
940-
"articles/load-testing/.openpublishing.redirection.azure-load-testing.json"
944+
"articles/load-testing/.openpublishing.redirection.azure-load-testing.json",
945+
"articles/azure-video-indexer/.openpublishing.redirection.azure-video-indexer.json"
941946
]
942947
}

.openpublishing.redirection.active-directory.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/active-directory/manage-apps/my-apps-deployment-plan.md",
5+
"redirect_url": "/azure/active-directory/manage-apps/myapps-overview",
6+
"redirect_document_id": false
7+
},
38
{
49
"source_path_from_root": "/articles/active-directory/authentication/cloud-native-certificate-based-authentication-faq.yml",
510
"redirect_url": "/azure/active-directory/authentication/certificate-based-authentication-faq",

.openpublishing.redirection.azure-monitor.json

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,11 @@
55
"redirect_url": "/azure/azure-monitor/app/overview-dashboard",
66
"redirect_document_id": false
77
},
8+
{
9+
"source_path_from_root": "/articles/azure-monitor/essentials/activity-logs-insights.md",
10+
"redirect_url": "/azure/azure-monitor/essentials/activity-log",
11+
"redirect_document_id": false
12+
},
813
{
914
"source_path_from_root": "/articles/application-insights/app-insights-performance-counters.md",
1015
"redirect_url": "/azure/azure-monitor/app/performance-counters",
@@ -30,6 +35,11 @@
3035
"redirect_url": "/azure/azure-monitor/change/change-analysis-visualizations",
3136
"redirect_document_id": false
3237
},
38+
{
39+
"source_path_from_root": "/articles/azure-monitor/azure-monitor-app-hub.yml",
40+
"redirect_url": "/azure/azure-monitor/",
41+
"redirect_document_id": false
42+
},
3343
{
3444
"source_path_from_root": "/articles/azure-monitor/app/troubleshoot-portal-connectivity.md",
3545
"redirect_url": "https://docs.microsoft.com/troubleshoot/azure/azure-monitor/app-insights/troubleshoot-portal-connectivity",
@@ -55,10 +65,25 @@
5565
"redirect_url": "/azure/azure-monitor/logs/cost-logs",
5666
"redirect_document_id": false
5767
},
68+
{
69+
"source_path_from_root": "/articles/azure-monitor/app/apm-tables.md",
70+
"redirect_url": "/azure/azure-monitor/app/convert-classic-resource#workspace-based-resource-changes",
71+
"redirect_document_id": false
72+
},
5873
{
5974
"source_path_from_root": "/articles/azure-monitor/logs/data-ingestion-from-file.md",
6075
"redirect_url": "/azure/azure-monitor/agents/data-sources-custom-logs",
6176
"redirect_document_id": false
77+
},
78+
{
79+
"source_path_from_root": "/articles/azure-monitor/alerts/itsmc-service-manager-script.md",
80+
"redirect_url": "/azure/azure-monitor/alerts/itsmc-connections.md",
81+
"redirect_document_id": false
82+
},
83+
{
84+
"source_path_from_root": "/articles/azure-monitor/alerts/itsmc-connections-scsm.md" ,
85+
"redirect_url": "/azure/azure-monitor/alerts/itsmc-connections.md",
86+
"redirect_document_id": false
6287
}
6388
]
6489
}

.openpublishing.redirection.azure-productivity.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"redirections": [
33
{
44
"source_path_from_root": "/articles/lab-services/classroom-labs-overview.md",
5-
"redirect_url": "/azure/lab-services/get-started-manage-labs",
5+
"redirect_url": "/azure/lab-services/lab-services-overview",
66
"redirect_document_id": false
77
},
88
{

.openpublishing.redirection.azure-sql.json

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

0 commit comments

Comments
 (0)