Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into us429364-seo-top25-vnet

Author: asudbring

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/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
 

articles/expressroute/expressroute-about-virtual-network-gateways.md

@@ -99,7 +99,10 @@ When you create an ExpressRoute gateway, Microsoft automatically provisions and
 
 **Availability:**  
 Auto-Assigned Public IP is not available for Virtual WAN (vWAN) or Extended Zone deployments.
+ 
+#### Create a new ExpressRoute gateway with Auto-Assigned Public IP
 
+:::image type="content" source="media/expressroute-introduction/hobo-ip.png" alt-text="Screenshot of the create for virtual gateway." lightbox="media/gateway-migration/gateway-prepare-stage.png":::
 
 ## Connectivity from VNet to VNet and from VNet to virtual WAN
 

articles/expressroute/expressroute-howto-gateway-migration-portal.md

@@ -36,6 +36,7 @@ Follow these steps to migrate to a new gateway using the Azure portal:
     :::image type="content" source="media/gateway-migration/validate-step.png" alt-text="Screenshot of the validate step for migrating a virtual network gateway." lightbox="media/gateway-migration/validate-step.png":::
 
 1. After successful validation, move to the **Prepare** stage. At this point, a new virtual network gateway will be created, and its Public IP address will be provisioned and managed by Microsoft. In the **Virtual Network Gateway Details** section, enter the following information:
+1. 
     :::image type="content" source="media/gateway-migration/gateway-prepare-update.png" alt-text="Screenshot of the Prepare stage for migrating a virtual network gateway." lightbox="media/gateway-migration/gateway-prepare-stage.png":::
 
     | Setting | value |
@@ -65,4 +66,4 @@ Follow these steps to migrate to a new gateway using the Azure portal:
 ## Next steps
 
 * Learn more about [designing for high availability](designing-for-high-availability-with-expressroute.md).
-* Plan for [disaster recovery](designing-for-disaster-recovery-with-expressroute-privatepeering.md) and [using VPN as a backup](use-s2s-vpn-as-backup-for-expressroute-privatepeering.md).
+* Plan for [disaster recovery](designing-for-disaster-recovery-with-expressroute-privatepeering.md) and [using VPN as a backup](use-s2s-vpn-as-backup-for-expressroute-privatepeering.md).