merge conflict

Author: dlepow

.acrolinx-config.edn

@@ -1,2 +1,2 @@
 {:allowed-branchname-matches ["main" "release-.*"]
- :allowed-filename-matches ["(?i)articles/(?:(?!active-directory/saas-apps/toc.yml|role-based-access-control/resource-provider-operations.md|.*policy/samples/|.*resource-graph/samples/))" "(?i)includes/(?:(?!policy/reference/|policy/standards/))"]}
+ :allowed-filename-matches ["(?i)articles/(?:(?!active-directory/saas-apps/toc.yml|role-based-access-control/resource-provider-operations.md|.*policy/samples/|.*resource-graph/samples/))" "(?i)includes/(?:(?!policy/reference/|policy/standards/|resource-graph/samples/))"]}

.openpublishing.publish.config.json

@@ -356,6 +356,12 @@
       "branch": "main",
       "branch_mapping": {}
     },
+    {
+      "path_to_root": "azure-functions-python-worker",
+      "url": "https://github.com/Azure/azure-functions-python-worker",
+      "branch": "dev",
+      "branch_mapping": {}
+    },    
     {
       "path_to_root": "functions-openapi-turbine-repair",
       "url": "https://github.com/Azure-Samples/functions-openapi-turbine-repair",
@@ -866,6 +872,12 @@
       "branch": "master",
       "branch_mapping": {}
     },
+    {
+      "path_to_root": "blob-devguide-go",
+      "url": "https://github.com/Azure-Samples/blob-storage-devguide-go",
+      "branch": "main",
+      "branch_mapping": {}
+    },
     {
       "path_to_root": "azure-sdk-for-net",
       "url": "https://github.com/Azure/azure-sdk-for-net/",
@@ -974,6 +986,12 @@
       "branch": "main",
       "branch_mapping": {}
     },
+    {
+      "path_to_root": "azure-typescript-e2e-apps",
+      "url": "https://github.com/Azure-Samples/azure-typescript-e2e-apps",
+      "branch": "main",
+      "branch_mapping": {}
+    },
     {
       "path_to_root": "azure-webpubsub",
       "url": "https://github.com/Azure/azure-webpubsub",
@@ -1183,6 +1201,12 @@
       "url": "https://github.com/Azure-Samples/explore-iot-operations",
       "branch": "main",
       "branch_mapping": {}
+    },
+    {
+      "path_to_root": "SupportArticles-docs",
+      "url": "https://github.com/MicrosoftDocs/SupportArticles-docs",
+      "branch": "main",
+      "branch_mapping": {}
     }
   ],
   "branch_target_mapping": {
@@ -1232,6 +1256,8 @@
   ".openpublishing.redirection.government.json",
   ".openpublishing.redirection.guidance.json",
   ".openpublishing.redirection.industry.json",
+  ".openpublishing.redirection.iot-accelerators.json",
+  ".openpublishing.redirection.iot-develop.json",
   ".openpublishing.redirection.iot-hub-device-update.json",
   ".openpublishing.redirection.json",
   ".openpublishing.redirection.key-vault.json",
@@ -1296,9 +1322,7 @@
   "articles/hdinsight/.openpublishing.redirection.hdinsight.json",
   "articles/healthcare-apis/.openpublishing.redirection.healthcare-apis.json",
   "articles/internet-peering/.openpublishing.redirection.internet-peering.json",
-  "articles/iot-accelerators/.openpublishing.redirection.iot-accelerators.json",
   "articles/iot-central/.openpublishing.redirection.iot-central.json",
-  "articles/iot-develop/.openpublishing.redirection.iot-develop.json",
   "articles/iot-dps/.openpublishing.redirection.iot-dps.json",
   "articles/iot-edge/.openpublishing.redirection.iot-edge.json",
   "articles/iot-hub/.openpublishing.redirection.iot-hub.json",

.openpublishing.redirection.active-directory.json

@@ -32725,6 +32725,11 @@
             "redirect_url": "/azure/active-directory/governance/licensing-fundamentals",
             "redirect_document_id": false
         },
+        {
+            "source_path": "articles/active-directory/azuread-dev/index.yml",
+            "redirect_url": "/entra/identity-platform",
+            "redirect_document_id": false
+        },
         {
             "source_path": "articles/active-directory/azuread-dev/about-microsoft-identity-platform.md",
             "redirect_url": "/previous-versions/azure/active-directory/azuread-dev/about-microsoft-identity-platform",

.openpublishing.redirection.api-management.json

@@ -76,6 +76,10 @@
         "redirect_document_id": false
       }, 
     {
+        "source_path_from_root": "/articles/api-management/api-management-howto-developer-portal.md",
+        "redirect_url": "/azure/api-management/developer-portal-overview",
+        "redirect_document_id": false
+    },    {
         "source_path_from_root": "/articles/api-management/authorizations-overview.md",
         "redirect_url": "/azure/api-management/credentials-overview",
         "redirect_document_id": false

.openpublishing.redirection.azure-kubernetes-service.json

@@ -351,12 +351,6 @@
             "redirect_url": "/cli/azure/aks#az_aks_create",
             "redirect_document_id": false
         },
