Merge pull request #276995 from MicrosoftDocs/main

6/3/2024 AM Publish

Author: Taojunshen

articles/ai-services/content-safety/overview.md

@@ -115,20 +115,20 @@ To use the Content Safety APIs, you must create your Azure AI Content Safety res
 |Region | Moderation APIs | Prompt Shields |  Protected material<br>detection | Groundedness<br>detection | Incident response | Blocklists |
 |---|---|---|---|---|---|---|
 | East US | ✅ | ✅| ✅ |✅ |✅ |✅ |
-| East US 2 | ✅ | | | ✅ | | |
-| West US | | | | | ✅ | |
-| West US 2 | ✅ | | | | | |
-| Central US | ✅ | | | | | |
-| North Central US | ✅ | | | | | |
-| South Central US | ✅ | | | | | |
-| Canada East | ✅ | | | | | |
-| Switzerland North | ✅ | | | | | |
-| Sweden Central | ✅ | | |✅ |✅ | |
-| UK South | ✅ | | | | | |
-| France Central | ✅ | | | | | |
+| East US 2 | ✅ | | | ✅ | | ✅|
+| West US | | | | | ✅ | ✅|
+| West US 2 | ✅ | | | | |✅ |
+| Central US | ✅ | | | | |✅ |
+| North Central US | ✅ | | | | | ✅|
+| South Central US | ✅ | | | | |✅ |
+| Canada East | ✅ | | | | | ✅|
+| Switzerland North | ✅ | | | | | ✅|
+| Sweden Central | ✅ | | |✅ |✅ | ✅|
+| UK South | ✅ | | | | |✅ |
+| France Central | ✅ | | | | | ✅|
 | West Europe | ✅ | ✅ |✅ | | |✅ |
-| Japan East | ✅ | | | | | |
-| Australia East| ✅ | ✅ | | | | |
+| Japan East | ✅ | | | | |✅ |
+| Australia East| ✅ | ✅ | | | | ✅|
 
 Feel free to [contact us](mailto:[email protected]) if you need other regions for your business.
 

articles/ai-studio/concepts/rbac-ai-studio.md

@@ -42,6 +42,7 @@ Here's a table of the built-in roles and their permissions for the hub:
 | Owner | Full access to the hub, including the ability to manage and create new hubs and assign permissions. This role is automatically assigned to the hub creator|
 | Contributor |    User has full access to the hub, including the ability to create new hubs, but isn't able to manage hub permissions on the existing resource. |
 | Azure AI Developer |     Perform all actions except create new hubs and manage the hub permissions. For example, users can create projects, compute, and connections. Users can assign permissions within their project. Users can interact with existing Azure AI resources such as Azure OpenAI, Azure AI Search, and Azure AI services. |
+| Azure AI Inference Deployment Operator | Perform all actions required to create a resource deployment within a resource group. |
 | Reader |     Read only access to the hub. This role is automatically assigned to all project members within the hub. |
 
 
@@ -95,6 +96,7 @@ Here's a table of the built-in roles and their permissions for the project:
 | Owner | Full access to the project, including the ability to assign permissions to project users. |
 | Contributor |    User has full access to the project but can't assign permissions to project users. |
 | Azure AI Developer |     User can perform most actions, including create deployments, but can't assign permissions to project users. |
+| Azure AI Inference Deployment Operator | Perform all actions required to create a resource deployment within a resource group. |
 | Reader |     Read only access to the project. |
 
 When a user is granted access to a project (for example, through the AI Studio permission management), two more roles are automatically assigned to the user. The first role is Reader on the hub. The second role is the Inference Deployment Operator role, which allows the user to create deployments on the resource group that the project is in. This role is composed of these two permissions: ```"Microsoft.Authorization/*/read"``` and    ```"Microsoft.Resources/deployments/*"```.

articles/ai-studio/how-to/deploy-jais-models.md

@@ -253,8 +253,7 @@ Response:
 
 | **Sample Type**       | **Sample Notebook**                             |
 |----------------|----------------------------------------|
