fix merge conflict

Author: v-albemi

.openpublishing.redirection.active-directory.json

@@ -24393,7 +24393,7 @@
     {
       "source_path_from_root": "/articles/active-directory/reports-monitoring/overview-service-health-notifications.md",
       "redirect_url": "/azure/service-health/service-health-portal-update",
-      "redirect_document_id": true
+      "redirect_document_id": false
     },
     {
       "source_path_from_root": "/articles/active-directory/reports-monitoring/quickstart-configure-named-locations.md",
@@ -33686,4 +33686,4 @@
       "redirect_document_id": false
     }
   ]
-}
+}

.openpublishing.redirection.app-service.json

@@ -1322,7 +1322,22 @@
         },
         {
             "source_path_from_root": "/articles/app-service/containers/quickstart-multi-container.md",
-            "redirect_url": "/azure/app-service/quickstart-multi-container",
+            "redirect_url": "/azure/app-service/tutorial-custom-container-sidecar",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/app-service/containers/tutorial-multi-container-app.md",
+            "redirect_url": "/azure/app-service/tutorial-custom-container-sidecar",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/app-service/quickstart-multi-container.md",
+            "redirect_url": "/azure/app-service/tutorial-custom-container-sidecar",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/app-service/tutorial-multi-container-app.md",
+            "redirect_url": "/azure/app-service/tutorial-custom-container-sidecar",
             "redirect_document_id": false
         },
         {
@@ -1966,18 +1981,18 @@
             "redirect_document_id": false
         },
         {
-            "source_path_from_root": "/articles/app-service/containers/tutorial-java-spring-cosmosdb.md",
+            "source_path_from_root": "/articles/app-service/tutorial-java-quarkus-postgresql-app.md",
             "redirect_url": "/azure/app-service/tutorial-java-spring-cosmosdb",
             "redirect_document_id": false
         },
         {
-            "source_path_from_root": "/articles/app-service-web/app-service-web-tutorial-java-mysql.md",
+            "source_path_from_root": "/articles/app-service/containers/tutorial-java-spring-cosmosdb.md",
             "redirect_url": "/azure/app-service/tutorial-java-spring-cosmosdb",
             "redirect_document_id": false
         },
         {
-            "source_path_from_root": "/articles/app-service/containers/tutorial-multi-container-app.md",
-            "redirect_url": "/azure/app-service/tutorial-multi-container-app",
+            "source_path_from_root": "/articles/app-service-web/app-service-web-tutorial-java-mysql.md",
+            "redirect_url": "/azure/app-service/tutorial-java-spring-cosmosdb",
             "redirect_document_id": false
         },
         {

.openpublishing.redirection.azure-functions.json

@@ -1,9 +1,14 @@
 {
     "redirections": [
+        {
+            "source_path_from_root": "/articles/azure-functions/functions-bindings-return-value.md",
+            "redirect_url": "/azure/azure-functions/functions-triggers-bindings",
+            "redirect_document_id": false
+        },
         {
             "source_path_from_root": "/articles/azure-functions/durable/durable-functions-configure-durable-functions-with-credentials.md",
             "redirect_url": "/azure/azure-functions/durable/durable-functions-configure-managed-identity",
             "redirect_document_id": false
-        }
+        }    
     ]
 }

.openpublishing.redirection.azure-monitor.json

@@ -2009,6 +2009,11 @@
       "source_path_from_root": "/articles/azure-resource-manager/bicep/bicep-extensibility-kubernetes-provider.md",
       "redirect_url": "/azure/azure-resource-manager/bicep/bicep-kubernetes-extension",
       "redirect_document_id": false
-    }    
+    },
+    {
+      "source_path_from_root": "/articles/azure-resource-manager/bicep/tutorial-use-deployment-stacks.md",
+      "redirect_url": "/training/modules/manage-resource-lifecycles-deployment-stacks",
+      "redirect_document_id": false
+    }        
   ]
 }

.openpublishing.redirection.azure-resource-manager.json

@@ -4,6 +4,11 @@
             "source_path_from_root": "/articles/education-hub/custom-tenant-set-up-classroom.md",
             "redirect_url": "/articles/education-hub/about-education-hub.md",
             "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/education-hub/it-admin-allocate-credit.md",
+            "redirect_url": "/articles/education-hub/about-education-hub.md",
+            "redirect_document_id": false
         }
     ]
     }

.openpublishing.redirection.education.json

@@ -350,6 +350,11 @@
       "redirect_url": "/azure/iot/concepts-model-parser",
       "redirect_document_id": false
     },