-        {
-            "source_path_from_root": "/articles/aks/delete-cluster.md",
-            "redirect_url": "/cli/azure/aks#az_aks_delete",
-            "redirect_document_id": false
-        },
-
         {
             "source_path": "articles/aks/view-master-logs.md",
             "redirect_url": "/azure/aks/view-control-plane-logs",

.openpublishing.redirection.azure-monitor.json

@@ -5,6 +5,11 @@
             "redirect_url": "/azure/azure-monitor/snapshot-debugger/snapshot-debugger#release-notes-for-microsoftapplicationinsightssnapshotcollector",
             "redirect_document_id": false
         },
+        {
+            "source_path_from_root": "/articles/azure-monitor/agents/om-agents.md",
+            "redirect_url": "/azure/azure-monitor/vm/scom-managed-instance-overview",
+            "redirect_document_id": false
+         },
         {
             "source_path_from_root": "/articles/azure-monitor/best-practices.md",
             "redirect_url": "/azure/azure-monitor/getting-started",
@@ -4131,7 +4136,7 @@
         },
         {
             "source_path_from_root": "/articles/azure-monitor/platform/alerts-using-migration-tool.md",
-            "redirect_url": "/azure/azure-monitor/alerts/alerts-using-migration-tool",
+            "redirect_url": "/previous-versions/azure/azure-monitor/alerts/alerts-using-migration-tool",
             "redirect_document_id": false
         },
         {
@@ -6259,6 +6264,46 @@
             "redirect_url": "/previous-versions/azure/azure-monitor/autoscale/tutorial-autoscale-performance-schedule",
             "redirect_document_id": false
         },
+        {
+            "source_path_from_root": "/articles/azure-monitor/alerts/alerts-automatic-migration.md",
+            "redirect_url": "/previous-versions/azure/azure-monitor/alerts/alerts-automatic-migration",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-monitor/alerts/alerts-classic.overview.md",
+            "redirect_url": "/previous-versions/azure/azure-monitor/alerts/alerts-classic.overview",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-monitor/alerts/alerts-classic-portal.md",
+            "redirect_url": "/previous-versions/azure/azure-monitor/alerts/alerts-classic-portal",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-monitor/alerts/alerts-enable-template.md",
+            "redirect_url": "/previous-versions/azure/azure-monitor/alerts/alerts-enable-template",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-monitor/alerts/alerts-prepare-migration.md",
+            "redirect_url": "/previous-versions/azure/azure-monitor/alerts/alerts-prepare-migration",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-monitor/alerts/alerts-understand-migration.md",
+            "redirect_url": "/previous-versions/azure/azure-monitor/alerts/alerts-understand-migration",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-monitor/alerts/alerts-webhooks.md",
+            "redirect_url": "/previous-versions/azure/azure-monitor/alerts/alerts-webhooks",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-monitor/alerts/api-alerts.md",
+            "redirect_url": "/previous-versions/azure/azure-monitor/alerts/api-alerts",
+            "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",
@@ -6289,6 +6334,11 @@
             "redirect_url": "/azure/azure-monitor/containers/kubernetes-monitoring-disable",
             "redirect_document_id": false
         },
+        {
+            "source_path_from_root": "/articles/azure-monitor/containers/container-insights-metric-alerts.md",
+            "redirect_url": "/azure/azure-monitor/containers/kubernetes-metric-alerts",
+            "redirect_document_id": false
+        },
         {
             "source_path_from_root": "/articles/azure-monitor/essentials/prometheus-metrics-from-arc-enabled-cluster.md",
             "redirect_url": "/azure/azure-monitor/containers/prometheus-metrics-from-arc-enabled-cluster",
@@ -6616,7 +6666,27 @@
         },
         {
             "source_path_from_root": "/articles/azure-monitor/monitor-reference.md",
-            "redirect_url": "/azure/azure-monitor/overview",
+            "redirect_url": "/azure/azure-monitor/monitor-azure-monitor-reference",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-monitor/ai-ops/responsible-ai-faq.md",
+            "redirect_url": "/azure/copilot/overview",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-monitor/ai-ops/investigator-overview.md",
+            "redirect_url": "/azure/copilot/overview",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-monitor/ai-ops/investigate-alert-instance.md",
+            "redirect_url": "/azure/copilot/overview",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-monitor/azure-monitor-monitoring-reference.md",
+            "redirect_url": "/azure/azure-monitor/monitor-azure-monitor-reference",
             "redirect_document_id": false
         },
         {
@@ -6638,6 +6708,18 @@
             "source_path_from_root": "/articles/azure-monitor/agents/resource-manager-data-collection-rules.md",
             "redirect_url": "/azure/azure-monitor/essentials/data-collection-rule-create-edit?tabs=arm#manually-create-a-dcr",
             "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-monitor/essentials/remote-write-prometheus.md",
+            "redirect_url": "/azure/azure-monitor/essentials/prometheus-remote-write-virtual-machines",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-monitor/essentials/prometheus-get-started.md",
+            "redirect_url": "/azure/azure-monitor/essentials/prometheus-metrics-overview",
+            "redirect_document_id": false
         }
