merge conflix

Author: henrymbuguakiarie

.openpublishing.publish.config.json

@@ -656,6 +656,12 @@
       "branch": "main",
       "branch_mapping": {}
     },
+    {
+      "path_to_root": "cosmos-db-nosql-query-samples",
+      "url": "https://github.com/Azure-Samples/cosmos-db-nosql-query-samples",
+      "branch": "main",
+      "branch_mapping": {}
+    },
     {
       "path_to_root": "cosmosdb-nodejs-get-started",
       "url": "https://github.com/Azure-Samples/azure-cosmos-db-sql-api-nodejs-getting-started",
@@ -1009,7 +1015,13 @@
       "url": "https://github.com/Azure/actions-workflow-samples",
       "branch": "master",
       "branch_mapping": {}
-    }  
+    },
+    {
+      "path_to_root": "azure-proactive-resiliency-library",
+      "url": "https://github.com/Azure/Azure-Proactive-Resiliency-Library",
+      "branch": "main",
+      "branch_mapping": {}
+    }
   ],
   "branch_target_mapping": {
     "live": ["Publish", "PDF"],
@@ -1054,15 +1066,17 @@
   ".openpublishing.redirection.sql-database.json",
   ".openpublishing.redirection.virtual-desktop.json",
   ".openpublishing.redirection.devops-project.json",
-  "articles/applied-ai-services/.openpublishing.redirection.applied-ai-old.json",
-  "articles/applied-ai-services/.openpublishing.redirection.applied-ai-services.json",
+  "articles/ai-services/.openpublishing.redirection.ai-services-from-applied.json",
+  "articles/ai-services/.openpublishing.redirection.ai-services-from-cog.json",
+  "articles/ai-services/.openpublishing.redirection.applied-ai-old.json",
+  "articles/ai-services/.openpublishing.redirection.applied-ai-services.json",
+  "articles/ai-services/.openpublishing.redirection.cognitive-services.json",
   "articles/azure-fluid-relay/.openpublishing.redirection.fluid-relay.json",
   "articles/azure-netapp-files/.openpublishing.redirection.azure-netapp-files.json",
   "articles/azure-relay/.openpublishing.redirection.relay.json",
   "articles/azure-video-analyzer/.openpublishing.redirection.azure-video-analyzer.json",
   "articles/azure-video-indexer/.openpublishing.redirection.azure-video-indexer.json",
   "articles/cloud-shell/.openpublishing.redirection.cloud-shell.json",
-  "articles/cognitive-services/.openpublishing.redirection.cognitive-services.json",
   "articles/communication-services/.openpublishing.redirection.communication-services.json",
   "articles/confidential-computing/.openpublishing.redirection.json",
   "articles/container-apps/.openpublishing.redirection.container-apps.json",

.openpublishing.redirection.active-directory.json

@@ -100,6 +100,26 @@
       "redirect_url": "/azure/active-directory/saas-apps/safety-culture-tutorial",
       "redirect_document_id": false
     },
+    {
+      "source_path_from_root": "/articles/active-directory/saas-apps/opentext-fax-tutorial.md",
+      "redirect_url": "/azure/active-directory/saas-apps/xm-fax-and-xm-send-secure-tutorial",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/active-directory/saas-apps/opentext-directory-services-tutorial.md",
+      "redirect_url": "/azure/active-directory/saas-apps/directory-services-tutorial",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/active-directory/saas-apps/r-and-d-tax-credit-services-tutorial.md",
+      "redirect_url": "/azure/active-directory/saas-apps/pwc-identity-tutorial",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/active-directory/saas-apps/tanium-cloud-sso-tutorial.md",
+      "redirect_url": "/azure/active-directory/saas-apps/tanium-sso-tutorial",
+      "redirect_document_id": false
+    },
     {
       "source_path_from_root": "/articles/active-directory/saas-apps/firstbird-tutorial.md",
       "redirect_url": "/azure/active-directory/saas-apps/radancys-employee-referrals-tutorial",
@@ -4355,6 +4375,11 @@
       "redirect_url": "/azure/active-directory/external-identities/user-token",
       "redirect_document_id": true
     },
