Merge branch 'main' into josefree-main-262852

Author: majguo

.openpublishing.publish.config.json

@@ -1264,6 +1264,7 @@
   "articles/iot-hub/.openpublishing.redirection.iot-hub.json",
   "articles/iot-operations/.openpublishing.redirection.iot-operations.json",
   "articles/load-testing/.openpublishing.redirection.azure-load-testing.json",
+  "articles/lab-services/.openpublishing.redirection.lab-services.json",
   "articles/logic-apps/.openpublishing.redirection.logic-apps.json",
   "articles/machine-learning/.openpublishing.redirection.machine-learning.json",
   "articles/machine-learning/v1/.openpublishing.redirection.machine-learning-v1.json",

.openpublishing.redirection.app-service.json

@@ -6573,7 +6573,11 @@
             "source_path_from_root": "/articles/azure-monitor/logs/data-collection-rule-sample-custom-logs.md",
             "redirect_url": "/azure/azure-monitor/essentials/data-collection-rule-samples",
             "redirect_document_id": false
-        }
-        
+        },
+        {
+            "source_path_from_root": "/articles/azure-monitor/agents/data-collection-rule-sample-agent.md",
+            "redirect_url": "/azure/azure-monitor/essentials/data-collection-rule-samples",
+            "redirect_document_id": false
+        }        
     ]
 }

.openpublishing.redirection.azure-monitor.json

@@ -369,6 +369,11 @@
             "source_path_from_root": "/articles/virtual-desktop/publish-applications.md",
             "redirect_url": "/azure/virtual-desktop/publish-applications-stream-remoteapp",
             "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/virtual-desktop/autoscale-new-existing-host-pool.md",
+            "redirect_url": "/azure/virtual-desktop/autoscale-scaling-plan",
+            "redirect_document_id": true
         }
     ]
 }

.openpublishing.redirection.json

@@ -1,15 +1,10 @@
 ---
 title: Token enrichment  - Azure Active Directory B2C
 description: Enrich tokens with claims from external identity data sources using APIs or outbound webhooks.
-
 author: garrodonnell
 manager: CelesteDG
-
 ms.service: active-directory
-
-ms.custom: 
 ms.topic: how-to
-
 ms.date: 01/17/2023
 ms.author: godonnell
 ms.subservice: B2C

.openpublishing.redirection.virtual-desktop.json

@@ -9,12 +9,12 @@ manager: CelesteDG
 ms.service: active-directory
 
 ms.topic: reference
-ms.date: 01/11/2024
+ms.date: 01/17/2024
 ms.author: kengaderdus
 ms.subservice: B2C
 
 
-#Customer intent: As a developer using Azure Active Directory B2C custom policies, I want to understand how to use claim resolvers in my technical profiles, so that I can provide context information about authorization requests and populate claims with dynamic values.
+#Customer intent: As a developer using Azure AD B2C custom policies, I want to understand how to use claim resolvers in my technical profiles, so that I can provide context information about authorization requests and populate claims with dynamic values.
 
 ---
 
@@ -122,6 +122,17 @@ Any parameter name included as part of an OIDC or OAuth2 request can be mapped t
 | {OAUTH-KV:loyalty_number} | A query string parameter. | 1234 |
 | {OAUTH-KV:any custom query string} | A query string parameter. | N/A |
 
+## SAML key-value parameters
+
+In a SAML authentication request, any parameter name that's included in the request, but isn’t specific to the protocol (such as SAMLRequest) can be mapped to a claim in the user journey. For example, the request may include a custom parameter such as `username`. This applies to both SP-Initiated and IDP-Initiated SAML requests.
+
+| Claim | Description | Example |
+| ----- | ----------------------- | --------|
+| {SAML-KV:username} | A query string or POST body parameter. | [email protected] |
+| {SAML-KV:loyalty_number} |  A query string or POST body parameter. | 1234 |
+| {SAML-KV:any custom query string} |  A query string or POST body parameter. | N/A |
+
+
 ## SAML
 
 The following table lists the claim resolvers  with information about the SAML authorization request:

articles/active-directory-b2c/add-api-connector-token-enrichment.md

@@ -1,19 +1,15 @@
 ---
 title: Identity Protection and Conditional Access in Azure AD B2C
 description: Learn how Identity Protection gives you visibility into risky sign-ins and risk detections. Find out how and Conditional Access lets you enforce organizational policies based on risk events in your Azure AD B2C tenants.
-
 ms.service: active-directory
 ms.subservice: conditional-access
 ms.topic: overview
 ms.date: 01/11/2024
