Skip to content

Commit 92df5b7

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into lb-qs-cli
2 parents 8d1be41 + 837800a commit 92df5b7

File tree

2,646 files changed

+25044
-16195
lines changed

Some content is hidden

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

2,646 files changed

+25044
-16195
lines changed

.openpublishing.publish.config.json

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -528,7 +528,7 @@
528528
{
529529
"path_to_root": "azure-sdk-for-go-samples",
530530
"url": "https://github.com/Azure-Samples/azure-sdk-for-go-samples",
531-
"branch": "master",
531+
"branch": "main",
532532
"branch_mapping": {}
533533
},
534534
{
@@ -830,6 +830,18 @@
830830
"url": "https://github.com/Azure-Samples/msdocs-nodejs-mongodb-azure-sample-app",
831831
"branch": "main",
832832
"branch_mapping": {}
833+
},
834+
{
835+
"path_to_root": "msdocs-django-postgresql-sample-app",
836+
"url": "https://github.com/Azure-Samples/msdocs-django-postgresql-sample-app",
837+
"branch": "main",
838+
"branch_mapping": {}
839+
},
840+
{
841+
"path_to_root": "msdocs-flask-postgresql-sample-app",
842+
"url": "https://github.com/Azure-Samples/msdocs-flask-postgresql-sample-app",
843+
"branch": "main",
844+
"branch_mapping": {}
833845
}
834846
],
835847
"branch_target_mapping": {
@@ -899,6 +911,7 @@
899911
"articles/virtual-machine-scale-sets/.openpublishing.redirection.virtual-machine-scale-sets.json",
900912
"articles/mysql/.openpublishing.redirection.mysql.json",
901913
"articles/container-apps/.openpublishing.redirection.container-apps.json",
902-
"articles/spring-cloud/.openpublishing.redirection.spring-cloud.json"
914+
"articles/spring-cloud/.openpublishing.redirection.spring-cloud.json",
915+
"articles/load-testing/.openpublishing.redirection.azure-load-testing.json"
903916
]
904917
}

.openpublishing.redirection.azure-monitor.json

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,22 @@
2424
"source_path_from_root": "/articles/azure-monitor/agents/data-collection-rule-overview.md",
2525
"redirect_url": "/azure/azure-monitor/essentials/data-collection-rule-overview",
2626
"redirect_document_id": false
27+
},
28+
{
29+
"source_path_from_root": "/articles/azure-monitor/app/change-analysis.md",
30+
"redirect_url": "/azure/azure-monitor/change/change-analysis",
31+
"redirect_document_id": false
32+
},
33+
{
34+
"source_path_from_root": "/articles/azure-monitor/app/change-analysis-visualizations.md",
35+
"redirect_url": "/azure/azure-monitor/change/change-analysis-visualizations",
36+
"redirect_document_id": false
37+
},
38+
{
39+
"source_path_from_root": "/articles/azure-monitor/app/change-analysis-troubleshoot.md",
40+
"redirect_url": "/azure/azure-monitor/change/change-analysis-troubleshoot",
41+
"redirect_document_id": false
2742
}
43+
2844
]
2945
}

