Merge branch 'main' into airflow-config

Author: ambika-garg

.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

@@ -176,12 +176,24 @@
       "branch": "master",
       "branch_mapping": {}
     },
+    {
+      "path_to_root": "azure_powershell_scripts",
+      "url": "https://github.com/Azure-Samples/azure-docs-powershell-samples",
+      "branch": "main",
+      "branch_mapping": {}
+    },
     {
       "path_to_root": "powershell_scripts",
       "url": "https://github.com/Azure/azure-docs-powershell-samples",
       "branch": "master",
       "branch_mapping": {}
     },
+    {
+      "path_to_root": "new_powershell_scripts",
+      "url": "https://github.com/Azure-Samples/azure-docs-powershell-samples",
+      "branch": "main",
+      "branch_mapping": {}
+    },
     {
       "path_to_root": "policy-templates",
       "url": "https://github.com/Azure/azure-policy",
@@ -509,7 +521,7 @@
     {
       "path_to_root": "azureml-examples-temp-fix",
       "url": "https://github.com/Azure/azureml-examples",
-      "branch": "temp-fix-doc-error",
+      "branch": "temp-fix",
       "branch_mapping": {}
     },
     {
@@ -944,6 +956,12 @@
       "branch": "main",
       "branch_mapping": {}
     },
+    {
+      "path_to_root": "msdocs-quarkus-postgresql-sample-app",
+      "url": "https://github.com/Azure-Samples/msdocs-quarkus-postgresql-sample-app",
+      "branch": "main",
+      "branch_mapping": {}
+    },
     {
       "path_to_root": "azuresignalr-samples",
       "url": "https://github.com/aspnet/AzureSignalR-samples",
@@ -1129,6 +1147,12 @@
       "url": "https://github.com/MicrosoftDocs/azure-reference-other-pr",
       "branch": "main",
       "branch_mapping": {}
+    },
+    {
+      "path_to_root": "azure-iot-operations-samples",
+      "url": "https://github.com/Azure-Samples/explore-iot-operations",
+      "branch": "main",
+      "branch_mapping": {}
     }
   ],
   "branch_target_mapping": {
@@ -1230,9 +1254,11 @@
   "articles/spring-apps/.openpublishing.redirection.spring-apps.json",
   "articles/spring-cloud/.openpublishing.redirection.spring-cloud.json",
   "articles/static-web-apps/.openpublishing.redirection.static-web-apps.json",
+  "articles/storsimple/.openpublishing.redirection.storsimple.json",
   "articles/stream-analytics/.openpublishing.redirection.stream-analytics.json",
   "articles/synapse-analytics/.openpublishing.redirection.synapse-analytics.json",
   "articles/virtual-machine-scale-sets/.openpublishing.redirection.virtual-machine-scale-sets.json",
-  "articles/virtual-machines/.openpublishing.redirection.virtual-machines.json"
+  "articles/virtual-machines/.openpublishing.redirection.virtual-machines.json",
+  "articles/operator-nexus/.openpublishing.redirection.operator-nexus.json"
 ]
 }

.openpublishing.redirection.api-management.json

