Merge pull request #270802 from dlepow/d2

[APIM][release-ga-apim-v2-tiers] Dirty PR to resolve merge conflict with main

Author: Court72

.openpublishing.redirection.availability-zones.json

@@ -7,22 +7,22 @@
         },
         {
             "source_path_from_root": "/articles/availability-zones/az-region.md",
-            "redirect_URL": "/azure/reliability/availability-zones-service-support",
+            "redirect_url": "/azure/reliability/availability-zones-service-support",
             "redirect_document_id": false
         },
         {
             "source_path_from_root": "/articles/availability-zones/business-continuity-management-program.md",
-            "redirect_URL": "/azure/reliability/business-continuity-management-program",
+            "redirect_url": "/azure/reliability/business-continuity-management-program",
             "redirect_document_id": false
         },
         {
             "source_path_from_root": "/articles/availability-zones/cross-region-replication-azure.md",
-            "redirect_URL": "/azure/reliability/cross-region-replication-azure",
+            "redirect_url": "/azure/reliability/cross-region-replication-azure",
             "redirect_document_id": false
         },
         {
             "source_path_from_root": "/articles/availability-zones/glossary.md",
-            "redirect_URL": "/azure/reliability/glossary",
+            "redirect_url": "/azure/reliability/glossary",
             "redirect_document_id": false
         },
         {
@@ -32,87 +32,87 @@
         },
         {
             "source_path_from_root": "/articles/availability-zones/migrate-api-mgt.md",
-            "redirect_URL": "/azure/reliability/migrate-api-mgt",
+            "redirect_url": "/azure/reliability/migrate-api-mgt",
             "redirect_document_id": false
         },
         {
             "source_path_from_root": "/articles/availability-zones/migrate-app-configuration.md",
-            "redirect_URL": "/azure/reliability/migrate-app-configuration-mgt",
+            "redirect_url": "/azure/reliability/migrate-app-configuration-mgt",
             "redirect_document_id": false
         },
         {
             "source_path_from_root": "/articles/availability-zones/migrate-app-gateway-v2.md",
-            "redirect_URL": "/azure/reliability/migrate-app-gateway-v2",
+            "redirect_url": "/azure/reliability/migrate-app-gateway-v2",
             "redirect_document_id": false
         },
         {
             "source_path_from_root": "/articles/availability-zones/migrate-app-service-environment.md",
-            "redirect_URL": "/azure/reliability/migrate-app-service-environment",
+            "redirect_url": "/azure/reliability/migrate-app-service-environment",
             "redirect_document_id": false
         },
         {
             "source_path_from_root": "/articles/availability-zones/migrate-app-service.md",
-            "redirect_URL": "/azure/reliability/migrate-app-service",
+            "redirect_url": "/azure/reliability/migrate-app-service",
             "redirect_document_id": false
         },
         {
             "source_path_from_root": "/articles/availability-zones/migrate-cache-redis.md",
-            "redirect_URL": "/azure/reliability/migrate-cache-redis",
+            "redirect_url": "/azure/reliability/migrate-cache-redis",
             "redirect_document_id": false
         },
         {
             "source_path_from_root": "/articles/availability-zones/migrate-container-instances.md",
-            "redirect_URL": "/azure/reliability/migrate-container-instances",
+            "redirect_url": "/azure/reliability/migrate-container-instances",
             "redirect_document_id": false
         },
         {
             "source_path_from_root": "/articles/availability-zones/migrate-functions.md",
-            "redirect_URL": "/azure/reliability/migrate-functions",
+            "redirect_url": "/azure/reliability/migrate-functions",
             "redirect_document_id": false
         },
         {
             "source_path_from_root": "/articles/availability-zones/migrate-load-balancer.md",
-            "redirect_URL": "/azure/reliability/migrate-load-balancer",
+            "redirect_url": "/azure/reliability/migrate-load-balancer",
             "redirect_document_id": false
         },
         {
             "source_path_from_root": "/articles/availability-zones/migrate-monitor-log-analytics.md",
-            "redirect_URL": "/azure/reliability/migrate-monitor-log-analytics",
+            "redirect_url": "/azure/reliability/migrate-monitor-log-analytics",
             "redirect_document_id": false
         },
         {
             "source_path_from_root": "/articles/availability-zones/migrate-recovery-services-vault.md",
-            "redirect_URL": "/azure/reliability/migrate-recovery-services-vault",
+            "redirect_url": "/azure/reliability/migrate-recovery-services-vault",
             "redirect_document_id": false
         },
         {
             "source_path_from_root": "/articles/availability-zones/migrate-search-service.md",
-            "redirect_URL": "/azure/reliability/migrate-search-service-balancer",
+            "redirect_url": "/azure/reliability/migrate-search-service-balancer",
             "redirect_document_id": false
         },
         {
             "source_path_from_root": "/articles/availability-zones/migrate-storage.md",
-            "redirect_URL": "/azure/reliability/migrate-storage",
+            "redirect_url": "/azure/reliability/migrate-storage",
             "redirect_document_id": false
         },
         {
             "source_path_from_root": "/articles/availability-zones/migrate-vm.md",
-            "redirect_URL": "/azure/reliability/migrate-vm",
+            "redirect_url": "/azure/reliability/migrate-vm",
             "redirect_document_id": false
         },
         {
             "source_path_from_root": "/articles/availability-zones/migrate-workload-aks-mysql.md",
-            "redirect_URL": "/azure/reliability/migrate-workload-aks-mysql",
+            "redirect_url": "/azure/reliability/migrate-workload-aks-mysql",
             "redirect_document_id": false
         },
         {
             "source_path_from_root": "/articles/availability-zones/overview.md",
-            "redirect_URL": "/azure/reliability/overview",
+            "redirect_url": "/azure/reliability/overview",
             "redirect_document_id": false
         },
         {
             "source_path_from_root": "/articles/availability-zones/region-types-service-categories-azure.md",
-            "redirect_URL": "/azure/reliability/availability-service-by-category",
+            "redirect_url": "/azure/reliability/availability-service-by-category",
             "redirect_document_id": false
         }
     ]

