resolve conflicts

Author: b-ahibbard

.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))" "includes/"]}
+ :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/))"]}

.openpublishing.publish.config.json

@@ -998,12 +998,36 @@
       "branch": "main",
       "branch_mapping": {}
     },
+    {
+      "path_to_root": "cosmos-db-nosql-nodejs-quickstart",
+      "url": "https://github.com/azure-samples/cosmos-db-nosql-nodejs-quickstart",
+      "branch": "main",
+      "branch_mapping": {}
+    },
     {
       "path_to_root": "cosmos-db-nosql-python-samples",
       "url": "https://github.com/azure-samples/cosmos-db-nosql-python-samples",
       "branch": "main",
       "branch_mapping": {}
     },
+    {
+      "path_to_root": "cosmos-db-nosql-python-quickstart",
+      "url": "https://github.com/azure-samples/cosmos-db-nosql-python-quickstart",
+      "branch": "main",
+      "branch_mapping": {}
+    },
+    {
+      "path_to_root": "cosmos-db-nosql-java-quickstart",
+      "url": "https://github.com/azure-samples/cosmos-db-nosql-java-quickstart",
+      "branch": "main",
+      "branch_mapping": {}
+    },
+    {
+      "path_to_root": "cosmos-db-nosql-go-quickstart",
+      "url": "https://github.com/azure-samples/cosmos-db-nosql-go-quickstart",
+      "branch": "main",
+      "branch_mapping": {}
+    },
     {
       "path_to_root": "cosmos-db-mongodb-dotnet-samples",
       "url": "https://github.com/azure-samples/cosmos-db-mongodb-dotnet-samples",
@@ -1204,6 +1228,8 @@
   "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/ai-studio/.openpublishing.redirection.ai-studio.json",
+  "articles/energy-data-services/.openpublishing.redirection.energy-data-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",
@@ -1223,6 +1249,8 @@
   "articles/digital-twins/.openpublishing.redirection.digital-twins.json",
   "articles/event-grid/.openpublishing.redirection.event-grid.json",
   "articles/event-hubs/.openpublishing.redirection.event-hubs.json",
+  "articles/governance/policy/.openpublishing.redirection.policy.json",
+  "articles/governance/policy/.openpublishing.redirection.resource-graph.json",
   "articles/hdinsight/.openpublishing.redirection.hdinsight.json",
   "articles/hdinsight-aks/.openpublishing.redirection.hdinsight-aks.json",
   "articles/healthcare-apis/.openpublishing.redirection.healthcare-apis.json",

.openpublishing.redirection.active-directory.json

@@ -430,6 +430,11 @@
             "redirect_url": "/previous-versions/azure/azure-monitor/visualize/workbooks-view-designer-conversion-overview",
             "redirect_document_id": false
         },
+        {
+            "source_path_from_root": "/articles/azure-monitor/visualize/workbooks-retrieve-legacy-workbooks.md",
+            "redirect_url": "/previous-versions/azure/azure-monitor/visualize/workbooks-retrieve-legacy-workbooks",
+            "redirect_document_id": false
+        },
         {
             "source_path_from_root": "/articles/azure-monitor/visualize/workbooks-view-designer-conversions.md",
             "redirect_url": "/previous-versions/azure/azure-monitor/visualize/workbooks-view-designer-conversions",
@@ -702,7 +707,7 @@
         },
         {
             "source_path_from_root": "/articles/azure-monitor/containers/container-insights-transition-hybrid.md",
-            "redirect_url": "/azure/azure-monitor/containers/container-insights-onboard",
+            "redirect_url": "/azure/azure-monitor/containers/kubernetes-monitoring-enable",
             "redirect_document_id": false
         },
         {
@@ -1185,6 +1190,11 @@
             "redirect_url": "/azure/azure-monitor/agents/agents-overview",
             "redirect_document_id": true
         },