-| CLI using CURL and Python web requests    | [webrequests.ipynb](
-https://aka.ms/jais/webrequests-sample) |
+| CLI using CURL and Python web requests    | [webrequests.ipynb](https://aka.ms/jais/webrequests-sample) |
 | OpenAI SDK (experimental)    | [openaisdk.ipynb](https://aka.ms/jais/openaisdk) |
 | LiteLLM | [litellm.ipynb](https://aka.ms/jais/litellm-sample) |
 

articles/ai-studio/how-to/develop/ai-template-get-started.md

@@ -18,7 +18,7 @@ author: eric-urban
 Streamline your code-first development with prebuilt, task-specific Azure AI templates. Benefit from using the latest features and best practices from Microsoft Azure AI, with popular frameworks like LangChain, prompt flow, and Semantic Kernel in multiple languages.
 
 > [!TIP]
-> Discover the latest templates in our curated [AZD templates collection](https://aka.ms/azd-ai-templates). Deploy them with a single command ```azd up``` using the [Azure Developer CLI](/developer/azure-developer-cli/overview). 
+> Discover the latest templates in our curated [AZD templates collection](https://aka.ms/azd-ai-templates). Deploy them with a single command ```azd up``` using the [Azure Developer CLI](/azure/developer/azure-developer-cli/). 
 
 ## Start with a sample application
 

articles/aks/start-stop-nodepools.md

@@ -19,6 +19,7 @@ You might not need to continuously run your AKS workloads. For example, you migh
 * The cluster and node pool must be running.
 * You can't stop node pools from clusters which use the [Node Autoprovisioning (NAP)](node-autoprovision.md) feature.
 
+
 ## Before you begin
 
 This article assumes you have an existing AKS cluster. If you need an AKS cluster, create one using the [Azure CLI][aks-quickstart-cli], [Azure PowerShell][aks-quickstart-powershell], or the [Azure portal][aks-quickstart-portal].
@@ -56,6 +57,10 @@ This article assumes you have an existing AKS cluster. If you need an AKS cluste
     > [!NOTE]
     > If the `provisioningState` shows `Stopping`, your node pool is still in the process of stopping.
 
+
+    > [!NOTE]
+    > Stopping the node pool will stop its Cluster Autoscaler, and starts it back when starting the node pool. So if you manually modify the number of VMSS instances in the pool while it's stopped, Cluster Autoscaler might show inconsistencies. 
+
 ---
 
 ## Start a stopped AKS node pool

articles/app-service/includes/quickstart-java/quickstart-java-javase.md

@@ -44,7 +44,7 @@ If Maven isn't your preferred development tool, check out our similar tutorials
 
 ### [Spring Boot](#tab/springboot)
 
-1. Download and extract the [default Spring Boot web application template](https://github.com/rd-1-2022/rest-service). This repository is cloned for you when you run the [Spring CLI](https://docs.spring.io/spring-cli/reference/creating-new-projects.html) command `spring boot new my-webapp`.
+1. Download and extract the [default Spring Boot web application template](https://github.com/rd-1-2022/rest-service). This repository is cloned for you when you run the [Spring CLI](https://docs.spring.io/spring-cli/reference/getting-started.html) command `spring boot new my-webapp`.
 
     ```bash
     git clone https://github.com/rd-1-2022/rest-service my-webapp

articles/automation/change-tracking/enable-vms-monitoring-agent.md

@@ -3,7 +3,7 @@ title: Enable Azure Automation Change Tracking for single machine and multiple m
 description: This article tells how to enable the Change Tracking feature for single machine and multiple machines at scale from the Azure portal.
 services: automation
 ms.subservice: change-inventory-management
-ms.date: 04/10/2024
+ms.date: 06/03/2024
 ms.topic: conceptual
 ---
 
@@ -163,7 +163,8 @@ Using the Deploy if not exist (DINE) policy, you can enable Change tracking with
    :::image type="content" source="media/enable-vms-monitoring-agent/build-template.png" alt-text="Screenshot to get started with building a template.":::
 1. In the **Edit template**, select **Load file** to upload the *CtDcrCreation.json* file.
 1. Select **Save**.
-1. In the **Custom deployment** > **Basics** tab, provide **Subscription** and **Resource group** where you want to deploy the Data Collection Rule. The **Data Collection Rule Name** is optional.
+1. In the **Custom deployment** > **Basics** tab, provide **Subscription** and **Resource group** where you want to deploy the Data Collection Rule. The **Data Collection Rule Name** is optional. The resource group must be same as the resource group associated with the Log Analytic workspace id chosen here.
+
    :::image type="content" source="media/enable-vms-monitoring-agent/build-template-basics.png" alt-text="Screenshot to provide subscription and resource group details to deploy data collection rule.":::
 
    >[!NOTE]

articles/azure-arc/servers/agent-overview.md

@@ -1,7 +1,7 @@
 ---
 title:  Overview of the Azure Connected Machine agent
 description: This article provides a detailed overview of the Azure Connected Machine agent, which supports monitoring virtual machines hosted in hybrid environments.
-ms.date: 12/06/2023
+ms.date: 06/03/2024
 ms.topic: conceptual
 ---
 
@@ -257,6 +257,12 @@ Agent deployment and machine connection require certain [prerequisites](prerequi
 
 We provide several options for deploying the agent. For more information, see [Plan for deployment](plan-at-scale-deployment.md) and [Deployment options](deployment-options.md).
 
+## Disaster Recovery
+
+There are no customer-enabled disaster recovery options for Arc-enabled servers. In the event of an outage in an Azure region, the system will failover to another region in the same [Azure geography](https://azure.microsoft.com/explore/global-infrastructure/geographies/) (if one exists). While this failover procedure is automatic, it does take some time. The Connected Machine agent will be disconnected during this period and will show a status of **Disconnected** until the failover is complete. The system will failback to its original region once the outage has been restored.
+
+An outage of Azure Arc won't affect the customer workload itself; only management of the applicable servers via Arc will be impaired.
+
 ## Next steps
 
 * To begin evaluating Azure Arc-enabled servers, see [Quickstart: Connect hybrid machines with Azure Arc-enabled servers](learn/quick-enable-hybrid-vm.md).

articles/azure-arc/servers/overview.md

@@ -1,7 +1,7 @@
 ---
 title: Azure Arc-enabled servers Overview
 description: Learn how to use Azure Arc-enabled servers to manage servers hosted outside of Azure like an Azure resource.
-ms.date: 05/11/2023
+ms.date: 06/03/2024
 ms.topic: overview
 ---
 
@@ -91,12 +91,6 @@ To learn more about resource type limits, see the [Resource instance limit](../.
 
 Azure Arc-enabled servers stores customer data. By default, customer data stays within the region the customer deploys the service instance in. For region with data residency requirements, customer data is always kept within the same region.
 
-## Disaster Recovery
-
-There are no customer-enabled disaster recovery options for Arc-enabled servers. In the event of an outage in an Azure region, the system will failover to another region in the same [Azure geography](https://azure.microsoft.com/explore/global-infrastructure/geographies/) (if one exists). While this failover procedure is automatic, it does take some time. The Connected Machine agent will be disconnected during this period and will show a status of **Disconnected** until the failover is complete. The system will failback to its original region once the outage has been restored.
-
-An outage of Azure Arc won't affect the customer workload itself; only management of the applicable servers via Arc will be impaired.
-
 ## Next steps
 
 * Before evaluating or enabling Azure Arc-enabled servers across multiple hybrid machines, review the [Connected Machine agent overview](agent-overview.md) to understand requirements, technical details about the agent, and deployment methods.

articles/azure-cache-for-redis/cache-best-practices-kubernetes.md

@@ -32,7 +32,7 @@ If your Azure Cache for Redis client application runs on a Linux-based container
 
 ## Potential connection collision with _Istio/Envoy_
 
-Currently, Azure Cache for Redis uses ports 15xxx for clustered caches to expose cluster nodes to client applications. As documented [here](https://istio.io/latest/docs/ops/deployment/requirements/#ports-used-by-istio), the same ports are also used by _Istio.io_ sidecar proxy called _Envoy_ and could interfere with creating connections, especially on port 15001 and 15006.
+Currently, Azure Cache for Redis uses ports 15xxx for clustered caches to expose cluster nodes to client applications. As documented [here](https://istio.io/latest/docs/ops/deployment/application-requirements/#ports-used-by-istio), the same ports are also used by _Istio.io_ sidecar proxy called _Envoy_ and could interfere with creating connections, especially on port 15001 and 15006.
 
 When using _Istio_ with an Azure Cache for Redis cluster, consider excluding the potential collision ports with an [istio annotation](https://istio.io/latest/docs/reference/config/annotations/).