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

Author: PatrickFarley

.openpublishing.publish.config.json

@@ -230,6 +230,12 @@
       "branch": "master",
       "branch_mapping": {}
     },
+    {
+      "path_to_root": "function-app-arm-templates",
+      "url": "https://github.com/Azure-Samples/function-app-arm-templates",
+      "branch": "main",
+      "branch_mapping": {}
+    },    
     {
       "path_to_root": "functions-azure-product",
       "url": "https://github.com/Azure/Azure-Functions",
@@ -1204,6 +1210,7 @@
   "articles/iot-edge/.openpublishing.redirection.iot-edge.json",
   "articles/iot/.openpublishing.redirection.iot.json",
   "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/logic-apps/.openpublishing.redirection.logic-apps.json",
   "articles/machine-learning/.openpublishing.redirection.machine-learning.json",

.openpublishing.redirection.api-management.json

@@ -1,5 +1,30 @@
 {
   "redirections": [
+    {
+        "source_path_from_root": "/articles/api-management/authorizations-overview.md",
+        "redirect_url": "/azure/api-management/credentials-overview",
+        "redirect_document_id": false
+    },
+    {
+        "source_path_from_root": "/articles/api-management/authorizations-configure-common-providers.md",
+        "redirect_url": "/azure/api-management/credentials-configure-common-providers",
+        "redirect_document_id": false
+    },
+    {
+        "source_path_from_root": "/articles/api-management/configure-authorization-connection.md",
+        "redirect_url": "/azure/api-management/configure-credential-connection",
+        "redirect_document_id": false
+    },
+    {
+        "source_path_from_root": "/articles/api-management/authorizations-how-to-azure-ad.md",
+        "redirect_url": "/azure/api-management/credentials-how-to-azure-ad",
+        "redirect_document_id": false
+    },
+    {
+        "source_path_from_root": "/articles/api-management/authorizations-how-to-github.md",
+        "redirect_url": "/azure/api-management/credentials-how-to-github",
+        "redirect_document_id": false
+    },
     {
         "source_path_from_root": "/articles/api-management/powershell-samples.md",
         "redirect_url": "https://github.com/Azure/azure-docs-powershell-samples",

.openpublishing.redirection.app-service.json

@@ -54,6 +54,96 @@
       "source_path_from_root": "/articles/app-service/networking/private-endpoint.md",
       "redirect_url": "/azure/app-service/overview-private-endpoint",
       "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/app-service/scripts/cli-deploy-ftp.md",
+      "redirect_url": "/azure/app-service/samples-cli",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/app-service/scripts/cli-deploy-github.md",
+      "redirect_url": "/azure/app-service/samples-cli",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/app-service/scripts/cli-continuous-deployment-github.md",
+      "redirect_url": "/azure/app-service/samples-cli",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/app-service/scripts/cli-deploy-local-git.md",
+      "redirect_url": "/azure/app-service/samples-cli",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/app-service/scripts/cli-deploy-staging-environment.md",
+      "redirect_url": "/azure/app-service/samples-cli",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/app-service/scripts/cli-linux-docker-aspnetcore.md",
+      "redirect_url": "/azure/app-service/samples-cli",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/app-service/scripts/cli-deploy-privateendpoint.md",
+      "redirect_url": "/azure/app-service/samples-cli",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/app-service/scripts/cli-configure-custom-domain.md",
+      "redirect_url": "/azure/app-service/samples-cli",
+      "redirect_document_id": false
+    },    
+    {
+      "source_path_from_root": "/articles/app-service/scripts/cli-configure-ssl-certificate.md",
+      "redirect_url": "/azure/app-service/samples-cli",
+      "redirect_document_id": false
+    },    
+    {
+      "source_path_from_root": "/articles/app-service/scripts/cli-scale-manual.md",
+      "redirect_url": "/azure/app-service/samples-cli",
+      "redirect_document_id": false
+    },    
+    {
+      "source_path_from_root": "/articles/app-service/scripts/cli-scale-high-availability.md",
+      "redirect_url": "/azure/app-service/samples-cli",
+      "redirect_document_id": false
+    },    
+    {
+      "source_path_from_root": "/articles/app-service/scripts/cli-integrate-app-service-with-application-gateway.md",
+      "redirect_url": "/azure/app-service/samples-cli",
+      "redirect_document_id": false
+    },    
+    {
+      "source_path_from_root": "/articles/app-service/scripts/cli-connect-to-sql.md",
+      "redirect_url": "/azure/app-service/samples-cli",
+      "redirect_document_id": false
+    },    
+    {
+      "source_path_from_root": "/articles/app-service/scripts/cli-connect-to-storage.md",
+      "redirect_url": "/azure/app-service/samples-cli",
+      "redirect_document_id": false
+    },    
+    {
+      "source_path_from_root": "/articles/app-service/scripts/cli-connect-to-redis.md",
+      "redirect_url": "/azure/app-service/samples-cli",
+      "redirect_document_id": false
+    },    
+    {
+      "source_path_from_root": "/articles/app-service/scripts/cli-connect-to-documentdb.md",
+      "redirect_url": "/azure/app-service/samples-cli",
+      "redirect_document_id": false
+    },    
+    {
+      "source_path_from_root": "/articles/app-service/scripts/cli-backup-schedule-restore.md",
+      "redirect_url": "/azure/app-service/samples-cli",
+      "redirect_document_id": false
+    },    
+    {
+      "source_path_from_root": "/articles/app-service/scripts/cli-monitor.md",
+      "redirect_url": "/azure/app-service/samples-cli",
+      "redirect_document_id": false
     }
   ]
 }

.openpublishing.redirection.azure-monitor.json

@@ -6384,11 +6384,21 @@
             "redirect_url": "/azure/azure-monitor/app/overview-dashboard#create-custom-kpi-dashboards-using-application-insights",
             "redirect_document_id": false
         },