+        {
+            "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": true
+        },
         {
             "source_path_from_root": "/azure/azure-monitor/agents/agents-overview.md#log-analytics-agent",
             "redirect_url": "/azure/azure-monitor/agents/log-analytics-agent",
@@ -1692,17 +1702,22 @@
         },
         {
             "source_path_from_root": "/articles/monitoring/monitoring-container-insights-onboard.md",
-            "redirect_url": "/azure/azure-monitor/insights/container-insights-onboard",
+            "redirect_url": "/azure/azure-monitor/insights/kubernetes-monitoring-enable",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/containers/container-insights-enable-provisioned-clusters.md",
+            "redirect_url": "/azure/azure-monitor/insights/kubernetes-monitoring-enable",
             "redirect_document_id": false
         },
         {
             "source_path_from_root": "/articles/monitoring/monitoring-container-insights-optout.md",
-            "redirect_url": "/azure/azure-monitor/insights/container-insights-optout",
+            "redirect_url": "/azure/azure-monitor/containers/kubernetes-monitoring-disable",
             "redirect_document_id": false
         },
         {
             "source_path_from_root": "/articles/azure-monitor/insights/container-insights-optout-openshift.md",
-            "redirect_url": "/azure/azure-monitor/insights/container-insights-optout-openshift-v3",
+            "redirect_url": "/azure/azure-monitor/containers/kubernetes-monitoring-disable",
             "redirect_document_id": false
         },
         {
@@ -4731,7 +4746,12 @@
         },
         {
             "source_path_from_root": "/articles/azure-monitor/insights/container-insights-agent-config.md",
-            "redirect_url": "/azure/azure-monitor/containers/container-insights-agent-config",
+            "redirect_url": "/azure/azure-monitor/containers/container-insights-data-collection-configmap",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-monitor/containers/container-insights-agent-config.md",
+            "redirect_url": "/azure/azure-monitor/containers/container-insights-data-collection-configmap",
             "redirect_document_id": false
         },
         {
@@ -4774,6 +4794,16 @@
             "redirect_url": "/azure/azure-monitor/containers/container-insights-enable-new-cluster",
             "redirect_document_id": false
         },
+        {
+            "source_path_from_root": "/articles/azure-monitor/containers/container-insights-enable-aks.md",
+            "redirect_url": "/azure/azure-monitor/containers/kubernetes-monitoring-enable",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-monitor/containers/container-insights-enable-arc-enabled-clusters.md",
+            "redirect_url": "/azure/azure-monitor/containers/kubernetes-monitoring-enable",
+            "redirect_document_id": false
+        },
         {
             "source_path_from_root": "/articles/azure-monitor/insights/container-insights-gpu-monitoring.md",
             "redirect_url": "/azure/azure-monitor/containers/container-insights-gpu-monitoring",
@@ -4826,27 +4856,27 @@
         },
         {
             "source_path_from_root": "/articles/azure-monitor/insights/container-insights-onboard.md",
-            "redirect_url": "/azure/azure-monitor/containers/container-insights-onboard",
+            "redirect_url": "/azure/azure-monitor/containers/kubernetes-monitoring-enable",
             "redirect_document_id": false
         },
         {
             "source_path_from_root": "/articles/azure-monitor/insights/container-insights-optout.md",
-            "redirect_url": "/azure/azure-monitor/containers/container-insights-optout",
+            "redirect_url": "/azure/azure-monitor/containers/kubernetes-monitoring-disable",
             "redirect_document_id": false
         },
         {
             "source_path_from_root": "/articles/azure-monitor/insights/container-insights-optout-hybrid.md",
-            "redirect_url": "/azure/azure-monitor/containers/container-insights-optout-hybrid",
+            "redirect_url": "/azure/azure-monitor/containers/kubernetes-monitoring-disable",
             "redirect_document_id": false
         },
         {
             "source_path_from_root": "/articles/azure-monitor/insights/container-insights-optout-openshift-v3.md",
-            "redirect_url": "/azure/azure-monitor/containers/container-insights-optout-openshift-v3",
+            "redirect_url": "/azure/azure-monitor/containers/kubernetes-monitoring-disable",
             "redirect_document_id": false
         },
         {
             "source_path_from_root": "/articles/azure-monitor/insights/container-insights-optout-openshift-v4.md",
-            "redirect_url": "/azure/azure-monitor/containers/container-insights-optout-openshift-v4",
+            "redirect_url": "/azure/azure-monitor/containers/kubernetes-monitoring-disable",
             "redirect_document_id": false
         },
         {
@@ -4879,6 +4909,16 @@
             "redirect_url": "/azure/azure-monitor/containers/container-insights-update-metrics",
             "redirect_document_id": false
         },