+    {
+      "source_path_from_root": "/articles/active-directory/fundamentals/customize-branding.md",
+      "redirect_url": "/azure/active-directory/fundamentals/how-to-customize-branding",
+      "redirect_document_id": true
+    },
     {
       "source_path_from_root": "/articles/active-directory/fundamentals/certificate-authorities.md",
       "redirect_url": "/azure/security/fundamentals/azure-CA-details",

.openpublishing.redirection.api-management.json

@@ -1,5 +1,79 @@
 {
   "redirections": [
+    {
+        "source_path_from_root": "/articles/api-management/policies/authorize-request-using-external-authorizer.md",
+        "redirect_url": "https://github.com/Azure/api-management-policy-snippets",
+        "redirect_document_id": false
+    },{
+        "source_path_from_root": "/articles/api-management/policies/add-correlation-id.md",
+        "redirect_url": "https://github.com/Azure/api-management-policy-snippets",
+        "redirect_document_id": false
+    },
+    {
+        "source_path_from_root": "/articles/api-management/policies/authorize-request-based-on-jwt-claims.md",
+        "redirect_url": "https://github.com/Azure/api-management-policy-snippets",
+        "redirect_document_id": false
+    },
+    {
+        "source_path_from_root": "/articles/api-management/policies/cache-response.md",
+        "redirect_url": "https://github.com/Azure/api-management-policy-snippets",
+        "redirect_document_id": false
+    },
+    {
+        "source_path_from_root": "/articles/api-management/policies/filter-ip-addresses-when-using-appgw.md",
+        "redirect_url": "https://github.com/Azure/api-management-policy-snippets",
+        "redirect_document_id": false
+    },
+    {
+        "source_path_from_root": "/articles/api-management/policies/filter-response-content.md",
+        "redirect_url": "https://github.com/Azure/api-management-policy-snippets",
+        "redirect_document_id": false
+    },
+    {
+        "source_path_from_root": "/articles/api-management/policies/generate-shared-access-signature.md",
+        "redirect_url": "https://github.com/Azure/api-management-policy-snippets",
+        "redirect_document_id": false
+    },
+    {
+        "source_path_from_root": "/articles/api-management/policies/get-x-csrf-token-from-sap-gateway.md",
+        "redirect_url": "https://github.com/Azure/api-management-policy-snippets",
+        "redirect_document_id": false
+    },
+    {
+        "source_path_from_root": "/articles/api-management/policies/index.md",
+        "redirect_url": "https://github.com/Azure/api-management-policy-snippets",
+        "redirect_document_id": false
+    },
+    {
+        "source_path_from_root": "/articles/api-management/policies/log-errors-to-stackify.md",
+        "redirect_url": "https://github.com/Azure/api-management-policy-snippets",
+        "redirect_document_id": false
+    },
+    {
+        "source_path_from_root": "/articles/api-management/policies/route-requests-based-on-size.md",
+        "redirect_url": "https://github.com/Azure/api-management-policy-snippets",
+        "redirect_document_id": false
+    },
+    {
+        "source_path_from_root": "/articles/api-management/policies/send-request-context-info-to-backend-service.md",
+        "redirect_url": "https://github.com/Azure/api-management-policy-snippets",
+        "redirect_document_id": false
+    },
+    {
+        "source_path_from_root": "/articles/api-management/policies/set-cache-duration.md",
+        "redirect_url": "https://github.com/Azure/api-management-policy-snippets",
+        "redirect_document_id": false
+    },      
+    {
+        "source_path_from_root": "/articles/api-management/policies/set-header-to-enable-backend-to-construct-urls.md",
+        "redirect_url": "https://github.com/Azure/api-management-policy-snippets",
+        "redirect_document_id": false
+    },
+    {
+        "source_path_from_root": "/articles/api-management/policies/use-oauth2-for-authorization.md",
+        "redirect_url": "https://github.com/Azure/api-management-policy-snippets",
+        "redirect_document_id": false
+    },
     {
         "source_path_from_root": "/articles/api-management/api-management-access-restriction-policies.md",
         "redirect_url": "/azure/api-management/api-management-policies#access-restriction-policies",

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

@@ -9,6 +9,11 @@
             "source_path_from_root": "/articles/aks/cilium-enterprise-marketplace.md",
             "redirect_url": "/azure/aks/azure-cni-powered-by-cilium",
             "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/aks/web-app-routing.md",
+            "redirect_url": "/azure/aks/app-routing",
+            "redirect_document_id": false
         }
     ]
 }

.openpublishing.redirection.azure-monitor.json

@@ -6176,10 +6176,25 @@
             "redirect_url": "/azure/azure-monitor/app/javascript-sdk-configuration",
             "redirect_document_id": false
         },
-       {
+        {
             "source_path_from_root": "/articles/azure-monitor/agents/data-collection-firewall.md",
             "redirect_url": "/azure/azure-monitor/agents/data-collection-rule-azure-monitor-agent",
             "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-monitor/autoscale/tutorial-autoscale-performance-schedule.md",
+            "redirect_url": "/previous-versions/azure/azure-monitor/autoscale/tutorial-autoscale-performance-schedule",
+            "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",
+            "redirect_document_id": false
+        }, 
+        {
+            "source_path_from_root": "/articles/azure-monitor/essentials/resource-logs-categories.md",
+            "redirect_url": "/azure/azure-monitor/reference/supported-logs/logs-index",
+            "redirect_document_id": false
         } 
     ]
 }

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

@@ -482,8 +482,8 @@
         },
         {
             "source_path_from_root": "/articles/defender-for-cloud/enable-enhanced-security.md",
-            "redirect_url": "/azure/defender-for-cloud/enable-all-plans",
-            "redirect_document_id": true
+            "redirect_url": "/azure/defender-for-cloud/connect-azure-subscription",
+            "redirect_document_id": false
         },
         {
             "source_path_from_root": "/articles/security-center/enhanced-security-features-overview.md",
@@ -825,6 +825,21 @@
             "redirect_url": "/azure/defender-for-cloud/tutorial-enable-databases-plan",
             "redirect_document_id": true
         },
+        {
+            "source_path_from_root": "/articles/defender-for-cloud/enable-all-plans.md",
+            "redirect_url": "/azure/defender-for-cloud/connect-azure-subscription",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/defender-for-cloud/get-started.md",
+            "redirect_url": "/azure/defender-for-cloud/connect-azure-subscription",
+            "redirect_document_id": true
+        },
+        {
+            "source_path_from_root": "/articles/defender-for-cloud/enable-vulnerability-assessment-agentless.md",
+            "redirect_url": "/azure/defender-for-cloud/enable-agentless-scanning-vms",
+            "redirect_document_id": true
+        },
         {
             "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",