mcp-instana 0.2.1__py3-none-any.whl → 0.3.0__py3-none-any.whl

src/event/events_tools.py

@@ -25,6 +25,8 @@ except ImportError:
     logger.error("Failed to import event resources API", exc_info=True)
     raise
 
+from mcp.types import ToolAnnotations
+
 from src.core.utils import BaseInstanaClient, register_as_tool, with_header_auth
 
 logger = logging.getLogger(__name__)
@@ -153,7 +155,10 @@ class AgentMonitoringEventsMCPTools(BaseInstanaClient):
 
         return summary
 
-    @register_as_tool
+    @register_as_tool(
+        title="Get Event",
+        annotations=ToolAnnotations(readOnlyHint=True, destructiveHint=False)
+    )
     @with_header_auth(EventsApi)
     async def get_event(self, event_id: str, ctx=None, api_client=None) -> Dict[str, Any]:
         """
@@ -238,7 +243,10 @@ class AgentMonitoringEventsMCPTools(BaseInstanaClient):
             logger.error(f"Error in get_event: {e}", exc_info=True)
             return {"error": f"Failed to get event: {e!s}", "event_id": event_id}
 
-    @register_as_tool
+    @register_as_tool(
+        title="Get Kubernetes Info Events",
+        annotations=ToolAnnotations(readOnlyHint=True, destructiveHint=False)
+    )
     @with_header_auth(EventsApi)
     async def get_kubernetes_info_events(self,
                                          from_time: Optional[int] = None,
@@ -383,7 +391,10 @@ class AgentMonitoringEventsMCPTools(BaseInstanaClient):
                 "details": str(e)
             }
 
-    @register_as_tool
+    @register_as_tool(
+        title="Get Agent Monitoring Events",
+        annotations=ToolAnnotations(readOnlyHint=True, destructiveHint=False)
+    )
     @with_header_auth(EventsApi)
     async def get_agent_monitoring_events(self,
                                           query: Optional[str] = None,
@@ -525,7 +536,10 @@ class AgentMonitoringEventsMCPTools(BaseInstanaClient):
             }
 
 
-    @register_as_tool
+    @register_as_tool(
+        title="Get Issues",
+        annotations=ToolAnnotations(readOnlyHint=True, destructiveHint=False)
+    )
     @with_header_auth(EventsApi)
     async def get_issues(self,
                              query: Optional[str] = None,
@@ -593,7 +607,10 @@ class AgentMonitoringEventsMCPTools(BaseInstanaClient):
             logger.error(f"Error in get_issue_events: {e}", exc_info=True)
             return {"error": f"Failed to get issue events: {e!s}"}
 
-    @register_as_tool
+    @register_as_tool(
+        title="Get Incidents",
+        annotations=ToolAnnotations(readOnlyHint=True, destructiveHint=False)
+    )
     @with_header_auth(EventsApi)
     async def get_incidents(self,
                              query: Optional[str] = None,
@@ -661,7 +678,10 @@ class AgentMonitoringEventsMCPTools(BaseInstanaClient):
             logger.error(f"Error in get_incident_events: {e}", exc_info=True)
             return {"error": f"Failed to get incident events: {e!s}"}
 
-    @register_as_tool
+    @register_as_tool(
+        title="Get Changes",
+        annotations=ToolAnnotations(readOnlyHint=True, destructiveHint=False)
+    )
     @with_header_auth(EventsApi)
     async def get_changes(self,
                              query: Optional[str] = None,
@@ -729,7 +749,10 @@ class AgentMonitoringEventsMCPTools(BaseInstanaClient):
             logger.error(f"Error in get_change_events: {e}", exc_info=True)
             return {"error": f"Failed to get change events: {e!s}"}
 
-    @register_as_tool
+    @register_as_tool(
+        title="Get Events By IDs",
+        annotations=ToolAnnotations(readOnlyHint=True, destructiveHint=False)
+    )
     @with_header_auth(EventsApi)
     async def get_events_by_ids(
         self,

src/infrastructure/infrastructure_analyze.py

@@ -33,6 +33,8 @@ except ImportError as e:
     logger.error(f"Error importing Instana SDK: {e}", exc_info=True)
     raise
 
+from mcp.types import ToolAnnotations
+
 from src.core.utils import BaseInstanaClient, register_as_tool, with_header_auth
 
 # Configure logger for this module
@@ -50,7 +52,10 @@ class InfrastructureAnalyzeMCPTools(BaseInstanaClient):
         """Initialize the Infrastructure Analyze MCP tools client."""
         super().__init__(read_token=read_token, base_url=base_url)
 
-    @register_as_tool
+    @register_as_tool(
+        title="Get Available Metrics",
+        annotations=ToolAnnotations(readOnlyHint=True, destructiveHint=False)
+    )
     @with_header_auth(InfrastructureAnalyzeApi)
     async def get_available_metrics(self,
                                     payload: Optional[Union[Dict[str, Any], str]] = None,
@@ -186,7 +191,10 @@ class InfrastructureAnalyzeMCPTools(BaseInstanaClient):
             logger.error(f"Error in get_available_metrics: {e}", exc_info=True)
             return {"error": f"Failed to get available metrics: {e!s}"}
 
-    @register_as_tool
+    @register_as_tool(
+        title="Get Entities",
+        annotations=ToolAnnotations(readOnlyHint=True, destructiveHint=False)
+    )
     @with_header_auth(InfrastructureAnalyzeApi)
     async def get_entities(self,
                            payload: Optional[Union[Dict[str, Any], str]] = None,
@@ -301,7 +309,10 @@ class InfrastructureAnalyzeMCPTools(BaseInstanaClient):
             logger.error(f"Error in get_entities: {e}", exc_info=True)
             return {"error": f"Failed to get entities: {e!s}"}
 
-    @register_as_tool
+    @register_as_tool(
+        title="Get Aggregated Entity Groups",
+        annotations=ToolAnnotations(readOnlyHint=True, destructiveHint=False)
+    )
     @with_header_auth(InfrastructureAnalyzeApi)
     async def get_aggregated_entity_groups(self,
                                            payload: Optional[Union[Dict[str, Any], str]] = None,
@@ -502,7 +513,10 @@ class InfrastructureAnalyzeMCPTools(BaseInstanaClient):
                 "error": f"Failed to summarize results: {e!s}"
             }
 
-    @register_as_tool
+    @register_as_tool(
+        title="Get Available Plugins",
+        annotations=ToolAnnotations(readOnlyHint=True, destructiveHint=False)
+    )
     @with_header_auth(InfrastructureAnalyzeApi)
     async def get_available_plugins(self,
                                     payload: Optional[Union[Dict[str, Any], str]] = None,

src/infrastructure/infrastructure_catalog.py

@@ -20,6 +20,8 @@ except ImportError as e:
     logger.error(f"Error importing Instana SDK: {e}", exc_info=True)
     raise
 
+from mcp.types import ToolAnnotations
+
 from src.core.utils import BaseInstanaClient, register_as_tool, with_header_auth
 
 # Configure logger for this module
@@ -32,7 +34,10 @@ class InfrastructureCatalogMCPTools(BaseInstanaClient):
         """Initialize the Infrastructure Catalog MCP tools client."""
         super().__init__(read_token=read_token, base_url=base_url)
 
-    @register_as_tool
+    @register_as_tool(
+        title="Get Available Payload Keys By Plugin ID",
+        annotations=ToolAnnotations(readOnlyHint=True, destructiveHint=False)
+    )
     @with_header_auth(InfrastructureCatalogApi)
     async def get_available_payload_keys_by_plugin_id(self,
                                                       plugin_id: str,
@@ -123,7 +128,10 @@ class InfrastructureCatalogMCPTools(BaseInstanaClient):
             return {"error": f"Failed to get payload keys: {e!s}", "plugin_id": plugin_id}
 
 
-    @register_as_tool
+    @register_as_tool(
+        title="Get Infrastructure Catalog Metrics",
+        annotations=ToolAnnotations(readOnlyHint=True, destructiveHint=False)
+    )
     @with_header_auth(InfrastructureCatalogApi)
     async def get_infrastructure_catalog_metrics(self,
                                                  plugin: str,
@@ -160,10 +168,22 @@ class InfrastructureCatalogMCPTools(BaseInstanaClient):
 
             # Handle different response types
             if isinstance(result, list):
-                # If it's a list of metric names, limit to first 50
-                limited_metrics = result[:50]
-                logger.debug(f"Received {len(result)} metrics for plugin {plugin}, returning first {len(limited_metrics)}")
-                return limited_metrics
+                # If it's a list of metric objects or names, extract metric names
+                metric_names = []
+                for item in result[:50]:  # Limit to first 50
+                    if isinstance(item, str):
+                        # Already a string (metric name)
+                        metric_names.append(item)
+                    elif isinstance(item, dict):
+                        # Extract metric name from metric object
+                        metric_name = item.get('metricId') or item.get('label') or str(item)
+                        metric_names.append(metric_name)
+                    else:
+                        # Convert to string
+                        metric_names.append(str(item))
+
+                logger.debug(f"Received {len(result)} metrics for plugin {plugin}, returning first {len(metric_names)}")
+                return metric_names
 
             elif hasattr(result, 'to_dict'):
                 # If it's an SDK object with to_dict method
@@ -171,14 +191,35 @@ class InfrastructureCatalogMCPTools(BaseInstanaClient):
 
                 # Check if the dict contains a list of metrics
                 if isinstance(result_dict, list):
-                    limited_metrics = result_dict[:50]
-                    logger.debug(f"Received {len(result_dict)} metrics for plugin {plugin}, returning first {len(limited_metrics)}")
-                    return limited_metrics
+                    metric_names = []
+                    for item in result_dict[:50]:  # Limit to first 50
+                        if isinstance(item, str):
+                            metric_names.append(item)
+                        elif isinstance(item, dict):
+                            metric_name = item.get('metricId') or item.get('label') or str(item)
+                            metric_names.append(metric_name)
+                        else:
+                            metric_names.append(str(item))
+
+                    logger.debug(f"Received {len(result_dict)} metrics for plugin {plugin}, returning first {len(metric_names)}")
+                    return metric_names
                 elif isinstance(result_dict, dict):
                     # Try to extract metric names from dict structure
                     if 'metrics' in result_dict:
-                        metrics = result_dict['metrics'][:50] if isinstance(result_dict['metrics'], list) else []
-                        return metrics
+                        metrics_list = result_dict['metrics']
+                        if isinstance(metrics_list, list):
+                            metric_names = []
+                            for item in metrics_list[:50]:  # Limit to first 50
+                                if isinstance(item, str):
+                                    metric_names.append(item)
+                                elif isinstance(item, dict):
+                                    metric_name = item.get('metricId') or item.get('label') or str(item)
+                                    metric_names.append(metric_name)
+                                else:
+                                    metric_names.append(str(item))
+                            return metric_names
+                        else:
+                            return [f"Metrics field is not a list for plugin {plugin}"]
                     else:
                         return [f"Unexpected dict structure for plugin {plugin}"]
                 else:
@@ -193,7 +234,10 @@ class InfrastructureCatalogMCPTools(BaseInstanaClient):
             return [f"Error: Failed to get metric catalog for plugin '{plugin}': {e!s}"]
 
 
-    @register_as_tool
+    @register_as_tool(
+        title="Get Infrastructure Catalog Plugins",
+        annotations=ToolAnnotations(readOnlyHint=True, destructiveHint=False)
+    )
     @with_header_auth(InfrastructureCatalogApi)
     async def get_infrastructure_catalog_plugins(self, ctx=None, api_client=None) -> Dict[str, Any]:
         """
