Merge branch 'main' into release-azure-policy-versioning

Author: v-alje

.openpublishing.redirection.azure-monitor.json

@@ -5509,6 +5509,11 @@
             "redirect_url": "/azure/azure-monitor/logs/resource-manager-workspace",
             "redirect_document_id": false
         },
+        {
+            "source_path_from_root": "/articles/azure-monitor/logs/resource-manager-cluster.md",
+            "redirect_url": "/azure/azure-monitor/logs/logs-dedicated-clusters",
+            "redirect_document_id": false
+        },
         {
             "source_path_from_root": "/articles/azure-monitor/visualize/powerbi.md",
             "redirect_url": "/azure/azure-monitor/logs/log-powerbi",

articles/aks/eks-edw-deploy.md

@@ -35,7 +35,7 @@ In this article, you will deploy an [AWS EDW workload][eks-edw-overview] to Azur
 
 You use the `deploy.sh` script in the `deployment` directory of the [GitHub repository][github-repo] to deploy the application to Azure.
 
-The script first checks that all of the [prerequisite tools][prerequisites] are installed. If not, the script terminates and displays an error message letting you know which prerequisites are missing. If this happens, review the prerequisites, install any missing tools, and then run the script again. You need [Node autoprovisioning (NAP) for AKS] feature flag registered on your Azure subscription. If it isn't already registered, the script executes an Azure CLI command to register the feature flag.
+The script first checks that all of the [prerequisite tools][prerequisites] are installed. If not, the script terminates and displays an error message letting you know which prerequisites are missing. If this happens, review the prerequisites, install any missing tools, and then run the script again. The [Node autoprovisioning (NAP) for AKS][nap-aks] feature flag must be registered on your Azure subscription. If it isn't already registered, the script executes an Azure CLI command to register the feature flag.
 
 The script records the state of the deployment in a file called `deploy.state`, which is located in the `deployment` directory. You can use this file to set environment variables when deploying the app.
 
@@ -304,3 +304,4 @@ For more information on developing and running applications in AKS, see the foll
 [helm-aks]: ./kubernetes-helm.md
 [k8s-aks]: ./deploy-marketplace.md
 [openai-aks]: ./open-ai-quickstart.md
+[nap-aks]: ./node-autoprovision.md

articles/aks/media/eks-edw-rearchitect/edw-architecture-aws.png

@@ -12,7 +12,7 @@ ms.custom: devdivchpfy22
 
 # Tutorial: Debug your APIs using request tracing
 
-[!INCLUDE [api-management-availability-premium-dev-standard-basic-consumption](../../includes/api-management-availability-premium-dev-standard-basic-consumption.md)]
+[!INCLUDE [api-management-availability-all-tiers](../../includes/api-management-availability-all-tiers.md)]
 
 This tutorial describes how to inspect (trace) request processing in Azure API Management. Tracing helps you debug and troubleshoot your API.
 
@@ -25,8 +25,6 @@ In this tutorial, you learn how to:
 
 :::image type="content" source="media/api-management-howto-api-inspector/api-inspector-002.png" alt-text="Screenshot showing the API inspector." lightbox="media/api-management-howto-api-inspector/api-inspector-002.png":::
 
-[!INCLUDE [api-management-availability-tracing-v2-tiers](../../includes/api-management-availability-tracing-v2-tiers.md)]
-
 ## Prerequisites
 
 + Learn the [Azure API Management terminology](api-management-terminology.md).

articles/aks/media/eks-edw-rearchitect/edw-architecture-azure.png

@@ -6,13 +6,13 @@ services: api-management
 
 ms.service: api-management
 ms.topic: article
-ms.date: 08/07/2023
+ms.date: 06/24/2024
 ms.author: danlep
 ---
 
 # How to delegate user registration and product subscription
 
-[!INCLUDE [premium-dev-standard-basic.md](../../includes/api-management-availability-premium-dev-standard-basic.md)]
+[!INCLUDE [premium-dev-standard-basic-standardv2-basicv2.md](../../includes/api-management-availability-premium-dev-standard-basic-standardv2-basicv2.md)]
 
 Delegation enables your website to own the user data and perform custom validation. With delegation, you can handle developer sign-in/sign-up (and related account management operations) and product subscription using your existing website, instead of the developer portal's built-in functionality. 
 
@@ -29,8 +29,8 @@ The final workflow will be:
 
 ### Set up API Management to route requests via delegation endpoint
 
-1. In the Azure portal, search for **Developer portal** in your API Management resource.
-1. Click the **Delegation** item. 
+1. In the [Azure portal](https://portal.azure.com), navigate to your API Management instance.
+1. In the left menu, under **Developer portal**, select **Delegation**. 
 1. Click the checkbox to enable **Delegate sign-in & sign-up**.
 
     :::image type="content" source="media/api-management-howto-setup-delegation/api-management-delegation-signin-up.png" alt-text="Screenshot showing delegation of sign-in and sign-up in the portal.":::

articles/api-management/api-management-howto-api-inspector.md

@@ -22,8 +22,6 @@ The `trace` policy adds a custom trace into the request tracing output in the te
 
 [!INCLUDE [api-management-tracing-alert](../../includes/api-management-tracing-alert.md)]
 
-[!INCLUDE [api-management-availability-tracing-v2-tiers](../../includes/api-management-availability-tracing-v2-tiers.md)]
-
 [!INCLUDE [api-management-policy-generic-alert](../../includes/api-management-policy-generic-alert.md)]
 
 ## Policy statement

articles/api-management/api-management-howto-setup-delegation.md

@@ -92,7 +92,6 @@ The following API Management capabilities are currently unavailable in the v2 ti
 * CA Certificates
 
 **Developer portal**
-* Delegation of user registration and product subscription
 * Reports
 * Custom HTML code widget and custom widget
 * Self-hosted developer portal
@@ -103,7 +102,6 @@ The following API Management capabilities are currently unavailable in the v2 ti
 * Cipher configuration
 * Client certificate renegotiation
 * Free, managed TLS certificate
-* Request tracing in the test console
 * Requests to the gateway over localhost
 
 ## Resource limits

articles/api-management/trace-policy.md

@@ -6,7 +6,7 @@ services: application-gateway
 author: greg-lindsay
 ms.service: application-gateway
 ms.topic: how-to
-ms.date: 12/27/2022
+ms.date: 06/27/2024
 ms.author: greglin
 ---
 
@@ -32,40 +32,40 @@ From your TLS/SSL certificate, export the public key .cer file (not the private
 
 1. To obtain a .cer file from the certificate, open **Manage user certificates**. Locate the certificate, typically in 'Certificates - Current User\Personal\Certificates', and right-click. Click **All Tasks**, and then click **Export**. This opens the **Certificate Export Wizard**. If you want to open Certificate Manager in current user scope using PowerShell, you type *certmgr* in the console window.
 
-> [!NOTE]
-> If you can't find the certificate under Current User\Personal\Certificates, you may have accidentally opened "Certificates - Local Computer", rather than "Certificates - Current User"). 
+   > [!NOTE]
+   > If you can't find the certificate under Current User\Personal\Certificates, you may have accidentally opened "Certificates - Local Computer", rather than "Certificates - Current User"). 
 
    ![Screenshot shows the Certificate Manager with Certificates selected and a contextual menu with All tasks, then Export selected.](./media/certificates-for-backend-authentication/export.png)
 
-1. In the Wizard, click **Next**.
+2. In the Wizard, click **Next**.
 
    ![Export certificate](./media/certificates-for-backend-authentication/exportwizard.png)
 
-1. Select **No, do not export the private key**, and then click **Next**.
+3. Select **No, do not export the private key**, and then click **Next**.
 
    ![Do not export the private key](./media/certificates-for-backend-authentication/notprivatekey.png)
 
-1. On the **Export File Format** page, select **Base-64 encoded X.509 (.CER).**, and then click **Next**.
+4. On the **Export File Format** page, select **Base-64 encoded X.509 (.CER).**, and then click **Next**.
 
    ![Base-64 encoded](./media/certificates-for-backend-authentication/base64.png)
 
-1. For **File to Export**, **Browse** to the location to which you want to export the certificate. For **File name**, name the certificate file. Then, click **Next**.
+5. For **File to Export**, **Browse** to the location to which you want to export the certificate. For **File name**, name the certificate file. Then, click **Next**.
 
    ![Screenshot shows the Certificate Export Wizard where you specify a file to export.](./media/certificates-for-backend-authentication/browse.png)
 
-1. Click **Finish** to export the certificate.
+6. Click **Finish** to export the certificate.
 
    ![Screenshot shows the Certificate Export Wizard after you complete the file export.](./media/certificates-for-backend-authentication/finish-screen.png)
 
-1. Your certificate is successfully exported.
+7. Your certificate is successfully exported.
 
    ![Screenshot shows the Certificate Export Wizard with a success message.](./media/certificates-for-backend-authentication/success.png)
 
    The exported certificate looks similar to this:
 
    ![Screenshot shows a certificate symbol.](./media/certificates-for-backend-authentication/exported.png)
 
-1. If you open the exported certificate using Notepad, you see something similar to this example. The section in blue contains the information that is uploaded to application gateway. If you open your certificate with Notepad and it doesn't look similar to this, typically this means you didn't export it using the Base-64 encoded X.509(.CER) format. Additionally, if you want to use a different text editor, understand that some editors can introduce unintended formatting in the background. This can create problems when uploaded the text from this certificate to Azure.
+8. If you open the exported certificate using Notepad, you see something similar to this example. The section in blue contains the information that is uploaded to application gateway. If you open your certificate with Notepad and it doesn't look similar to this, typically this means you didn't export it using the Base-64 encoded X.509(.CER) format. Additionally, if you want to use a different text editor, understand that some editors can introduce unintended formatting in the background. This can create problems when uploaded the text from this certificate to Azure.
 
    ![Open with Notepad](./media/certificates-for-backend-authentication/format.png)
 

articles/api-management/v2-service-tiers-overview.md

@@ -5,7 +5,7 @@ services: application-gateway
 author: greg-lindsay
 ms.service: application-gateway
 ms.topic: how-to
-ms.date: 02/10/2022
+ms.date: 06/27/2024
 ms.author: greglin
 ---
 
@@ -34,6 +34,9 @@ For more information on how to set up an Application Gateway resource after VNet
 
 The word "classic" in classic networking service refers to networking resources managed by Azure Service Manager (ASM). Azure Service Manager (ASM) is the old control plane of Azure responsible for creating, managing, deleting VMs and performing other control plane operations.
 
+> [!NOTE]
+> To view all the classic resources in your subscription, Open the **All Resources** blade and look for a **(Classic)** suffix after the resource name.
+
 ### What is Azure Resource Manager?
 
 Azure Resource Manager is the latest control plane of Azure responsible for creating, managing, deleting VMs and performing other control plane operations.