Some update

Author: datgfg

README.md

@@ -88,28 +88,40 @@ MCP server for the Datadog API, enabling incident management and more.
      - `operation` (optional string): Filter by operation name.
    - **Returns**: Array of matching traces from Datadog APM.
 
-9. `list_hosts`
+9. `list_spans`
 
-   - Get list of hosts from Datadog.
+   - Get a list of spans matching a search query (Datadog Spans Search API).
    - **Inputs**:
-     - `filter` (optional string): Filter string for search results.
-     - `sort_field` (optional string): Field to sort hosts by.
-     - `sort_dir` (optional string): Sort direction (asc/desc).
-     - `start` (optional number): Starting offset for pagination.
-     - `count` (optional number): Max number of hosts to return (max: 1000).
-     - `from` (optional number): Search hosts from this UNIX timestamp.
-     - `include_muted_hosts_data` (optional boolean): Include muted hosts status and expiry.
-     - `include_hosts_metadata` (optional boolean): Include host metadata (version, platform, etc).
-   - **Returns**: Array of hosts with details including name, ID, aliases, apps, mute status, and more.
-
-10. `get_active_hosts_count`
+     - `query` (string): Search query following spans syntax.
+     - `from` (number): Minimum timestamp for requested spans (epoch seconds).
+     - `to` (number): Maximum timestamp for requested spans (epoch seconds).
+     - `sort` (optional string): Order of spans in results ('timestamp' | '-timestamp').
+     - `cursor` (optional string): Pagination cursor from previous request.
+     - `limit` (optional number): Maximum number of spans to return (default 100).
+   - **Returns**: Spans list, count, and next cursor when available.
+
+10. `list_hosts`
+
+- Get list of hosts from Datadog.
+- **Inputs**:
+  - `filter` (optional string): Filter string for search results.
+  - `sort_field` (optional string): Field to sort hosts by.
+  - `sort_dir` (optional string): Sort direction (asc/desc).
+  - `start` (optional number): Starting offset for pagination.
+  - `count` (optional number): Max number of hosts to return (max: 1000).
+  - `from` (optional number): Search hosts from this UNIX timestamp.
+  - `include_muted_hosts_data` (optional boolean): Include muted hosts status and expiry.
+  - `include_hosts_metadata` (optional boolean): Include host metadata (version, platform, etc).
+- **Returns**: Array of hosts with details including name, ID, aliases, apps, mute status, and more.
+
+11. `get_active_hosts_count`
 
     - Get the total number of active hosts in Datadog.
     - **Inputs**:
       - `from` (optional number): Number of seconds from which you want to get total number of active hosts (defaults to 2h).
     - **Returns**: Count of total active and up hosts.
 
-11. `mute_host`
+12. `mute_host`
 
     - Mute a host in Datadog.
     - **Inputs**:
@@ -119,22 +131,22 @@ MCP server for the Datadog API, enabling incident management and more.
       - `override` (optional boolean): If true and the host is already muted, replaces existing end time.
     - **Returns**: Success status and confirmation message.
 
-12. `unmute_host`
+13. `unmute_host`
 
     - Unmute a host in Datadog.
     - **Inputs**:
       - `hostname` (string): The name of the host to unmute.
     - **Returns**: Success status and confirmation message.
 
-13. `list_downtimes`
+14. `list_downtimes`
 
     - List scheduled downtimes from Datadog.
     - **Inputs**:
       - `currentOnly` (optional boolean): Return only currently active downtimes when true.
       - `monitorId` (optional number): Filter by monitor ID.
     - **Returns**: Array of scheduled downtimes with details including scope, monitor information, and schedule.
 
-14. `schedule_downtime`
+15. `schedule_downtime`
 
     - Schedule a downtime in Datadog.
     - **Inputs**:
@@ -152,20 +164,20 @@ MCP server for the Datadog API, enabling incident management and more.
         - `until` (optional number): UNIX timestamp for when the recurrence ends.
     - **Returns**: Scheduled downtime details including ID and active status.
 
-15. `cancel_downtime`
+16. `cancel_downtime`
 
     - Cancel a scheduled downtime in Datadog.
     - **Inputs**:
       - `downtimeId` (number): The ID of the downtime to cancel.
     - **Returns**: Confirmation of downtime cancellation.
 
-16. `get_rum_applications`
+17. `get_rum_applications`
 
     - Get all RUM applications in the organization.
     - **Inputs**: None.
     - **Returns**: List of RUM applications.
 
-17. `get_rum_events`
+18. `get_rum_events`
 
     - Search and retrieve RUM events from Datadog.
     - **Inputs**:
