Skip to content

Commit bda362a

Browse files
authored
Merge branch 'main' into edit
2 parents a97ef76 + 780b65c commit bda362a

File tree

3,236 files changed

+39654
-24993
lines changed

Some content is hidden

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

3,236 files changed

+39654
-24993
lines changed

.openpublishing.publish.config.json

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -164,6 +164,12 @@
164164
"branch": "dev",
165165
"branch_mapping": {}
166166
},
167+
{
168+
"path_to_root": "functions-quickstart-templates-v1",
169+
"url": "https://github.com/Azure/azure-functions-templates",
170+
"branch": "v1.x",
171+
"branch_mapping": {}
172+
},
167173
{
168174
"path_to_root": "azure-functions-samples-java",
169175
"url": "https://github.com/Azure-Samples/azure-functions-samples-java",
@@ -849,9 +855,15 @@
849855
"branch_mapping": {}
850856
},
851857
{
852-
"path_to_root": "azure-cosmos-dotnet-v3",
853-
"url": "https://github.com/Azure-Samples/cosmos-db-sql-api-dotnet-samples",
854-
"branch": "v3",
858+
"path_to_root": "cosmos-db-nosql-dotnet-samples",
859+
"url": "https://github.com/azure-samples/cosmos-db-nosql-dotnet-samples",
860+
"branch": "main",
861+
"branch_mapping": {}
862+
},
863+
{
864+
"path_to_root": "cosmos-db-nosql-python-samples",
865+
"url": "https://github.com/azure-samples/cosmos-db-nosql-python-samples",
866+
"branch": "main",
855867
"branch_mapping": {}
856868
},
857869
{
@@ -908,6 +920,7 @@
908920
".openpublishing.redirection.azure-percept.json",
909921
".openpublishing.redirection.azure-productivity.json",
910922
".openpublishing.redirection.azure-australia.json",
923+
".openpublishing.redirection.iot-hub-device-update.json",
911924
"articles/azure-fluid-relay/.openpublishing.redirection.fluid-relay.json",
912925
"articles/azure-netapp-files/.openpublishing.redirection.azure-netapp-files.json",
913926
"articles/azure-relay/.openpublishing.redirection.relay.json",

.openpublishing.redirection.active-directory.json

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3433,17 +3433,17 @@
34333433
},
34343434
{
34353435
"source_path_from_root": "/articles/active-directory/develop/active-directory-permissions.md",
3436-
"redirect_url": "/azure/active-directory/develop/v2-permissions-and-consent",
3436+
"redirect_url": "/azure/active-directory/develop/permissions-consent-overview",
34373437
"redirect_document_id": false
34383438
},
34393439
{
34403440
"source_path_from_root": "/articles/active-directory/develop/active-directory-v2-scopes.md",
3441-
"redirect_url": "/azure/active-directory/develop/v2-permissions-and-consent",
3441+
"redirect_url": "/azure/active-directory/develop/permissions-consent-overview",
34423442
"redirect_document_id": false
34433443
},
34443444
{
34453445
"source_path_from_root": "/articles/active-directory/develop/v1-permissions-and-consent.md",
3446-
"redirect_url": "/azure/active-directory/develop/v2-permissions-and-consent",
3446+
"redirect_url": "/azure/active-directory/develop/permissions-consent-overview",
34473447
"redirect_document_id": false
34483448
},
34493449
{
@@ -5536,6 +5536,21 @@
55365536
"redirect_url": "/azure/active-directory/app-proxy/application-proxy-add-on-premises-application",
55375537
"redirect_document_id": true
55385538
},
5539+
{
5540+
"source_path_from_root": "/articles/active-directory/develop/consent-framework.md",
5541+
"redirect_url": "/azure/active-directory/develop/application-consent-experience",
5542+
"redirect_document_id": false
5543+
},
5544+
{
5545+
"source_path_from_root": "/articles/active-directory/develop/v2-permissions-and-consent.md",
5546+
"redirect_url": "/azure/active-directory/develop/permissions-consent-overview",
5547+
"redirect_document_id": false
5548+
},
5549+
{
5550+
"source_path_from_root": "/articles/active-directory/manage-apps/consent-and-permissions-overview.md",
5551+
"redirect_url": "/azure/active-directory/manage-apps/user-admin-consent-overview",
5552+
"redirect_document_id": false
5553+
},
55395554
{
55405555
"source_path_from_root": "/articles/active-directory/manage-apps/application-proxy-enable.md",
55415556
"redirect_url": "/azure/active-directory/app-proxy/application-proxy-add-on-premises-application",

.openpublishing.redirection.azure-monitor.json

Lines changed: 42 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -278,12 +278,27 @@
278278
},
279279
{
280280
"source_path_from_root": "/articles/azure-monitor/alerts/itsmc-service-manager-script.md",
281-
"redirect_url": "/azure/azure-monitor/alerts/itsmc-connections",
281+
"redirect_url": "/azure/azure-monitor/alerts/itsmc-overview",
282+
"redirect_document_id": false
283+
},
284+
{
285+
"source_path_from_root": "/articles/azure-monitor/alerts/itsmc-connections.md",
286+
"redirect_url": "/azure/azure-monitor/alerts/itsmc-overview",
287+
"redirect_document_id": false
288+
},
289+
{
290+
"source_path_from_root": "/articles/azure-monitor/alerts/itsmc-connections-cherwell.md",
291+
"redirect_url": "/azure/azure-monitor/alerts/itsmc-overview",
292+
"redirect_document_id": false
293+
},
294+
{
295+
"source_path_from_root": "/articles/azure-monitor/alerts/itsmc-connections-provance.md",
296+
"redirect_url": "/azure/azure-monitor/alerts/itsmc-overview",
282297
"redirect_document_id": false
283298
},
284299
{
285300
"source_path_from_root": "/articles/azure-monitor/alerts/itsmc-connections-scsm.md" ,
286-
"redirect_url": "/azure/azure-monitor/alerts/itsmc-connections",
301+
"redirect_url": "/azure/azure-monitor/alerts/itsmc-overview",
287302
"redirect_document_id": false
288303
},
289304
{
@@ -2908,13 +2923,13 @@
29082923
},
29092924
{
29102925
"source_path_from_root": "/articles/log-analytics/log-analytics-itsmc-connections.md",
2911-
"redirect_url": "/azure/azure-monitor/platform/itsmc-connections",
2926+
"redirect_url": "/azure/azure-monitor/platform/itsmc-overview",
29122927
"redirect_document_id": true
29132928
},
29142929
{
29152930
"source_path_from_root": "/articles/log-analytics/log-analytics-itsmc-overview.md",
29162931
"redirect_url": "/azure/azure-monitor/platform/itsmc-overview",
2917-
"redirect_document_id": true
2932+
"redirect_document_id": false
29182933
},
29192934
{
29202935
"source_path_from_root": "/articles/log-analytics/log-analytics-itsmc-service-manager-script.md",
@@ -3571,6 +3586,12 @@
35713586
"redirect_url": "/azure/service-health/alerts-activity-log-service-notifications",
35723587
"redirect_document_id": false
35733588
},
3589+
{
3590+
"source_path_from_root": "/articles/azure-monitor/logs/azure-data-explorer-monitor-proxy.md",
3591+
"redirect_url": "/azure/data-explorer/query-monitor-data",
3592+
"redirect_document_id": false
3593+
},
3594+
35743595
{
35753596
"source_path_from_root": "/articles/azure-monitor/platform/service-notifications.md",
35763597
"redirect_url": "/azure/service-health/service-notifications",
@@ -5108,17 +5129,17 @@
51085129
},
51095130
{
51105131
"source_path_from_root": "/articles/azure-monitor/platform/itsmc-connections-cherwell.md",
5111-
"redirect_url": "/azure/azure-monitor/alerts/itsmc-connections-cherwell",
5132+
"redirect_url": "/azure/azure-monitor/alerts/itsmc-overview",
51125133
"redirect_document_id": false
51135134
},
51145135
{
51155136
"source_path_from_root": "/articles/azure-monitor/platform/itsmc-connections-provance.md",
5116-
"redirect_url": "/azure/azure-monitor/alerts/itsmc-connections-provance",
5137+
"redirect_url": "/azure/azure-monitor/alerts/itsmc-overview",
51175138
"redirect_document_id": false
51185139
},
51195140
{
51205141
"source_path_from_root": "/articles/azure-monitor/platform/itsmc-connections-scsm.md",
5121-
"redirect_url": "/azure/azure-monitor/alerts/itsmc-connections-scsm",
5142+
"redirect_url": "/azure/azure-monitor/alerts/itsmc-overview",
51225143
"redirect_document_id": false
51235144
},
51245145
{
@@ -5465,30 +5486,36 @@
54655486
"source_path_from_root": "/articles/azure-monitor/containers/container-insights-update-metrics.md",
54665487
"redirect_url": "/azure/azure-monitor/containers/container-insights-custom-metrics",
54675488
"redirect_document_id": false
5468-
}
5469-
,
5489+
},
54705490
{
54715491
"source_path_from_root": "/articles/automation/migrate-oms-update-deployments.md",
54725492
"redirect_url": "/azure/azure-monitor/terminology#april-2018---retirement-of-operations-management-suite-brand",
54735493
"redirect_document_id": false
5474-
}
5475-
,
5494+
},
54765495
{
54775496
"source_path_from_root": "/articles/azure-monitor/autoscale/autoscale-virtual-machine-scale-sets.md",
54785497
"redirect_url": "/azure/virtual-machine-scale-sets/tutorial-autoscale-template",
54795498
"redirect_document_id": false
5480-
}
5481-
,
5499+
},
54825500
{
54835501
"source_path_from_root": "/articles/azure-monitor/alerts/alerts-common-schema-integrations.md",
54845502
"redirect_url": "/azure/azure-monitor/alerts/alerts-logic-apps",
54855503
"redirect_document_id": false
5486-
}
5487-
,
5504+
},
54885505
{
54895506
"source_path_from_root": "/articles/azure-monitor/alerts/action-groups-logic-app.md",
54905507
"redirect_url": "/azure/azure-monitor/alerts/alerts-logic-apps",
54915508
"redirect_document_id": false
5509+
},
5510+
{
5511+
"source_path_from_root": "/articles/azure-monitor/containers/container-insights-prometheus-metrics-addon.md",
5512+
"redirect_url": "/azure/azure-monitor/essentials/prometheus-metrics-enable",
5513+
"redirect_document_id": false
5514+
},
5515+
{
5516+
"source_path_from_root": "/articles/azure-monitor/containers/container-insights-prometheus-monitoring-addon.md",
5517+
"redirect_url": "/azure/azure-monitor/containers/container-insights-prometheus",
5518+
"redirect_document_id": false
54925519
}
54935520
]
54945521
}

