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

Author: asudbring

.openpublishing.publish.config.json

@@ -254,6 +254,12 @@
       "branch": "main",
       "branch_mapping": {}
     },
+    {
+      "path_to_root": "function-flex-consumption",
+      "url": "https://github.com/Azure-Samples/azure-functions-flex-consumption-samples",
+      "branch": "main",
+      "branch_mapping": {}
+    },
     {
       "path_to_root": "functions-azure-product",
       "url": "https://github.com/Azure/Azure-Functions",
@@ -506,6 +512,12 @@
       "branch": "sdk-codetest",
       "branch_mapping": {}
     },
+    {
+      "path_to_root": "rag-data-openai-python-promptflow-main",
+      "url": "https://github.com/Azure-Samples/rag-data-openai-python-promptflow",
+      "branch": "main",
+      "branch_mapping": {}
+    },
     {
       "path_to_root": "azureml-examples-main",
       "url": "https://github.com/azure/azureml-examples",
@@ -1225,6 +1237,12 @@
       "url": "https://github.com/MicrosoftDocs/SupportArticles-docs",
       "branch": "main",
       "branch_mapping": {}
+    },
+    {
+      "path_to_root": "msdocs-python-fastapi-webapp-quickstart",
+      "url": "https://github.com/Azure-Samples/msdocs-python-fastapi-webapp-quickstart",
+      "branch": "main",
+      "branch_mapping": {}
     }
   ],
   "branch_target_mapping": {

.openpublishing.redirection.app-service.json

@@ -1850,6 +1850,16 @@
             "redirect_url": "/azure/app-service/scripts/powershell-scale-manual",
             "redirect_document_id": false
         },
+        {
+            "source_path_from_root": "/articles/app-service/get-resource-events.md",
+            "redirect_url": "/azure/app-service/monitor-app-service",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/app-service/overview-monitoring.md",
+            "redirect_url": "/azure/app-service/monitor-app-service",
+            "redirect_document_id": false
+        },
         {
             "source_path_from_root": "/articles/app-service/app-service-security-attributes.md",
             "redirect_url": "/azure/app-service/security-baseline",

.openpublishing.redirection.applied-ai-services.json

@@ -249,6 +249,11 @@
             "source_path_from_root": "/articles/ai-services/content-safety/how-to/incident-response.md",
             "redirect_url": "/azure/ai-services/content-safety/how-to/custom-categories-rapid",
             "redirect_document_id": true
+          },
+          {
+            "source_path_from_root": "/articles/ai-services/content-safety/concepts/custom-categories-rapid.md",
+            "redirect_url": "/azure/ai-services/content-safety/concepts/custom-categories",
+            "redirect_document_id": true
           }
 	]
 }

.openpublishing.redirection.azure-app-configuration.json

@@ -24,6 +24,11 @@
             "source_path_from_root": "/articles/azure-app-configuration/quickstart-azure-function-csharp.md",
             "redirect_url": "/azure/azure-app-configuration/quickstart-azure-functions-csharp",
             "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-app-configuration/concept-github-action.md",
+            "redirect_url": "/azure/azure-app-configuration/push-kv-github-action.md",
+            "redirect_document_id": false
         }
     ]
 }

.openpublishing.redirection.azure-monitor.json

@@ -10,6 +10,11 @@
             "redirect_url": "/azure/azure-monitor/vm/scom-managed-instance-overview",
             "redirect_document_id": false
          },
+        {
+            "source_path_from_root": "/articles/azure-monitor/scom-manage-instance/monitor-arc-enabled-vm-with-scom-managed-instance.md",
+            "redirect_url": "/azure/azure-monitor/scom-manage-instance/monitor-azure-off-azure-vm-with-scom-managed-instance",
+            "redirect_document_id": false
+         },
         {
             "source_path_from_root": "/articles/azure-monitor/scom-manage-instance/common-questions.md",
             "redirect_url": "/azure/azure-monitor/scom-manage-instance/scom-managed-instance-faq",
@@ -1205,21 +1210,11 @@
             "redirect_url": "/azure/azure-monitor/app/overview-dashboard",
             "redirect_document_id": false
         },
