Skip to content

Commit d417cf2

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into lb-portforwardmulti-new
2 parents 909a987 + f10b1f3 commit d417cf2

File tree

923 files changed

+6168
-4858
lines changed

Some content is hidden

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

923 files changed

+6168
-4858
lines changed

.openpublishing.publish.config.json

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -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.json

Lines changed: 93 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
@@ -15188,7 +15187,7 @@
1518815187
"source_path_from_root": "/articles/defender-for-iot/device-builders/quickstart-azure-rtos-security-module.md",
1518915188
"redirect_url": "/azure/defender-for-iot/device-builders/how-to-quickstart-azure-rtos-security-module",
1519015189
"redirect_document_id": false
15191-
},
15190+
},
1519215191
{
1519315192
"source_path_from_root": "/articles/defender-for-iot/organizations/integration-cisco-ise-pxgrid.md",
1519415193
"redirect_url": "/azure/defender-for-iot/organizations/integration-forescout",
@@ -17733,7 +17732,7 @@
1773317732
"source_path_from_root": "/articles/lab-services/class-type-ethical-hacking-virtualbox.md",
1773417733
"redirect_url": "/azure/lab-services/class-types",
1773517734
"redirect_document_id": false
17736-
},
17735+
},
1773717736
{
1773817737
"source_path_from_root": "/articles/lab-services/classroom-labs/class-type-jupyter-notebook.md",
1773917738
"redirect_url": "/azure/lab-services/class-type-jupyter-notebook",
@@ -26038,12 +26037,12 @@
2603826037
"source_path_from_root": "/articles/storage/blobs/storage-quickstart-blobs-javascript-client-libraries-legacy.md",
2603926038
"redirect_url": "/azure/storage/blobs/quickstart-blobs-javascript-browser",
2604026039
"redirect_document_id": false
26041-
},
26040+
},
2604226041
{
2604326042
"source_path_from_root": "/articles/storage/blobs/storage-quickstart-blobs-nodejs-legacy.md",
2604426043
"redirect_url": "/azure/storage/blobs/storage-quickstart-blobs-nodejs",
2604526044
"redirect_document_id": false
26046-
},
26045+
},
2604726046
{
2604826047
"source_path_from_root": "/articles/storage/blobs/storage-quickstart-blobs-nodejs-v10.md",
2604926048
"redirect_url": "/azure/storage/blobs/storage-quickstart-blobs-nodejs",
@@ -33299,7 +33298,7 @@
3329933298
"redirect_url": "https://azure.microsoft.com/services/cognitive-services/",
3330033299
"redirect_document_id": false
3330133300
},
33302-
{
33301+
{
3330333302
"source_path_from_root": "/articles/machine-learning/studio/whats-new.md",
3330433303
"redirect_url": "https://azure.microsoft.com/updates/?product=machine-learning-studio",
3330533304
"redirect_document_id": false
@@ -43955,34 +43954,94 @@
4395543954
"redirect_document_id": false
4395643955
},
4395743956
{
43958-
"source_path_from_root": "/articles/azure/virtual-desktop/azure-advisor.md",
43959-
"redirect_url": "/azure/advisor/advisor-overview",
43960-
"redirect_document_id": false
43957+
"source_path_from_root": "/articles/azure/virtual-desktop/azure-advisor.md",
43958+
"redirect_url": "/azure/advisor/advisor-overview",
43959+
"redirect_document_id": false
4396143960
},
4396243961
{
4396343962
"source_path_from_root": "/articles/azure/cognitive-services/translator/tutorial-wpf-translation-csharp.md",
4396443963
"redirect_url": "/ai-builder/flow-text-translation?toc=/azure/cognitive-services/translator/toc.json&bc=/azure/cognitive-services/translator/breadcrumb/toc.json",
4396543964
"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-
}
43965+
},
43966+
{
43967+
"source_path_from_root": "/articles/azure/cognitive-services/translator/tutorial-build-flask-app-translation-synthesis.md",
43968+
"redirect_url": "/learn/modules/translate-text-with-translator-service?toc=/azure/cognitive-services/translator/toc.json&bc=/azure/cognitive-services/translator/breadcrumb/toc.json",
43969+
"redirect_document_id": false
43970+
},
43971+
{
43972+
"source_path": "articles/machine-learning/classic/deploy-with-resource-manager-template.md",
43973+
"redirect_url": "/previous-versions/azure/machine-learning/classic/deploy-with-resource-manager-template",
43974+
"redirect_document_id": false
43975+
},
43976+
{
43977+
"source_path_from_root": "/articles/governance/policy/how-to/guest-configuration-create-group-policy.md",
43978+
"redirect_url": "/azure/governance/policy/how-to/guest-configuration-create",
43979+
"redirect_document_id": false
43980+
},
43981+
{
43982+
"source_path_from_root": "/articles/virtual-desktop/compare-virtual-desktop-windows-365.md",
43983+
"redirect_url": "/azure/virtual-desktop/overview",
43984+
"redirect_document_id": false
43985+
},
43986+
{
43987+
"source_path_from_root": "/articles/governance/blueprints/samples/cis-azure-1-1-0.md",
43988+
"redirect_url": "/azure/governance/policy/samples/cis-azure-1-1-0",
43989+
"redirect_document_id": false
43990+
},
43991+
{
43992+
"source_path_from_root": "/articles/governance/blueprints/samples/cis-azure-1-3-0.md",
43993+
"redirect_url": "/azure/governance/policy/samples/cis-azure-1-3-0",
43994+
"redirect_document_id": false
43995+
},
43996+
{
43997+
"source_path_from_root": "/articles/governance/blueprints/samples/cmmc-l3.md",
43998+
"redirect_url": "/azure/governance/policy/samples/cmmc-l3",
43999+
"redirect_document_id": false
44000+
},
44001+
{
44002+
"source_path_from_root": "/articles/governance/blueprints/samples/hipaa-hitrust-9-2.md",
44003+
"redirect_url": "/azure/governance/policy/samples/hipaa-hitrust-9-2",
44004+
"redirect_document_id": false
44005+
},
44006+
{
44007+
"source_path_from_root": "/articles/governance/blueprints/samples/irs-1075-sept2016",
44008+
"redirect_url": "/azure/governance/policy/samples/irs-1075-sept2016",
44009+
"redirect_document_id": false
44010+
},
44011+
{
44012+
"source_path_from_root": "/articles/governance/blueprints/samples/nist-sp-800-171-r2",
44013+
"redirect_url": "/azure/governance/policy/samples/nist-sp-800-171-r2",
44014+
"redirect_document_id": false
44015+
},
44016+
{
44017+
"source_path_from_root": "/articles/governance/blueprints/samples/media/control-mapping.md",
44018+
"redirect_url": "/azure/governance/policy/samples",
44019+
"redirect_document_id": false
44020+
},
44021+
{
44022+
"source_path_from_root": "/articles/governance/blueprints/samples/media/deploy.md",
44023+
"redirect_url": "/azure/governance/policy/samples",
44024+
"redirect_document_id": false
44025+
},
44026+
{
44027+
"source_path_from_root": "/articles/governance/blueprints/samples/media/index.md",
44028+
"redirect_url": "/azure/governance/policy/samples",
44029+
"redirect_document_id": false
44030+
},
44031+
{
44032+
"source_path_from_root": "/articles/governance/blueprints/samples/pci-dss-3.2.1/control-mapping.md",
44033+
"redirect_url": "/azure/governance/policy/samples",
44034+
"redirect_document_id": false
44035+
},
44036+
{
44037+
"source_path_from_root": "/articles/governance/blueprints/samples/pci-dss-3.2.1/deploy.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/index.md",
44043+
"redirect_url": "/azure/governance/policy/samples",
44044+
"redirect_document_id": false
44045+
}
4398744046
]
43988-
}
44047+
}

