Skip to content

Commit e453b87

Browse files
authored
Merge branch 'main' into ip-services-freshness-1125
2 parents dee82b1 + a80c1f2 commit e453b87

1,117 files changed

Lines changed: 8702 additions & 41338 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.

.openpublishing.redirection.json

Lines changed: 330 additions & 0 deletions
Large diffs are not rendered by default.

articles/active-directory-b2c/partner-deduce.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ With this integration, organizations can extend their Azure AD B2C capabilities
3131

3232
To get started, you'll need:
3333

34-
- An Azure subscription. If you don't have one, get a [free account](https://azure.microsoft.com/free).
34+
- An Azure subscription. If you don't have one, get a [free account](https://azure.microsoft.com/pricing/purchase-options/azure-account?cid=msft_learn).
3535

3636
- An [Azure AD B2C tenant](tutorial-create-tenant.md) that is linked to your Azure subscription.
3737

articles/active-directory-b2c/partner-eid-me.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ To get started, you need:
3737
* A Relying Party account with eID-Me
3838
* Go to bluink.ca to [learn more](https://bluink.ca/eid-me/solutions/id-verification#contact-form) and request a demo
3939
* An Azure subscription
40-
* If you don't have one, get an [Azure free account](https://azure.microsoft.com/free)
40+
* If you don't have one, get an [Azure free account](https://azure.microsoft.com/pricing/purchase-options/azure-account?cid=msft_learn)
4141
* An Azure AD B2C tenant linked to the Azure subscription
4242
* See, [Tutorial: Create an Azure AD B2C tenant](tutorial-create-tenant.md)
4343
* A trial or production version of the eID-Me Digital ID App

articles/api-management/TOC.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,7 @@
248248
href: genai-gateway-capabilities.md
249249
- name: Manage LLM APIs
250250
items:
251-
- name: Import Azure AI Foundry API
251+
- name: Import Microsoft Foundry API
252252
href: azure-ai-foundry-api.md
253253
- name: Import Azure OpenAI API
254254
href: azure-openai-api-from-specification.md

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

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -27,31 +27,31 @@ Each API Management [pricing tier](api-management-key-concepts.md#api-management
2727

2828
| Feature | Consumption | Developer | Basic | Basic v2 |Standard | Standard v2 | Premium | Premium v2 |
2929
| -------------------------------------------------------------------------------------------- | ----------- | --------- | --------- | --------- | ----- | -------- | ------- | ------- |
30-
| Microsoft Entra integration<sup>1</sup> | No | Yes | No | Yes | Yes | Yes | Yes | Yes |
31-
| Virtual network injection support | No | Yes | No | No | No | No | Yes | Yes |
32-
| Private endpoint support for inbound connections | No | Yes | Yes | No | Yes | Yes | Yes | Yes |
33-
| Outbound virtual network integration support | No | No | No | No | No | Yes | No | Yes |
34-
| Multi-region deployment | No | No | No | No | No | No | Yes | No |
35-
| Availability zones | No | No | No | No | No | No | Yes | Yes |
36-
| Multiple custom domain names for gateway | No | Yes | No | No | No | No | Yes | No |
37-
| Developer portal<sup>2</sup> | No | Yes | Yes | Yes | Yes | Yes | Yes | Yes |
38-
| Built-in cache | No | Yes | Yes | Yes | Yes | Yes | Yes | Yes |
39-
| [External cache](./api-management-howto-cache-external.md) | Yes | Yes | Yes | Yes | Yes | Yes |Yes | Yes
40-
| Autoscaling | No | No | Yes | No | Yes | No |Yes | No |
41-
| API analytics | No | Yes | Yes | Yes | Yes | Yes | Yes | Yes |
42-
| [Self-hosted gateway](self-hosted-gateway-overview.md)<sup>3</sup> | No | Yes | No | No | No | No | Yes | No |
43-
| [Workspaces](workspaces-overview.md) | No | No | No | No | No | No | Yes | Yes |
44-
| [TLS settings](api-management-howto-manage-protocols-ciphers.md) | Yes | Yes | Yes | Yes | Yes | Yes | Yes | Yes |
45-
| [Client certificate authentication](api-management-howto-mutual-certificates-for-clients.md) | Yes | Yes | Yes | Yes | Yes | Yes |Yes | Yes |
46-
| [Policies](api-management-howto-policies.md)<sup>4</sup> | Yes | Yes | Yes | Yes | Yes | Yes | Yes | Yes |
47-
| [Credential manager](credentials-overview.md) | Yes | Yes | Yes | Yes | Yes | Yes | Yes | Yes |
48-
| [Backup and restore](api-management-howto-disaster-recovery-backup-restore.md) | No | Yes | Yes | No | Yes | No | Yes | No |
49-
| Azure Monitor metrics | Yes | Yes | Yes | Yes | Yes | Yes | Yes | Yes |
50-
| Azure Monitor and Log Analytics request logs | No | Yes | Yes | Yes | Yes | Yes |Yes | Yes |
51-
| Application Insights request logs | Yes | Yes | Yes | Yes | Yes | Yes |Yes | Yes |
52-
| Static IP | No | Yes | Yes | No |Yes | No | Yes | No |
53-
| Export API to Power Platform | Yes | Yes | Yes | Yes | Yes | Yes | Yes | Yes |
54-
| Export API to Postman | Yes | Yes | Yes | Yes | Yes | Yes | Yes | Yes |
30+
| Microsoft Entra integration<sup>1</sup> | | ✔️ | | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ |
31+
| Virtual network injection support | | ✔️ | | | | | ✔️ | ✔️ |
32+
| Private endpoint support for inbound connections | | ✔️ | ✔️ | | ✔️ | ✔️ | ✔️ | ✔️ |
33+
| Outbound virtual network integration support | | | | | | ✔️ | | ✔️ |
34+
| Multi-region deployment | | | | | | | ✔️ | |
35+
| Availability zones | | | | | | | ✔️ | ✔️ |
36+
| Multiple custom domain names for gateway | | ✔️ | | | | | ✔️ | |
37+
| Developer portal<sup>2</sup> | | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ |
38+
| Built-in cache | | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ |
39+
| [External cache](./api-management-howto-cache-external.md) | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ |✔️ | ✔️
40+
| Autoscaling | | | ✔️ | ✔️ | ✔️ | ✔️ |✔️ | ✔️ |
41+
| API analytics | | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ |
42+
| [Self-hosted gateway](self-hosted-gateway-overview.md)<sup>3</sup> | | ✔️ | | | | | ✔️ | |
43+
| [Workspaces](workspaces-overview.md) | | | | | | | ✔️ | ✔️ |
44+
| [TLS settings](api-management-howto-manage-protocols-ciphers.md) | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ |
45+
| [Client certificate authentication](api-management-howto-mutual-certificates-for-clients.md) | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ |✔️ | ✔️ |
46+
| [Policies](api-management-howto-policies.md)<sup>4</sup> | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ |
47+
| [Credential manager](credentials-overview.md) | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ |
48+
| [Backup and restore](api-management-howto-disaster-recovery-backup-restore.md) | | ✔️ | ✔️ | | ✔️ | | ✔️ | |
49+
| Azure Monitor metrics | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ |
50+
| Azure Monitor and Log Analytics request logs | | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ |✔️ | ✔️ |
51+
| Application Insights request logs | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ |✔️ | ✔️ |
52+
| Static IP | | ✔️ | ✔️ | |✔️ | | ✔️ | |
53+
| Export API to Power Platform | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ |
54+
| Export API to Postman | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ |
5555

5656

5757

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

Lines changed: 4 additions & 3 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: 09/30/2025
11+
ms.date: 11/21/2025
1212
ms.author: danlep
1313
---
1414

@@ -112,10 +112,10 @@ The following tables compare features available in the following API Management
112112
| [Pass-through WebSocket](websocket-api.md) | ✔️ | ✔️ || ✔️ | ✔️ |
113113
| [Pass-through gRPC](grpc-api.md) |||| ✔️ ||
114114
| [OData](import-api-from-odata.md) | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ |
115-
| [Azure OpenAI in AI Foundry models and LLMs](azure-ai-foundry-api.md) | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ |
115+
| [Azure OpenAI in Microsoft Foundry models and LLMs](azure-ai-foundry-api.md) | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ |
116116
| [Pass-through MCP server](expose-existing-mcp-server.md) | ✔️ | ✔️ || ✔️ ||
117117
| [Export REST API as MCP server](export-rest-mcp-server.md) | ✔️ | ✔️ || ✔️ ||
118-
| A2A agent || ✔️ ||||
118+
| [A2A agent](agent-to-agent-api.md) || ✔️ ||||
119119
| [Circuit breaker in backend](backends.md#circuit-breaker) | ✔️ | ✔️ || ✔️ | ✔️ |
120120
| [Load-balanced backend pool](backends.md#load-balanced-pool) | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ |
121121

@@ -185,6 +185,7 @@ For estimated maximum gateway throughput in the API Management service tiers, se
185185

186186
* **v2 tiers**
187187
* Scale gateway capacity by adding and removing scale [units](upgrade-and-scale.md), or upgrade the service tier.
188+
* Optionally configure [Azure Monitor autoscale](api-management-howto-autoscale.md).
188189

189190
* **Consumption tier**
190191
* API Management instances in the Consumption tier scale automatically based on the traffic.

articles/api-management/api-management-howto-llm-logs.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ Learn more about:
3131

3232
## Prerequisites
3333
- An Azure API Management instance.
34-
- A managed LLM chat completions API integrated with Azure API Management. For example, [Import an Azure AI Foundry API](azure-ai-foundry-api.md).
34+
- A managed LLM chat completions API integrated with Azure API Management. For example, [Import a Microsoft Foundry API](azure-ai-foundry-api.md).
3535
- Access to an Azure Log Analytics workspace.
3636
- Appropriate permissions to configure diagnostic settings and access logs in API Management.
3737

@@ -106,17 +106,17 @@ ApiManagementGatewayLlmLog
106106

107107
:::image type="content" source="media/api-management-howto-llm-logs/llm-log-query-small.png" alt-text="Screenshot of query results for LLM logs in the portal." lightbox="media/api-management-howto-llm-logs/llm-log-query.png":::
108108

109-
## Upload data to Azure AI Foundry for model evaluation
109+
## Upload data to Microsoft Foundry for model evaluation
110110

111-
You can export LLM logging data as a dataset for [model evaluation](/azure/ai-foundry/concepts/observability) in Azure AI Foundry. With model evaluation, you can assess the performance of your generative AI models and applications against a test model or dataset using built-in or custom evaluation metrics.
111+
You can export LLM logging data as a dataset for [model evaluation](/azure/ai-foundry/concepts/observability) in Microsoft Foundry. With model evaluation, you can assess the performance of your generative AI models and applications against a test model or dataset using built-in or custom evaluation metrics.
112112

113113
To use LLM logs as a dataset for model evaluation:
114114

115115
1. Join LLM request and response messages into a single record for each interaction, as shown in the [previous section](#review-azure-monitor-logs-for-requests-and-responses). Include the fields you want to use for model evaluation.
116-
1. Export the dataset to CSV format, which is compatible with Azure AI Foundry.
117-
1. In the Azure AI Foundry portal, create a new evaluation to upload and evaluate the dataset.
116+
1. Export the dataset to CSV format, which is compatible with Microsoft Foundry.
117+
1. In the Microsoft Foundry portal, create a new evaluation to upload and evaluate the dataset.
118118

119-
For details to create and run a model evaluation in Azure AI Foundry, see [Evaluate generative AI models and applications by using Azure AI Foundry](/azure/ai-foundry/how-to/evaluate-generative-ai-app).
119+
For details to create and run a model evaluation in Microsoft Foundry, see [Evaluate generative AI models and applications by using Microsoft Foundry](/azure/ai-foundry/how-to/evaluate-generative-ai-app).
120120

121121
## Related content
122122

articles/api-management/api-management-policy-expressions.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ The following table lists the .NET Framework types and members allowed in policy
142142
|`System.Security.Cryptography.SHA384Managed`|All|
143143
|`System.Security.Cryptography.SHA512`|All|
144144
|`System.Security.Cryptography.SHA512Managed`|All|
145-
|`System.Security.Cryptography.SymmetricAlgorithm`|All|
145+
|`System.Security.Cryptography.SymmetricAlgorithm`|All except parameterless `Create()`|
146146
|`System.Security.Cryptography.X509Certificates.PublicKey`|All|
147147
|`System.Security.Cryptography.X509Certificates.RSACertificateExtensions`|All|
148148
|`System.Security.Cryptography.X509Certificates.X500DistinguishedName`|`Name`|

articles/api-management/automate-portal-deployments.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ You can automate the migration of content between two API Management services, f
2626
> Using the script to migrate developer portal content between an API Management instance in a classic tier (for example, Standard) and an instance in a v2 tier (for example, Standard v2) isn't currently supported. Migration of portal content between instances in the v2 tiers is also not supported.
2727
2828
> [!NOTE]
29-
> If you're using a self-hosted developer portal with an explicitly defined custom storage account to host media files (that is, you define the `blobStorageUrl` setting in the `config.design.json` configuration file), you need to use the [original `scripts.v2/migrate.js` script](https://github.com/Azure/api-management-developer-portal/blob/master/scripts.v2/migrate.js). The original script doesn't work for managed or self-hosted portals with the media storage account managed by API Management. In that case, use the script from the `/scripts.v3` folder instead.
29+
> If you're using a self-hosted developer portal with an explicitly defined custom storage account to host media files (that is, you define the `blobStorageUrl` setting in the `config.design.json` configuration file), you need to use the [original `scripts.v3/migrate.js` script](https://github.com/Azure/api-management-developer-portal/blob/master/scripts.v3/migrate.js). The original script doesn't work for managed or self-hosted portals with the media storage account managed by API Management. In that case, use the script from the `/scripts.v3` folder instead.
3030
3131
The script performs the following steps:
3232

0 commit comments

Comments
 (0)