-        {
-            "source_path_from_root": "/articles/azure-monitor/agents/azure-monitor-agent-overview.md",
-            "redirect_url": "/azure/azure-monitor/agents/agents-overview",
-            "redirect_document_id": false
-        },
         {
             "source_path_from_root": "/articles/azure-monitor/agents/use-azure-monitor-agent-troubleshooter.md",
             "redirect_url": "/azure/azure-monitor/agents/troubleshooter-ama-windows",
             "redirect_document_id": false
         },
-        {
-            "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": false
-        },
         {
             "source_path_from_root": "/articles/application-insights/app-insights-platforms.md",
             "redirect_url": "/azure/azure-monitor/app/platforms",
@@ -2530,11 +2525,6 @@
             "redirect_url": "/azure/azure-monitor/agents/agent-manage",
             "redirect_document_id": false
         },
-        {
-            "source_path_from_root": "/articles/monitoring/monitoring-overview-azure-agents.md",
-            "redirect_url": "/azure/azure-monitor/platform/agents-overview",
-            "redirect_document_id": false
-        },
         {
             "source_path_from_root": "/articles/log-analytics/log-analytics-agent-windows.md",
             "redirect_url": "/azure/azure-monitor/agents/agent-windows",
@@ -3836,7 +3826,7 @@
         },
         {
             "source_path_from_root": "/articles/azure-monitor/platform/agents-overview.md",
-            "redirect_url": "/azure/azure-monitor/agents/agents-overview",
+            "redirect_url": "/azure/azure-monitor/agents/azure-monitor-agent-overview",
             "redirect_document_id": false
         },
         {
@@ -5559,6 +5549,41 @@
             "redirect_url": "/azure/azure-monitor/essentials/resource-manager-diagnostic-settings#diagnostic-setting-for-activity-log",
             "redirect_document_id": false
         },
+        {
+            "source_path_from_root": "/articles/azure-monitor/app/availability-overview.md",
+            "redirect_url": "/azure/azure-monitor/app/availability",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-monitor/app/availability-standard-tests.md",
+            "redirect_url": "/azure/azure-monitor/app/availability",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-monitor/app/availability-azure-functions.md",
+            "redirect_url": "/azure/azure-monitor/app/availability",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-monitor/app/availability-private-test.md",
+            "redirect_url": "/azure/azure-monitor/app/availability",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-monitor/app/availability-alerts.md",
+            "redirect_url": "/azure/azure-monitor/app/availability",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-monitor/app/availability-test-migration.md",
+            "redirect_url": "/azure/azure-monitor/app/availability",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-monitor/app/sla-report.md",
+            "redirect_url": "/azure/azure-monitor/app/availability",
+            "redirect_document_id": false
+        },
         {
             "source_path_from_root": "/articles/azure-monitor/app/tutorial-alert.md",
             "redirect_url": "/azure/azure-monitor/app/availability-standard-tests",
@@ -6753,6 +6778,32 @@
             "source_path_from_root": "/articles/azure-monitor/agents/azure-monitor-agent-migration-tools.md",
             "redirect_url": "/azure/azure-monitor/agents/azure-monitor-agent-migration",
             "redirect_document_id": false
-        }     
+        },
+        {
+            "source_path_from_root": "/articles/azure-monitor/agents/agents-overview.md",
+            "redirect_url": "/azure/azure-monitor/agents/azure-monitor-agent-overview",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-monitor/agents/azure-monitor-agent-data-collection-endpoint.md",
+            "redirect_url": "/azure/azure-monitor/agents/azure-monitor-agent-network-configuration",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-monitor/agents/data-collection-text-log.md",
+            "redirect_url": "/azure/azure-monitor/agents/data-collection-log-text",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/monitoring/monitoring-overview-azure-agents.md",
+            "redirect_url": "/azure/azure-monitor/agents/azure-monitor-agent-overview",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-monitor/agents/data-collection-rule-azure-monitor-agent.md",
+            "redirect_url": "/azure/azure-monitor/agents/azure-monitor-agent-data-collection",
+            "redirect_document_id": false
+        }
     ]
 }
