Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into rolyon-rbac-classic-admins-deprecation-update

Author: rolyon

.openpublishing.publish.config.json

@@ -200,6 +200,42 @@
             "branch": "master",
             "branch_mapping": {}
         },
+        {
+          "path_to_root": "functions-quickstart-dotnet-azd",
+          "url": "https://github.com/Azure-Samples/functions-quickstart-dotnet-azd",
+          "branch": "main",
+          "branch_mapping": {}
+        },
+        {
+          "path_to_root": "functions-quickstart-java-azd",
+          "url": "https://github.com/Azure-Samples/azure-functions-java-flex-consumption-azd",
+          "branch": "main",
+          "branch_mapping": {}
+        },
+        {
+          "path_to_root": "functions-quickstart-python-azd",
+          "url": "https://github.com/Azure-Samples/functions-quickstart-python-http-azd",
+          "branch": "main",
+          "branch_mapping": {}
+        },
+        {
+          "path_to_root": "functions-quickstart-powershell-azd",
+          "url": "https://github.com/Azure-Samples/functions-quickstart-powershell-azd",
+          "branch": "main",
+          "branch_mapping": {}
+        },
+        {
+          "path_to_root": "functions-quickstart-javascript-azd",
+          "url": "https://github.com/Azure-Samples/functions-quickstart-javascript-azd",
+          "branch": "main",
+          "branch_mapping": {}
+        },
+        {
+          "path_to_root": "functions-quickstart-typescript-azd",
+          "url": "https://github.com/Azure-Samples/functions-quickstart-typescript-azd",
+          "branch": "main",
+          "branch_mapping": {}
+        },
         {
             "path_to_root": "azure-functions-templates-v3",
             "url": "https://github.com/Azure/azure-functions-templates",
@@ -560,6 +596,12 @@
             "branch": "main",
             "branch_mapping": {}
         },
+        {
+            "path_to_root": "msdocs-spring-boot-mongodb-sample-app",
+            "url": "https://github.com/Azure-Samples/msdocs-spring-boot-mongodb-sample-app",
+            "branch": "main",
+            "branch_mapping": {}
+        },
         {
             "path_to_root": "msdocs-tomcat-mysql-sample-app",
             "url": "https://github.com/Azure-Samples/msdocs-tomcat-mysql-sample-app",
@@ -857,4 +899,4 @@
         "articles/virtual-network/.openpublishing.redirection.virtual-network.json",
         "articles/vpn-gateway/.openpublishing.redirection.vpn-gateway.json"
     ]
-}
+}

.openpublishing.redirection.azure-resource-manager.json

@@ -2009,6 +2009,11 @@
       "source_path_from_root": "/articles/azure-resource-manager/bicep/bicep-extensibility-kubernetes-provider.md",
       "redirect_url": "/azure/azure-resource-manager/bicep/bicep-kubernetes-extension",
       "redirect_document_id": false
-    }    
+    },
+    {
+      "source_path_from_root": "/articles/azure-resource-manager/bicep/tutorial-use-deployment-stacks.md",
+      "redirect_url": "/training/modules/manage-resource-lifecycles-deployment-stacks",
+      "redirect_document_id": false
+    }        
   ]
 }

.openpublishing.redirection.iot-develop.json

@@ -350,6 +350,11 @@
       "redirect_url": "/azure/iot/concepts-model-parser",
       "redirect_document_id": false
     },
