resolve conflict

Author: b-ahibbard

.github/policies/disallow-edits.yml

@@ -155,13 +155,16 @@ configuration:
         if:
           # If a 'sign-off' comment is added to a PR in the articles/reliability folder , and the PR author isn't Anastasia or John...
           - payloadType: Issue_Comment
-          - isPullRequest
           - filesMatchPattern:
               matchAny: true
               pattern: articles/reliability/*
-          - commentContains:
-              pattern: \#sign-off
-              isRegex: false
+          - or:
+              - commentContains:
+                  pattern: ^(#sign-off)$
+                  isRegex: True
+              - commentContains:
+                  pattern: ^(\#sign-off)$
+                  isRegex: True
           - not:
               or:
                 - isActivitySender:

.openpublishing.publish.config.json

@@ -242,12 +242,6 @@
             "branch": "main",
             "branch_mapping": {}
         },
-        {
-            "path_to_root": "azure-proactive-resiliency-library",
-            "url": "https://github.com/Azure/Azure-Proactive-Resiliency-Library",
-            "branch": "main",
-            "branch_mapping": {}
-        },
         {
             "path_to_root": "azure-sdk-for-go-samples",
             "url": "https://github.com/Azure-Samples/azure-sdk-for-go-samples",
@@ -590,6 +584,12 @@
             "branch": "main",
             "branch_mapping": {}
         },
+        {
+            "path_to_root": "laravel-tasks",
+            "url": "https://github.com/Azure-Samples/laravel-tasks",
+            "branch": "main",
+            "branch_mapping": {}
+        },
         {
             "path_to_root": "playwright-testing-service",
             "url": "https://github.com/microsoft/playwright-testing-service",

.openpublishing.redirection.json

@@ -1,10 +1,210 @@
 {
   "redirections": [
+    {
+      "source_path": "articles/automation/update-management/configure-alerts.md",
+      "redirect_url": "/azure/update-manager/manage-alerts",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/automation/update-management/configure-groups.md",
+      "redirect_url": "/azure/update-manager/dynamic-scope-overview",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/automation/update-management/configure-wuagent.md",
+      "redirect_url": "/azure/update-manager/configure-wu-agent",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/automation/update-management/deploy-updates.md",
+      "redirect_url": "/azure/update-manager/deploy-updates",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/automation/update-management/enable-from-automation-account.md",
+      "redirect_url": "/azure/update-manager/migration-overview",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/automation/update-management/enable-from-portal.md",
+      "redirect_url": "/azure/update-manager/migration-using-portal",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/automation/update-management/enable-from-runbook.md",
+      "redirect_url": "/azure/update-manager/migration-using-runbook-scripts",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/automation/update-management/enable-from-template.md",
+      "redirect_url": "/azure/update-manager/migration-manual",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/automation/update-management/enable-from-vm.md",
+      "redirect_url": "/azure/update-manager/migration-overview",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/automation/update-management/manage-updates-for-vm.md",
+      "redirect_url": "/azure/update-manager/view-updates",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/automation/update-management/mecmintegration.md",
+      "redirect_url": "/azure/update-manager/overview",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/automation/update-management/operating-system-requirements.md",
+      "redirect_url": "/azure/update-manager/support-matrix-updates",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/automation/update-management/overview.md",
+      "redirect_url": "/azure/update-manager/workflow-update-manager",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/automation/update-management/plan-deployment.md",
+      "redirect_url": "/azure/update-manager/workflow-update-manager",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/automation/update-management/pre-post-scripts.md",
+      "redirect_url": "/azure/update-manager/pre-post-events-schedule-maintenance-configuration",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/automation/update-management/query-logs.md",
+      "redirect_url": "/azure/update-manager/sample-query-logs",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/automation/update-management/remove-feature.md",
+      "redirect_url": "/azure/update-manager/view-updates",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/automation/update-management/remove-vms.md",
+      "redirect_url": "/azure/update-manager/deploy-updates",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/automation/update-management/scope-configuration.md",
+      "redirect_url": "/azure/update-manager/updates-maintenance-schedules",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/automation/update-management/view-update-assessments.md",
+      "redirect_url": "/azure/update-manager/view-updates",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/automation/troubleshoot/update-management.md",
+      "redirect_url": "/azure/update-manager/troubleshoot",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/automation/troubleshoot/update-agent-issues.md",
+      "redirect_url": "/azure/update-manager/troubleshoot",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/automation/troubleshoot/update-agent-issues-linux.md",
+      "redirect_url": "/azure/update-manager/troubleshoot",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/automation/change-tracking/enable-from-portal.md",
+      "redirect_url": "/azure/automation/change-tracking/enable-vms-monitoring-agent",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/automation/change-tracking/enable-from-vm.md",
+      "redirect_url": "/azure/automation/change-tracking/enable-vms-monitoring-agent",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/automation/change-tracking/enable-from-automation-account.md",
+      "redirect_url": "/azure/automation/change-tracking/enable-vms-monitoring-agent",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/automation/change-tracking/configure-alerts.md",
+      "redirect_url": "/azure/automation/change-tracking/overview-monitoring-agent",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/automation/change-tracking/enable-from-runbook.md",
+      "redirect_url": "/azure/automation/change-tracking/manage-change-tracking-monitoring-agent",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/automation/change-tracking/manage-change-tracking.md",
+      "redirect_url": "/azure/automation/change-tracking/manage-change-tracking-monitoring-agent",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/automation/change-tracking/manage-inventory-vms.md",
+      "redirect_url": "/azure/automation/change-tracking/manage-change-tracking-monitoring-agent",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/automation/change-tracking/manage-scope-configurations.md",
+      "redirect_url": "/azure/automation/change-tracking/enable-vms-monitoring-agent",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/automation/change-tracking/overview.md",
+      "redirect_url": "/azure/automation/change-tracking/overview-monitoring-agent",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/automation/change-tracking/remove-feature.md",
+      "redirect_url": "/azure/automation/change-tracking/overview-monitoring-agent",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/automation/change-tracking/remove-vms-from-change-tracking.md",
+      "redirect_url": "/azure/automation/change-tracking/overview-monitoring-agent",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/automation/how-to/region-mappings.md",
+      "redirect_url": "/azure/automation/change-tracking/region-mappings-monitoring-agent",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/automation/automation-tutorial-installed-software.md",
+      "redirect_url": "/azure/automation/change-tracking/overview-monitoring-agent",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/automation/troubleshoot/change-tracking.md",
+      "redirect_url": "/azure/automation/change-tracking/guidance-migration-log-analytics-monitoring-agent",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/automation/troubleshoot/onboarding.md",
+      "redirect_url": "/azure/automation/change-tracking/guidance-migration-log-analytics-monitoring-agent",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/migrate/tutorial-modernize-asp-net-aks.md",
+      "redirect_url": "/azure/migrate/migrate-services-overview",
+      "redirect_document_id": false
+    },
     {
       "source_path": "articles/databox-online/azure-stack-edge-gpu-deploy-sample-module-marketplace.md",
       "redirect_url": "https://azuremarketplace.microsoft.com/marketplace/apps?page=1",
       "redirect_document_id": false
     },
+    {
+      "source_path": "articles/partner-solutions/logzio/index.yml",
+      "redirect_url": "/previous-versions/azure/partner-solutions/logzio/index",
+      "redirect_document_id": false
+    },
     {
       "source_path": "articles/partner-solutions/logzio/create.md",
       "redirect_url": "/previous-versions/azure/partner-solutions/logzio/create",
@@ -30,6 +230,11 @@
       "redirect_url": "/previous-versions/azure/partner-solutions/logzio/troubleshoot",
       "redirect_document_id": false
     },
+    {
+      "source_path": "articles/event-grid/event-schema-storage-actions.md",
+      "redirect_url": "/azure/storage-actions/overview",
+      "redirect_document_id": false
+    },
     {
       "source_path_from_root": "/articles/hdinsight-aks/index.yml",
       "redirect_url": "/previous-versions/azure/hdinsight-aks",
@@ -1820,6 +2025,16 @@
       "redirect_url": "/previous-versions/azure/devtest-labs/devtest-lab-integrate-ci-cd",
       "redirect_document_id": false
     },
+    {
+      "source_path": "articles/devtest-labs/devtest-lab-configure-lab-level-secrets.md",
+      "redirect_url": "/azure/devtest-labs/devtest-lab-overview",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/devtest-labs/devtest-lab-trusted-launch.md",
+      "redirect_url": "/azure/devtest-labs/devtest-lab-overview",
+      "redirect_document_id": false
+    },
     {
       "source_path": "articles/devtest-labs/integrate-environments-devops-pipeline.md",
       "redirect_url": "/previous-versions/azure/devtest-labs/integrate-environments-devops-pipeline",
@@ -1855,6 +2070,11 @@
       "redirect_url": "/azure/api-management/monitor-api-management",
       "redirect_document_id": false
     },
+    {
+      "source_path_from_root": "/articles/vpn-gateway/vpn-gateway-cross-premises-options.md",
+      "redirect_url": "/previous-versions/azure/vpn-gateway/vpn-gateway-about-vpn-gateway-settings",
+      "redirect_document_id": false
+    },
     {
       "source_path_from_root": "/articles/vpn-gateway/vpn-gateway-about-forced-tunneling.md",
       "redirect_url": "/previous-versions/azure/vpn-gateway/vpn-gateway-about-forced-tunneling",
@@ -3020,6 +3240,21 @@
       "redirect_url": "/azure/databox/index",
       "redirect_document_id": false
     },
+    {
+      "source_path_from_root": "/articles/databox/data-box-next-gen-overview.md",
+      "redirect_url": "/azure/databox/data-box-overview?pivots=dbx-ng",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/databox/data-box-next-gen-quickstart-portal.md",
+      "redirect_url": "/azure/databox/data-box-quickstart-portal?pivots=dbx-ng",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/databox/data-box-next-gen-quickstart-export.md",
+      "redirect_url": "/azure/databox/data-box-quickstart-export?pivots=dbx-ng",
+      "redirect_document_id": false
+    },
     {
       "source_path_from_root": "/articles/ddos-protection/ddos-disaster-recovery-guidance.md",
       "redirect_url": "../reliability/reliability-ddos.md",
@@ -4075,36 +4310,6 @@
       "redirect_url": "/azure/notification-hubs/notification-hubs-push-notification-http2-token-authentication",
       "redirect_document_id": false
     },
-    {
-      "source_path_from_root": "/articles/openshift/howto-encrypt-data-disks.md",
-      "redirect_url": "/azure/openshift/howto-byok",
-      "redirect_document_id": false
-    },
-    {
-      "source_path_from_root": "/articles/openshift/howto-deploy-java-jboss-enterprise-application-platform-with-auto-redeploy.md",
-      "redirect_url": "/azure/openshift/index",
-      "redirect_document_id": false
-    },
-    {
-      "source_path_from_root": "/articles/openshift/quickstart-portal.md",
-      "redirect_url": "/azure/openshift/create-cluster",
-      "redirect_document_id": false
-    },
-    {
-      "source_path_from_root": "/articles/openshift/tutorial-connect-cluster.md",
-      "redirect_url": "/azure/openshift/connect-cluster",
-      "redirect_document_id": false
-    },
-    {
-      "source_path_from_root": "/articles/openshift/tutorial-create-cluster.md",
-      "redirect_url": "/azure/openshift/create-cluster",
-      "redirect_document_id": false
-    },
-    {
-      "source_path_from_root": "/articles/openshift/tutorial-delete-cluster.md",
-      "redirect_url": "/azure/openshift/delete-cluster",
-      "redirect_document_id": false
-    },
     {
       "source_path_from_root": "/articles/operator-service-manager/overview.md",
       "redirect_url": "azure/operator-service-manager/azure-operator-service-manager-overview",
@@ -5935,6 +6140,11 @@
       "redirect_url": "/azure/reliability/overview-reliability-guidance",
       "redirect_document_id": false
     },
+    {
+      "source_path_from_root": "/articles/reliability/sovereign-cloud-china.md",
+      "redirect_url": "/azure/china/concepts-service-availability",
+      "redirect_document_id": false
+    },
     {
       "source_path_from_root": "/articles/managed-grafana/concept-role-based-access-control.md",
       "redirect_url": "/azure/managed-grafana/how-to-manage-access-permissions-users-identities",
@@ -5949,6 +6159,26 @@
       "source_path": "articles/sentinel/resources.md",
       "redirect_url": "/azure/sentinel/overview",
       "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/nat-gateway/tutorial-dual-stack-outbound-nat-load-balancer.md",
+      "redirect_url": "/azure/nat-gateway/nat-overview",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/sentinel/kusto-resources.md",
+      "redirect_url": "/kusto/query/kql-learning-resources?view=microsoft-sentinel?view=microsoft-sentinel&preserve-view=true&toc=/azure/sentinel/TOC.json&bc=/azure/sentinel/breadcrumb/toc.json",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/reliability/availability-zones-baseline.md",
+      "redirect_url": "/azure/reliability/availability-zones-migration-overview",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/virtual-network/virtual-network-for-azure-services.md",
+      "redirect_url": "/azure/virtual-network/vnet-integration-for-azure-services",
+      "redirect_document_id": false
     }
   ]
-}
+}