+    {
+      "source_path_from_root": "/articles/iot/concepts-model-parser.md",
+      "redirect_url": "/azure/iot/concepts-modeling-guide",
+      "redirect_document_id": false
+    },
     {
       "source_path_from_root": "/articles/iot-pnp/concepts-model-repository.md",
       "redirect_url": "/azure/iot/concepts-model-discovery",

.openpublishing.redirection.iot-develop.json

@@ -10,7 +10,7 @@
       "redirect_url": "/previous-versions/azure/azure-app-configuration/rest-api-fiddler",
       "redirect_document_id": false
     },
-    { 
+    {
       "source_path": "articles/kinect-dk/index.yml",
       "redirect_url": "/previous-versions/azure/kinect-dk/index",
       "redirect_document_id": false
@@ -290,26 +290,6 @@
       "redirect_url": "/previous-versions/azure/storage/file-sync/file-sync-storsimple-cost-comparison",
       "redirect_document_id": false
     },
-    {
-      "source_path_from_root": "/articles/advisor/advisor-alerts.md",
-      "redirect_url": "/azure/advisor/advisor-alerts-portal",
-      "redirect_document_id": false
-    },
-    {
-      "source_path_from_root": "/articles/advisor/advisor-high-availability-recommendations.md",
-      "redirect_url": "/azure/advisor/advisor-reference-reliability-recommendations",
-      "redirect_document_id": false
-    },
-    {
-      "source_path_from_root": "/articles/advisor/advisor-operational-excellence-recommendations.md",
-      "redirect_url": "/azure/advisor/advisor-reference-operational-excellence-recommendations",
-      "redirect_document_id": false
-    },
-    {
-      "source_path_from_root": "/articles/advisor/advisor-performance-recommendations.md",
-      "redirect_url": "/azure/advisor/advisor-reference-performance-recommendations",
-      "redirect_document_id": false
-    },
     {
       "source_path_from_root": "/articles/app-service/manage-move-across-regions.md",
       "redirect_url": "/azure/operational-excellence/relocation-app-service",
@@ -590,11 +570,6 @@
       "redirect_url": "/azure/azure-maps/",
       "redirect_document_id": true
     },
-    {
-      "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/azure-portal-overview.md",
       "redirect_url": "https://azure.microsoft.com/features/azure-portal/",
@@ -1310,21 +1285,6 @@
       "redirect_url": "/azure/cdn/monitoring-and-access-log",
       "redirect_document_id": true
     },
-    {
-      "source_path_from_root": "/articles/chaos-studio/chaos-studio-tutorial-agent-based.md",
-      "redirect_url": "/azure/chaos-studio/chaos-studio-tutorial-agent-based-portal",
-      "redirect_document_id": false
-    },
-    {
-      "source_path_from_root": "/articles/chaos-studio/chaos-studio-tutorial-aks.md",
-      "redirect_url": "/azure/chaos-studio/chaos-studio-tutorial-aks-portal",
-      "redirect_document_id": false
-    },
-    {
-      "source_path_from_root": "/articles/chaos-studio/chaos-studio-tutorial-service-direct.md",
-      "redirect_url": "/azure/chaos-studio/chaos-studio-tutorial-service-direct-portal",
-      "redirect_document_id": false
-    },
     {
       "source_path_from_root": "/articles/chef/chef-automation.md",
       "redirect_url": "/azure/developer/chef/windows-vm-configure",
@@ -2135,16 +2095,46 @@
       "redirect_url": "/azure/firewall/ftp-support",
       "redirect_document_id": false
     },
+    {
+      "source_path_from_root": "/articles/firewall/diagnostic-logs.md",
+      "redirect_url": "/azure/firewall/monitor-firewall",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/firewall/enable-top-ten-and-flow-trace.md",
+      "redirect_url": "/azure/firewall/monitor-firewall-reference",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/firewall/firewall-diagnostics.md",
+      "redirect_url": "/azure/firewall/monitor-firewall",
+      "redirect_document_id": false
+    },
     {
       "source_path_from_root": "/articles/firewall/firewall-network-rule-logging.md",
-      "redirect_url": "/azure/firewall/firewall-diagnostics",
+      "redirect_url": "/azure/firewall/monitor-firewall",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/firewall/firewall-structured-logs.md",
+      "redirect_url": "/azure/firewall/monitor-firewall",
       "redirect_document_id": false
     },
     {
       "source_path_from_root": "/articles/firewall/log-analytics-samples.md",
       "redirect_url": "/azure/firewall/firewall-workbook",
       "redirect_document_id": false
     },
+    {
+      "source_path_from_root": "/articles/firewall/logs-and-metrics.md",
+      "redirect_url": "/azure/firewall/monitor-firewall",
+      "redirect_document_id": true
+    },
+    {
+      "source_path_from_root": "/articles/firewall/metrics.md",
+      "redirect_url": "/azure/firewall/monitor-firewall-reference",
+      "redirect_document_id": false
+    },
     {
       "source_path_from_root": "/articles/firewall/protect-windows-virtual-desktop.md",
       "redirect_url": "/azure/firewall/protect-azure-virtual-desktop",
@@ -2167,7 +2157,7 @@
     },
     {
       "source_path_from_root": "/articles/firewall/tutorial-diagnostics.md",
-      "redirect_url": "/azure/firewall/firewall-diagnostics",
+      "redirect_url": "/azure/firewall/monitor-firewall",
       "redirect_document_id": false
     },
     {
@@ -3125,6 +3115,11 @@
       "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",
@@ -3885,16 +3880,6 @@
       "redirect_url": "/azure/sentinel/monitor-your-data",
       "redirect_document_id": false
     },
-    {
-      "source_path_from_root": "/articles/service-health/alerts-activity-log-service-notifications.md",
-      "redirect_url": "/azure/service-health/alerts-activity-log-service-notifications-portal",
-      "redirect_document_id": false
-    },
-    {
-      "source_path_from_root": "/articles/service-health/service-health-rest.md",
-      "redirect_url": "/azure/service-health/index",
-      "redirect_document_id": false
-    },
     {
       "source_path_from_root": "/articles/site-recovery/move-vaults-across-regions.md",
       "redirect_url": "/azure/operational-excellence/relocation-site-recovery",
@@ -4380,6 +4365,11 @@
       "redirect_url": "/azure/virtual-wan/monitor-virtual-wan",
       "redirect_document_id": false
     },
+    {
+      "source_path_from_root": "/articles/virtual-wan/monitoring-best-practices.md",
+      "redirect_url": "/azure/virtual-wan/monitor-virtual-wan",
+      "redirect_document_id": false
+    },
     {
       "source_path_from_root": "/articles/virtual-wan/scenario-route-between-hubs-firewall.md",
       "redirect_url": "/azure/virtual-wan/scenario-route-between-vnets-firewall",
@@ -4754,6 +4744,11 @@
       "source_path_from_root": "/articles/virtual-network/virtual-network-service-endpoint-policies-powershell.md",
       "redirect_url": "/azure/virtual-network/virtual-network-service-endpoint-policies",
       "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/modeling-simulation-workbench/how-to-guide-manage-storage.md",
+      "redirect_url": "/azure/modeling-simulation-workbench/concept-storage",
+      "redirect_document_id": false
     }
   ]
