Merging changes synced from https://github.com/MicrosoftDocs/azure-dev-docs-pr (branch live)

Author: Learn Build Service GitHub App

articles/azure-mcp-server/TOC.yml

@@ -41,6 +41,8 @@ items:
           href: tools/azure-aks.md
         - name: Azure Load Testing
           href: tools/azure-load-testing.md
+        - name: Azure Marketplace
+          href: tools/azure-marketplace.md
         - name: Azure MCP tool
           href: tools/azure-mcp-tool.md
         - name: Azure Monitor
@@ -57,6 +59,8 @@ items:
           href: tools/azure-sql.md
         - name: Azure Storage
           href: tools/storage.md
+        - name: Azure Virtual Desktop
+          href: tools/azure-virtual-desktop.md
         - name: Resource Group
           href: tools/resource-group.md
         - name: Subscription

articles/azure-mcp-server/includes/tools/supported-azure-services.md

@@ -3,7 +3,7 @@
  ms.author: diberry
  ms.service: azure-mcp-server
  ms.topic: include
- ms.date: 08/04/2025
+ ms.date: 08/05/2025
 ---
 
 ## Available tools
@@ -27,6 +27,7 @@ Azure MCP Server provides the following tools for Azure services and Azure-relat
 | [Azure Key Vault](../../tools/key-vault-key.md) | List and create keys, secrets, certificates in Azure Key Vault. |
 | [Azure Kubernetes Service](../../tools/azure-aks.md) | List Azure Kubernetes Service clusters. |
 | [Azure Load Testing](../../tools/azure-load-testing.md) | Create, run, and see load testing. |
+| [Azure Marketplace](../../tools/azure-marketplace.md) | Discover Azure Marketplace products and offers. |
 | [Azure MCP tool](../../tools/azure-mcp-tool.md) | Discover and manage available Azure MCP Server tools. |
 | [Azure Monitor](../../tools/monitor.md) | Query Azure Monitor logs and metrics. |
 | [Azure Native ISV](../../tools/azure-native-isv.md) | Work with Azure Native ISV services, including Datadog integration for monitoring and observability. |
@@ -35,6 +36,7 @@ Azure MCP Server provides the following tools for Azure services and Azure-relat
 | [Azure Service Bus](../../tools/service-bus.md) | Work with Azure Service Bus messaging services. |
 | [Azure SQL](../../tools/azure-sql.md) | Work with Azure SQL Database servers, databases, firewall rules, and elastic pools. |
 | [Azure Storage](../../tools/storage.md) | List Azure Storage accounts, containers, blobs, and tables. |
+| [Azure Virtual Desktop](../../tools/azure-virtual-desktop.md) | Manage Azure Virtual Desktop host pools, session hosts, and user sessions. |
 | [Resource Groups](../../tools/resource-group.md) | List Azure resource groups. |
 | [Subscription](../../tools/subscription.md) | List Azure subscriptions. |
 | [Terraform best practices for Azure](../../tools/azure-terraform-best-practices.md) | Get guidance on implementing Terraform for Azure resources. |

articles/azure-mcp-server/tools/app-configuration.md

@@ -94,7 +94,7 @@ Example prompts include:
 
 ## Set key-value setting
 
-The Azure MCP Server can create or update a [key-value setting](/azure/azure-app-configuration/concept-key-value) in an App Configuration store.
+Set or update a [key-value setting](/azure/azure-app-configuration/concept-key-value) in an App Configuration store. 
 
 Example prompts include:
 
@@ -106,11 +106,12 @@ Example prompts include:
 
 | Parameter | Required or optional | Description |
 |-----------|-------------|-------------|
-| **Subscription** | Required | The ID of the subscription containing the App Configuration store.          |
 | **Account name** | Required | The name of the App Configuration store.                                    |
 | **Key**          | Required | The key name of the setting to set.                                         |
 | **Value**        | Required | The value to set for the key.                                               |
 | **Label**        | Optional | The label of the setting to set.                                            |
+| **Tags** | Optional | The tags to associate with the configuration key. Tags should be in the format 'key=value'. You can specify multiple tags. |
+| **Content type** | Optional | The content type of the configuration value. This value indicates how the value should be interpreted or parsed. |
 
 ## Show key-value setting
 

articles/azure-mcp-server/tools/azure-aks.md

