Skip to content

Commit 4eac21e

Browse files
Merge pull request #310901 from MicrosoftDocs/main
Auto Publish – main to live - 2026-01-26 23:00 UTC
2 parents 4a2843c + 05136ee commit 4eac21e

43 files changed

Lines changed: 1424 additions & 735 deletions

Some content is hidden

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

articles/azure-app-configuration/configuration-provider-overview.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -55,20 +55,20 @@ Dynamic Refresh (Push Mode) | GA | GA | N/A | N/A | N/A | N/A
5555
Dynamic Refresh (Collection Monitoring) | [GA](./reference-dotnet-provider.md#configuration-refresh) | WIP | GA | WIP | [GA](./reference-javascript-provider.md#configuration-refresh) | [GA](./reference-go-provider.md#configuration-refresh)
5656
JSON Content Type Handling | [GA](./reference-dotnet-provider.md#json-content-type-handling) | GA | GA | GA | [GA](./reference-javascript-provider.md#json-content-type-handling) | [GA](./reference-go-provider.md#json-content-type-handling)
5757
JSON with Comments | [GA](./reference-dotnet-provider.md#json-content-type-handling) | GA | GA | GA | [GA](./reference-javascript-provider.md#json-content-type-handling) | [GA](./reference-go-provider.md#json-content-type-handling)
58-
Configuration Setting Mapping | [GA](./reference-dotnet-provider.md#configuration-setting-mapping) | N/A | N/A | N/A | N/A | N/A
58+
Configuration Setting Mapping | [GA](./reference-dotnet-provider.md#configuration-setting-mapping) | N/A | N/A | GA | N/A | N/A
5959
Key Vault References | [GA](./reference-dotnet-provider.md#key-vault-reference) | GA | GA | GA | [GA](./reference-javascript-provider.md#key-vault-reference) | [GA](./reference-go-provider.md#key-vault-reference)
60-
Key Vault Secret Refresh | [GA](./reference-dotnet-provider.md#key-vault-secret-refresh) | WIP | GA | WIP | [GA](./reference-javascript-provider.md#key-vault-secret-refresh) | [GA](./reference-go-provider.md#key-vault-secret-refresh)
60+
Key Vault Secret Refresh | [GA](./reference-dotnet-provider.md#key-vault-secret-refresh) | WIP | GA | GA | [GA](./reference-javascript-provider.md#key-vault-secret-refresh) | [GA](./reference-go-provider.md#key-vault-secret-refresh)
6161
Custom Key Vault Secret Resolution | [GA](./reference-dotnet-provider.md#key-vault-reference) | GA | GA | GA | [GA](./reference-javascript-provider.md#key-vault-reference) | [GA](./reference-go-provider.md#custom-secret-resolver)
6262
Parallel Secret Resolution | WIP | N/A | WIP | N/A | [GA](./reference-javascript-provider.md#parallel-secret-resolution) | GA
6363
Feature Flags | [GA](./reference-dotnet-provider.md#feature-flag) | GA | GA | GA | [GA](./reference-javascript-provider.md#feature-flag) | [GA](./reference-go-provider.md#feature-flags)
64-
Variant Feature Flags | [GA](./reference-dotnet-provider.md#feature-flag) | Preview | GA | GA | [GA](./reference-javascript-provider.md#feature-flag) | [GA](./reference-go-provider.md#feature-flags)
65-
Feature Flag Telemetry | [GA](./reference-dotnet-provider.md#feature-flag-telemetry) | Preview | GA | GA | GA | WIP
64+
Variant Feature Flags | [GA](./reference-dotnet-provider.md#feature-flag) | GA | GA | GA | [GA](./reference-javascript-provider.md#feature-flag) | [GA](./reference-go-provider.md#feature-flags)
65+
Feature Flag Telemetry | [GA](./reference-dotnet-provider.md#feature-flag-telemetry) | GA | GA | GA | GA | WIP
6666
Key Prefix Trim | [GA](./reference-dotnet-provider.md#trim-prefix-from-keys) | GA | GA | GA | [GA](./reference-javascript-provider.md#trim-prefix-from-keys) | [GA](./reference-go-provider.md#trim-prefix-from-keys)
6767
Configurable Startup Time-out | [GA](./reference-dotnet-provider.md#startup-retry) | WIP | N/A | WIP | [GA](./reference-javascript-provider.md#startup-retry) | [GA](./reference-go-provider.md#startup-retry)
6868
Replica Auto Discovery | [GA](./reference-dotnet-provider.md#geo-replication) | GA | GA | GA | [GA](./reference-javascript-provider.md#geo-replication) | [GA](./reference-go-provider.md#geo-replication)
6969
Replica Failover | [GA](./reference-dotnet-provider.md#geo-replication) | GA | GA | GA | [GA](./reference-javascript-provider.md#geo-replication) | [GA](./reference-go-provider.md#geo-replication)
70-
Replica Load Balancing | [GA](./reference-dotnet-provider.md#geo-replication) | WIP | GA | GA | [GA](./reference-javascript-provider.md#geo-replication) | [GA](./reference-go-provider.md#geo-replication)
71-
Snapshots | [GA](./reference-dotnet-provider.md#snapshot) | GA | GA | WIP | [GA](./reference-javascript-provider.md#snapshot) | [GA](./reference-go-provider.md#snapshot)
70+
Replica Load Balancing | [GA](./reference-dotnet-provider.md#geo-replication) | GA | GA | GA | [GA](./reference-javascript-provider.md#geo-replication) | [GA](./reference-go-provider.md#geo-replication)
71+
Snapshots | [GA](./reference-dotnet-provider.md#snapshot) | GA | GA | GA | [GA](./reference-javascript-provider.md#snapshot) | [GA](./reference-go-provider.md#snapshot)
7272
Distributed Tracing | [GA](./reference-dotnet-provider.md#distributed-tracing) | WIP | WIP | WIP | WIP | N/A
7373
Health Check | [GA](./reference-dotnet-provider.md#health-check) | GA | WIP | WIP | WIP | N/A
7474
Select by Tag Filters | [GA](./reference-dotnet-provider.md#load-specific-key-values-using-selectors) | WIP | GA | GA | [GA](./reference-javascript-provider.md#tag-filters) | [GA](./reference-go-provider.md#tag-filters)

articles/azure-app-configuration/feature-management-overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ Feature | .NET | Spring | Python | JavaScript | Go |
4242
------- | ---- | ------ | ------ | ---------- | -- |
4343
Targeting Filter | [GA](./feature-management-dotnet-reference.md#targeting) | GA | [GA](./feature-management-python-reference.md#targeting) | [GA](./feature-management-javascript-reference.md#targeting) | [GA](./feature-management-go-reference.md#targeting)
4444
Targeting Exclusion | [GA](./feature-management-dotnet-reference.md#targeting-exclusion) | GA | [GA](./feature-management-python-reference.md#targeting-exclusion) | [GA](./feature-management-javascript-reference.md#targeting-exclusion) | [GA](./feature-management-go-reference.md#targeting-exclusion)
45-
Ambient Targeting | [GA](./feature-management-dotnet-reference.md#targeting-in-a-web-application) | WIP | WIP | [GA](./feature-management-javascript-reference.md#targeting-in-a-web-application) | WIP
45+
Ambient Targeting | [GA](./feature-management-dotnet-reference.md#targeting-in-a-web-application) | WIP | GA | [GA](./feature-management-javascript-reference.md#targeting-in-a-web-application) | WIP
4646
Time Window Filter | [GA](./feature-management-dotnet-reference.md#microsofttimewindow) | GA | [GA](./feature-management-python-reference.md#microsofttimewindow) | [GA](./feature-management-javascript-reference.md#microsofttimewindow) | [GA](./feature-management-go-reference.md#microsofttimewindow)
4747
Recurring Time Window | [GA](./feature-management-dotnet-reference.md#microsofttimewindow) | GA | GA | [GA](./feature-management-javascript-reference.md#microsofttimewindow) | WIP
4848
Custom Feature Filter | [GA](./feature-management-dotnet-reference.md#implement-a-feature-filter) | GA | [GA](./feature-management-python-reference.md#implementing-a-feature-filter) | [GA](./feature-management-javascript-reference.md#implementing-a-feature-filter) | [GA](./feature-management-go-reference.md#implementing-a-feature-filter)

articles/azure-functions/TOC.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -624,6 +624,12 @@
624624
href: python-scale-performance-reference.md
625625
- name: Memory profiling
626626
href: python-memory-profiler-reference.md
627+
- name: AI
628+
items:
629+
- name: Azure MCP server for Azure Functions
630+
href: /azure/developer/azure-mcp-server/services/azure-mcp-server-for-functions?toc=/azure/azure-functions/toc.json&bc=/azure/azure-functions/breadcrumb/toc.json
631+
- name: GitHub Copilot for Azure
632+
href: /azure/developer/github-copilot-azure?toc=/azure/azure-functions/toc.json&bc=/azure/azure-functions/breadcrumb/toc.json
627633
- name: Migration guides
628634
items:
629635
- name: Migrate from AWS Lambda
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
items:
2+
- name: Azure
3+
tocHref: /azure/index
4+
topicHref: /azure/index
5+
items:
6+
- name: Azure Functions
7+
tocHref: /azure/azure-functions
8+
topicHref: /azure/azure-functions/index

articles/cdn/cdn-app-dev-node.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22
title: Get started with the Azure CDN SDK for Node.js
33
description: Learn how to create a simple Node.js console application that demonstrates how to automate creation and management of Azure CDN profiles and endpoints.
44
services: cdn
5-
author: zhangmanling
6-
manager: erikre
5+
author: cynthn
6+
manager: akashdubey
77
ms.service: azure-cdn
88
ms.topic: how-to
99
ms.date: 03/31/2025
10-
ms.author: erikre
10+
ms.author: cynthn
1111
ms.custom: devx-track-js
1212
ROBOTS: NOINDEX
1313
# Customer intent: As a developer, I want to create and manage Azure CDN profiles and endpoints using Node.js, so that I can automate content delivery network operations in my applications.

articles/container-apps/billing.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ ms.author: cshoe
1414

1515
# Billing in Azure Container Apps
1616

17-
Billing in Azure Container Apps depends on your [plan type](plans.md) (Consumption or Dedicated). Your plan type depends on the environment type you select.
17+
Billing in Azure Container Apps depends on your [plan type](plans.md) (Consumption or Dedicated). Your plan type depends on the workload profile you use within your environment. The default environment type is workload profiles, which supports both Consumption and Dedicated plans.
1818

1919
| Plan type | Description |
2020
|--|--|

articles/container-apps/environment-type-consumption-only.md

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
2-
title: Consumption-only environment type in Azure Container Apps
3-
description: Learn about features and billing considerations for Consumption-only environment types in Azure Container Apps.
2+
title: Consumption-only environment type in Azure Container Apps (legacy)
3+
description: Learn about features and billing considerations for the legacy Consumption-only environment type in Azure Container Apps.
44
services: container-apps
55
author: craigshoemaker
66
ms.service: azure-container-apps
@@ -9,15 +9,18 @@ ms.date: 02/05/2025
99
ms.author: cshoe
1010
---
1111

12-
# Consumption-only environment type in Azure Container Apps
12+
# Consumption-only environment type in Azure Container Apps (legacy)
13+
14+
> [!NOTE]
15+
> The Consumption-only environment type is a legacy option. For new Container Apps environments, the *Workload profiles (v2)* environment type is the default and recommended choice.
1316
1417
In Azure Container Apps, there are two environment types which determine what features are available to your applications.
1518

1619
The Consumption-only environment runs your application using compute resources exclusively allocated on-demand. In other words, you only pay for resources consumed by your application.
1720

1821
This article explains features of the *Consumption-only (v1)* environment type. For more information on the default *Workload profiles (v2)* environment type, see [Compute and billing structures in Azure Container Apps](structure.md).
1922

20-
While Consumption-only environments are an option, for new Container Apps environments that need the consumption model, creating a *Workload profiles v2* environment with the built-in [consumption workload profile](./structure.md#workload-profiles) is recommended.
23+
While Consumption-only environments are still an option, the *Workload profiles (v2)* environment type is now the default when creating new Container Apps environments. For environments that need the consumption model, the built-in [consumption workload profile](./structure.md#workload-profiles) in a *Workload profiles v2* environment is recommended.
2124

2225
The Consumption-only environment type works on the consumption plan. Apps running in the Consumption-only have access to 4 vCPUs with 8 GB of memory. There's no access to GPUs in a Consumption-only environment.
2326

@@ -33,7 +36,7 @@ Yes, but there are some distinctions between how the consumption plan operates a
3336

3437
### I need consumption pricing. Should I use a Consumption-only (v1) environment, or a Workload profiles (v2) environment with the consumption profile?
3538

36-
If you need the features of a consumption model, and you're creating a new Azure Container Apps environment, use the *Workload profiles (v2)* environment with the consumption profile. Using this approach gives you the flexibility to add dedicated resources to your environment should you need them in the future.
39+
Use the *Workload profiles (v2)* environment with the consumption profile. This the default environment type when creating new Container Apps environments. This approach gives you the flexibility to add dedicated resources to your environment should you need them in the future, along with access to improved networking features.
3740

3841
## Related content
3942

articles/container-apps/environment.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ Environments include the following features:
1818

1919
| Feature | Description |
2020
|---|---|
21-
| Type | There are [two different types](#types) of Container Apps environments: Workload profiles environments and Consumption only environments. Workload profiles environments support both the Consumption and Dedicated [plans](plans.md) whereas Consumption only environments support only the Consumption [plan](plans.md). |
21+
| Type | There are [two different types](#types) of Container Apps environments: Workload profiles environments (the default) and Consumption only environments (legacy). Workload profiles environments support both the Consumption and Dedicated [plans](plans.md) whereas Consumption only environments support only the Consumption [plan](plans.md). |
2222
| Virtual network | A virtual network supports each environment, which enforces the environment's secure boundaries. As you create an environment, a virtual network with [limited network capabilities](networking.md) is created for you, or you can provide your own. Adding an [existing virtual network](vnet-custom.md) gives you fine-grained control over your network. |
2323
| Multiple container apps | When multiple container apps are in the same environment, they share the same virtual network and write logs to the same logging destination. |
2424
| Multi-service integration | You can add [Azure Functions](../container-apps/functions-overview.md) and [Azure Spring Apps](https://aka.ms/asaonaca) to your Azure Container Apps environment. |
@@ -49,8 +49,8 @@ Use more than one environment when you want two or more applications to:
4949

5050
| Type | Description | Plan | Billing considerations |
5151
|--|--|--|--|
52-
| Workload profile | Run serverless apps with support for scale-to-zero and pay only for resources your apps use with the consumption profile. You can also run apps with customized hardware and increased cost predictability by using dedicated workload profiles. | Consumption and Dedicated | You can choose to run apps under either or both plans by using separate workload profiles. The Dedicated plan has a fixed plan management cost for the entire environment regardless of how many workload profiles you're using. The Dedicated plan also has a variable cost based on the number of workload profile instances and the resources allocated to each instance. For more information, see [Billing](billing.md#dedicated-plan). |
53-
| Consumption only | Run serverless apps with support for scale-to-zero and pay only for resources your apps use. | Consumption only | Billed only for individual container apps and their resource usage. There's no cost associated with the Container Apps environment. |
52+
| Workload profile (default) | Run serverless apps with support for scale-to-zero and pay only for resources your apps use with the consumption profile. You can also run apps with customized hardware and increased cost predictability by using dedicated workload profiles. | Consumption and Dedicated | You can choose to run apps under either or both plans by using separate workload profiles. The Dedicated plan has a fixed plan management cost for the entire environment regardless of how many workload profiles you're using. The Dedicated plan also has a variable cost based on the number of workload profile instances and the resources allocated to each instance. For more information, see [Billing](billing.md#dedicated-plan). |
53+
| Consumption only (legacy) | Run serverless apps with support for scale-to-zero and pay only for resources your apps use. | Consumption only | Billed only for individual container apps and their resource usage. There's no cost associated with the Container Apps environment. |
5454

5555
## Logs
5656

articles/container-apps/firewall-integration.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ In the workload profiles environment, user-defined routes (UDRs) and [securing o
2222
2323
When using an external workload profiles environment, inbound traffic to Azure Container Apps is routed through the public IP that exists in the [managed resource group](./networking.md#ports-and-ip-addresses) rather than through your subnet. This means that locking down inbound traffic via NSG or Firewall on an external workload profiles environment isn't supported. For more information, see [Control outbound traffic with user defined routes](./user-defined-routes.md).
2424

25-
In the Consumption only environment, express routes aren't supported, and custom user-defined routes (UDRs) have limited support. For more information on the level of UDR support available in a Consumption-only environment, see the [FAQ](faq.yml#do-consumption-only-environments-support-custom-user-defined-routes-).
25+
In the legacy Consumption only environment, express routes aren't supported, and custom user-defined routes (UDRs) have limited support. For more information on the level of UDR support available in a Consumption-only environment, see the [FAQ](faq.yml#do-consumption-only-environments-support-custom-user-defined-routes-).
2626

2727
## NSG allow rules
2828

articles/container-apps/functions-container-apps.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,10 +64,10 @@ Use these commands to create your required Azure resources:
6464
6565
This `az group create` command creates a resource group in the East US region. If you instead want to use a region near you, using an available region code returned from the `az account list-locations` command. You must modify subsequent commands to use your custom region instead of `eastus`.
6666
67-
1. Create Azure Container App environment with workload profiles enabled.
67+
1. Create an Azure Container Apps environment.
6868
6969
```azurecli
70-
az containerapp env create --name MyContainerappEnvironment --enable-workload-profiles --resource-group AzureFunctionsContainers-rg --location eastus
70+
az containerapp env create --name MyContainerappEnvironment --resource-group AzureFunctionsContainers-rg --location eastus
7171
```
7272
This command can take a few minutes to complete.
7373

0 commit comments

Comments
 (0)