-}
+}

.openpublishing.redirection.json

@@ -165,11 +165,6 @@
       "redirect_url": "/security/benchmark/azure/baselines/aad-security-baseline",
       "redirect_document_id": false
     },
-    {
-      "source_path_from_root": "/articles/advisor/security-baseline.md",
-      "redirect_url": "/security/benchmark/azure/baselines/advisor-security-baseline",
-      "redirect_document_id": false
-    },
     {
       "source_path_from_root": "/articles/azure-app-configuration/security-baseline.md",
       "redirect_url": "/security/benchmark/azure/baselines/app-config-security-baseline",
@@ -265,11 +260,6 @@
       "redirect_url": "/security/benchmark/azure/baselines/managed-applications-security-baseline",
       "redirect_document_id": false
     },
-    {
-      "source_path_from_root": "/articles/azure-monitor/security-baseline.md",
-      "redirect_url": "/security/benchmark/azure/baselines/monitor-security-baseline",
-      "redirect_document_id": false
-    },
     {
       "source_path_from_root": "/articles/migrate/security-baseline.md",
       "redirect_url": "/security/benchmark/azure/baselines/migrate-security-baseline",

.openpublishing.redirection.security-benchmark.json

@@ -283,7 +283,7 @@
         {
             "source_path": "articles/sentinel/store-logs-in-azure-data-explorer.md",
             "redirect_url": "/azure/azure-monitor/logs/data-retention-archive",
-            "redirect_document_id": true
+            "redirect_document_id": false
         },
         {
             "source_path": "articles/sentinel/review-fine-tune-overview.md",
@@ -1657,4 +1657,4 @@
             "redirect_document_id": false
         }
     ]
-}
+}