Skip to content

Commit 6ff372a

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into us543898-nat-ip-v2-preview-remove
# Conflicts: # articles/nat-gateway/nat-availability-zones.md
2 parents 81de726 + 593fb0f commit 6ff372a

171 files changed

Lines changed: 4483 additions & 1555 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.openpublishing.redirection.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6659,6 +6659,11 @@
66596659
"source_path": "articles/reliability/migrate-load-balancer.md",
66606660
"redirect_url": "/azure/reliability/reliability-load-balancer",
66616661
"redirect_document_id": false
6662+
},
6663+
{
6664+
"source_path": "articles/nat-gateway/nat-availability-zones.md",
6665+
"redirect_url": "/azure/reliability/reliability-nat-gateway",
6666+
"redirect_document_id": false
66626667
}
66636668
]
66646669
}

articles/api-management/api-management-gateways-overview.md

Lines changed: 24 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ ms.author: danlep
1616

1717
[!INCLUDE [api-management-availability-all-tiers](../../includes/api-management-availability-all-tiers.md)]
1818

19-
This article provides information about the roles and features of the API Management *gateway* component and compares the gateways you can deploy.
19+
This article describes the roles and features of the API Management *gateway* component. It also compares the gateways you can deploy.
2020

2121
Related information:
2222

@@ -34,21 +34,21 @@ The API Management *gateway* (also called *data plane* or *runtime*) is the serv
3434

3535

3636
> [!NOTE]
37-
> All requests to the API Management gateway, including those rejected by policy configurations, count toward configured rate limits, quotas, and billing limits if applied in the service tier.
37+
> All requests to the API Management gateway, including those rejected by policy configurations, count toward configured rate limits, quotas, and billing limits if the service tier applies them.
3838
3939

40-
## Managed and self-hosted
40+
## Managed and self-hosted gateways
4141

4242
API Management offers both managed and self-hosted gateways:
4343

44-
* **Managed** - The managed gateway is the default gateway component that is deployed in Azure for every API Management instance in every service tier. A standalone managed gateway can also be associated with a [workspace](workspaces-overview.md) in an API Management instance. With the managed gateway, all API traffic flows through Azure regardless of where backends implementing the APIs are hosted.
44+
* **Managed** - The managed gateway is the default gateway component that Azure deploys for every API Management instance in every service tier. You can also associate a standalone managed gateway with a [workspace](workspaces-overview.md) in an API Management instance in select service tiers. By using the managed gateway, all API traffic flows through Azure regardless of where backends implementing the APIs are hosted.
4545