articles/active-directory-domain-services/policy-reference.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: Built-in policy definitions for Azure Active Directory Domain Services
33
description: Lists Azure Policy built-in policy definitions for Azure Active Directory Domain Services. These built-in policy definitions provide common approaches to managing your Azure resources.
4-
ms.date: 02/15/2022
4+
ms.date: 03/08/2022
55
ms.service: active-directory
66
ms.subservice: domain-services
77
author: justinha

articles/active-directory/authentication/concept-certificate-based-authentication-technical-deep-dive.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ services: active-directory
66
ms.service: active-directory
77
ms.subservice: authentication
88
ms.topic: how-to
9-
ms.date: 02/15/2022
9+
ms.date: 03/11/2022
1010

1111
ms.author: justinha
1212
author: vimrang
13-
manager: daveba
13+
manager: karenhoran
1414
ms.reviewer: vimrang
1515

1616
ms.collection: M365-identity-device-management
@@ -196,7 +196,7 @@ For the first test scenario, configure the authentication policy where the Issue
196196

197197
### Test multifactor authentication
198198

199-
For the next test scenario, configure the authentication policy where the Issuer subject rule satisfies multifactor authentication.
199+
For the next test scenario, configure the authentication policy where the **policyOID** rule satisfies multifactor authentication.
200200

201201
:::image type="content" border="true" source="./media/concept-certificate-based-authentication-technical-deep-dive/multifactor.png" alt-text="Screenshot of the Authentication policy configuration showing multifactor authentication required." lightbox="./media/concept-certificate-based-authentication-technical-deep-dive/multifactor.png":::
202202

