Merge pull request #279534 from MicrosoftDocs/main

6/27/2024 PM Publish

Author: Taojunshen

.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/ai-services/openai/how-to/provisioned-throughput-onboarding.md

@@ -3,7 +3,7 @@ title: Azure OpenAI Service Provisioned Throughput Units (PTU) onboarding
 description: Learn about provisioned throughput units onboarding and Azure OpenAI. 
 ms.service: azure-ai-openai
 ms.topic: conceptual 
-ms.date: 05/02/2024
+ms.date: 06/25/2024
 manager: nitinme
 author: mrbullwinkle 
 ms.author: mbullwin 
@@ -44,11 +44,13 @@ The **Provisioned** option and the capacity planner are only available in certai
 |---|---|
 |Model | OpenAI model you plan to use. For example: GPT-4 |
 | Version | Version of the model you plan to use, for example 0614 |
-| Prompt tokens | Number of tokens in the prompt for each call |
-| Generation tokens | Number of tokens generated by the model on each call |
-| Peak calls per minute | Peak concurrent load to the endpoint measured in calls per minute|
+| Peak calls per min | The number of calls per minute that are expected to be sent to the model |
+| Tokens in prompt call | The number of tokens in the prompt for each call to the model. Calls with larger prompts will utilize more of the PTU deployment. Currently this calculator assumes a single prompt value so for workloads with wide variance, we recommend benchmarking your deployment on your traffic to determine the most accurate estimate of PTU needed for your deployment. |
+| Tokens in model response | The number of tokens generated from each call to the model. Calls with larger generation sizes will utilize more of the PTU deployment. Currently this calculator assumes a single prompt value so for workloads with wide variance, we recommend benchmarking your deployment on your traffic to determine the most accurate estimate of PTU needed for your deployment. |
 
-After you fill in the required details, select **Calculate** to view the suggested PTU for your scenario.
+After you fill in the required details, select **Calculate** button in the output column.
+
+The values in the output column are the estimated value of PTU units required for the provided workload inputs. The first output value represents the estimated PTU units required for the workload, rounded to the nearest PTU scale increment. The second output value represents the raw estimated PTU units required for the workload. The token totals are calculated using the following equation: `Total = Peak calls per minute * (Tokens in prompt call + Tokens in model response)`.
 
 :::image type="content" source="../media/how-to/provisioned-onboarding/capacity-calculator.png" alt-text="Screenshot of the Azure OpenAI Studio landing page." lightbox="../media/how-to/provisioned-onboarding/capacity-calculator.png":::
 

articles/ai-services/openai/media/how-to/provisioned-onboarding/capacity-calculator.png

@@ -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/eks-edw-deploy.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/aks/media/eks-edw-rearchitect/edw-architecture-aws.png

@@ -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.

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

@@ -3,7 +3,7 @@ title: Runbook execution in Azure Automation
 description: This article provides an overview of the processing of runbooks in Azure Automation.
 services: automation
 ms.subservice: process-automation
-ms.date: 12/28/2022
+ms.date: 06/27/2024
 ms.topic: conceptual
 ms.custom:
 ---
@@ -148,6 +148,7 @@ The following table describes the statuses that are possible for a job. You can
 | Stopping |The system is stopping the job. |
 | Suspended |Applies to [graphical and PowerShell Workflow runbooks](automation-runbook-types.md) only. The job was suspended by the user, by the system, or by a command in the runbook. If a runbook doesn't have a checkpoint, it starts from the beginning. If it has a checkpoint, it can start again and resume from its last checkpoint. The system only suspends the runbook when an exception occurs. By default, the `ErrorActionPreference` variable is set to Continue, indicating that the job keeps running on an error. If the preference variable is set to Stop, the job suspends on an error.  |
 | Suspending |Applies to [graphical and PowerShell Workflow runbooks](automation-runbook-types.md) only. The system is trying to suspend the job at the request of the user. The runbook must reach its next checkpoint before it can be suspended. If it has already passed its last checkpoint, it completes before it can be suspended. |
+| New | The job has been submitted recently but is not yet activated.|
 
 ## Activity logging
 

articles/application-gateway/certificates-for-backend-authentication.md

@@ -3,7 +3,7 @@ title: Azure Datacenter DNS records used by Azure Automation | Microsoft Docs
 description: This article provides the DNS records required by Azure Automation features when restricting communication to a specific Azure region hosting that Automation account.
 services: automation
 ms.subservice: process-automation
-ms.date: 06/29/2021
+ms.date: 06/28/2024
 ms.topic: conceptual
 ---
 
@@ -63,6 +63,7 @@ To support [Private Link](../../private-link/private-link-overview.md) in Azure
 | China East 2 |`https://<accountId>.webhook.sha2.azure-automation.cn`<br>`https://<accountId>.agentsvc.sha2.azure-automation.cn`<br>`https://<accountId>.jrds.sha2.azure-automation.cn` |
 | China North |`https://<accountId>.webhook.bjb.azure-automation.cn`<br>`https://<accountId>.agentsvc.bjb.azure-automation.cn`<br>`https://<accountId>.jrds.bjb.azure-automation.cn` |
 | China North 2 |`https://<accountId>.webhook.bjs2.azure-automation.cn`<br>`https://<accountId>.agentsvc.bjs2.azure-automation.cn`<br>`https://<accountId>.jrds.bjs2.azure-automation.cn` |
+| China North 3 | `https://<accountId>.webhook.cnn3.azure-automation.cn` </br> `https://<accountId>.agentsvc.cnn3.azure-automation.cn` </br> `https://<accountId>.jrds.cnn3.azure-automation.cn` |  
 | West Europe |`https://<accountId>.webhook.we.azure-automation.net`<br>`https://<accountId>.agentsvc.we.azure-automation.net`<br>`https://<accountId>.jrds.we.azure-automation.net` |
 | North Europe |`https://<accountId>.webhook.ne.azure-automation.net`<br>`https://<accountId>.agentsvc.ne.azure-automation.net`<br>`https://<accountId>.jrds.ne.azure-automation.net` |
 | France Central |`https://<accountId>.webhook.fc.azure-automation.net`<br>`https://<accountId>.agentsvc.fc.azure-automation.net`<br>`https://<accountId>.jrds.fc.azure-automation.net` |