.openpublishing.redirection.azure-monitor.json

@@ -6623,6 +6623,21 @@
             "source_path_from_root": "/articles/azure-monitor/insights/resource-group-insights.md",
             "redirect_url": "/azure/azure-resource-manager/management/resource-group-insights",
             "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-monitor/essentials/data-collection-endpoint-sample.md",
+            "redirect_url": "/azure/azure-monitor/essentials/data-collection-endpoint-overview#sample-data-collection-endpoint",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-monitor/essentials/data-collection.md",
+            "redirect_url": "/azure/azure-monitor/essentials/data-collection-rule-overview",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-monitor/agents/resource-manager-data-collection-rules.md",
+            "redirect_url": "/azure/azure-monitor/essentials/data-collection-rule-create-edit?tabs=arm#manually-create-a-dcr",
+            "redirect_document_id": false
         }
     ]
 }

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

@@ -1927,7 +1927,7 @@
         },
         {
             "source_path": "articles/azure-resource-manager/bicep/bicep-import-providers.md",
-            "redirect_URL": "bicep-import",
+            "redirect_url": "bicep-import",
             "redirect_document_id": false
         }
     ]

.openpublishing.redirection.json

@@ -147,17 +147,17 @@
         },
         {
             "source_path_from_root": "/articles/automanage/windows-server-azure-edition-vnext.md",
-            "redirect_URL": "/windows-server/get-started/azure-edition",
+            "redirect_url": "/windows-server/get-started/azure-edition",
             "redirect_document_id": false
         },
         {
             "source_path_from_root": "/articles/automanage/automanage-hotpatch.md",
-            "redirect_URL": "/windows-server/get-started/hotpatch",
+            "redirect_url": "/windows-server/get-started/hotpatch",
             "redirect_document_id": false
         },
         {
             "source_path_from_root": "/articles/automanage/automanage-windows-server-services-overview.md",
-            "redirect_URL": "/windows-server/get-started/azure-edition",
+            "redirect_url": "/windows-server/get-started/azure-edition",
             "redirect_document_id": false
         },
         {
@@ -3687,27 +3687,27 @@
         },
         {
             "source_path_from_root": "/articles/dotnet-develop-multitenant-applications.md",
-            "redirect_URL": "/azure/architecture/guide/multitenant/overview",
+            "redirect_url": "/azure/architecture/guide/multitenant/overview",
             "redirect_document_id": false
         },
         {
             "source_path_from_root": "/articles/bastion/tutorial-protect-bastion-host.md",
-            "redirect_URL": "/azure/bastion/tutorial-protect-bastion-host-ddos",
+            "redirect_url": "/azure/bastion/tutorial-protect-bastion-host-ddos",
             "redirect_document_id": false
         },
         {
             "source_path_from_root": "/articles/firewall/tutorial-protect-firewall.md",
-            "redirect_URL": "/azure/firewall/tutorial-protect-firewall-ddos",
+            "redirect_url": "/azure/firewall/tutorial-protect-firewall-ddos",
             "redirect_document_id": false
         },
         {
             "source_path_from_root": "/articles/external-attack-surface-management/data-connections-overview.md",
-            "redirect_URL": "/azure/external-attack-surface-management/index",
+            "redirect_url": "/azure/external-attack-surface-management/index",
             "redirect_document_id": true
         },
         {
             "source_path_from_root": "/articles/private-multi-access-edge-compute-mec/deploy-metaswitch-fusion-core-solution.md",
-            "redirect_URL": "/azure/private-5g-core",
+            "redirect_url": "/azure/private-5g-core",
             "redirect_document_id": false
         },
         {
@@ -3717,12 +3717,12 @@
         },
         {
             "source_path_from_root": "/articles/private-multi-access-edge-compute-mec/metaswitch-fusion-core-overview.md",
-            "redirect_URL": "/azure/private-5g-core",
+            "redirect_url": "/azure/private-5g-core",
             "redirect_document_id": false
         },
         {
             "source_path_from_root": "/articles/private-5g-core/modify-site-plan.md",
-            "redirect_URL": "/azure/private-5g-core/modify-service-plan",
+            "redirect_url": "/azure/private-5g-core/modify-service-plan",
             "redirect_document_id": false
         },
         {
@@ -3841,7 +3841,7 @@
         },
         {
             "source_path_from_root": "/articles/external-attack-surface-management/labeling-inventory-assets.md",
-            "redirect_URL": "/azure/external-attack-surface-management/modifying-inventory-assets",
+            "redirect_url": "/azure/external-attack-surface-management/modifying-inventory-assets",
             "redirect_document_id": true
         },
         {
@@ -3899,6 +3899,16 @@
             "redirect_url": "/azure/operational-excellence/relocation-key-vault",
             "redirect_document_id": false
         },
