Merge branch 'MicrosoftDocs:main' into main

Author: MutemwaRMasheke

.openpublishing.redirection.json

@@ -1,5 +1,30 @@
 {
   "redirections": [
+    {
+      "source_path": "articles/storage/blobs/storage-blob-scalable-app-create-vm.md",
+      "redirect_url": "/previous-versions/azure/storage/blobs/storage-blob-scalable-app-create-vm",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/storage/blobs/storage-blob-scalable-app-download-files.md",
+      "redirect_url": "/previous-versions/azure/storage/blobs/storage-blob-scalable-app-download-files",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/storage/blobs/storage-blob-scalable-app-upload-files.md",
+      "redirect_url": "/previous-versions/azure/storage/blobs/storage-blob-scalable-app-upload-files",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/storage/blobs/storage-blob-scalable-app-verify-metrics.md",
+      "redirect_url": "/previous-versions/azure/storage/blobs/storage-blob-scalable-app-verify-metrics",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/api-management/self-hosted-gateway-migration-guide.md",
+      "redirect_url": "/previous-versions/azure/api-management/self-hosted-gateway-migration-guide",
+      "redirect_document_id": false
+    },
     {
       "source_path": "articles/governance/machine-configuration/whats-new/migrating-from-dsc-extension.md ",
       "redirect_url": " https://azure.microsoft.com/updates/migrate-from-linux-dsc-extension-to-the-guest-configuration-feature-of-azure-policy-by-may-1-2025/",
@@ -475,11 +500,62 @@
       "redirect_url": "/azure/azure-health-insights/overview",
       "redirect_document_id": false
     },
+    
     {
       "source_path_from_root": "/articles/azure-health-insights/response-info.md",
       "redirect_url": "/azure/azure-health-insights/overview",
       "redirect_document_id": false
     },
+    {
+      "source_path_from_root": "/articles/azure-maps/tutorial-iot-hub-maps.md",
+      "redirect_url": "/azure/azure-maps",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/azure-health-insights/oncophenotype/faq.md",
+      "redirect_url": "/azure/azure-health-insights/overview",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/azure-health-insights/oncophenotype/get-started.md",
+      "redirect_url": "/azure/azure-health-insights/overview",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/azure-health-insights/oncophenotype/inferences.md",
+      "redirect_url": "/azure/azure-health-insights/overview",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/azure-health-insights/oncophenotype/model-configuration.md",
+      "redirect_url": "/azure/azure-health-insights/overview",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/azure-health-insights/oncophenotype/overview.md",
+      "redirect_url": "/azure/azure-health-insights/overview",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/azure-health-insights/oncophenotype/patient-info.md",
+      "redirect_url": "/azure/azure-health-insights/overview",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/azure-health-insights/oncophenotype/support-and-help.md",
+      "redirect_url": "/azure/azure-health-insights/overview",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/azure-health-insights/oncophenotype/transparency-note.md",
+      "redirect_url": "/azure/azure-health-insights/overview",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/azure-health-insights/oncophenotype/index.yml",
+      "redirect_url": "/azure/azure-health-insights/overview",
+      "redirect_document_id": false
+    },
     {
       "source_path_from_root": "/articles/azure-maps/about-creator.md",
       "redirect_url": "/azure/azure-maps/creator-indoor-maps",
@@ -4635,6 +4711,11 @@
       "redirect_url": "/azure/modeling-simulation-workbench/concept-storage",
       "redirect_document_id": false
     },
+    {
+      "source_path_from_root": "/articles/modeling-simulation-workbench/quickstart-create-portal.md",
+      "redirect_url": "/azure/modeling-simulation-workbench/get-started-modeling-simulation-workbench",
+      "redirect_document_id": false
+    },
     {
       "source_path_from_root": "/articles/load-balancer/upgrade-basic-standard.md",
       "redirect_url": "/azure/load-balancer/upgrade-basic-standard-with-powershell",

CODEOWNERS

@@ -2,19 +2,19 @@
 # Each line is a file pattern followed by one or more owners.
 
 # Folder paths in this list have been migrated to new repositories and content can no longer be created for these services in this repo.
-/articles/aks @tynevi @thomps23
-/articles/defender-for-cloud  @tynevi @thomps23
-/articles/attestation  @tynevi @thomps23
-/articles/confidential-ledger  @tynevi @thomps23
-/articles/dedicated-hsm  @tynevi @thomps23
-/articles/key-vault  @tynevi @thomps23
-/articles/payment-hsm  @tynevi @thomps23
-/articles/postgresql @tynevi @thomps23
-/articles/cosmos-db @tynevi @thomps23
-/articles/dms @tynevi @thomps23
-/articles/mariadb @tynevi @thomps23
-/articles/mysql @tynevi @thomps23
-/articles/managed-instance-apache-cassandra @tynevi @thomps23
+/articles/aks @tynevi @thomps23 @jasonwhowell
+/articles/defender-for-cloud  @tynevi @thomps23 @jasonwhowell
+/articles/attestation  @tynevi @thomps23 @jasonwhowell
+/articles/confidential-ledger  @tynevi @thomps23 @jasonwhowell
+/articles/dedicated-hsm  @tynevi @thomps23 @jasonwhowell
+/articles/key-vault  @tynevi @thomps23 @jasonwhowell
+/articles/payment-hsm  @tynevi @thomps23 @jasonwhowell
+/articles/postgresql @tynevi @thomps23 @jasonwhowell
+/articles/cosmos-db @tynevi @thomps23 @jasonwhowell
+/articles/dms @tynevi @thomps23 @jasonwhowell
+/articles/mariadb @tynevi @thomps23 @jasonwhowell
+/articles/mysql @tynevi @thomps23 @jasonwhowell
+/articles/managed-instance-apache-cassandra @tynevi @thomps23 @jasonwhowell
 /articles/virtual-machines @jasonwhowell @thomps23
 /articles/virtual-machines-scale-sets @jasonwhowell @thomps23
 /articles/container-instances @jasonwhowell @thomps23
@@ -36,4 +36,4 @@
 /articles/lighthouse @jasonwhowell @thomps23
 /articles/quotas @jasonwhowell @thomps23
 /articles/container-registry @jasonwhowell @thomps23
-/articles/kubernetes-fleet @jasonwhowell @thomps23
+/articles/kubernetes-fleet @MicrosoftDocs/azure-docs-codeowners

articles/active-directory-b2c/custom-policy-developer-notes.md

@@ -30,18 +30,19 @@ Azure Active Directory B2C [user flows and custom policies](user-flow-overview.m
 
 - Support requests for public preview features can be submitted through regular support channels.
 
-## User flows
-|Feature  |User flow  |Custom policy  |Notes  |
-|---------|:---------:|:---------:|---------|
-| [Sign-up and sign-in](add-sign-up-and-sign-in-policy.md) with email and password. | GA | GA| |
-| [Sign-up and sign-in](add-sign-up-and-sign-in-policy.md) with username and password.| GA | GA | |
-| [Profile editing flow](add-profile-editing-policy.md) | GA | GA | |
-| [Self-Service password reset](add-password-reset-policy.md) | GA| GA| Available in China cloud, but only for custom policies. |
-| [Force password reset](force-password-reset.md) | GA | GA | Available in China cloud, but only for custom policies. |
-| [Phone sign-up and sign-in](phone-authentication-user-flows.md) | GA | GA | Available in China cloud, but only for custom policies. |
-| [Smart lockout](threat-management.md) | GA | GA | |
-| [Conditional Access and Identity Protection](conditional-access-user-flow.md) | GA | GA | Not available for SAML applications. Limited CA features are available in China cloud. Identity Protection is not available in China cloud. |
-| [CAPTCHA](add-captcha.md) | Preview | Preview | You can enable it during sign-up or sign-in for Local accounts. |
+## Feature availability
+| Feature | User flow | Custom policy | User flow in China | Custom policy in China | Notes |
+|---|:---:|:---:|---|---|---|
+| [Sign-up and sign-in](add-sign-up-and-sign-in-policy.md) with email and password. | GA | GA | GA | GA |  |
+| [Sign-up and sign-in](add-sign-up-and-sign-in-policy.md) with username and password. | GA | GA | GA | GA |  |
+| [Profile editing flow](add-profile-editing-policy.md) | GA | GA | GA | GA |  |
+| [Self-Service password reset](add-password-reset-policy.md) | GA | GA | GA | GA |  |
+| [Force password reset](force-password-reset.md) | GA | GA | NA | GA |  |
+| [Phone sign-up and sign-in](phone-authentication-user-flows.md) | GA | GA | NA | GA |  |
+| [Smart lockout](threat-management.md) | GA | GA | NA | NA |  |
+| [Conditional Access](conditional-access-user-flow.md) | GA | GA | NA | Limited availability | Not available for SAML applications.  |
+| [Identity Protection](conditional-access-identity-protection-overview.md) | GA | GA | NA | NA |  |
+| [CAPTCHA](add-captcha.md) | Preview | Preview | NA | NA | You can enable it during sign-up or sign-in for Local accounts. |
 
 ## OAuth 2.0 application authorization flows
 

articles/api-management/TOC.yml

@@ -1,7 +1,6 @@
 - name: Azure API Management Documentation
   href: index.yml
 - name: Get started
-  expanded: true
   items:
   - name: What's new?
     href: https://github.com/Azure/API-Management/blob/main/changelogs/api-management-service.md
@@ -13,7 +12,7 @@
     - name: API Management features availability
       href: api-management-features.md
     - name: API Management gateways
-      href: api-management-gateways-overview.md  
+      href: api-management-gateways-overview.md
     - name: v2 service tiers
       href: v2-service-tiers-overview.md
     - name: Terminology
@@ -64,6 +63,7 @@
       href: api-management-howto-developer-portal-customize.md
     - name: 10 - Manage APIs in Visual Studio Code
       href: visual-studio-code-tutorial.md
+  expanded: true
 - name: Deployment and operations
   items:
   - name: Provision and scale
@@ -111,7 +111,7 @@
     - name: VNet injection (service) - requirements
       href: virtual-network-injection-resources.md
     - name: VNet integration (workspace gateway) - requirements
-      href: virtual-network-workspaces-resources.md  
+      href: virtual-network-workspaces-resources.md
     - name: Deploy to a VNet - external
       href: api-management-using-with-vnet.md
     - name: Deploy to a VNet - internal
@@ -290,7 +290,7 @@
   - name: Self-hosted gateway overview
     href: self-hosted-gateway-overview.md
   - name: Deploy the gateway
-    items: 
+    items:
     - name: Provision a self-hosted gateway
       href: api-management-howto-provision-self-hosted-gateway.md
     - name: Deploy a self-hosted gateway to Azure Kubernetes Service
@@ -304,7 +304,7 @@
     - name: Deploy a self-hosted gateway to Docker
       href: how-to-deploy-self-hosted-gateway-docker.md
     - name: Deploy a self-hosted gateway to Azure Container Apps
-      href: how-to-deploy-self-hosted-gateway-container-apps.md  
+      href: how-to-deploy-self-hosted-gateway-container-apps.md
     - name: Deploy an Azure API Management gateway to Arc-enabled Kubernetes cluster
       href: how-to-deploy-self-hosted-gateway-azure-arc.md
   - name: Configure custom domain for self-hosted gateway
@@ -319,8 +319,6 @@
     href: self-hosted-gateway-enable-azure-ad.md
   - name: Guidance for running on Kubernetes
     href: how-to-self-hosted-gateway-on-kubernetes-in-production.md
-  - name: Migrate to self-hosted gateway v2
-    href: self-hosted-gateway-migration-guide.md
   - name: Support policy for self-hosted gateway
     href: self-hosted-gateway-support-policies.md
 - name: Secure your APIs
@@ -390,13 +388,13 @@
     - name: Extend portal with custom functionality
       href: developer-portal-extend-custom-functionality.md
     - name: Enable CORS for interactive console
-      href: enable-cors-developer-portal.md    
+      href: enable-cors-developer-portal.md
     - name: Enable console OAuth support
       href: api-management-howto-oauth2.md
     - name: Integrate Application Insights
       href: developer-portal-integrate-application-insights.md
     - name: Log developer portal usage
-      href: developer-portal-enable-usage-logs.md  
+      href: developer-portal-enable-usage-logs.md
     - name: Integrate Google Tag Manager
       href: developer-portal-integrate-google-tag-manager.md
     - name: Customize developer portal on WordPress
@@ -425,20 +423,19 @@
       href: api-management-howto-configure-notifications.md
   - name: Export APIs
     items:
-
     - name: Inventory APIs in API Center
       href: ../api-center/import-api-management-apis.md?toc=%2Fazure%2Fapi-management%2Ftoc.json&bc=/azure/api-management/breadcrumb/toc.json
     - name: Export APIs to Postman for API development
       displayName: collection
       href: export-api-postman.md
     - name: Export APIs to the Power Platform
       items:
-        - name: Export API as custom connector
-          displayName: Power Platform
-          href: export-api-power-platform.md
-        - name: Enable CORS for custom connector
-          displayName: Power Platform
-          href: enable-cors-power-platform.md
+      - name: Export API as custom connector
+        displayName: Power Platform
+        href: export-api-power-platform.md
+      - name: Enable CORS for custom connector
+        displayName: Power Platform
+        href: enable-cors-power-platform.md
   - name: Monetize APIs
     items:
     - name: Monetization overview
@@ -681,7 +678,7 @@
     - name: stv1 compute platform retirement - Global Azure (August 2024)
       href: breaking-changes/stv1-platform-retirement-august-2024.md
     - name: stv1 compute platform retirement - Azure Government, Azure in China (February 2025)
-      href: breaking-changes/stv1-platform-retirement-sovereign-clouds-february-2025.md 
+      href: breaking-changes/stv1-platform-retirement-sovereign-clouds-february-2025.md
     - name: Workspaces preview breaking changes, part 2 (March 2025)
       href: breaking-changes/workspaces-breaking-changes-march-2025.md
     - name: Git configuration retirement (March 2025)

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

@@ -54,8 +54,6 @@ API Management offers both managed and self-hosted gateways:
 
     * Each self-hosted gateway is associated with a **Gateway** resource in a cloud-based API Management instance from which it receives configuration updates and communicates status. 
 
-[!INCLUDE [preview](./includes/preview/preview-callout-self-hosted-gateway-deprecation.md)]
-
 ## Feature comparison: Managed versus self-hosted gateways
 
 The following tables compare features available in the following API Management gateways:

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>