Skip to content

Commit 60211d5

Browse files
authored
Merge branch 'MicrosoftDocs:main' into main
2 parents 004a21a + 24451ca commit 60211d5

File tree

1,064 files changed

+8663
-6405
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,064 files changed

+8663
-6405
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: 50 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",

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

Lines changed: 4 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

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/api-management-features.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -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 |

articles/api-management/breaking-changes/managed-certificates-suspension-august-2025.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
2-
title: Azure API Management - Managed certificates suspension for new custom domains (August 2025)
3-
description: Azure API Management is temporarily suspending managed certificates for new custom domains from August 15, 2025 to March 15, 2026 due to industry-wide changes in domain validation.
2+
title: Azure API Management - Managed certificates suspension for custom domains (August 2025)
3+
description: Azure API Management is temporarily suspending creation of managed certificates for custom domains from August 15, 2025 to March 15, 2026 due to industry-wide changes in domain validation.
44
services: api-management
55
author: dlepow
66
ms.service: azure-api-management
@@ -10,21 +10,21 @@ ms.date: 07/18/2025
1010
ms.author: danlep
1111
---
1212

13-
# Managed certificates suspension for new custom domains (August 2025)
13+
# Creation of managed certificates temporarily suspended for custom domains (August 2025)
1414

1515
[!INCLUDE [premium-dev-standard-basic.md](../../../includes/api-management-availability-premium-dev-standard-basic.md)]
1616

17-
Azure managed certificates for new custom domains in API Management will be temporarily turned off from August 15, 2025 to March 15, 2026. Existing managed certificates will be autorenewed and remain unaffected.
17+
Creation of Azure-managed certificates for custom domains in API Management will be temporarily turned off from August 15, 2025 to March 15, 2026. Existing managed certificates will be autorenewed and remain unaffected.
1818

19-
In the classic service tiers, Azure API Management offers [free, managed TLS certificates for custom domains](../configure-custom-domain.md#domain-certificate-options), allowing customers to secure their endpoints without purchasing and managing their own certificates. Because of an industry-wide deprecation of CNAME-based Domain Control Validation (DCV), our Certificate Authority (CA), DigiCert, will migrate to a new validation platform to meet Multi-Perspective Issuance Corroboration (MPIC) requirements. This migration requires a temporary suspension of managed certificates for new custom domains.
19+
In the classic service tiers, Azure API Management offers [free, managed TLS certificates for custom domains](../configure-custom-domain.md#domain-certificate-options) (preview), allowing customers to secure their endpoints without purchasing and managing their own certificates. Because of an industry-wide deprecation of CNAME-based Domain Control Validation (DCV), our Certificate Authority (CA), DigiCert, will migrate to a new validation platform to meet Multi-Perspective Issuance Corroboration (MPIC) requirements for issuing certificates. This migration requires us to temporarily suspend the creation of managed certificates for custom domains.
2020

2121
## Is my service affected by this?
2222

23-
You're affected if you plan to create new managed certificates for new custom domains in Azure API Management between August 15, 2025 and March 15, 2026. Existing managed certificates will be autorenewed before August 15, 2025 and will continue to function normally. There's no impact to existing managed certificates or custom domains already using them.
23+
You're affected if you plan to create new managed certificates for custom domains in Azure API Management between August 15, 2025 and March 15, 2026. Existing managed certificates will be autorenewed before August 15, 2025 and will continue to function normally. There's no impact to existing managed certificates or custom domains already using them.
2424

2525
## What is the deadline for the change?
2626

27-
The suspension of managed certificates for new custom domains will be enforced from August 15, 2025 to March 15, 2026. The capability to create managed certificates will resume after the migration to the new validation platform is complete.
27+
The suspension of managed certificates for custom domains will be enforced from August 15, 2025 to March 15, 2026. The capability to create managed certificates will resume after the migration to the new validation platform is complete.
2828

2929
## What do I need to do?
3030

articles/api-management/how-to-create-workspace.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@ author: dlepow
55
ms.topic: how-to
66
ms.service: azure-api-management
77
ms.author: danlep
8-
ms.date: 06/03/2025
8+
ms.date: 07/15/2025
99
ms.custom:
1010
- build-2025
1111
---
1212

1313
# Create and manage a workspace in Azure API Management
1414

15-
[!INCLUDE [api-management-availability-premium](../../includes/api-management-availability-premium.md)]
15+
[!INCLUDE [api-management-availability-premium-premium-v2](../../includes/api-management-availability-premium-premium-v2.md)]
1616

1717
Set up a [workspace](workspaces-overview.md) to enable an API team to manage and productize their own APIs, while providing the API platform team with the tools to observe, govern, and maintain the API Management platform. After you create a workspace and assign permissions, workspace collaborators can create and manage their own APIs, products, subscriptions, and related resources.
1818

articles/api-management/v2-service-tiers-overview.md

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

77
ms.service: azure-api-management
88
ms.topic: concept-article
9-
ms.date: 06/16/2025
9+
ms.date: 07/15/2025
1010
ms.author: danlep
1111
ms.custom:
1212
- references_regions
@@ -27,7 +27,7 @@ The following v2 tiers are generally available:
2727

2828
The following v2 tier is in preview:
2929

30-
* **Premium v2** - Premium v2 offers enterprise features including full virtual network isolation and scaling for high volume workloads.
30+
* **Premium v2** - Premium v2 offers enterprise features including full virtual network isolation, scaling for high volume workloads, and workspaces.
3131

3232
## Key capabilities
3333

articles/api-management/workspaces-overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ ms.custom:
1515

1616
# Federated API management with workspaces
1717

18-
[!INCLUDE [api-management-availability-premium](../../includes/api-management-availability-premium.md)]
18+
[!INCLUDE [api-management-availability-premium-premium-v2](../../includes/api-management-availability-premium-premium-v2.md)]
1919

2020
This article provides an overview of API Management *workspaces* and how they empower decentralized API development teams to manage and productize their APIs in a common service infrastructure.
2121

132 KB
Loading

0 commit comments

Comments
 (0)