Merge branch 'main' of https://github.com/tejaswikolli-web/azure-docs-pr

Author: tejaswikolli-web

.openpublishing.publish.config.json

@@ -946,6 +946,7 @@
     "articles/machine-learning/.openpublishing.redirection.machine-learning.json",
     "articles/static-web-apps/.openpublishing.redirection.static-web-apps.json",
     ".openpublishing.redirection.virtual-desktop.json",
+    ".openpublishing.redirection.deployment-environments.json",
     "articles/applied-ai-services/.openpublishing.redirection.applied-ai-services.json",
     "articles/applied-ai-services/.openpublishing.archived.json",
     "articles/cognitive-services/.openpublishing.redirection.cognitive-services.json",

.openpublishing.redirection.azure-monitor.json

@@ -361,11 +361,6 @@
             "redirect_url": "/azure/data-explorer/data-explorer-insights",
             "redirect_document_id": false
         },
-        {
-            "source_path_from_root": "/articles/azure-monitor/insights/troubleshoot-workbooks.md" ,
-            "redirect_url": "/azure/azure-monitor/visualize/workbooks-overview",
-            "redirect_document_id": false
-        },
         {
             "source_path_from_root": "/articles/azure-monitor/vm/vminsights-ga-release-faq.md" ,
             "redirect_url": "/azure/azure-monitor/faq#vm-insights",
@@ -5440,6 +5435,26 @@
             "source_path_from_root": "/articles/azure-monitor/insights/sql-insights-troubleshoot.md",
             "redirect_url": "/azure/azure-sql/database/sql-insights-troubleshoot",
             "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-monitor/containers/container-insights-prometheus-integration.md",
+            "redirect_url": "/azure/azure-monitor/containers/container-insights-prometheus",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-monitor/containers/container-insights-enable-existing-clusters.md",
+            "redirect_url": "/azure/azure-monitor/containers/container-insights-enable-aks",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-monitor/containers/container-insights-enable-new-cluster.md",
+            "redirect_url": "/azure/azure-monitor/containers/container-insights-enable-aks",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-monitor/containers/container-insights-update-metrics.md",
+            "redirect_url": "/azure/azure-monitor/containers/container-insights-custom-metrics",
+            "redirect_document_id": false
         }
         ,
         {

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

@@ -710,6 +710,16 @@
             "redirect_url": "/azure/defender-for-cloud/defender-for-containers-usage",
             "redirect_document_id": true
         },
+        {
+            "source_path_from_root": "/articles/defender-for-cloud/enable-data-collection.md",
+            "redirect_url": "/azure/defender-for-cloud/monitoring-components",
+            "redirect_document_id": true
+        },
+        {
+            "source_path_from_root": "/articles/defender-for-cloud/defender-for-containers-usage.md",
+            "redirect_url": "/azure/defender-for-cloud/defender-for-containers-va-acr",
+            "redirect_document_id": true
+        },
         {
             "source_path_from_root": "/articles/defender-for-cloud/file-integrity-monitoring-usage.md",
             "redirect_url": "/azure/defender-for-cloud/file-integrity-monitoring-enable-log-analytics",
@@ -720,5 +730,6 @@
             "redirect_url": "/azure/defender-for-cloud/release-notes#azure-monitor-agent-integration-now-in-preview",
             "redirect_document_id": true
         }
+    
       ]
 }

.openpublishing.redirection.deployment-environments.json

@@ -0,0 +1,19 @@
+{
+  "redirections": [
+    {
+      "source_path_from_root": "/articles/deployment-environments/how-to-configure-environment-types.md",
+      "redirect_url": "/azure/deployment-environments/how-to-configure-project-environment-types",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/deployment-environments/tutorial-create-and-configure-devcenter.md",
+      "redirect_url": "/azure/deployment-environments/quickstart-create-and-configure-devcenter",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/deployment-environments/tutorial-create-and-configure-projects.md",
+      "redirect_url": "/azure/deployment-environments/quickstart-create-and-configure-projects",
+      "redirect_document_id": false
+    }
+  ]
+}

.openpublishing.redirection.json

