Allow optional subdomain for Datadog enterprise accounts (#40)

Co-authored-by: katsumata（TK） <[email protected]>

Author: AndrewJDawes

README.md

@@ -212,13 +212,15 @@ You need valid Datadog API credentials to use this MCP server:
 - `DATADOG_API_KEY`: Your Datadog API key
 - `DATADOG_APP_KEY`: Your Datadog Application key
 - `DATADOG_SITE` (optional): The Datadog site (e.g. `datadoghq.eu`)
+- `DATADOG_SUBDOMAIN` (optional): The Datadog subdomain (e.g. `<your-subdomain>.datadoghq.com`)
 
 Export them in your environment before running the server:
 
 ```bash
 export DATADOG_API_KEY="your_api_key"
 export DATADOG_APP_KEY="your_app_key"
-export DATADOG_SITE="your_datadog_site"
+export DATADOG_SITE="your_datadog_site" # Optional
+export DATADOG_SUBDOMAIN="your_datadog_subdomain" # Optional
 ```
 
 ## Installation
@@ -243,7 +245,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
@@ -268,7 +270,8 @@ On Windows: `%APPDATA%/Claude/claude_desktop_config.json`
       "env": {
         "DATADOG_API_KEY": "<YOUR_API_KEY>",
         "DATADOG_APP_KEY": "<YOUR_APP_KEY>",
-        "DATADOG_SITE": "<YOUR_SITE>" // Optional
+        "DATADOG_SITE": "<YOUR_SITE>", // Optional
+        "DATADOG_SUBDOMAIN": "<YOUR_SUBDOMAIN>" // Optional
       }
     }
   }
@@ -286,7 +289,8 @@ Or specify via `npx`:
       "env": {
         "DATADOG_API_KEY": "<YOUR_API_KEY>",
         "DATADOG_APP_KEY": "<YOUR_APP_KEY>",
-        "DATADOG_SITE": "<YOUR_SITE>" // Optional
+        "DATADOG_SITE": "<YOUR_SITE>", // Optional
+        "DATADOG_SUBDOMAIN": "<YOUR_SUBDOMAIN>" // Optional
       }
     }
   }

smithery.yaml

@@ -19,6 +19,10 @@ startCommand:
         type: string
         default: ''
         description: Optional Datadog site (e.g. datadoghq.eu)
+      datadogSubdomain:
+        type: string
+        default: ''
+        description: Optional Datadog subdomain (e.g. <your-subdomain>.datadoghq.com)
   commandFunction:
     # A JS function that produces the CLI command based on the given config to start the MCP on stdio.
     |-
@@ -28,10 +32,12 @@ startCommand:
       env: Object.assign({}, process.env, {
         DATADOG_API_KEY: config.datadogApiKey,
         DATADOG_APP_KEY: config.datadogAppKey,
-        ...(config.datadogSite && { DATADOG_SITE: config.datadogSite })
+        ...(config.datadogSite && { DATADOG_SITE: config.datadogSite }),
+        ...(config.datadogSubdomain && { DATADOG_SUBDOMAIN: config.datadogSubdomain })
       })
     })
   exampleConfig:
     datadogApiKey: your_datadog_api_key_here
     datadogAppKey: your_datadog_app_key_here
     datadogSite: datadoghq.com
+    datadogSubdomain: your-subdomain

src/index.ts

@@ -74,6 +74,7 @@ const datadogConfig = createDatadogConfig({
   apiKeyAuth: process.env.DATADOG_API_KEY,
   appKeyAuth: process.env.DATADOG_APP_KEY,
   site: process.env.DATADOG_SITE,
+  subdomain: process.env.DATADOG_SUBDOMAIN,
 })
 
 const TOOL_HANDLERS: ToolHandlers = {

src/utils/datadog.ts

@@ -4,6 +4,7 @@ interface CreateDatadogConfigParams {
   apiKeyAuth: string
   appKeyAuth: string
   site?: string
+  subdomain?: string
 }
 
 export function createDatadogConfig(
@@ -25,6 +26,12 @@ export function createDatadogConfig(
     })
   }
 
+  if (config.subdomain != null) {
+    datadogConfig.setServerVariables({
+      subdomain: config.subdomain,
+    })
+  }
+
   datadogConfig.unstableOperations = {
     'v2.listIncidents': true,
     'v2.getIncident': true,

tests/utils/datadog.test.ts

@@ -34,6 +34,35 @@ describe('createDatadogConfig', () => {
       'datadoghq.com',
     )
   })
+})
+
+describe('createDatadogConfig', () => {
+  it('should create a datadog config with custom subdomain when DATADOG_SUBDOMAIN is configured', () => {
+    const datadogConfig = createDatadogConfig({
+      apiKeyAuth: 'test-api-key',
+      appKeyAuth: 'test-app-key',
+      subdomain: 'youryour-subdomain',
+    })
+    expect(datadogConfig.authMethods).toEqual({
+      apiKeyAuth: new ApiKeyAuthAuthentication('test-api-key'),
+      appKeyAuth: new AppKeyAuthAuthentication('test-app-key'),
+    })
+    expect(datadogConfig.servers[0]?.getConfiguration()?.subdomain).toBe(
+      'youryour-subdomain',
+    )
+  })
+
+  it('should create a datadog config with default subdomain when DATADOG_SUBDOMAIN is not configured', () => {
+    const datadogConfig = createDatadogConfig({
+      apiKeyAuth: 'test-api-key',
+      appKeyAuth: 'test-app-key',
+    })
+    expect(datadogConfig.authMethods).toEqual({
+      apiKeyAuth: new ApiKeyAuthAuthentication('test-api-key'),
+      appKeyAuth: new AppKeyAuthAuthentication('test-app-key'),
+    })
+    expect(datadogConfig.servers[0]?.getConfiguration()?.subdomain).toBe('api')
+  })
 
   it('should throw an error when DATADOG_API_KEY are not configured', () => {
     expect(() =>