Merge pull request #287586 from MicrosoftDocs/main

Publish to live, Monday 4 AM PST, 9/30

Author: ttorble

articles/api-management/api-management-howto-app-insights.md

@@ -375,15 +375,8 @@ To emit custom metrics, perform the following configuration steps.
 
 ### Limits for custom metrics
 
-Azure Monitor imposes [usage limits](/azure/azure-monitor/essentials/metrics-custom-overview#quotas-and-limits) for custom metrics that may affect your ability to emit metrics from API Management. For example, Azure Monitor currently sets a limit of 10 dimension keys per metric, and a limit of 50,000 total active time series per region in a subscription (within a 12 hour period). 
-
-These limits have the following implications for configuring custom metrics in API Management:
-
-* You can configure a maximum of 10 custom dimensions per `emit-metric` policy.
-
-* The number of active time series generated by the `emit-metric` policy within a 12 hour period is the product of the number of unique values of each configured dimension during the period. For example, if three custom dimensions were configured in the policy, and each dimension had 10 possible values within the period, the `emit-metric` policy would contribute 1,000 (10 x 10 x 10) active time series.
-
-* If you configure the `emit-metric` policy in multiple API Management instances that are in the same region in a subscription, all instances can contribute to the regional active time series limit.   
+[!INCLUDE [api-management-custom-metrics-limits](../../includes/api-management-custom-metrics-limits.md)]
+   
 
 ## Performance implications and log sampling
 

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

@@ -17,17 +17,21 @@ ms.custom:
 
 [!INCLUDE [api-management-availability-all-tiers](../../includes/api-management-availability-all-tiers.md)]
 
-The `azure-openai-emit-token-metric` policy sends metrics to Application Insights about consumption of large language model tokens through Azure OpenAI Service APIs. Token count metrics include: Total Tokens, Prompt Tokens, and Completion Tokens. 
+The `azure-openai-emit-token-metric` policy sends custom metrics to Application Insights about consumption of large language model tokens through Azure OpenAI Service APIs. Token count metrics include: Total Tokens, Prompt Tokens, and Completion Tokens. 
 
 [!INCLUDE [api-management-policy-generic-alert](../../includes/api-management-policy-generic-alert.md)]
 
 [!INCLUDE [api-management-azure-openai-models](../../includes/api-management-azure-openai-models.md)]
 
+## Limits for custom metrics
+
+[!INCLUDE [api-management-custom-metrics-limits](../../includes/api-management-custom-metrics-limits.md)]
+
 
 ## Prerequisites
 
 * One or more Azure OpenAI Service APIs must be added to your API Management instance. For more information, see [Add an Azure OpenAI Service API to Azure API Management](./azure-openai-api-from-specification.md).
-* Your API Management instance must be integrated with Application insights. For more information, see [How to integrate Azure API Management with Azure Application Insights](./api-management-howto-app-insights.md#create-a-connection-using-the-azure-portal).
+* Your API Management instance must be integrated with Application insights. For more information, see [How to integrate Azure API Management with Azure Application Insights](./api-management-howto-app-insights.md).
 * Enable Application Insights logging for your Azure OpenAI APIs. 
 * Enable custom metrics with dimensions in Application Insights. For more information, see [Emit custom metrics](api-management-howto-app-insights.md#emit-custom-metrics).
 
@@ -46,7 +50,6 @@ The `azure-openai-emit-token-metric` policy sends metrics to Application Insight
 | Attribute | Description                | Required                | Default value  |
 | --------- | -------------------------- |  ------------------ | -------------- |
 | namespace | A string. Namespace of metric. Policy expressions aren't allowed. | No        | API Management |
-| value     |  Value of metric expressed as a double. Policy expressions are allowed.   | No           | 1              |
 
 
 ## Elements
@@ -88,15 +91,13 @@ The `azure-openai-emit-token-metric` policy sends metrics to Application Insight
 
 ## Example
 
-The following example sends Azure OpenAI token count metrics to Application Insights along with User ID, Client IP, and API ID as dimensions.
+The following example sends Azure OpenAI token count metrics to Application Insights along with API ID as a custom dimension.
 
 ```xml
 <policies>
   <inbound>
       <azure-openai-emit-token-metric
             namespace="AzureOpenAI">   
-            <dimension name="User ID" />
-            <dimension name="Client IP" value="@(context.Request.IpAddress)" />
             <dimension name="API ID" />
         </azure-openai-emit-token-metric> 
   </inbound>

articles/api-management/emit-metric-policy.md

@@ -6,7 +6,7 @@ author: dlepow
 
 ms.service: azure-api-management
 ms.topic: article
-ms.date: 07/23/2024
+ms.date: 09/25/2024
 ms.author: danlep
 ms.custom: engagement-fy23
 ---
@@ -17,12 +17,18 @@ ms.custom: engagement-fy23
 
 The `emit-metric` policy sends custom metrics in the specified format to Application Insights.
 
-> [!NOTE]
-> * Custom metrics are a [preview feature](/azure/azure-monitor/essentials/metrics-custom-overview) of Azure Monitor and subject to [limitations](/azure/azure-monitor/essentials/metrics-custom-overview#design-limitations-and-considerations).
-> * For more information about the API Management data added to Application Insights, see [How to integrate Azure API Management with Azure Application Insights](./api-management-howto-app-insights.md#what-data-is-added-to-application-insights).
-
 [!INCLUDE [api-management-policy-generic-alert](../../includes/api-management-policy-generic-alert.md)]
 
+## Limits for custom metrics
+
+[!INCLUDE [api-management-custom-metrics-limits](../../includes/api-management-custom-metrics-limits.md)]
+
+## Prerequisites
+
+* Your API Management instance must be integrated with Application insights. For more information, see [How to integrate Azure API Management with Azure Application Insights](./api-management-howto-app-insights.md).
+* Enable Application Insights logging for your APIs. 
+* Enable custom metrics with dimensions in Application Insights. For more information, see [Emit custom metrics](api-management-howto-app-insights.md#emit-custom-metrics).
+
 ## Policy statement
 
 ```xml
@@ -73,18 +79,14 @@ The `emit-metric` policy sends custom metrics in the specified format to Applica
 
 * You can configure at most 10 custom dimensions for this policy.
 
-* Invoking the `emit-metric` policy counts toward the usage limits for custom metrics per region in a subscription. [Learn more](api-management-howto-app-insights.md#limits-for-custom-metrics)
-
 ## Example
 
-The following example sends a custom metric to count the number of API requests along with user ID, client IP, and API ID as custom dimensions.
+The following example sends a custom metric to count the number of API requests along with API ID as a custom dimension.
 
 ```xml
 <policies>
   <inbound>
     <emit-metric name="Request" value="1" namespace="my-metrics"> 
-        <dimension name="User ID" /> 
-        <dimension name="Client IP" value="@(context.Request.IpAddress)" /> 
         <dimension name="API ID" /> 
     </emit-metric> 
   </inbound>

articles/api-management/llm-emit-token-metric-policy.md

@@ -16,7 +16,7 @@ ms.custom:
 
 [!INCLUDE [api-management-availability-all-tiers](../../includes/api-management-availability-all-tiers.md)]
 
-The `llm-emit-token-metric` policy sends metrics to Application Insights about consumption of large language model (LLM) tokens through LLM APIs. Token count metrics include: Total Tokens, Prompt Tokens, and Completion Tokens. 
+The `llm-emit-token-metric` policy sends custom metrics to Application Insights about consumption of large language model (LLM) tokens through LLM APIs. Token count metrics include: Total Tokens, Prompt Tokens, and Completion Tokens. 
 
 > [!NOTE]
 > Currently, this policy is in preview.
@@ -26,6 +26,10 @@ The `llm-emit-token-metric` policy sends metrics to Application Insights about c
 [!INCLUDE [api-management-llm-models](../../includes/api-management-llm-models.md)]
 
 
+## Limits for custom metrics
+
+[!INCLUDE [api-management-custom-metrics-limits](../../includes/api-management-custom-metrics-limits.md)]
+
 ## Prerequisites
 
 * One or more LLM APIs must be added to your API Management instance. 
@@ -48,7 +52,6 @@ The `llm-emit-token-metric` policy sends metrics to Application Insights about c
 | Attribute | Description                | Required                | Default value  |
 | --------- | -------------------------- |  ------------------ | -------------- |
 | namespace | A string. Namespace of metric. Policy expressions aren't allowed. | No        | API Management |
-| value     |  Value of metric expressed as a double. Policy expressions are allowed.   | No           | 1              |
 
 
 ## Elements
@@ -89,15 +92,13 @@ The `llm-emit-token-metric` policy sends metrics to Application Insights about c
 
 ## Example
 
-The following example sends LLM token count metrics to Application Insights along with User ID, Client IP, and API ID as dimensions.
+The following example sends LLM token count metrics to Application Insights along with API ID as a custom dimension.
 
 ```xml
 <policies>
   <inbound>
       <llm-emit-token-metric
             namespace="MyLLM">   
-            <dimension name="User ID" />
-            <dimension name="Client IP" value="@(context.Request.IpAddress)" />
             <dimension name="API ID" />
         </llm-emit-token-metric> 
   </inbound>

articles/azure-government/compare-azure-government-global-azure.md

@@ -126,7 +126,7 @@ Table below lists API endpoints in Azure vs. Azure Government for accessing and
 ||API Management Portal|portal.azure-api.net|portal.azure-api.us||
 ||App Configuration|azconfig.io|azconfig.azure.us||
 ||App Service|azurewebsites.net|azurewebsites.us||
-||Azure AI Search|search.windows.net|search.windows.us||
+||Azure AI Search|search.windows.net|search.azure.us||
 ||Azure Functions|azurewebsites.net|azurewebsites.us||
 
 ## Service availability