Merge branch 'main' into release-migrate-new-structure

Author: v-alje

.openpublishing.redirection.json

@@ -1,5 +1,30 @@
 {
   "redirections": [
+    {
+      "source_path": "articles/cdn/cdn-caching-rules.md",
+      "redirect_url": "/previous-versions/azure/cdn/cdn-caching-rules",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/cdn/cdn-dynamic-site-acceleration.md",
+      "redirect_url": "/previous-versions/azure/cdn/cdn-dynamic-site-acceleration",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/cdn/cdn-caching-policy.md",
+      "redirect_url": "/previous-versions/azure/cdn/cdn-caching-policy",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/cdn/cdn-manage-expiration-of-blob-content.md",
+      "redirect_url": "/previous-versions/azure/cdn/cdn-manage-expiration-of-blob-content",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/cdn/cdn-manage-expiration-of-cloud-service-content.md",
+      "redirect_url": "/previous-versions/azure/cdn/cdn-manage-expiration-of-cloud-service-content",
+      "redirect_document_id": false
+    },
     {
       "source_path": "articles/cdn/cdn-http-variables.md",
       "redirect_url": "/previous-versions/azure/cdn/cdn-http-variables",
@@ -6777,7 +6802,12 @@
     {
       "source_path": "articles/defender-for-iot/organizations/extra-deploy-enterprise-iot.md",
       "redirect_url": "/azure/defender-for-iot/organizations/eiot-defender-for-endpoint",
-           "redirect_document_id": false
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/cyclecloud/how-to/slurm-cloud-bursting-setup.md",
+      "redirect_url": "/azure/cyclecloud/how-to/bursting/slurm-cloud-bursting-setup",
+      "redirect_document_id": false
     },
     {
       "source_path": "articles/sentinel/work-with-styx-objects-indicators.md",

ThirdPartyNotices.md

@@ -7,9 +7,9 @@ see the [LICENSE](LICENSE) file, and grant you a license to any code in the repo
 Microsoft, Windows, Microsoft Azure and/or other Microsoft products and services referenced in the documentation
 may be either trademarks or registered trademarks of Microsoft in the United States and/or other countries.
 The licenses for this project do not grant you rights to use any Microsoft names, logos, or trademarks.
-Microsoft's general trademark guidelines can be found at http://go.microsoft.com/fwlink/?LinkID=254653.
+You can find Microsoft general trademark guidelines at [Microsoft Trademark and Brand Guidelines](https://www.microsoft.com/en-us/legal/intellectualproperty/trademarks).
 
-Privacy information can be found at https://privacy.microsoft.com/en-us/
+For privacy information, see [privacy at Microsoft](https://privacy.microsoft.com/en-us/).
 
 Microsoft and any contributors reserve all other rights, whether under their respective copyrights, patents,
 or trademarks, whether by implication, estoppel, or otherwise.

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

@@ -79,19 +79,20 @@ The following tables compare features available in the following API Management
 | [Virtual network injection](virtual-network-concepts.md)  |  Developer, Premium | Premium v2 | ❌ | ✔️<sup>1,2</sup> | ✔️ |
 | [Inbound private endpoints](private-endpoint.md)  |  Developer, Basic, Standard, Premium | Standard v2 | ❌ | ❌ | ❌ |
 | [Outbound virtual network integration](integrate-vnet-outbound.md)  | ❌ | Standard  v2, Premium v2  |  ❌ | ❌ | ✔️ |
-| [Availability zones](zone-redundancy.md)  |  Premium | ❌  | ❌ | ✔️<sup>1</sup> | ✔️<sup>3</sup> |
+| [Availability zones](zone-redundancy.md)  |  Premium | ✔️<sup>3</sup>  | ❌ | ✔️<sup>1</sup> | ✔️<sup>3</sup> |
 | [Multi-region deployment](api-management-howto-deploy-multi-region.md) |  Premium | ❌ |  ❌ | ✔️<sup>1</sup> | ❌ |
-| [CA root certificates](api-management-howto-ca-certificates.md) for certificate validation |  ✔️ | ✔️ | ❌ | ✔️<sup>3</sup> |  ❌ |
+| [CA root certificates](api-management-howto-ca-certificates.md) for certificate validation |  ✔️ | ✔️ | ❌ | ✔️<sup>4</sup> |  ❌ |
 | [Managed domain certificates](configure-custom-domain.md?tabs=managed#domain-certificate-options) |  Developer, Basic, Standard, Premium | ❌ | ✔️ | ❌ | ❌ |
 | [TLS settings](api-management-howto-manage-protocols-ciphers.md) |  ✔️ | ✔️ | ✔️ | ✔️ | ❌ |
-| **HTTP/2** (Client-to-gateway) | ✔️<sup>4</sup> | ✔️<sup>4</sup> |❌ | ✔️ | ❌ |
+| **HTTP/2** (Client-to-gateway) | ✔️<sup>5</sup> | ✔️<sup>5</sup> |❌ | ✔️ | ❌ |
 | **HTTP/2** (Gateway-to-backend) |  ❌ | ❌ | ❌ | ✔️ | ❌ |
 | API threat detection with [Defender for APIs](protect-with-defender-for-apis.md) | ✔️ | ✔️ |  ❌ | ❌ | ❌ |
 
 <sup>1</sup> Depends on how the gateway is deployed, but is the responsibility of the customer.<br/>
 <sup>2</sup> Connectivity to the self-hosted gateway v2 [configuration endpoint](self-hosted-gateway-overview.md#fqdn-dependencies) requires DNS resolution of the endpoint hostname.<br/>
-<sup>3</sup> CA root certificates for self-hosted gateway are managed separately per gateway<br/>
-<sup>4</sup> Client protocol needs to be enabled.
+<sup>3</sup> Two zones are enabled by default; not configurable.<br/>
+<sup>4</sup> CA root certificates for self-hosted gateway are managed separately per gateway<br/>
+<sup>5</sup> Client protocol needs to be enabled.
 
 ### Backend APIs
 

articles/application-gateway/tutorial-ingress-controller-add-on-existing.md

@@ -54,6 +54,9 @@ To configure more parameters for the above command, see [az aks create](/cli/azu
 > [!NOTE]
 > A node resource group will be created with the name **MC_resource-group-name_cluster-name_location**.
 
+>[!NOTE]
+>If you are planning on using AGIC with an AKS cluster using CNI Overlay, specify the parameter `--aks-custom-headers AKSHTTPCustomFeatures=Microsoft.ContainerService/AppGatewayWithOverlayPreview` to configure AGIC to handle connectivity to the CNI Overlay enabled cluster.
+
 ## Deploy a new application gateway 
 
 You'll now deploy a new application gateway, to simulate having an existing application gateway that you want to use to load balance traffic to your AKS cluster, **myCluster**. The name of the application gateway will be **myApplicationGateway**, but you'll need to first create a public IP resource, named **myPublicIp**, and a new virtual network called **myVnet** with address space 10.0.0.0/16, and a subnet with address space 10.0.0.0/24 called **mySubnet**, and deploy your application gateway in **mySubnet** using **myPublicIp**. 

articles/application-gateway/tutorial-ingress-controller-add-on-new.md

@@ -59,6 +59,9 @@ az aks create -n myCluster -g myResourceGroup --network-plugin azure --enable-ma
 > [!NOTE] 
 > Please ensure the identity used by AGIC has the proper permissions. A list of permissions needed by the identity can be found here: [Configure Infrastructure - Permissions](configuration-infrastructure.md#permissions). If a custom role is not defined with the required permissions, you may use the _Network Contributor_ role.
 
+>[!NOTE]
+>If you are planning on using AGIC with an AKS cluster using CNI Overlay, specify the parameter `--aks-custom-headers AKSHTTPCustomFeatures=Microsoft.ContainerService/AppGatewayWithOverlayPreview` to configure AGIC to handle connectivity to the CNI Overlay enabled cluster.
+
 ```azurecli-interactive
 # Get application gateway id from AKS addon profile
 appGatewayId=$(az aks show -n myCluster -g myResourceGroup -o tsv --query "addonProfiles.ingressApplicationGateway.config.effectiveApplicationGatewayId")

articles/azure-maps/how-to-view-api-usage.md

@@ -1,7 +1,7 @@
 ---
 title: View Azure Maps API usage metrics
 titleSuffix: Microsoft Azure Maps
-description: Learn how to view Azure Maps API usage metrics, such as total requests, total errors, and availability. See how to filter data and split results.
+description: Discover how to monitor Azure Maps API usage metrics, including total requests, total errors, and availability. Learn how to filter data and break down results for better insights.
 author: sinnypan
 ms.author: sipa
 ms.date: 03/31/2025
@@ -12,15 +12,15 @@ ms.subservice: general
 
 # View Azure Maps API usage metrics
 
-This article shows you how to view the API usage metrics, for your Azure Maps account, in the [Azure portal]. The metrics are shown in a convenient graph format along a customizable time duration.
+This article guides you on how to view API usage metrics for your Azure Maps account in the [Azure portal]. The metrics are displayed in an easy-to-read graph format over a customizable time period.
 
 ## View metric snapshot
 
-You can see some common metrics on the **Overview** page of your Maps account. It currently shows *Total Requests*, *Total Errors*, and *Availability* over a selectable time duration.
+The **Overview** page of your Maps account displays key metrics such as *Total Requests*, *Total Errors*, and *Availability* over a selectable time period.
 
 ![Azure Maps usage metrics overview](media/how-to-view-api-usage/portal-overview.png)
 
-Continue to the next section if you need to customize these graphs for your particular analysis.
+Proceed to the next section to customize these graphs for your specific analysis needs.
 
 ## View detailed metrics
 
@@ -30,30 +30,34 @@ Continue to the next section if you need to customize these graphs for your part
 
 3. Once your Maps account is open, select the **Metrics** menu on the left.
 
-4. On the **Metrics** pane, choose one of the following options:
+4. In the **Metrics** pane, choose one of the following options:
 
-   1. **Availability** - which shows the *Average* of API availability over a period of time.
-   2. **Usage** - which shows how the usage *Count* for your account.
+   1. **Availability** - displays the Average API availability over a specified time period.
+   2. **Usage** - displays the usage count for your account.
 
       ![Azure Maps usage metrics pane](media/how-to-view-api-usage/portal-metrics.png)
 
-5. Next, you may select the *Time range* by selecting **Last 24 hours (Automatic)**. By default, the time range is set to 24 hours. After clicking, you'll see all selectable time ranges. You can select the *Time granularity* and choose to show the time as *local* or *GMT* in the same drop-down. Click **Apply**.
+5. The default time range is **Last 24 hours (Automatic)**. To change this, select the default value to open the _Time Range_ pop-up, which displays all available settings. You can change the *Time granularity* and show the time as *local* or *GMT*. Once the desired options are chosen, select **Apply**.
 
     ![Azure Maps metrics time range](media/how-to-view-api-usage/time-range.png)
 
-6. Once you add your metric, you can **Add filter** from the properties relevant to that metric. Then, select the value of the property that you want to see reflected on the graph.
+    > [!NOTE]
+    > Metrics are stored for 93 days, but you can only query up to 30 days' worth of data at a time. If you encounter a blank chart or partial metric data, ensure the start and end dates in the time picker don't exceed a 30-day interval. Once you've selected a 30-day interval, you can pan the chart to view other metrics. For more information, see [Troubleshooting metrics charts](/azure/azure-monitor/essentials/data-platform-metrics).
+
+6. After adding your metric, you can apply a filter based on the properties relevant to that metric. Then, choose the value of the property you want to display on the graph.
 
     ![Azure Maps usage metrics Filter](media/how-to-view-api-usage/filter.png)
 
-7. You may also **Apply splitting** for your metric based on your selected metric property. It allows the graph to be split into multiple graphs, for each value of that property. In the following picture, the color of each graph corresponds to the property value shown at the bottom of the graph.
+7. You can also **Apply splitting** for your metric based on your selected metric property. This feature allows the graph to be divided into multiple graphs, each representing a different value of that property. In the following example, the color of each graph corresponds to the property value displayed at the bottom.
 
     ![Azure Maps usage metrics splitting](media/how-to-view-api-usage/splitting.png)
 
-8. You may also observe multiple metrics on the same graph, by selecting the **Add metric** button.
+8. You can also view multiple metrics on the same graph by selecting the **Add metric** button.
 
 ## Next steps
 
-Learn more about the Azure Maps APIs you want to track usage for:
+Discover more about the Azure Maps APIs you wish to monitor:
+
 > [!div class="nextstepaction"]
 > [Azure Maps Web SDK How-To]
 

articles/azure-maps/understanding-azure-maps-transactions.md

@@ -22,7 +22,7 @@ When you use [Azure Maps Services], the API requests you make generate transac
 
 ## Azure Maps Transaction information by service
 
-The following table summarizes the Azure Maps services that generate transactions, billable and nonbillable, along with any notable aspects that are helpful to understand in how the number of transactions are calculated.
+The following table summarizes the Azure Maps services that generate both billable and nonbillable transactions, along with key aspects to help understand how the number of transactions is calculated.
 
 > [!NOTE]
 >
@@ -33,7 +33,7 @@ The following table summarizes the Azure Maps services that generate transaction
 | [Data registry] (Deprecated<sup>1</sup>) | Yes      | One request = 1 transaction| <ul><li>Location Insights Data (Gen2 pricing)</li></ul>|
 | [Geolocation]| Yes| One request = 1 transaction| <ul><li>Location Insights Geolocation (Gen2 pricing)</li><li>Standard S1 Geolocation Transactions (Gen1 S1 pricing)</li><li>Standard Geolocation Transactions (Gen1 S0 pricing)</li></ul>|
 | [Render] | Yes, except Get Copyright API, Get Attribution API and Terra maps (`MapTile.GetTerraTile` and `layer=terra`) which are nonbillable.|<ul><li>15 tiles = 1 transaction</li><li>One request for Get Copyright = 1 transaction</li><li>One request for Get Map Attribution = 1 transaction</li><li>One request for Get Static Map = 1 transaction</li><li>One request for Get Map Tileset = 1 transaction</li></ul> <br> For Creator related usage, see the [Creator table]. |<ul><li>Maps Base Map Tiles (Gen2 pricing)</li><li>Maps Imagery Tiles (Gen2 pricing)</li><li>Maps Static Map Images (Gen2 pricing)</li><li>Maps Weather Tiles (Gen2 pricing)</li><li>Standard Hybrid Aerial Imagery Transactions (Gen1 S0 pricing)</li><li>Standard Aerial Imagery Transactions (Gen1 S0 pricing)</li><li>Standard S1 Aerial Imagery Transactions (Gen1 S1 pricing)</li><li>Standard S1 Hybrid Aerial Imagery Transactions (Gen1 S1 pricing)</li><li>Standard S1 Rendering Transactions (Gen1 S1 pricing)</li><li>Standard S1 Tile Transactions (Gen1 S1 pricing)</li><li>Standard S1 Weather Tile Transactions (Gen1 S1 pricing)</li><li>Standard Tile Transactions (Gen1 S0 pricing)</li><li>Standard Weather Tile Transactions (Gen1 S0 pricing)</li><li>Maps Copyright (Gen2 pricing, Gen1 S0 pricing and Gen1 S1 pricing)</li></ul>|
-| [Route] | Yes | One request = 1 transaction<br><ul><li>If using the Route Matrix, every four cells in the Route Matrix request generates a billable Route transaction, rounded up to the nearest whole number. If you provided 5 origins and 10 destinations, that would be counted as `Ceiling(0.25*5*10) = 13` Routing transactions.</li><li>If using Batch Directions, each route query (route origin/destination coordinate pair and waypoints) in the Batch request call generates a billable Route transaction. Note, the billable Route transaction usage results generated by the batch request has **-Batch** appended to the API name of your Azure portal metrics report.</li></ul> | <ul><li>Location Insights Routing (Gen2 pricing)</li><li>Standard S1 Routing Transactions (Gen1 S1 pricing)</li><li>Standard Services API Transactions (Gen1 S0 pricing)</li></ul> |
+| [Route] | Yes | One request = 1 transaction<br><ul><li>If using the Route Matrix, every four cells in the Route Matrix request generates a billable Route transaction, rounded up to the nearest whole number. If you provided 5 origins and 10 destinations, that would be counted as `Ceiling(0.25*5*10) = 13` Routing transactions.</li><li>If using **Batch transactions**, each query in the Batch request call generates a billable Route transaction.</li><li>If using **Snap to Roads**. Snap to Roads is billed similarly to other Route APIs: 1 request equals 1 transaction, and each request can support up to 100 snap-to-roads points.</li></ul> | <ul><li>Location Insights Routing (Gen2 pricing)</li><li>Standard S1 Routing Transactions (Gen1 S1 pricing)</li><li>Standard Services API Transactions (Gen1 S0 pricing)</li></ul> |
 | [Search v1]<br>[Search v2] | Yes | One request = 1 transaction.<br><ul><li>If using Batch Search, each location in the Batch request generates a billable Search transaction. Note, the billable Search transaction usage results generated by the batch request has **-Batch** appended to the API name of your Azure portal metrics report.</li></ul> | <ul><li>Location Insights Search</li><li>Standard S1 Search Transactions (Gen1 S1 pricing)</li><li>Standard Services API Transactions (Gen1 S0 pricing)</li></ul> |
 | [Spatial] (Deprecated<sup>1</sup>) | Yes, except for `Spatial.GetBoundingBox`, `Spatial.PostBoundingBox` and `Spatial.PostPointInPolygonBatch`, which are nonbillable.| One request = 1 transaction.<br><ul><li>If using Geofence, five requests = 1 transaction</li></ul> | <ul><li>Location Insights Spatial Calculations (Gen2 pricing)</li><li>Standard S1 Spatial Transactions (Gen1 S1 pricing)</li></ul> |
 | [Timezone] | Yes | One request = 1 transaction | <ul><li>Location Insights Timezone (Gen2 pricing)</li><li>Standard S1 Time Zones Transactions (Gen1 S1 pricing)</li><li>Standard Time Zones Transactions (Gen1 S0 pricing)</li></ul> |
@@ -44,11 +44,11 @@ The following table summarizes the Azure Maps services that generate transaction
 
 > [!NOTE]
 >
-> There is no charge to use [Azure Maps Power BI visual](power-bi-visual-get-started.md) as long as you have a [Power BI subscription](/power-bi/fundamentals/service-self-service-signup-for-power-bi).
+> There's no charge to use [Azure Maps Power BI visual](power-bi-visual-get-started.md) as long as you have a [Power BI subscription](/power-bi/fundamentals/service-self-service-signup-for-power-bi).
 
 > [!TIP]
 >
-> Unlike Bing Maps, Azure Maps doesn’t use [session IDs]. Instead, Azure Maps offers a number of free transactions each month as shown in [Azure Maps pricing]. For example, you get 5,000 free *Base Map Tile* transactions per month. Each transaction can include up to 15 tiles for a total of 75,000 tiles rendered for free each month.
+> Unlike Bing Maps, Azure Maps doesn’t use [session IDs]. Instead, Azure Maps offers many free transactions each month as shown in [Azure Maps pricing]. For example, you get 5,000 free *Base Map Tile* transactions per month. Each transaction can include up to 15 tiles for a total of 75,000 tiles rendered for free each month.
 <!-- In Bing Maps, any time a synchronous Truck Routing request is made, three transactions are counted. Does this apply also to Azure Maps?-->
 
 ## Azure Maps Creator