Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into FAQ-new

Author: yoninalmsft

.openpublishing.publish.config.json

@@ -978,6 +978,7 @@
     ".openpublishing.redirection.app-service.json",
     ".openpublishing.redirection.key-vault.json",
     ".openpublishing.redirection.sql-database.json",
+    ".openpublishing.redirection.machine-configuration.json",
     ".openpublishing.redirection.security-benchmark.json",
     "articles/synapse-analytics/.openpublishing.redirection.synapse-analytics.json",
     ".openpublishing.redirection.azure-web-pubsub.json",

.openpublishing.redirection.active-directory.json

@@ -55,6 +55,11 @@
       "redirect_url": "/azure/active-directory/authentication/how-to-mfa-registration-campaign",
       "redirect_document_id": false
     },
+    {
+      "source_path_from_root": "/articles/active-directory/develop/workload-identity-federation-create-trust-github.md",
+      "redirect_url":"/azure/active-directory/develop/workload-identity-federation-create-trust",
+      "redirect_document_id": false
+    },
     {
       "source_path_from_root": "/articles/active-directory/develop/active-directory-v2-limitations.md",
       "redirect_url": "/azure/active-directory/azuread-dev/azure-ad-endpoint-comparison",

.openpublishing.redirection.azure-monitor.json

@@ -233,27 +233,27 @@
         },
         {
             "source_path_from_root": "/articles/azure-monitor/visualize/view-designer-conversion-examples.md",
-            "redirect_url": "/azure/azure-monitor/visualize/workbooks-overview",
+            "redirect_url": "/azure/azure-monitor/visualize/workbooks-view-designer-conversion-overview",
             "redirect_document_id": false
         },
         {
             "source_path_from_root": "/articles/azure-monitor/visualize/view-designer-conversion-options.md",
-            "redirect_url": "/azure/azure-monitor/visualize/workbooks-overview",
+            "redirect_url": "/azure/azure-monitor/visualize/workbooks-view-designer-conversion-overview",
             "redirect_document_id": false
         },
         {
             "source_path_from_root": "/articles/azure-monitor/visualize/view-designer-conversion-overview.md",
-            "redirect_url": "/azure/azure-monitor/visualize/workbooks-overview",
+            "redirect_url": "/azure/azure-monitor/visualize/workbooks-view-designer-conversion-overview",
             "redirect_document_id": false
         },
         {
             "source_path_from_root": "/articles/azure-monitor/visualize/view-designer-conversion-tasks.md",
-            "redirect_url": "/azure/azure-monitor/visualize/workbooks-overview",
+            "redirect_url": "/azure/azure-monitor/visualize/workbooks-view-designer-conversion-overview",
             "redirect_document_id": false
         },
         {
             "source_path_from_root": "/articles/azure-monitor/visualize/view-designer-conversion-tiles.md",
-            "redirect_url": "/azure/azure-monitor/visualize/workbooks-overview",
+            "redirect_url": "/azure/azure-monitor/visualize/workbooks-view-designer-conversion-overview",
             "redirect_document_id": false
         },
         {
@@ -268,7 +268,7 @@
         },
         {
             "source_path_from_root": "/articles/azure-monitor/visualize/workbooks-add-text.md",
-            "redirect_url": "/azure/azure-monitor/visualize/workbooks-add-workbook-elements",
+            "redirect_url": "/azure/azure-monitor/visualize/workbooks-create-workbook",
             "redirect_document_id": false
         },
         {
@@ -301,14 +301,34 @@
             "redirect_url": "/azure/azure-monitor/alerts/alerts-types",
             "redirect_document_id": false
         },
+        {
+            "source_path_from_root": "/articles/azure-monitor/alerts/alerts-page.md" ,
+            "redirect_url": "/azure/azure-monitor/alerts/alerts-manage-alert-instances",
+            "redirect_document_id": false
+        },
         {
             "source_path_from_root": "/articles/azure-monitor/alerts/alerts-managing-alert-instances.md" ,
-            "redirect_url": "/azure/azure-monitor/alerts/alerts-page",
+            "redirect_url": "/azure/azure-monitor/alerts/alerts-manage-alert-instances",
             "redirect_document_id": false
         },
         {
             "source_path_from_root": "/articles/azure-monitor/alerts/alerts-managing-alert-states.md" ,
-            "redirect_url": "/azure/azure-monitor/alerts/alerts-page",
+            "redirect_url": "/azure/azure-monitor/alerts/alerts-manage-alert-instances",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-monitor/alerts/alerts-metric.md" ,
+            "redirect_url": "/azure/azure-monitor/alerts/alerts-create-new-alert-rule",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-monitor/alerts/alerts-log.md" ,
+            "redirect_url": "/azure/azure-monitor/alerts/alerts-create-new-alert-rule",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-monitor/alerts/alerts-activity-log.md" ,
+            "redirect_url": "/azure/azure-monitor/alerts/alerts-create-new-alert-rule",
             "redirect_document_id": false
         },
         {
@@ -341,6 +361,11 @@
             "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",
@@ -480,6 +505,11 @@
             "source_path_from_root": "/articles/azure-monitor/app/cloudservices.md" ,
             "redirect_url": "/azure/azure-monitor/app/azure-web-apps-net-core",
             "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-monitor/logs/workspace-design-service-providers.md" ,
+            "redirect_url": "/azure/azure-monitor/logs/workspace-design",
+            "redirect_document_id": false
         }
     ]
 }

