Merge branch 'main' into three-active-directory-recovery-articles

Author: ShawnJackson

.openpublishing.publish.config.json

@@ -32,6 +32,18 @@
   "need_preview_pull_request": true,
   "contribution_branch_mappings": {},
   "dependent_repositories": [
+    {
+      "path_to_root": "azure-dev-docs-pr",
+      "url": "https://github.com/MicrosoftDocs/azure-dev-docs-pr",
+      "branch": "main",
+      "branch_mapping": {}
+    },
+    {
+      "path_to_root": "terraform_samples",
+      "url": "https://github.com/Azure/terraform",
+      "branch": "master",
+      "branch_mapping": {}
+    },
     {
       "path_to_root": "quickstart-templates",
       "url": "https://github.com/Azure/azure-quickstart-templates",
@@ -79,7 +91,7 @@
       "url": "https://github.com/Azure-Samples/msdocs-storage-bind-function-service",
       "branch": "main",
       "branch_mapping": {}
-    },    
+    },
     {
       "path_to_root": "azure_cli_scripts",
       "url": "https://github.com/Azure-Samples/azure-cli-samples",
@@ -889,8 +901,19 @@
       "url": "https://github.com/Azure-Samples/azure-sql-binding-func-dotnet-todo",
       "branch": "docs-snippets",
       "branch_mapping": {}
+    },
+    {
+      "path_to_root": "ms-identity-node",
+      "url": "https://github.com/Azure-Samples/ms-identity-node",
+      "branch": "main",
+      "branch_mapping": {}
+    },
+    {
+      "path_to_root": "ms-identity-javascript-nodejs-desktop",
+      "url": "https://github.com/Azure-Samples/ms-identity-javascript-nodejs-desktop",
+      "branch": "main",
+      "branch_mapping": {}
     }
-
   ],
   "branch_target_mapping": {
     "live": ["Publish", "PDF"],

.openpublishing.redirection.azure-monitor.json

@@ -1,5 +1,65 @@
 {
     "redirections": [
+        {
+            "source_path_from_root": "/articles/azure-monitor/app/profiler.md",
+            "redirect_url": "/azure/azure-monitor/profiler/profiler",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-monitor/app/profiler-aspnetcore-linux.md",
+            "redirect_url": "/azure/azure-monitor/profiler/profiler-aspnetcore-linux",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-monitor/app/profiler-azure-functions.md",
+            "redirect_url": "/azure/azure-monitor/profiler/profiler-azure-functions",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-monitor/app/profiler-bring-your-own-storage.md",
+            "redirect_url": "/azure/azure-monitor/profiler/profiler-bring-your-own-storage",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-monitor/app/profiler-cloudservice.md",
+            "redirect_url": "/azure/azure-monitor/profiler/profiler-cloudservice",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-monitor/app/profiler-containers.md",
+            "redirect_url": "/azure/azure-monitor/profiler/profiler-containers",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-monitor/app/profiler-overview.md",
+            "redirect_url": "/azure/azure-monitor/profiler/profiler-overview",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-monitor/app/profiler-servicefabric.md",
+            "redirect_url": "/azure/azure-monitor/profiler/profiler-servicefabric",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-monitor/app/profiler-settings.md",
+            "redirect_url": "/azure/azure-monitor/profiler/profiler-settings",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-monitor/app/profiler-trackrequests.md",
+            "redirect_url": "/azure/azure-monitor/profiler/profiler-trackrequests",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-monitor/app/profiler-troubleshooting.md",
+            "redirect_url": "/azure/azure-monitor/profiler/profiler-troubleshooting",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-monitor/app/profiler-vm.md",
+            "redirect_url": "/azure/azure-monitor/profiler/profiler-vm",
+            "redirect_document_id": false
+        },
         {
             "source_path_from_root": "/articles/azure-monitor/app/app-insights-dashboards.md",
             "redirect_url": "/azure/azure-monitor/app/overview-dashboard",
@@ -102,22 +162,42 @@
         },
         {
             "source_path_from_root": "/articles/azure-monitor/alerts/alerts-metric-overview.md" ,
-            "redirect_url": "/azure/azure-monitor/alerts/alert-types.md#metric-alerts",
+            "redirect_url": "/azure/azure-monitor/alerts/alerts-types",
             "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.md",
             "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_document_id": false
+        },
         {
             "source_path_from_root": "/articles/azure-monitor/alerts/alerts-unified-log.md" ,
-            "redirect_url": "/azure/azure-monitor/alerts/alert-types.md#log-alerts",
+            "redirect_url": "/azure/azure-monitor/alerts/alerts-types",
             "redirect_document_id": false
         },
         {
             "source_path_from_root": "/articles/azure-monitor/alerts/activity-log-alerts.md" ,
-            "redirect_url": "/azure/azure-monitor/alerts/alert-types.md#activity-log-alerts",
+            "redirect_url": "/azure/azure-monitor/alerts/alerts-types",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-monitor/alerts/alerts-smartgroups-overview.md" ,
+            "redirect_url": "/azure/azure-monitor/alerts/alerts-types",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-monitor/alerts/alerts-managing-smart-groups.md" ,
+            "redirect_url": "/azure/azure-monitor/alerts/alerts-types",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-monitor/insights/data-explorer.md" ,
+            "redirect_url": "/azure/data-explorer/data-explorer-insights",
             "redirect_document_id": false
         }
     ]