Merge branch 'MicrosoftDocs:main' into docs-editor/map-data-fields-to-entities-1689594566

Author: yelevin

.openpublishing.publish.config.json

@@ -1015,7 +1015,13 @@
       "url": "https://github.com/Azure/actions-workflow-samples",
       "branch": "master",
       "branch_mapping": {}
-    }  
+    },
+    {
+      "path_to_root": "azure-proactive-resiliency-library",
+      "url": "https://github.com/Azure/Azure-Proactive-Resiliency-Library",
+      "branch": "main",
+      "branch_mapping": {}
+    }
   ],
   "branch_target_mapping": {
     "live": ["Publish", "PDF"],
@@ -1060,15 +1066,17 @@
   ".openpublishing.redirection.sql-database.json",
   ".openpublishing.redirection.virtual-desktop.json",
   ".openpublishing.redirection.devops-project.json",
-  "articles/applied-ai-services/.openpublishing.redirection.applied-ai-old.json",
-  "articles/applied-ai-services/.openpublishing.redirection.applied-ai-services.json",
+  "articles/ai-services/.openpublishing.redirection.ai-services-from-applied.json",
+  "articles/ai-services/.openpublishing.redirection.ai-services-from-cog.json",
+  "articles/ai-services/.openpublishing.redirection.applied-ai-old.json",
+  "articles/ai-services/.openpublishing.redirection.applied-ai-services.json",
+  "articles/ai-services/.openpublishing.redirection.cognitive-services.json",
   "articles/azure-fluid-relay/.openpublishing.redirection.fluid-relay.json",
   "articles/azure-netapp-files/.openpublishing.redirection.azure-netapp-files.json",
   "articles/azure-relay/.openpublishing.redirection.relay.json",
   "articles/azure-video-analyzer/.openpublishing.redirection.azure-video-analyzer.json",
   "articles/azure-video-indexer/.openpublishing.redirection.azure-video-indexer.json",
   "articles/cloud-shell/.openpublishing.redirection.cloud-shell.json",
-  "articles/cognitive-services/.openpublishing.redirection.cognitive-services.json",
   "articles/communication-services/.openpublishing.redirection.communication-services.json",
   "articles/confidential-computing/.openpublishing.redirection.json",
   "articles/container-apps/.openpublishing.redirection.container-apps.json",

.openpublishing.redirection.azure-monitor.json

@@ -6176,7 +6176,7 @@
             "redirect_url": "/azure/azure-monitor/app/javascript-sdk-configuration",
             "redirect_document_id": false
         },
-       {
+        {
             "source_path_from_root": "/articles/azure-monitor/agents/data-collection-firewall.md",
             "redirect_url": "/azure/azure-monitor/agents/data-collection-rule-azure-monitor-agent",
             "redirect_document_id": false
@@ -6185,6 +6185,16 @@
             "source_path_from_root": "/articles/azure-monitor/autoscale/tutorial-autoscale-performance-schedule.md",
             "redirect_url": "/previous-versions/azure/azure-monitor/autoscale/tutorial-autoscale-performance-schedule",
             "redirect_document_id": false
+        }, 
+        {
+            "source_path_from_root": "/articles/azure-monitor/essentials/metrics-supported.md",
+            "redirect_url": "/azure/azure-monitor/reference/supported-metrics/metrics-index",
+            "redirect_document_id": false
+        }, 
+        {
+            "source_path_from_root": "/articles/azure-monitor/essentials/resource-logs-categories.md",
+            "redirect_url": "/azure/azure-monitor/reference/supported-logs/logs-index",
+            "redirect_document_id": false
         } 
     ]
 }

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

@@ -835,6 +835,11 @@
             "redirect_url": "/azure/defender-for-cloud/connect-azure-subscription",
             "redirect_document_id": true
         },
+        {
+            "source_path_from_root": "/articles/defender-for-cloud/enable-vulnerability-assessment-agentless.md",
+            "redirect_url": "/azure/defender-for-cloud/enable-agentless-scanning-vms",
+            "redirect_document_id": true
+        },
         {
             "source_path_from_root": "/articles/defender-for-cloud/defender-for-storage-exclude.md",
             "redirect_url": "/azure/defender-for-cloud/defender-for-storage-classic-enable#exclude-a-storage-account-from-a-protected-subscription-in-the-per-transaction-plan",

.openpublishing.redirection.json

@@ -1790,6 +1790,21 @@
             "redirect_url": "/azure/automanage/index",
             "redirect_document_id": false
         },