@@ -263,7 +307,10 @@ class InfrastructureCatalogMCPTools(BaseInstanaClient):
 
 
 
-    @register_as_tool
+    @register_as_tool(
+        title="Get Infrastructure Catalog Plugins With Custom Metrics",
+        annotations=ToolAnnotations(readOnlyHint=True, destructiveHint=False)
+    )
     @with_header_auth(InfrastructureCatalogApi)
     async def get_infrastructure_catalog_plugins_with_custom_metrics(self, ctx=None, api_client=None) -> Dict[str, Any] | List[Dict[str, Any]]:
         """
@@ -303,7 +350,10 @@ class InfrastructureCatalogMCPTools(BaseInstanaClient):
             return {"error": f"Failed to get plugins with custom metrics: {e!s}"}
 
 
-    @register_as_tool
+    @register_as_tool(
+        title="Get Tag Catalog",
+        annotations=ToolAnnotations(readOnlyHint=True, destructiveHint=False)
+    )
     @with_header_auth(InfrastructureCatalogApi)
     async def get_tag_catalog(self, plugin: str, ctx=None, api_client=None) -> Dict[str, Any]:
         """
@@ -388,7 +438,10 @@ class InfrastructureCatalogMCPTools(BaseInstanaClient):
             return {"error": f"Failed to get tag catalog: {e!s}"}
 
 
