@dynatrace-oss/dynatrace-mcp-server 0.6.0 → 0.7.0

package/README.md

@@ -277,6 +277,43 @@ The [Amazon Q Developer CLI](https://docs.aws.amazon.com/amazonq/latest/qdevelop
 
 This configuration should be stored in `<your-repo>/.amazonq/mcp.json`.
 
+**Google Gemini CLI**
+
+The [Google Gemini CLI](https://github.com/google-gemini/gemini-cli) is Google's official command-line AI assistant that supports MCP server integration. You can add the Dynatrace MCP server using either the built-in management commands or manual configuration.
+
+Using `gemini` CLI directly (recommended):
+
+```bash
+gemini extensions install https://github.com/dynatrace-oss/dynatrace-mcp
+export DT_PLATFORM_TOKEN=...
+export DT_ENVIRONMENT=https://...
+```
+
+and verify that the server is running via
+
+```bash
+gemini mcp list
+```
+
+Or manually in your `~/.gemini/settings.json` or `.gemini/settings.json`:
+
+```json
+{
+  "mcpServers": {
+    "dynatrace": {
+      "command": "npx",
+      "args": ["@dynatrace-oss/dynatrace-mcp-server@latest"],
+      "env": {
+        "DT_PLATFORM_TOKEN": "",
+        "DT_ENVIRONMENT": ""
+      },
+      "timeout": 30000,
+      "trust": false
+    }
+  }
+}
+```
+
 ### HTTP Server Mode (Alternative)
 
 For scenarios where you need to run the MCP server as an HTTP service instead of using stdio (e.g., for stateful sessions, load balancing, or integration with web clients), you can use the HTTP server mode:

package/dist/capabilities/davis-copilot.js

@@ -16,8 +16,29 @@
  * in Dynatrace, including problem events, security issues, logs, metrics, and spans.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.chatWithDavisCopilot = exports.explainDqlInNaturalLanguage = exports.generateDqlFromNaturalLanguage = void 0;
+exports.chatWithDavisCopilot = exports.explainDqlInNaturalLanguage = exports.generateDqlFromNaturalLanguage = exports.isDavisCopilotSkillAvailable = exports.DAVIS_COPILOT_DOCS = void 0;
 const client_davis_copilot_1 = require("@dynatrace-sdk/client-davis-copilot");
+// Documentation links for Davis Copilot
+exports.DAVIS_COPILOT_DOCS = {
+    ENABLE_COPILOT: 'https://docs.dynatrace.com/docs/discover-dynatrace/platform/davis-ai/copilot/copilot-getting-started#enable-davis-copilot',
+};
+/**
+ * Check if a specific Davis Copilot skill is available
+ * Returns true if the skill is available, false otherwise
+ */
+const isDavisCopilotSkillAvailable = async (dtClient, skill) => {
+    try {
+        const client = new client_davis_copilot_1.PublicClient(dtClient);
+        const response = await client.listAvailableSkills();
+        const availableSkills = response.skills || [];
+        return availableSkills.includes(skill);
+    }
+    catch (error) {
+        // If Davis Copilot is not enabled or any other error occurs, return false
+        return false;
+    }
+};
+exports.isDavisCopilotSkillAvailable = isDavisCopilotSkillAvailable;
 /**
  * Generate DQL from natural language
  * Converts plain English descriptions into powerful Dynatrace Query Language (DQL) statements.

package/dist/capabilities/find-monitored-entity-by-name.js

@@ -1,17 +1,18 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.findMonitoredEntityByName = exports.generateDqlSearchEntityCommand = void 0;
+exports.findMonitoredEntitiesByName = exports.generateDqlSearchEntityCommand = void 0;
 const execute_dql_1 = require("./execute-dql");
 const dynatrace_entity_types_1 = require("../utils/dynatrace-entity-types");
 /**
- * Construct a DQL statement like "fetch <entityType> | search "*<entityName>*" | fieldsAdd entity.type" for each entity type,
+ * Construct a DQL statement like "fetch <entityType> | search "*<entityName1>*" OR "*<entityName2>*" | fieldsAdd entity.type" for each entity type,
  * and join them with " | append [ ... ]"
  * @param entityName
  * @returns DQL Statement for searching all entity types
  */
-const generateDqlSearchEntityCommand = (entityName) => {
-    const fetchDqlCommands = dynatrace_entity_types_1.DYNATRACE_ENTITY_TYPES.map((entityType, index) => {
-        const dql = `fetch ${entityType} | search "*${entityName}*" | fieldsAdd entity.type`;
+const generateDqlSearchEntityCommand = (entityNames, extendedSearch) => {
+    // If extendedSearch is true, use all entity types, otherwise use only basic ones
+    const fetchDqlCommands = (extendedSearch ? dynatrace_entity_types_1.DYNATRACE_ENTITY_TYPES_ALL : dynatrace_entity_types_1.DYNATRACE_ENTITY_TYPES_BASICS).map((entityType, index) => {
+        const dql = `fetch ${entityType} | search "*${entityNames.join('*" OR "*')}*" | fieldsAdd entity.type | expand tags`;
         if (index === 0) {
             return dql;
         }
@@ -26,27 +27,11 @@ exports.generateDqlSearchEntityCommand = generateDqlSearchEntityCommand;
  * @param entityName
  * @returns A string with the entity details like id, name and type, or an error message if no entity was found
  */
-const findMonitoredEntityByName = async (dtClient, entityName) => {
-    if (!entityName) {
-        return 'You need to provide an entity name to search for.';
-    }
+const findMonitoredEntitiesByName = async (dtClient, entityNames, extendedSearch) => {
     // construct a DQL statement for searching the entityName over all entity types
-    const dql = (0, exports.generateDqlSearchEntityCommand)(entityName);
+    const dql = (0, exports.generateDqlSearchEntityCommand)(entityNames, extendedSearch);
     // Get response from API
     // Note: This may be slow, as we are appending multiple entity types above
-    const dqlResponse = await (0, execute_dql_1.executeDql)(dtClient, { query: dql });
-    if (dqlResponse && dqlResponse.records && dqlResponse.records.length > 0) {
-        let resp = 'The following monitored entities were found:\n';
-        // iterate over dqlResponse and create a string with the entity names
-        dqlResponse.records.forEach((entity) => {
-            if (entity) {
-                resp += `- Entity '${entity['entity.name']}' of type '${entity['entity.type']} has entity id '${entity.id}'\n`;
-            }
-        });
-        return resp;
-    }
-    else {
-        return 'No monitored entity found with the specified name.';
-    }
+    return await (0, execute_dql_1.executeDql)(dtClient, { query: dql });
 };
-exports.findMonitoredEntityByName = findMonitoredEntityByName;
+exports.findMonitoredEntitiesByName = findMonitoredEntitiesByName;

package/dist/capabilities/find-monitored-entity-by-name.test.js

@@ -5,27 +5,43 @@ const find_monitored_entity_by_name_1 = require("./find-monitored-entity-by-name
 describe('generateDqlSearchCommand', () => {
     beforeEach(() => {
         // Ensure we have at least some entity types for testing
-        expect(dynatrace_entity_types_1.DYNATRACE_ENTITY_TYPES.length).toBeGreaterThan(0);
+        expect(dynatrace_entity_types_1.DYNATRACE_ENTITY_TYPES_ALL.length).toBeGreaterThan(0);
     });
-    it('should include all entity types from DYNATRACE_ENTITY_TYPES', () => {
+    it('should include all entity types from DYNATRACE_ENTITY_TYPES_ALL', () => {
         const entityName = 'test';
-        const result = (0, find_monitored_entity_by_name_1.generateDqlSearchEntityCommand)(entityName);
+        const result = (0, find_monitored_entity_by_name_1.generateDqlSearchEntityCommand)([entityName], true);
         console.log(result);
         // Check that all entity types are included in the DQL
-        dynatrace_entity_types_1.DYNATRACE_ENTITY_TYPES.forEach((entityType) => {
+        dynatrace_entity_types_1.DYNATRACE_ENTITY_TYPES_ALL.forEach((entityType) => {
+            expect(result).toContain(`fetch ${entityType}`);
+        });
+    });
+    it('should include entity types from DYNATRACE_ENTITY_TYPES_BASICS', () => {
+        const entityName = 'test';
+        const result = (0, find_monitored_entity_by_name_1.generateDqlSearchEntityCommand)([entityName], false);
+        console.log(result);
+        // Check that all entity types are included in the DQL
+        dynatrace_entity_types_1.DYNATRACE_ENTITY_TYPES_BASICS.forEach((entityType) => {
             expect(result).toContain(`fetch ${entityType}`);
         });
     });
     it('should structure the DQL correctly with first fetch and subsequent appends', () => {
         const entityName = 'test';
-        const result = (0, find_monitored_entity_by_name_1.generateDqlSearchEntityCommand)(entityName);
+        const result = (0, find_monitored_entity_by_name_1.generateDqlSearchEntityCommand)([entityName], true);
         // First entity type should not have append prefix
-        const firstEntityType = dynatrace_entity_types_1.DYNATRACE_ENTITY_TYPES[0];
-        expect(result).toContain(`fetch ${firstEntityType} | search "*${entityName}*" | fieldsAdd entity.type`);
+        const firstEntityType = dynatrace_entity_types_1.DYNATRACE_ENTITY_TYPES_ALL[0];
+        expect(result).toContain(`fetch ${firstEntityType} | search "*${entityName}*" | fieldsAdd entity.type | expand tags`);
         // Subsequent entity types should have append prefix (if there are more than 1)
-        if (dynatrace_entity_types_1.DYNATRACE_ENTITY_TYPES.length > 1) {
-            const secondEntityType = dynatrace_entity_types_1.DYNATRACE_ENTITY_TYPES[1];
-            expect(result).toContain(`  | append [ fetch ${secondEntityType} | search "*${entityName}*" | fieldsAdd entity.type ]`);
+        if (dynatrace_entity_types_1.DYNATRACE_ENTITY_TYPES_ALL.length > 1) {
+            const secondEntityType = dynatrace_entity_types_1.DYNATRACE_ENTITY_TYPES_ALL[1];
+            expect(result).toContain(`  | append [ fetch ${secondEntityType} | search "*${entityName}*" | fieldsAdd entity.type | expand tags ]`);
         }
     });
+    it('should handle multiple entityNames correctly', () => {
+        const entityNames = ['test1', 'test2', 'example'];
+        const result = (0, find_monitored_entity_by_name_1.generateDqlSearchEntityCommand)(entityNames, true);
+        // Check that the search part includes all entity names joined by OR
+        const searchPart = `search "*test1*" OR "*test2*" OR "*example*"`;
+        expect(result).toContain(searchPart);
+    });
 });

package/dist/getDynatraceEnv.js

@@ -11,16 +11,20 @@ function getDynatraceEnv(env = process.env) {
     const dtPlatformToken = env.DT_PLATFORM_TOKEN;
     const dtEnvironment = env.DT_ENVIRONMENT;
     const slackConnectionId = env.SLACK_CONNECTION_ID || 'fake-slack-connection-id';
-    const grailBudgetGB = parseFloat(env.DT_GRAIL_QUERY_BUDGET_GB || '1000'); // Default to 1000 GB
+    let grailBudgetGB = parseFloat(env.DT_GRAIL_QUERY_BUDGET_GB || '1000'); // Default to 1000 GB
     if (!dtEnvironment) {
         throw new Error('Please set DT_ENVIRONMENT environment variable to your Dynatrace Platform Environment');
     }
     if (!oauthClientId && !oauthClientSecret && !dtPlatformToken) {
         throw new Error('Please set either OAUTH_CLIENT_ID and OAUTH_CLIENT_SECRET, or DT_PLATFORM_TOKEN environment variables');
     }
+    // For dev and hardening stages, set unlimited budget (-1) unless explicitly overridden
+    if (dtEnvironment.includes('apps.dynatracelabs.com') && !env.DT_GRAIL_QUERY_BUDGET_GB) {
+        grailBudgetGB = -1;
+    }
     // ToDo: Allow the case of -1 for unlimited Budget
-    if (isNaN(grailBudgetGB) || (grailBudgetGB <= 0 && grailBudgetGB !== -1)) {
-        throw new Error('DT_GRAIL_QUERY_BUDGET_GB must be a positive number representing GB budget for Grail queries');
+    if (isNaN(grailBudgetGB) || (grailBudgetGB < 0 && grailBudgetGB !== -1)) {
+        throw new Error('DT_GRAIL_QUERY_BUDGET_GB must be a positive number or -1 (for unlimited) representing GB budget for Grail queries');
     }
     if (!dtEnvironment.startsWith('https://')) {
         throw new Error('Please set DT_ENVIRONMENT to a valid Dynatrace Environment URL (e.g., https://<environment-id>.apps.dynatrace.com)');

package/dist/getDynatraceEnv.test.js

@@ -71,4 +71,36 @@ describe('getDynatraceEnv', () => {
         };
         expect(() => (0, getDynatraceEnv_1.getDynatraceEnv)(env)).not.toThrow();
     });
+    it('Defaults the Grail Budget to 1000', () => {
+        const env = {
+            ...baseEnv,
+            GRAIL_BUDGET_GB: undefined,
+            DT_ENVIRONMENT: 'https://abc123.apps.dynatrace.com',
+        };
+        const result = (0, getDynatraceEnv_1.getDynatraceEnv)(env);
+        expect(result).toEqual({
+            oauthClientId: env.OAUTH_CLIENT_ID,
+            oauthClientSecret: env.OAUTH_CLIENT_SECRET,
+            dtEnvironment: env.DT_ENVIRONMENT,
+            dtPlatformToken: env.DT_PLATFORM_TOKEN,
+            slackConnectionId: env.SLACK_CONNECTION_ID,
+            grailBudgetGB: 1000, // Default value
+        });
+    });
+    it('Resets the Grail Budget if a dev/sprint URL is used', () => {
+        const env = {
+            ...baseEnv,
+            GRAIL_BUDGET_GB: undefined,
+            DT_ENVIRONMENT: 'https://abc123.dev.apps.dynatracelabs.com',
+        };
+        const result = (0, getDynatraceEnv_1.getDynatraceEnv)(env);
+        expect(result).toEqual({
+            oauthClientId: env.OAUTH_CLIENT_ID,
+            oauthClientSecret: env.OAUTH_CLIENT_SECRET,
+            dtEnvironment: env.DT_ENVIRONMENT,
+            dtPlatformToken: env.DT_PLATFORM_TOKEN,
+            slackConnectionId: env.SLACK_CONNECTION_ID,
+            grailBudgetGB: -1, // Default value for dynatracelabs.com
+        });
+    });
 });

package/dist/index.js

@@ -14,7 +14,6 @@ const version_1 = require("./utils/version");
 const dynatrace_clients_1 = require("./authentication/dynatrace-clients");
 const list_vulnerabilities_1 = require("./capabilities/list-vulnerabilities");
 const list_problems_1 = require("./capabilities/list-problems");
-const get_monitored_entity_details_1 = require("./capabilities/get-monitored-entity-details");
 const get_ownership_information_1 = require("./capabilities/get-ownership-information");
 const get_events_for_cluster_1 = require("./capabilities/get-events-for-cluster");
 const create_workflow_for_problem_notification_1 = require("./capabilities/create-workflow-for-problem-notification");
@@ -26,8 +25,22 @@ const find_monitored_entity_by_name_1 = require("./capabilities/find-monitored-e
 const davis_copilot_1 = require("./capabilities/davis-copilot");
 const getDynatraceEnv_1 = require("./getDynatraceEnv");
 const telemetry_openkit_1 = require("./utils/telemetry-openkit");
+const dynatrace_entity_types_1 = require("./utils/dynatrace-entity-types");
 const grail_budget_tracker_1 = require("./utils/grail-budget-tracker");
-(0, dotenv_1.config)();
+// Load environment variables from .env file if available, and suppress warnings/logging to stdio
+// as it breaks MCP communication when using stdio transport
+const dotEnvOutput = (0, dotenv_1.config)({ quiet: true });
+if (dotEnvOutput.error) {
+    // Only log error if it's not about missing .env file
+    if (dotEnvOutput.error.code !== 'ENOENT') {
+        console.error('Error loading .env file:', dotEnvOutput.error);
+        process.exit(1);
+    }
+}
+else {
+    // Successfully loaded .env file
+    console.error(`.env file loaded successfully - loaded ${dotEnvOutput.parsed ? Object.keys(dotEnvOutput.parsed).length : 0} environment variables: ${Object.keys(dotEnvOutput.parsed || {}).join(', ')}`);
+}
 let scopesBase = [
     'app-engine:apps:run', // needed for environmentInformationClient
     'app-engine:functions:run', // needed for environmentInformationClient
@@ -126,6 +139,7 @@ const main = async () => {
     }, {
         capabilities: {
             tools: {},
+            elicitation: {},
         },
     });
     // quick abstraction/wrapper to make it easier for tools to reply text instead of JSON
@@ -170,6 +184,38 @@ const main = async () => {
         };
         server.tool(name, description, paramsSchema, annotations, (args) => wrappedCb(args));
     };
+    /**
+     * Helper function to request human approval for potentially sensitive operations
+     * @param operation - Description of the operation requiring approval
+     * @returns Promise<boolean> - true if approved, false if declined or cancelled
+     */
+    const requestHumanApproval = async (operation) => {
+        try {
+            const result = await server.server.elicitInput({
+                message: `Please review: ${operation}`,
+                requestedSchema: {
+                    type: 'object',
+                    properties: {
+                        approval: {
+                            type: 'boolean',
+                            title: 'Approve this operation?',
+                            description: 'Select true to approve this operation, or false to decline.',
+                            default: false,
+                        },
+                    },
+                    required: ['approval'],
+                },
+            });
+            if (result.action === 'accept' && result.content?.approval === true) {
+                return true;
+            }
+            return false;
+        }
+        catch (error) {
+            console.error('Failed to elicit human approval:', error);
+            return false; // Default to deny if elicitation fails
+        }
+    };
     /** Tool Definitions below */
     tool('get_environment_info', 'Get information about the connected Dynatrace Environment (Tenant) and verify the connection and authentication.', {}, {
         readOnlyHint: true,
@@ -183,7 +229,7 @@ const main = async () => {
         resp += `You can reach it via ${dtEnvironment}\n`;
         return resp;
     });
-    tool('list_vulnerabilities', 'List all non-muted vulnerabilities from Dynatrace for the last 30 days. An additional filter can be provided using DQL filter.', {
+    tool('list_vulnerabilities', 'Retrieve all active (non-muted) vulnerabilities from Dynatrace for the last 30 days. An additional filter can be provided using DQL filter (filter for a specific entity type and id).', {
         riskScore: zod_1.z
             .number()
             .optional()
@@ -192,7 +238,8 @@ const main = async () => {
         additionalFilter: zod_1.z
             .string()
             .optional()
-            .describe('Additional filter for DQL statement for vulnerabilities, e.g., \'vulnerability.stack == "CODE_LIBRARY"\' or \'vulnerability.risk.level == "CRITICAL"\' or \'affected_entity.name contains "prod"\' or \'vulnerability.davis_assessment.exposure_status == "PUBLIC_NETWORK"\''),
+            .describe('Additional DQL-based filter for accessing vulnerabilities, e.g., by entity type (preferred), like \'dt.entity.<service|host|application|$type> == "<entity-id>"\', by entity name (not recommended) \'affected_entity.name contains "<entity-name>"\' , or by tags \'entity_tags == array("dt.owner:team-foobar", "tag:tag")\'. ' +
+            'You can also filter by vulnerability details like \'vulnerability.stack == "CODE_LIBRARY"\' or \'vulnerability.risk.level == "CRITICAL"\' or \'vulnerability.davis_assessment.exposure_status == "PUBLIC_NETWORK"\''),
         maxVulnerabilitiesToDisplay: zod_1.z
             .number()
             .default(25)
@@ -234,11 +281,11 @@ const main = async () => {
                 `\n3. Last but not least, tell the user to visit ${dtEnvironment}/ui/apps/dynatrace.security.vulnerabilities/vulnerabilities/<vulnerability-id> for full details.`;
         return resp;
     });
-    tool('list_problems', 'List all problems (dt.davis.problems) known on Dynatrace, sorted by their recency, for the last 12h. An additional filter can be provided using DQL filter.', {
+    tool('list_problems', 'List all problems (dt.davis.problems) known on Dynatrace, sorted by their recency, for the last 12h. An additional DQL based filter, like filtering for specific entities, can be provided.', {
         additionalFilter: zod_1.z
             .string()
             .optional()
-            .describe('Additional filter for DQL statement for dt.davis.problems, e.g., \'entity_tags == array("dt.owner:team-foobar", "tag:tag")\''),
+            .describe('Additional DQL filter for dt.davis.problems - filter by entity type (preferred), like \'dt.entity.<service|host|application|$type> == "<entity-id>"\', or by entity tags \'entity_tags == array("dt.owner:team-foobar", "tag:tag")\''),
         maxProblemsToDisplay: zod_1.z.number().default(10).describe('Maximum number of problems to display in the response.'),
     }, {
         readOnlyHint: true,
@@ -274,65 +321,61 @@ const main = async () => {
             return 'No problems found';
         }
     });
-    tool('find_entity_by_name', 'Get the entityId of a monitored entity (service, host, process-group, application, kubernetes-node, ...) within the topology based on the name of the entity on Dynatrace', {
-        entityName: zod_1.z.string().describe('Name of the entity to search for, e.g., "my-service" or "my-host"'),
-    }, {
-        readOnlyHint: true,
-    }, async ({ entityName }) => {
-        const dtClient = await (0, dynatrace_clients_1.createDtHttpClient)(dtEnvironment, scopesBase.concat('storage:entities:read'), oauthClientId, oauthClientSecret, dtPlatformToken);
-        const entityResponse = await (0, find_monitored_entity_by_name_1.findMonitoredEntityByName)(dtClient, entityName);
-        return entityResponse;
-    });
-    tool('get_entity_details', 'Get details of a monitored entity based on the entityId on Dynatrace', {
-        entityId: zod_1.z.string().optional(),
+    tool('find_entity_by_name', 'Find the entityId and type of a monitored entity (service, host, process-group, application, kubernetes-node, custom-app, ...) within the topology on Dynatrace, based on the name of the entity. Run this before querying data like logs, metrics, problems, events. If no entity name is known, make an educated guess with common identifiers like package.json `id`/`name`, helm chart names, kubernetes manfiest names, and alike.', {
+        entityNames: zod_1.z
+            .array(zod_1.z.string())
+            .describe('Names of the entities to search for - try with one name at first (identifiers like package.json id), and only try with multiple names if the first search was unsuccessful'),
+        maxEntitiesToDisplay: zod_1.z.number().default(10).describe('Maximum number of entities to display in the response.'),
+        extendedSearch: zod_1.z
+            .boolean()
+            .optional()
+            .default(false)
+            .describe('Set this to true if you want a comprehensive search over all available entity types.'),
     }, {
         readOnlyHint: true,
-    }, async ({ entityId }) => {
+    }, async ({ entityNames, maxEntitiesToDisplay, extendedSearch }) => {
         const dtClient = await (0, dynatrace_clients_1.createDtHttpClient)(dtEnvironment, scopesBase.concat('storage:entities:read'), oauthClientId, oauthClientSecret, dtPlatformToken);
-        const entityDetails = await (0, get_monitored_entity_details_1.getMonitoredEntityDetails)(dtClient, entityId);
-        if (!entityDetails) {
-            return `No entity found with entityId: ${entityId}`;
-        }
-        let resp = `Entity ${entityDetails.displayName} of type ${entityDetails.type} with \`entityId\` ${entityDetails.entityId}\n` +
-            `Properties: ${JSON.stringify(entityDetails.allProperties)}\n`;
-        if (entityDetails.type == 'SERVICE') {
-            resp += `You can find more information about the service at ${dtEnvironment}/ui/apps/dynatrace.services/explorer?detailsId=${entityDetails.entityId}&sidebarOpen=false`;
-        }
-        else if (entityDetails.type == 'HOST') {
-            resp += `You can find more information about the host at ${dtEnvironment}/ui/apps/dynatrace.infraops/hosts/${entityDetails.entityId}`;
-        }
-        else if (entityDetails.type == 'KUBERNETES_CLUSTER') {
-            resp += `You can find more information about the cluster at ${dtEnvironment}/ui/apps/dynatrace.infraops/kubernetes/${entityDetails.entityId}`;
-        }
-        else if (entityDetails.type == 'CLOUD_APPLICATION') {
-            resp += `You can find more details about the application at ${dtEnvironment}/ui/apps/dynatrace.kubernetes/explorer/workload?detailsId=${entityDetails.entityId}`;
-        }
-        resp += `\n\n**Filter**:`;
-        // Use entityTypeTable as the filter (e.g., fetch logs | filter dt.entity.service == "SERVICE-1234")
-        if (entityDetails.entityTypeTable) {
-            resp += ` You can use the following filter to get relevant information from other tools: \`| filter ${entityDetails.entityTypeTable} == "${entityDetails.entityId}"\`. `;
+        const result = await (0, find_monitored_entity_by_name_1.findMonitoredEntitiesByName)(dtClient, entityNames, extendedSearch);
+        if (result && result.records && result.records.length > 0) {
+            let resp = `Found ${result.records.length} monitored entities! Displaying the first ${maxEntitiesToDisplay} entities:\n`;
+            // iterate over dqlResponse and create a string with the problem details, but only show the top maxEntitiesToDisplay problems
+            result.records.slice(0, maxEntitiesToDisplay).forEach((entity) => {
+                if (entity && entity.id) {
+                    const entityType = (0, dynatrace_entity_types_1.getEntityTypeFromId)(String(entity.id));
+                    resp += `- Entity '${entity['entity.name']}' of type '${entity['entity.type']}' has entity id '${entity.id}' and tags ${entity['tags'] ? entity['tags'] : 'none'} - Use the DQL Filter: '| filter ${entityType} == "${entity.id}"'\n`;
+                }
+            });
+            resp +=
+                '\n\n**Next Steps:**\n' +
+                    '1. Try to fetch more details about the entity, using the `execute_dql` tool with "describe(dt.entity.<entity-type>)", and "fetch dt.entity.<entity-type> | filter id == <entity-id> | fieldsAdd <field-1>, <field2>, ..."\n' +
+                    '2. Perform a sanity check that found entities are actually the ones you are looking for, by comparing name and by type (hosts vs. containers vs. apps vs. functions) and technology (Java, TypeScript, .NET) with what is available in the local source code repo.\n' +
+                    '3. Find and investigate available metrics for relevant entities, by using the `execute_dql` tool with the following DQL statement: "fetch metric.series | filter dt.entity.<entity-type> == <entity-id>"\n' +
+                    '4. Find out whether any problems exist for this entity using the `list_problems` or `list_vulnerabilities` tool, and the provided DQL-Filter\n';
+            return resp;
         }
         else {
-            resp += ` Try to use search command as follows: \`| search "${entityDetails.entityId}"\`. `;
+            return 'No monitored entity found with the specified name. Try to broaden your search term or check for typos.';
         }
-        resp += `\n\n**Next Steps**\n\n`;
-        resp += `1. Find available metrics for this entity, by using execute_dql tool with the following DQL statement: "fetch metric.series" and the filter defined above\n`;
-        resp += `2. Find out whether any problems exist for this entity using the list_problems tool\n`;
-        resp += `3. Explore logs for this entity by using execute_dql with "fetch logs" and applying the filter mentioned above'\n`;
-        return resp;
     });
     tool('send_slack_message', 'Sends a Slack message to a dedicated Slack Channel via Slack Connector on Dynatrace', {
-        channel: zod_1.z.string().optional(),
-        message: zod_1.z.string().optional(),
+        channel: zod_1.z.string(),
+        message: zod_1.z
+            .string()
+            .describe('Slack markdown supported. Avoid sending sensitive data like log lines. Focus on context, insights, links, and summaries.'),
     }, {
         // not read-only, not open-world, not destructive
         readOnlyHint: false,
     }, async ({ channel, message }) => {
+        // Request human approval before sending the message
+        const approved = await requestHumanApproval(`Send information via Slack to ${channel}`);
+        if (!approved) {
+            return 'Operation cancelled: Human approval was not granted for sending this Slack message.';
+        }
         const dtClient = await (0, dynatrace_clients_1.createDtHttpClient)(dtEnvironment, scopesBase.concat('app-settings:objects:read'), oauthClientId, oauthClientSecret, dtPlatformToken);
         const response = await (0, send_slack_message_1.sendSlackMessage)(dtClient, slackConnectionId, channel, message);
         return `Message sent to Slack channel: ${JSON.stringify(response)}`;
     });
-    tool('verify_dql', 'Verify a Dynatrace Query Language (DQL) statement on Dynatrace GRAIL before executing it. This step is recommended for DQL statements that have been dynamically created by non-expert tools. For statements coming from the `generate_dql_from_natural_language` tool as well as from documentation, this step can be omitted.', {
+    tool('verify_dql', 'Syntactically verify a Dynatrace Query Language (DQL) statement on Dynatrace GRAIL before executing it. Recommended for generated DQL statements. Skip for statements created by `generate_dql_from_natural_language` tool, as well as from documentation.', {
         dqlStatement: zod_1.z.string(),
     }, {
         readOnlyHint: true,
@@ -351,16 +394,17 @@ const main = async () => {
             resp += `The DQL statement is valid - you can use the "execute_dql" tool.\n`;
         }
         else {
-            resp += `The DQL statement is invalid. Please adapt your statement.\n`;
+            resp += `The DQL statement is invalid. Please adapt your statement. Consider using "generate_dql_from_natural_language" tool for help.\n`;
         }
         return resp;
     });
     tool('execute_dql', 'Get Logs, Metrics, Spans or Events from Dynatrace GRAIL by executing a Dynatrace Query Language (DQL) statement. ' +
-        'You can also use the "generate_dql_from_natural_language" tool upfront to generate or refine a DQL statement based on your request. ' +
-        'Note: For more information about available fields for filters and aggregation, use the query "fetch dt.semantic_dictionary.models | filter data_object == \"logs\""', {
+        'Use the "generate_dql_from_natural_language" tool upfront to generate or refine a DQL statement based on your request. ' +
+        'To learn about possible fields available for filtering, use the query "fetch dt.semantic_dictionary.models | filter data_object == \"logs\""', {
         dqlStatement: zod_1.z
             .string()
-            .describe('DQL Statement (Ex: "fetch [logs, spans, events] | filter <some-filter> | summarize count(), by:{some-fields}.", or for metrics: "timeseries { avg(<metric-name>), value.A = avg(<metric-name>, scalar: true) }")'),
+            .describe('DQL Statement (Ex: "fetch [logs, spans, events], from: now()-4h, to: now() | filter <some-filter> | summarize count(), by:{some-fields}.", or for metrics: "timeseries { avg(<metric-name>), value.A = avg(<metric-name>, scalar: true) }"). ' +
+            'When querying data for a specific entity, call the `find_entity_by_name` tool first to get an appropriate filter like `dt.entity.service == "SERVICE-1234"` or `dt.entity.host == "HOST-1234"` to be used in the DQL statement. '),
     }, {
         // not readonly (DQL statements may modify things), not idempotent (may change over time)
         readOnlyHint: false,
@@ -431,6 +475,11 @@ const main = async () => {
         idempotentHint: true,
     }, async ({ text }) => {
         const dtClient = await (0, dynatrace_clients_1.createDtHttpClient)(dtEnvironment, scopesBase.concat('davis-copilot:nl2dql:execute'), oauthClientId, oauthClientSecret, dtPlatformToken);
+        // Check if the nl2dql skill is available
+        const isAvailable = await (0, davis_copilot_1.isDavisCopilotSkillAvailable)(dtClient, 'nl2dql');
+        if (!isAvailable) {
+            return `❌ The DQL generation skill is not available. Please visit: ${davis_copilot_1.DAVIS_COPILOT_DOCS.ENABLE_COPILOT}`;
+        }
         const response = await (0, davis_copilot_1.generateDqlFromNaturalLanguage)(dtClient, text);
         let resp = `🔤 Natural Language to DQL:\n\n`;
         resp += `**Query:** "${text}"\n\n`;
@@ -460,6 +509,11 @@ const main = async () => {
         idempotentHint: true,
     }, async ({ dql }) => {
         const dtClient = await (0, dynatrace_clients_1.createDtHttpClient)(dtEnvironment, scopesBase.concat('davis-copilot:dql2nl:execute'), oauthClientId, oauthClientSecret, dtPlatformToken);
+        // Check if the dql2nl skill is available
+        const isAvailable = await (0, davis_copilot_1.isDavisCopilotSkillAvailable)(dtClient, 'dql2nl');
+        if (!isAvailable) {
+            return `❌ The DQL explanation skill is not available. Please visit: ${davis_copilot_1.DAVIS_COPILOT_DOCS.ENABLE_COPILOT}`;
+        }
         const response = await (0, davis_copilot_1.explainDqlInNaturalLanguage)(dtClient, dql);
         let resp = `📝 DQL to Natural Language:\n\n`;
         resp += `**DQL Query:**\n\`\`\`\n${dql}\n\`\`\`\n\n`;
@@ -475,7 +529,7 @@ const main = async () => {
         }
         return resp;
     });
-    tool('chat_with_davis_copilot', 'Use this tool in case no specific tool is available. Get an answer to any Dynatrace related question as well as troubleshooting, and guidance. *(Note: Davis CoPilot AI is GA, but the Davis CoPilot APIs are in preview)*', {
+    tool('chat_with_davis_copilot', 'Use this tool to ask any Dynatrace related question, in case no other more specific tool is available.', {
         text: zod_1.z.string().describe('Your question or request for Davis CoPilot'),
         context: zod_1.z.string().optional().describe('Optional context to provide additional information'),
         instruction: zod_1.z.string().optional().describe('Optional instruction for how to format the response'),
@@ -485,6 +539,11 @@ const main = async () => {
         openWorldHint: true, // web-search like characteristics
     }, async ({ text, context, instruction }) => {
         const dtClient = await (0, dynatrace_clients_1.createDtHttpClient)(dtEnvironment, scopesBase.concat('davis-copilot:conversations:execute'), oauthClientId, oauthClientSecret, dtPlatformToken);
+        // Check if the conversation skill is available
+        const isAvailable = await (0, davis_copilot_1.isDavisCopilotSkillAvailable)(dtClient, 'conversation');
+        if (!isAvailable) {
+            return `❌ The conversation skill is not available. Please visit: ${davis_copilot_1.DAVIS_COPILOT_DOCS.ENABLE_COPILOT}`;
+        }
         const conversationContext = [];
         if (context) {
             conversationContext.push({
@@ -537,6 +596,11 @@ const main = async () => {
         readOnlyHint: false,
         idempotentHint: false, // creating the same workflow multiple times is possible
     }, async ({ problemType, teamName, channel, isPrivate }) => {
+        // ask for human approval
+        const approved = await requestHumanApproval(`Create a workflow for notifying team ${teamName} via ${channel} about ${problemType} problems`);
+        if (!approved) {
+            return 'Operation cancelled: Human approval was not granted for creating this workflow.';
+        }
         const dtClient = await (0, dynatrace_clients_1.createDtHttpClient)(dtEnvironment, scopesBase.concat('automation:workflows:write', 'automation:workflows:read', 'automation:workflows:run'), oauthClientId, oauthClientSecret, dtPlatformToken);
         const response = await (0, create_workflow_for_problem_notification_1.createWorkflowForProblemNotification)(dtClient, teamName, channel, problemType, isPrivate);
         let resp = `Workflow Created: ${response?.id} with name ${response?.title}.\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`;
@@ -558,6 +622,11 @@ const main = async () => {
         readOnlyHint: false,
         idempotentHint: true, // making the same workflow public multiple times yields the same result
     }, async ({ workflowId }) => {
+        // ask for human approval
+        const approved = await requestHumanApproval(`Make workflow ${workflowId} publicly available to everyone on the Dynatrace Environment`);
+        if (!approved) {
+            return 'Operation cancelled: Human approval was not granted for making this workflow public.';
+        }
         const dtClient = await (0, dynatrace_clients_1.createDtHttpClient)(dtEnvironment, scopesBase.concat('automation:workflows:write', 'automation:workflows:read', 'automation:workflows:run'), oauthClientId, oauthClientSecret, dtPlatformToken);
         const response = await (0, update_workflow_1.updateWorkflow)(dtClient, workflowId, {
             isPrivate: false,
@@ -618,7 +687,9 @@ You can now execute new Grail queries (DQL, etc.) again. If this happens more of
         ccRecipients: zod_1.z.array(zod_1.z.string().email()).optional().describe('Array of email addresses for CC recipients'),
         bccRecipients: zod_1.z.array(zod_1.z.string().email()).optional().describe('Array of email addresses for BCC recipients'),
         subject: zod_1.z.string().describe('Subject line of the email'),
-        body: zod_1.z.string().describe('Body content of the email (plain text only)'),
+        body: zod_1.z
+            .string()
+            .describe('Body content of the email (plain text only). Avoid sending sensitive data like log lines. Focus on context, insights, links, and summaries.'),
     }, {
         openWorldHint: true, // email is as close to the open-world as we can get with our system
     }, async ({ toRecipients, ccRecipients, bccRecipients, subject, body }) => {
@@ -627,6 +698,12 @@ You can now execute new Grail queries (DQL, etc.) again. If this happens more of
         if (totalRecipients > 10) {
             throw new Error(`Total recipients (${totalRecipients}) exceeds maximum limit of 10 across TO, CC, and BCC fields`);
         }
+        // Request human approval before sending the email
+        const allRecipients = [...toRecipients, ...(ccRecipients || []), ...(bccRecipients || [])];
+        const approved = await requestHumanApproval(`Send information via Email to ${allRecipients.join(', ')}`);
+        if (!approved) {
+            return 'Operation cancelled: Human approval was not granted for sending this email.';
+        }
         const dtClient = await (0, dynatrace_clients_1.createDtHttpClient)(dtEnvironment, scopesBase.concat('email:emails:send'), oauthClientId, oauthClientSecret, dtPlatformToken);
         const emailRequest = {
             toRecipients: { emailAddresses: toRecipients },

package/dist/utils/dynatrace-entity-types.js

@@ -8,7 +8,7 @@
  * @see https://docs.dynatrace.com/docs/discover-dynatrace/references/semantic-dictionary/model/dt-entities
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DYNATRACE_ENTITY_TYPES = void 0;
+exports.DYNATRACE_ENTITY_TYPES_ALL = exports.DYNATRACE_ENTITY_TYPES_BASICS = void 0;
 exports.getEntityTypeFromId = getEntityTypeFromId;
 /**
  * Entity ID prefixes mapped to their corresponding Dynatrace entity types
@@ -19,28 +19,23 @@ exports.getEntityTypeFromId = getEntityTypeFromId;
  *
  * Recommendation: Use `verify_dql` and/or `execute_dql` to ensure that the entity type can be queried correctly.
  */
-const ENTITY_ID_PREFIX_TO_TYPE_MAP = {
+const ENTITY_ID_PREFIX_TO_TYPE_MAP_BASICS = {
     // Core Applications and Services
     APPLICATION: 'dt.entity.application', // Verified!
     SERVICE: 'dt.entity.service', // Verified!
-    SERVICE_INSTANCE: 'dt.entity.service_instance', // Verified!
     MOBILE_APPLICATION: 'dt.entity.mobile_application', // Verified! (0 rows found, manually verified that entity exists)
     CUSTOM_APPLICATION: 'dt.entity.custom_application', // Verified!
     // Infrastructure
     HOST: 'dt.entity.host', // Verified!
     HOST_GROUP: 'dt.entity.host_group', // Verified!
     PROCESS_GROUP: 'dt.entity.process_group', // Verified!
-    PROCESS_GROUP_INSTANCE: 'dt.entity.process_group_instance', // Verified!
     DISK: 'dt.entity.disk', // Verified!
     NETWORK_INTERFACE: 'dt.entity.network_interface', // Verified!
     // Cloud Services
     CLOUD_APPLICATION: 'dt.entity.cloud_application', // Verified!
-    CLOUD_APPLICATION_INSTANCE: 'dt.entity.cloud_application_instance', // Verified!
     CLOUD_APPLICATION_NAMESPACE: 'dt.entity.cloud_application_namespace', // Verified!
     // Containers and Container Groups
     CONTAINER_GROUP: 'dt.entity.container_group', // Verified!
-    CONTAINER_GROUP_INSTANCE: 'dt.entity.container_group_instance', // Verified!
-    DCG_INSTANCE: 'dt.entity.docker_container_group_instance', // Verified! (0 rows found, manually verified that entity exists, but this might be deprecated / old)
     // Environment
     ENVIRONMENT: 'dt.entity.environment', // Verified!
     // Operating System
@@ -55,6 +50,18 @@ const ENTITY_ID_PREFIX_TO_TYPE_MAP = {
     GEOLOCATION: 'dt.entity.geolocation', // Verified!
     // Database Services
     RELATIONAL_DATABASE_SERVICE: 'dt.entity.relational_database_service', // Verified - might need an additional integration/config to work properly though
+    // Kubernetes Entities
+    KUBERNETES_NODE: 'dt.entity.kubernetes_node', // Verified!
+    KUBERNETES_CLUSTER: 'dt.entity.kubernetes_cluster', // Verified!
+    KUBERNETES_SERVICE: 'dt.entity.kubernetes_service', // Verified!
+};
+const ENTITY_ID_PREFIX_TO_TYPE_MAP_ALL = {
+    ...ENTITY_ID_PREFIX_TO_TYPE_MAP_BASICS,
+    SERVICE_INSTANCE: 'dt.entity.service_instance', // Verified!
+    PROCESS_GROUP_INSTANCE: 'dt.entity.process_group_instance', // Verified!
+    CLOUD_APPLICATION_INSTANCE: 'dt.entity.cloud_application_instance', // Verified!
+    DCG_INSTANCE: 'dt.entity.docker_container_group_instance', // Verified! (0 rows found, manually verified that entity exists, but this might be deprecated / old)
+    CONTAINER_GROUP_INSTANCE: 'dt.entity.container_group_instance', // Verified!
     // AWS Services
     EC2_INSTANCE: 'dt.entity.ec2_instance', // Verified!
     AWS_LAMBDA_FUNCTION: 'dt.entity.aws_lambda_function', // Verified!
@@ -66,12 +73,9 @@ const ENTITY_ID_PREFIX_TO_TYPE_MAP = {
     // Virtual Machines
     AZURE_VM: 'dt.entity.azure_vm', // Verified
     OPENSTACK_VM: 'dt.entity.openstack_vm', // Needs manual verification - available only if OpenStack integration is configured
-    // Kubernetes Entities
-    KUBERNETES_NODE: 'dt.entity.kubernetes_node', // Verified!
-    KUBERNETES_CLUSTER: 'dt.entity.kubernetes_cluster', // Verified!
-    KUBERNETES_SERVICE: 'dt.entity.kubernetes_service', // Verified!
 };
-exports.DYNATRACE_ENTITY_TYPES = Object.values(ENTITY_ID_PREFIX_TO_TYPE_MAP).sort();
+exports.DYNATRACE_ENTITY_TYPES_BASICS = Object.values(ENTITY_ID_PREFIX_TO_TYPE_MAP_BASICS).sort();
+exports.DYNATRACE_ENTITY_TYPES_ALL = Object.values(ENTITY_ID_PREFIX_TO_TYPE_MAP_ALL).sort();
 /**
  * Maps a Dynatrace entity ID to its corresponding entity type.
  *
@@ -97,5 +101,5 @@ function getEntityTypeFromId(entityId) {
     }
     const prefix = entityId.substring(0, hyphenIndex);
     // Look up the entity type in our mapping
-    return ENTITY_ID_PREFIX_TO_TYPE_MAP[prefix] || null;
+    return ENTITY_ID_PREFIX_TO_TYPE_MAP_ALL[prefix] || null;
 }

package/dist/utils/dynatrace-entity-types.test.js

@@ -3,12 +3,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const dynatrace_entity_types_1 = require("./dynatrace-entity-types");
 describe('DYNATRACE_ENTITY_TYPES', () => {
     it('should be sorted alphabetically', () => {
-        const sortedTypes = [...dynatrace_entity_types_1.DYNATRACE_ENTITY_TYPES].sort();
-        expect(dynatrace_entity_types_1.DYNATRACE_ENTITY_TYPES).toEqual(sortedTypes);
+        const sortedTypes = [...dynatrace_entity_types_1.DYNATRACE_ENTITY_TYPES_ALL].sort();
+        expect(dynatrace_entity_types_1.DYNATRACE_ENTITY_TYPES_ALL).toEqual(sortedTypes);
     });
     it('should have unique values', () => {
-        const uniqueTypes = [...new Set(dynatrace_entity_types_1.DYNATRACE_ENTITY_TYPES)];
-        expect(dynatrace_entity_types_1.DYNATRACE_ENTITY_TYPES.length).toBe(uniqueTypes.length);
+        const uniqueTypes = [...new Set(dynatrace_entity_types_1.DYNATRACE_ENTITY_TYPES_ALL)];
+        expect(dynatrace_entity_types_1.DYNATRACE_ENTITY_TYPES_ALL.length).toBe(uniqueTypes.length);
     });
 });
 describe('getEntityTypeFromId', () => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dynatrace-oss/dynatrace-mcp-server",
-  "version": "0.6.0",
+  "version": "0.7.0",
   "mcpName": "io.github.dynatrace-oss/Dynatrace-mcp",
   "description": "Model Context Protocol (MCP) server for Dynatrace",
   "keywords": [

package/dist/capabilities/get-monitored-entity-details.js

@@ -1,47 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getMonitoredEntityDetails = void 0;
-const execute_dql_1 = require("./execute-dql");
-const dynatrace_entity_types_1 = require("../utils/dynatrace-entity-types");
-/**
- * Get monitored entity details by entity ID via DQL
- * @param dtClient
- * @param entityId
- * @returns Details about the monitored entity, or undefined in case we couldn't find it
- */
-const getMonitoredEntityDetails = async (dtClient, entityId) => {
-    // Try to determine the entity type directly from the entity ID (e.g., PROCESS_GROUP-F84E4759809ADA84 -> dt.entity.process_group)
-    const entityType = (0, dynatrace_entity_types_1.getEntityTypeFromId)(entityId);
-    if (!entityType) {
-        console.error(`Couldn't determine entity type for ID: ${entityId}. Please raise an issue at https://github.com/dynatrace-oss/dynatrace-mcp/issues if you believe this is a bug.`);
-        return;
-    }
-    // construct DQL statement like `fetch dt.entity.hosts | filter id == "HOST-1234"`
-    const dql = `fetch ${entityType} | filter id == "${entityId}" | expand tags | fieldsAdd entity.type`;
-    // Get response from API
-    const dqlResponse = await (0, execute_dql_1.executeDql)(dtClient, { query: dql });
-    // verify response and length
-    if (!dqlResponse || !dqlResponse.records || dqlResponse.records.length === 0) {
-        console.error(`No entity found for ID: ${entityId}`);
-        return;
-    }
-    // in case we have more than one entity -> log it
-    if (dqlResponse.records.length > 1) {
-        console.error(`Multiple entities (${dqlResponse.records.length}) found for entity ID: ${entityId}. Returning the first one.`);
-    }
-    const entity = dqlResponse.records[0];
-    // make typescript happy; entity should never be null though
-    if (!entity) {
-        console.error(`No entity found for ID: ${entityId}`);
-        return;
-    }
-    // return entity details
-    return {
-        entityId: String(entity.id),
-        entityTypeTable: entityType,
-        displayName: String(entity['entity.name']),
-        type: String(entity['entity.type']),
-        allProperties: entity || undefined,
-    };
-};
-exports.getMonitoredEntityDetails = getMonitoredEntityDetails;