+        {
+            "source_path": "articles/automanage/windows-server-azure-edition-vnext.md",
+            "redirect_URL": "/windows-server/get-started/azure-edition",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "articles/automanage/automanage-hotpatch.md",
+            "redirect_URL": "/windows-server/get-started/hotpatch",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "articles/automanage/automanage-windows-server-services-overview.md",
+            "redirect_URL": "/windows-server/get-started/azure-edition",
+            "redirect_document_id": false
+        },
         {
             "source_path_from_root": "/articles/aks/view-metrics.md",
             "redirect_url": "/azure/aks/monitor-aks",
@@ -13318,6 +13333,21 @@
             "redirect_url": "/azure/governance/policy/samples/index",
             "redirect_document_id": false
         },
+        {
+            "source_path_from_root": "/articles/governance/policy/samples/PCIv3_2_1_2018_audit.md pci-dss-3-2-1.md",
+            "redirect_url": "/azure/governance/policy/samples/index",
+            "redirect_document_id": false
+        },
+        {
+          "source_path_from_root": "/articles/governance/policy/samples/PCIv3_2_1_2018_audit.md",
+          "redirect_url": "/azure/governance/policy/samples/pci-dss-3-2-1",
+          "redirect_document_id": false
+        },
+        {
+          "source_path_from_root": "/articles/governance/policy/samples/pci_dss_v4.0.md",
+          "redirect_url": "/azure/governance/policy/samples/pci-dss-4-0",
+          "redirect_document_id": false
+        },
         {
             "source_path_from_root": "/articles/azure-policy/create-manage-policy.md",
             "redirect_url": "/azure/governance/policy/tutorials/create-and-manage",
@@ -22075,67 +22105,67 @@
         },
         {
             "source_path_from_root": "/articles/labs/anomaly-finder/apiref.md",
-            "redirect_url": "/azure/cognitive-services/anomaly-detector/",
+            "redirect_url": "/azure/ai-services/anomaly-detector/",
             "redirect_document_id": false
         },
         {
             "source_path_from_root": "/articles/labs/anomaly-finder/overview.md",
-            "redirect_url": "/azure/cognitive-services/anomaly-detector/overview",
+            "redirect_url": "/azure/ai-services/anomaly-detector/overview",
             "redirect_document_id": false
         },
         {
             "source_path_from_root": "/articles/labs/anomaly-finder/quickstart/csharp.md",
-            "redirect_url": "/azure/cognitive-services/anomaly-detector/quickstarts/detect-data-anomalies-csharp",
+            "redirect_url": "/azure/ai-services/anomaly-detector/quickstarts/detect-data-anomalies-csharp",
             "redirect_document_id": false
         },
         {
             "source_path_from_root": "/articles/labs/anomaly-finder/quickstart/csharp-tutorial.md",
-            "redirect_url": "/azure/cognitive-services/anomaly-detector/quickstarts/detect-data-anomalies-csharp",
+            "redirect_url": "/azure/ai-services/anomaly-detector/quickstarts/detect-data-anomalies-csharp",
             "redirect_document_id": false
         },
         {
             "source_path_from_root": "/articles/labs/anomaly-finder/quickstart/curl.md",
-            "redirect_url": "/azure/cognitive-services/anomaly-detector/quickstarts/detect-data-anomalies-csharp",
+            "redirect_url": "/azure/ai-services/anomaly-detector/quickstarts/detect-data-anomalies-csharp",
             "redirect_document_id": false
         },
         {
             "source_path_from_root": "/articles/labs/anomaly-finder/quickstart/java.md",
-            "redirect_url": "/azure/cognitive-services/anomaly-detector/quickstarts/detect-data-anomalies-java",
+            "redirect_url": "/azure/ai-services/anomaly-detector/quickstarts/detect-data-anomalies-java",
             "redirect_document_id": false
         },
         {
             "source_path_from_root": "/articles/labs/anomaly-finder/quickstart/java-tutorial.md",
-            "redirect_url": "/azure/cognitive-services/anomaly-detector/quickstarts/detect-data-anomalies-java",
+            "redirect_url": "/azure/ai-services/anomaly-detector/quickstarts/detect-data-anomalies-java",
             "redirect_document_id": false
         },
         {
             "source_path_from_root": "/articles/labs/anomaly-finder/quickstart/javascript.md",
-            "redirect_url": "/azure/cognitive-services/anomaly-detector/quickstarts/detect-data-anomalies-python",
+            "redirect_url": "/azure/ai-services/anomaly-detector/quickstarts/detect-data-anomalies-python",
             "redirect_document_id": false
         },
         {
             "source_path_from_root": "/articles/labs/anomaly-finder/quickstart/javascript-tutorial.md",
-            "redirect_url": "/azure/cognitive-services/anomaly-detector/quickstarts/detect-data-anomalies-python",
+            "redirect_url": "/azure/ai-services/anomaly-detector/quickstarts/detect-data-anomalies-python",
             "redirect_document_id": false
         },
         {
             "source_path_from_root": "/articles/labs/anomaly-finder/quickstart/php.md",
-            "redirect_url": "/azure/cognitive-services/anomaly-detector/quickstarts/detect-data-anomalies-python",
+            "redirect_url": "/azure/ai-services/anomaly-detector/quickstarts/detect-data-anomalies-python",
             "redirect_document_id": false
         },
         {
             "source_path_from_root": "/articles/labs/anomaly-finder/quickstart/python.md",
-            "redirect_url": "/azure/cognitive-services/anomaly-detector/quickstarts/detect-data-anomalies-python",
+            "redirect_url": "/azure/ai-services/anomaly-detector/quickstarts/detect-data-anomalies-python",
             "redirect_document_id": false
         },
         {
             "source_path_from_root": "/articles/labs/anomaly-finder/quickstart/python-tutorial.md",
-            "redirect_url": "/azure/cognitive-services/anomaly-detector/quickstarts/detect-data-anomalies-python",
+            "redirect_url": "/azure/ai-services/anomaly-detector/quickstarts/detect-data-anomalies-python",
             "redirect_document_id": false
         },
         {
             "source_path_from_root": "/articles/labs/anomaly-finder/quickstart/ruby.md",
-            "redirect_url": "/azure/cognitive-services/anomaly-detector/quickstarts/detect-data-anomalies-python",
+            "redirect_url": "/azure/ai-services/anomaly-detector/quickstarts/detect-data-anomalies-python",
             "redirect_document_id": false
         },
         {
@@ -24017,6 +24047,16 @@
             "source_path_from_root": "/articles/container-registry/github-action-scan.md",
             "redirect_url": "/azure/developer/github/",
             "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/virtual-machines/virtual-machines-reliability.md",
+            "redirect_url": "/azure/virtual-machines/reliability-virtual-machines",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/private-link/tutorial-private-endpoint-webapp-portal.md",
+            "redirect_url": "/azure/private-link/create-private-endpoint-portal",
+            "redirect_document_id": false
         }
     ]
 }

