fixed merge conflict

Author: bandersmsft

.openpublishing.publish.config.json

@@ -1200,6 +1200,7 @@
   ".openpublishing.redirection.azure-arc-data.json",
   ".openpublishing.redirection.azure-attestation.json",
   ".openpublishing.redirection.azure-app-configuration.json",
+  ".openpublishing.redirection.azure-datalake-storage-gen1.json",
   ".openpublishing.redirection.azure-australia.json",
   ".openpublishing.redirection.azure-databricks.json",
   ".openpublishing.redirection.azure-hpc.json",
@@ -1222,6 +1223,7 @@
   ".openpublishing.redirection.machine-configuration.json",
   ".openpublishing.redirection.marketplace.json",
   ".openpublishing.redirection.openshift.json",
+  ".openpublishing.redirection.purview.json",
   ".openpublishing.redirection.security-benchmark.json",
   ".openpublishing.redirection.sentinel.json",
   ".openpublishing.redirection.spring-cloud.json",
@@ -1280,10 +1282,10 @@
   "articles/mysql/.openpublishing.redirection.mysql.json",
   "articles/network-watcher/.openpublishing.redirection.network-watcher.json",
   "articles/object-anchors/.openpublishing.redirection.object-anchors.json",
+  "articles/operator-insights/.openpublishing.redirection.operator-insights.json",
   "articles/operator-nexus/.openpublishing.redirection.operator-nexus.json",
   "articles/peering-service/.openpublishing.redirection.peering-service.json",
   "articles/postgresql/.openpublishing.redirection.postgresql.json",
-  "articles/purview/.openpublishing.redirection.purview.json",
   "articles/route-server/.openpublishing.redirection.route-server.json",
   "articles/sap/.openpublishing.redirection.sap.json",
   "articles/security/.openpublishing.redirection.security.json",

.openpublishing.redirection.azure-datalake-storage-gen1.json

@@ -461,11 +461,6 @@
             "source_path_from_root": "/articles/aks/command-invoke.md",
             "redirect_url": "/azure/aks/access-private-cluster",
             "redirect_document_id": false
-        },
-        {
-            "source_path_from_root": "/articles/aks/ai-toolchain-operator.md",
-            "redirect_url": "https://azure.microsoft.com/updates/preview-ai-toolchain-operator-addon-for-aks/",
-            "redirect_document_id": false
         }
     ]
 }

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

@@ -74,6 +74,21 @@
             "source_path_from_root": "/articles/certification/how-to-indirectly-connected-devices.md",
             "redirect_url": "/azure/certification/overview",
             "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/certification/program-requirements-pnp.md",
+            "redirect_url": "/azure/certification/overview",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/certification/how-to-troubleshoot-pnp.md",
+            "redirect_url": "/azure/certification/overview",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/certification/how-to-test-pnp.md",
+            "redirect_url": "/azure/certification/overview",
+            "redirect_document_id": false
         }
     ]
 }

.openpublishing.redirection.azure-monitor.json

@@ -920,6 +920,11 @@
             "redirect_url": "/azure/defender-for-cloud/multicloud",
             "redirect_document_id": false
         },