+        {
+            "source_path_from_root": "/articles/batch/monitoring-overview.md",
+            "redirect_url": "/azure/batch/monitor-batch",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/batch/batch-diagnostics.md",
+            "redirect_url": "/azure/batch/monitor-batch",
+            "redirect_document_id": false
+        },
         {
             "source_path_from_root": "/articles/event-hubs/move-cluster-across-regions.md",
             "redirect_url": "/azure/operational-excellence/relocation-event-hub-cluster",
@@ -3908,6 +3918,11 @@
             "source_path_from_root": "/articles/storage/common/storage-account-move.md",
             "redirect_url": "/azure/operational-excellence/relocation-storage-account",
             "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/defender-for-iot/organizations/update-legacy-ot-software.md",
+            "redirect_url": "/azure/defender-for-iot/organizations/update-ot-software?tabs=portal",
+            "redirect_document_id": false
         }
     ]
-}
+}

.openpublishing.redirection.operator-5g-core.json

@@ -44,6 +44,11 @@
             "source_path_from_root": "/articles/operator-5g-core/quickstart-deploy-network-functions.md",
             "redirect_url": "/azure/operator-5g-core/how-to-deploy-network-functions",
             "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/operator-5g-core/quickstart-perform-checks-post-deployment.md",
+            "redirect_url": "/azure/operator-5g-core/quickstart-configure-extension-for-status-monitoring",
+            "redirect_document_id": false
         }
    ]
 }