@@ -9,7 +9,7 @@ author: diberry
 ms.author: diberry
 ms.service: azure-mcp-server
 ms.topic: reference
-ms.date: 7/22/2025
+ms.date: 08/05/2025
 ---
 
 # Azure Kubernetes Service tools for the Azure MCP Server
@@ -43,6 +43,23 @@ Example prompts include:
 |-----------|-------------|-------------|
 | Subscription | Required | The ID or name of your Azure subscription containing the AKS clusters. |
 
+## Get cluster details
+
+Gets detailed information about a specific Azure Kubernetes Service (AKS) cluster, including configuration, status, node pools, and networking details. This operation helps you examine cluster properties and monitor the health of your Kubernetes environment.
+
+Example prompts include:
+
+- **Cluster details**: "Show me details about the 'production-aks' cluster in my subscription."
+- **Check cluster**: "Get information about cluster 'dev-kubernetes' in subscription 'dev-123'."
+- **Cluster status**: "What's the current status of my 'staging-aks' cluster?"
+- **View configuration**: "Show me the configuration for cluster 'web-app-cluster'."
+- **Cluster health**: "Get detailed health information for my 'ml-workload-aks' cluster."
+- **Node pool info**: "What are the node pool details for cluster 'analytics-cluster'?"
+
+| Parameter | Required or optional | Description |
+|-----------|-------------|-------------|
+| **Name** | Required | The name of the AKS cluster to retrieve details for. |
+
 
 ## Related content
 

articles/azure-mcp-server/tools/azure-best-practices.md

@@ -7,54 +7,20 @@ content_well_notification:
   - AI-contribution
 ai-usage: ai-assisted
 ms.topic: reference
-ms.date: 07/22/2025
+ms.date: 08/05/2025
 author: diberry
 ms.author: diberry
 ---
 
 # Azure best practices tools
 
-This article describes the best practices tools available in Azure MCP Server that provide guidance on Azure service usage, development, and deployment.
+This article describes the best practices tools in Azure MCP Server that provide guidance on Azure service usage, development, and deployment.
 
-Azure best practices tools offer recommendations for Azure Functions development, deployment strategies, and Azure SDK implementation patterns to help you build robust, secure, and efficient Azure applications.
-
-
-## Azure Functions
-
-## Get code generation best practices
-
-<!-- azmcp bestpractices azurefunctions get-code-generation -->
-
-Returns best practices for [Azure Functions](/azure/azure-functions/) code generation. Use this tool to get guidance on writing efficient and maintainable Azure Functions code.
-
-Example prompts include:
-
-- **General best practices**: "What are the best practices for Azure Functions code generation?"
-- **Show recommendations**: "Show me code generation best practices for Azure Functions."
-- **Development guidance**: "I need guidance on writing Azure Functions code, what should I follow?"
-- **Recommended patterns**: "What are the recommended patterns for Azure Functions development?"
-- **Efficient coding**: "Help me understand how to write efficient Azure Functions code."
-
-### Get deployment best practices
-
-<!-- azmcp bestpractices azurefunctions get-deployment -->
-
-Returns best practices for Azure Functions deployment. Use this tool to get guidance on deploying Azure Functions applications efficiently and securely.
-
-Example prompts include:
-
-- **Deployment best practices**: "What are the best practices for deploying Azure Functions?"
-- **CI/CD setup**: "How should I set up CI/CD for my Azure Functions app?"
-- **Deployment recommendations**: "Show me deployment recommendations for Azure Functions."
-- **Production deployment**: "What's the best way to deploy Azure Functions to production?"
-- **Secure pipeline**: "I need guidance on setting up a secure deployment pipeline for Azure Functions."
-
-
-## Azure SDK
+Azure best practices tools offer recommendations for Azure service implementation patterns to help you build robust, secure, and efficient Azure applications.
 
 ## Get best practices
 
-<!-- azmcp bestpractices general get -->
+<!-- azmcp bestpractices get -->
 
 Returns best practices for secure, production-grade Azure SDK usage. Use this tool to get guidance on implementing Azure services in your applications.
 
@@ -66,6 +32,10 @@ Example prompts include:
 - **Connection management**: "What's the recommended way to manage connections with Azure services?"
 - **Secure implementation**: "I need help implementing Azure services securely in my application"
 