@@ -175,7 +187,7 @@ MCP server for the Datadog API, enabling incident management and more.
       - `limit` (optional number): Maximum number of events to return (default: 100).
     - **Returns**: Array of RUM events.
 
-18. `get_rum_grouped_event_count`
+19. `get_rum_grouped_event_count`
 
     - Search, group and count RUM events by a specified dimension.
     - **Inputs**:
@@ -185,7 +197,7 @@ MCP server for the Datadog API, enabling incident management and more.
       - `groupBy` (optional string): Dimension to group results by (default: "application.name").
     - **Returns**: Grouped event counts.
 
-19. `get_rum_page_performance`
+20. `get_rum_page_performance`
 
     - Get page (view) performance metrics from RUM data.
     - **Inputs**:
@@ -195,7 +207,7 @@ MCP server for the Datadog API, enabling incident management and more.
       - `metricNames` (array of strings): Array of metric names to retrieve (e.g., 'view.load_time', 'view.first_contentful_paint').
     - **Returns**: Performance metrics including average, min, max, and count for each metric.
 
-20. `get_rum_page_waterfall`
+21. `get_rum_page_waterfall`
 
     - Retrieve RUM page (view) waterfall data filtered by application name and session ID.
     - **Inputs**:
@@ -243,7 +255,7 @@ pnpm watch   # for development with auto-rebuild
 
 To use this with Claude Desktop, add the following to your `claude_desktop_config.json`:
 