+        {
+            "source_path_from_root": "/articles/defender-for-cloud/defender-for-containers-vulnerability-assessment-azure.md",
+            "redirect_url": "/azure/defender-for-cloud/agentless-vulnerability-assessment-azure",
+            "redirect_document_id": false
+        },
         {
             "source_path_from_root": "/articles/defender-for-cloud/concept-aws-connector.md",
             "redirect_url": "/azure/defender-for-cloud/quickstart-onboard-aws",

.openpublishing.redirection.certification.json

@@ -1,5 +1,25 @@
 {
     "redirections": [
+    {
+      "source_path": "articles/batch/batch-pool-no-public-ip-address.md",
+      "redirect_url": "/previous-versions/azure/batch/articles/batch/batch-pool-no-public-ip-address",
+      "redirect_document_id": false
+    }, 
+    {  
+      "source_path": "articles/batch/batch-rendering-applications.md",
+      "redirect_url": "/previous-versions/azure/batch/articles/batch/batch-rendering-applications",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/batch/batch-rendering-using.md",
+      "redirect_url": "/previous-versions/azure/batch/articles/batch/batch-rendering-using",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/batch/batch-rendering-application-reference.md",
+      "redirect_url": "/previous-versions/aure/batch/articles/batch/batch-rendering-application-reference",
+      "redirect_document_id": false
+    },
     	{
            "source_path": "articles/cosmos-db/nosql/sdk-java-spark-v2.md",
            "redirect_url": "/previous-versions/azure/cosmos-db/nosql/sdk-java-spark-v2",
@@ -980,6 +1000,11 @@
             "redirect_url": "/analysis-services/tabular-models/compatibility-level-for-tabular-models-in-analysis-services",
             "redirect_document_id": false
         },
+        {
+            "source_path_from_root": "/articles/analysis-services/analysis-services-monitor.md",
+            "redirect_url": "/azure/analysis-services/monitor-analysis-services",
+            "redirect_document_id": false
+        },
         {
             "source_path_from_root": "/articles/frontdoor/front-door-whats-new.md",
             "redirect_url": "https://azure.microsoft.com/updates/?category=networking\u0026query=Azure%20Front%20Door",
@@ -9360,6 +9385,11 @@
             "redirect_url": "/visualstudio/containers/overview-local-process-kubernetes",
             "redirect_document_id": false
         },
+        {
+            "source_path_from_root": "/articles/docker/index.yml",
+            "redirect_url": "/dotnet/architecture/microservices/container-docker-introduction/docker-defined",
+            "redirect_document_id": false
+        },
         {
             "source_path_from_root": "/articles/vs-azure-tools-docker-edit-and-refresh.md",
             "redirect_url": "/visualstudio/docker/vs-azure-tools-docker-edit-and-refresh",
@@ -10881,9 +10911,10 @@
         {
             "source_path_from_root": "/articles/reliability/disaster-recovery-guidance-overview.md",
             "redirect_url": "/azure/reliability/reliability-guidance-overview",
-            "redirect_document_id": false
+            "redirect_document_id": false  
         },
         {
+
             "source_path_from_root": "/articles/orbital/overview-analytics.md",
             "redirect_url": "/azure/orbital/overview",
             "redirect_document_id": false
@@ -10913,6 +10944,31 @@
             "source_path_from_root": "/articles/networking/disaster-recovery-dns-traffic-manager.md",
             "redirect_url": "/azure/reliability/reliability-traffic-manager",
             "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/event-hubs/move-across-regions.md",
+            "redirect_url": "/azure/operational-excellence/relocation-event-hub",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-monitor/logs/move-workspace-region.md",
+            "redirect_url": "/azure/operational-excellence/relocation-log-analytics",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/key-vault/general/move-region.md",
+            "redirect_url": "/azure/operational-excellence/relocation-key-vault",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/event-hubs/move-cluster-across-regions.md",
+            "redirect_url": "/azure/operational-excellence/relocation-event-hub-cluster",
+            "redirect_document_id": false 
+        },
+        {
+            "source_path_from_root": "/articles/storage/common/storage-account-move.md",
+            "redirect_url": "/azure/operational-excellence/relocation-storage-account",
+            "redirect_document_id": false 
         }
 
     ]

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

@@ -1055,6 +1055,21 @@
             "redirect_url": "/azure/sentinel/normalization-schema-process-event",
             "redirect_document_id": true
         },
+        {
+            "source_path_from_root": "/articles/sentinel/connect-cef-ama.md",
+            "redirect_url": "/azure/sentinel/connect-cef-syslog-ama",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/sentinel/connect-cef-syslog.md",
+            "redirect_url": "/azure/sentinel/connect-cef-syslog-ama",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/sentinel/connect-cef-syslog-options.md",
+            "redirect_url": "/azure/sentinel/connect-cef-syslog-ama",
+            "redirect_document_id": false
+        },
         {
             "source_path_from_root": "/articles/sentinel/notebooks-with-synapse.md",
             "redirect_url": "/azure/sentinel/notebooks-hunt",

.openpublishing.redirection.json

@@ -0,0 +1,9 @@
+{
+    "redirections": [
+        {
+            "source_path_from_root": "/articles/virtual-machines/security-recommendations.md",
+            "redirect_url": "/security/benchmark/azure/baselines/virtual-machines-windows-virtual-machines-security-baseline",
+            "redirect_document_id": false
+        }
+    ]
+}