.replaycheck/articles/storage/blobs/assign-azure-role-data-access.yml

@@ -0,0 +1,56 @@
+# %version 1
+contentPath: articles\storage\blobs\assign-azure-role-data-access.md
+
+steps:
+- task: SetPlaceholder@1
+  textToReplace: <email>
+  replacementText: 
+  uid: cb105ef6
+- task: SetPlaceholder@1
+  textToReplace: <subscription-id>
+  replacementText: 
+  uid: e3ce9356
+- task: SetPlaceholder@1
+  textToReplace: ab12cd34-ef56-ab12-cd34-ef56ab12cd34
+  replacementText: 
+  uid: 2de8753c
+- task: SetPlaceholder@1
+  textToReplace: <resource-group-name>
+  replacementText: myResourceGroup
+  uid: 542306be
+- task: SetPlaceholder@1
+  textToReplace: <storage-account-name>
+  replacementText: 
+  uid: "57011072"
+- task: SetPlaceholder@1
+  textToReplace: <container-name>
+  replacementText: 
+  uid: c0f2f9d5
+- task: RunCommand@1
+  environment:
+    type: azure-cloud-shell-pwsh
+  outputValidationRules:
+  - operator: contains
+    value: 'RoleDefinitionName : Storage Blob Data Contributor'
+  uid: fee1778
+- task: RunCommand@1
+  environment:
+    type: azure-cloud-shell-pwsh
+  outputValidationRules:
+  - operator: contains
+    value: 'RoleDefinitionName : Storage Blob Data Reader'
+  uid: 3361d580
+- task: RunCommand@1
+  environment:
+    type: az-cli
+  outputValidationRules:
+  - operator: contains
+    value: '"roleDefinitionName": "Storage Blob Data Contributor"'
+  uid: 60f1639b
+- task: RunCommand@1
+  environment:
+    type: az-cli
+  outputValidationRules:
+  - operator: contains
+    value: '"roleDefinitionName": "Storage Blob Data Reader"'
+  uid: 8cdad632

articles/active-directory-b2c/access-tokens.md

@@ -106,7 +106,7 @@ grant_type=authorization_code
 &client_secret=2hMG2-_:y12n10vwH...
 ```
 
-If you want to test this POST HTTP request, you can use any HTTP client such as [Microsoft PowerShell](/powershell/scripting/overview) or [Postman](https://www.postman.com/).
+If you want to test this POST HTTP request, you can use any HTTP client such as [Microsoft PowerShell](/powershell/scripting/overview).
 
 A successful token response looks like this:
 

articles/active-directory-b2c/add-identity-provider.md

@@ -1,12 +1,11 @@
 ---
-title: Add an identity provider - Azure Active Directory B2C  
+title: Add an identity provider
+titleSuffix: Azure AD B2C 
 description: Learn how to add an identity provider to your Active Directory B2C tenant.
-
 author: garrodonnell
 manager: CelesteDG
-
 ms.author: godonnell
-ms.date: 02/08/2023
+ms.date: 03/22/2024
 ms.custom: mvc
 ms.topic: how-to
 ms.service: active-directory

articles/active-directory-b2c/add-sign-up-and-sign-in-policy.md

@@ -2,14 +2,11 @@
 title: Set up a sign-up and sign-in flow
 titleSuffix: Azure AD B2C
 description: Learn how to set up a sign-up and sign-in flow in Azure Active Directory B2C.
-
 author: garrodonnell
 manager: CelesteDG
-
 ms.service: active-directory
-
 ms.topic: how-to
-ms.date: 02/09/2023
+ms.date: 03/22/2024
 ms.author: godonnell
 ms.subservice: B2C
 ms.custom: "b2c-support"