Skip to content

Commit 4630e85

Browse files
committed
Merge branch 'main' into reliability-app-service-environment-updates
2 parents 018048c + b8d62b6 commit 4630e85

File tree

2,657 files changed

+44685
-142361
lines changed

Some content is hidden

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

2,657 files changed

+44685
-142361
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: 100 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",
@@ -3999,11 +4034,56 @@
39994034
"redirect_url": "/azure/expressroute/expressroute-howto-linkvnet-cli",
40004035
"redirect_document_id": false
40014036
},
4037+
{
4038+
"source_path_from_root": "/articles/expressroute/quickstart-create-expressroute-vnet-template.md",
4039+
"redirect_url": "/azure/expressroute/expressroute-howto-circuit-resource-manager-template",
4040+
"redirect_document_id": false
4041+
},
4042+
{
4043+
"source_path_from_root": "/articles/expressroute/expressroute-howto-expressroute-direct-cli.md",
4044+
"redirect_url": "/azure/expressroute/how-to-expressroute-direct-portal",
4045+
"redirect_document_id": false
4046+
},
4047+
{
4048+
"source_path_from_root": "/articles/expressroute/expressroute-howto-erdirect.md",
4049+
"redirect_url": "/azure/expressroute/how-to-expressroute-direct-portal",
4050+
"redirect_document_id": false
4051+
},
4052+
{
4053+
"source_path_from_root": "/articles/expressroute/how-to-routefilter-cli.md",
4054+
"redirect_url": "/azure/expressroute/how-to-routefilter-portal",
4055+
"redirect_document_id": false
4056+
},
4057+
{
4058+
"source_path_from_root": "/articles/expressroute/how-to-routefilter-powershell.md",
4059+
"redirect_url": "/azure/expressroute/how-to-routefilter-portal",
4060+
"redirect_document_id": false
4061+
},
4062+
{
4063+
"source_path_from_root": "/articles/expressroute/work-remotely-support.md",
4064+
"redirect_url": "/azure/networking/working-remotely-support",
4065+
"redirect_document_id": false
4066+
},
40024067
{
40034068
"source_path_from_root": "/articles/expressroute/working-remotely-support.md",
40044069
"redirect_url": "/azure/expressroute/work-remotely-support",
40054070
"redirect_document_id": false
40064071
},
4072+
{
4073+
"source_path_from_root": "/articles/expressroute/expressroute-howto-add-ipv6-powershell.md",
4074+
"redirect_url": "/azure/expressroute/expressroute-howto-add-ipv6",
4075+
"redirect_document_id": false
4076+
},
4077+
{
4078+
"source_path_from_root": "/articles/expressroute/expressroute-howto-add-ipv6-cli.md",
4079+
"redirect_url": "/azure/expressroute/expressroute-howto-add-ipv6",
4080+
"redirect_document_id": false
4081+
},
4082+
{
4083+
"source_path_from_root": "/articles/expressroute/expressroute-howto-add-ipv6-portal.md",
4084+
"redirect_url": "/azure/expressroute/expressroute-howto-add-ipv6",
4085+
"redirect_document_id": false
4086+
},
40074087
{
40084088
"source_path_from_root": "/articles/external-attack-surface-management/data-connections-overview.md",
40094089
"redirect_url": "/azure/external-attack-surface-management/index",
@@ -6869,6 +6949,11 @@
68696949
"redirect_url": "/azure/sre-agent/usage",
68706950
"redirect_document_id": false
68716951
},
6952+
{
6953+
"source_path": "articles/sre-agent/incident-management-tools.md",
6954+
"redirect_url": "/azure/sre-agent/overview",
6955+
"redirect_document_id": false
6956+
},
68726957
{
68736958
"source_path": "articles/app-service/tutorial-sre-agent.md",
68746959
"redirect_url": "/azure/sre-agent/troubleshoot-azure-app-service",
@@ -6894,6 +6979,11 @@
68946979
"redirect_url": "/azure/governance/policy/samples/hipaa-hitrust",
68956980
"redirect_document_id": false
68966981
},
6982+
{
6983+
"source_path": "articles/reliability/migrate-workload-aks-mysql.md",
6984+
"redirect_url": "/azure/reliability/availability-zones-migration-overview",
6985+
"redirect_document_id": true
6986+
},
68976987
{
68986988
"source_path": "articles/private-5g-core/disconnected-mode.md",
68996989
"redirect_url": "/azure/private-5g-core/azure-stack-edge-disconnects",
@@ -6903,6 +6993,16 @@
69036993
"source_path": "articles/signups/startup-programs.md",
69046994
"redirect_url": "/azure/signups/overview",
69056995
"redirect_document_id": false
6996+
},
6997+
{
6998+
"source_path": "articles/reliability/migrate-sql-database.md",
6999+
"redirect_url": "/azure/azure-sql/database/enable-zone-redundancy",
7000+
"redirect_document_id": false
7001+
},
7002+
{
7003+
"source_path": "articles/reliability/migrate-app-gateway-v2.md",
7004+
"redirect_url": "/azure/reliability/reliability-application-gateway-v2",
7005+
"redirect_document_id": false
69067006
}
69077007
]
69087008
}

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/active-directory-b2c/whats-new-docs.md

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: "What's new in Azure Active Directory business-to-customer (B2C)"
33
description: "New and updated documentation for the Azure Active Directory business-to-customer (B2C)."
4-
ms.date: 07/03/2025
4+
ms.date: 08/01/2025
55
ms.service: azure-active-directory
66
ms.subservice: b2c
77
ms.topic: whats-new
@@ -18,6 +18,12 @@ manager: CelesteDG
1818