+        {
+            "source_path_from_root": "/articles/azure-monitor/containers/container-insights-enable-aks-policy.md",
+            "redirect_url": "/azure/azure-monitor/containers/kubernetes-monitoring-enable&tabs=policy#enable-container-insights",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-monitor/containers/container-insights-enable-provisioned-clusters.md",
+            "redirect_url": "/azure/azure-monitor/containers/kubernetes-monitoring-enable.md&tabs=cli#aks-hybrid-cluster",
+            "redirect_document_id": false
+        },
         {
             "source_path_from_root": "/articles/azure-monitor/log-query/app-expression.md",
             "redirect_url": "/azure/azure-monitor/logs/app-expression",
@@ -5706,7 +5746,7 @@
         },
         {
             "source_path_from_root": "/articles/azure-monitor/containers/container-insights-prometheus-metrics-addon.md",
-            "redirect_url": "/azure/azure-monitor/essentials/prometheus-metrics-enable",
+            "redirect_url": "/azure/azure-monitor/containers/kubernetes-monitoring-enable",
             "redirect_document_id": false
         },
         {
@@ -6051,7 +6091,7 @@
         },
         {
             "source_path_from_root": "/articles/azure-monitor/alerts/alerts-using-migration-tool.md",
-            "redirect_url": "previous-versions/azure/azure-monitor/alerts/alerts-using-migration-tool",
+            "redirect_url": "/previous-versions/azure/azure-monitor/alerts/alerts-using-migration-tool",
             "redirect_document_id": false
         },
         {
@@ -6074,6 +6114,21 @@
             "redirect_url": "/previous-versions/azure/azure-monitor/visualize/view-designer-filters",
             "redirect_document_id": false
         },
+        {
+            "source_path_from_root": "/articles/azure-monitor/visualize/workbooks-configurations.md",
+            "redirect_url": "/azure/azure-monitor/visualize/workbooks-manage",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-monitor/visualize/workbooks-getting-started.md",
+            "redirect_url": "/azure/azure-monitor/visualize/workbooks-overview",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-monitor/visualize/workbooks-commonly-used-components.md",
+            "redirect_url": "/azure/azure-monitor/visualize/workbooks-visualizations",
+            "redirect_document_id": false
+        },
         {
             "source_path_from_root": "/articles/azure-monitor/app/export-telemetry.md",
             "redirect_url": "/previous-versions/azure/azure-monitor/app/export-telemetry",
@@ -6211,17 +6266,17 @@
         },
         {
             "source_path_from_root": "/articles/azure-monitor/containers/container-insights-prometheus.md",
-            "redirect_url": "/azure/azure-monitor/containers/prometheus-metrics-enable",
+            "redirect_url": "/azure/azure-monitor/containers/kubernetes-monitoring-enable",
             "redirect_document_id": false
         },
         {
             "source_path_from_root": "/articles/azure-monitor/essentials/prometheus-metrics-enable.md",
-            "redirect_url": "/azure/azure-monitor/containers/prometheus-metrics-enable",
+            "redirect_url": "/azure/azure-monitor/containers/kubernetes-monitoring-enable.md#enable-prometheus-and-grafana",
             "redirect_document_id": false
         },
         {
             "source_path_from_root": "/articles/azure-monitor/essentials/prometheus-metrics-disable.md",
-            "redirect_url": "/azure/azure-monitor/containers/prometheus-metrics-disable",
+            "redirect_url": "/azure/azure-monitor/containers/kubernetes-monitoring-disable",
             "redirect_document_id": false
         },
         {
@@ -6294,6 +6349,21 @@
             "redirect_url": "/azure/azure-monitor/containers/prometheus-authorization-proxy",
             "redirect_document_id": false
         },