.openpublishing.redirection.json

@@ -434,6 +434,16 @@
       "redirect_url": "/azure/azure-arc/kubernetes/conceptual-agent-overview",
       "redirect_document_id": false
     },
+    {
+      "source_path": "articles/cognitive-services/language-service/custom-text-classification/how-to/improve-model.md",
+      "redirect_url": "/azure/cognitive-services/language-service/custom-text-classification/how-to/view-model-evaluation",
+      "redirect_document_id": true
+    },
+    {
+      "source_path": "articles/cognitive-services/language-service/custom-named-entity-recognition/how-to/improve-model.md",
+      "redirect_url": "/azure/cognitive-services/language-service/custom-named-entity-recognition/how-to/view-model-evaluation",
+      "redirect_document_id": true
+    },
     {
       "source_path": "articles/cognitive-services/conversational-language-understanding/how-to/deploy-query-model.md",
       "redirect_url": "/azure/cognitive-services/language-service/conversational-language-understanding/how-to/deploy-model",
@@ -7641,6 +7651,16 @@
       "redirect_url": "/azure/azure-monitor/app/overview-dashboard",
       "redirect_document_id": true
     },
+    {
+      "source_path_from_root": "/articles/azure-monitor/agents/azure-monitor-agent-overview.md",
+      "redirect_url": "/azure/azure-monitor/agents/agents-overview",
+      "redirect_document_id": true
+    },
+    {
+      "source_path_from_root": "/azure/azure-monitor/agents/agents-overview.md#log-analytics-agent",
+      "redirect_url": "/azure/azure-monitor/agents/log-analytics-agent",
+      "redirect_document_id": true
+    },
     {
       "source_path_from_root": "/articles/cognitive-services/Computer-vision/deploy-computer-vision-on-container-instances.md",
       "redirect_url": "/azure/cognitive-services/containers/azure-container-instance-recipe",
@@ -7734,7 +7754,7 @@
     {
       "source_path_from_root": "/articles/cognitive-services/language-service/custom-classification/how-to/view-model-evaluation.md",
       "redirect_url": "/azure/cognitive-services/language-service/custom-text-classification/how-to/view-model-evaluation",
-      "redirect_document_id": true
+      "redirect_document_id": false
     },
     {
       "source_path_from_root": "/articles/cognitive-services/language-service/custom-classification/concepts/data-formats.md",

.openpublishing.redirection.machine-configuration.json

@@ -0,0 +1,69 @@
+{
+    "redirections": [
+        {
+          "source_path_from_root": "/articles/governance/policy/concepts/guest-configuration.md",
+          "redirect_url": "/azure/governance/machine-configuration/overview",
+          "redirect_document_id": false
+        },
+        {
+          "source_path_from_root": "/articles/governance/policy/concepts/guest-configuration-policy-effects.md",
+          "redirect_url": "/azure/governance/machine-configuration/machine-configuration-policy-effects",
+          "redirect_document_id": false
+        },
+        {
+          "source_path_from_root": "/articles/governance/policy/how-to/guest-configuration-desired-state-configuration-extension-migration.md",
+          "redirect_url": "/azure/governance/machine-configuration/machine-configuration-dsc-extension-migration",
+          "redirect_document_id": false
+        },
+        {
+          "source_path_from_root": "/articles/governance/policy/concepts/guest-configuration-custom.md",
+          "redirect_url": "/azure/governance/machine-configuration/machine-configuration-custom",
+          "redirect_document_id": false
+        },
+        {
+          "source_path_from_root": "/articles/governance/policy/how-to/guest-configuration-create.md",
+          "redirect_url": "/azure/governance/machine-configuration/machine-configuration-create",
+          "redirect_document_id": false
+        },
+        {
+          "source_path_from_root": "/articles/governance/policy/how-to/guest-configuration-create-test.md",
+          "redirect_url": "/azure/governance/machine-configuration/machine-configuration-create-test",
+          "redirect_document_id": false
+        },
+        {
+          "source_path_from_root": "/articles/governance/policy/how-to/guest-configuration-create-signing.md",
+          "redirect_url": "/azure/governance/machine-configuration/machine-configuration-create-signing",
+          "redirect_document_id": false
+        },
+        {
+          "source_path_from_root": "/articles/governance/policy/how-to/guest-configuration-create-setup.md",
+          "redirect_url": "/azure/governance/machine-configuration/machine-configuration-create-setup",
+          "redirect_document_id": false
+        },
+        {
+          "source_path_from_root": "/articles/governance/policy/how-to/guest-configuration-create-publish.md",
+          "redirect_url": "/azure/governance/machine-configuration/machine-configuration-create-publish",
+          "redirect_document_id": false
+        },
+        {
+          "source_path_from_root": "/articles/governance/policy/how-to/guest-configuration-create-definition.md",
+          "redirect_url": "/azure/governance/machine-configuration/machine-configuration-create-definition",
+          "redirect_document_id": false
+        },
+        {
+          "source_path_from_root": "/articles/governance/policy/how-to/guest-configuration-create-assignment.md",
+          "redirect_url": "/azure/governance/machine-configuration/machine-configuration-create-assignment",
+          "redirect_document_id": false
+        },
+        {
+          "source_path_from_root": "/articles/governance/policy/how-to/guest-configuration-azure-automation-migration.md",
+          "redirect_url": "/azure/governance/machine-configuration/machine-configuration-azure-automation-migration",
+          "redirect_document_id": false
+        },
+        {
+          "source_path_from_root": "/articles/governance/policy/concepts/guest-configuration-assignments.md",
+          "redirect_url": "/azure/governance/machine-configuration/machine-configuration-assignments",
+          "redirect_document_id": false
+        },
+      ]
+}

.whatsnew/.azure-monitor.json

@@ -0,0 +1,77 @@
+{
+  "$schema": "https://whatsnewapi.azurewebsites.net/schema",
+  "docSetProductName": "Azure Monitor",
+  "rootDirectory": "articles/azure-monitor/",
+  "docLinkSettings": {
+    "linkFormat": "relative",
+    "relativeLinkPrefix": "/azure/azure-monitor/"
+  },
+  "inclusionCriteria": {
+    "labels": [
+      "label:whats-new"
+    ],
+    "minAdditionsToFile": 1
+  },
+  "areas": [
+    {
+      "names": ["."],
+      "heading": "General"
+    },
+    {
+      "names":["agents"],
+      "heading": "Agents"
+    },
+    {
+      "names":["alters"],
+      "heading": "Alerts"
+    },
+    {
+      "names":["app"],
+      "heading": "Application Insights"
+    },
+    {
+      "names":["autoscale"],
+      "heading": "Autoscale"
+    },
+    {
+      "names":["change"],
+      "heading": "Change Analysis"
+    },
+    {
+      "names":["containers"],
+      "heading": "Containers"
+    },
+    {
+      "names":["essentials"],
+      "heading": "Essentials"
+    },
+    {
+      "names":["insights"],
+      "heading": "Insights"
+    },
+    {
+      "names":["logs"],
+      "heading": "Logs"
+    },
+    {
+      "names":["media"],
+      "heading": "Media"
+    },
+    {
+      "names":["profiler"],
+      "heading": "Profiler"
+    },
+    {
+      "names":["snapshot-debugger"],
+      "heading": "Snapshot Debugger"
+    },
+    {
+      "names":["visualize"],
+      "heading": "Visualize"
+    },
+    {
+      "names":["vm"],
+      "heading": "VMs"
+    }
+  ]
+}

articles/active-directory-b2c/contentdefinitions.md

@@ -162,19 +162,19 @@ The following example shows the content definition identifiers and the correspon
       <DataUri>urn:com:microsoft:aad:b2c:elements:contract:providerselection:1.2.1</DataUri>
     </ContentDefinition>
     <ContentDefinition Id="api.signuporsignin">
-      <DataUri>urn:com:microsoft:aad:b2c:elements:contract:unifiedssp:2.1.5</DataUri>
+      <DataUri>urn:com:microsoft:aad:b2c:elements:contract:unifiedssp:2.1.7</DataUri>
     </ContentDefinition>
     <ContentDefinition Id="api.selfasserted">
-      <DataUri>urn:com:microsoft:aad:b2c:elements:contract:selfasserted:2.1.7</DataUri>
+      <DataUri>urn:com:microsoft:aad:b2c:elements:contract:selfasserted:2.1.14</DataUri>
     </ContentDefinition>
     <ContentDefinition Id="api.selfasserted.profileupdate">
-      <DataUri>urn:com:microsoft:aad:b2c:elements:contract:selfasserted:2.1.7</DataUri>
+      <DataUri>urn:com:microsoft:aad:b2c:elements:contract:selfasserted:2.1.14</DataUri>
     </ContentDefinition>
     <ContentDefinition Id="api.localaccountsignup">
-      <DataUri>urn:com:microsoft:aad:b2c:elements:contract:selfasserted:2.1.7</DataUri>
+      <DataUri>urn:com:microsoft:aad:b2c:elements:contract:selfasserted:2.1.14</DataUri>
     </ContentDefinition>
     <ContentDefinition Id="api.localaccountpasswordreset">
-      <DataUri>urn:com:microsoft:aad:b2c:elements:contract:selfasserted:2.1.7</DataUri>
+      <DataUri>urn:com:microsoft:aad:b2c:elements:contract:selfasserted:2.1.14</DataUri>
     </ContentDefinition>
     <ContentDefinition Id="api.phonefactor">
       <RecoveryUri>~/common/default_page_error.html</RecoveryUri>

articles/active-directory-b2c/extensions-app.md

@@ -31,15 +31,34 @@ To verify that the b2c-extensions-app is present:
 
 ## Recover the extensions app
 
-If you accidentally deleted the b2c-extensions-app, you have 30 days to recover it. You can restore the app using the Graph API:
+If you accidentally deleted the `b2c-extensions-app`, you have 30 days to recover it.
 
+> [!NOTE]
+> An application can only be restored if it has been deleted within the last 30 days. If it has been more than 30 days, data will be permanently lost. For more assistance, file a support ticket.
+
+<!--Hide portal steps until SP bug is fixed
+### Recover the extensions app using the Azure portal
+
+1. Sign in to your Azure AD B2C tenant.
+2. Search for and open **App registrations**.
+1. Select the **Deleted applications** tab and identify the `b2c-extensions-app` from the list of recently deleted applications.
+1. Select **Restore app registration**.
+
+You should now be able to [see the restored app](#verifying-that-the-extensions-app-is-present) in the Azure portal.
+-->
+### Recover the extensions app using Microsoft Graph
+To restore the app using Microsoft Graph, you must restore both the application object and the service principal. For more information, see the [Restore deleted item](/graph/api/directory-deleteditems-restore) API.
+
+To restore the application object:
 1. Browse to [https://developer.microsoft.com/en-us/graph/graph-explorer](https://developer.microsoft.com/en-us/graph/graph-explorer).
 1. Log in to the site as a global administrator for the Azure AD B2C directory that you want to restore the deleted app for. This global administrator must have an email address similar to the following: `username@{yourTenant}.onmicrosoft.com`.
-1. Issue an HTTP GET against the URL `https://graph.microsoft.com/beta/directory/deleteditems/microsoft.graph.application`. This operation will list all of the applications that have been deleted within the past 30 days.
-1. Find the application in the list where the name begins with 'b2c-extensions-app’ and copy its `objectid` property value.
-1. Issue an HTTP POST against the URL `https://graph.microsoft.com/beta/directory/deleteditems/{id}/restore`. Replace the `{id}` portion of the URL with the `objectid` from the previous step.
+1. Issue an HTTP GET against the URL `https://graph.microsoft.com/v1.0/directory/deleteditems/microsoft.graph.application`. This operation will list all of the applications that have been deleted within the past 30 days. You can also use the URL `https://graph.microsoft.com/v1.0/directory/deletedItems/microsoft.graph.application?$filter=displayName eq 'b2c-extensions-app. Do not modify. Used by AADB2C for storing user data.'` to filter by the app's **displayName** property.
+1. Find the application in the list where the name begins with `b2c-extensions-app` and copy its `id` property value.
+1. Issue an HTTP POST against the URL `https://graph.microsoft.com/v1.0/directory/deleteditems/{id}/restore`. Replace the `{id}` portion of the URL with the `id` from the previous step.]
 
-You should now be able to [see the restored app](#verifying-that-the-extensions-app-is-present) in the Azure portal.
+To restore the service principal object:
+1. Issue an HTTP GET against the URL `https://graph.microsoft.com/v1.0/directory/deleteditems/microsoft.graph.servicePrincipal`. This operation will list all of the service principals that have been deleted within the past 30 days. You can also use the URL `https://graph.microsoft.com/v1.0/directory/deletedItems/microsoft.graph.servicePrincipal?$filter=displayName eq 'b2c-extensions-app. Do not modify. Used by AADB2C for storing user data.'` to filter by the app's **displayName** property.
+1. Find the service principal in the list where the name begins with `b2c-extensions-app` and copy its `id` property value.
+1. Issue an HTTP POST against the URL `https://graph.microsoft.com/v1.0/directory/deleteditems/{id}/restore`. Replace the `{id}` portion of the URL with the `id` from the previous step.
 
-> [!NOTE]
-> An application can only be restored if it has been deleted within the last 30 days. If it has been more than 30 days, data will be permanently lost. For more assistance, file a support ticket.
+You should now be able to [see the restored app](#verifying-that-the-extensions-app-is-present) in the Azure portal.