@@ -1,5 +1,20 @@
 {
     "redirections": [
+        {
+            "source_path":  "articles/backup/sap-hana-db-manage.md",
+            "redirect_url":  "/azure/backup/sap-hana-database-manage",
+            "redirect_document_id":  false   
+        },
+        {
+            "source_path":  "articles/backup/sap-hana-db-restore.md",
+            "redirect_url":  "/azure/backup/sap-hana-database-restore",
+            "redirect_document_id":  false  
+        },
+        {
+            "source_path":  "articles/backup/sap-hana-db-about.md",
+            "redirect_url":  "/azure/backup/sap-hana-database-about",
+            "redirect_document_id":  false
+        },
         {
             "source_path_from_root": "/articles/storage/blobs/storage-quickstart-blobs-dotnet-legacy.md",
             "redirect_url": "/azure/storage/blobs/storage-quickstart-blobs-dotnet",
@@ -11318,6 +11333,11 @@
             "redirect_url": "/azure/ddos-protection/telemetry",
             "redirect_document_id": false
         },
+        {
+            "source_path_from_root": "/articles/ddos-protection/ddos-protection-standard-features.md",
+            "redirect_url": "/azure/ddos-protection/ddos-protection-features",
+            "redirect_document_id": false
+        },
         {
             "source_path_from_root": "/articles/asc-for-iot/index.yml",
             "redirect_url": "/azure/defender-for-iot/",

articles/active-directory-b2c/TOC.yml

@@ -496,6 +496,10 @@
       href: partner-lexisnexis.md
     - name: Onfido
       href: partner-onfido.md
+  - name: Identity verification tools
+    items:
+    - name: Grit IEF editor 
+      href: partner-grit-editor.md
   - name: Domain name
     items:
     - name: b2clogin.com overview

articles/active-directory-b2c/add-password-reset-policy.md

@@ -9,7 +9,7 @@ manager: CelesteDG
 ms.service: active-directory
 ms.workload: identity
 ms.topic: how-to
-ms.date: 08/24/2021
+ms.date: 10/07/2022
 ms.custom: project-no-code
 ms.author: kengaderdus
 ms.subservice: B2C
@@ -114,6 +114,7 @@ Declare your claims in the [claims schema](claimsschema.md). Open the extensions
 
 [Page layout version](contentdefinitions.md#migrating-to-page-layout) 2.1.2 is required to enable the self-service password reset flow in the sign-up or sign-in journey. To upgrade the page layout version:
 
+1. Open the base file of your policy, for example, *SocialAndLocalAccounts/TrustFrameworkBase.xml*.
 1. Search for the [BuildingBlocks](buildingblocks.md) element. If the element doesn't exist, add it.
 1. Locate the [ContentDefinitions](contentdefinitions.md) element. If the element doesn't exist, add it.
 1. Modify the **DataURI** element within the **ContentDefinition** element to have the ID `api.signuporsignin`:
@@ -131,7 +132,10 @@ Declare your claims in the [claims schema](claimsschema.md). Open the extensions
     ```
 
 ### Add the technical profiles
-A claims transformation technical profile accesses the `isForgotPassword` claim. The technical profile is referenced later. When it's invoked, it sets the value of the `isForgotPassword` claim to `true`. Find the **ClaimsProviders** element (if the element doesn't exist, create it), and then add the following claims provider:
+A claims transformation technical profile accesses the `isForgotPassword` claim. The technical profile is referenced later. When it's invoked, it sets the value of the `isForgotPassword` claim to `true`. 
+
+1. Open the extensions file of your policy, for example, in *SocialAndLocalAccounts/TrustFrameworkExtensions.xml*.
+1. Find the **ClaimsProviders** element (if the element doesn't exist, create it), and then add the following claims provider:
 
 ```xml
 <!-- 
@@ -171,7 +175,8 @@ The user can now sign in, sign up, and perform password reset in your user journ
 
 The sub journey is called from the user journey and performs the specific steps that deliver the password reset experience to the user. Use the `Call` type sub journey so that when the sub journey is finished, control is returned to the orchestration step that initiated the sub journey.
 
-Find the **SubJourneys** element. If the element doesn't exist, add it after the **User Journeys** element. Then, add the following sub journey:
+1. Open the extensions file of your policy, such as *SocialAndLocalAccounts/TrustFrameworkExtensions.xml*.
+1. Find the **SubJourneys** element. If the element doesn't exist, add it after the **User Journeys** element. Then, add the following sub journey:
 
 ```xml
 <!--
@@ -203,23 +208,25 @@ Next, connect the **Forgot your password?** link to the Forgot Password sub jour
 
 If you don't have your own custom user journey that has a **CombinedSignInAndSignUp** step, complete the following steps to duplicate an existing sign-up or sign-in user journey. Otherwise, continue to the next section.
 
-1. In the starter pack, open the *TrustFrameworkBase.xml* file.
+1. In the starter pack, open the *TrustFrameworkBase.xml* file such as *SocialAndLocalAccounts/TrustFrameworkBase.xml*.
 1. Find and copy the entire contents of the **UserJourney** element that includes `Id="SignUpOrSignIn"`.
-1. Open *TrustFrameworkExtensions.xml* and find the **UserJourneys** element. If the element doesn't exist, add one.
+1. Open *TrustFrameworkExtensions.xml* file, such as *SocialAndLocalAccounts/TrustFrameworkExtensions.xml*, and find the **UserJourneys** element. If the element doesn't exist, create it.
 1. Create a child element of the **UserJourneys** element by pasting the entire contents of the **UserJourney** element you copied in step 2.
 1. Rename the ID of the user journey. For example, `Id="CustomSignUpSignIn"`.
 
 ### Connect the Forgot Password link to the Forgot Password sub journey
 
-In your user journey, you can represent the Forgot Password sub journey as a **ClaimsProviderSelection**. Adding this element connects the **Forgot your password?** link to the Forgot Password sub journey.
+In your user journey, you can represent the Forgot Password sub journey as a **ClaimsProviderSelection**. By adding this element, you connect the **Forgot your password?** link to the Forgot Password sub journey.
+
+1. Open the *TrustFrameworkExtensions.xml* file, such as *SocialAndLocalAccounts/TrustFrameworkExtensions.xml*. 
 
 1. In the user journey, find the orchestration step element that includes `Type="CombinedSignInAndSignUp"` or `Type="ClaimsProviderSelection"`. It's usually the first orchestration step. The **ClaimsProviderSelections** element contains a list of identity providers that a user can use to sign in. Add the following line:
 
     ```xml
     <ClaimsProviderSelection TargetClaimsExchangeId="ForgotPasswordExchange" />
     ```
 
-1. In the next orchestration step, add a **ClaimsExchange** element. Add the following line:
+1. In the next orchestration step, add a **ClaimsExchange** element by adding the following line:
 
     ```xml
     <ClaimsExchange Id="ForgotPasswordExchange" TechnicalProfileReferenceId="ForgotPassword" />
@@ -245,7 +252,13 @@ In your user journey, you can represent the Forgot Password sub journey as a **C
 
 ### Set the user journey to be executed
 
-Now that you've modified or created a user journey, in the **Relying Party** section, specify the journey that Azure AD B2C will execute for this custom policy. In the [RelyingParty](relyingparty.md) element, find the **DefaultUserJourney** element. Update the **DefaultUserJourney ReferenceId** to match the ID of the user journey in which you added the **ClaimsProviderSelections**.
+Now that you've modified or created a user journey, in the **Relying Party** section, specify the journey that Azure AD B2C will execute for this custom policy. 
+
+1. Open the file that has the **Relying Party** element, such as *SocialAndLocalAccounts/SignUpOrSignin.xml*.   
+
+1. In the [RelyingParty](relyingparty.md) element, find the **DefaultUserJourney** element. 
+
+1. Update the **DefaultUserJourney ReferenceId** to match the ID of the user journey in which you added the **ClaimsProviderSelections**.
 
 ```xml
 <RelyingParty>
@@ -275,8 +288,8 @@ Your application might need to detect whether the user signed in by using the Fo
 1. In the Azure portal, search for and select **Azure AD B2C**.
 1. In the menu under **Policies**, select **Identity Experience Framework**.
 1. Select **Upload custom policy**. In the following order, upload the two policy files that you changed:
-   1. The extension policy, for example, *TrustFrameworkExtensions.xml*.
-   1. The relying party policy, for example, *SignUpSignIn.xml*.
+   1. The extension policy, for example, *SocialAndLocalAccounts/TrustFrameworkExtensions.xml*.
+   1. The relying party policy, for example, *SocialAndLocalAccounts/SignUpOrSignin.xml*.
 
 ::: zone-end
 

articles/active-directory-b2c/identity-provider-azure-ad-single-tenant.md

@@ -9,7 +9,7 @@ manager: CelesteDG
 ms.service: active-directory
 ms.workload: identity
 ms.topic: how-to
-ms.date: 06/08/2022
+ms.date: 10/11/2022
 ms.author: kengaderdus
 ms.subservice: B2C
 ms.custom: fasttrack-edit, project-no-code
@@ -45,10 +45,12 @@ As of November 2020, new application registrations show up as unverified in the
 To enable sign-in for users with an Azure AD account from a specific Azure AD organization, in Azure Active Directory B2C (Azure AD B2C), you need to create an application in [Azure portal](https://portal.azure.com). For more information, see [Register an application with the Microsoft identity platform](../active-directory/develop/quickstart-register-app.md).
 
 1. Sign in to the [Azure portal](https://portal.azure.com).
-1. Make sure you're using the directory that contains your organizational Azure AD tenant (for example, Contoso). Select the **Directories + subscriptions** icon in the portal toolbar.
-1. On the **Portal settings | Directories + subscriptions** page, find your Azure AD directory in the **Directory name** list, and then select **Switch**.
-1. Under **Azure services**, select **App registrations** or search for and select **App registrations**.
-1. Select **New registration**.
+1. Make sure you're using the directory that contains your organizational Azure AD tenant (for example, Contoso):
+    1. Select the **Directories + subscriptions** icon in the portal toolbar.
+    2. On the **Portal settings | Directories + subscriptions** page, find your Azure AD directory in the **Directory name** list, and then select **Switch**.
+1. In the Azure portal, search for and select **Azure Active Directory**. 
+1. In the left menu, under **Manage**, select **App registrations**.
+1. Select **+ New registration**.
 1. Enter a **Name** for your application. For example, `Azure AD B2C App`.
 1. Accept the default selection of **Accounts in this organizational directory only (Default Directory only - Single tenant)** for this application.
 1. For the **Redirect URI**, accept the value of **Web**, and enter the following URL in all lowercase letters, where `your-B2C-tenant-name` is replaced with the name of your Azure AD B2C tenant.
@@ -69,9 +71,12 @@ To enable sign-in for users with an Azure AD account from a specific Azure AD or
 
 If you want to get the `family_name` and `given_name` claims from Azure AD, you can configure optional claims for your application in the Azure portal UI or application manifest. For more information, see [How to provide optional claims to your Azure AD app](../active-directory/develop/active-directory-optional-claims.md).
 
-1. Sign in to the [Azure portal](https://portal.azure.com) using your organizational Azure AD tenant. Search for and select **Azure Active Directory**.
-1. From the **Manage** section, select **App registrations**.
-1. Select the application you want to configure optional claims for in the list.
+1. Sign in to the [Azure portal](https://portal.azure.com) using your organizational Azure AD tenant. Or if you're already signed in, make sure you're using the directory that contains your organizational Azure AD tenant (for example, Contoso):
+    1. Select the **Directories + subscriptions** icon in the portal toolbar.
+    2. On the **Portal settings | Directories + subscriptions** page, find your Azure AD directory in the **Directory name** list, and then select **Switch**. 
+1. In the Azure portal, search for and select **Azure Active Directory**.
+1. In the left menu, under **Manage**, select **App registrations**.
+1. Select the application you want to configure optional claims for in the list, such as `Azure AD B2C App`. 
 1. From the **Manage** section, select **Token configuration**.
 1. Select **Add optional claim**.
 1. For the **Token type**, select **ID**.

articles/active-directory-b2c/media/partner-grit-editor/sample-code-development-workflow.png

@@ -102,6 +102,13 @@ Microsoft partners with the following ISVs for Web Application Firewall (WAF).
 |  ![Screenshot of Azure WAF logo](./media/partner-gallery/azure-web-application-firewall-logo.png) | [Azure WAF](./partner-azure-web-application-firewall.md) provides centralized protection of your web applications from common exploits and vulnerabilities.  |
 ![Screenshot of Cloudflare logo](./media/partner-gallery/cloudflare-logo.png) | [Cloudflare](./partner-cloudflare.md) is a WAF provider that helps organizations protect against malicious attacks that aim to exploit vulnerabilities such as SQLi, and XSS. |
 
+## Identity verification tools 
+
+Microsoft partners with the following ISVs for tools that can help with implementation of your authentication solution.
+
+| ISV partner | Description and integration walkthroughs |
+|:-------------------------|:--------------|
+| ![Screenshot of a grit ief editor logo.](./media/partner-gallery/grit-logo.png) | [Grit Visual Identity Experience Framework Editor](./partner-grit-editor.md) is a tool that saves time during authentication deployment. It supports multiple languages without the need to write code. It also has a no code debugger for user journeys.|
 
 ## Additional information