Skip to content

Commit 96d07f8

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into managing-billing-benefits
2 parents 7b0e725 + 6b1c2ed commit 96d07f8

351 files changed

Lines changed: 5201 additions & 3070 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.

articles/api-management/private-endpoint.md

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ ms.service: azure-api-management
55
author: dlepow
66
ms.author: danlep
77
ms.topic: how-to
8-
ms.date: 11/17/2025
8+
ms.date: 03/17/2026
99
ms.custom:
1010
- build-2025
1111
- sfi-image-nochange
@@ -32,7 +32,9 @@ You can configure an inbound [private endpoint](../private-link/private-endpoint
3232
* Only the API Management instance's **Gateway endpoint** supports inbound Private Link connections.
3333
* Each API Management instance supports at most 100 Private Link connections.
3434
* Connections aren't supported on the [self-hosted gateway](self-hosted-gateway-overview.md) or on a [workspace gateway](workspaces-overview.md#workspace-gateway).
35-
* In the classic API Management tiers, private endpoints aren't supported in instances injected in an internal or external virtual network.
35+
* In the classic API Management tiers, private endpoints aren't supported in instances injected in an internal or external virtual network.
36+
> [!NOTE]
37+
> In the Standard v2 and Premium v2 tiers, private endpoints are supported in instances with any supported virtual network configuration when fronted with [Azure Front Door Premium](../frontdoor/standard-premium/how-to-enable-private-link-apim.md).
3638
3739
## Typical scenarios
3840

@@ -43,9 +45,6 @@ Supported configurations include:
4345
* Pass client requests through a firewall and configure rules to route requests privately to the API Management gateway.
4446
* Configure Azure Front Door (or Azure Front Door with Azure Application Gateway) to receive external traffic and then route traffic privately to the API Management gateway. For example, see [Connect Azure Front Door Premium to an Azure API Management with Private Link](../frontdoor/standard-premium/how-to-enable-private-link-apim.md).
4547

46-
> [!NOTE]
47-
> Currently, routing traffic privately from Azure Front Door to an API Management Premium v2 instance isn't supported.
48-
4948
## Prerequisites
5049

5150
- An existing API Management instance. [Create one if you haven't already](get-started-create-service-instance.md).

articles/app-service/app-service-plan-manage.md

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ ms.assetid: 4859d0d5-3e3c-40cc-96eb-f318b2c51a3d
66
ms.topic: how-to
77
ms.author: msangapu
88
author: msangapu-msft
9-
ms.date: 11/17/2025
9+
ms.date: 03/19/2026
1010
ms.update-cycle: 1095-days
1111
ms.custom: "UpdateFrequency3"
1212

@@ -102,6 +102,19 @@ When creating or manually scaling out an App Service Plan you may experience sit
102102

103103
The preview of App Service Plan Asynchronous enables you to request your target number of instances and the platform scales out to the target number, without you having to modify your original request and retrying. The platform scales to the number of available instances and then triggers the underlying platform to make more instances available. You can make use of this functionality during scale-out operations or at plan creation time. This functionality is supported for all Basic, Standard, and Premium pricing plans.
104104

105+
> [!NOTE]
106+
> This behavior is NOT configurable for App Service Plans created in App Service Environments. App Service Environments create and scale App Service Plans asynchronously by default.
107+
108+
### Scaling up or down App Service Plan SKUs
109+
110+
When using asynchronous scaling, it's possible to scale up or down to a larger or smaller SKU. During this type of operation, no other properties of the App Service Plan can be changed. Scaling up or down to a new SKU may fail if there aren't enough App Service Plan instances available to fully satisfy the request, this is to prevent your App Service Plan having fewer workers than requested.
111+
112+
If a scale up or down operation fails, you can either scale in or out within the current SKU or perform the operation with the minim number of acceptable workers and then scale out asynchronously to the desired target.
113+
114+
### Cancelling an asynchronous scaling operation
115+
116+
An in-progress asynchronous scale operation is canceled only when you explicitly change the TargetWorkerCount property. Changes to other App Service Plan properties don't cancel the operation, including changes to the SKU, or App Service Plan instance count. App Service Plan instance count changes that can't be completed synchronously are ignored unless the TargetWorkerCount is also changed. To explicitly cancel the scale operation, set the TargetWorkerCount to 0.
117+
105118
### [Scale-out (CLI)](#tab/asyncscaleout)
106119
```azurecli-interactive
107120
az appservice plan update -g <resourceGroupName> -n <App Service Plan Name> --async-scaling-enabled true --number-of-workers <number of workers to scale out to>
@@ -111,7 +124,6 @@ az appservice plan update -g <resourceGroupName> -n <App Service Plan Name> --as
111124
```azurecli-interactive
112125
az appservice plan create -g asyncasp -n asyncasplinuxexample --number-of-workers 25 --sku p1v3 --async-scaling-enabled true --location northeurope
113126
```
114-
115127
---
116128

117129
<a name="delete"></a>

articles/app-service/overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ Whether you're a student, a small business, a startup, or an enterprise, App Ser
2525

2626
### Students
2727

28-
- **Free access**: In addition to the widely available [free tier](https://azure.microsoft.com/pricing/purchase-options/azure-account), students can take advantage of the [Azure for Students Starter](https://azure.microsoft.com/pricing/offers/ms-azr-0144p) program.
28+
- **Free access**: In addition to the widely available [free tier](https://azure.microsoft.com/pricing/purchase-options/azure-account?cid=msft_learn), students can take advantage of the [Azure for Students Starter](https://azure.microsoft.com/pricing/offers/ms-azr-0144p?cid=msft_learn) program.
2929
- **IDE support**: Purpose-built deployment tools are available for Visual Studio, Visual Studio Code, IntelliJ, and Eclipse.
3030
- **Easy to use**: Run your apps without needing experience in infrastructure management.
3131
- **Learning Resources**: Plenty of tutorials and guides to help you get started.

articles/app-service/tutorial-nodejs-mongodb-app.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ ms.custom:
2525

2626
# Tutorial: Deploy a Node.js + MongoDB web app to Azure
2727

28-
This tutorial shows how to create a secure Node.js app in [Azure App Service](overview.md) that's connected to an [Azure Cosmos DB for MongoDB](/azure/cosmos-db/mongodb/mongodb-introduction) database. Azure App Service provides a highly scalable, self-patching web hosting service using the Linux operating system. When you're finished, you have an Express.js app running on Azure App Service on Linux.
28+
This tutorial shows how to create a secure Node.js app in [Azure App Service](overview.md) that's connected to an [Azure DocumentDB](https://learn.microsoft.com/azure/documentdb/) database. Azure App Service provides a highly scalable, self-patching web hosting service using the Linux operating system. When you're finished, you have an Express.js app running on Azure App Service on Linux.
2929

3030
:::image type="content" source="./media/tutorial-nodejs-mongodb-app/azure-portal-browse-app-2.png" alt-text="Screenshot of Node.js application storing data in Cosmos DB.":::
3131

@@ -125,7 +125,7 @@ Having issues? Check the [Troubleshooting section](#troubleshooting).
125125

126126
## Create App Service and Azure Cosmos DB
127127

128-
In this step, you create the Azure resources. The steps used in this tutorial create a set of secure-by-default resources that include App Service and Azure Cosmos DB for MongoDB. For the creation process, you specify:
128+
In this step, you create the Azure resources. The steps used in this tutorial create a set of secure-by-default resources that include App Service and Azure DocumentDB. For the creation process, you specify:
129129

130130
- The **Name** for the web app. It's part of the DNS name for your app.
131131
- The **Region** to run the app physically in the world. It's also part of the DNS name for your app.
@@ -171,7 +171,7 @@ Sign in to the [Azure portal](https://portal.azure.com/) and follow these steps
171171
- **Virtual network** &rarr; Integrated with the App Service app and isolates back-end network traffic.
172172
- **Private endpoint** &rarr; Access endpoint for the database resource in the virtual network.
173173
- **Network interface** &rarr; Represents a private IP address for the private endpoint.
174-
- **Azure Cosmos DB for MongoDB** &rarr; Accessible only from behind the private endpoint. A database and a user are created for you on the server.
174+
- **Azure DocumentDB** &rarr; Accessible only from behind the private endpoint. A database and a user are created for you on the server.
175175
- **Private DNS zone** &rarr; Enables DNS resolution of the Azure Cosmos DB server in the virtual network.
176176

177177
:::column-end:::

0 commit comments

Comments
 (0)