CODEOWNERS

@@ -39,7 +39,7 @@ articles/service-health @rboucher
 /articles/synapse-analytics/synapse-link/ @Rodrigossz @SnehaGunda @jovanpop-msft
 
 # Cognitive Services
-/articles/cognitive-services/ @aahill @patrickfarley @nitinme @mrbullwinkle @laujan @eric-urban @jboback
+/articles/ai-services/ @aahill @patrickfarley @nitinme @mrbullwinkle @laujan @eric-urban @jboback
 
 # DevOps
 /articles/ansible/ @TomArcherMsft

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

@@ -34,7 +34,7 @@ You can create an API endpoint using one of our [samples](api-connector-samples.
 
 To use an [API connector](api-connectors-overview.md), you first create the API connector and then enable it in a user flow.
 
-1. Sign in to the [Azure portal](https://portal.azure.com/).
+1. Sign in to the [Azure portal](https://portal.azure.com).
 1. Under **Azure services**, select **Azure AD B2C**.
 1. Select **API connectors**, and then select **New API connector**.
 
@@ -52,7 +52,7 @@ To use an [API connector](api-connectors-overview.md), you first create the API
 
 Follow these steps to add an API connector to a sign-up user flow.
 
-1. Sign in to the [Azure portal](https://portal.azure.com/).
+1. Sign in to the [Azure portal](https://portal.azure.com).
 1. Under **Azure services**, select **Azure AD B2C**.
 1. Select **User flows**, and then select the user flow you want to add the API connector to.
 1. Select **API connectors**, and then select the API endpoint you want to invoke at the **Before sending the token (preview)** step in the user flow:

articles/active-directory-b2c/add-sign-in-policy.md

@@ -27,7 +27,7 @@ The sign-in policy lets users:
 * Sign in with an Azure AD B2C Local Account
 * Users can sign-in with a social account
 * Password reset
-* Users cannot sign up for an Azure AD B2C Local Account. To create an account, an administrator can use [Azure portal](manage-users-portal.md#create-a-consumer-user), or [MS Graph API](microsoft-graph-operations.md).
+* Users cannot sign up for an Azure AD B2C Local Account. To create an account, an administrator can use the [Azure portal](manage-users-portal.md#create-a-consumer-user), or [Microsoft Graph API](microsoft-graph-operations.md).
 
 ![Profile editing flow](./media/add-sign-in-policy/sign-in-user-flow.png)
 

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

@@ -124,7 +124,7 @@ grant_type=authorization_code&client_id=90c0fe63-bcf2-44d5-8fb7-b8bbc0b29dc6&sco
 | client_id |Required |The application ID assigned to your app in the [Azure portal](https://portal.azure.com).|
 | client_secret | Yes, in Web Apps | The application secret that was generated in the [Azure portal](https://portal.azure.com/). Client secrets are used in this flow for Web App scenarios, where the client can securely store a client secret. For Native App (public client) scenarios, client secrets cannot be securely stored, and therefore are not used in this call. If you use a client secret, please change it on a periodic basis. |
 | grant_type |Required |The type of grant. For the authorization code flow, the grant type must be `authorization_code`. |
-| scope |Required |A space-separated list of scopes. A single scope value indicates to Azure AD both of the permissions that are being requested. Using the client ID as the scope indicates that your app needs an access token that can be used against your own service or web API, represented by the same client ID.  The `offline_access` scope indicates that your app needs a refresh token for long-lived access to resources.  You also can use the `openid` scope to request an ID token from Azure AD B2C. |
+| scope |Recommended |A space-separated list of scopes. A single scope value indicates to Azure AD both of the permissions that are being requested. Using the client ID as the scope indicates that your app needs an access token that can be used against your own service or web API, represented by the same client ID.  The `offline_access` scope indicates that your app needs a refresh token for long-lived access to resources.  You also can use the `openid` scope to request an ID token from Azure AD B2C. |
 | code |Required |The authorization code that you acquired in from the `/authorize` endpoint. |
 | redirect_uri |Required |The redirect URI of the application where you received the authorization code. |
 | code_verifier | recommended | The same `code_verifier` used to obtain the authorization code. Required if PKCE was used in the authorization code grant request. For more information, see the [PKCE RFC](https://tools.ietf.org/html/rfc7636). |

articles/active-directory-b2c/conditional-access-user-flow.md

@@ -88,7 +88,7 @@ Azure AD B2C **Premium P2** is required to create risky sign-in policies. **Prem
 
 To add a Conditional Access policy, disable security defaults:
 
-1. Sign in to the [Azure portal](https://portal.azure.com/).
+1. Sign in to the [Azure portal](https://portal.azure.com).
 1. Make sure you're using the directory that contains your Azure AD B2C tenant. Select the **Directories + subscriptions** icon in the portal toolbar.
 1. On the **Portal settings | Directories + subscriptions** page, find your Azure AD B2C directory in the **Directory name** list, and then select **Switch**.
 1. Under **Azure services**, select **Azure Active Directory**. Or use the search box to find and select **Azure Active Directory**.
@@ -421,7 +421,7 @@ The claims transformation isn't limited to the `strongAuthenticationPhoneNumber`
 
 To review the result of a Conditional Access event:
 
-1. Sign in to the [Azure portal](https://portal.azure.com/).
+1. Sign in to the [Azure portal](https://portal.azure.com).
 1. Make sure you're using the directory that contains your Azure AD B2C tenant. Select the **Directories + subscriptions** icon in the portal toolbar.
 1. On the **Portal settings | Directories + subscriptions** page, find your Azure AD B2C directory in the **Directory name** list, and then select **Switch**.
 1. Under **Azure services**, select **Azure AD B2C**. Or use the search box to find and select **Azure AD B2C**.

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

@@ -7,7 +7,7 @@ author: kengaderdus
 manager: CelesteDG
 ms.service: active-directory
 ms.workload: identity
-ms.custom: devx-track-js
+ms.custom: devx-track-js, devx-track-linux
 ms.topic: how-to
 ms.date: 07/07/2022
 ms.author: kengaderdus