@@ -1,5 +1,80 @@
 {
   "redirections": [
+      {
+        "source_path": "articles/api-management/set-graphql-resolver-policy.md",
+        "redirect_url": "/previous-versions/azure/api-management/set-graphql-resolver-policy",
+        "redirect_document_id": false
+      },      
+      {
+        "source_path": "articles/api-management/api-management-api-templates.md",
+        "redirect_url": "/previous-versions/azure/api-management/api-management-api-templates",
+        "redirect_document_id": false
+      },
+      {
+        "source_path": "articles/api-management/api-management-application-templates.md",
+        "redirect_url": "/previous-versions/azure/api-management/api-management-application-templates",
+        "redirect_document_id": false
+      },
+      {
+        "source_path": "articles/api-management/api-management-customize-styles.md",
+        "redirect_url": "/previous-versions/azure/api-management/api-management-customize-styles",
+        "redirect_document_id": false
+      },
+      {
+        "source_path": "articles/api-management/api-management-developer-portal-templates-reference.md",
+        "redirect_url": "/previous-versions/azure/api-management/api-management-developer-portal-templates-reference",
+        "redirect_document_id": false
+      },
+      {
+        "source_path": "articles/api-management/api-management-developer-portal-templates.md",
+        "redirect_url": "/previous-versions/azure/api-management/api-management-developer-portal-templates",
+        "redirect_document_id": false
+      },
+      {
+        "source_path": "articles/api-management/api-management-issue-templates.md",
+        "redirect_url": "/previous-versions/azure/api-management/api-management-issue-templates",
+        "redirect_document_id": false
+      },
+      {
+        "source_path": "articles/api-management/api-management-modify-content-layout.md",
+        "redirect_url": "/previous-versions/azure/api-management/api-management-modify-content-layout",
+        "redirect_document_id": false
+      },
+      {
+        "source_path": "articles/api-management/api-management-page-controls.md",
+        "redirect_url": "/previous-versions/azure/api-management/api-management-page-controls",
+        "redirect_document_id": false
+      },
+      {
+        "source_path": "articles/api-management/api-management-page-templates.md",
+        "redirect_url": "/previous-versions/azure/api-management/api-management-page-templates",
+        "redirect_document_id": false
+      },
+      {
+        "source_path": "articles/api-management/api-management-product-templates.md",
+        "redirect_url": "/previous-versions/azure/api-management/api-management-product-templates",
+        "redirect_document_id": false
+      },
+      {
+        "source_path": "articles/api-management/api-management-template-data-model-reference.md",
+        "redirect_url": "/previous-versions/azure/api-management/api-management-template-data-model-reference",
+        "redirect_document_id": false
+      },
+      {
+        "source_path": "articles/api-management/api-management-template-resources.md",
+        "redirect_url": "/previous-versions/azure/api-management/api-management-template-resources",
+        "redirect_document_id": false
+      },
+      {
+        "source_path": "articles/api-management/api-management-user-profile-templates.md",
+        "redirect_url": "/previous-versions/azure/api-management/api-management-user-profile-templates",
+        "redirect_document_id": false
+      },
+      {
+        "source_path": "articles/api-management/developer-portal-deprecated-migration.md",
+        "redirect_url": "/previous-versions/azure/api-management/developer-portal-deprecated-migration",
+        "redirect_document_id": false
+      }, 
     {
         "source_path_from_root": "/articles/api-management/authorizations-overview.md",
         "redirect_url": "/azure/api-management/credentials-overview",

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

@@ -1,5 +1,15 @@
 {
     "redirections": [
+        {
+            "source_path_from_root": "/articles/aks/auto-upgrade-node-image.md",
+            "redirect_url": "/azure/aks/auto-upgrade-node-os-image",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/aks/managed-azure-ad.md",
+            "redirect_url": "/azure/aks/enable-authentication-microsoft-entra-id",
+            "redirect_document_id": false
+        },
         {
             "source_path_from_root": "/articles/aks/stop-api-upgrade.md",
             "redirect_url": "/azure/aks/upgrade-cluster",

.openpublishing.redirection.azure-monitor.json

@@ -425,6 +425,16 @@
             "redirect_url": "/azure/azure-monitor/visualize/workbooks-data-sources",
             "redirect_document_id": false
         },
+        {
+            "source_path_from_root": "/articles/azure-monitor/visualize/workbooks-view-designer-conversion-overview.md",
+            "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-view-designer-conversions.md",
+            "redirect_url": "/previous-versions/azure/azure-monitor/visualize/workbooks-view-designer-conversions",
+            "redirect_document_id": false
+        },
         {
             "source_path_from_root": "/articles/azure-monitor/alerts/itsmc-service-manager-script.md",
             "redirect_url": "/azure/azure-monitor/alerts/itsmc-overview",
@@ -475,6 +485,11 @@
             "redirect_url": "/azure/azure-monitor/alerts/alerts-types",
             "redirect_document_id": false
         },
+        {
+            "source_path_from_root": "/articles/azure-monitor/alerts/alerts-create-new-alert-rule.md",
+            "redirect_url": "/azure/azure-monitor/alerts/alerts-create-metric-alert-rule",
+            "redirect_document_id": false
+        },
         {
             "source_path_from_root": "/articles/azure-monitor/alerts/alerts-page.md",
             "redirect_url": "/azure/azure-monitor/alerts/alerts-manage-alert-instances",
@@ -492,17 +507,17 @@
         },
         {
             "source_path_from_root": "/articles/azure-monitor/alerts/alerts-metric.md",
-            "redirect_url": "/azure/azure-monitor/alerts/alerts-create-new-alert-rule",
+            "redirect_url": "/azure/azure-monitor/alerts/alerts-create-metric-alert-rule",
             "redirect_document_id": false
         },
         {
             "source_path_from_root": "/articles/azure-monitor/alerts/alerts-log.md",
-            "redirect_url": "/azure/azure-monitor/alerts/alerts-create-new-alert-rule",
+            "redirect_url": "/azure/azure-monitor/alerts/alerts-create-log-alert-rule",
             "redirect_document_id": false
         },
         {
             "source_path_from_root": "/articles/azure-monitor/alerts/alerts-activity-log.md",
-            "redirect_url": "/azure/azure-monitor/alerts/alerts-create-new-alert-rule",
+            "redirect_url": "/azure/azure-monitor/alerts/alerts-create-activity-log-alert-rule",
             "redirect_document_id": false
         },
         {
@@ -2601,22 +2616,22 @@
         },
         {
             "source_path_from_root": "/articles/azure-monitor/platform/quick-alerts-classic-metric-portal.md",
-            "redirect_url": "/azure/azure-monitor/alerts/alerts-metric",
+            "redirect_url": "/azure/azure-monitor/alerts/alerts-create-metric-alert-rule",
             "redirect_document_id": false
         },
         {
             "source_path_from_root": "/articles/monitoring-and-diagnostics/alert-metric.md",
-            "redirect_url": "/azure/azure-monitor/alerts/alerts-metric",
+            "redirect_url": "/azure/azure-monitor/alerts/alerts-create-metric-alert-rule",
             "redirect_document_id": true
         },
         {
             "source_path_from_root": "/articles/monitoring-and-diagnostics/monitor-quick-resource-metric-alert-portal.md",
-            "redirect_url": "/azure/azure-monitor/alerts/alerts-metric",
+            "redirect_url": "/azure/azure-monitor/alerts/alerts-create-metric-alert-rule",
             "redirect_document_id": false
         },
         {
             "source_path_from_root": "/articles/monitoring-and-diagnostics/monitoring-create-metric-alerts-with-templates.md",
-            "redirect_url": "/azure/azure-monitor/alerts/alerts-metric-create-templates",
+            "redirect_url": "/azure/azure-monitor/alerts/alerts-create-rule-cli-powershell-arm",
             "redirect_document_id": true
         },
         {
@@ -2631,7 +2646,7 @@
         },
         {
             "source_path_from_root": "/articles/monitoring-and-diagnostics/alert-metric-overview.md",
-            "redirect_url": "/azure/azure-monitor/alerts/alerts-metric-overview",
+            "redirect_url": "/azure/azure-monitor/alerts/alerts-types",
             "redirect_document_id": true
         },
         {
@@ -4001,17 +4016,17 @@
         },
         {
             "source_path_from_root": "/articles/azure-monitor/platform/alerts-metric.md",
-            "redirect_url": "/azure/azure-monitor/alerts/alerts-metric",
+            "redirect_url": "/azure/azure-monitor/alerts/alerts-create-metric-alert-rule",
             "redirect_document_id": false
         },
         {
             "source_path_from_root": "/articles/azure-monitor/platform/alerts-metric-create-templates.md",
-            "redirect_url": "/azure/azure-monitor/alerts/alerts-metric-create-templates",
+            "redirect_url": "/azure/azure-monitor/alerts/alerts-create-rule-cli-powershell-arm",
             "redirect_document_id": false
         },
         {
             "source_path_from_root": "/articles/azure-monitor/alerts/alerts-metric-create-templates.md",
-            "redirect_url": "/azure/azure-monitor/alerts/alerts-create-new-alert-rule",
+            "redirect_url": "/azure/azure-monitor/alerts/alerts-create-rule-cli-powershell-arm",
             "redirect_document_id": false
         },
         {
@@ -4021,7 +4036,7 @@
         },
         {
             "source_path_from_root": "/articles/azure-monitor/alerts/alerts-log-create-templates.md",
-            "redirect_url": "/azure/azure-monitor/alerts/alerts-create-new-alert-rule",
+            "redirect_url": "/azure/azure-monitor/alerts/alerts-create-rule-cli-powershell-arm",
             "redirect_document_id": false
         },
         {
@@ -6433,6 +6448,26 @@
             "source_path_from_root": "/articles/azure-monitor/faq.yml",
             "redirect_url": "/azure/azure-monitor/overview#frequently-asked-questions",
             "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-monitor/logs/app-expression.md",
+            "redirect_url": "/azure/azure-monitor/logs/cross-workspace-query",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-monitor/logs/workspace-expression.md",
+            "redirect_url": "/azure/azure-monitor/logs/cross-workspace-query",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-monitor/logs/resource-expression.md",
+            "redirect_url": "/azure/azure-monitor/logs/cross-workspace-query",
+            "redirect_document_id": false
+        },
+        {
+            "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
         }
     ]
 }

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

@@ -890,6 +890,16 @@
             "redirect_url": "/azure/defender-for-cloud/defender-for-storage-classic-enable#exclude-a-storage-account-from-a-protected-subscription-in-the-per-transaction-plan",
             "redirect_document_id": true
         },
+        {
+            "source_path_from_root": "/articles/defender-for-cloud/agentless-container-registry-vulnerability-assessment.md",
+            "redirect_url": "/azure/defender-for-cloud/agentless-vulnerability-assessment-azure",
+            "redirect_document_id": true
+        },
+        {
+            "source_path_from_root": "/articles/defender-for-cloud/view-and-remediate-vulnerabilities-for-images-running-on-aks.md",
+            "redirect_url": "/azure/defender-for-cloud/view-and-remediate-vulnerabilities-for-images",
+            "redirect_document_id": true
+        },
         {
             "source_path_from_root": "/articles/defender-for-cloud/attack-path-reference.md",
             "redirect_url": "/azure/defender-for-cloud/how-to-manage-attack-path",