diff --git a/.vscode/cspell.json b/.vscode/cspell.json index 96d9cebd59..5c2660afce 100644 --- a/.vscode/cspell.json +++ b/.vscode/cspell.json @@ -416,7 +416,6 @@ "functionapp", "functionapps", "germanynorth", - "gethealth", "grpcio", "gsaascend", "gsamas", diff --git a/eng/tools/ToolDescriptionEvaluator/consolidated-tools.json b/eng/tools/ToolDescriptionEvaluator/consolidated-tools.json index 4ea3d410b7..17610d2a4c 100644 --- a/eng/tools/ToolDescriptionEvaluator/consolidated-tools.json +++ b/eng/tools/ToolDescriptionEvaluator/consolidated-tools.json @@ -196,7 +196,7 @@ "mcp_azure-mcp-ser_azmcp_grafana_list", "mcp_azure-mcp-ser_azmcp_datadog_monitoredresources_list", "mcp_azure-mcp-ser_azmcp_monitor_workspace_list", - "mcp_azure-mcp-ser_azmcp_monitor_healthmodels_entity_gethealth", + "mcp_azure-mcp-ser_azmcp_monitor_healthmodels_entity_get", "mcp_azure-mcp-ser_azmcp_monitor_metrics_definitions", "mcp_azure-mcp-ser_azmcp_monitor_metrics_query", "mcp_azure-mcp-ser_azmcp_monitor_resource_log_query", @@ -208,7 +208,7 @@ ] }, { - "name": "deploy_resources_and_applications_to_azure", + "name": "deploy_resources_and_applications_to_azure", "description": "Deploy resources and applications to Azure. Retrieve application logs, access Bicep and Terraform rules, get CI/CD pipeline guidance, and generate deployment plans.", "parameters": { "intent": { diff --git a/eng/tools/ToolDescriptionEvaluator/prompts.json b/eng/tools/ToolDescriptionEvaluator/prompts.json index f37b2c0034..8e3f5a6cdc 100644 --- a/eng/tools/ToolDescriptionEvaluator/prompts.json +++ b/eng/tools/ToolDescriptionEvaluator/prompts.json @@ -533,7 +533,7 @@ "azmcp_monitor_activitylog_list": [ "List the activity logs of the last month for " ], - "azmcp_monitor_healthmodels_entity_gethealth": [ + "azmcp_monitor_healthmodels_entity_get": [ "Show me the health status of entity using the health model " ], "azmcp_monitor_metrics_definitions": [ @@ -790,4 +790,4 @@ "I want to design a cloud app for ordering groceries", "How can I design a cloud service in Azure that will store and present videos for users?" ] -} \ No newline at end of file +} diff --git a/eng/tools/ToolDescriptionEvaluator/tools.json b/eng/tools/ToolDescriptionEvaluator/tools.json index 0fdbbd8a6c..61865cb9a4 100644 --- a/eng/tools/ToolDescriptionEvaluator/tools.json +++ b/eng/tools/ToolDescriptionEvaluator/tools.json @@ -6141,9 +6141,9 @@ ] }, { - "name": "gethealth", + "name": "get", "description": "Retrieve the health status of an entity for a given Azure Monitor Health Model. Use this tool ONLY when the user mentions a specific health model name and asks for health status, health events. This provides application-level health monitoring with custom health models, not basic Azure resource availability.\r\nFor basic Azure resource availability status, use Resource Health tool instead `azmcp_resourcehealth_availability-status_get`. \r\nFor querying logs from a Log Analystics workspace, use `azmcp_monitor_workspace_log_query`. \r\nFor querying logs of a specific Azure resource, use `azmcp_monitor_resource_log_query`. \r\nRequired arguments:\r\n - --entity: The entity to get health for\r\n - --health-model: The health model name", - "command": "azmcp monitor healthmodels entity gethealth", + "command": "azmcp monitor healthmodels entity get", "option": [ { "name": "--tenant", @@ -8440,7 +8440,7 @@ }, { "name": "get", - "description": "Get the current availability status or health status of a specific Azure resource to diagnose health issues. Works with storage_account_name, virtual machine, resource group, subscription, and other Azure types. It provides detailed information about resource availability state, potential issues, and timestamps.\r\nIf health model is provided, don't use this command, instead use monitor_healthmodels_entity_gethealth tool.", + "description": "Get the current availability status or health status of a specific Azure resource to diagnose health issues. Works with storage_account_name, virtual machine, resource group, subscription, and other Azure types. It provides detailed information about resource availability state, potential issues, and timestamps.\r\nIf health model is provided, don't use this command, instead use monitor_healthmodels_entity_get tool.", "command": "azmcp resourcehealth availability-status get", "option": [ { @@ -11447,4 +11447,4 @@ ], "consolidated_azure_tools": null, "duration": 47 -} \ No newline at end of file +} diff --git a/servers/Azure.Mcp.Server/CHANGELOG.md b/servers/Azure.Mcp.Server/CHANGELOG.md index e8681eb414..0306016746 100644 --- a/servers/Azure.Mcp.Server/CHANGELOG.md +++ b/servers/Azure.Mcp.Server/CHANGELOG.md @@ -11,6 +11,7 @@ The Azure MCP Server updates automatically by default whenever a new release com ### Bugs Fixed - fix `azmcp_sql_db_rename`'s new database name binding bug [[#615](https://github.com/microsoft/mcp/issues/615)] - Fixed retained-buffer leaks across services (Kusto, EventGrid, AppLens, Speech, Cosmos, Foundry, NetworkResourceProvider) and tool loaders (BaseToolLoader, ServerToolLoader, NamespaceToolLoader, SingleProxyToolLoader) by disposing JsonDocument/HttpResponseMessage instances and cloning returned JsonElements. ([#817](https://github.com/microsoft/mcp/pull/817)) +- Change `azmcp_monitor_healthmodels_entity_gethealth` tool name to `azmcp_monitor_healthmodels_entity_get` [[#808](https://github.com/microsoft/mcp/pull/808)] ### Other Changes diff --git a/servers/Azure.Mcp.Server/docs/azmcp-commands.md b/servers/Azure.Mcp.Server/docs/azmcp-commands.md index 60766377bd..7ab8b26251 100644 --- a/servers/Azure.Mcp.Server/docs/azmcp-commands.md +++ b/servers/Azure.Mcp.Server/docs/azmcp-commands.md @@ -88,7 +88,7 @@ azmcp server start \ #### Specific Tool Filtering -Exposes only specific tools by name, providing the finest level of granularity. The `--namespace` and `--tool` options cannot be used together. Use multiple `--tool` parameters to include multiple tools. Using `--tool` automatically switches to `all` mode. +Exposes only specific tools by name, providing the finest level of granularity. The `--namespace` and `--tool` options cannot be used together. Use multiple `--tool` parameters to include multiple tools. Using `--tool` automatically switches to `all` mode. ```bash # Start MCP Server with default mode and only subscription and resource group tools @@ -1357,7 +1357,7 @@ azmcp monitor workspace log query --subscription \ ```bash # Get the health of an entity # ❌ Destructive | ✅ Idempotent | ❌ OpenWorld | ✅ ReadOnly | ❌ Secret | ❌ LocalRequired -azmcp monitor healthmodels entity gethealth --subscription \ +azmcp monitor healthmodels entity get --subscription \ --resource-group \ --health-model \ --entity @@ -1488,7 +1488,7 @@ azmcp monitor webtests update --subscription \ # List Azure Managed Lustre Filesystems available in a subscription or resource group # ❌ Destructive | ✅ Idempotent | ❌ OpenWorld | ✅ ReadOnly | ❌ Secret | ❌ LocalRequired azmcp managedlustre filesystem list --subscription \ - --resource-group + --resource-group # Create an Azure Managed Lustre filesystem # ❌ Destructive | ❌ Idempotent | ❌ OpenWorld | ❌ ReadOnly | ❌ Secret | ❌ LocalRequired diff --git a/servers/Azure.Mcp.Server/docs/e2eTestPrompts.md b/servers/Azure.Mcp.Server/docs/e2eTestPrompts.md index 9e9fa788b6..a563a9ea23 100644 --- a/servers/Azure.Mcp.Server/docs/e2eTestPrompts.md +++ b/servers/Azure.Mcp.Server/docs/e2eTestPrompts.md @@ -447,7 +447,7 @@ This file contains prompts used for end-to-end testing to ensure each tool is in | Tool Name | Test Prompt | |:----------|:----------| | azmcp_monitor_activitylog_list | List the activity logs of the last month for | -| azmcp_monitor_healthmodels_entity_gethealth | Show me the health status of entity using the health model | +| azmcp_monitor_healthmodels_entity_get | Show me the health status of entity using the health model | | azmcp_monitor_metrics_definitions | Get metric definitions for from the namespace | | azmcp_monitor_metrics_definitions | Show me all available metrics and their definitions for storage account | | azmcp_monitor_metrics_definitions | What metric definitions are available for the Application Insights resource | diff --git a/tools/Azure.Mcp.Tools.Monitor/src/Commands/HealthModels/Entity/EntityGetHealthCommand.cs b/tools/Azure.Mcp.Tools.Monitor/src/Commands/HealthModels/Entity/EntityGetHealthCommand.cs index 04e993f25f..165712a638 100644 --- a/tools/Azure.Mcp.Tools.Monitor/src/Commands/HealthModels/Entity/EntityGetHealthCommand.cs +++ b/tools/Azure.Mcp.Tools.Monitor/src/Commands/HealthModels/Entity/EntityGetHealthCommand.cs @@ -12,14 +12,14 @@ namespace Azure.Mcp.Tools.Monitor.Commands.HealthModels.Entity; public sealed class EntityGetHealthCommand(ILogger logger) : BaseMonitorHealthModelsCommand { private const string CommandTitle = "Get the health of an entity in a health model"; - private const string CommandName = "gethealth"; + private const string CommandName = "get"; public override string Name => CommandName; public override string Description => $""" Retrieve the health status of an entity for a given Azure Monitor Health Model. Use this tool ONLY when the user mentions a specific health model name and asks for health status, health events. This provides application-level health monitoring with custom health models, not basic Azure resource availability. - For basic Azure resource availability status, use Resource Health tool instead `azmcp_resourcehealth_availability-status_get`. - For querying logs from a Log Analystics workspace, use `azmcp_monitor_workspace_log_query`. - For querying logs of a specific Azure resource, use `azmcp_monitor_resource_log_query`. + For basic Azure resource availability status, use Resource Health tool instead `azmcp_resourcehealth_availability-status_get`. + For querying logs from a Log Analystics workspace, use `azmcp_monitor_workspace_log_query`. + For querying logs of a specific Azure resource, use `azmcp_monitor_resource_log_query`. Required arguments: - {MonitorOptionDefinitions.Health.Entity.Name}: The entity to get health for - {MonitorOptionDefinitions.Health.HealthModel.Name}: The health model name diff --git a/tools/Azure.Mcp.Tools.ResourceHealth/src/Commands/AvailabilityStatus/AvailabilityStatusGetCommand.cs b/tools/Azure.Mcp.Tools.ResourceHealth/src/Commands/AvailabilityStatus/AvailabilityStatusGetCommand.cs index 12bc584a0f..829d0dfa7e 100644 --- a/tools/Azure.Mcp.Tools.ResourceHealth/src/Commands/AvailabilityStatus/AvailabilityStatusGetCommand.cs +++ b/tools/Azure.Mcp.Tools.ResourceHealth/src/Commands/AvailabilityStatus/AvailabilityStatusGetCommand.cs @@ -23,7 +23,7 @@ public sealed class AvailabilityStatusGetCommand(ILogger $""" Get the current availability status or health status of a specific Azure resource to diagnose health issues. Works with storage_account_name, virtual machine, resource group, subscription, and other Azure types. It provides detailed information about resource availability state, potential issues, and timestamps. - If health model is provided, don't use this command, instead use monitor_healthmodels_entity_gethealth tool. + If health model is provided, don't use this command, instead use monitor_healthmodels_entity_get tool. """; public override string Title => CommandTitle;