-
 ms.author: kengaderdus
 author: kengaderdus
 manager: CelesteDG
-
 ms.collection: M365-identity-device-management
 
-
 #Customer intent: As an Azure AD B2C application owner, I want to enhance the security of my applications by using Identity Protection and Conditional Access, so that I can detect and respond to risky authentications and enforce organizational policies.
 
 ---

articles/active-directory-b2c/claim-resolver-overview.md

@@ -1,13 +1,13 @@
 ---
 title: Configure authentication in a sample Node.js web application by using Azure Active Directory B2C (Azure AD B2C)
-description: This article discusses how to use Azure Active Directory B2C to sign in and sign up users in a Node.js web application. 
+description: This article discusses how to use Azure Active Directory B2C to sign in and sign up users in a Node.js web application.
 titleSuffix: Azure AD B2C
 
 author: kengaderdus
 manager: CelesteDG
 ms.service: active-directory
 
-ms.custom: devx-track-js, devx-track-linux
+ms.custom: devx-track-js, linux-related-content
 ms.topic: how-to
 ms.date: 01/11/2024
 ms.author: kengaderdus
@@ -20,14 +20,14 @@ ms.subservice: B2C
 
 # Configure authentication in a sample Node.js web application by using Azure Active Directory B2C
 
-This sample article uses a sample Node.js application to show how to add Azure Active Directory B2C (Azure AD B2C) authentication to a Node.js web application. The sample application enables users to sign in, sign out, update profile and reset password using Azure AD B2C user flows. The sample web application uses [Microsoft Authentication Library (MSAL) for Node](https://github.com/AzureAD/microsoft-authentication-library-for-js/tree/dev/lib/msal-node) to handle authentication and authorization. 
+This sample article uses a sample Node.js application to show how to add Azure Active Directory B2C (Azure AD B2C) authentication to a Node.js web application. The sample application enables users to sign in, sign out, update profile and reset password using Azure AD B2C user flows. The sample web application uses [Microsoft Authentication Library (MSAL) for Node](https://github.com/AzureAD/microsoft-authentication-library-for-js/tree/dev/lib/msal-node) to handle authentication and authorization.
 
 In this article, you’ll do the following tasks:
 
 - Register a web application in the Azure portal.
 - Create combined **Sign in and sign up**, **Profile editing**, and **Password reset** user flows for the app in the Azure portal.
 - Update a sample Node application to use your own Azure AD B2C application and user flows.
-- Test the sample application. 
+- Test the sample application.
 
 ## Prerequisites
 
@@ -37,15 +37,15 @@ In this article, you’ll do the following tasks:
 
 ## Step 1: Configure your user flows
 
-[!INCLUDE [active-directory-b2c-app-integration-add-user-flow](../../includes/active-directory-b2c-app-integration-add-user-flow.md)] 
+[!INCLUDE [active-directory-b2c-app-integration-add-user-flow](../../includes/active-directory-b2c-app-integration-add-user-flow.md)]
 
 ## Step 2: Register a web application
 
-To enable your application sign in with Azure AD B2C, register your app in the Azure AD B2C directory. The app registration establishes a trust relationship between the app and Azure AD B2C.  
+To enable your application sign in with Azure AD B2C, register your app in the Azure AD B2C directory. The app registration establishes a trust relationship between the app and Azure AD B2C.
 
-During app registration, you'll specify the *Redirect URI*. The redirect URI is the endpoint to which the user is redirected by Azure AD B2C after they authenticate with Azure AD B2C. The app registration process generates an *Application ID*, also known as the *client ID*, that uniquely identifies your app. After your app is registered, Azure AD B2C uses both the application ID, and the redirect URI to create authentication requests. 
+During app registration, you'll specify the *Redirect URI*. The redirect URI is the endpoint to which the user is redirected by Azure AD B2C after they authenticate with Azure AD B2C. The app registration process generates an *Application ID*, also known as the *client ID*, that uniquely identifies your app. After your app is registered, Azure AD B2C uses both the application ID, and the redirect URI to create authentication requests.
 
-### Step 2.1: Register the app 
+### Step 2.1: Register the app
 
 To register the web app, follow these steps:
 
@@ -54,7 +54,7 @@ To register the web app, follow these steps:
 1. In the Azure portal, search for and select **Azure AD B2C**.
 1. Select **App registrations**, and then select **New registration**.
 1. Under **Name**, enter a name for the application (for example, *webapp1*).
-1. Under **Supported account types**, select **Accounts in any identity provider or organizational directory (for authenticating users with user flows)**. 
+1. Under **Supported account types**, select **Accounts in any identity provider or organizational directory (for authenticating users with user flows)**.
 1. Under **Redirect URI**, select **Web** and then, in the URL box, enter `http://localhost:3000/redirect`.
 1. Under **Permissions**, select the **Grant admin consent to openid and offline_access permissions** checkbox.
 1. Select **Register**.
@@ -106,7 +106,7 @@ The `views` folder contains Handlebars files for the application's user interfac
 
 ## Step 5: Configure the sample web app
 
-Open your web app in a code editor such as Visual Studio Code. Under the project root folder, open the *.env* file. This file contains information about your Azure AD B2C identity provider. Update the following app settings properties:  
+Open your web app in a code editor such as Visual Studio Code. Under the project root folder, open the *.env* file. This file contains information about your Azure AD B2C identity provider. Update the following app settings properties:
 
 |Key  |Value  |
 |---------|---------|
@@ -129,7 +129,7 @@ Your final configuration file should look like the following sample:
 You can now test the sample app. You need to start the Node server and access it through your browser on `http://localhost:3000`.
 
 1. In your terminal, run the following code to start the Node.js web server:
- 
+
    ```bash
    node index.js
    ```
@@ -147,19 +147,19 @@ You can now test the sample app. You need to start the Node server and access it
 
 ### Test profile editing
 
-1. After you sign in, select **Edit profile**. 
-1. Enter new changes as required, and then select **Continue**. You should see the page with sign-in status with the new changes, such as **Given Name**. 
+1. After you sign in, select **Edit profile**.
+1. Enter new changes as required, and then select **Continue**. You should see the page with sign-in status with the new changes, such as **Given Name**.
 
 ### Test password reset
 
-1. After you sign in, select **Reset password**. 
+1. After you sign in, select **Reset password**.
 1. In the next dialog that appears, you can cancel the operation by selecting **Cancel**. Alternatively, enter your email address, and then select **Send verification code**. You'll receive a verification code to your email account. Copy the verification code in your email, enter it into the password reset dialog, and then select **Verify code**.
 1. Select **Continue**.
 1. Enter your new password, confirm it, and then select **Continue**. You should see the page that shows sign-in status.
 
 ### Test sign-out
 
-After you sign in, select **Sign out**. You should see the page that has a **Sign in** button. 
+After you sign in, select **Sign out**. You should see the page that has a **Sign in** button.
 
 ## Next steps
 

articles/active-directory-b2c/conditional-access-identity-protection-overview.md

@@ -86,24 +86,21 @@ Extract the sample file to a folder where the total length of the path is 260 or
 
 In the project's root directory, follow these steps:
 
-1. Rename the *app_config.py* file to *app_config.py.OLD*.
-1. Rename the *app_config_b2c.py* file to *app_config.py*. This file contains information about your Azure AD B2C identity provider. 
-
-1. Create an `.env` file in the root folder of the project using `.env.sample.b2c` as a guide.
+1. Create an `.env` file in the root folder of the project using `.env.sample` as a guide.
 
     ```shell
     FLASK_DEBUG=True
-    TENANT_NAME=<tenant name>
+    B2C_TENANT_NAME=<tenant name>
     CLIENT_ID=<client id>
     CLIENT_SECRET=<client secret>
-    SIGNUPSIGNIN_USER_FLOW=B2C_1_profile_editing
-    EDITPROFILE_USER_FLOW=B2C_1_reset_password
-    RESETPASSWORD_USER_FLOW=B2C_1_signupsignin1
+    SIGNUPSIGNIN_USER_FLOW=B2C_1_signupsignin1
+    EDITPROFILE_USER_FLOW=B2C_1_profile_editing
+    RESETPASSWORD_USER_FLOW=B2C_1_reset_password
     ```
 
     |Key  |Value  |
     |---------|---------|
-    |`TENANT_NAME`| The first part of your Azure AD B2C [tenant name](tenant-management-read-tenant-name.md#get-your-tenant-name) (for example, `contoso`). |
+    |`B2C_TENANT_NAME`| The first part of your Azure AD B2C [tenant name](tenant-management-read-tenant-name.md#get-your-tenant-name) (for example, `contoso`). |
     |`CLIENT_ID`| The web API application ID from [step 2.1](#step-21-register-the-app).|
     |`CLIENT_SECRET`| The client secret value you created in [step 2.2](#step-22-create-a-web-app-client-secret). |
     |`*_USER_FLOW`|The user flows you created in [step 1](#step-1-configure-your-user-flow).|