+| Parameter | Required or optional | Description |
+|-----------|-------------|-------------|
+| Resource | Required | The type of Azure resource to get best practices for. Options include: 'general' (general Azure best practices), 'azurefunctions' (Azure Functions specific best practices), or 'static-web-app' (Azure Static Web Apps specific best practices). |
+| Action | Required | The action to perform. Options include: 'all' (best practices for both code generation and deployment, only for static-web-app), 'code-generation' (best practices for code generation, for general and azurefunctions), or 'deployment' (best practices for deployment, for general and azurefunctions). |
 
 ## Related resources
 

articles/azure-mcp-server/tools/azure-marketplace.md

@@ -0,0 +1,57 @@
+---
+title: Marketplace Tools - Azure MCP Server
+description: Learn how to use the Azure MCP Server with Azure Marketplace to discover and manage marketplace products and offers.
+keywords: azure mcp server, azmcp, marketplace, products, offers, solutions
+ms.service: azure-mcp-server
+ms.topic: reference
+ms.date: 08/05/2025
+author: diberry
+ms.author: diberry
+content_well_notification: 
+  - AI-contribution
+ai-usage: ai-assisted
+---
+
+# Marketplace tools for the Azure MCP Server
+
+The Azure MCP Server enables you to manage Azure resources, including Azure Marketplace products, by using natural language prompts. With this capability, you can quickly discover and retrieve information about marketplace offerings without needing to remember complex syntax.
+
+[Azure Marketplace](/azure/marketplace/) is an online store for solutions that are built on or built for Azure. It's designed for IT professionals and developers. The marketplace offers a catalog of applications, services, and solutions from Microsoft and partners that help you accelerate your cloud adoption and digital transformation.
+
+[!INCLUDE [tip-about-params](../includes/tools/parameter-consideration.md)]
+
+## Get marketplace product information
+
+<!--
+azmcp marketplace productget --product-id --include-stop-sold-plans --language --market --lookup-offer-in-tenant-level --plan-id --sku-id --include-service-instruction-templates --partner-tenant-id --pricing-audience
+-->
+
+Retrieve detailed information about a specific product or offer from Azure Marketplace. This operation helps you get comprehensive details about marketplace solutions, including pricing, plans, and availability information for evaluation and procurement decisions.
+
+Example prompts include:
+
+- **Get product details**: "Show me information about product ID 'microsoft-ads.windows-data-science-vm'"
+- **Check specific plan**: "Get marketplace product details for plan ID 'standard-data-science-vm'"
+- **View pricing information**: "Retrieve marketplace product info with pricing audience set to 'public'"
+- **Get localized information**: "Show marketplace product in French language for France market"
+- **Include service templates**: "Get product details including service instruction templates"
+
+| Parameter | Required or optional | Description |
+|-----------|-------------|-------------|
+| **Product ID** | Required | The unique identifier for the marketplace product you want to retrieve information about. |
+| **Include stop sold plans** | Optional | Whether to include plans that are no longer available for purchase in the results. |
+| **Language** | Optional | The language code for localized product information (for example, 'en-us', 'fr-fr'). |
+| **Market** | Optional | The market or region code to get region-specific pricing and availability (for example, 'US', 'FR'). |
+| **Lookup offer in tenant level** | Optional | Whether to look up the offer at the tenant level for organization-specific information. |
+| **Plan ID** | Optional | The specific plan identifier within the product to get detailed plan information. |
+| **SKU ID** | Optional | The specific pricing SKU identifier for a specific product variant or configuration. |
+| **Include service instruction templates** | Optional | Whether to include service instruction templates in the response for deployment guidance. |
+| **Pricing audience** | Optional | The target audience for pricing information (for example, 'public', 'private', 'government'). |
+
+## Related content
+
+- [What are the Azure MCP Server tools?](index.md)
+- [Get started using Azure MCP Server](../get-started.md)
+- [Azure Marketplace documentation](/azure/marketplace/)
+- [Find solutions in Azure Marketplace](/marketplace/find-solutions-azure-marketplace)
+- [Azure Marketplace purchasing overview](/marketplace/purchasing-overview)

articles/azure-mcp-server/tools/azure-virtual-desktop.md