.openpublishing.redirection.defender-for-cloud.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
},
6363
{
6464
"source_path_from_root": "/articles/defender-for-cloud/supported-machines-endpoint-solutions-clouds.md",
65-
"redirect_url": "/articles/defender-for-cloud/supported-machines-endpoint-solutions-clouds-containers",
65+
"redirect_url": "/azure/defender-for-cloud/supported-machines-endpoint-solutions-clouds-containers",
6666
"redirect_document_id": false
6767
},
6868
{

.openpublishing.redirection.json

Lines changed: 103 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -5982,7 +5982,7 @@
59825982
"source_path_from_root": "/articles/azure-functions/functions-test-a-function.md",
59835983
"redirect_url": "/azure/azure-functions/supported-languages",
59845984
"redirect_document_id": false
5985-
},
5985+
},
59865986
{
59875987
"source_path_from_root": "/articles/azure-app-configuration/quickstart-azure-function-csharp.md",
59885988
"redirect_url": "/azure/azure-app-configuration/quickstart-azure-functions-csharp",
@@ -7787,7 +7787,7 @@
77877787
"source_path_from_root": "/articles/cognitive-services/LUIS/luis-tutorial-review-endpoint-utterances.md",
77887788
"redirect_url": "/azure/cognitive-services/LUIS/how-to/improve-application",
77897789
"redirect_document_id": false
7790-
},
7790+
},
77917791
{
77927792
"source_path_from_root": "/articles/cognitive-services/LUIS/luis-concept-enterprise.md",
77937793
"redirect_url": "/azure/cognitive-services/LUIS/how-to/improve-application",
@@ -12088,7 +12088,6 @@
1208812088
"redirect_url": "/azure/azure-signalr/signalr-tutorial-authenticate-azure-functions",
1208912089
"redirect_document_id": true
1209012090
},
12091-
1209212091
{
1209312092
"source_path_from_root": "/articles/cognitive-services/form-recognizer/build-training-data-set.md",
1209412093
"redirect_url": "/azure/applied-ai-services/form-recognizer/build-training-data-set",
@@ -14669,7 +14668,7 @@
1466914668
"redirect_url": "/azure/data-explorer/manage-cluster-vertical-scaling",
1467014669
"redirect_document_id": false
1467114670
},
14672-
{
14671+
{
1467314672
"source_path_from_root": "/articles/postgresql/howto-manage-firewall-using-cli.md",
1467414673
"redirect_url": "/azure/postgresql/quickstart-create-server-database-azure-cli#configure-a-server-based-firewall-rule",
1467514674
"redirect_document_id": true
@@ -14969,6 +14968,11 @@
1496914968
"redirect_url": "/azure/defender-for-iot/organizations/tutorial-qradar",
1497014969
"redirect_document_id": false
1497114970
},
14971+
{
14972+
"source_path_from_root": "/articles/iot-edge/how-to-devops-starter.md",
14973+
"redirect_url": "/azure/iot-edge/how-to-continuous-integration-continuous-deployment-classic/",
14974+
"redirect_document_id": false
14975+
},
1497214976
{
1497314977
"source_path_from_root": "/articles/ansible/index.yml",
1497414978
"redirect_url": "/azure/developer/ansible/",
@@ -15188,7 +15192,7 @@
1518815192
"source_path_from_root": "/articles/defender-for-iot/device-builders/quickstart-azure-rtos-security-module.md",
1518915193
"redirect_url": "/azure/defender-for-iot/device-builders/how-to-quickstart-azure-rtos-security-module",
1519015194
"redirect_document_id": false
15191-
},
15195+
},
1519215196
{
1519315197
"source_path_from_root": "/articles/defender-for-iot/organizations/integration-cisco-ise-pxgrid.md",
1519415198
"redirect_url": "/azure/defender-for-iot/organizations/integration-forescout",
@@ -17733,7 +17737,7 @@
1773317737
"source_path_from_root": "/articles/lab-services/class-type-ethical-hacking-virtualbox.md",
1773417738
"redirect_url": "/azure/lab-services/class-types",
1773517739
"redirect_document_id": false
17736-
},
17740+
},
1773717741
{
1773817742
"source_path_from_root": "/articles/lab-services/classroom-labs/class-type-jupyter-notebook.md",
1773917743
"redirect_url": "/azure/lab-services/class-type-jupyter-notebook",
@@ -25209,6 +25213,11 @@
2520925213
"redirect_url": "/azure/azure-sql/managed-instance/scripts/create-configure-managed-instance-cli",
2521025214
"redirect_document_id": false
2521125215
},
25216+
{
25217+
"source_path_from_root": "/articles/azure-sql/managed-instance/azure-app-sync-network-configuration.md",
25218+
"redirect_url": "/azure/azure-sql/managed-instance/",
25219+
"redirect_document_id": false
25220+
},
2521225221
{
2521325222
"source_path_from_root": "/articles/sql-database/scripts/sql-database-copy-database-to-new-server-cli.md",
2521425223
"redirect_url": "/azure/azure-sql/database/scripts/copy-database-to-new-server-cli",
@@ -26038,12 +26047,12 @@
2603826047
"source_path_from_root": "/articles/storage/blobs/storage-quickstart-blobs-javascript-client-libraries-legacy.md",
2603926048
"redirect_url": "/azure/storage/blobs/quickstart-blobs-javascript-browser",
2604026049
"redirect_document_id": false
26041-
},
26050+
},
2604226051
{
2604326052
"source_path_from_root": "/articles/storage/blobs/storage-quickstart-blobs-nodejs-legacy.md",
2604426053
"redirect_url": "/azure/storage/blobs/storage-quickstart-blobs-nodejs",
2604526054
"redirect_document_id": false
26046-
},
26055+
},
2604726056
{
2604826057
"source_path_from_root": "/articles/storage/blobs/storage-quickstart-blobs-nodejs-v10.md",
2604926058
"redirect_url": "/azure/storage/blobs/storage-quickstart-blobs-nodejs",
@@ -33299,7 +33308,7 @@
3329933308
"redirect_url": "https://azure.microsoft.com/services/cognitive-services/",
3330033309
"redirect_document_id": false
3330133310
},
33302-
{
33311+
{
3330333312
"source_path_from_root": "/articles/machine-learning/studio/whats-new.md",
3330433313
"redirect_url": "https://azure.microsoft.com/updates/?product=machine-learning-studio",
3330533314
"redirect_document_id": false
@@ -43955,34 +43964,94 @@
4395543964
"redirect_document_id": false
4395643965
},
4395743966
{
43958-
"source_path_from_root": "/articles/azure/virtual-desktop/azure-advisor.md",
43959-
"redirect_url": "/azure/advisor/advisor-overview",
43960-
"redirect_document_id": false
43967+
"source_path_from_root": "/articles/azure/virtual-desktop/azure-advisor.md",
43968+
"redirect_url": "/azure/advisor/advisor-overview",
43969+
"redirect_document_id": false
4396143970
},
4396243971
{
4396343972
"source_path_from_root": "/articles/azure/cognitive-services/translator/tutorial-wpf-translation-csharp.md",
4396443973
"redirect_url": "/ai-builder/flow-text-translation?toc=/azure/cognitive-services/translator/toc.json&bc=/azure/cognitive-services/translator/breadcrumb/toc.json",
4396543974
"redirect_document_id": false
43966-
},
43967-
{
43968-
"source_path_from_root": "/articles/azure/cognitive-services/translator/tutorial-build-flask-app-translation-synthesis.md",
43969-
"redirect_url": "/learn/modules/translate-text-with-translator-service?toc=/azure/cognitive-services/translator/toc.json&bc=/azure/cognitive-services/translator/breadcrumb/toc.json",
43970-
"redirect_document_id": false
43971-
},
43972-
{
43973-
"source_path": "articles/machine-learning/classic/deploy-with-resource-manager-template.md",
43974-
"redirect_url": "/previous-versions/azure/machine-learning/classic/deploy-with-resource-manager-template",
43975-
"redirect_document_id": false
43976-
},
43977-
{
43978-
"source_path_from_root": "/articles/governance/policy/how-to/guest-configuration-create-group-policy.md",
43979-
"redirect_url": "/azure/governance/policy/how-to/guest-configuration-create",
43980-
"redirect_document_id": false
43981-
},
43982-
{
43983-
"source_path_from_root": "/articles/virtual-desktop/compare-virtual-desktop-windows-365.md",
43984-
"redirect_url": "/azure/virtual-desktop/overview",
43985-
"redirect_document_id": false
43986-
}
43975+
},
43976+
{
43977+
"source_path_from_root": "/articles/azure/cognitive-services/translator/tutorial-build-flask-app-translation-synthesis.md",
43978+
"redirect_url": "/learn/modules/translate-text-with-translator-service?toc=/azure/cognitive-services/translator/toc.json&bc=/azure/cognitive-services/translator/breadcrumb/toc.json",
43979+
"redirect_document_id": false
43980+
},
43981+
{
43982+
"source_path": "articles/machine-learning/classic/deploy-with-resource-manager-template.md",
43983+
"redirect_url": "/previous-versions/azure/machine-learning/classic/deploy-with-resource-manager-template",
43984+
"redirect_document_id": false
43985+
},
43986+
{
43987+
"source_path_from_root": "/articles/governance/policy/how-to/guest-configuration-create-group-policy.md",
43988+
"redirect_url": "/azure/governance/policy/how-to/guest-configuration-create",
43989+
"redirect_document_id": false
43990+
},
43991+
{
43992+
"source_path_from_root": "/articles/virtual-desktop/compare-virtual-desktop-windows-365.md",
43993+
"redirect_url": "/azure/virtual-desktop/overview",
43994+
"redirect_document_id": false
43995+
},
43996+
{
43997+
"source_path_from_root": "/articles/governance/blueprints/samples/cis-azure-1-1-0.md",
43998+
"redirect_url": "/azure/governance/policy/samples/cis-azure-1-1-0",
43999+
"redirect_document_id": false
44000+
},
44001+
{
44002+
"source_path_from_root": "/articles/governance/blueprints/samples/cis-azure-1-3-0.md",
44003+
"redirect_url": "/azure/governance/policy/samples/cis-azure-1-3-0",
44004+
"redirect_document_id": false
44005+
},
44006+
{
44007+
"source_path_from_root": "/articles/governance/blueprints/samples/cmmc-l3.md",
44008+
"redirect_url": "/azure/governance/policy/samples/cmmc-l3",
44009+
"redirect_document_id": false
44010+
},
44011+
{
44012+
"source_path_from_root": "/articles/governance/blueprints/samples/hipaa-hitrust-9-2.md",
44013+
"redirect_url": "/azure/governance/policy/samples/hipaa-hitrust-9-2",
44014+
"redirect_document_id": false
44015+
},
44016+
{
44017+
"source_path_from_root": "/articles/governance/blueprints/samples/irs-1075-sept2016",
44018+
"redirect_url": "/azure/governance/policy/samples/irs-1075-sept2016",
44019+
"redirect_document_id": false
44020+
},
44021+
{
44022+
"source_path_from_root": "/articles/governance/blueprints/samples/nist-sp-800-171-r2",
44023+
"redirect_url": "/azure/governance/policy/samples/nist-sp-800-171-r2",
44024+
"redirect_document_id": false
44025+
},
44026+
{
44027+
"source_path_from_root": "/articles/governance/blueprints/samples/media/control-mapping.md",
44028+
"redirect_url": "/azure/governance/policy/samples",
44029+
"redirect_document_id": false
44030+
},
44031+
{
44032+
"source_path_from_root": "/articles/governance/blueprints/samples/media/deploy.md",
44033+
"redirect_url": "/azure/governance/policy/samples",
44034+
"redirect_document_id": false
44035+
},
44036+
{
44037+
"source_path_from_root": "/articles/governance/blueprints/samples/media/index.md",
44038+
"redirect_url": "/azure/governance/policy/samples",
44039+
"redirect_document_id": false
44040+
},
44041+
{
44042+
"source_path_from_root": "/articles/governance/blueprints/samples/pci-dss-3.2.1/control-mapping.md",
44043+
"redirect_url": "/azure/governance/policy/samples",
44044+
"redirect_document_id": false
44045+
},
44046+
{
44047+
"source_path_from_root": "/articles/governance/blueprints/samples/pci-dss-3.2.1/deploy.md",
44048+
"redirect_url": "/azure/governance/policy/samples",
44049+
"redirect_document_id": false
44050+
},
44051+
{
44052+
"source_path_from_root": "/articles/governance/blueprints/samples/pci-dss-3.2.1/index.md",
44053+
"redirect_url": "/azure/governance/policy/samples",
44054+
"redirect_document_id": false
44055+
}
4398744056
]
43988-
}
44057+
}