+        {
+            "source_path_from_root": "/articles/azure-monitor/containers/prometheus-metrics-disable.md",
+            "redirect_url": "/azure/azure-monitor/containers/kubernetes-monitoring-disable",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-monitor/containers/container-insights-logging-v2.md",
+            "redirect_url": "/azure/azure-monitor/containers/container-insights-logs-schema",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-monitor/containers/container-insights-onboard.md",
+            "redirect_url": "/azure/azure-monitor/containers/kubernetes-monitoring-enable",
+            "redirect_document_id": false
+        },        
         {
             "source_path_from_root": "/articles/azure-monitor/azure-cli-metrics-alert-sample.md",
             "redirect_url": "/azure/azure-monitor/alerts/azure-cli-metrics-alert-sample",
@@ -6324,14 +6394,44 @@
             "redirect_url": "/azure/azure-monitor/agents/solution-agenthealth",
             "redirect_document_id": false
         },
+        {
+            "source_path_from_root": "/articles/azure-monitor/containers/container-insights-optout.md",
+            "redirect_url": "/azure/azure-monitor/containers/kubernetes-monitoring-disable",
+            "redirect_document_id": false
+        },
         {
             "source_path_from_root": "/articles/azure-monitor/containers/container-insights-optout-openshift-v3.md",
-            "redirect_url": "/azure/azure-monitor/containers/container-insights-optout",
+            "redirect_url": "/azure/azure-monitor/containers/kubernetes-monitoring-disable",
             "redirect_document_id": false
         },
         {
             "source_path_from_root": "/articles/azure-monitor/containers/container-insights-optout-openshift-v4.md",
-            "redirect_url": "/azure/azure-monitor/containers/container-insights-optout",
+            "redirect_url": "/azure/azure-monitor/containers/kubernetes-monitoring-disable",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-monitor/containers/container-insights-cost-config.md",
+            "redirect_url": "/azure/azure-monitor/containers/container-insights-data-collection-dcr",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-monitor/containers/container-insights-optout-hybrid.md",
+            "redirect_url": "/azure/azure-monitor/containers/kubernetes-monitoring-disable",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-monitor/containers/container-insights-v2-migration.md",
+            "redirect_url": "/azure/azure-monitor/containers/container-insights-logs-schema",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-monitor/containers/prometheus-metrics-enable.md",
+            "redirect_url": "/azure/azure-monitor/containers/kubernetes-monitoring-enable#enable-prometheus-and-grafana",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-monitor/containers/prometheus-metrics-from-arc-enabled-cluster.md",
+            "redirect_url": "/azure/azure-monitor/containers/kubernetes-monitoring-enable",
             "redirect_document_id": false
         },
         {
@@ -6468,6 +6568,16 @@
             "source_path_from_root": "/articles/azure-monitor/vm/vminsights-configure-workspace.md",
             "redirect_url": "/azure/azure-monitor/vm/vminsights-enable-overview",
             "redirect_document_id": false
-        }
+        },
+        {
+            "source_path_from_root": "/articles/azure-monitor/logs/data-collection-rule-sample-custom-logs.md",
+            "redirect_url": "/azure/azure-monitor/essentials/data-collection-rule-samples",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-monitor/agents/data-collection-rule-sample-agent.md",
+            "redirect_url": "/azure/azure-monitor/essentials/data-collection-rule-samples",
+            "redirect_document_id": false
+        }        
     ]
 }

.openpublishing.redirection.azure-monitor.json

@@ -1919,11 +1919,6 @@
           "source_path_from_root": "/articles/azure-resource-manager/managed-applications/scripts/managed-application-powershell-sample-get-managed-group-resize-vm.md",
           "redirect_url": "/azure/azure-resource-manager/managed-applications/overview",
           "redirect_document_id": false
-        },
-        {
-            "source_path_from_root": "/articles/governance/policy/tutorials/policy-as-code-github.md",
-            "redirect_url": "/azure/governance/policy/concepts/policy-as-code",
-            "redirect_document_id": false
-          }
+        }
     ]
 }