Merge branch 'release-aio-m2' of https://github.com/MicrosoftDocs/azure-docs-pr into m2-managesecrets

Author: asergaz

.openpublishing.redirection.json

@@ -2595,6 +2595,11 @@
       "redirect_url": "/azure/azure-maps/zoom-levels-and-tile-grid",
       "redirect_document_id": true
     },
+    {
+      "source_path": "articles/managed-grafana/how-to-sync-teams-with-azure-ad-groups.md",
+      "redirect_url": "how-to-sync-teams-with-entra-groups",
+      "redirect_document_id": false
+    },
     {
       "source_path_from_root": "/articles/media-services/azure-media-player/azure-media-player-license.md",
       "redirect_url": "/legal/azure-media-player/azure-media-player-license",

articles/app-service/environment/overview.md

@@ -69,7 +69,7 @@ A benefit of using an App Service Environment instead of a multitenant service i
 App Service Environment v3 differs from earlier versions in the following ways:
 
 - There are no networking dependencies on the customer's virtual network. You can secure all inbound and outbound traffic and route outbound traffic as you want.
-- You can deploy an App Service Environment v3 that's enabled for zone redundancy. You set zone redundancy only during creation and only in regions where all App Service Environment v3 dependencies are zone redundant. In this case, each App Service Plan on the App Service Environment will need to have a minimum of three instances so that they can be spread across zones. For more information, see [Migrate App Service Environment to availability zone support](../../availability-zones/migrate-app-service-environment.md).
+- You can deploy an App Service Environment v3 that's enabled for zone redundancy. You set zone redundancy only during creation and only in regions where all App Service Environment v3 dependencies are zone redundant. This is a deployment time only decision. Changing zone redundancy is not possible after it has been deployed. With zone redundant App Service Environment, each App Service Plan on the App Service Environment will need to have a minimum of three instances so that they can be spread across zones. For more information, see [Migrate App Service Environment to availability zone support](../../availability-zones/migrate-app-service-environment.md).
 - You can deploy an App Service Environment v3 on a dedicated host group. Host group deployments aren't zone redundant.
 - Scaling is much faster than with an App Service Environment v2. Although scaling still isn't immediate, as in the multitenant service, it's a lot faster.
 - Front-end scaling adjustments are no longer required. App Service Environment v3 front ends automatically scale to meet your needs and are deployed on better hosts.
@@ -165,6 +165,7 @@ App Service Environment v3 is available in the following regions:
 | Southeast Asia       | ✅                           | ✅                          |
 | Spain Central        | ✅                           | ✅**                        |
 | Sweden Central       | ✅                           | ✅                          |
+| Sweden South         | ✅                           |                             |
 | Switzerland North    | ✅                           | ✅                          |
 | Switzerland West     | ✅                           |                             |
 | UAE Central          | ✅                           |                             |
@@ -188,23 +189,109 @@ App Service Environment v3 is available in the following regions:
 | US DoD Central       | ✅                           |                             |
 | US DoD East          | ✅                           |                             |
 | US Gov Arizona       | ✅                           |                             |
-| US Gov Iowa          |                              |                             |
 | US Gov Texas         | ✅                           |                             |
 | US Gov Virginia      | ✅                           |✅                          |
 
 ### Microsoft Azure operated by 21Vianet
 
 | Region               | Single zone support          | Availability zone support   |
 | -------------------- | :--------------------------: | :-------------------------: |
-| China East 2         |                              |                             |
+|                      | App Service Environment v3   | App Service Environment v3  |
 | China East 3         | ✅                          |                              |
-| China North 2        |                              |                             |
 | China North 3        | ✅                          | ✅                          |
 
 ### In-region data residency
 
 An App Service Environment will only store customer data including app content, settings and secrets within the region where it's deployed. All data is guaranteed to remain in the region. For more information, see [Data residency in Azure](https://azure.microsoft.com/explore/global-infrastructure/data-residency/#overview).
 
+## Pricing tiers
+
+The following sections list the regional pricing tiers (SKUs) availability for App Service Environment v3.
+
+> [!NOTE]
+> Windows Container plans currently do not support memory intensive SKUs.
+>
+ 
+### Azure Public:
+
+| Region               | Standard     | Large       | Memory intensive  |
+| -------------------- | :----------: | :---------: | :---------------: |
+|                      | I1v2-I3v2    | I4v2-I6v2   | I1mv2-I5mv2       |
+| Australia Central    | ✅          | ✅          | ✅               | 
+| Australia Central 2  | ✅          | ✅          | ✅               | 
+| Australia East       | ✅          | ✅          | ✅               | 
+| Australia Southeast  | ✅          | ✅          | ✅               | 
+| Brazil South         | ✅          | ✅          |                   | 
+| Brazil Southeast     | ✅          | ✅          | ✅               |
+| Canada Central       | ✅          | ✅          | ✅               |
+| Canada East          | ✅          | ✅          | ✅               | 
+| Central India        | ✅          | ✅          | ✅               | 
+| Central US           | ✅          | ✅ *        |                   | 
+| East Asia            | ✅          | ✅          | ✅               |
+| East US              | ✅          | ✅          |                   | 
+| East US 2            | ✅          | ✅          | ✅               |
+| France Central       | ✅          | ✅          | ✅               | 
+| France South         | ✅          | ✅          | ✅               | 
+| Germany North        | ✅          | ✅          | ✅               | 
+| Germany West Central | ✅          | ✅          | ✅               | 
+| Israel Central       | ✅          | ✅          |                   | 
+| Italy North          | ✅          | ✅          |                   | 
+| Japan East           | ✅          | ✅          | ✅               | 
+| Japan West           | ✅          | ✅          | ✅               | 
+| Jio India Central    | ✅          | ✅          |                   | 
+| Jio India West       | ✅          | ✅          |                   | 
+| Korea Central        | ✅          | ✅          |                   | 
+| Korea South          | ✅          | ✅          | ✅               |
+| Mexico Central       | ✅          | ✅          |                   | 
+| North Central US     | ✅          | ✅          | ✅               | 
+| North Europe         | ✅          | ✅          | ✅               |
+| Norway East          | ✅          | ✅          | ✅               | 
+| Norway West          | ✅          | ✅          | ✅               |
+| Poland Central       | ✅          | ✅          |                   |
+| Qatar Central        | ✅          | ✅          |                   |
+| South Africa North   | ✅          | ✅          | ✅               |
+| South Africa West    | ✅          | ✅          | ✅               | 
+| South Central US     | ✅          | ✅          | ✅               |
+| South India          | ✅          | ✅          |                   | 
+| Southeast Asia       | ✅          | ✅          | ✅               |
+| Spain Central        | ✅          | ✅          |                   | 
+| Sweden Central       | ✅          | ✅          | ✅               |
+| Sweden South         | ✅          | ✅          | ✅               |
+| Switzerland North    | ✅          | ✅          | ✅               |
+| Switzerland West     | ✅          | ✅          | ✅               | 
+| UAE Central          | ✅          | ✅          |                   | 
+| UAE North            | ✅          | ✅          | ✅               | 
+| UK South             | ✅          | ✅          | ✅               | 
+| UK West              | ✅          | ✅          | ✅               | 
+| West Central US      | ✅          | ✅ *        |                   | 
+| West Europe          | ✅          | ✅ *        |                   | 
+| West India           | ✅          | ✅          | ✅               | 
+| West US              | ✅          | ✅          |                   | 
+| West US 2            | ✅          | ✅          | ✅               | 
+| West US 3            | ✅          | ✅          | ✅               | 
+
+\* Windows Container does not support Large skus in this region.
+\** Linux does not support Memory intensive skus in this region.
+
+### Azure Government:
+
+| Region               | Standard     | Large       | Memory intensive  |
+| -------------------- | :----------: | :---------: | :---------------: |
+|                      | I1v2-I3v2    | I4v2-I6v2   | I1mv2-I5mv2       |
+| US DoD Central       | ✅          |✅ *         |                   |
+| US DoD East          | ✅          |✅ *         |                   |
+| US Gov Arizona       | ✅          |✅ *         |                   |
+| US Gov Texas         | ✅          |✅ *         |                   |
+| US Gov Virginia      | ✅          |✅ *         |                   |
+
+### Microsoft Azure operated by 21Vianet:
+
+| Region               | Standard     | Large       | Memory intensive  |
+| -------------------- | :----------: | :---------: | :---------------: |
+|                      | I1v2-I3v2    | I4v2-I6v2   | I1mv2-I5mv2       |
+| China East 3         | ✅          | ✅ *        |                   |
+| China North 3        | ✅          | ✅ *        |                   |
+
 ## Next steps
 
 > [!div class="nextstepaction"]

articles/app-service/manage-create-arc-environment.md

@@ -5,7 +5,7 @@ author: msangapu-msft
 ms.author: msangapu
 ms.topic: article
 ms.custom: devx-track-azurecli
-ms.date: 03/24/2023
+ms.date: 09/23/2024
 ---
 # Set up an Azure Arc-enabled Kubernetes cluster to run App Service, Functions, and Logic Apps (Preview)
 
@@ -17,6 +17,8 @@ Azure Arc-enabled Kubernetes lets you make your on-premises or cloud Kubernetes
 
 If you don't have an Azure account, [sign up today](https://azure.microsoft.com/free/?utm_source=campaign&utm_campaign=vscode-tutorial-app-service-extension&mktingSource=vscode-tutorial-app-service-extension) for a free account.
 
+Review the [requirements and limitations](overview-arc-integration.md) of the public preview. Of particular importance are the cluster requirements.
+
 <!-- ## Prerequisites
 
 - Create a Kubernetes cluster in a supported Kubernetes distribution and connect it to Azure Arc in a supported region. See [Public preview limitations](overview-arc-integration.md#public-preview-limitations).
@@ -56,7 +58,7 @@ az extension add --upgrade --yes --name appservice-kube
 ## Create a connected cluster
 
 > [!NOTE]
-> This tutorial uses [Azure Kubernetes Service (AKS)](/azure/aks/) to provide concrete instructions for setting up an environment from scratch. However, for a production workload, you will likely not want to enable Azure Arc on an AKS cluster as it is already managed in Azure. The steps below will help you get started understanding the service, but for production deployments, they should be viewed as illustrative, not prescriptive. See [Quickstart: Connect an existing Kubernetes cluster to Azure Arc](/azure/azure-arc/kubernetes/quickstart-connect-cluster) for general instructions on creating an Azure Arc-enabled Kubernetes cluster.
+> This tutorial uses [Azure Kubernetes Service (AKS)](/azure/aks/) to provide concrete instructions for setting up an environment from scratch. However, for a production workload, you will likely not want to enable Azure Arc on an AKS cluster as it is already managed in Azure. The steps will help you get started understanding the service, but for production deployments, they should be viewed as illustrative, not prescriptive. See [Quickstart: Connect an existing Kubernetes cluster to Azure Arc](/azure/azure-arc/kubernetes/quickstart-connect-cluster) for general instructions on creating an Azure Arc-enabled Kubernetes cluster.
 
 1. Create a cluster in Azure Kubernetes Service with a public IP address. Replace `<group-name>` with the resource group name you want.
 
@@ -207,7 +209,7 @@ While a [Log Analytic workspace](/azure/azure-monitor/logs/quick-create-workspac
 
 ## Install the App Service extension
 
-1. Set the following environment variables for the desired name of the [App Service extension](overview-arc-integration.md), the cluster namespace in which resources should be provisioned, and the name for the App Service Kubernetes environment. Choose a unique name for `<kube-environment-name>`, because it will be part of the domain name for app created in the App Service Kubernetes environment.
+1. Set the following environment variables for the desired name of the [App Service extension](overview-arc-integration.md), the cluster namespace in which resources should be provisioned, and the name for the App Service Kubernetes environment. Choose a unique name for `<kube-environment-name>`, because it is part of the domain name for app created in the App Service Kubernetes environment.
 
     # [bash](#tab/bash)
 
@@ -291,13 +293,13 @@ While a [Log Analytic workspace](/azure/azure-monitor/logs/quick-create-workspac
     
     | Parameter | Description |
     | - | - |
-    | `Microsoft.CustomLocation.ServiceAccount` | The service account that should be created for the custom location that will be created. It is recommended that this be set to the value `default`. |
+    | `Microsoft.CustomLocation.ServiceAccount` | The service account that should be created for the custom location that is created. It is recommended that this be set to the value `default`. |
     | `appsNamespace` | The namespace to provision the app definitions and pods. **Must** match that of the extension release namespace. |
-    | `clusterName` | The name of the App Service Kubernetes environment that will be created against this extension. |
+    | `clusterName` | The name of the App Service Kubernetes environment that is created against this extension. |
     | `keda.enabled` | Whether [KEDA](https://keda.sh/) should be installed on the Kubernetes cluster. Accepts `true` or `false`. |
-    | `buildService.storageClassName` | The [name of the storage class](https://kubernetes.io/docs/concepts/storage/persistent-volumes/#class) for the build service to store build artifacts. A value like `default` specifies a class named `default`, and not [any class that is marked as default](https://kubernetes.io/docs/tasks/administer-cluster/change-default-storage-class/).  Default is a valid storage class for AKS and AKS HCI but it may not be for other distrubtions/platforms. |
-    | `buildService.storageAccessMode` | The [access mode](https://kubernetes.io/docs/concepts/storage/persistent-volumes/#access-modes) to use with the named storage class above. Accepts `ReadWriteOnce` or `ReadWriteMany`. |
-    | `customConfigMap` | The name of the config map that will be set by the App Service Kubernetes environment. Currently, it must be `<namespace>/kube-environment-config`, replacing `<namespace>` with the value of `appsNamespace` above. |
+    | `buildService.storageClassName` | The [name of the storage class](https://kubernetes.io/docs/concepts/storage/persistent-volumes/#class) for the build service to store build artifacts. A value like `default` specifies a class named `default`, and not [any class that is marked as default](https://kubernetes.io/docs/tasks/administer-cluster/change-default-storage-class/). Default is a valid storage class for AKS and AKS HCI but it may not be for other distrubtions/platforms. |
+    | `buildService.storageAccessMode` | The [access mode](https://kubernetes.io/docs/concepts/storage/persistent-volumes/#access-modes) to use with the named storage class. Accepts `ReadWriteOnce` or `ReadWriteMany`. |
+    | `customConfigMap` | The name of the config map that will be set by the App Service Kubernetes environment. Currently, it must be `<namespace>/kube-environment-config`, replacing `<namespace>` with the value of `appsNamespace`. |
     | `envoy.annotations.service.beta.kubernetes.io/azure-load-balancer-resource-group` | The name of the resource group in which the Azure Kubernetes Service cluster resides. Valid and required only when the underlying cluster is Azure Kubernetes Service.  |
     | `logProcessor.appLogs.destination` | Optional. Accepts `log-analytics` or `none`, choosing none disables platform logs. |
     | `logProcessor.appLogs.logAnalyticsConfig.customerId` | Required only when `logProcessor.appLogs.destination` is set to `log-analytics`. The base64-encoded Log analytics workspace ID. This parameter should be configured as a protected setting. |
@@ -338,7 +340,7 @@ While a [Log Analytic workspace](/azure/azure-monitor/logs/quick-create-workspac
     az resource wait --ids $EXTENSION_ID --custom "properties.installState!='Pending'" --api-version "2020-07-01-preview"
     ```
 
-You can use `kubectl` to see the pods that have been created in your Kubernetes cluster:
+You can use `kubectl` to see the pods created in your Kubernetes cluster:
 
 ```bash
 kubectl get pods -n $NAMESPACE