+

.openpublishing.redirection.baremetal-infrastructure.json

@@ -134,6 +134,41 @@
             "source_path_from_root": "/articles/baremetal-infrastructure/workloads/sap/baremetal-overview-architecture.md",
             "redirect_url": "/azure/baremetal-infrastructure/concepts-baremetal-infrastructure-overview",
             "redirect_document_id": false
+        },
+        {
+            "source_path": "articles/baremetal-infrastructure/workloads/nc2-on-azure/solution-design.md",
+            "redirect_url": "/azure/baremetal-infrastructure/workloads/nc2-on-azure/architecture",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "articles/baremetal-infrastructure/workloads/nc2-on-azure/nc2-baremetal-overview.md",
+            "redirect_url": "/azure/baremetal-infrastructure/workloads/nc2-on-azure/about-nc2-on-azure",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "articles/baremetal-infrastructure/workloads/nc2-on-azure/skus.md",
+            "redirect_url": "/azure/baremetal-infrastructure/workloads/nc2-on-azure/about-nc2-on-azure",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "articles/baremetal-infrastructure/workloads/nc2-on-azure/nc2-on-azure-responsibility-matrix.md",
+            "redirect_url": "/azure/baremetal-infrastructure/workloads/nc2-on-azure/about-nc2-on-azure",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "articles/baremetal-infrastructure/workloads/nc2-on-azure/requirements.md",
+            "redirect_url": "/azure/baremetal-infrastructure/workloads/nc2-on-azure/architecture",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "articles/baremetal-infrastructure/workloads/nc2-on-azure/use-cases-and-supported-scenarios.md",
+            "redirect_url": "/azure/baremetal-infrastructure/workloads/nc2-on-azure/architecture",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "articles/baremetal-infrastructure/workloads/nc2-on-azure/supported-instances-and-regions.md",
+            "redirect_url": "/azure/baremetal-infrastructure/workloads/nc2-on-azure/architecture",
+            "redirect_document_id": false
         }
     ]
 }

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

@@ -1,5 +1,30 @@
 {
     "redirections": [
+        {
+            "source_path_from_root": "/articles/defender-for-cloud/multicloud.yml",
+            "redirect_url": "/azure/defender-for-cloud/security-policy-concept",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/defender-for-cloud/recommendations-reference.md",
+            "redirect_url": "/azure/defender-for-cloud/plan-multicloud-security-get-started",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/defender-for-cloud/recommendations-reference-gcp.md",
+            "redirect_url": "/azure/defender-for-cloud/security-policy-concept",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/defender-for-cloud/recommendations-reference-aws.md",
+            "redirect_url": "/azure/defender-for-cloud/security-policy-concept",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/defender-for-cloud/upcoming-changes.md",
+            "redirect_url": "/azure/defender-for-cloud/release-notes",
+            "redirect_document_id": false
+        },
         {
             "source_path_from_root": "/articles/defender-for-cloud/secret-scanning.md",
             "redirect_url": "/azure/defender-for-cloud/secrets-scanning-servers",
@@ -960,6 +985,11 @@
             "redirect_url": "/azure/defender-for-cloud/view-and-remediate-vulnerability-registry-images",
             "redirect_document_id": false
         },
+        {
+            "source_path_from_root": "/articles/defender-for-cloud/management-groups-roles.md",
+            "redirect_url": "/azure/governance/management-groups/overview",
+            "redirect_document_id": false
+        },
         {
             "source_path_from_root": "/articles/defender-for-cloud/how-to-migrate-to-built-in.md",
             "redirect_url": "/azure/defender-for-cloud/how-to-transition-to-built-in",