Merge pull request #303519 from MicrosoftDocs/main

Auto Publish – main to live - 2025-07-29 17:00 UTC

Author: learn-build-service-prod[bot]

articles/api-management/api-management-features.md

@@ -28,7 +28,7 @@ Each API Management [pricing tier](api-management-key-concepts.md#api-management
 | -------------------------------------------------------------------------------------------- | ----------- | --------- | --------- | --------- | ----- | -------- | ------- | ------- | 
 | Microsoft Entra integration<sup>1</sup>                                                             | No          | Yes       | No    | Yes      | Yes      | Yes      | Yes     | Yes |
 | Virtual network injection support                                                               | No          | Yes       | No    | No       | No       | No       | Yes    | Yes |
-| Private endpoint support for inbound connections                                                               | No          | Yes       | Yes    | No       | Yes      | Yes (preview)       | Yes  | No   |
+| Private endpoint support for inbound connections                                                               | No          | Yes       | Yes    | No       | Yes      | Yes     | Yes  | No   |
 | Outbound virtual network integration support                                                             | No          | No       | No    | No       | No       | Yes       | No    | Yes |
 | Multi-region deployment                                                                      | No          | No        | No    | No       | No       | No       | Yes     | No |
 | Availability zones                                                                           | No          | No        | No    | No       | No       | No       | Yes     | No  |
@@ -64,4 +64,4 @@ Each API Management [pricing tier](api-management-key-concepts.md#api-management
 * [Overview of Azure API Management](api-management-key-concepts.md)
 * [API Management limits](/azure/azure-resource-manager/management/azure-subscription-service-limits?toc=/azure/api-management/toc.json&bc=/azure/api-management/breadcrumb/toc.json#api-management-limits)
 * [V2 tiers overview](v2-service-tiers-overview.md)
-* [API Management pricing](https://azure.microsoft.com/pricing/details/api-management/)
+* [API Management pricing](https://azure.microsoft.com/pricing/details/api-management/)

articles/application-gateway/application-gateway-tls-version-retirement.md

@@ -5,7 +5,7 @@ services: application gateway
 author: jaesoni
 ms.service: azure-application-gateway
 ms.topic: concept-article
-ms.date: 07/18/2025
+ms.date: 07/29/2025
 ms.author: mbender
 ms.custom:
   - build-2025
@@ -101,6 +101,9 @@ To determine whether clients connecting to your Application Gateway resource are
 ### Logs
 You can also check the [Application Gateway Access logs](monitor-application-gateway-reference.md#access-log-category) to view this information in log format.
 
+> [!NOTE]
+> The metrics or logs for the V1 SKUs do not provide client TLS protocol information.
+
 ### Error information
 Once support for TLS versions 1.0 and 1.1 is discontinued, clients may encounter errors such as `curl: (35) error:0A000410:SSL routines::sslv3 alert handshake failure`. Depending on the browser being used, various messages indicating TLS handshake failures may be displayed.
 

articles/application-gateway/for-containers/understanding-pricing.md

@@ -182,14 +182,15 @@ Pricing calculation:
 
 ### Example 6 - Web Application Firewall
 
-This example assumes Application Gateway for Containers has load raising the number of capacity units and has a Web Application Firewall (WAF) policy reference to an Application Gateway for Containers' security policy. The WAF policy is configured with both DRS 2.1 and bot manager rulesets.
+This example assumes Application Gateway for Containers has load raising the number of capacity units and has a Web Application Firewall (WAF) policy reference to an Application Gateway for Containers' security policy. The WAF policy is configured with both DRS 2.1 and bot manager rulesets. This WAF policy also has four custom rules enabled which do not incur any additional charges
 
 *	1 Application Gateway for Containers resource
 *	1 frontend resource
 *	1 association resource
 *	1 security policy resources (non-billable)
 *	8 capacity units
 *	1 WAF policy running a default ruleset and a bot manager ruleset
+*	4 WAF custom rules
 *	10 million requests processed by WAF
 
 Pricing calculation:
@@ -204,14 +205,14 @@ Pricing calculation:
 
 ### Example 7 - Web Application Firewall - Multiple Policies
 
-This example assumes Application Gateway for Containers has load raising the number of capacity units and has three Web Application Firewall (WAF) policy reference to three corresponding Application Gateway for Containers' security policies. One policy is configured with both DRS 2.1 and bot manager rulesets, the other two policies only have DRS 2.1 ruleset.
+This example assumes Application Gateway for Containers has load raising the number of capacity units and has three Web Application Firewall (WAF) policy reference to three corresponding Application Gateway for Containers' security policies. One policy is configured with both DRS 2.1, bot manager rulesets and 3 custom rules, the other two policies only have DRS 2.1 ruleset and no custom rules.
 
 *	1 Application Gateway for Containers resource
 *	1 frontend resource
 *	1 association resource
 *	3 security policy resources (non-billable)
 *	8 Capacity Units
-*	1 WAF policy running a default ruleset and a bot manager ruleset
+*	1 WAF policy running a default ruleset, a bot manager ruleset and three custom rules
 *	10 million requests processed by WAF
 
 Pricing calculation:

articles/application-gateway/overview-v2.md

@@ -24,7 +24,7 @@ The v2 SKU includes the following enhancements:
 
 - **TCP/TLS proxy (Preview)**: Azure Application Gateway now also supports Layer 4 (TCP protocol) and TLS (Transport Layer Security) proxying. This feature is currently in public preview. For more information, see [Application Gateway TCP/TLS proxy overview](tcp-tls-proxy-overview.md).
 - **Autoscaling**: Application Gateway or WAF deployments under the autoscaling SKU can scale out or in based on changing traffic load patterns. Autoscaling also removes the requirement to choose a deployment size or instance count during provisioning. This SKU offers true elasticity. In the Standard_v2 and WAF_v2 SKU, Application Gateway can operate both in fixed capacity (autoscaling disabled) and in autoscaling enabled mode. Fixed capacity mode is useful for scenarios with consistent and predictable workloads. Autoscaling mode is beneficial in applications that see variance in application traffic.
-- **Zone redundancy**: An Application Gateway or WAF deployment can span multiple Availability Zones, removing the need to provision separate Application Gateway instances in each zone with a Traffic Manager. You can choose a single zone or multiple zones where Application Gateway instances are deployed, which makes it more resilient to zone failure. The backend pool for applications can be similarly distributed across availability zones.
+- **Zone redundancy**: Application Gateway or WAF deployments span multiple Availability Zones by default, removing the need to provision separate Application Gateway instances in each zone with a Traffic Manager. Application Gateway instances are deployed (by default) in a minimum of two availability zones, which makes it more resilient to zone failure. The backend pool for applications can be similarly distributed across availability zones.
 
   Zone redundancy is available only where Azure availability zones are available. In other regions, all other features are supported. For more information, see [Azure regions with availability zone support](../reliability/availability-zones-region-support.md).
 - **Static VIP**: Application Gateway v2 SKU supports the static VIP type exclusively. Static VIP ensures that the VIP associated with the application gateway doesn't change for the lifecycle of the deployment, even after a restart. You must use the application gateway URL for domain name routing to App Services via the application gateway, as v1 doesn't have a static VIP.

articles/application-gateway/understanding-pricing.md

@@ -41,19 +41,22 @@ Application Gateway V2 and WAF V2 SKUs support autoscaling and guarantee high av
 Capacity Unit is the measure of capacity utilization for an Application Gateway across multiple parameters.
 
 A single Capacity Unit consists of the following parameters:
-* 2500 Persistent connections
+* 2,500 Persistent connections
 * 2.22-Mbps throughput
 * 1 Compute Unit
 
 The parameter with the highest utilization among these three parameters is used to calculate capacity units for billing purposes.
 
-#### Capacity Unit related to Instance Count
+#### Capacity Units related to Instance Count
 <h4 id="instance-count"></h4>
 
 You can also pre-provision resources by specifying the **Instance Count**. Each instance guarantees a minimum of 10 capacity units in terms of processing capability. The same instance could potentially support more than 10 capacity units for different traffic patterns depending upon the capacity unit parameters.
 
 Manually defined scale and limits set for autoscaling (minimum or maximum) are set in terms of instance count. The manually set scale for instance count and the minimum instance count in autoscale config reserves 10 capacity units/instance. These reserved capacity units are billed as long as the application gateway is active regardless of the actual resource consumption. If actual consumption crosses the 10 capacity units/instance threshold, additional capacity units are billed under the variable component.
 
+> [!NOTE]
+> An **Instance** is a physical deployment unit of Application Gateway. Users aren't billed directly for the number of instances, but rather for the capacity units reserved or consumed by the instances. 
+
 #### Total capacity units
 
 Total capacity units are calculated based on the higher of the capacity units by utilization or by instance count.
@@ -69,6 +72,18 @@ Compute unit guidance:
 
 The following table shows example prices using Application Gateway Standard v2 SKU. These prices are based on a snapshot of East US pricing and are for illustration purposes only.
 
+> [!NOTE]
+> Compute units are an entirely different concept from capacity units. Compute units are a measure of compute capacity consumed, while capacity units are a measure of capacity utilization across multiple parameters. Compute units are one of three parameters used to calculate capacity units.
+
+### How much traffic can an instance handle?
+
+Each instance of Application Gateway Standard_v2 can handle the following traffic:
+* 25,000 persistent connections
+* 500-Mbps throughput
+* 10 compute units
+
+Therefore, in cases where the dominant factor is either compute units or persistent connections, each instance can handle 10 capacity units. In cases where the dominant factor is throughput, each instance can handle approximately 225 capacity units. This data depends on the type of payload.
+
 #### Fixed Costs (East US region pricing)
 
 |              V2 SKU             |  Costs ($/hr)  |
@@ -116,7 +131,7 @@ Let’s assume you’ve provisioned a Standard_V2 Application Gateway with manua
 
 Your Application Gateway costs using the pricing described previously are calculated as follows:
 
-1 CU can handle 2.22 Mbps throughput.
+1 CU can handle 2.22-Mbps throughput.
 
 CUs required to handle 88.8 Mbps = 88.8 / 2.22 = 40 
 
@@ -134,7 +149,7 @@ Variable Costs = $0.008 * ( 3 (Instance Units) * 10 (capacity units) + 10 (addit
 Total Costs = $179.58 + $233.6 = $413.18
 
 However, if processing capacity equivalent to only say 7 additional CUs was available for use within the 3 reserved instances.
-In this scenario the Application Gateway resource is under scaled and could potentially lead to increase in latency or requests getting dropped.
+In this scenario, the Application Gateway resource is under scaled and could potentially lead to increase in latency or requests getting dropped.
 
 Fixed Price = $0.246  * 730 (Hours) =  $179.58
 
@@ -401,7 +416,7 @@ You can view the amount of consumption for different parameters (compute unit, t
 
 * Fixed Billable Capacity Units
 
-    The minimum number of capacity units kept provisioned as per the minimum instance count setting (one instance translates to 10 capacity units) in the Application Gateway configuration.
+    The minimum number of capacity units kept provisioned as per the minimum instance count setting (one instance translates to a minimum of 10 capacity units) in the Application Gateway configuration.
 
 * Estimated Billed Capacity units