Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into mdb-dev-boxes-not-accessed

Author: RoseHJM

.openpublishing.redirection.json

@@ -2434,6 +2434,16 @@
       "redirect_url": "/previous-versions/azure/vpn-gateway/vpn-gateway-about-vpn-gateway-settings",
       "redirect_document_id": false
     },
+    {
+      "source_path_from_root": "/articles/vpn-gateway/gateway-sku-change.md",
+      "redirect_url": "/azure/vpn-gateway/gateway-sku-upgrade",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/vpn-gateway/gateway-sku-resize.md",
+      "redirect_url": "/azure/vpn-gateway/gateway-sku-upgrade",
+      "redirect_document_id": false
+    },
     {
       "source_path_from_root": "/articles/vpn-gateway/vpn-gateway-about-forced-tunneling.md",
       "redirect_url": "/previous-versions/azure/vpn-gateway/vpn-gateway-about-forced-tunneling",
@@ -7084,6 +7094,26 @@
       "redirect_url": "/azure/cyclecloud/release-notes/ccws/2025-02-06",
       "redirect_document_id": false
     },
+    {
+      "source_path": "articles/app-service/sre-agent-overview.md",
+      "redirect_url": "/azure/sre-agent/overview",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/app-service/sre-agent-usage.md",
+      "redirect_url": "/azure/sre-agent/usage",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/app-service/tutorial-sre-agent.md",
+      "redirect_url": "/azure/sre-agent/troubleshoot-azure-app-service",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/container-apps/sre-agent-troubleshoot.md",
+      "redirect_url": "/azure/sre-agent/troubleshoot-azure-container-apps",
+      "redirect_document_id": false
+    },
     {
       "source_path": "articles/reliability/whats-new.md",
       "redirect_url": "/azure/reliability/overview",

articles/api-management/export-rest-mcp-server.md

@@ -85,6 +85,9 @@ To verify that the MCP server is working, you can use Visual Studio Code to send
 
 In Visual Studio Code, use GitHub Copilot chat in agent mode (preview) to add the MCP server and use the tools. For background about MCP servers in Visual Studio Code, see [Use MCP Servers in VS Code (Preview)](https://code.visualstudio.com/docs/copilot/chat/mcp-servers).
 
+> [!TIP]
+> If you use the [MCP Inspector](https://modelcontextprotocol.io/docs/tools/inspector) to test an MCP server created by API Management, we recommend using version 0.9.0.
+
 ### Add the MCP server in Visual Studio Code
 
 To add the MCP server in Visual Studio Code:

articles/app-service/sre-agent-usage.md

@@ -246,13 +246,7 @@ items:
 - name: Logs and monitoring
   items:
     - name: Troubleshoot and resolve issues with an agent
-      items:
-        - name: Overview
-          href: sre-agent-overview.md
-        - name: Use an SRE agent
-          href: sre-agent-usage.md
-        - name: SRE Agent tutorial
-          href: tutorial-sre-agent.md    
+      href: ../sre-agent/troubleshoot-azure-app-service.md  
     - name: Monitor App Service
       href: monitor-app-service.md
     - name: Monitoring data reference

articles/app-service/toc.yml

@@ -396,6 +396,8 @@
         href: ./reference-kubernetes-provider.md
     - name: Go
       items:
+      - name: Feature reference
+        href: https://pkg.go.dev/github.com/Azure/AppConfiguration-GoProvider/azureappconfiguration
       - name: Azure SDK for Go
         href: https://go.microsoft.com/fwlink/?linkid=2270866
 

articles/azure-app-configuration/TOC.yml

@@ -5,7 +5,7 @@ author: maud-lv
 ms.author: malev
 ms.service: azure-app-configuration
 ms.topic: conceptual
-ms.date: 05/13/2024
+ms.date: 06/04/2025
 ---
 
 # Geo-replication overview
@@ -31,7 +31,7 @@ This team would benefit from geo-replication. They can create a replica of their
 
 ## Considerations
 
-- Geo-replication isn't available in the free tier.  
+- Geo-replication isn't available in the Free and Developer tiers.  
 - Each replica has limits, as outlined in the [App Configuration pricing page](https://azure.microsoft.com/pricing/details/app-configuration/). These limits are isolated per replica. 
 - Azure App Configuration also supports Azure availability zones to create a resilient and highly available store within an Azure Region. Availability zone support is automatically included for a replica if the replica's region has availability zone support. The combination of availability zones for redundancy within a region, and geo-replication across multiple regions, enhances both the availability and performance of a configuration store.
 <!--

articles/azure-app-configuration/concept-geo-replication.md

@@ -8,12 +8,12 @@ ms.author: malev
 ms.service: azure-app-configuration
 ms.custom: devx-track-azurecli
 ms.topic: conceptual
-ms.date: 04/16/2025
+ms.date: 06/04/2025
 ---
 
 # Point-in-time key-values
 
-Azure App Configuration maintains a record of changes made to key-values. This record provides a timeline of key-value changes. You can reconstruct the history of any key and provide its past value at any moment within the key history period (7 days for Free tier stores, or 30 days for Standard tier stores). Using this feature, you can “time-travel” backward and retrieve an old key-value. For example, you can recover configuration settings used before the most recent deployment in order to roll back the application to the previous configuration.
+Azure App Configuration maintains a record of changes made to key-values. This record provides a timeline of key-value changes. You can reconstruct the history of any key and provide its past value at any moment within the key history period (7 days for Free and Developer tier stores, or 30 days for Standard and Premium tier stores). Using this feature, you can “time-travel” backward and retrieve an old key-value. For example, you can recover configuration settings used before the most recent deployment in order to roll back the application to the previous configuration.
 
 ## Restore key-values
 

articles/azure-app-configuration/concept-point-time-snapshot.md

@@ -19,6 +19,14 @@ Using private endpoints for your App Configuration store enables you to:
 - Increase security for the virtual network (VNet) ensuring data doesn't escape from the VNet.
 - Securely connect to the App Configuration store from on-premises networks that connect to the VNet using [VPN](../vpn-gateway/vpn-gateway-about-vpngateways.md) or [ExpressRoutes](../expressroute/expressroute-locations.md) with private-peering.
 
+Private endpoints availability varies by App Configuration tier:
+- **Free tier**: Not available
+- **Developer tier**: Up to 1 private endpoint
+- **Standard tier**: Up to 10 private endpoints
+- **Premium tier**: Up to 100 private endpoints
+
+For more information about pricing, see [Azure App Configuration pricing](https://azure.microsoft.com/pricing/details/app-configuration/).
+
 ## Conceptual overview
 
 A private endpoint is a special network interface for an Azure service in your [Virtual Network](../virtual-network/virtual-networks-overview.md) (VNet). When you create a private endpoint for your App Configuration store, it provides secure connectivity between clients on your VNet and your configuration store. The private endpoint is assigned an IP address from the IP address range of your VNet. The connection between the private endpoint and the configuration store uses a secure private link.

articles/azure-app-configuration/concept-private-endpoint.md

@@ -5,7 +5,7 @@ author: Muksvso
 ms.author: mubatra
 ms.service: azure-app-configuration
 ms.topic: conceptual 
-ms.date: 11/15/2023
+ms.date: 06/04/2025
 ---
 
 # Snapshots
@@ -75,15 +75,16 @@ For stores that use HMAC authentication, both the "read snapshot" operation (to
 
 ## Billing considerations and limits
 
-App Configuration has three tiers, Free, Standard and Premium. Check the following details for snapshot quotas in each tier.
+App Configuration has four tiers: Free, Developer, Standard, and Premium. The following table summarizes the snapshot storage quotas for each tier:
 
-* **Free tier**: This tier has a snapshot storage quota of 10 MB.  One can create as many snapshots as possible as long as the total storage size of all active and archived snapshots is less than 10 MB.
+| Tier        | Snapshot storage quota |
+|-------------|-----------------------|
+| Free        | 10 MB                 |
+| Developer   | 500 MB                |
+| Standard    | 1 GB                  |
+| Premium     | 4 GB                  |
 
-* **Standard tier**: This tier has a snapshot storage quota of 1 GB. One can create as many snapshots as possible as long as the total storage size of all active and archived snapshots is less than 1 GB.
-
-* **Premium tier**: This tier has a snapshot storage quota of 4 GB. One can create as many snapshots as possible as long as the total storage size of all active and archived snapshots is less than 4 GB.
-
-The maximum size for a snapshot is 1 MB.
+You can create as many snapshots as needed, as long as the total storage size of all active and archived snapshots does not exceed the quota for your tier. The maximum size for an individual snapshot is 1 MB.
 
 ## Next steps
 

articles/azure-app-configuration/concept-snapshots.md

@@ -6,7 +6,7 @@ ms.author: mubatra
 ms.service: azure-app-configuration
 ms.custom:
 ms.topic: conceptual
-ms.date: 05/13/2024
+ms.date: 06/04/2025
 ---
 
 # Soft delete
@@ -53,7 +53,7 @@ To list deleted App Configuration stores, or get an individual store by name the
 
 ## Billing implications
 
-There won't be any charges for the soft deleted stores. Once you recover a soft deleted store, the usual charges will start applying. Soft delete isn't available with free tier.
+There won't be any charges for the soft deleted stores. Once you recover a soft deleted store, the usual charges will start applying. Soft delete isn't available in the Free and Developer tiers.
 
 ## Next steps