-    @register_as_tool
+    @register_as_tool(
+        title="Get Tag Catalog All",
+        annotations=ToolAnnotations(readOnlyHint=True, destructiveHint=False)
+    )
     @with_header_auth(InfrastructureCatalogApi)
     async def get_tag_catalog_all(self, ctx=None, api_client=None) -> Dict[str, Any]:
         """
@@ -507,7 +560,10 @@ class InfrastructureCatalogMCPTools(BaseInstanaClient):
         return summary
 
 
-    @register_as_tool
+    @register_as_tool(
+        title="Get Infrastructure Catalog Search Fields",
+        annotations=ToolAnnotations(readOnlyHint=True, destructiveHint=False)
+    )
     @with_header_auth(InfrastructureCatalogApi)
     async def get_infrastructure_catalog_search_fields(self, ctx=None, api_client=None) -> List[str] | Dict[str, Any]:
         """

src/infrastructure/infrastructure_metrics.py

@@ -9,6 +9,7 @@ import logging
 from datetime import datetime
 from typing import Any, Dict, List, Optional, Union
 
+from mcp.types import ToolAnnotations
 from pydantic import StrictBool
 
 from src.core.utils import (
@@ -40,7 +41,10 @@ class InfrastructureMetricsMCPTools(BaseInstanaClient):
         """Initialize the Infrastructure Analyze MCP tools client."""
         super().__init__(read_token=read_token, base_url=base_url)
 
-    @register_as_tool
+    @register_as_tool(
+        title="Get Infrastructure Metrics",
+        annotations=ToolAnnotations(readOnlyHint=True, destructiveHint=False)
+    )
     @with_header_auth(InfrastructureMetricsApi)
     async def get_infrastructure_metrics(self,
                                          offline: Optional[StrictBool] = False,

src/infrastructure/infrastructure_resources.py

@@ -25,6 +25,8 @@ except ImportError:
     logger.error("Failed to import infrastructure resources API", exc_info=True)
     raise
 
+from mcp.types import ToolAnnotations
+
 from src.core.utils import BaseInstanaClient, register_as_tool, with_header_auth
 
 # Configure logger for this module
@@ -37,7 +39,10 @@ class InfrastructureResourcesMCPTools(BaseInstanaClient):
         """Initialize the Infrastructure Resources MCP tools client."""
         super().__init__(read_token=read_token, base_url=base_url)
 
-    @register_as_tool
+    @register_as_tool(
+        title="Get Monitoring State",
+        annotations=ToolAnnotations(readOnlyHint=True, destructiveHint=False)
+    )
     @with_header_auth(InfrastructureResourcesApi)
     async def get_monitoring_state(self, ctx=None, api_client=None) -> Dict[str, Any]:
         """
@@ -63,7 +68,10 @@ class InfrastructureResourcesMCPTools(BaseInstanaClient):
             logger.error(f"Error in get_monitoring_state: {e}", exc_info=True)
             return {"error": f"Failed to get monitoring state: {e!s}"}
 
-    @register_as_tool
+    @register_as_tool(
+        title="Get Plugin Payload",
+        annotations=ToolAnnotations(readOnlyHint=True, destructiveHint=False)
+    )
     @with_header_auth(InfrastructureResourcesApi)
     async def get_plugin_payload(self,
                                  snapshot_id: str,
@@ -104,7 +112,10 @@ class InfrastructureResourcesMCPTools(BaseInstanaClient):
             logger.error(f"Error in get_plugin_payload: {e}", exc_info=True)
             return {"error": f"Failed to get plugin payload: {e!s}"}
 
-    @register_as_tool
+    @register_as_tool(
+        title="Get Snapshot",
+        annotations=ToolAnnotations(readOnlyHint=True, destructiveHint=False)
+    )
     @with_header_auth(InfrastructureResourcesApi)
     async def get_snapshot(self,
                            snapshot_id: str,
@@ -212,7 +223,10 @@ class InfrastructureResourcesMCPTools(BaseInstanaClient):
             logger.error(f"Error in get_snapshot: {e}", exc_info=True)
             return {"error": f"Failed to get snapshot: {e!s}"}
 
-    @register_as_tool
+    @register_as_tool(
+        title="Get Snapshots",
+        annotations=ToolAnnotations(readOnlyHint=True, destructiveHint=False)
+    )
     @with_header_auth(InfrastructureResourcesApi)
     async def get_snapshots(self,
                             query: Optional[str] = None,
@@ -367,7 +381,10 @@ class InfrastructureResourcesMCPTools(BaseInstanaClient):
 
 
 
-    @register_as_tool
+    @register_as_tool(
+        title="Post Snapshots",
+        annotations=ToolAnnotations(readOnlyHint=False, destructiveHint=False)
+    )
     @with_header_auth(InfrastructureResourcesApi)
     async def post_snapshots(self,
                              snapshot_ids: Union[List[str], str],
@@ -414,13 +431,12 @@ class InfrastructureResourcesMCPTools(BaseInstanaClient):
                 from instana_client.models.get_snapshots_query import (
                     GetSnapshotsQuery,  #type: ignore
                 )
+                from instana_client.models.time_frame import TimeFrame  #type: ignore
 
+                time_frame = TimeFrame(to=to_time, windowSize=window_size)
                 query_obj = GetSnapshotsQuery(
-                    snapshot_ids=snapshot_ids,
-                    time_frame={
-                        "to": to_time,
-                        "windowSize": window_size
-                    }
+                    snapshotIds=snapshot_ids if isinstance(snapshot_ids, list) else [snapshot_ids],
+                    timeFrame=time_frame
                 )
 
                 logger.debug("Making SDK request with without_preload_content...")
@@ -546,7 +562,10 @@ class InfrastructureResourcesMCPTools(BaseInstanaClient):
 
 
 
-    @register_as_tool
+    @register_as_tool(
+        title="Software Versions",
+        annotations=ToolAnnotations(readOnlyHint=True, destructiveHint=False)
+    )
     @with_header_auth(InfrastructureResourcesApi)
     async def software_versions(self, ctx=None, api_client=None) -> Dict[str, Any]:
         """

src/infrastructure/infrastructure_topology.py

@@ -22,6 +22,8 @@ except ImportError:
     logger.error("Failed to import infrastructure topology API", exc_info=True)
     raise
 
+from mcp.types import ToolAnnotations
+
 from src.core.utils import BaseInstanaClient, register_as_tool, with_header_auth
 
 # Configure logger for this module
@@ -49,7 +51,10 @@ class InfrastructureTopologyMCPTools(BaseInstanaClient):
         """Initialize the Infrastructure Topology MCP tools client."""
         super().__init__(read_token=read_token, base_url=base_url)
 
-    @register_as_tool
+    @register_as_tool(
+        title="Get Related Hosts",
+        annotations=ToolAnnotations(readOnlyHint=True, destructiveHint=False)
+    )
     @with_header_auth(InfrastructureTopologyApi)
     async def get_related_hosts(self,
                                 snapshot_id: str,
@@ -110,7 +115,10 @@ class InfrastructureTopologyMCPTools(BaseInstanaClient):
             logger.error(f"Error in get_related_hosts: {e}", exc_info=True)
             return {"error": f"Failed to get related hosts: {e!s}"}
 
-    @register_as_tool
+    @register_as_tool(
+        title="Get Topology",
+        annotations=ToolAnnotations(readOnlyHint=True, destructiveHint=False)
+    )
     @with_header_auth(InfrastructureTopologyApi)
     async def get_topology(self,
                            include_data: Optional[bool] = False,