@dynatrace-oss/dynatrace-mcp-server 0.1.1 → 0.1.3

package/README.md

@@ -41,6 +41,25 @@ You can add this MCP server (using STDIO) to your MCP Client like VS Code, Claud
 }
 ```
 
+Please note: In this config, [the `${workspaceFolder}` variable](https://code.visualstudio.com/docs/reference/variables-reference#_predefined-variables) is used.
+This only works if the config is stored in the current workspaces, e.g., `<your-repo>/.vscode/mcp.json`. Alternatively, this can also be stored in user-settings, and you can define `env` as follows:
+
+```json
+{
+  "servers": {
+    "npx-dynatrace-mcp-server": {
+      "command": "npx",
+      "args": ["-y", "@dynatrace-oss/dynatrace-mcp-server@latest"],
+      "env": {
+        "OAUTH_CLIENT_ID": "",
+        "OAUTH_CLIENT_SECRET": "",
+        "DT_ENVIRONMENT": ""
+      }
+    }
+  }
+}
+```
+
 **Claude Desktop**
 ```json
 {
@@ -58,6 +77,25 @@ You can add this MCP server (using STDIO) to your MCP Client like VS Code, Claud
 }
 ```
 
+**Amazon Q Developer CLI**
+
+The [Amazon Q Developer CLI](https://docs.aws.amazon.com/amazonq/latest/qdeveloper-ug/command-line-chat.html) provides an interactive chat experience directly in your terminal. You can ask questions, get help with AWS services, troubleshoot issues, and generate code snippets without leaving your command line environment.
+```json
+{
+  "mcpServers": {
+    "mobile-mcp": {
+      "command": "npx",
+      "args": ["-y", "@dynatrace-oss/dynatrace-mcp-server@latest"],
+      "env": {
+        "OAUTH_CLIENT_ID": "",
+        "OAUTH_CLIENT_SECRET": "",
+        "DT_ENVIRONMENT": ""
+      }
+    }
+  }
+}
+```
+
 ## Environment Variables
 
 A **Dynatrace OAuth Client** is needed to communicate with your Dynatrace Environment. Please follow the documentation about
@@ -83,6 +121,7 @@ and set up the following environment variables in order for this MCP to work:
   * `storage:bizevents:read` - Read bizevents for reliability guardian validations
   * `storage:spans:read` - Read spans from Grail
   * `storage:entities:read` - Read Entities from Grail
+  * `storage:events:read` -  Read Events from Grail
   * `storage:system:read` - Read System Data from Grail
   * `storage:user.events:read` - Read User events from Grail
   * `storage:user.sessions:read` - Read User sessions from Grail

package/dist/capabilities/get-events-for-cluster.js

@@ -1,35 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getEventsForCluster = void 0;
-const client_query_1 = require("@dynatrace-sdk/client-query");
+const execute_dql_1 = require("./execute-dql");
 const getEventsForCluster = async (dtClient, clusterId) => {
-    const queryExecutionClient = new client_query_1.QueryExecutionClient(dtClient);
-    const response = await queryExecutionClient.queryExecute({
-        body: {
-            query: `fetch events | filter k8s.cluster.id == "${clusterId}"`,
-        }
-    });
-    if (response.result) {
-        // return response result immediately
-        return response.result.records;
+    let dql = `fetch events | filter k8s.cluster.uid == "${clusterId}"`;
+    if (!clusterId) {
+        // if no clusterId is provided, we need to fetch all events
+        dql = `fetch events | filter isNotNull(k8s.cluster.uid)`;
     }
-    // else: We might have to poll
-    if (response.requestToken) {
-        // poll for the result
-        let pollResponse;
-        do {
-            // sleep for 2 seconds
-            await new Promise(resolve => setTimeout(resolve, 2000));
-            pollResponse = await queryExecutionClient.queryPoll({
-                requestToken: response.requestToken,
-            });
-            // done - let's return it
-            if (pollResponse.result) {
-                return pollResponse.result.records;
-            }
-        } while (pollResponse.state === 'RUNNING' || pollResponse.state === 'NOT_STARTED');
-    }
-    // else: whatever happened - we have an error
-    return undefined;
+    return (0, execute_dql_1.executeDql)(dtClient, dql);
 };
 exports.getEventsForCluster = getEventsForCluster;

package/dist/capabilities/get-logs-for-entity.js

@@ -1,35 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getLogsForEntity = void 0;
-const client_query_1 = require("@dynatrace-sdk/client-query");
+const execute_dql_1 = require("./execute-dql");
 const getLogsForEntity = async (dtClient, entityId) => {
-    const queryExecutionClient = new client_query_1.QueryExecutionClient(dtClient);
-    const response = await queryExecutionClient.queryExecute({
-        body: {
-            query: `fetch logs | filter dt.source_entity == "${entityId}"`,
-        }
-    });
-    if (response.result) {
-        // return response result immediately
-        return response.result.records;
-    }
-    // else: We might have to poll
-    if (response.requestToken) {
-        // poll for the result
-        let pollResponse;
-        do {
-            // sleep for 2 seconds
-            await new Promise(resolve => setTimeout(resolve, 2000));
-            pollResponse = await queryExecutionClient.queryPoll({
-                requestToken: response.requestToken,
-            });
-            // done - let's return it
-            if (pollResponse.result) {
-                return pollResponse.result.records;
-            }
-        } while (pollResponse.state === 'RUNNING' || pollResponse.state === 'NOT_STARTED');
-    }
-    // else: whatever happened - we have an error
-    return undefined;
+    const dql = `fetch logs | filter dt.source_entity == "${entityId}"`;
+    return (0, execute_dql_1.executeDql)(dtClient, dql);
 };
 exports.getLogsForEntity = getLogsForEntity;

package/dist/dynatrace-clients.js

@@ -3,22 +3,52 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.callAppFunction = exports.createOAuthClient = void 0;
 const http_client_1 = require("@dynatrace-sdk/http-client");
 const dt_app_1 = require("dt-app");
+/** Uses the provided oauth Client ID and Secret and requests a token */
+const requestToken = async (clientId, clientSecret, authUrl, scopes) => {
+    const res = await fetch(authUrl, {
+        method: 'POST',
+        headers: {
+            'Content-Type': 'application/x-www-form-urlencoded',
+        },
+        body: new URLSearchParams({
+            grant_type: 'client_credentials',
+            client_id: clientId,
+            client_secret: clientSecret,
+            scope: scopes.join(' '),
+        }),
+    });
+    if (!res.ok) {
+        console.error(`Failed to fetch token: ${res.status} ${res.statusText}`);
+    }
+    return await res.json();
+};
 /** Create an Oauth Client based on clientId, clientSecret, environmentUrl and scopes */
 const createOAuthClient = async (clientId, clientSecret, environmentUrl, scopes) => {
-    const baseUrl = await (0, dt_app_1.getSSOUrl)(environmentUrl);
     if (!clientId) {
         throw new Error('Failed to retrieve OAuth client id from env "DT_APP_OAUTH_CLIENT_ID"');
     }
     if (!clientSecret) {
         throw new Error('Failed to retrieve OAuth client secret from env "DT_APP_OAUTH_CLIENT_SECRET"');
     }
-    console.error(`baseUrl=${baseUrl}`);
+    if (!environmentUrl) {
+        throw new Error('Failed to retrieve environment URL from env "DT_ENVIRONMENT"');
+    }
+    console.error(`Trying to authenticate API Calls to ${environmentUrl} via OAuthClientId ${clientId}`);
+    const ssoBaseUrl = await (0, dt_app_1.getSSOUrl)(environmentUrl);
+    const ssoAuthUrl = new URL('/sso/oauth2/token', ssoBaseUrl).toString();
+    console.error(`Using SSO auth URL: ${ssoAuthUrl}`);
+    // try to request a token, just to verify that everything is set up correctly
+    const tokenResponse = await requestToken(clientId, clientSecret, ssoAuthUrl, scopes);
+    if (tokenResponse.error && tokenResponse.error_description) {
+        throw new Error(`Failed to retrieve OAuth token: ${tokenResponse.error} - ${tokenResponse.error_description}`);
+    }
+    console.error(`Successfully retrieved token from SSO!`);
     return new http_client_1._OAuthHttpClient({
         scopes,
         clientId,
         secret: clientSecret,
         environmentUrl,
-        authUrl: new URL('/sso/oauth2/token', baseUrl).toString(),
+        authUrl: ssoAuthUrl,
     });
 };
 exports.createOAuthClient = createOAuthClient;

package/dist/dynatrace-oauth-client.js

@@ -0,0 +1,55 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.OAuthHttpClient = void 0;
+class OAuthHttpClient {
+    config;
+    oauthToken;
+    constructor(config) {
+        this.config = config;
+    }
+    async send(options) {
+        const { statusValidator = defaultStatusValidator } = options;
+        if (!this.oauthToken || this.oauthToken.isExpired()) {
+            this.oauthToken = await this.requestToken();
+        }
+        const requestBodyType = options.requestBodyType ?? 'json';
+        const url = new URL(options.url, this.config.environmentUrl);
+        const body = options.body !== undefined
+            ? await encodeRequestBody(options.body, requestBodyType)
+            : undefined;
+        const headers = {
+            ...applyContentTypeHeader(options.headers, requestBodyType),
+            Authorization: `${this.oauthToken.tokenType} ${this.oauthToken.accessToken}`,
+        };
+        const response = await send(url.toString(), {
+            method: options.method,
+            signal: options.abortSignal,
+            body,
+            headers,
+        });
+        const ok = statusValidator(response.status);
+        if (ok) {
+            return new HttpClientResponse(response);
+        }
+        else {
+            throw new HttpClientResponseError(response, { requestMethod: options.method });
+        }
+    }
+    async requestToken() {
+        const res = await send(this.config.authUrl, {
+            method: 'POST',
+            headers: {
+                'Content-Type': 'application/x-www-form-urlencoded',
+            },
+            body: new URLSearchParams({
+                grant_type: 'client_credentials',
+                client_id: this.config.clientId,
+                client_secret: this.config.secret,
+                scope: this.config.scopes.join(' '),
+            }),
+        });
+        const data = await res.json();
+        return new OAuthToken(data);
+    }
+}
+exports.OAuthHttpClient = OAuthHttpClient;

package/dist/index.js

@@ -38,6 +38,7 @@ let scopes = [
     'storage:bizevents:read', // Read bizevents for reliability guardian validations
     'storage:spans:read', // Read spans from Grail
     'storage:entities:read', // Read Entities from Grail
+    'storage:events:read', // Read events from Grail
     'storage:system:read', // Read System Data from Grail
     'storage:user.events:read', // Read User events from Grail
     'storage:user.sessions:read', // Read User sessions from Grail
@@ -222,13 +223,13 @@ const main = async () => {
         return `Logs:\n${JSON.stringify(logs?.map(logLine => logLine ? logLine.content : 'Empty log'))}`;
     });
     tool("verify_dql", "Verify a DQL statement on Dynatrace", {
-        dqlStatement: zod_1.z.string().optional()
+        dqlStatement: zod_1.z.string()
     }, async ({ dqlStatement }) => {
         const response = await (0, execute_dql_1.verifyDqlStatement)(dtClient, dqlStatement);
         return `Parsing DQL Statement resulted in: ${JSON.stringify(response)}`;
     });
     tool("execute_dql", "Get Logs, Metrics, Spans, Events from Dynatrace by executing a DQL statement. Please use verify_dql tool before you execute a DQL statement.", {
-        dqlStatement: zod_1.z.string().optional()
+        dqlStatement: zod_1.z.string()
     }, async ({ dqlStatement }) => {
         const response = await (0, execute_dql_1.executeDql)(dtClient, dqlStatement);
         return `DQL Response: ${JSON.stringify(response)}`;
@@ -260,11 +261,11 @@ const main = async () => {
         });
         return `Workflow ${response.id} is now public!\nYou can access the Workflow via the following link: ${dtEnvironment}/ui/apps/dynatrace.automations/workflows/${response?.id}.\nTell the user to inspect the Workflow by visiting the link.\n`;
     });
-    tool("get_kubernetes_events", "Get all events from a specific Kubernetes cluster", {
-        clusterId: zod_1.z.string().optional()
+    tool("get_kubernetes_events", "Get all events from a specific Kubernetes (K8s) cluster", {
+        clusterId: zod_1.z.string().optional().describe(`The Kubernetes (K8s) Cluster Id, referred to as k8s.cluster.uid (this is NOT the Dynatrace environment)`)
     }, async ({ clusterId }) => {
         const events = await (0, get_events_for_cluster_1.getEventsForCluster)(dtClient, clusterId);
-        return `Events:\n${JSON.stringify(events)}`;
+        return `Kubernetes Events:\n${JSON.stringify(events)}`;
     });
     tool("get_ownership", "Get detailed Ownership information for one or multiple entities on Dynatrace", {
         entityIds: zod_1.z.string().optional().describe("Comma separated list of entityIds"),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dynatrace-oss/dynatrace-mcp-server",
-  "version": "0.1.1",
+  "version": "0.1.3",
   "description": "Model Context Protocol (MCP) server for Dynatrace",
   "keywords": [
     "Dynatrace",