.openpublishing.redirection.azure-productivity.json

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,11 @@
2929
"source_path_from_root": "/articles/devtest-labs/scripts/set-allowed-vm-sizes-in-lab.md",
3030
"redirect_url": "/azure/devtest-labs/samples-powershell",
3131
"redirect_document_id": false
32-
}
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+
}
3338
]
3439
}

.openpublishing.redirection.communication-services.json

Lines changed: 0 additions & 9 deletions
This file was deleted.
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/iot-hub-device-update/migration-pp-to-ppr.md",
5+
"redirect_url": "/azure/iot-hub-device-update/migration-public-preview-refresh-to-ga",
6+
"redirect_document_id": true
7+
}
8+
]
9+
}

.openpublishing.redirection.json

Lines changed: 30 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,11 @@
99
"source_path_from_root": "/articles/api-management/developer-portal-use-community-widgets.md",
1010
"redirect_url": "/azure/api-management/developer-portal-extend-custom-functionality",
1111
"redirect_document_id": false
12+
},
13+
{
14+
"source_path": "articles/sentinel/whats-new-archive.md",
15+
"redirect_url": "/azure/sentinel/whats-new",
16+
"redirect_document_id": false
1217
},
1318
{
1419
"source_path": "articles/backup/sap-hana-db-manage.md",
@@ -125,6 +130,11 @@
125130
"redirect_url": "/azure/aks/monitor-aks",
126131
"redirect_document_id": false
127132
},
133+
{
134+
"source_path_from_root": "/articles/aks/workload-identity-migration-sidecar.md",
135+
"redirect_url": "/azure/aks/workload-identity-migrate-from-pod-identity",
136+
"redirect_document_id": false
137+
},
128138
{
129139
"source_path": "articles/api-management/zone-redundancy.md",
130140
"redirect_url": "/azure/availability-zones/migrate-api-mgt",
@@ -768,6 +778,11 @@
768778
"redirect_url": "/azure/frontdoor/create-front-door-cli",
769779
"redirect_document_id": false
770780
},
781+
{
782+
"source_path_from_root": "/articles/frontdoor/standard-premium/how-to-create-origin.md",
783+
"redirect_url": "/azure/frontdoor/how-to-configure-origin",
784+
"redirect_document_id": false
785+
},
771786
{
772787
"source_path_from_root": "/articles/aks/aks-resource-health.md",
773788
"redirect_url": "/troubleshoot/azure/azure-kubernetes/welcome-azure-kubernetes",
@@ -788,6 +803,16 @@
788803
"redirect_url": "/troubleshoot/azure/azure-kubernetes/welcome-azure-kubernetes",
789804
"redirect_document_id": false
790805
},
806+
{
807+
"source_path_from_root": "/articles/aks/dapr-troubleshooting.md",
808+
"redirect_url": "/troubleshoot/azure/azure-kubernetes/welcome-azure-kubernetes",
809+
"redirect_document_id": false
810+
},
811+
{
812+
"source_path_from_root": "/articles/aks/csi-secrets-store-troubleshooting.md",
813+
"redirect_url": "/troubleshoot/azure/azure-kubernetes/welcome-azure-kubernetes",
814+
"redirect_document_id": false
815+
},
791816
{
792817
"source_path_from_root": "/articles/cdn/index.yml",
793818
"redirect_url": "/azure/frontdoor",
@@ -6418,11 +6443,6 @@
64186443
"redirect_url": "/azure/storage/blobs/storage-encrypt-decrypt-blobs-key-vault",
64196444
"redirect_document_id": false
64206445
},
6421-
{
6422-
"source_path_from_root": "/articles/storage/blobs/storage-encrypt-decrypt-blobs-key-vault.md",
6423-
"redirect_url": "/azure/storage/blobs/client-side-encryption",
6424-
"redirect_document_id": false
6425-
},
64266446
{
64276447
"source_path_from_root": "/articles/storage/blobs/Storage-blob-performance-tiers.md",
64286448
"redirect_url": "/azure/storage/common/storage-account-overview",
@@ -29358,6 +29378,11 @@
2935829378
"source_path_from_root": "/articles/virtual-network/ip-services/create-custom-ip-address-prefix-ipv6.md",
2935929379
"redirect_url": "/azure/virtual-network/ip-services/create-custom-ip-address-prefix-ipv6-powershell",
2936029380
"redirect_document_id": false
29381+
},
29382+
{
29383+
"source_path_from_root": "/articles/cloud-shell/example-terraform-bash.md",
29384+
"redirect_url": "/azure/developer/terraform/quickstart-configure",
29385+
"redirect_document_id": false
2936129386
}
2936229387
]
2936329388
}
Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
11
{
2-
"$schema": "https://whatsnewapi.azurewebsites.net/schema",
3-
"docSetProductName": "Azure Active Directory application management",
4-
"rootDirectory": "articles/active-directory/manage-apps/",
5-
"docLinkSettings": {
6-
"linkFormat": "relative",
7-
"relativeLinkPrefix": "/azure/active-directory/manage-apps"
8-
},
9-
"inclusionCriteria": {
10-
"excludePullRequestTitles": true,
11-
"minAdditionsToFile" : 10,
12-
"maxFilesChanged": 50,
13-
"labels": [
14-
"label:active-directory/svc",
15-
"label:app-mgmt/subsvc"
16-
]
17-
},
18-
"areas": [
19-
{
20-
"name": ".",
21-
"heading": "Azure Active Directory application management"
22-
}
23-
]
24-
}
2+
"$schema": "https://whatsnewapi.azurewebsites.net/schema",
3+
"docSetProductName": "Azure Active Directory application management",
4+
"rootDirectory": "articles/active-directory/manage-apps/",
5+
"docLinkSettings": {
6+
"linkFormat": "relative",
7+
"relativeLinkPrefix": "/azure/active-directory/manage-apps"
8+
},
9+
"inclusionCriteria": {
10+
"omitPullRequestTitles": true,
11+
"minAdditionsToFile": 10,
12+
"maxFilesChanged": 50,
13+
"labels": [
14+
"label:active-directory/svc",
15+
"label:app-mgmt/subsvc"
16+
]
17+
},
18+
"areas": [
19+
{
20+
"name": ".",
21+
"heading": "Azure Active Directory application management"
22+
}
23+
]
24+
}

articles/active-directory-b2c/TOC.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -249,9 +249,8 @@
249249
- name: Authentication options
250250
href: enable-authentication-in-node-web-app-with-api-options.md
251251
- name: Secure access to Web API (ASP.NET Core and Node.js)
252-
displayName: REST API
253-
- name: Enable authentication in your web API
254252
href: enable-authentication-web-api.md
253+
displayName: REST API
255254
- name: Secure API Management API
256255
href: secure-api-management.md
257256
displayName: api, api management, migrate, b2clogin.com

articles/active-directory-b2c/api-connector-samples.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ author: kengaderdus
66
manager: CelesteDG
77

88
ms.author: kengaderdus
9-
ms.date: 07/16/2021
9+
ms.date: 11/03/2022
1010
ms.custom: mvc
1111
ms.topic: sample
1212
ms.service: active-directory

0 commit comments

Comments
 (0)