+        
+
     ]
 }

.openpublishing.redirection.container-service.json

@@ -1,6 +1,12 @@
 {
     "redirections": [
         {
+            "source_path_from_root": "/articles/container-service/container-registry-auth-aci.md",
+            "redirect_url": "/azure/container-service/container-registry-authentication",
+            "redirect_document_id": false
+        },
+        {
+        
             "source_path_from_root": "/articles/container-service/dcos-swarm/container-service-application-specific-marathon.md",
             "redirect_url": "/previous-versions/azure/container-service/dcos-swarm/container-service-application-specific-marathon",
             "redirect_document_id": false

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

@@ -1,5 +1,10 @@
 {
     "redirections": [
+        {
+            "source_path_from_root": "/articles/defender-for-cloud/secret-scanning.md",
+            "redirect_url": "/azure/defender-for-cloud/secrets-scanning-servers",
+            "redirect_document_id": false
+        },
         {
             "source_path_from_root": "/articles/defender-for-cloud/prevent-misconfigurations.md",
             "redirect_url": "/azure/defender-for-cloud/manage-mcsb",
@@ -711,7 +716,7 @@
             "redirect_document_id": true
         },
         {
-            "source_path_from_root": "/articles/security-center/update-regulatory-compliance-packages.md",
+            "source_path_from_root": "/articles/security-center/update-regulatory-compliance-packages.yml",
             "redirect_url": "/azure/defender-for-cloud/update-regulatory-compliance-packages",
             "redirect_document_id": true
         },
@@ -721,7 +726,7 @@
             "redirect_document_id": true
         },
         {
-            "source_path_from_root": "/articles/security-center/workflow-automation.md",
+            "source_path_from_root": "/articles/security-center/workflow-automation.yml",
             "redirect_url": "/azure/defender-for-cloud/workflow-automation",
             "redirect_document_id": true
         },
@@ -945,6 +950,16 @@
             "redirect_url": "/azure/defender-for-cloud/create-custom-recommendations",
             "redirect_document_id": false
         },
+        {
+            "source_path_from_root": "/articles/defender-for-cloud/view-and-remediate-vulnerabilities-for-images.md",
+            "redirect_url": "/azure/defender-for-cloud/view-and-remediate-vulnerabilities-containers",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/defender-for-cloud/view-and-remediate-vulnerability-assessment-findings.md",
+            "redirect_url": "/azure/defender-for-cloud/view-and-remediate-vulnerability-registry-images",
+            "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",

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

@@ -1,5 +1,35 @@
 {
-    "redirections": [          
+    "redirections": [  
+        {
+            "source_path_from_root": "/articles/defender-for-iot/device-builders/how-to-azure-rtos-security-module.md",
+            "redirect_url": "/azure/defender-for-iot/device-builders/how-to-threadx-security-module",
+            "redirect_document_id": false
+        }, 
+        {
+            "source_path_from_root": "/articles/defender-for-iot/device-builders/iot-security-azure-rtos.md",
+            "redirect_url": "/azure/defender-for-iot/device-builders/iot-security-threadx",
+            "redirect_document_id": false
+        }, 
+        {
+            "source_path_from_root": "/articles/defender-for-iot/device-builders/azure-rtos-security-module-api.md",
+            "redirect_url": "/azure/defender-for-iot/device-builders/threadx-security-module-api",
+            "redirect_document_id": false
+        }, 
+        {
+            "source_path_from_root": "/articles/defender-for-iot/device-builders/concept-rtos-security-alerts-recommendations.md",
+            "redirect_url": "/azure/defender-for-iot/device-builders/concept-threadx-security-alerts-recommendations",
+            "redirect_document_id": false
+        }, 
+        {
+            "source_path_from_root": "/articles/defender-for-iot/device-builders/concept-rtos-security-module.md",
+            "redirect_url": "/azure/defender-for-iot/device-builders/concept-threadx-security-module",
+            "redirect_document_id": false
+        },         
+        {
+            "source_path_from_root": "/articles/defender-for-iot/device-builders/how-to-rtos-security-module.md",
+            "redirect_url": "/azure/defender-for-iot/device-builders/how-to-threadx-security-module",
+            "redirect_document_id": false
+        },         
         {
             "source_path_from_root": "/articles/defender-for-iot/organizations/resources-manage-proprietary-protocols.md",
             "redirect_url": "/azure/defender-for-iot/organizations/how-to-manage-individual-sensors#manage-custom-plugins-legacy",
@@ -730,7 +760,7 @@
             "redirect_document_id": false
         },
         {
-            "source_path_from_root": "/articles/defender-for-iot/how-to-deploy-edge.md",
+            "source_path_from_root": "/articles/defender-for-iot/how-to-deploy-edge.yml",
             "redirect_url": "/azure/defender-for-iot/device-builders/how-to-deploy-edge",
             "redirect_document_id": false
         },