Merge remote-tracking branch 'upstream/main' into fxl---for-cawa---public-and-private-access-mutually-exclusive-in-Enterprise--32388506

Author: flang-msft

.gitignore

@@ -26,4 +26,23 @@ AzureMigration.ps1
 *.pdn
 
 # Pycharm
-.idea/*
+.idea/*
+articles/planetary-computer/doc-tree-generator.py
+.gitignore
+articles/planetary-computer/article_links_diagram.md
+articles/planetary-computer/index_helper.py
+articles/planetary-computer/metadata_index.csv
+articles/planetary-computer/broken_link_checker.py
+articles/planetary-computer/broken_links_external.csv
+articles/planetary-computer/broken_links.csv
+articles/planetary-computer/check_orphaned_docs.py
+
+# Python cache files
+*.pyc
+__pycache__/
+articles/planetary-computer/interesting_stats.py
+articles/planetary-computer/locate_text.py
+articles/planetary-computer/image_syntax_checker.py
+articles/planetary-computer/image-file-fixer.py
+articles/planetary-computer/orphaned-media.py
+articles/planetary-computer/orphaned_media_files.txt

.openpublishing.publish.config.json

@@ -140,6 +140,30 @@
             "branch": "main",
             "branch_mapping": {}
         },
+        {
+            "path_to_root": "remote-mcp-functions-dotnet",
+            "url": "https://github.com/Azure-Samples/remote-mcp-functions-dotnet",
+            "branch": "main",
+            "branch_mapping": {}
+        },
+        {
+            "path_to_root": "remote-mcp-functions-typescript",
+            "url": "https://github.com/Azure-Samples/remote-mcp-functions-typescript",
+            "branch": "main",
+            "branch_mapping": {}
+        },
+        {
+            "path_to_root": "remote-mcp-functions-python",
+            "url": "https://github.com/Azure-Samples/remote-mcp-functions-python",
+            "branch": "main",
+            "branch_mapping": {}
+        },
+        {
+            "path_to_root": "remote-mcp-functions-java",
+            "url": "https://github.com/Azure-Samples/remote-mcp-functions-java",
+            "branch": "main",
+            "branch_mapping": {}
+        },
         {
             "path_to_root": "azure-functions-durable-js",
             "url": "https://github.com/Azure/azure-functions-durable-js",
@@ -158,6 +182,12 @@
             "branch": "dev",
             "branch_mapping": {}
         },
+        {
+            "path_to_root": "azure-functions-mongodb-extension",
+            "url": "https://github.com/Azure/Azure-functions-mongodb-extension",
+            "branch": "main",
+            "branch_mapping": {}
+        },
         {
             "path_to_root": "azure-functions-nodejs-v4",
             "url": "https://github.com/Azure/azure-functions-nodejs-samples",

.openpublishing.redirection.json

@@ -2394,6 +2394,11 @@
       "redirect_url": "/azure/architecture/web-apps/guides/multi-region-app-service/multi-region-app-service",
       "redirect_document_id": false
     },
+    {
+      "source_path_from_root": "/articles/app-service/app-service-configure-premium-tier.md",
+      "redirect_url": "/azure/app-service/app-service-configure-premium-v4-tier",
+      "redirect_document_id": false
+    },           
     {
       "source_path_from_root": "/articles/public-multi-access-edge-compute-mec/tutorial-create-vm-using-python-sdk.md",
       "redirect_url": "/previous-versions/azure/public-multi-access-edge-compute-mec/tutorial-create-vm-using-python-sdk",
@@ -6851,7 +6856,27 @@
     },
     {
       "source_path_from_root": "/articles/azure-functions/migration.md",
-      "redirect_url": "/azure/azure-functions/migration/migrate-lambda-workloads-overview",
+      "redirect_url": "/azure/azure-functions/migration/migrate-aws-lambda-to-azure-functions",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/azure-functions/migration/migrate-lambda-workloads-overview.md",
+      "redirect_url": "/azure/azure-functions/migration/migrate-aws-lambda-to-azure-functions",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/azure-functions/migration/discover-lambda-workloads.md",
+      "redirect_url": "/azure/azure-functions/migration/migrate-aws-lambda-to-azure-functions",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/azure-functions/migration/assess-lambda-workloads.md",
+      "redirect_url": "/azure/azure-functions/migration/migrate-aws-lambda-to-azure-functions",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/azure-functions/migration/migrate-lambda-workloads.md",
+      "redirect_url": "/azure/azure-functions/migration/migrate-aws-lambda-to-azure-functions",
       "redirect_document_id": false
     },
     {

articles/active-directory-b2c/service-limits.md

@@ -186,17 +186,18 @@ As a protection for our customers, Microsoft places some restrictions on telepho
 | 20  | Egypt | 50 | 200 | 
 | 211 |	South Sudan |	10	| 30 |
 | 212 | Morocco | 20 | 100 |
+| 213 | Algeria | 20 | 100 |
 | 216 | Tunisia | 20 | 100 |
 | 221 | Senegal | 10 | 30 |
 | 223 | Mali | 20 | 100 |
 | 224 | Guinea | 20 | 100 |
-| 225 |	Côte d’Ivoire |	10	| 30 |
+| 225 |	Ivory Coast|	10	| 30 |
 | 226 |  Burina Faso   | 10  |  30  |
 | 228 |  Togo  | 10  |  30  |
 | 233 |	Ghana|	10	| 30 |
 | 234 | Nigeria | 20 | 100 |
 | 236 |	Central African Republic  |	10	| 30 |
-| 238 | Cabo Verde | 10 | 30 |
+| 238 | Cape Verde | 10 | 30 |
 | 249 |  Sudan | 10  |  30  |
 | 251 |	Ethiopia  |	10	| 30 |
 | 252 |  Somalia   | 10  |  30  |  
@@ -208,18 +209,21 @@ As a protection for our customers, Microsoft places some restrictions on telepho
 | 261 | Madagascar | 10 | 30 |
 | 263 | Zimbabwe | 10 | 30 |
 | 265 |	Malawi  |	10	| 30 |
+| 373 |	Moldova |	20	| 100 |
 | 375 |	Belarus   |	10	| 30 |
 | 386 | Slovenia | 10 | 50 |
 | 501 |  Belize| 10  |  30  |
 | 502 | Guatemala | 10 | 50 
 | 503 | El Salvador | 10 | 30 |
-| 52 | Mexico | 100 | 500 
+| 52 | Mexico | 100 | 500 |
+| 53 | Cuba | 10 | 30 |
 | 58 |	Venezuela|	10	| 30 |
 | 591 | Bolivia | 10 | 30 |
 | 60 | Malaysia | 50 | 200 |
 | 62 |  Indonesia | 50  |  200 |
 | 63 |  Philippines   | 50  |  200 |
-| 670 |	Timor-Leste  |	10	| 30 |
+| 670 |	East Timor (Timor-Leste)  |	10	| 30 |
+| 675 |	Papua New Guinea  |	10	| 30 |
 | 7 |  Russia | 100  |  1000 |
 | 84 |  Vietnam   | 150  |  500 |
 | 855 |  Cambodia  | 50  |  200 |
@@ -228,8 +232,9 @@ As a protection for our customers, Microsoft places some restrictions on telepho
 | 92 |  Pakistan| 100  |  1000 |
 | 93 |	Afghanistan  |	10	| 30 |
 | 94 |  Sri Lanka | 100  |  500 |
-| 95 |	Myanmar | 10	| 30 |
+| 95 |	Myanmar (Burma) | 10	| 30 |
 | 961 |	Lebanon  |	10	| 30 |
+| 963 |	Syria  |	10	| 30 |
 | 967 |	Yemen	|10	| 30 |
 | 970 |  State of Palestine| 10  |  30  |
 | 972 |	Israel  |	50	| 200 |

articles/api-management/api-management-capacity.md

@@ -1,12 +1,12 @@
 ---
-title: Capacity metrics - Azure API Management | Microsoft Docs
+title: Capacity Metrics - Azure API Management
 description: This article explains the capacity metrics in Azure API Management and how to make informed decisions about whether to scale an instance.
 services: api-management
 author: dlepow
 
 ms.service: azure-api-management
 ms.topic: how-to
-ms.date: 10/01/2024
+ms.date: 04/17/2025
 ms.author: danlep
 ms.custom: fasttrack-edit
 ---
@@ -19,18 +19,18 @@ API Management provides [Azure Monitor metrics](api-management-howto-use-azure-m
 
 This article explains the capacity metrics and how they behave, shows how to access capacity metrics in the Azure portal, and suggests when to consider scaling or upgrading your API Management instance.
 
-[!INCLUDE [api-management-workspace-availability](../../includes/api-management-workspace-availability.md)]
-
 > [!IMPORTANT]
-> This article introduces how to monitor and scale your Azure API Management instance based on capacity metrics. However, when an instance *reaches* its capacity, it won't throttle to prevent overload. Instead, it will act like an overloaded web server: increased latency, dropped connections, and timeout errors. API clients should be ready to handle these issues as they do with other external services, for example by using retry policies.
+> This article introduces how to monitor and scale your Azure API Management instance based on capacity metrics. However, when an instance *reaches* its capacity, it won't throttle to prevent overload. Instead, it will act like an overloaded web server: increased latency, dropped connections, and time-out errors. API clients should be ready to handle these issues as they do with other external services, for example by using retry policies.
+
+[!INCLUDE [api-management-workspace-try-it](../../includes/api-management-workspace-try-it.md)]
 
 ## Prerequisites
 
 To follow the steps in this article, you must have an API Management instance in one of the tiers that supports capacity metrics. For more information, see [Create an Azure API Management instance](get-started-create-service-instance.md).
 
 ## Available capacity metrics
 
-Different capacity metrics are available in the [v2 service tiers](v2-service-tiers-overview.md) and classic tiers. 
+Different capacity metrics are available in the [v2 service tiers](v2-service-tiers-overview.md), classic tiers, and [workspace gateways](workspaces-overview.md#workspace-gateway). 
 
 #### [v2 tiers](#tab/v2-tiers)
 
@@ -66,6 +66,21 @@ Available aggregations for this metric are as follows.
 
 [!INCLUDE [api-management-cpu-memory-capacity](../../includes/api-management-cpu-memory-capacity.md)]
 
+#### [Workspace gateways](#tab/workspace-gateway)
+
+In a workspace gateway, the following metrics are available:
+
+* **CPU Utilization (%)** - The percentage of CPU capacity used by the gateway units.
+
+* **Memory Utilization (%)** - The percentage of memory capacity used by the gateway units.
+
+Available aggregations for these metrics are as follows.
+
+* **Avg** - Average percentage of capacity used across gateway processes in every [unit](upgrade-and-scale.md) of a workspace gateway. 
+* **Max** - Percentage of capacity in gateway process with the greatest consumption.  
+
+[!INCLUDE [api-management-cpu-memory-capacity](../../includes/api-management-cpu-memory-capacity.md)]
+
 ---
 
 ## Capacity metric behavior
@@ -85,7 +100,7 @@ The more complex operations on the requests are, the higher the capacity consump
 
 Capacity metrics can also spike intermittently or be greater than zero even if no requests are being processed. It happens because of system- or platform-specific actions and should not be taken into consideration when deciding whether to scale an instance.
 
-Although capacity metrics are designed to surface problems with your API Management instance, there are cases when problems won't be reflected in changes in these metrics. Additionally, low capacity metrics don't necessarily mean that your API Management instance isn't experiencing any problems.
+Although capacity metrics are designed to surface problems with your API Management instance (or workspace gateway), there are cases when problems won't be reflected in changes in these metrics. Additionally, low capacity metrics don't necessarily mean that your API Management instance isn't experiencing any problems.
 
 
 ## Use the Azure portal to examine capacity metrics
@@ -128,19 +143,32 @@ Access metrics in the portal to understand how much capacity is used over time.
 > * You can use Azure Monitor [autoscaling](api-management-howto-autoscale.md) to automatically add an Azure API Management unit. Scaling operation can take around 30 minutes, so you should plan your rules accordingly.  
 > * In multi-region deployments, only scaling the primary location is allowed.
 
+#### [Workspace gateways](#tab/workspace-gateway) 
+
+1. Navigate to your API Management instance in the [Azure portal](https://portal.azure.com/).
+1. In the left menu, under **APIs**, select **Workspaces** > the workspace associated with the gateway that you want to monitor.
+1. In the left menu, under **Deployment + infrastructure**, select **Gateways** > the workspace gateway that you want to monitor.
+1. In the left menu, under **Monitoring**, select **Metrics**.
+1. Select the **CPU Utilization (%)** or **Memory Utilization (%)** metric from the available metrics. Choose the default **Avg** aggregation or select the **Max** aggregation to see the peak usage.
+1. Pick a desired timeframe from the top bar of the section.
+
+> [!NOTE]
+> You can set a [metric alert](api-management-howto-use-azure-monitor.md#set-up-an-alert-rule) to let you know when something unexpected is happening. For example, get notifications when your workspace gateway has exceeded its expected peak CPU or Memory usage for more than 20 minutes.
+
+
 ---
 
 ## Use capacity for scaling decisions
 
-Use capacity metrics for making decisions whether to scale an API Management instance to accommodate more load. The following are general considerations:
+Use capacity metrics for making decisions whether to scale an API Management instance (or workspace gateway) to accommodate more load. The following are general considerations:
 
 + Look at a long-term trend and average.
 + Ignore sudden spikes that are most likely not related to an increase in load (see [Capacity metric behavior](#capacity-metric-behavior) section for explanation).
 + As a general rule, upgrade or scale your instance when a capacity metric value exceeds **60% - 70%** for a long period of time (for example, 30 minutes). Different values may work better for your service or scenario.
-+ If your instance is configured with only 1 unit, upgrade or scale your instance when a capacity metric value exceeds **40%** for a long period. This recommendation is based on the need to reserve capacity for guest OS updates in the underlying service platform.
++ If your instance or workspace gateway is configured with only 1 unit, upgrade or scale it when a capacity metric value exceeds **40%** for a long period. This recommendation is based on the need to reserve capacity for guest OS updates in the underlying service platform.
 
->[!TIP]  
-> If you are able to estimate your traffic beforehand, test your API Management instance on workloads you expect. You can increase the request load on your tenant gradually and monitor the value of the capacity metric that corresponds to your peak load. Follow the steps from the previous section to use Azure portal to understand how much capacity is used at any given time.
+> [!TIP]  
+> If you are able to estimate your traffic beforehand, test your API Management instance or workspace gateway on workloads you expect. You can increase the request load gradually and monitor the value of the capacity metric that corresponds to your peak load. Follow the steps from the previous section to use Azure portal to understand how much capacity is used at any given time.
 
 > [!IMPORTANT]
 > When defining autoscaling rules, make sure to avoid autoscaling flapping that will cause a scale in/scale out loop. To learn more, we recommend reading [Azure Monitor Autoscale's guidance around flapping](/azure/azure-monitor/autoscale/autoscale-flapping).

articles/api-management/api-management-faq.yml

@@ -62,7 +62,7 @@ sections:
           * The [API Management REST API](/rest/api/apimanagement/)
           * Azure client SDKs for [.NET](/dotnet/api/overview/azure/api-management), [JavaScript](/javascript/api/overview/azure/api-management), [Java](/java/api/overview/azure/api-management), and other languages
           * [Azure PowerShell](/powershell/module/az.apimanagement/) and [Azure CLI](/cli/azure/apim)
-          * [Azure Resource Manager](/azure/templates/microsoft.apimanagement/allversions) and Bicep templates. See example [quickstart templates](https://azure.microsoft.com/resources/templates/?Page=2&term=api+management).
+          * [Azure Resource Manager](/azure/templates/microsoft.apimanagement/allversions) and Bicep files. See example [quickstart templates](https://azure.microsoft.com/resources/templates/?Page=2&term=api+management).
           * [Terraform](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/resources/api_management)
 
       - question: |

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

@@ -6,7 +6,7 @@ author: dlepow
 
 ms.service: azure-api-management
 ms.topic: how-to
-ms.date: 09/04/2024
+ms.date: 04/09/2025
 ms.author: danlep
 ms.custom: engagement-fy23, devx-track-arm-template, devx-track-bicep
 ---
@@ -121,7 +121,7 @@ Use the API Management [Logger - Create or Update](/rest/api/apimanagement/curre
 
 #### [Bicep](#tab/bicep)
 
-Include a snippet similar to the following in your Bicep template.
+Include a snippet similar to the following in your Bicep file.
 
 ```Bicep
 resource aiLoggerWithSystemAssignedIdentity 'Microsoft.ApiManagement/service/loggers@2022-08-01' = {
@@ -181,7 +181,7 @@ Use the API Management [Logger - Create or Update](/rest/api/apimanagement/curre
 
 #### [Bicep](#tab/bicep)
 
-Include a snippet similar the following in your Bicep template.
+Include a snippet similar the following in your Bicep file.
 
 ```Bicep
 resource aiLoggerWithUserAssignedIdentity 'Microsoft.ApiManagement/service/loggers@2022-08-01' = {
@@ -244,7 +244,7 @@ If you are configuring the logger for a workspace, use the [Workspace Logger - C
 
 #### [Bicep](#tab/bicep)
 
-Include a snippet similar to the following in your Bicep template.
+Include a snippet similar to the following in your Bicep file.
 
 If you are configuring the logger for a workspace, create a `Microsoft.ApiManagement/service.workspace/loggers@2023-09-01-preview` resource instead.
 

articles/api-management/api-management-howto-log-event-hubs.md

@@ -58,7 +58,7 @@ To create an Event Hubs connection string, see [Get an Event Hubs connection str
 ## Create an API Management logger
 The next step is to configure a [logger](/rest/api/apimanagement/current-ga/logger) in your API Management service so that it can log events to the event hub.
 
-Create and manage API Management loggers by using the [API Management REST API](/rest/api/apimanagement/current-preview/logger/create-or-update) directly or by using tools including [Azure PowerShell](/powershell/module/az.apimanagement/new-azapimanagementlogger), a Bicep template, or an Azure Resource Management template.
+Create and manage API Management loggers by using the [API Management REST API](/rest/api/apimanagement/current-preview/logger/create-or-update) directly or by using tools including [Azure PowerShell](/powershell/module/az.apimanagement/new-azapimanagementlogger), a Bicep file, or an Azure Resource Management template.
 
 ### Option 1: Logger with managed identity credentials (recommended)
 
@@ -89,7 +89,7 @@ Use the API Management [Logger - Create or Update](/rest/api/apimanagement/curre
 
 #### [Bicep](#tab/bicep)
 
-Include a snippet similar to the following in your Bicep template.
+Include a snippet similar to the following in your Bicep file.
 
 ```Bicep
 resource ehLoggerWithSystemAssignedIdentity 'Microsoft.ApiManagement/service/loggers@2022-08-01' = {
@@ -155,7 +155,7 @@ Use the API Management [Logger - Create or Update](/rest/api/apimanagement/curre
 
 #### [Bicep](#tab/bicep)
 
-Include a snippet similar to the following in your Bicep template.
+Include a snippet similar to the following in your Bicep file.
 
 ```Bicep
 resource ehLoggerWithUserAssignedIdentity 'Microsoft.ApiManagement/service/loggers@2022-08-01' = {
@@ -220,7 +220,7 @@ New-AzApiManagementLogger -Context $context -LoggerId "ContosoLogger1" -Name "Ap
 
 #### [Bicep](#tab/bicep)
 
-Include a snippet similar to the following in your Bicep template.
+Include a snippet similar to the following in your Bicep file.
 
 ```Bicep
 resource ehLoggerWithConnectionString 'Microsoft.ApiManagement/service/loggers@2022-08-01' = {