articles/active-directory/develop/TOC.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,8 +127,10 @@
127127
href: zero-trust-for-developers.md
128128
- name: Best practices for least privileged access for apps
129129
href: secure-least-privileged-access.md
130-
- name: Security best practices for Azure AD application registration
130+
- name: Security best practices for Azure AD app registration
131131
href: security-best-practices-for-app-registration.md
132+
- name: Secure access control using groups in Azure AD
133+
href: secure-group-access-control.md
132134
- name: Automatic user provisioning (SCIM)
133135
href: ../app-provisioning/user-provisioning.md?toc=/azure/active-directory/develop/toc.json&bc=/azure/active-directory/develop/breadcrumb/toc.json
134136
- name: Use the Microsoft Graph API
23.9 KB
Loading

articles/active-directory/develop/migrate-spa-implicit-to-auth-code.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ For additional changes you might need to make to your code, see the [migration g
7777

7878
## Disable implicit grant settings
7979

80-
Once you've updated all your production applications that use this app registration and its client ID to MSAL 2.x and the authorization code flow, you should uncheck the implicit grant settings in the app registration.
80+
Once you've updated all your production applications that use this app registration and its client ID to MSAL 2.x and the authorization code flow, you should uncheck the implicit grant settings under the **Authentication** menu of the app registration.
8181

8282
When you uncheck the implicit grant settings in the app registration, the implicit flow is disabled for all applications using registration and its client ID.
8383

articles/active-directory/develop/msal-js-sso.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ When your application is open in multiple tabs and you first sign in the user on
3030
By default, MSAL.js uses `sessionStorage`, which doesn't allow the session to be shared between tabs. To get SSO between tabs, make sure to set the `cacheLocation` in MSAL.js to `localStorage` as shown below.
3131

3232
```javascript
33+
3334
const config = {
3435
auth: {
3536
clientId: "abcd-ef12-gh34-ikkl-ashdjhlhsdg",
@@ -39,7 +40,7 @@ const config = {
3940
},
4041
};
4142

42-
const myMSALObj = new UserAgentApplication(config);
43+
const msalInstance = new msal.PublicClientApplication(config);
4344
```
4445

4546
## SSO between apps
@@ -72,8 +73,7 @@ var request = {
7273
sid: sid,
7374
};
7475

75-
userAgentApplication
76-
.acquireTokenSilent(request)
76+
msalInstance.acquireTokenSilent(request)
7777
.then(function (response) {
7878
const token = response.accessToken;
7979
})
@@ -95,7 +95,7 @@ var request = {
9595
extraQueryParameters: { domain_hint: "organizations" },
9696
};
9797

98-
userAgentApplication.loginRedirect(request);
98+
msalInstance.loginRedirect(request);
9999
```
100100

101101
To get the values for login_hint and domain_hint by reading the claims returned in the ID token for the user.
@@ -104,7 +104,7 @@ To get the values for login_hint and domain_hint by reading the claims returned
104104

105105
- **domain_hint** is only required to be passed when using the /common authority. The domain hint is determined by tenant ID(tid). If the `tid` claim in the ID token is `9188040d-6c67-4c5b-b112-36a304b66dad` it's consumers. Otherwise, it's organizations.
106106

107-
For more information about **login_hint** and **domain_hint**, see [Implicit grant flow](v2-oauth2-implicit-grant-flow.md).
107+
For more information about **login_hint** and **domain_hint**, see [auth code grant](v2-oauth2-auth-code-flow.md).
108108

109109
## SSO without MSAL.js login
110110

@@ -125,8 +125,7 @@ var request = {
125125
extraQueryParameters: { domain_hint: "organizations" },
126126
};
127127

128-
userAgentApplication
129-
.acquireTokenSilent(request)
128+
msalInstance.acquireTokenSilent(request)
130129
.then(function (response) {
131130
const token = response.accessToken;
132131
})
@@ -142,6 +141,7 @@ MSAL.js brings feature parity with ADAL.js for Azure AD authentication scenarios
142141
To take advantage of the SSO behavior when updating from ADAL.js, you'll need to ensure the libraries are using `localStorage` for caching tokens. Set the `cacheLocation` to `localStorage` in both the MSAL.js and ADAL.js configuration at initialization as follows:
143142

144143
```javascript
144+
145145
// In ADAL.js
146146
window.config = {
147147
clientId: "g075edef-0efa-453b-997b-de1337c29185",
@@ -160,7 +160,7 @@ const config = {
160160
},
161161
};
162162

163-
const myMSALObj = new UserAgentApplication(config);
163+
const msalInstance = new msal.PublicClientApplication(config);
164164
```
165165

166166
Once the `cacheLocation` is configured, MSAL.js can read the cached state of the authenticated user in ADAL.js and use that to provide SSO in MSAL.js.

0 commit comments

Comments
 (0)