@@ -0,0 +1,83 @@
+---
+title: Azure Virtual Desktop Tools
+description: Learn how to use the Azure MCP Server with Azure Virtual Desktop.
+keywords: azure mcp server, azmcp, azure virtual desktop, avd, host pools, session hosts
+author: diberry
+ms.author: diberry
+ms.date: 08/06/2025
+content_well_notification: 
+  - AI-contribution
+ai-usage: ai-assisted
+ms.topic: reference
+ms.custom: build-2025
+---
+
+# Azure Virtual Desktop tools for the Azure MCP Server
+
+The Azure MCP Server enables you to manage Azure Virtual Desktop resources by using natural language prompts. You can list host pools, view session hosts, monitor user sessions, and manage your virtual desktop infrastructure without needing to remember complex command syntax.
+
+[Azure Virtual Desktop](/azure/virtual-desktop/overview) is a desktop and app virtualization service that runs on the cloud. It provides a full Windows experience with optimized Office 365 ProPlus, and supports Remote Desktop Services environments.
+
+[!INCLUDE [tip-about-params](../includes/tools/parameter-consideration.md)]
+
+## Conditional parameters
+
+Some of the Azure Virtual Desktop tools require **one** of the following parameter options within the conversation context:
+
+- **Option 1**: Host pool name
+- **Option 2**: Host pool resource ID
+
+Don't provide both parameters (host pool name and host pool resource ID) together, because this combination creates conflicting inputs. When you provide a host pool resource ID, the tool uses it instead of searching by name.
+
+## Host pools: list host pools
+
+The Azure MCP Server can list all host pools in a subscription or resource group. This feature provides an overview of your virtual desktop infrastructure and helps you manage your desktop deployment.
+
+Example prompts include:
+
+- **List all host pools**: "Show me all host pools in my subscription."
+- **View host pools**: "What host pools do I have available?"
+- **Find host pools**: "List all virtual desktop host pools."
+- **Query host pools**: "Show available host pools in my environment."
+- **Check infrastructure**: "Get all Azure Virtual Desktop host pools."
+
+## Host pools: list session hosts in a host pool
+
+The Azure MCP Server can list all session hosts in a host pool. This functionality helps you monitor your virtual machines and understand the capacity and status of your virtual desktop environment.
+
+Example prompts include:
+
+- **List session hosts**: "Show me all session hosts in the 'production-hostpool' host pool."
+- **View VMs**: "What session hosts are in my host pool?"
+- **Find hosts**: "List all virtual machines in hostpool 'dev-environment'."
+- **Query capacity**: "Show session hosts in my virtual desktop pool."
+- **Check hosts**: "Get all session hosts for host pool ID '/subscriptions/abc123/resourceGroups/rg/providers/Microsoft.DesktopVirtualization/hostPools/pool1'."
+
+| Parameter | Required or optional | Description |
+|-----------|-------------|-------------|
+| **Host pool** | [Conditionally](#conditional-parameters) required | The name of the Azure Virtual Desktop host pool. This is the unique name you choose for your host pool. |
+| **Host pool resource ID** | [Conditionally](#conditional-parameters) required | The Azure resource ID of the host pool. When you provide this ID, the server uses it instead of searching by name. |
+
+## Host pools: list user sessions
+
+The Azure MCP Server can list all user sessions on a specific session host in a host pool. This capability helps you monitor active users, troubleshoot connection issues, and manage user workloads.
+
+Example prompts include:
+
+- **List user sessions**: "Show me all user sessions on session host 'vm-prod-001' in host pool 'production-pool'."
+- **View active users**: "What users are connected to session host 'desktop-vm-02'?"
+- **Find sessions**: "List all active sessions on host 'avd-host-001'."
+- **Monitor users**: "Show user sessions for session host in my host pool."
+- **Check connections**: "Get all user sessions on virtual machine 'session-host-03'."
+
+| Parameter | Required or optional | Description |
+|-----------|-------------|-------------|
+| **Host pool** | [Conditionally](#conditional-parameters) required | The name of the Azure Virtual Desktop host pool. This is the unique name you choose for your host pool. |
+| **Host pool resource ID** | [Conditionally](#conditional-parameters) required | The Azure resource ID of the host pool. When you provide this ID, the server uses it instead of searching by name. |
+| **Session host** | Required | The name of the session host. This name is the computer name of the virtual machine in the host pool. |
+
+## Related content
+
+- [What are the Azure MCP Server tools?](index.md)
+- [Get started using Azure MCP Server](../get-started.md)
+- [Azure Virtual Desktop documentation](/azure/virtual-desktop/)