+    {
+      "source_path_from_root": "/articles/iot/concepts-model-parser.md",
+      "redirect_url": "/azure/iot/concepts-modeling-guide",
+      "redirect_document_id": false
+    },
     {
       "source_path_from_root": "/articles/iot-pnp/concepts-model-repository.md",
       "redirect_url": "/azure/iot/concepts-model-discovery",

articles/api-management/api-management-capacity.md

@@ -1,110 +1,153 @@
 ---
-title: Capacity of an Azure API Management instance | Microsoft Docs
-description: This article explains what the capacity metric is and how to make informed decisions whether to scale an Azure API Management instance.
+title: Capacity metrics - Azure API Management | Microsoft Docs
+description: This article explains the capacity metrics in Azure API Management and how to make informed decisions about whether to scale an instance.
 services: api-management
 author: dlepow
 
 ms.service: azure-api-management
 ms.topic: how-to
-ms.date: 07/06/2022
+ms.date: 08/26/2024
 ms.author: danlep
 ms.custom: fasttrack-edit
 ---
 
 # Capacity of an Azure API Management instance
 
-[!INCLUDE [api-management-availability-premium-dev-standard-basic](../../includes/api-management-availability-premium-dev-standard-basic.md)]
+[!INCLUDE [api-management-availability-premium-dev-standard-basic-standardv2-basicv2](../../includes/api-management-availability-premium-dev-standard-basic-standardv2-basicv2.md)]
 
-**Capacity** is the most important [Azure Monitor metric](api-management-howto-use-azure-monitor.md#view-metrics-of-your-apis) for making informed decisions whether to [scale or upgrade](upgrade-and-scale.md) an API Management instance to accommodate more load. Its construction is complex and imposes certain behavior.
+API Management provides [Azure Monitor metrics](api-management-howto-use-azure-monitor.md#view-metrics-of-your-apis) to detect use of system capacity, helping you troubleshoot gateway problems and make informed decisions whether to [scale or upgrade](upgrade-and-scale.md) an API Management instance to accommodate more load. 
 
-This article explains what the **capacity** is and how it behaves. It shows how to access **capacity** metrics in the Azure portal and suggests when to consider scaling or upgrading your API Management instance.
+This article explains the capacity metrics and how they behave, shows how to access capacity metrics in the Azure portal, and suggests when to consider scaling or upgrading your API Management instance.
 
 [!INCLUDE [api-management-workspace-availability](../../includes/api-management-workspace-availability.md)]
 
 > [!IMPORTANT]
-> This article discusses how you can monitor and scale your Azure API Management instance based upon its capacity metric. However, it is equally important to understand what happens when an individual API Management instance has actually *reached* its capacity. Azure API Management will not apply service-level throttling to prevent a physical overload of the instances. When an instance reaches its physical capacity, it will behave similar to any overloaded web server that is unable to process incoming requests: latency will increase, connections will get dropped, timeout errors will occur, and so on. This means that API clients should be prepared to deal with this possibility as they do with any other external service (for example, by applying retry policies).
+> This article introduces how to monitor and scale your Azure API Management instance based on capacity metrics. However, when an instance *reaches* its capacity, it won't throttle to prevent overload. Instead, it will act like an overloaded web server: increased latency, dropped connections, and timeout errors. API clients should be ready to handle these issues as they do with other external services, for example by using retry policies.
 
 ## Prerequisites
 
-To follow the steps in this article, you must have:
+To follow the steps in this article, you must have an API Management instance in one of the tiers that supports capacity metrics. For more information, see [Create an Azure API Management instance](get-started-create-service-instance.md).
 
-+ An active Azure subscription.
+## Available capacity metrics
 
-    [!INCLUDE [quickstarts-free-trial-note](~/reusable-content/ce-skilling/azure/includes/quickstarts-free-trial-note.md)]
+Different capacity metrics are available in the [v2 service tiers](v2-service-tiers-overview.md) and classic tiers. 
 
-+ An API Management instance. For more information, see [Create an Azure API Management instance](get-started-create-service-instance.md).
+#### [v2 tiers](#tab/v2-tiers)
+
+In the v2 tiers, the following metrics are available:
+
+* **CPU Percentage of Gateway** - The percentage of CPU capacity used by the gateway units.
+
+* **Memory Percentage of Gateway** - The percentage of memory capacity used by the gateway units.
+
+Available aggregations for these metrics are as follows.
+
+* **Avg** - Average percentage of capacity used across gateway processes in every [unit](upgrade-and-scale.md) of an API Management instance. 
+* **Max** - Percentage of capacity in gateway process with the greatest consumption.  
+
+[!INCLUDE [api-management-cpu-memory-capacity](../../includes/api-management-cpu-memory-capacity.md)]
+
+#### [Classic tiers](#tab/classic)
+
+In the Developer, Basic, Standard, and Premium tiers, the **Capacity** metric is available for making decisions about scaling or upgrading an API Management instance. Its construction is complex and imposes certain behavior.
+
+Available aggregations for this metric are as follows.
+
+* **Avg** - Average percentage of capacity used across gateway processes in every [unit](upgrade-and-scale.md) of an API Management instance. 
+* **Max** - Percentage of capacity in gateway process with the greatest consumption.  
 
 [!INCLUDE [availability-capacity.md](../../includes/api-management-availability-capacity.md)]
 
-## What is capacity
+### What the Capacity metric indicates
 
 ![Diagram that explains the Capacity metric.](./media/api-management-capacity/capacity-ingredients.png)
 
-**Capacity** is an indicator of load on an API Management instance. It reflects usage of resources (CPU, memory) and network queue lengths. CPU and memory usage reveals consumption of resources by:
+**Capacity** is an indicator of load on an API Management instance. It reflects usage of resources (CPU, memory) and network queue lengths. 
 
-+ API Management data plane services, such as request processing, which can include forwarding requests or running a policy.
-+ API Management management plane services, such as management actions applied via the Azure portal or Azure Resource Manager, or load coming from the [developer portal](api-management-howto-developer-portal.md).
-+ Selected operating system processes, including processes that involve cost of TLS handshakes on new connections.
-+ Platform updates, such as OS updates on the underlying compute resources for the instance.
-+ Number of APIs deployed, regardless of activity, which can consume additional capacity.
+[!INCLUDE [api-management-cpu-memory-capacity](../../includes/api-management-cpu-memory-capacity.md)]
 
-Total **capacity** is an average of its own values from every [unit](upgrade-and-scale.md) of an API Management instance.
-
-Although the **capacity metric** is designed to surface problems with your API Management instance, there are cases when problems won't be reflected in changes in the **capacity metric**.
+---
 
 ## Capacity metric behavior
 
-Because of its construction, in real life **capacity** can be impacted by many variables, for example:
+In real life capacity metrics can be impacted by many variables, for example:
 
 + connection patterns (new connection on a request versus reusing the existing connection)
 + size of a request and response
 + policies configured on each API or number of clients sending requests.
 
-The more complex operations on the requests are, the higher the **capacity** consumption will be. For example, complex transformation policies consume much more CPU than a simple request forwarding. Slow backend service responses will increase it, too.
+The more complex operations on the requests are, the higher the capacity consumption is. For example, complex transformation policies consume much more CPU than a simple request forwarding. Slow backend service responses increase it, too.
 
 > [!IMPORTANT]
-> **Capacity** is not a direct measure of the number of requests being processed.
+> Capacity metrics are not direct measures of the number of requests being processed.
 
 ![Capacity metric spikes](./media/api-management-capacity/capacity-spikes.png)
 
-**Capacity** can also spike intermittently or be greater than zero even if no requests are being processed. It happens because of system- or platform-specific actions and should not be taken into consideration when deciding whether to scale an instance.
+Capacity metrics can also spike intermittently or be greater than zero even if no requests are being processed. It happens because of system- or platform-specific actions and should not be taken into consideration when deciding whether to scale an instance.
+
+Although capacity metrics are designed to surface problems with your API Management instance, there are cases when problems won't be reflected in changes in these metrics. Additionally, low capacity metrics don't necessarily mean that your API Management instance isn't experiencing any problems.
 
-Low **capacity metric** doesn't necessarily mean that your API Management instance isn't experiencing any problems.
 
-## Use the Azure portal to examine capacity
+## Use the Azure portal to examine capacity metrics
+
+Access metrics in the portal to understand how much capacity is used over time.
+
+#### [v2 tiers](#tab/v2-tiers) 
+
+1. Navigate to your API Management instance in the [Azure portal](https://portal.azure.com/).
+1. In the left menu, under **Monitoring**, select **Metrics**.
+1. Select the **CPU Percentage of Gateway** or **Memory Percentage of Gateway** metric from the available metrics. Choose the default **Avg** aggregation or select the **Max** aggregation to see the peak usage.
+1. Pick a desired timeframe from the top bar of the section.
+
+> [!IMPORTANT]
+> Currently, the **Capacity** metric also appears in the portal for instances in v2 tiers. However, it's not supported for use in the v2 tiers and shows a value of 0.
+
+> [!NOTE]
+> You can set a [metric alert](api-management-howto-use-azure-monitor.md#set-up-an-alert-rule) to let you know when something unexpected is happening. For example, get notifications when your API Management instance has exceeded its expected peak CPU or Memory usage for more than 20 minutes.
+  
+
+#### [Classic tiers](#tab/classic)
 
 ![Capacity metric](./media/api-management-capacity/capacity-metric.png)  
 
 1. Navigate to your API Management instance in the [Azure portal](https://portal.azure.com/).
-2. In the left menu, under **Monitoring**, select **Metrics**.
-3. Select the **Capacity** metric from the available metrics and leave the default **Avg** aggregation.
+1. In the left menu, under **Monitoring**, select **Metrics**.
+1. Select the **Capacity** metric from the available metrics and leave the default **Avg** aggregation.
 
     > [!TIP]
     > If you've deployed your instance to multiple locations, you should always look at a **capacity** metric breakdown per location to avoid wrong interpretations.
 
-4. To split the metric by location, from the section at the top, select **Apply splitting** and then select **Location**.
-5. Pick a desired timeframe from the top bar of the section.
+1. To split the metric by location, from the section at the top, select **Apply splitting** and then select **Location**.
+1. Pick a desired timeframe from the top bar of the section.
+
+> [!IMPORTANT]
+> Currently, the **CPU Percentage of Gateway** and **Memory Consumption of Gateway** metrics also appear in the portal for instances in classic tiers. However, they're not supported for use in classic tiers and show a value of 0.
+
+
 
-    You can set a [metric alert](api-management-howto-use-azure-monitor.md#set-up-an-alert-rule) to let you know when something unexpected is happening. For example, get notifications when your API Management instance has exceeded its expected peak capacity for more than 20 minutes.
 
-    >[!TIP]
-    > You can configure alerts to let you know when your service is running low on capacity or use Azure Monitor [autoscaling](api-management-howto-autoscale.md) to automatically add an Azure API Management unit. Scaling operation can take around 30 minutes, so you should plan your rules accordingly.  
-    > Only scaling the master location is allowed.
+
+> [!NOTE]
+> * You can set a [metric alert](api-management-howto-use-azure-monitor.md#set-up-an-alert-rule) to let you know when something unexpected is happening. For example, get notifications when your API Management instance has exceeded its expected peak capacity for more than 20 minutes.
+> * You can use Azure Monitor [autoscaling](api-management-howto-autoscale.md) to automatically add an Azure API Management unit. Scaling operation can take around 30 minutes, so you should plan your rules accordingly.  
+> * In multi-region deployments, only scaling the primary location is allowed.
+
+---
 
 ## Use capacity for scaling decisions
 
-**Capacity** is the metric for making decisions whether to scale an API Management instance to accommodate more load. The following are general considerations:
+Use capacity metrics for making decisions whether to scale an API Management instance to accommodate more load. The following are general considerations:
 
 + Look at a long-term trend and average.
 + Ignore sudden spikes that are most likely not related to an increase in load (see [Capacity metric behavior](#capacity-metric-behavior) section for explanation).
-+ As a general rule, upgrade or scale your instance when the **capacity** value exceeds **60% - 70%** for a long period of time (for example, 30 minutes). Different values may work better for your service or scenario.
-+ If your instance is configured with only 1 unit, upgrade or scale your instance when the **capacity** value exceeds **40%** for a long period. This recommendation is based on the need to reserve capacity for guest OS updates in the underlying service platform.
++ As a general rule, upgrade or scale your instance when a capacity metric value exceeds **60% - 70%** for a long period of time (for example, 30 minutes). Different values may work better for your service or scenario.
++ If your instance is configured with only 1 unit, upgrade or scale your instance when a capacity metric value exceeds **40%** for a long period. This recommendation is based on the need to reserve capacity for guest OS updates in the underlying service platform.
 
 >[!TIP]  
 > If you are able to estimate your traffic beforehand, test your API Management instance on workloads you expect. You can increase the request load on your tenant gradually and monitor the value of the capacity metric that corresponds to your peak load. Follow the steps from the previous section to use Azure portal to understand how much capacity is used at any given time.
 
-## Next steps
+## Related content
 
 - [Upgrade and scale an Azure API Management service instance](upgrade-and-scale.md)
 - [Automatically scale an Azure API Management instance](api-management-howto-autoscale.md)
-- [Plan and manage costs for API Management](plan-manage-costs.md)
+- [Plan and manage costs for API Management](plan-manage-costs.md)