articles/active-directory-b2c/authorization-code-flow.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ manager: CelesteDG
88
ms.service: active-directory
99
ms.workload: identity
1010
ms.topic: conceptual
11-
ms.date: 03/03/2022
11+
ms.date: 03/31/2022
1212
ms.author: kengaderdus
1313
ms.subservice: B2C
1414
ms.custom: fasttrack-edit
@@ -49,7 +49,7 @@ client_id=90c0fe63-bcf2-44d5-8fb7-b8bbc0b29dc6
4949
&response_type=code
5050
&redirect_uri=urn%3Aietf%3Awg%3Aoauth%3A2.0%3Aoob
5151
&response_mode=query
52-
&scope=90c0fe63-bcf2-44d5-8fb7-b8bbc0b29dc6%20offline_access
52+
&scope=90c0fe63-bcf2-44d5-8fb7-b8bbc0b29dc6%20offline_access%20https://{tenant-name}/{app-id-uri}/{scope}
5353
&state=arbitrary_data_you_can_receive_in_the_response
5454
&code_challenge=YTFjNjI1OWYzMzA3MTI4ZDY2Njg5M2RkNmVjNDE5YmEyZGRhOGYyM2IzNjdmZWFhMTQ1ODg3NDcxY2Nl
5555
&code_challenge_method=S256

