Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into rolyon-aadroles-assignments-groups-update

Author: rolyon

articles/aks/free-standard-pricing-tiers.md

@@ -2,19 +2,13 @@
 title: Azure Kubernetes Service (AKS) Free and Standard pricing tiers for cluster management
 description: Learn about the Azure Kubernetes Service (AKS) Free and Standard pricing tiers for cluster management
 ms.topic: conceptual
-ms.date: 02/17/2023
+ms.date: 04/07/2023
 ms.custom: references_regions, devx-track-azurecli
 ---
 
 # Free and Standard pricing tiers for Azure Kubernetes Service (AKS) cluster management
 
-Azure Kubernetes Service (AKS) is now offering two pricing tiers for cluster management: the **Free tier** and the **Standard tier**.
-
-> [!IMPORTANT]
->
-> **Standard tier** is currently not available in Azure API 2023-01-01 due to a [critical bug](https://github.com/Azure/AKS/issues/3481). To enable the Uptime SLA feature in your cluster, you'll use the existing **Paid tier** and the `--uptime-sla` parameter.
->
-> Alternatively, you can select the **Standard tier** or **Free tier** on Azure portal when creating or updating an AKS cluster.
+Azure Kubernetes Service (AKS) is now offering two pricing tiers for cluster management: the **Free tier** and the **Standard tier**. Both tiers are in the **Base** sku. 
 
 |                  |Free tier|Standard tier|
 |------------------|---------|--------|
@@ -23,81 +17,91 @@ Azure Kubernetes Service (AKS) is now offering two pricing tiers for cluster man
 |**Pricing**|• Free cluster management <br> • Pay-as-you-go for resources you consume|• Pay-as-you-go for resources you consume|
 |**Feature comparison**|• Recommended for clusters with fewer than 10 nodes, but can support up to 1,000 nodes <br> • Includes all current AKS features|• Uptime SLA is enabled by default <br> • Greater cluster reliability and resources <br> • Can support up to 5,000 nodes in a cluster <br> • Includes all current AKS features
 
+> [!IMPORTANT]
+>
+> Uptime SLA has been repositioned as a default feature included with the Standard tier.
+>
+> The repositioning will result in the following API changes:
+>
+> |         |Prior to 2023-02-01 API|Starting from 2023-02-01 API|
+> |----------|-----------|------------|
+> |ManagedClusterSKUName|"Basic"|"Base"|
+> |ManagedClusterSKUTier|"Free" <br> "Paid"|"Free" <br> "Standard"|
+>
+> "Basic" and "Paid" are removed in the 2023-02-01 and 2023-02-02 Preview API version, and this will be a breaking change in API versions 2023-02-01 and 2023-02-02 Preview or newer. If you use automated scripts, CD pipelines, ARM templates, Terraform, or other third-party tooling that relies on the above parameters, please be sure to update the API parameters to use "Base" with "Free" or "Base" with "Standard" before upgrading to the 2023-02-01 and 2023-02-02 Preview API or newer API versions. 
+
 For more information on pricing, see the [AKS pricing details](https://azure.microsoft.com/pricing/details/kubernetes-service/).
 
 ## Uptime SLA terms and conditions
 
-The Uptime SLA feature is included in the Paid tier and is enabled per cluster. For more information on pricing, see the [AKS pricing details](https://azure.microsoft.com/pricing/details/kubernetes-service/).
+In the Standard tier, the Uptime SLA feature is enabled by default per cluster. For more information, see [SLA for AKS](https://azure.microsoft.com/support/legal/sla/kubernetes-service/v1_1/).
 
 ## Region availability
 
-* Uptime SLA is available in public regions and Azure Government regions where [AKS is supported](https://azure.microsoft.com/global-infrastructure/services/?products=kubernetes-service).
-* Uptime SLA is available for [private AKS clusters][private-clusters] in all public regions where AKS is supported.
+* Free tier and Standard tier are available in public regions and Azure Government regions where [AKS is supported](https://azure.microsoft.com/global-infrastructure/services/?products=kubernetes-service).
+* Free tier and Standard tier are available for [private AKS clusters][private-clusters] in all public regions where AKS is supported.
 
 ## Before you begin
 
-[Azure CLI](/cli/azure/install-azure-cli) version 2.8.0 or later and configured. Run `az --version` to find the version. If you need to install or upgrade, see [Install Azure CLI][install-azure-cli].
+[Azure CLI](/cli/azure/install-azure-cli) version 2.47.0 or later and configured. Run `az --version` to find the version. If you need to install or upgrade, see [Install Azure CLI][install-azure-cli].
 
 ## Create a new cluster in the Free tier or Paid tier
 
-> [!IMPORTANT]
-> `--tier standard` and `--tier free` are currently unavailable in Azure CLI 2.46.0 due to a [critical bug](https://github.com/Azure/AKS/issues/3481). To enable the Uptime SLA feature, use the commands below.
-
 Use the Azure CLI to create a new cluster on an AKS pricing tier. You can create your cluster in an existing resource group or create a new one. To learn more about resource groups and working with them, see [managing resource groups using the Azure CLI][manage-resource-group-cli].
 
 Use the [`az aks create`][az-aks-create] command to create an AKS cluster. The commands below show you how to create a new resource group named *myResourceGroup* and a cluster named *myAKSCluster* in that resource group in each tier.
 
 ```azurecli-interactive
 # Create a new AKS cluster in the Free tier
 
-az aks create --resource-group myResourceGroup --name myAKSCluster --no-uptime-sla
+az aks create --resource-group myResourceGroup --name myAKSCluster --tier free
 
-# Create a new AKS cluster in the Paid tier
+# Create a new AKS cluster in the Standard tier
 
-az aks create --resource-group myResourceGroup --name myAKSCluster --uptime-sla
+az aks create --resource-group myResourceGroup --name myAKSCluster --tier standard
 ```
 
 Once the deployment completes, it returns JSON-formatted information about your cluster:
 
 ```output
-# Sample output for --no-uptime-sla
+# Sample output for --tier free
 
   },
   "sku": {
-    "name": "Basic",
+    "name": "Base",
     "tier": "Free"
   },
 
-# Sample output for --uptime-sla
+# Sample output for --tier standard
 
   },
   "sku": {
     "name": "Base",
-    "tier": "Paid"
+    "tier": "Standard"
   },
 ```
 
-## Update the tier of an existing cluster
+## Update the tier of an existing AKS cluster
 
 The following example uses the [`az aks update`][az-aks-update] command to update the existing cluster.
 
 ```azurecli-interactive
 # Update an existing cluster to the Free tier
 
-az aks update --resource-group myResourceGroup --name myAKSCluster --no-uptime-sla
+az aks update --resource-group myResourceGroup --name myAKSCluster --tier free
 
 # Update an existing cluster to the Standard tier
 
-az aks update --resource-group myResourceGroup --name myAKSCluster --uptime-sla
+az aks update --resource-group myResourceGroup --name myAKSCluster --tier standard
 ```
 
-This process takes several minutes to complete. When finished, the following example JSON snippet shows the Paid tier for the SKU, indicating your cluster is enabled with Uptime SLA.
+This process takes several minutes to complete. When finished, the following example JSON snippet shows updating the existing cluster to the Standard tier in the Base SKU.
 
 ```output
   },
   "sku": {
     "name": "Base",
-    "tier": "Paid"
+    "tier": "Standard"
   },
 ```
 

articles/azure-cache-for-redis/cache-how-to-premium-clustering.md

@@ -110,6 +110,7 @@ The following list contains answers to commonly asked questions about Azure Cach
 * [Can I configure clustering for a basic or standard cache?](#can-i-configure-clustering-for-a-basic-or-standard-cache)
 * [Can I use clustering with the Redis ASP.NET Session State and Output Caching providers?](#can-i-use-clustering-with-the-redis-aspnet-session-state-and-output-caching-providers)
 * [I'm getting MOVE exceptions when using StackExchange.Redis and clustering, what should I do?](#im-getting-move-exceptions-when-using-stackexchangeredis-and-clustering-what-should-i-do)
+* [Does scaling out using clustering help to increase the number of supported client connections?](#Does scaling out using clustering help to increase the number of supported client connections?)
 
 ### Do I need to make any changes to my client application to use clustering?
 
@@ -189,6 +190,10 @@ Clustering is only available for premium caches.
 
 If you're using StackExchange.Redis and receive `MOVE` exceptions when using clustering, ensure that you're using [StackExchange.Redis 1.1.603](https://www.nuget.org/packages/StackExchange.Redis/) or later. For instructions on configuring your .NET applications to use StackExchange.Redis, see [Configure the cache clients](cache-dotnet-how-to-use-azure-redis-cache.md#configure-the-cache-client).
 
+### Does scaling out using clustering help to increase the number of supported client connections?
+
+No,scaling out using clustering and increasing the number of shards doesn't help in increasing the number of supported client connections.
+
 ## Next steps
 
 Learn more about Azure Cache for Redis features.

articles/azure-cache-for-redis/quickstart-create-redis-enterprise.md

@@ -6,15 +6,15 @@ ms.author: franlanglois
 ms.service: cache
 ms.custom: mvc, mode-other
 ms.topic: quickstart
-ms.date: 04/12/2022
+ms.date: 04/07/2023
 
 ---
 # Quickstart: Create a Redis Enterprise cache
 
 The Azure Cache for Redis Enterprise tiers provide fully integrated and managed [Redis Enterprise](https://redislabs.com/redis-enterprise/) on Azure. These new tiers are:
 
 * Enterprise, which uses volatile memory (DRAM) on a virtual machine to store data
-* Enterprise Flash, which uses both volatile and non-volatile memory (NVMe or SSD) to store data.
+* Enterprise Flash, which uses both volatile and nonvolatile memory (NVMe or SSD) to store data.
 
 Both Enterprise and Enterprise Flash support open-source Redis 6 and some new features that aren't yet available in the Basic, Standard, or Premium tiers. The supported features include some Redis modules that enable other features like search, bloom filters, and time series.  
 
@@ -40,7 +40,7 @@ Azure Cache for Redis is continually expanding into new regions. To check the av
    | ------------ |  ------- | -------------------------------------------------- |
    | **Subscription** | Drop down and select your subscription. | The subscription under which to create this new Azure Cache for Redis instance. |
    | **Resource group** | Drop down and select a resource group, or select **Create new** and enter a new resource group name. | Name for the resource group in which to create your cache and other resources. By putting all your app resources in one resource group, you can easily manage or delete them together. |
-   | **DNS name** | Enter a name that is unique in the region. | The cache name must be a string between 1 and 63 characters that contain only numbers, letters, or hyphens. The name must start and end with a number or letter, and can't contain consecutive hyphens. Your cache instance's *host name* will be *\<DNS name\>.\<Azure region\>.redisenterprise.cache.azure.net*. |
+   | **DNS name** | Enter a name that is unique in the region. | The cache name must be a string between 1 and 63 characters that contain only numbers, letters, or hyphens. The name must start and end with a number or letter, and can't contain consecutive hyphens. Your cache instance's *host name* is *\<DNS name\>.\<Azure region\>.redisenterprise.cache.azure.net*. |
    | **Location** | Drop down and select a location. | Enterprise tiers are available in selected Azure regions. |
    | **Cache type** | Drop down and select an *Enterprise* or *Enterprise Flash* tier and a size. |  The tier determines the size, performance, and features that are available for the cache. |
 
@@ -56,15 +56,18 @@ Azure Cache for Redis is continually expanding into new regions. To check the av
 
    Enable **Non-TLS access only** if you plan to connect to the new cache without using TLS. Disabling TLS is **not** recommended, however.
 
-   Set **Clustering policy** to **Enterprise** for a non-clustered cache. For more information on choosing **Clustering policy**, see [Clustering Policy](#clustering-policy).
+   Set **Clustering policy** to **Enterprise** for a nonclustered cache. For more information on choosing **Clustering policy**, see [Clustering Policy](#clustering-policy).
 
    :::image type="content" source="media/cache-create/cache-clustering-policy.png" alt-text="Screenshot that shows the Enterprise tier Advanced tab.":::
 
    > [!NOTE]
-   > Redis Enterprise supports two clustering policies. Use the **Enterprise** policy to access your cache using the regular Redis API. Use **OSS** to use the OSS Cluster API.
-   >
+   > Enterprise and Enterprise Flash tiers are inherently clustered, in contrast to the Basic, Standard, and Premium tiers. Redis Enterprise supports two clustering policies. 
+   >- Use the **Enterprise** policy to access your cache using the Redis API. 
+   >- Use **OSS** to use the OSS Cluster API. 
+   > For more information, see [Clustering on Enterprise](cache-best-practices-enterprise-tiers.md#clustering-on-enterprise).
+   > 
 
-   > [!NOTE]
+   > [!IMPORTANT]
    > You can't change modules after you create the cache instance. The setting is create-only.
    >
 
@@ -82,11 +85,11 @@ Azure Cache for Redis is continually expanding into new regions. To check the av
 
 The OSS Cluster mode allows clients to communicate with Redis using the same Redis Cluster API as open-source Redis. This mode provides optimal latency and near-linear scalability improvements when scaling the cluster. Your client library must support clustering to use the OSS Cluster mode.
 
-The Enterprise Cluster mode is a simpler configuration that exposes a single endpoint for client connections. This mode allows an application designed to use a standalone, or non-clustered, Redis server to seamlessly operate with a scalable, multi-node, Redis implementation. Enterprise Cluster mode abstracts the Redis Cluster implementation from the client by internally routing requests to the correct node in the cluster. Clients aren't required to support OSS Cluster mode.
+The Enterprise Cluster mode is a simpler configuration that exposes a single endpoint for client connections. This mode allows an application designed to use a standalone, or nonclustered, Redis server to seamlessly operate with a scalable, multi-node, Redis implementation. Enterprise Cluster mode abstracts the Redis Cluster implementation from the client by internally routing requests to the correct node in the cluster. Clients aren't required to support OSS Cluster mode.
 
 ## Next steps
 
 In this quickstart, you learned how to create an Enterprise tier instance of Azure Cache for Redis.
 
-> [!div class="nextstepaction"]
-> [Create an ASP.NET web app that uses an Azure Cache for Redis.](./cache-web-app-howto.md)
+- [Create an ASP.NET web app that uses an Azure Cache for Redis](cache-web-app-aspnet-core-howto.md)
+- [Best practices for the Enterprise tiers](cache-best-practices-enterprise-tiers.md)

articles/azure-functions/dotnet-isolated-in-process-differences.md

@@ -25,7 +25,7 @@ Use the following table to compare feature and functional differences between th
 | [Supported .NET versions](dotnet-isolated-process-guide.md#supported-versions) | Long Term Support (LTS) versions | [All supported versions](dotnet-isolated-process-guide.md#supported-versions) + .NET Framework |
 | Core packages | [Microsoft.NET.Sdk.Functions](https://www.nuget.org/packages/Microsoft.NET.Sdk.Functions/) | [Microsoft.Azure.Functions.Worker](https://www.nuget.org/packages/Microsoft.Azure.Functions.Worker/)<br/>[Microsoft.Azure.Functions.Worker.Sdk](https://www.nuget.org/packages/Microsoft.Azure.Functions.Worker.Sdk) | 
 | Binding extension packages | [Microsoft.Azure.WebJobs.Extensions.*](https://www.nuget.org/packages?q=Microsoft.Azure.WebJobs.Extensions)  | [Microsoft.Azure.Functions.Worker.Extensions.*](https://www.nuget.org/packages?q=Microsoft.Azure.Functions.Worker.Extensions) | 
-| Durable Functions | [Supported](durable/durable-functions-overview.md) | [Supported (public preview)](https://github.com/microsoft/durabletask-dotnet#usage-with-azure-functions) | 
+| Durable Functions | [Supported](durable/durable-functions-overview.md) | [Supported](durable/durable-functions-isolated-create-first-csharp.md?pivots=code-editor-visualstudio) | 
 | Model types exposed by bindings | Simple types<br/>[JSON serializable](/dotnet/api/system.text.json.jsonserializeroptions) types<br/>Arrays/enumerations<br/>Service SDK types such as [BlobClient](/dotnet/api/azure.storage.blobs.blobclient)<br/>`IAsyncCollector` (for output bindings) | Simple types<br/>JSON serializable types<br/>Arrays/enumerations<br/>[Some service-specific SDK types](dotnet-isolated-process-guide.md#sdk-types-preview) |
 | HTTP trigger model types| [HttpRequest](/dotnet/api/system.net.http.httpclient) / [ObjectResult](/dotnet/api/microsoft.aspnetcore.mvc.objectresult) | [HttpRequestData](/dotnet/api/microsoft.azure.functions.worker.http.httprequestdata?view=azure-dotnet&preserve-view=true) / [HttpResponseData](/dotnet/api/microsoft.azure.functions.worker.http.httpresponsedata?view=azure-dotnet&preserve-view=true) |
 | Output binding interaction | Return values (single output only)<br/>`out` parameters<br/>`IAsyncCollector` | Return values (expanded model with single or [multiple outputs](dotnet-isolated-process-guide.md#multiple-output-bindings)) |

articles/azure-monitor/app/availability-azure-functions.md

@@ -7,11 +7,11 @@ ms.date: 04/06/2023
 
 # Review TrackAvailability() test results
 
-This article explains how to review TrackAvailability() test results in the Azure portal and query the data using Log Analytics.
+This article explains how to review [TrackAvailability()](/dotnet/api/microsoft.applicationinsights.telemetryclient.trackavailability) test results in the Azure portal and query the data using [Log Analytics](../logs/log-analytics-overview.md#overview-of-log-analytics-in-azure-monitor).
+
 ## Prerequisites
 
 > [!div class="checklist"]
-> - [Azure subscription](https://azure.microsoft.com/free) and user account with the ability to create and delete resources
 > - [Workspace-based Application Insights resource](create-workspace-resource.md)
 > - Custom [Azure Functions app](../../azure-functions/functions-overview.md#introduction-to-azure-functions) running [TrackAvailability()](/dotnet/api/microsoft.applicationinsights.telemetryclient.trackavailability) with your own business logic
 

articles/azure-monitor/resource-graph-samples.md

@@ -1,6 +1,6 @@
 ---
 title: Azure Resource Graph sample queries for Azure Monitor
-description: Sample Azure Resource Graph queries for Azure Monitor showing use of resource types and tables to access Azure Monitor related resources and properties.
+description: Sample Azure Resource Graph queries for Azure Monitor showing the use of resource types and tables to access Azure Monitor-related resources and properties.
 ms.date: 07/07/2022
 ms.topic: sample
 author: bwren
@@ -10,9 +10,9 @@ ms.custom: subject-resourcegraph-sample
 # Azure Resource Graph sample queries for Azure Monitor
 
 This page is a collection of [Azure Resource Graph](../governance/resource-graph/overview.md) sample queries
-for Azure Monitor. For a complete list of Azure Resource Graph samples, see
-[Resource Graph samples by Category](../governance/resource-graph/samples/samples-by-category.md) and
-[Resource Graph samples by Table](../governance/resource-graph/samples/samples-by-table.md).
+for Azure Monitor. For a complete list of Azure Resource Graph samples, see:
+- [Resource Graph samples by category](../governance/resource-graph/samples/samples-by-category.md)
+- [Resource Graph samples by table](../governance/resource-graph/samples/samples-by-table.md)
 
 ## Azure Monitor
 
@@ -22,5 +22,5 @@ for Azure Monitor. For a complete list of Azure Resource Graph samples, see
 
 - Learn more about the [query language](../governance/resource-graph/concepts/query-language.md).
 - Learn more about how to [explore resources](../governance/resource-graph/concepts/explore-resources.md).
-- See samples of [Starter language queries](../governance/resource-graph/samples/starter.md).
-- See samples of [Advanced language queries](../governance/resource-graph/samples/advanced.md).
+- See samples of [starter language queries](../governance/resource-graph/samples/starter.md).
+- See samples of [advanced language queries](../governance/resource-graph/samples/advanced.md).