Merge pull request #278469 from ggailey777/patch-3

v-dirichards · web-flow · commit 92fd0899ac98 · 2024-06-27T09:23:24.000-05:00
[Functions][ACA] Add ACA info to the hosting tables and service limits
diff --git a/articles/azure-functions/functions-scale.md b/articles/azure-functions/functions-scale.md
@@ -3,7 +3,7 @@ title: Azure Functions scale and hosting
 description: Compare the various options you need to consider when choosing a hosting plan in which to run your function app in Azure Functions.
 ms.assetid: 5b63649c-ec7f-4564-b168-e0a74cb7e0f3
 ms.topic: limits-and-quotas
-ms.date: 05/10/2024
+ms.date: 06/27/2024
 ms.custom: H1Hack27Feb2017, devdivchpfy22, build-2023, build-2024
 ---
 # Azure Functions hosting options
@@ -55,8 +55,8 @@ This table shows operating system support for the hosting options.
 | **[Dedicated plan]** | ✅ Code-only<br/>✅ Container | ✅ Code-only |
 | **[Container Apps]** | ✅ Container-only | ❌ Not supported |
 
-<sup>1</sup> Linux is the only supported operating system for the [Python runtime stack](./functions-reference-python.md).  
-<sup>2</sup> Windows deployments are code-only. Functions doesn't currently support Windows containers. 
+1. Linux is the only supported operating system for the [Python runtime stack](./functions-reference-python.md).  
+2. Windows deployments are code-only. Functions doesn't currently support Windows containers. 
 
 [!INCLUDE [Timeout Duration section](../../includes/functions-timeout-duration.md)]
 
