Skip to content

Commit 489b3eb

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into edit-app-service
2 parents aa4900b + 56a998d commit 489b3eb

File tree

1,922 files changed

+28168
-15847
lines changed

Some content is hidden

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

1,922 files changed

+28168
-15847
lines changed

.openpublishing.publish.config.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -626,6 +626,12 @@
626626
"branch": "main",
627627
"branch_mapping": {}
628628
},
629+
{
630+
"path_to_root": "app-service-agentic-langgraph-foundry-node",
631+
"url": "https://github.com/Azure-Samples/app-service-agentic-langgraph-foundry-node",
632+
"branch": "main",
633+
"branch_mapping": {}
634+
},
629635
{
630636
"path_to_root": "app-service-agentic-semantic-kernel-java",
631637
"url": "https://github.com/Azure-Samples/app-service-agentic-semantic-kernel-java",

.openpublishing.redirection.json

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,40 @@
11
{
22
"redirections": [
3+
{
4+
"source_path": "articles/expressroute/expressroute-troubleshooting-arp-classic.md",
5+
"redirect_url": "/previous-versions/azure/expressroute/expressroute-troubleshooting-arp-classic",
6+
"redirect_document_id": false
7+
},
8+
{
9+
"source_path": "articles/expressroute/expressroute-howto-circuit-classic.md",
10+
"redirect_url": "/previous-versions/azure/expressroute/expressroute-howto-circuit-classic",
11+
"redirect_document_id": false
12+
},
13+
{
14+
"source_path": "articles/expressroute/expressroute-howto-routing-classic.md",
15+
"redirect_url": "/previous-versions/azure/expressroute/expressroute-howto-routing-classic",
16+
"redirect_document_id": false
17+
},
18+
{
19+
"source_path": "articles/expressroute/expressroute-howto-linkvnet-classic.md",
20+
"redirect_url": "/previous-versions/azure/expressroute/expressroute-howto-linkvnet-classic",
21+
"redirect_document_id": false
22+
},
23+
{
24+
"source_path": "articles/expressroute/expressroute-howto-move-arm.md",
25+
"redirect_url": "/previous-versions/azure/expressroute/expressroute-howto-move-arm",
26+
"redirect_document_id": false
27+
},
28+
{
29+
"source_path": "articles/expressroute/expressroute-move.md",
30+
"redirect_url": "/previous-versions/azure/expressroute/expressroute-move",
31+
"redirect_document_id": false
32+
},
33+
{
34+
"source_path": "articles/expressroute/expressroute-migration-classic-resource-manager.md",
35+
"redirect_url": "/previous-versions/azure/expressroute/expressroute-migration-classic-resource-manager",
36+
"redirect_document_id": false
37+
},
338
{
439
"source_path": "articles/api-center/discover-shadow-apis-dev-proxy.md",
540
"redirect_url": "/previous-versions/azure/api-center/discover-shadow-apis-dev-proxy",
@@ -4004,6 +4039,21 @@
40044039
"redirect_url": "/azure/expressroute/work-remotely-support",
40054040
"redirect_document_id": false
40064041
},
4042+
{
4043+
"source_path_from_root": "/articles/expressroute/expressroute-howto-add-ipv6-powershell.md",
4044+
"redirect_url": "/azure/expressroute/expressroute-howto-add-ipv6",
4045+
"redirect_document_id": false
4046+
},
4047+
{
4048+
"source_path_from_root": "/articles/expressroute/expressroute-howto-add-ipv6-cli.md",
4049+
"redirect_url": "/azure/expressroute/expressroute-howto-add-ipv6",
4050+
"redirect_document_id": false
4051+
},
4052+
{
4053+
"source_path_from_root": "/articles/expressroute/expressroute-howto-add-ipv6-portal.md",
4054+
"redirect_url": "/azure/expressroute/expressroute-howto-add-ipv6",
4055+
"redirect_document_id": false
4056+
},
40074057
{
40084058
"source_path_from_root": "/articles/external-attack-surface-management/data-connections-overview.md",
40094059
"redirect_url": "/azure/external-attack-surface-management/index",
@@ -6908,6 +6958,11 @@
69086958
"source_path": "articles/signups/startup-programs.md",
69096959
"redirect_url": "/azure/signups/overview",
69106960
"redirect_document_id": false
6961+
},
6962+
{
6963+
"source_path": "articles/reliability/migrate-sql-database.md",
6964+
"redirect_url": "/azure/azure-sql/database/enable-zone-redundancy",
6965+
"redirect_document_id": false
69116966
}
69126967

69136968
]

articles/active-directory-b2c/service-limits.md

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ manager: CelesteDG
88
ms.service: azure-active-directory
99

1010
ms.topic: reference
11-
ms.date: 07/15/2025
11+
ms.date: 07/29/2025
1212
ms.subservice: b2c
1313
zone_pivot_groups: b2c-policy-type
1414

@@ -211,17 +211,22 @@ As a protection for our customers, Microsoft places some restrictions on telepho
211211
| 261 | Madagascar | 10 | 30 |
212212
| 263 | Zimbabwe | 10 | 30 |
213213
| 265 | Malawi  | 10 | 30 |
214+
| 266 | Lesotho | 10 | 30 |
215+
| 359 | Bulgaria | 20 | 100
214216
| 373 | Moldova | 20 | 100 |
215217
| 375 | Belarus   | 10 | 30 |
218+
| 380 | Ukraine | 50 | 200 |
216219
| 381 | Serbia | 50 | 200 |
217220
| 386 | Slovenia | 10 | 50 |
218221
| 501 | Belize| 10 | 30 |
219-
| 502 | Guatemala | 10 | 50
222+
| 502 | Guatemala | 10 | 50 |
220223
| 503 | El Salvador | 10 | 30 |
224+
| 504 | Honduras | 50 | 200 |
221225
| 52 | Mexico | 100 | 500 |
222226
| 53 | Cuba | 10 | 30 |
223227
| 58 | Venezuela| 10 | 30 |
224228
| 591 | Bolivia | 10 | 30 |
229+
| 593 | Ecuador | 20 | 100 |
225230
| 60 | Malaysia | 50 | 200 |
226231
| 62 | Indonesia | 50 | 200 |
227232
| 63 | Philippines | 50 | 200 |
@@ -239,6 +244,7 @@ As a protection for our customers, Microsoft places some restrictions on telepho
239244
| 961 | Lebanon  | 10 | 30 |
240245
| 963 | Syria  | 10 | 30 |
241246
| 964 | Iraq | 50 | 200 |
247+
| 965 | Kuwait | 50 | 200 |
242248
| 967 | Yemen |10 | 30 |
243249
| 970 | State of Palestine| 10 | 30 |
244250
| 972 | Israel  | 50 | 200 |
@@ -250,7 +256,7 @@ As a protection for our customers, Microsoft places some restrictions on telepho
250256
| 994 | Azerbaijan | 50 | 200 |
251257
| 995 | Georgia | 10 | 30 |
252258
| 996 | Kyrgyzstan  | 10 | 30 |
253-
| 998 | Uzbekistan | 10 | 30
259+
| 998 | Uzbekistan | 10 | 30 |
254260

255261
## Next steps
256262

articles/api-center/register-discover-mcp-server.md

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description: Learn about how Azure API Center can be a centralized registry for
44
author: dlepow
55
ms.service: azure-api-center
66
ms.topic: concept-article
7-
ms.date: 04/28/2025
7+
ms.date: 07/22/2025
88
ms.author: danlep
99
# Customer intent: As an API program manager, I want to register and discover MCP servers as APIs in my API Center inventory.
1010
ms.custom:
@@ -27,6 +27,9 @@ To register an MCP server in your API center inventory, specify the API type as
2727

2828
As described in the following sections, when you register an MCP server, you can specify an environment, deployment, and definition.
2929

30+
> [!TIP]
31+
> If you manage MCP servers in Azure API Management, you can enable automatic synchronization to keep your API center up to date with MCP servers and other APIs from your API Management instance. To learn more, see [Synchronize APIs from Azure API Management instance](synchronize-api-management-apis.md).
32+
3033

3134
### Environment and deployment for MCP server
3235

@@ -62,6 +65,8 @@ You can use the following lightweight OpenAPI 3.0 API definition for your MCP se
6265

6366
Set up the [API Center portal](set-up-api-center-portal.md) so that developers and other stakeholders in your organization can discover MCP servers in your API inventory. Users can browse and filter MCP servers in the inventory and view details such as the URL endpoint of the MCP server, if available in the MCP server's API definition.
6467

68+
For a live example of how Azure API Center can power your private, enterprise-ready MCP registry, visit [https://mcp.azure.com](https://mcp.azure.com).
69+
6570
:::image type="content" source="media/register-discover-mcp-server/mcp-server-portal-small.png" lightbox="media/register-discover-mcp-server/mcp-server-portal.png" alt-text="Screenshot of MCP server in API Center portal.":::
6671

6772
> [!NOTE]

articles/api-center/synchronize-api-management-apis.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description: Integrate an API Management instance to Azure API Center for automa
44
author: dlepow
55
ms.service: azure-api-center
66
ms.topic: how-to
7-
ms.date: 06/25/2025
7+
ms.date: 07/22/2025
88
ms.author: danlep
99
ms.custom: devx-track-azurecli
1010
# Customer intent: As an API program manager, I want to integrate my Azure API Management instance with my API center and synchronize API Management APIs to my inventory.
@@ -23,7 +23,7 @@ Although you can use the Azure CLI to [import](import-api-management-apis.md) AP
2323

2424
When you integrate an API Management instance as an API source, the following happens:
2525

26-
1. All APIs, and optionally API definitions (specs), from the API Management instance are added to the API center inventory.
26+
1. All APIs, and optionally API definitions (specs), from the API Management instance are added to the API center inventory. MCP servers in API Management are included in the APIs added to the inventory.
2727
1. You configure an [environment](key-concepts.md#environment) of type *Azure API Management* in the API center.
2828
1. An associated [deployment](key-concepts.md#deployment) is created for each synchronized API definition from API Management.
2929

@@ -106,4 +106,5 @@ The API Management instance is integrated as an environment in your API center.
106106

107107
* [Manage API inventory with Azure CLI commands](manage-apis-azure-cli.md)
108108
* [Import APIs from API Management to your Azure API center](import-api-management-apis.md)
109+
* [Register and discover MCP servers in your API center](register-discover-mcp-server.md)
109110
* [Azure API Management documentation](../api-management/index.yml)

articles/api-management/TOC.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -680,7 +680,7 @@
680680
href: breaking-changes/git-configuration-retirement-march-2025.md
681681
- name: Direct management API retirement (March 2025)
682682
href: breaking-changes/direct-management-api-retirement-march-2025.md
683-
- name: Managed certificates suspension (August 2025)
683+
- name: Managed certificates suspension (August 2025 - March 2026)
684684
href: breaking-changes/managed-certificates-suspension-august-2025.md
685685
- name: ADAL-based identity provider retirement (September 2025)
686686
href: breaking-changes/identity-provider-adal-retirement-sep-2025.md
@@ -695,4 +695,4 @@
695695
- name: Stack Overflow
696696
href: https://stackoverflow.com/questions/tagged/azure-api-management
697697
- name: aka.ms/apimlove
698-
href: https://aka.ms/apimlove
698+
href: https://aka.ms/apimlove

articles/api-management/api-management-features.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ Each API Management [pricing tier](api-management-key-concepts.md#api-management
2828
| -------------------------------------------------------------------------------------------- | ----------- | --------- | --------- | --------- | ----- | -------- | ------- | ------- |
2929
| Microsoft Entra integration<sup>1</sup> | No | Yes | No | Yes | Yes | Yes | Yes | Yes |
3030
| Virtual network injection support | No | Yes | No | No | No | No | Yes | Yes |
31-
| Private endpoint support for inbound connections | No | Yes | Yes | No | Yes | Yes (preview) | Yes | No |
31+
| Private endpoint support for inbound connections | No | Yes | Yes | No | Yes | Yes | Yes | No |
3232
| Outbound virtual network integration support | No | No | No | No | No | Yes | No | Yes |
3333
| Multi-region deployment | No | No | No | No | No | No | Yes | No |
3434
| Availability zones | No | No | No | No | No | No | Yes | No |
@@ -39,7 +39,7 @@ Each API Management [pricing tier](api-management-key-concepts.md#api-management
3939
| Autoscaling | No | No | Yes | No | Yes | No |Yes | No |
4040
| API analytics | No | Yes | Yes | Yes | Yes | Yes | Yes | Yes |
4141
| [Self-hosted gateway](self-hosted-gateway-overview.md)<sup>3</sup> | No | Yes | No | No | No | No | Yes | No |
42-
| [Workspaces](workspaces-overview.md) | No | No | No | No | No | No | Yes | No |
42+
| [Workspaces](workspaces-overview.md) | No | No | No | No | No | No | Yes | Yes |
4343
| [TLS settings](api-management-howto-manage-protocols-ciphers.md) | Yes | Yes | Yes | Yes | Yes | Yes | Yes | Yes |
4444
| [Client certificate authentication](api-management-howto-mutual-certificates-for-clients.md) | Yes | Yes | Yes | Yes | Yes | Yes |Yes | Yes |
4545
| [Policies](api-management-howto-policies.md)<sup>4</sup> | Yes | Yes | Yes | Yes | Yes | Yes | Yes | Yes |
@@ -64,4 +64,4 @@ Each API Management [pricing tier](api-management-key-concepts.md#api-management
6464
* [Overview of Azure API Management](api-management-key-concepts.md)
6565
* [API Management limits](/azure/azure-resource-manager/management/azure-subscription-service-limits?toc=/azure/api-management/toc.json&bc=/azure/api-management/breadcrumb/toc.json#api-management-limits)
6666
* [V2 tiers overview](v2-service-tiers-overview.md)
67-
* [API Management pricing](https://azure.microsoft.com/pricing/details/api-management/)
67+
* [API Management pricing](https://azure.microsoft.com/pricing/details/api-management/)

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ ms.service: azure-api-management
88
ms.custom:
99
- build-2024
1010
ms.topic: concept-article
11-
ms.date: 07/11/2024
11+
ms.date: 07/22/2025
1212
ms.author: danlep
1313
---
1414

@@ -79,20 +79,20 @@ The following tables compare features available in the following API Management
7979
| [Virtual network injection](virtual-network-concepts.md) | Developer, Premium | Premium v2 || ✔️<sup>1,2</sup> | ✔️ |
8080
| [Inbound private endpoints](private-endpoint.md) | Developer, Basic, Standard, Premium | Standard v2 ||||
8181
| [Outbound virtual network integration](integrate-vnet-outbound.md) || Standard v2, Premium v2 ||| ✔️ |
82-
| [Availability zones](zone-redundancy.md) | Premium | ✔️<sup>3</sup> || ✔️<sup>1</sup> | ✔️<sup>3</sup> |
82+
| [Availability zones](zone-redundancy.md) | Premium | || ✔️<sup>1</sup> | |
8383
| [Multi-region deployment](api-management-howto-deploy-multi-region.md) | Premium ||| ✔️<sup>1</sup> ||
84-
| [CA root certificates](api-management-howto-ca-certificates.md) for certificate validation | ✔️ ||| ✔️<sup>4</sup> ||
84+
| [CA root certificates](api-management-howto-ca-certificates.md) for certificate validation | ✔️ ||| ✔️<sup>3</sup> ||
8585
| [Managed domain certificates](configure-custom-domain.md?tabs=managed#domain-certificate-options) | Developer, Basic, Standard, Premium || ✔️ |||
8686
| [TLS settings](api-management-howto-manage-protocols-ciphers.md) | ✔️ | ✔️ | ✔️ | ✔️ ||
87-
| **HTTP/2** (Client-to-gateway) | ✔️<sup>5</sup> | ✔️<sup>5</sup> || ✔️ ||
88-
| **HTTP/2** (Gateway-to-backend) || || ✔️ ||
87+
| **HTTP/2** (Client-to-gateway) | ✔️<sup>4</sup> | ✔️<sup>4</sup> || ✔️ ||
88+
| **HTTP/2** (Gateway-to-backend) || ✔️<sup>5</sup> || ✔️<sup>5</sup> ||
8989
| API threat detection with [Defender for APIs](protect-with-defender-for-apis.md) | ✔️ | ✔️ ||||
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> Two zones are enabled by default; not configurable.<br/>
94-
<sup>4</sup> CA root certificates for self-hosted gateway are managed separately per gateway<br/>
95-
<sup>5</sup> Client protocol needs to be enabled.
93+
<sup>3</sup> CA root certificates for self-hosted gateway are managed separately per gateway<br/>
94+
<sup>4</sup> Client protocol needs to be enabled.<br/>
95+
<sup>5</sup> Configure using the [forward-request](forward-request-policy.md) policy.
9696

9797
### Backend APIs
9898

articles/api-management/azure-openai-emit-token-metric-policy.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ The `azure-openai-emit-token-metric` policy sends custom metrics to Application
5959
| ----------- | --------------------------------------------------------------------------------- | -------- |
6060
| dimension | Add one or more of these elements for each dimension included in the metric. | Yes |
6161

62-
### dimension attributes
62+
### Dimension attributes
6363

6464
| Attribute | Description | Required | Default value |
6565
| --------- | -------------------------- | ------------------ | -------------- |
@@ -77,7 +77,7 @@ The `azure-openai-emit-token-metric` policy sends custom metrics to Application
7777
### Usage notes
7878

7979
* This policy can be used multiple times per policy definition.
80-
* You can configure at most 10 custom dimensions for this policy.
80+
* You can configure at most 5 custom dimensions for this policy.
8181
* This policy can optionally be configured when adding an API from the Azure OpenAI Service using the portal.
8282
* Where available, values in the usage section of the response from the Azure OpenAI Service API are used to determine token metrics.
8383
* Certain Azure OpenAI endpoints support streaming of responses. When `stream` is set to `true` in the API request to enable streaming, token metrics are estimated.

0 commit comments

Comments
 (0)