articles/active-directory-b2c/configure-a-sample-node-web-app.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ manager: CelesteDG
88
ms.service: active-directory
99
ms.workload: identity
1010
ms.topic: how-to
11-
ms.date: 04/03/2022
11+
ms.date: 03/31/2022
1212
ms.author: kengaderdus
1313
ms.subservice: B2C
1414
---
@@ -114,12 +114,12 @@ Open your web app in a code editor such as Visual Studio Code. Under the project
114114
|---------|---------|
115115
|`APP_CLIENT_ID`|The **Application (client) ID** for the web app you registered in [step 2.1](#step-2-register-a-web-application). |
116116
|`APP_CLIENT_SECRET`|The client secret for the web app you created in [step 2.2](#step-22-create-a-web-app-client-secret) |
117-
|`SIGN_UP_SIGN_IN_POLICY_AUTHORITY`|The **Sign in and sign up** user flow authority such as `https://<your-tenant-name>.b2clogin.com/<your-tenant-name>.onmicrosoft.com/<sign-in-sign-up-user-flow-name>`. Replace `<your-tenant-name>` with the name of your tenant and `<sign-in-sign-up-user-flow-name>` with the name of your Sign in and Sign up user flow such as `B2C_1_susi_node_app`. Learn how to [Get your tenant name](tenant-management.md#get-your-tenant-name). |
117+
|`SIGN_UP_SIGN_IN_POLICY_AUTHORITY`|The **Sign in and sign up** user flow authority such as `https://<your-tenant-name>.b2clogin.com/<your-tenant-name>.onmicrosoft.com/<sign-in-sign-up-user-flow-name>`. Replace `<your-tenant-name>` with the name of your tenant and `<sign-in-sign-up-user-flow-name>` with the name of your Sign in and Sign up user flow such as `B2C_1_susi`. Learn how to [Get your tenant name](tenant-management.md#get-your-tenant-name). |
118118
|`RESET_PASSWORD_POLICY_AUTHORITY`| The **Reset password** user flow authority such as `https://<your-tenant-name>.b2clogin.com/<your-tenant-name>.onmicrosoft.com/<reset-password-user-flow-name>`. Replace `<your-tenant-name>` with the name of your tenant and `<reset-password-user-flow-name>` with the name of your Reset password user flow such as `B2C_1_reset_password_node_app`.|
119119
|`EDIT_PROFILE_POLICY_AUTHORITY`|The **Profile editing** user flow authority such as `https://<your-tenant-name>.b2clogin.com/<your-tenant-name>.onmicrosoft.com/<profile-edit-user-flow-name>`. Replace `<your-tenant-name>` with the name of your tenant and `<reset-password-user-flow-name>` with the name of your reset password user flow such as `B2C_1_edit_profile_node_app`. |
120120
|`AUTHORITY_DOMAIN`| The Azure AD B2C authority domain such as `https://<your-tenant-name>.b2clogin.com`. Replace `<your-tenant-name>` with the name of your tenant.|
121121
|`APP_REDIRECT_URI`| The application redirect URI where Azure AD B2C will return authentication responses (tokens). It matches the **Redirect URI** you set while registering your app in Azure portal, and it must be publicly accessible. Leave the value as is.|
122-
|`LOGOUT_ENDPOINT`| The Azure AD B2C sign out endpoint such as `https://<your-tenant-name>.b2clogin.com/<your-tenant-name>.onmicrosoft.com/<sign-in-sign-up-user-flow-name>/oauth2/v2.0/logout?post_logout_redirect_uri=http://localhost:3000`. Replace `<your-tenant-name>` with the name of your tenant and `<sign-in-sign-up-user-flow-name>` with the name of your Sign in and Sign up user flow such as `B2C_1_susi_node_app`.|
122+
|`LOGOUT_ENDPOINT`| The Azure AD B2C sign out endpoint such as `https://<your-tenant-name>.b2clogin.com/<your-tenant-name>.onmicrosoft.com/<sign-in-sign-up-user-flow-name>/oauth2/v2.0/logout?post_logout_redirect_uri=http://localhost:3000`. Replace `<your-tenant-name>` with the name of your tenant and `<sign-in-sign-up-user-flow-name>` with the name of your Sign in and Sign up user flow such as `B2C_1_susi`.|
123123

124124
Your final configuration file should look like the following sample:
125125

@@ -142,7 +142,7 @@ You can now test the sample app. You need to start the Node server and access it
142142

143143
### Test sign in
144144

145-
1. After the page with the **Sign in** button finishes loading, select **Sign in**. You're prompted to sign in.
145+
1. After the page with the **Sign in** button completes loading, select **Sign in**. You're prompted to sign in.
146146
1. Enter your sign-in credentials, such as email address and password. If you don't have an account, select **Sign up now** to create an account. After you successfully sign in or sign up, you should see the following page that shows sign-in status.
147147

148148
:::image type="content" source="./media/configure-a-sample-node-web-app/tutorial-dashboard-page.png" alt-text="Screenshot shows web app sign-in status.":::

articles/active-directory-b2c/configure-authentication-sample-web-app.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ manager: CelesteDG
77
ms.service: active-directory
88
ms.workload: identity
99
ms.topic: reference
10-
ms.date: 09/15/2021
10+
ms.date: 03/11/2022
1111
ms.author: kengaderdus
1212
ms.subservice: B2C
1313
ms.custom: "b2c-support"
@@ -134,13 +134,13 @@ Your final configuration file should look like the following JSON:
134134
1. Go to `https://localhost:44316`.
135135
1. Select **Sign Up/In**.
136136

137-
![Screenshot of the "Sign Up/In" button on the project Welcome page.](./media/configure-authentication-sample-web-app/web-app-sign-in.png)
137+
:::image type="content" source="./media/configure-authentication-sample-web-app/web-app-sign-in.png" alt-text="Screenshot of the sign in and sign up button on the project Welcome page.":::
138138

139139
1. Complete the sign-up or sign-in process.
140140

141141
After successful authentication, you'll see your display name on the navigation bar. To view the claims that the Azure AD B2C token returns to your app, select **Claims**.
142142

143-
![Screenshot of the web app token claims.](./media/configure-authentication-sample-web-app/web-app-token-claims.png)
143+
:::image type="content" source="./media/configure-authentication-sample-web-app/web-app-token-claims.png" alt-text="Screenshot of the web app token claims.":::
144144

145145
## Deploy your application
146146

0 commit comments

Comments
 (0)