Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into aca/jason/scale-bicep

Author: craigshoemaker

articles/active-directory-b2c/billing.md

@@ -5,7 +5,7 @@ author: kengaderdus
 manager: CelesteDG
 ms.service: azure-active-directory
 ms.topic: reference
-ms.date: 03/10/2025
+ms.date: 05/20/2025
 ms.author: kengaderdus
 ms.subservice: b2c
 ms.custom: fasttrack-edit
@@ -36,18 +36,6 @@ Also, if you choose to provide higher levels of assurance by using multifactor a
 > [!IMPORTANT]
 > This article does not contain pricing details. For the latest information about usage billing and pricing, see [Azure Active Directory B2C pricing](https://azure.microsoft.com/pricing/details/active-directory-b2c/). See also [Azure AD B2C region availability and data residency](data-residency.md) for details about where the Azure AD B2C service is available and where user data is stored.
 
-## What do I need to do?
-
-To take advantage of MAU billing, your Azure AD B2C tenant must be linked to an Azure subscription. You might also need to switch your Azure AD B2C tenant to another pricing tier if you want to use Azure AD B2C Premium P2 features, like risk-based Conditional Access policies.
-
-|If your tenant is:  |You need to:  |
-|---------|---------|
-| An Azure AD B2C tenant already billed on a per-MAU basis     | Do nothing. When users authenticate to your Azure AD B2C tenant, you'll be automatically billed using the MAU-based billing model.        |
-| An Azure AD B2C tenant not yet linked to a subscription     |  [Link your Azure AD B2C tenant to a subscription](#link-an-azure-ad-b2c-tenant-to-a-subscription) to activate MAU billing.     |
-| An Azure AD B2C tenant that was linked to a subscription before November 1, 2019    | [Switch to MAU billing (recommended)](#switch-to-mau-billing-pre-november-2019-azure-ad-b2c-tenants), or stay on the per-authentication billing model.     |
-| An Azure AD B2C tenant and you want to use premium features  (like risk-based Conditional Access policies)    | [Change to a Microsoft Entra pricing tier](#change-your-azure-ad-pricing-tier) that supports the features you want to use.        |
-|  |  |
-
 ## About the monthly active users (MAU) billing model
 
 MAU billing went into effect for Azure AD B2C tenants on **November 1, 2019**. Any Azure AD B2C tenants that you created and linked to a subscription on or after that date have been billed on a per-MAU basis. 

articles/active-directory-b2c/conditional-access-identity-protection-overview.md

@@ -4,10 +4,10 @@ description: Learn how Identity Protection gives you visibility into risky sign-
 ms.service: azure-active-directory
 ms.subservice: b2c
 ms.topic: overview
-ms.date: 01/11/2024
+ms.date: 05/20/2025
 ms.author: kengaderdus
 author: kengaderdus
-manager: CelesteDG
+manager: mwongerapk
 ms.collection: M365-identity-device-management
 
 #Customer intent: As an Azure AD B2C application owner, I want to enhance the security of my applications by using Identity Protection and Conditional Access, so that I can detect and respond to risky authentications and enforce organizational policies.

articles/active-directory-b2c/find-help-open-support-ticket.md

@@ -9,7 +9,7 @@ manager: CelesteDG
 ms.service: azure-active-directory
 
 ms.topic: troubleshooting
-ms.date: 01/11/2024
+ms.date: 05/20/2025
 ms.author: kengaderdus
 ms.subservice: b2c
 

articles/active-directory-b2c/identity-protection-investigate-risk.md

@@ -4,7 +4,7 @@ description: Learn how to investigate risky users, and detections in Azure AD B2
 ms.service: entra-id
 ms.subservice: conditional-access
 ms.topic: overview
-ms.date: 01/24/2025
+ms.date: 05/24/2025
 ms.author: godonnell
 author: garrodonnell
 manager: CelesteDG

articles/active-directory-b2c/supported-azure-ad-features.md

@@ -3,12 +3,12 @@ title: Supported Microsoft Entra ID features
 description: Learn about Microsoft Entra ID features, which are still supported in Azure AD B2C.
 
 author: kengaderdus
-manager: CelesteDG
+manager: mwongerapk
 
 ms.service: azure-active-directory
 
 ms.topic: overview
-ms.date: 01/11/2024
+ms.date: 05/20/2025
 ms.author: kengaderdus
 ms.subservice: b2c
 
@@ -36,4 +36,4 @@ An Azure Active Directory B2C (Azure AD B2C) tenant is different than a Microsof
 | [Go-Local add-on](data-residency.md#go-local-add-on) | Microsoft Entra Go-Local add-on enables you to store data in the country/region you choose when your Microsoft Entra tenant.| Just like Microsoft Entra ID, Azure AD B2C supports [Go-Local add-on](data-residency.md#go-local-add-on). |
 
 > [!NOTE]
-> **Other Azure resources in your tenant:** <br>In an Azure AD B2C tenant, you can't provision other Azure resources such as virtual machines, Azure web apps, or Azure functions. You must create these resources in your Microsoft Entra tenant.
+> **Other Azure resources in your tenant:** <br>In an Azure AD B2C tenant, you can't provision other Azure resources such as virtual machines, Azure web apps, or Azure functions. You must create these resources in your Microsoft Entra tenant.

articles/api-center/includes/api-center-service-limits.md

@@ -7,7 +7,7 @@ author: dlepow
 
 ms.service: azure-api-center
 ms.topic: include
-ms.date: 03/ 18/2025
+ms.date: 05/19/2025
 ms.author: danlep
 ms.custom: Include file
 ---
@@ -29,7 +29,7 @@ ms.custom: Include file
 | Maximum number of APIs synchronized from a linked API source | 200 | 2,000<sup>4</sup>  |
 | Semantic search in API Center portal | No | Yes |
 
-<sup>1</sup> Free plan provided for 90 days, then service is soft-deleted. Use of full service features including API analysis is limited.<br/>
+<sup>1</sup> Use of full service features including API analysis is limited.<br/>
 <sup>2</sup> To increase a limit in the Standard plan, contact [support](https://azure.microsoft.com/support/options/).<br/>
 <sup>3</sup> Custom metadata properties assigned to APIs, deployments, and environments.<br/>
 <sup>4</sup> Process can take a few minutes to up to 24 hours to complete.<br/> 

articles/api-management/TOC.yml

@@ -208,8 +208,12 @@
       items:
       - name: AI gateway capabilities in API Management
         href: genai-gateway-capabilities.md
+      - name: Import Azure AI Foundry API
+        href: azure-ai-foundry-api.md
       - name: Import Azure OpenAI API
         href: azure-openai-api-from-specification.md
+      - name: Import OpenAI-compatible LLM API
+        href: openai-compatible-llm-api.md
       - name: Authenticate and authorize to Azure OpenAI
         href: api-management-authenticate-authorize-azure-openai.md
       - name: Expose REST API as MCP server
@@ -624,10 +628,6 @@
   - name: Azure Policy built-ins
     displayName: samples, policies, definitions
     href: ./policy-reference.md
-  - name: Gateway log schema
-    href: gateway-log-schema-reference.md
-  - name: Developer portal audit log schema
-    href: developer-portal-audit-log-schema-reference.md
   - name: Event Grid events schema
     href: ../event-grid/event-schema-api-management.md?toc=/azure/api-management/toc.json&bc=/azure/api-management/breadcrumb/toc.json
   - name: Virtual network configuration
@@ -636,8 +636,6 @@
     href: self-hosted-gateway-settings-reference.md
   - name: Self-hosted gateway Azure Arc configuration
     href: self-hosted-gateway-arc-reference.md
-  - name: Diagnostic logs settings
-    href: diagnostic-logs-reference.md
 - name: Resources
   items:
   - name: FAQ

articles/api-management/azure-ai-foundry-api.md

@@ -0,0 +1,101 @@
+---
+title: Import an Azure AI Foundry API - Azure API Management
+description: How to import an API from Azure AI Foundry as a REST API in Azure API Management.
+ms.service: azure-api-management
+author: dlepow
+ms.author: danlep
+ms.topic: how-to
+ms.date: 05/16/2025
+ms.collection: ce-skilling-ai-copilot
+ms.custom: template-how-to, build-2024
+---
+
+# Import an Azure AI Foundry API 
+
+[!INCLUDE [api-management-availability-all-tiers](../../includes/api-management-availability-all-tiers.md)]
+
+You can import AI model endpoints deployed in Azure AI Foundry to your API Management instance as APIs. Use AI gateway policies and other capabilities in API Management to simplify integration, improve observability, and enhance control over the model endpoints.
+
+Learn more about managing AI APIs in API Management:
+
+* [AI gateway capabilities in Azure API Management](genai-gateway-capabilities.md)
+
+
+## Client compatibility options
+
+API Management supports two client compatibility options for AI APIs. Choose the option suitable for your model deployment. The option determines how clients call the API and how the API Management instance routes requests to the AI service.
+
+* **Azure AI** - Manage model endpoints in Azure AI Foundry that are exposed through the [Azure AI Model Inference API](/azure/ai-studio/reference/reference-model-inference-api).
+
+    Clients call the deployment at a `/models` endpoint such as `/my-model/models/chat/completions`. Deployment name is passed in the request body. Use this option if you want flexibility to switch between models exposed through the Azure AI Model Inference API and those deployed in Azure OpenAI Service.
+
+* **Azure OpenAI Service** - Manage model endpoints deployed in Azure OpenAI Service. 
+
+    Clients call the deployment at an `/openai` endpoint such as `/openai/deployments/my-deployment/chat/completions`. Deployment name is passed in the request path. Use this option if your AI service only includes Azure OpenAI Service model deployments. 
+
+## Prerequisites
+
+- An existing API Management instance. [Create one if you haven't already](get-started-create-service-instance.md).
+- An Azure AI service in your subscription with one or more models deployed. Examples include models deployed in Azure AI Foundry or Azure OpenAI Service.
+
+## Import AI Foundry API using the portal
+
+Use the following steps to import an AI API to API Management. 
+
+When you import the API, API Management automatically configures:
+
+* Operations for each of the API's REST API endpoints
+* A system-assigned identity with the necessary permissions to access the AI service deployment.
+* A [backend](backends.md) resource and a [set-backend-service](set-backend-service-policy.md) policy that direct API requests to the AI service endpoint.
+* Authentication to the backend using the instance's system-assigned managed identity.
+* (optionally) Policies to help you monitor and manage the API.
+
+To import an AI Foundry API to API Management:
+
+1. In the [Azure portal](https://portal.azure.com), navigate to your API Management instance.
+1. In the left menu, under **APIs**, select **APIs** > **+ Add API**.
+1. Under **Create from Azure resource**, select **Azure AI Foundry**.
+
+    :::image type="content" source="media/azure-ai-foundry-api/ai-foundry-api.png" alt-text="Screenshot of creating an OpenAI-compatible API in the portal." :::
+1. On the **Select AI service** tab:
+    1. Select the **Subscription** in which to search for AI services. To get information about the model deployments in a service, select the **deployments** link next to the service name.
+       :::image type="content" source="media/azure-ai-foundry-api/deployments.png" alt-text="Screenshot of deployments for an AI service in the portal.":::
+    1. Select an AI service. 
+    1. Select **Next**.
+1. On the **Configure API** tab:
+    1. Enter a **Display name** and optional **Description** for the API.
+    1. In **Base path**, enter a path that your API Management instance uses to access the deployment endpoint.
+    1. Optionally select one or more **Products** to associate with the API.  
+    1. In **Client compatibility**, select either of the following based on the types of client you intend to support. See [Client compatibility options](#client-compatibility-options) for more information.
+        * **Azure OpenAI** - Select this option if your clients only need to access Azure OpenAI Service model deployments.
+        * **Azure AI** - Select this option if your clients need to access other models in Azure AI Foundry. 
+    1. Select **Next**.
+
+        :::image type="content" source="media/azure-ai-foundry-api/client-compatibility.png" alt-text="Screenshot of AI Foundry API configuration in the portal.":::
+
+1. On the **Manage token consumption** tab, optionally enter settings or accept defaults that define the following policies to help monitor and manage the API:
+    * [Manage token consumption](llm-token-limit-policy.md)
+    * [Track token usage](llm-emit-token-metric-policy.md) 
+1. On the **Apply semantic caching** tab, optionally enter settings or accept defaults that define the policies to help optimize performance and reduce latency for the API:
+    * [Enable semantic caching of responses](azure-openai-enable-semantic-caching.md)
+1. On the **AI content safety**, optionally enter settings or accept defaults to configure the Azure AI Content Safety service to block prompts with unsafe content:
+    * [Enforce content safety checks on LLM requests](llm-content-safety-policy.md)
+1. Select **Review**.
+1. After settings are validated, select **Create**. 
+
+## Test the AI API
+
+To ensure that your AI API is working as expected, test it in the API Management test console. 
+1. Select the API you created in the previous step.
+1. Select the **Test** tab.
+1. Select an operation that's compatible with the model deployment.
+    The page displays fields for parameters and headers.
+1. Enter parameters and headers as needed. Depending on the operation, you might need to configure or update a **Request body**.
+    > [!NOTE]
+    > In the test console, API Management automatically populates an **Ocp-Apim-Subscription-Key** header, and configures the subscription key of the built-in [all-access subscription](api-management-subscriptions.md#all-access-subscription). This key enables access to every API in the API Management instance. Optionally display the **Ocp-Apim-Subscription-Key** header by selecting the "eye" icon next to the **HTTP Request**.
+1. Select **Send**.
+
+    When the test is successful, the backend responds with a successful HTTP response code and some data. Appended to the response is token usage data to help you monitor and manage your language model token consumption.
+
+
+[!INCLUDE [api-management-define-api-topics.md](../../includes/api-management-define-api-topics.md)]

articles/api-management/azure-openai-api-from-specification.md

@@ -5,7 +5,7 @@ ms.service: azure-api-management
 author: dlepow
 ms.author: danlep
 ms.topic: how-to
-ms.date: 04/30/2025
+ms.date: 05/16/2025
 ms.collection: ce-skilling-ai-copilot
 ms.custom: template-how-to, build-2024
 ---
@@ -14,19 +14,22 @@ ms.custom: template-how-to, build-2024
 
 [!INCLUDE [api-management-availability-all-tiers](../../includes/api-management-availability-all-tiers.md)]
 
-This article shows two options to import an [Azure OpenAI Service](/azure/ai-services/openai/overview) API into an Azure API Management instance as a REST API:
+You can import AI model endpoints deployed in [Azure OpenAI Service](/azure/ai-services/openai/overview) to your API Management instance as a REST API. Use AI gateway policies and other capabilities in API Management to simplify integration, improve observability, and enhance control over the model endpoints.
+
+
+This article shows two options to import an Azure OpenAI API into an Azure API Management instance as a REST API:
 
 - [Import an Azure OpenAI API directly from Azure OpenAI Service](#option-1-import-api-from-azure-openai-service) (recommended)
 - [Download and add the OpenAPI specification](#option-2-add-an-openapi-specification-to-api-management) for Azure OpenAI and add it to API Management as an OpenAPI API.
 
 Learn more about managing AI APIs in API Management:
 
-* [Generative AI gateway capabilities in Azure API Management](genai-gateway-capabilities.md)
+* [AI gateway capabilities in Azure API Management](genai-gateway-capabilities.md)
 
 ## Prerequisites
 
 - An existing API Management instance. [Create one if you haven't already](get-started-create-service-instance.md).
-- An Azure OpenAI resource with a model deployed. For more information about model deployment, see the [resource deployment guide](/azure/ai-services/openai/how-to/create-resource).
+- An Azure OpenAI resource with a model deployed. For more information about model deployment in Azure OpenAI service, see the [resource deployment guide](/azure/ai-services/openai/how-to/create-resource).
 
     Make a note of the ID (name) of the deployment. You'll need it when you test the imported API in API Management.
 
@@ -71,6 +74,7 @@ To import an Azure OpenAI API to API Management:
     * [Manage token consumption](azure-openai-token-limit-policy.md)
     * [Track token usage](azure-openai-emit-token-metric-policy.md) 
     * [Enable semantic caching of responses](azure-openai-enable-semantic-caching.md)
+    * [Configure AI Content Safety](llm-content-safety-policy.md) for the API.
 
     Select **Review + Create**.
 1. After settings are validated, select **Create**. 
@@ -133,7 +137,7 @@ To ensure that your Azure OpenAI API is working as expected, test it in the API
     * `deployment-id` - the ID of a deployment in the Azure OpenAI service 
     * `api-version` - a valid Azure OpenAI API version, such as the API version you selected when you imported the API.
       :::image type="content" source="media/azure-openai-api-from-specification/test-azure-openai-api.png" alt-text="Screenshot of testing an Azure OpenAI Service API in the portal." lightbox="media/azure-openai-api-from-specification/test-azure-openai-api.png" :::
-1. Enter other parameters and headers as needed. Depending on the operation, you may need to configure or update a **Request body**.
+1. Enter other parameters and headers as needed. Depending on the operation, you might need to configure or update a **Request body**.
     > [!NOTE]
     > In the test console, API Management automatically populates an **Ocp-Apim-Subscription-Key** header, and configures the subscription key of the built-in [all-access subscription](api-management-subscriptions.md#all-access-subscription). This key enables access to every API in the API Management instance. Optionally display the **Ocp-Apim-Subscription-Key** header by selecting the "eye" icon next to the **HTTP Request**.
 1. Select **Send**.
@@ -142,11 +146,4 @@ To ensure that your Azure OpenAI API is working as expected, test it in the API
 
     :::image type="content" source="media/azure-openai-api-from-specification/api-response-usage.png" alt-text="Screenshot of token usage data in API response in the portal." :::
 
-## Caching policies for Azure OpenAI APIs
-
-In addition to the `azure-openai-token-limit` and `azure-openai-emit-token-metric` policies that you can configure when importing an Azure OpenAI Service API, API Management provides the following caching policies to help you optimize performance and reduce latency for Azure OpenAI APIs: 
-
-* `azure-openai-semantic-cache-store`
-* `azure-openai-semantic-cache-lookup` 
-
 [!INCLUDE [api-management-define-api-topics.md](../../includes/api-management-define-api-topics.md)]

articles/api-management/azure-openai-enable-semantic-caching.md

@@ -27,7 +27,7 @@ Enable semantic caching of responses to Azure OpenAI API requests to reduce band
     * Chat Completion API - Deployment used for API consumer calls 
     * Embeddings API - Deployment used for semantic caching
 * The API Management instance must be configured to use managed identity authentication to the Azure OpenAI APIs. For more information, see [Authenticate and authorize access to Azure OpenAI APIs using Azure API Management ](api-management-authenticate-authorize-azure-openai.md#authenticate-with-managed-identity).
-* An [Azure Cache for Redis Enterprise](../azure-cache-for-redis/quickstart-create-redis-enterprise.md) or [Azure Managed Redis](../redis/quickstart-create-managed-redis.md) instance. The **RediSearch** module must be enabled on the Redis cache.
+* An [Azure Managed Redis](../redis/quickstart-create-managed-redis.md) instance. The **RediSearch** module must be enabled on the Redis cache.
     > [!NOTE]
     > You can only enable the **RediSearch** module when creating a new Azure Redis Enterprise or Azure Managed Redis cache. You can't add a module to an existing cache. [Learn more](../redis/redis-modules.md)
 * External cache configured in the Azure API Management instance. For steps, see [Use an external Redis-compatible cache in Azure API Management](api-management-howto-cache-external.md).