4646
> [!NOTE]
4747
> Because of differences in the underlying service architecture, the gateways provided in the different API Management service tiers have some differences in capabilities. For details, see the section [Feature comparison: Managed versus self-hosted gateways](#feature-comparison-managed-versus-self-hosted-gateways).
4848
>
4949
5050

51-
* **Self-hosted** - The [self-hosted gateway](self-hosted-gateway-overview.md) is an optional, containerized version of the default managed gateway that is available in select service tiers. It's useful for hybrid and multicloud scenarios where there's a requirement to run the gateways off of Azure in the same environments where API backends are hosted. The self-hosted gateway enables customers with hybrid IT infrastructure to manage APIs hosted on-premises and across clouds from a single API Management service in Azure.
51+
* **Self-hosted** - The [self-hosted gateway](self-hosted-gateway-overview.md) is an optional, containerized version of the default managed gateway that's available in select service tiers. It's useful for hybrid and multicloud scenarios where there's a requirement to run the gateways off of Azure in the same environments where API backends are hosted. The self-hosted gateway enables customers with hybrid IT infrastructure to manage APIs hosted on-premises and across clouds from a single API Management service in Azure.
5252

5353
* The self-hosted gateway is [packaged](self-hosted-gateway-overview.md#packaging) as a Linux-based Docker container and is commonly deployed to Kubernetes, including to [Azure Kubernetes Service](how-to-deploy-self-hosted-gateway-azure-kubernetes-service.md) and [Azure Arc-enabled Kubernetes](how-to-deploy-self-hosted-gateway-azure-arc.md).
5454

@@ -66,7 +66,7 @@ The following tables compare features available in the following API Management
6666

6767
> [!NOTE]
6868
> * Some features of managed and self-hosted gateways are supported only in certain [service tiers](api-management-features.md) or with certain [deployment environments](self-hosted-gateway-overview.md#packaging) for self-hosted gateways.
69-
> * For the current supported features of the self-hosted gateway, ensure that you have upgraded to the latest major version of the self-hosted gateway [container image](self-hosted-gateway-overview.md#container-images).
69+
> * To see the current supported features of the self-hosted gateway, make sure you upgraded to the latest major version of the self-hosted gateway [container image](self-hosted-gateway-overview.md#container-images).
7070
> * See also self-hosted gateway [limitations](self-hosted-gateway-overview.md#limitations).
7171
7272
### Infrastructure
@@ -90,7 +90,7 @@ The following tables compare features available in the following API Management
9090

9191
<sup>1</sup> Depends on how the gateway is deployed, but is the responsibility of the customer.<br/>
9292
<sup>2</sup> Connectivity to the self-hosted gateway v2 [configuration endpoint](self-hosted-gateway-overview.md#fqdn-dependencies) requires DNS resolution of the endpoint hostname.<br/>
93-
<sup>3</sup> CA root certificates for self-hosted gateway are managed separately per gateway<br/>
93+
<sup>3</sup> CA root certificates for self-hosted gateway are managed separately per gateway.<br/>
9494
<sup>4</sup> Client protocol needs to be enabled.<br/>
9595
<sup>5</sup> Configure using the [forward-request](forward-request-policy.md) policy.<br/>
9696
<sup>6</sup> Configure CA certificate details for backend certificate authentication in [backend](backends.md) settings.
@@ -154,7 +154,7 @@ For details about monitoring options, see [Observability in Azure API Management
154154
| [Request tracing](api-management-howto-api-inspector.md) | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ |
155155

156156
<sup>1</sup> The v2 tiers support Azure Monitor-based analytics.<br/>
157-
<sup>2</sup> Gateway uses [Azure Application Insight's built-in memory buffer](/azure/azure-monitor/app/telemetry-channels#built-in-telemetry-channels) and does not provide delivery guarantees.<br/>
157+
<sup>2</sup> Gateway uses [Azure Application Insight's built-in memory buffer](/azure/azure-monitor/app/telemetry-channels#built-in-telemetry-channels) and doesn't provide delivery guarantees.<br/>
158158
<sup>3</sup> The self-hosted gateway currently doesn't send resource logs (diagnostic logs) to Azure Monitor. Optionally [send metrics](how-to-configure-cloud-metrics-logs.md) to Azure Monitor, or [configure and persist logs locally](how-to-configure-local-metrics-logs.md) where the self-hosted gateway is deployed.<br/>
159159

160160
### Authentication and authorization
@@ -169,17 +169,17 @@ Managed and self-hosted gateways support all available [API authentication and a
169169
## Gateway throughput and scaling
170170

171171
> [!IMPORTANT]
172-
> Throughput is affected by the number and rate of concurrent client connections, the kind and number of configured policies, payload sizes, backend API performance, and other factors. Self-hosted gateway throughput is also dependent on the compute capacity (CPU and memory) of the host where it runs. Perform gateway load testing using anticipated production conditions to determine expected throughput accurately.
172+
> Throughput depends on many factors, including the number and rate of concurrent client connections, the kind and number of configured policies, payload sizes, backend API performance, and other factors. Self-hosted gateway throughput also depends on the compute capacity (CPU and memory) of the host where it runs. To accurately determine expected throughput, perform gateway load testing by using anticipated production conditions.
173173
174174
### Managed gateway
175175

176176
For estimated maximum gateway throughput in the API Management service tiers, see [API Management pricing](https://azure.microsoft.com/pricing/details/api-management/).
177177

178178
> [!IMPORTANT]
179-
> Throughput figures are presented for information only and must not be relied upon for capacity and budget planning. See [API Management pricing](https://azure.microsoft.com/pricing/details/api-management/) for details.
179+
> Use the throughput figures for information only. Don't rely on them for capacity and budget planning. See [API Management pricing](https://azure.microsoft.com/pricing/details/api-management/) for details.
180180
181181
* **Classic tiers**
182-
* Scale gateway capacity by adding and removing scale [units](upgrade-and-scale.md), or upgrade the service tier. (Scaling not available in the Developer tier.)
182+
* Scale gateway capacity by adding and removing scale [units](upgrade-and-scale.md), or upgrade the service tier. (Scaling isn't available in the Developer tier.)
183183
* In the Basic, Standard, and Premium tiers, optionally configure [Azure Monitor autoscale](api-management-howto-autoscale.md).
184184
* In the Premium tier, optionally add and distribute gateway capacity across multiple [regions](api-management-howto-deploy-multi-region.md).
185185

@@ -198,6 +198,19 @@ For estimated maximum gateway throughput in the API Management service tiers, se
198198

199199
Scale capacity by adding and removing scale [units](upgrade-and-scale.md) in the workspace gateway.
200200

201+
## Gateway health check endpoint
202+
203+
In all tiers except the Consumption tier, Azure API Management provides a built-in gateway health check endpoint at path `/status-0123456789abcdef`. Reach this endpoint to help confirm that the API gateway is available and functioning correctly. It doesn't test backend APIs, only the gateway itself.
204+
205+
A request to the endpoint returns a `200 OK` HTTP response when the gateway is healthy; failures indicate networking or gateway issues.
206+
207+
* Azure uses this endpoint internally for continuous SLA monitoring and gateway health validation.
208+
* Customers can integrate requests to this endpoint into their own monitoring tools and probes.
209+
* The endpoint is available for managed gateways (including regional gateways in multi-region deployments), self-hosted gateways, and workspace gateways.
210+
211+
> [!TIP]
212+
> When you [integrate Azure Application Insights](api-management-howto-app-insights.md) with API Management, you can optionally enable availability monitoring of the gateway. This setting regularly polls the gateway health check endpoint and reports results on the **Availability** tab in Application Insights.
213+
201214
## Related content
202215

203216
Learn more about:

articles/app-service/includes/configure-azure-storage/azure-storage-linux-container-pivot.md

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -203,6 +203,46 @@ To validate that the Azure Storage is mounted successfully for the app:
203203
tcpping Storageaccount.file.core.windows.net
204204
```
205205

206+
### Storage mount health checks and auto‑recovery
207+
208+
Azure App Service includes a built‑in health‑check mechanism to ensure that mounted Azure Storage volumes (Azure Files or Azure Blob) remain accessible and responsive. This system helps prevent application hangs caused by stale or disconnected storage mounts.
209+
210+
#### How the health check works
211+
212+
1. **Periodic I/O test**
213+
App Service periodically performs file I/O on a marker file named `__lastCheckTime.txt`.
214+
- **Location:** A `LogFiles` subdirectory under the mounted path (for example, `/mount/path/LogFiles/__lastCheckTime.txt`).
215+
- **Behavior:**
216+
- A read operation is attempted on this file.
217+
- The file does *not* need to exist—“file not found” is treated as a successful check.
218+
219+
2. **Frequency**
220+
The check runs every **5 seconds** by default.
221+
222+
3. **Failure handling**
223+
- Each failed or timed‑out check increments a *failed ping counter*.
224+
- When failures exceed the configured threshold:
225+
- **Azure Files:** 18 failed pings
226+
- **Azure Blob:** 15 failed pings
227+
- The mount is marked **Faulted**, and **App Service automatically restarts the app** to restore connectivity to the share.
228+
229+
#### Configuration via App Settings
230+
231+
You can customize health‑check behavior using the following app settings.
232+
233+
| Storage type | Setting name | Default value | Description |
234+
|--------------|--------------|---------------|-------------|
235+
| Azure Files | `WEBSITE_BYOS_FILES_HEALTH_CHECK_FREQUENCY` | `5` | Interval in seconds between health checks. |
236+
| Azure Files | `WEBSITE_BYOS_FILES_MAX_FAILED_PINGS` | `18` | Number of consecutive failures before marking the volume as faulted. |
237+
| Azure Files | `WEBSITE_BYOS_FILES_AUTO_RECOVERY_ENABLED` | `true` | Set to `false` to disable auto‑recovery logic. |
238+
| Azure Blob | `WEBSITE_BYOS_BLOB_HEALTH_CHECK_FREQUENCY` | `5` | Interval in seconds between health checks. |
239+
| Azure Blob | `WEBSITE_BYOS_BLOB_MAX_FAILED_PINGS` | `15` | Number of consecutive failures before marking the volume as faulted. |
240+
| Azure Blob | `WEBSITE_BYOS_BLOB_AUTO_RECOVERY_ENABLED` | `true` | Set to `false` to disable auto‑recovery logic. |
241+
242+
#### Notes
243+
- Auto‑recovery helps prevent long‑running application hangs caused by unresponsive storage paths.
244+
- Disabling auto‑recovery is not recommended unless troubleshooting specific mount behavior.
245+
206246
## Best practices
207247

208248
### Performance

articles/app-service/manage-automatic-scaling.md

Lines changed: 35 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -4,32 +4,50 @@ description: Learn how to scale automatically in Azure App Service with no confi
44
author: msangapu-msft
55
ms.author: msangapu
66
ms.topic: how-to
7-
ms.date: 04/18/2025
7+
ms.date: 01/09/2026
88
ms.custom: devx-track-azurecli
9-
109
ms.service: azure-app-service
1110
---
1211

1312
# Automatic scaling in Azure App Service
1413

15-
> [!NOTE]
16-
> Automatic scaling is available for all app types: Windows and Linux (deploy as code and container). Automatic scaling isn't supported for deployment slot traffic.
17-
>
14+
> [!NOTE]
15+
> Automatic scaling is available for all app types: Windows and Linux (deploy as code or container).
16+
> Automatic scaling isn't supported for deployment slot traffic.
17+
18+
Automatic scaling is a scale-out option that automatically handles scaling decisions for your web apps and App Service plans. It's different from [Azure autoscale](/azure/azure-monitor/autoscale/autoscale-overview), which lets you define scaling rules based on metrics and schedules.
19+
20+
With automatic scaling, you can adjust scaling settings to improve performance and reduce cold-start delays. The platform prewarms instances to act as a buffer, ensuring smooth scaling transitions. You're billed per second for every instance, including prewarmed instances.
1821

19-
Automatic scaling is a scale-out option that automatically handles scaling decisions for your web apps and App Service plans. It's different from **[Azure autoscale](/azure/azure-monitor/autoscale/autoscale-overview)**, which lets you define scaling rules based on schedules and resources.
22+
## Before you begin
2023

21-
With automatic scaling, you can adjust scaling settings to improve your app's performance and avoid cold start issues. The platform prewarms instances to act as a buffer when scaling out, ensuring smooth performance transitions. You're charged per second for every instance, including prewarmed instances.
24+
Automatic scaling in App Service is different from autoscale.
25+
Use automatic scaling when you want App Service to handle scaling automatically based on HTTP traffic, without creating rules or schedules.
2226

23-
The following table compares scale-out and scale-in options available on App Service:
27+
**Automatic scaling (this article):**
28+
- Scales automatically based on incoming HTTP traffic
29+
- Configured per app
30+
- Supports Always ready, per-app limits, Maximum burst, and prewarmed instances
2431

25-
| | **Manual** | **Autoscale** | **Automatic scaling** |
26-
| --- | --- | --- | --- |
27-
| Available pricing tiers | Basic and up | Standard and up | Premium V2 (P1V2, P2V2, and P3V2) pricing tiers. Premium V3 (P0V3, P1V3, P2V3, P3V3, P1MV3, P2MV3, P3MV3, P4MV3, and P5MV3) pricing tiers.|
28-
|Rule-based scaling |No |Yes |No, the platform manages the scale-out and scale-in based on HTTP traffic. |
29-
|Schedule-based scaling |No |Yes |No |
30-
|Always-ready instances | No, your web app runs on the number of manually scaled instances. | No, your web app runs on other instances available during the scale-out operation, based on the threshold defined for autoscale rules. | Yes (minimum 1) |
31-
|Prewarmed instances |No |No |Yes (default 1) |
32-
|Per-app maximum |No |No |Yes |
32+
**Autoscale:**
33+
- Uses metrics (CPU, memory, queue length, custom metrics)
34+
- Supports schedule-based scaling
35+
- Applies to the entire App Service plan
36+
37+
If you need CPU-, memory-, or time-based scaling, use autoscale instead.
38+
Only one scaling method should be active for an App Service plan.
39+
40+
## Scale-out options available in App Service
41+
42+
| &nbsp; | **Manual** | **Autoscale** | **Automatic scaling** |
43+
|--------|------------|---------------|------------------------|
44+
| Available tiers | Basic and up | Standard and up | Premium v2 and Premium v3 |
45+
| Rule-based scaling | No | Yes | No (traffic-based) |
46+
| Schedule-based scaling | No | Yes | No |
47+
| Always-ready instances | No | No | Yes (minimum 1) |
48+
| Prewarmed instances | No | No | Yes (default 1) |
49+
| Per-app maximum | No | No | Yes |
50+
| ARR affinity behavior | On by default | On unless manually disabled | [Should be disabled manually](#arr-affinity) |
3351

3452
## How automatic scaling works
3553

@@ -175,7 +193,7 @@ If your web app returns a 5xx status, these endpoint pings might result in inter
175193
### How do I track the number of scaled-out instances during the automatic scaling event?
176194

177195
The `AutomaticScalingInstanceCount` metric reports the number of virtual machines on which the app is running, including the prewarmed instance if it's deployed. This metric can also be used to track the maximum number of instances your web app scaled out during an automatic scaling event. This metric is available only for the apps that have **Automatic Scaling** enabled.
178-
196+
<a name='arr-affinity'></a>
179197
### How does ARR Affinity affect automatic scaling?
180198

181199
> [!NOTE]

articles/app-service/overview-managed-instance.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Managed Instance on App Service overview (preview)
33
description: Managed Instance on Azure App Service is a specialized hosting option that provides isolation, customization, and secure integration with Azure resources, ideal for legacy, and infrastructure-dependent web apps.
44
keywords: app service, azure app service, managed instance, isolation, vnet integration, registry, COM, RDP, installation scripts, key vault, pv4, pmv4, windows services, GAC, third-party dependencies
55
ms.topic: overview
6-
ms.date: 11/08/2025
6+
ms.date: 01/09/2026
77
ms.author: msangapu
88
author: msangapu-msft
99
ms.service: azure-app-service
@@ -95,7 +95,7 @@ Managed Instance provides plan-level configuration through:
9595
|-----------|---------|
9696
| **Platform** | • Windows only (no Linux/containers)<br>• Not available in ASE |
9797
| **SKUs** | Pv4 and Pmv4 only |
98-
| **Regions** | East Asia, West Central US, North Europe, East US |
98+
| **Regions** | East Asia, West Central US, North Europe, East US, Australia East |
9999
| **Authentication** | Entra ID and Managed Identity only (no domain join/NTLM/Kerberos) |
100100
| **Workloads** | Web apps only (no WebJobs, TCP/NetPipes) |
101101
| **Configuration** | Persistent changes require scripts (RDP is diagnostics-only) |
@@ -114,4 +114,4 @@ Managed Instance provides plan-level configuration through:
114114
- [Managed Instance Quickstart](quickstart-managed-instance.md)
115115
- [App Service overview](overview.md)
116116
- [Configure Managed Instance](configure-managed-instance.md)
117-
- [App Service Environment comparison](./environment/overview.md)
117+
- [App Service Environment comparison](./environment/overview.md)

0 commit comments

Comments
 (0)