@@ -75,20 +75,22 @@ Maximum instances are given on a per-function app (Consumption) or per-plan (Pre
 | **[Flex Consumption plan]** | [Per-function scaling](./flex-consumption-plan.md#per-function-scaling). Event-driven scaling decisions are calculated on a per-function basis, which provides a more deterministic way of scaling the functions in your app. With the exception of HTTP, Blob storage (Event Grid), and Durable Functions, all other function trigger types in your app scale on independent instances. All HTTP triggers in your app scale together as a group on the same instances, as do all Blob storage (Event Grid) triggers. All Durable Functions triggers also share instances and scale together. | Limited only by total memory usage of all instances across a given region. For more information, see [Instance memory](flex-consumption-plan.md#instance-memory).  | 
 | **[Premium plan]** | [Event driven](event-driven-scaling.md). Scale out automatically, even during periods of high load. Azure Functions infrastructure scales CPU and memory resources by adding more instances of the Functions host, based on the number of events that its functions are triggered on. | **Windows:** 100<br/>**Linux:** 20-100<sup>2</sup>| 
 | **[Dedicated plan]**<sup>3</sup> | Manual/autoscale |10-30<br/>100 (ASE)| 
+| **[Container Apps]** | [Event driven](event-driven-scaling.md). Scale out automatically, even during periods of high load. Azure Functions infrastructure scales CPU and memory resources by adding more instances of the Functions host, based on the number of events that its functions are triggered on. | 10-300<sup>4</sup>  |
 
-
-<sup>1</sup> During scale-out, there's currently a limit of 500 instances per subscription per hour for Linux apps on a Consumption plan.  <br/>
-<sup>2</sup> In some regions, Linux apps on a Premium plan can scale to 100 instances. For more information, see the [Premium plan article](functions-premium-plan.md#region-max-scale-out). <br/>
-<sup>3</sup> For specific limits for the various App Service plan options, see the [App Service plan limits](../azure-resource-manager/management/azure-subscription-service-limits.md#app-service-limits).
+1. During scale-out, there's currently a limit of 500 instances per subscription per hour for Linux apps on a Consumption plan.  <br/>
+2. In some regions, Linux apps on a Premium plan can scale to 100 instances. For more information, see the [Premium plan article](functions-premium-plan.md#region-max-scale-out). <br/>
+3. For specific limits for the various App Service plan options, see the [App Service plan limits](../azure-resource-manager/management/azure-subscription-service-limits.md#app-service-limits).
+4. On Container Apps, you can set the [maximum number of replicas](../container-apps/scale-app.md#scale-definition), which is honored as long as there's enough cores quota available.
 
 ## Cold start behavior
 
 | Plan | Details | 
 | -- | -- |
-| **[Consumption plan]** | Apps can scale to zero when idle, meaning some requests might have more latency at startup. The consumption plan does have some optimizations to help decrease cold start time, including pulling from prewarmed placeholder functions that already have the function host and language processes running. |
+| **[Consumption plan]** | Apps can scale to zero when idle, meaning some requests might have more latency at startup. The consumption plan does have some optimizations to help decrease cold start time, including pulling from prewarmed placeholder functions that already have the host and language processes running. |
 | **[Flex Consumption plan]** | Supports [always ready instances](./flex-consumption-plan.md#always-ready-instances) to reduce the delay when provisioning new instances. |
 | **[Premium plan]** | Supports [always ready instances](./functions-premium-plan.md#always-ready-instances) to avoid cold starts by letting you maintain one or more _perpetually warm_ instances. |
 | **[Dedicated plan]** | When running in a Dedicated plan, the Functions host can run continuously on a prescribed number of instances, which means that cold start isn't really an issue. |
+| **[Container Apps]** | Depends on the [minimum number of replicas](../container-apps/scale-app.md#scale-definition):<br/> • When set to zero: apps can scale to zero when idle and some requests might have more latency at startup.<br/>• When set to one or more: the host process runs continuously, which means that cold start isn't an issue.  | 
 
 ## Service limits
 
@@ -106,6 +108,7 @@ Maximum instances are given on a per-function app (Consumption) or per-plan (Pre
 | **[Flex Consumption plan]** | Billing is based on number of executions, the memory of instances when they're actively executing functions, plus the cost of any [always ready instances](./flex-consumption-plan.md#always-ready-instances). For more information, see [Flex Consumption plan billing](flex-consumption-plan.md#billing).
 | **[Premium plan]** | Premium plan is based on the number of core seconds and memory used across needed and prewarmed instances. At least one instance per plan must always be kept warm. This plan provides the most predictable pricing. |
 | **[Dedicated plan]** | You pay the same for function apps in an App Service Plan as you would for other App Service resources, like web apps.<br/><br/>For an ASE, there's a flat monthly rate that pays for the infrastructure and doesn't change with the size of the environment. There's also a cost per App Service plan vCPU. All apps hosted in an ASE are in the Isolated pricing SKU. For more information, see the [ASE overview article](../app-service/environment/overview.md#pricing). |
+| **[Container Apps]** | Billing in Azure Container Apps is based on your plan type. For more information, see [Billing in Azure Container Apps](../container-apps/billing.md).|  
 
 For a direct cost comparison between dynamic hosting plans (Consumption, Flex Consumption, and Premium), see the [Azure Functions pricing page](https://azure.microsoft.com/pricing/details/functions/). For pricing of the various Dedicated plan options, see the [App Service pricing page](https://azure.microsoft.com/pricing/details/app-service). For pricing Container Apps hosting, see [Azure Container Apps pricing](https://azure.microsoft.com/pricing/details/container-apps/).
 
diff --git a/includes/functions-limits.md b/includes/functions-limits.md
@@ -4,26 +4,26 @@ ms.service: azure-functions
 ms.custom:
   - build-2024
 ms.topic: include
-ms.date: 05/10/2024
+ms.date: 06/17/2024
 ms.author: glenga
 ---
-| Resource |[Consumption plan](/azure/azure-functions/consumption-plan)|[Flex Consumption plan](/azure/azure-functions/flex-consumption-plan)<sup>12</sup>|[Premium plan](/azure/azure-functions/functions-premium-plan)|[Dedicated plan](/azure/azure-functions/dedicated-plan)/[ASE](/azure/app-service/environment/intro)| 
-| --- | --- | --- | --- | --- | 
-| Default [timeout duration](/azure/azure-functions/functions-scale#timeout) (min) |5 | 30 | 30 |30<sup>1</sup> |
-| Max [timeout duration](/azure/azure-functions/functions-scale#timeout) (min) |10 | unbounded<sup>15</sup> | unbounded<sup>7</sup> | unbounded<sup>2</sup> | 
-| Max outbound connections (per instance) | 600 active (1200 total) | unbounded | unbounded | unbounded | 
-| Max request size (MB)<sup>3</sup> | 100 | 100 | 100 | 100 |  
-| Max query string length<sup>3</sup> | 4096 | 4096 | 4096 | 4096 |  
-| Max request URL length<sup>3</sup> | 8192 | 8192 | 8192 | 8192 | 
-|[ACU](/azure/virtual-machines/acu) per instance | 100 | varies | 210-840 | 100-840/210-250<sup>8</sup> |
-| Max memory (GB per instance) | 1.5 | 4<sup>13</sup> | 3.5-14 | 1.75-14/3.5-14 | 
-| Max instance count (Windows/Linux) | 200/100 | 1000 <sup>14</sup> | 100/20 | varies by SKU/100<sup>9</sup> |   
-| Function apps per plan<sup>11</sup> | 100 | 100 | 100 | unbounded<sup>4</sup> |
-| [App Service plans](/azure/app-service/overview-hosting-plans) | 100 per [region](https://azure.microsoft.com/global-infrastructure/regions/) | n/a | 100 per resource group |100 per resource group |
-| [Deployment slots](/azure/azure-functions/functions-deployment-slots) per app<sup>10</sup> | 2 | n/a | 3 | 1-20<sup>9</sup> | 
-| Storage<sup>5</sup> | 5 GB | 250 GB | 250 GB |50-1000 GB | 
-| Custom domains per app</a> |500<sup>6</sup> | 500 | 500 | 500 | 
-| Custom domain [SSL support](/azure/app-service/configure-ssl-bindings) |unbounded SNI SSL connection included | unbounded SNI SSL and 1 IP SSL connections included | unbounded SNI SSL and 1 IP SSL connections included |unbounded SNI SSL and 1 IP SSL connections included | 
+| Resource |[Consumption plan](/azure/azure-functions/consumption-plan)|[Flex Consumption plan](/azure/azure-functions/flex-consumption-plan)<sup>12</sup>|[Premium plan](/azure/azure-functions/functions-premium-plan)|[Dedicated plan](/azure/azure-functions/dedicated-plan)/[ASE](/azure/app-service/environment/intro)| [Container Apps](/azure/azure-functions/functions-container-apps-hosting)|
+| --- | --- | --- | --- | --- | --- | 
+| Default [timeout duration](/azure/azure-functions/functions-scale#timeout) (min) |5 | 30 | 30 |30<sup>1</sup> | 30<sup>16</sup> |
+| Max [timeout duration](/azure/azure-functions/functions-scale#timeout) (min) |10 | unbounded<sup>15</sup> | unbounded<sup>7</sup> | unbounded<sup>2</sup> | unbounded<sup>17</sup> |
+| Max outbound connections (per instance) | 600 active (1200 total) | unbounded | unbounded | unbounded | unbounded |
+| Max request size (MB)<sup>3</sup> | 100 | 100 | 100 | 100 |  100 |
+| Max query string length<sup>3</sup> | 4096 | 4096 | 4096 | 4096 |   4096 | 
+| Max request URL length<sup>3</sup> | 8192 | 8192 | 8192 | 8192 | 8192 | 
+|[ACU](/azure/virtual-machines/acu) per instance | 100 | varies | 210-840 | 100-840/210-250<sup>8</sup> | [varies](/azure/container-apps/billing) |
+| Max memory (GB per instance) | 1.5 | 4<sup>13</sup> | 3.5-14 | 1.75-14/3.5-14 | [varies](/azure/container-apps/billing) |
+| Max instance count (Windows/Linux) | 200/100 | 1000 <sup>14</sup> | 100/20 | varies by SKU/100<sup>9</sup> |  10-300<sup>18</sup> | 
+| Function apps per plan<sup>11</sup> | 100 | 100 | 100 | unbounded<sup>4</sup> | unbounded<sup>4</sup> |
+| [App Service plans](/azure/app-service/overview-hosting-plans) | 100 per [region](https://azure.microsoft.com/global-infrastructure/regions/) | n/a | 100 per resource group |100 per resource group | n/a |
+| [Deployment slots](/azure/azure-functions/functions-deployment-slots) per app<sup>10</sup> | 2 | n/a | 3 | 1-20<sup>9</sup> | not supported |
+| Storage<sup>5</sup> | 5 GB | 250 GB | 250 GB |50-1000 GB | n/a |
+| Custom domains per app</a> |500<sup>6</sup> | 500 | 500 | 500 | not supported |
+| Custom domain [SSL support](/azure/app-service/configure-ssl-bindings) |unbounded SNI SSL connection included | unbounded SNI SSL and 1 IP SSL connections included | unbounded SNI SSL and 1 IP SSL connections included |unbounded SNI SSL and 1 IP SSL connections included | not supported |
 
 Notes on service limits:
 
@@ -40,5 +40,8 @@ Notes on service limits:
 11. There's currently a limit of 5000 function apps in a given subscription. 
 12. The Flex Consumption plan is currently in preview.  
 13. Flex Consumption plan instance sizes are currently defined as either 2,048 MB or 4,096 MB. For more information, see [Instance memory](/azure/azure-functions/flex-consumption-plan#instance-memory).  
-14. Flex Consumption plan during preview has a regional subscription quota that limits the total memory usage of all instances across a given region. For more information, see [Instance memory](/azure/azure-functions/flex-consumption-plan#instance-memory).
-15. In a Flex Consumption plan, the host doesn't enforce an execution time limit. However, there are currently no guarantees because the platform might need to terminate your instances during scale-in, deployments, or to apply updates.
+14. Flex Consumption plan during preview has a regional subscription quota that limits the total memory usage of all instances across a given region. For more information, see [Instance memory](/azure/azure-functions/flex-consumption-plan#instance-memory).  
+15. In a Flex Consumption plan, the host doesn't enforce an execution time limit. However, there are currently no guarantees because the platform might need to terminate your instances during scale-in, deployments, or to apply updates.  
+16. When the [minimum number of replicas](/azure/container-apps/scale-app#scale-definition) is set to zero, the default timeout depends on the specific triggers used in the app.
+17. When the [minimum number of replicas](../articles/container-apps/scale-app.md#scale-definition) is set to one or more.
+18. On Container Apps, you can set the [maximum number of replicas](/azure/container-apps/scale-app#scale-definition), which is honored as long as there's enough cores quota available.
diff --git a/includes/functions-networking-features.md b/includes/functions-networking-features.md
@@ -1,12 +1,20 @@
 ---
+author: ggailey777
+ms.service: azure-functions
 ms.custom:
   - build-2024
+ms.topic: include
+ms.date: 06/27/2024
+ms.author: glenga
 ---
-| Feature |[Consumption plan](../articles/azure-functions/consumption-plan.md)|[Flex Consumption plan](../articles/azure-functions/flex-consumption-plan.md)|[Premium plan](../articles/azure-functions/functions-premium-plan.md)|[Dedicated plan](../articles/azure-functions/dedicated-plan.md)/[ASE](../articles/app-service/environment/intro.md)|
-|----------------|-----------|----------------|---------|-----------------------| ---|
-|[Inbound IP restrictions](../articles/azure-functions/functions-networking-options.md#inbound-networking-features)|✅ Yes|✅ Yes|✅ Yes|✅ Yes | 
-|[Inbound Private Endpoints](../articles/azure-functions/functions-networking-options.md#inbound-networking-features)|❌ No|✅ Yes|✅ Yes|✅ Yes|
-|[Virtual network integration](../articles/azure-functions/functions-networking-options.md#virtual-network-integration)|❌ No|✅ Yes (Regional) |✅ Yes (Regional)|✅ Yes (Regional and Gateway)|
-|[Virtual network triggers (non-HTTP)](../articles/azure-functions/functions-networking-options.md#virtual-network-triggers-non-http)|❌ No|✅ Yes | ✅ Yes |✅ Yes|
-|[Hybrid connections](../articles/azure-functions/functions-networking-options.md#hybrid-connections) (Windows only)|❌ No|❌ No|✅ Yes|✅ Yes|
-|[Outbound IP restrictions](../articles/azure-functions/functions-networking-options.md#outbound-ip-restrictions)|❌ No|✅ Yes|✅ Yes|✅ Yes|
+
+| Feature |[Consumption plan](../articles/azure-functions/consumption-plan.md)|[Flex Consumption plan](../articles/azure-functions/flex-consumption-plan.md)|[Premium plan](../articles/azure-functions/functions-premium-plan.md)|[Dedicated plan](../articles/azure-functions/dedicated-plan.md)/[ASE](../articles/app-service/environment/intro.md)|[Container Apps](../articles/azure-functions/functions-container-apps-hosting.md)<sup>*</sup> |  
+|----------------|-----------|----------------|---------|---------------| ---| --- |
+|[Inbound IP restrictions](../articles/azure-functions/functions-networking-options.md#inbound-networking-features)|✅Yes|✅Yes|✅Yes|✅Yes | ❌No | 
+|[Inbound Private Endpoints](../articles/azure-functions/functions-networking-options.md#inbound-networking-features)|❌No|✅Yes|✅Yes|✅Yes| ❌No |   
+|[Virtual network integration](../articles/azure-functions/functions-networking-options.md#virtual-network-integration)|❌No|✅Yes (Regional) |✅Yes (Regional)|✅Yes (Regional and Gateway)| ✅Yes| 
+|[Virtual network triggers (non-HTTP)](../articles/azure-functions/functions-networking-options.md#virtual-network-triggers-non-http)|❌No|✅Yes | ✅Yes |✅Yes| ✅Yes| 
+|[Hybrid connections](../articles/azure-functions/functions-networking-options.md#hybrid-connections) (Windows only)|❌No|❌ No |✅Yes|✅Yes| ❌No|
+|[Outbound IP restrictions](../articles/azure-functions/functions-networking-options.md#outbound-ip-restrictions)|❌No| ✅Yes | ✅Yes|✅Yes| ❌No| 
+
+<sup>*</sup>For more information, see [Networking in Azure Container Apps environment](../articles/container-apps/networking.md). 
diff --git a/includes/functions-timeout-duration.md b/includes/functions-timeout-duration.md