+        {
+            "source_path_from_root": "/articles/azure-monitor/app/sampling.md",
+            "redirect_url": "/previous-versions/azure/azure-monitor/app/sampling",
+            "redirect_document_id": false
+        },
         {
             "source_path_from_root": "/articles/azure-monitor/app/tutorial-asp-net-core.md",
             "redirect_url": "/previous-versions/azure/azure-monitor/app/tutorial-asp-net-core",
             "redirect_document_id": false
         },
+        {
+            "source_path_from_root": "/articles/azure-monitor/app/search-and-transaction-diagnostics.md",
+            "redirect_url": "/previous-versions/azure/azure-monitor/app/search-and-transaction-diagnostics-redirect",
+            "redirect_document_id": false
+        },
         {
             "source_path_from_root": "/articles/azure-monitor/app/tutorial-asp-net-custom-metrics.md",
             "redirect_url": "/previous-versions/azure/azure-monitor/app/tutorial-asp-net-custom-metrics",

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

@@ -1,10 +1,45 @@
 {
     "redirections": [
+        {
+            "source_path_from_root": "/articles/defender-for-cloud/prevent-misconfigurations.md",
+            "redirect_url": "/azure/defender-for-cloud/manage-mcsb",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/defender-for-cloud/tutorial-security-policy.md",
+            "redirect_url": "/azure/defender-for-cloud/security-policy-concept",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/defender-for-cloud/how-to-manage-aws-assessments-standards.md",
+            "redirect_url": "/azure/defender-for-cloud/create-custom-recommendations",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/defender-for-cloud/how-to-manage-gcp-assessments-standards.md",
+            "redirect_url": "/azure/defender-for-cloud/create-custom-recommendations",
+            "redirect_document_id": false
+        },
         {
             "source_path_from_root": "/articles/security-center/release-notes.md",
             "redirect_url": "/azure/defender-for-cloud/release-notes",
             "redirect_document_id": false
         },
+        {
+            "source_path_from_root": "/articles/defender-for-cloud/concept-credential-scanner-rules.md",
+            "redirect_url": "/azure/defender-for-cloud/defender-for-devops-introduction",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/defender-for-cloud/concept-devops-posture-management-overview.md",
+            "redirect_url": "/azure/defender-for-cloud/concept-devops-environment-posture-management-overview",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/defender-for-cloud/detect-exposed-secrets.md",
+            "redirect_url": "/azure/defender-for-cloud/defender-for-devops-introduction",
+            "redirect_document_id": false
+        },
         {
             "source_path_from_root": "/articles/security-center/upcoming-changes.md",
             "redirect_url": "/azure/defender-for-cloud/upcoming-changes",
@@ -707,8 +742,8 @@
         },
         {
             "source_path_from_root": "/articles/defender-for-cloud/defender-for-container-registries-cicd.md",
-            "redirect_url": "/azure/defender-for-cloud/defender-for-containers-cicd",
-            "redirect_document_id": true
+            "redirect_url": "/azure/defender-for-cloud/defender-for-devops-introduction",
+            "redirect_document_id": false
         },
         {
             "source_path_from_root": "/articles/defender-for-cloud/defender-for-container-registries-usage.md",
@@ -738,7 +773,7 @@
         {
             "source_path_from_root": "/articles/defender-for-cloud/defender-for-containers-cicd.md",
             "redirect_url": "/azure/defender-for-cloud/defender-for-devops-introduction",
-            "redirect_document_id": true
+            "redirect_document_id": false
         },
         {
             "source_path_from_root": "/articles/defender-for-cloud/tutorial-enable-pull-request-annotations.md",
@@ -752,8 +787,8 @@
         },
         {
             "source_path_from_root": "/articles/defender-for-cloud/detect-credential-leaks.md",
-            "redirect_url": "/azure/defender-for-cloud/detect-exposed-secrets",
-            "redirect_document_id": true
+            "redirect_url": "/azure/defender-for-cloud/defender-for-devops-introduction",
+            "redirect_document_id": false
         },
         {
             "source_path_from_root": "/articles/defender-for-cloud/defender-for-containers-va-ecr.md",
@@ -845,10 +880,20 @@
             "redirect_url": "/azure/defender-for-cloud/defender-for-dns-introduction",
             "redirect_document_id": true
         },
+        {
+            "source_path_from_root": "/articles/defender-for-cloud/support-agentless-containers-posture.md",
+            "redirect_url": "/azure/defender-for-cloud/support-matrix-defender-for-containers",
+            "redirect_document_id": false
+        },
         {
             "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",
             "redirect_document_id": true
+        },
+        {
+            "source_path_from_root": "/articles/defender-for-cloud/attack-path-reference.md",
+            "redirect_url": "/azure/defender-for-cloud/how-to-manage-attack-path",
+            "redirect_document_id": true
         }
     ]
 }

.openpublishing.redirection.defender-for-iot.json

@@ -1,5 +1,11 @@
 {
     "redirections": [          
+        {
+            "source_path_from_root": "/articles/defender-for-iot/organizations/faqs-eiot.md",
+            "redirect_url": "/azure/defender-for-iot/organizations/concept-enterprise#frequently-asked-questions",
+            "redirect_document_id": false
+        },
+
         {
             "source_path_from_root": "/articles/defender-for-iot/organizations/best-practices/plan-network-monitoring.md",
             "redirect_url": "/azure/defender-for-iot/organizations/best-practices/plan-prepare-deploy",