1919
Welcome to what's new in Azure Active Directory B2C documentation. This article lists new and significantly updated docs from the past three months. To learn what's new with the B2C service, see [What's new in Microsoft Entra ID](../active-directory/fundamentals/whats-new.md), [Azure AD B2C developer release notes](custom-policy-developer-notes.md) and [What's new in Microsoft Entra External ID](/entra/external-id/whats-new-docs).
2020

21+
## July 2025
22+
23+
### Updated articles
24+
25+
- [Azure Active Directory B2C service limits and restrictions](service-limits.md) - Added new region limits
26+
2127
## June 2025
2228

2329
### Updated articles
@@ -36,8 +42,3 @@ This month, we added an important note to our articles stating that starting May
3642
- [Manage administrator accounts in Azure Active Directory B2C](tenant-management-manage-administrator.md) - Updated the User page information
3743
- [Track user behavior in Azure AD B2C by using Application Insights](analytics-with-application-insights.md) - Replaced instrumentation key with connection string
3844

39-
## March 2025
40-
41-
### Updated articles
42-
- [Error codes: Azure Active Directory B2C](error-codes.md) - Updated error messages
43-

articles/api-center/includes/about-mcp-servers.md

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ author: dlepow
66

77
ms.service: azure-api-center
88
ms.topic: include
9-
ms.date: 05/12/2025
9+
ms.date: 07/16/2025
1010
ms.author: danlep
1111
ms.custom:
1212
- Include file
@@ -21,24 +21,9 @@ The [model context protocol](https://www.anthropic.com/news/model-context-protoc
2121

2222
### MCP architecture
2323

24-
The following diagram illustrates the MCP architecture:
25-
26-
:::image type="content" source="media/about-mcp-servers/mcp-architecture.png" alt-text="Diagram of model context protocol (MCP) architecture.":::
27-
28-
The architecture consists of the following components:
29-
30-
| Component | Description |
31-
|----------------|-------------------------------------------------------------------------------------------------|
32-
| **MCP hosts** | LLM applications such as chat apps or AI assistants in your IDEs (like GitHub Copilot in Visual Studio Code) that need to access external capabilities |
33-
| **MCP clients**| Protocol clients, inside the host application, that maintain 1:1 connections with servers |
34-
| **MCP servers**| Lightweight programs that each expose specific capabilities and provide context, tools, and prompts to clients |
35-
| **MCP protocol**| Transport layer in the middle |
36-
3724
MCP follows a client-server architecture where a host application can connect to multiple servers. Whenever your MCP host or client needs a tool, it connects to the MCP server. The MCP server then connects to, for example, a database or an API. MCP hosts and servers connect with each other through the MCP protocol.
3825

39-
### Remote versus local MCP servers
40-
41-
MCP utilizes a client-host-server architecture built on [JSON-RPC 2.0 for messaging](https://modelcontextprotocol.io/docs/concepts/architecture). Communication between clients and servers occurs over defined transport layers, and supports primarily two modes of operation:
26+
The MCP architecture is built on [JSON-RPC 2.0 for messaging](https://modelcontextprotocol.io/docs/concepts/architecture). Communication between clients and servers occurs over defined transport layers, and supports primarily two modes of operation:
4227

4328
* **Remote MCP servers** - MCP clients connect to MCP servers over the internet, establishing a connection using HTTP and server-sent events (SSE), and authorizing the MCP client access to resources on the user's account using OAuth.
4429

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

Lines changed: 7 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: 08/04/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,13 +65,16 @@ 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]
6873
> The URL endpoint for the MCP server is only visible in the API Center portal if you add an MCP deployment and an API definition for the MCP server.
6974
7075
## Related content
7176

77+
* [About MCP servers in API Management](../api-management/mcp-server-overview.md)
7278
* [Import APIs to your API center from API Management](import-api-management-apis.md)
7379
* [Use the Visual Studio extension for API Center](build-register-apis-vscode-extension.md) to build and register APIs from Visual Studio Code.
7480

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: 18 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,7 @@
236236
items:
237237
- name: AI gateway capabilities in API Management
238238
href: genai-gateway-capabilities.md
239-
- name: Import LLM APIs
239+
- name: Manage LLM APIs
240240
items:
241241
- name: Import Azure AI Foundry API
242242
href: azure-ai-foundry-api.md
@@ -248,12 +248,20 @@
248248
href: openai-compatible-google-gemini-api.md
249249
- name: Import Amazon Bedrock API
250250
href: amazon-bedrock-passthrough-llm-api.md
251-
- name: Expose REST API as MCP server
252-
href: export-rest-mcp-server.md
253-
- name: Semantic caching for Azure OpenAI API requests
254-
href: azure-openai-enable-semantic-caching.md
255-
- name: Authenticate and authorize to Azure OpenAI
256-
href: api-management-authenticate-authorize-azure-openai.md
251+
- name: Semantic caching for LLM API requests
252+
href: azure-openai-enable-semantic-caching.md
253+
- name: Authenticate and authorize to Azure OpenAI
254+
href: api-management-authenticate-authorize-azure-openai.md
255+
- name: Manage MCP servers
256+
items:
257+
- name: MCP server capabilities
258+
href: mcp-server-overview.md
259+
- name: Expose REST API as MCP server
260+
href: export-rest-mcp-server.md
261+
- name: Expose existing MCP server
262+
href: expose-existing-mcp-server.md
263+
- name: Secure access to MCP servers
264+
href: secure-mcp-servers.md
257265
- name: Manage APIs with policies
258266
items:
259267
- name: API Management policies overview
@@ -449,7 +457,7 @@
449457
href: diagnose-solve-problems.md
450458
- name: Troubleshoot failed to update hostnames error
451459
href: api-management-troubleshoot-cannot-add-custom-domain.md
452-
- name: Troubleshoot response timeouts and errors
460+
- name: Troubleshoot response time-outs and errors
453461
href: troubleshoot-response-timeout-and-errors.md
454462
- name: Samples
455463
items:
@@ -680,7 +688,7 @@
680688
href: breaking-changes/git-configuration-retirement-march-2025.md
681689
- name: Direct management API retirement (March 2025)
682690
href: breaking-changes/direct-management-api-retirement-march-2025.md
683-
- name: Managed certificates suspension (August 2025)
691+
- name: Managed certificates suspension (August 2025 - March 2026)
684692
href: breaking-changes/managed-certificates-suspension-august-2025.md
685693
- name: ADAL-based identity provider retirement (September 2025)
686694
href: breaking-changes/identity-provider-adal-retirement-sep-2025.md
@@ -695,4 +703,4 @@
695703
- name: Stack Overflow
696704
href: https://stackoverflow.com/questions/tagged/azure-api-management
697705
- name: aka.ms/apimlove
698-
href: https://aka.ms/apimlove
706+
href: https://aka.ms/apimlove

0 commit comments

Comments
 (0)