-On MacOS: `~/Library/Application Support/Claude/claude_desktop_config.json`  
+On MacOS: `~/Library/Application Support/Claude/claude_desktop_config.json`
 On Windows: `%APPDATA%/Claude/claude_desktop_config.json`
 
 ```json

package.json

@@ -1,10 +1,10 @@
 {
-  "name": "@winor30/mcp-server-datadog",
-  "version": "1.6.0",
+  "name": "@datgfg/mcp-server-datadog",
+  "version": "1.6.3",
   "description": "MCP server for interacting with Datadog API",
   "repository": {
     "type": "git",
-    "url": "https://github.com/winor30/mcp-server-datadog.git"
+    "url": "https://github.com/datgfg/mcp-server-datadog.git"
   },
   "type": "module",
   "bin": {
@@ -35,7 +35,7 @@
     "lint-staged": "lint-staged"
   },
   "dependencies": {
-    "@datadog/datadog-api-client": "^1.34.1",
+    "@datadog/datadog-api-client": "^1.41.0",
     "@modelcontextprotocol/sdk": "0.6.0",
     "zod": "^3.24.3",
     "zod-to-json-schema": "^3.24.5"
@@ -70,7 +70,6 @@
   },
   "lint-staged": {
     "*.{js,ts}": [
-      "eslint --fix",
       "prettier --write"
     ],
     "*.{json,md}": [

pnpm-lock.yaml

@@ -16,17 +16,19 @@ import {
 import { log, mcpDatadogVersion } from './utils/helper'
 import { INCIDENT_TOOLS, createIncidentToolHandlers } from './tools/incident'
 import { METRICS_TOOLS, createMetricsToolHandlers } from './tools/metrics'
-import { LOGS_TOOLS, createLogsToolHandlers } from './tools/logs'
+// import { LOGS_TOOLS, createLogsToolHandlers } from './tools/logs'
 import { MONITORS_TOOLS, createMonitorsToolHandlers } from './tools/monitors'
 import {
   DASHBOARDS_TOOLS,
   createDashboardsToolHandlers,
 } from './tools/dashboards'
-import { TRACES_TOOLS, createTracesToolHandlers } from './tools/traces'
-import { HOSTS_TOOLS, createHostsToolHandlers } from './tools/hosts'
+// Traces tools have been consolidated under spans tools
+// import { TRACES_TOOLS, createTracesToolHandlers } from './tools/traces'
+import { SPANS_TOOLS, createSpansToolHandlers } from './tools/spans'
+// import { HOSTS_TOOLS, createHostsToolHandlers } from './tools/hosts'
 import { ToolHandlers } from './utils/types'
 import { createDatadogConfig } from './utils/datadog'
-import { createDowntimesToolHandlers, DOWNTIMES_TOOLS } from './tools/downtimes'
+// import { createDowntimesToolHandlers, DOWNTIMES_TOOLS } from './tools/downtimes'
 import { createRumToolHandlers, RUM_TOOLS } from './tools/rum'
 import { v2, v1 } from '@datadog/datadog-api-client'
 
@@ -55,12 +57,13 @@ server.setRequestHandler(ListToolsRequestSchema, async () => {
     tools: [
       ...INCIDENT_TOOLS,
       ...METRICS_TOOLS,
-      ...LOGS_TOOLS,
+      // ...LOGS_TOOLS,
       ...MONITORS_TOOLS,
       ...DASHBOARDS_TOOLS,
-      ...TRACES_TOOLS,
-      ...HOSTS_TOOLS,
-      ...DOWNTIMES_TOOLS,
+      // ...TRACES_TOOLS,
+      ...SPANS_TOOLS,
+      // ...HOSTS_TOOLS,
+      // ...DOWNTIMES_TOOLS,
       ...RUM_TOOLS,
     ],
   }
@@ -79,12 +82,13 @@ const datadogConfig = createDatadogConfig({
 const TOOL_HANDLERS: ToolHandlers = {
   ...createIncidentToolHandlers(new v2.IncidentsApi(datadogConfig)),
   ...createMetricsToolHandlers(new v1.MetricsApi(datadogConfig)),
-  ...createLogsToolHandlers(new v2.LogsApi(datadogConfig)),
+  // ...createLogsToolHandlers(new v2.LogsApi(datadogConfig)),
   ...createMonitorsToolHandlers(new v1.MonitorsApi(datadogConfig)),
   ...createDashboardsToolHandlers(new v1.DashboardsApi(datadogConfig)),
-  ...createTracesToolHandlers(new v2.SpansApi(datadogConfig)),
-  ...createHostsToolHandlers(new v1.HostsApi(datadogConfig)),
-  ...createDowntimesToolHandlers(new v1.DowntimesApi(datadogConfig)),
+  // ...createTracesToolHandlers(new v2.SpansApi(datadogConfig)),
+  ...createSpansToolHandlers(new v2.SpansApi(datadogConfig)),
+  // ...createHostsToolHandlers(new v1.HostsApi(datadogConfig)),
+  // ...createDowntimesToolHandlers(new v1.DowntimesApi(datadogConfig)),
   ...createRumToolHandlers(new v2.RUMApi(datadogConfig)),
 }
 /**

src/index.ts

@@ -15,3 +15,19 @@ export const QueryMetricsZodSchema = z.object({
 })
 
 export type QueryMetricsArgs = z.infer<typeof QueryMetricsZodSchema>
+
+// Schema for listing all metrics
+export const ListMetricsZodSchema = z.object({
+  from: z
+    .number()
+    .optional()
+    .describe(
+      'Start of the timeframe (in seconds since Unix epoch) to list active metrics. Defaults to 24h ago if omitted.',
+    ),
+  tagFilter: z
+    .string()
+    .optional()
+    .describe('Filter metrics that have been submitted with the given tags.'),
+})
+
+export type ListMetricsArgs = z.infer<typeof ListMetricsZodSchema>

src/tools/metrics/schema.ts

@@ -1,9 +1,9 @@
 import { ExtendedTool, ToolHandlers } from '../../utils/types'
 import { v1 } from '@datadog/datadog-api-client'
 import { createToolSchema } from '../../utils/tool'
-import { QueryMetricsZodSchema } from './schema'
+import { QueryMetricsZodSchema, ListMetricsZodSchema } from './schema'
 
-type MetricsToolName = 'query_metrics'
+type MetricsToolName = 'query_metrics' | 'list_metrics'
 type MetricsTool = ExtendedTool<MetricsToolName>
 
 export const METRICS_TOOLS: MetricsTool[] = [
@@ -12,6 +12,11 @@ export const METRICS_TOOLS: MetricsTool[] = [
     'query_metrics',
     'Query timeseries points of metrics from Datadog',
   ),
+  createToolSchema(
+    ListMetricsZodSchema,
+    'list_metrics',
+    'List active metric names from Datadog',
+  ),
 ] as const
 
 type MetricsToolHandlers = ToolHandlers<MetricsToolName>
@@ -40,5 +45,29 @@ export const createMetricsToolHandlers = (
         ],
       }
     },
+    list_metrics: async (request) => {
+      const { from, tagFilter } = ListMetricsZodSchema.parse(
+        request.params.arguments,
+      )
+
+      // default to 24h ago if from not provided
+      const fromSeconds = from ?? Math.floor(Date.now() / 1000) - 60 * 60 * 24
+
+      const response = await apiInstance.listActiveMetrics({
+        from: fromSeconds,
+        tagFilter,
+      })
+
+      const metrics = response.metrics as string[]
+
+      return {
+        content: [
+          {
+            type: 'text',
+            text: `Metrics: ${JSON.stringify(metrics)}`,
+          },
+        ],
+      }
+    },
   }
 }

src/tools/metrics/tool.ts

@@ -0,0 +1 @@
+export { SPANS_TOOLS, createSpansToolHandlers } from './tool'