Add query_string to Topology widget definition

.generator/schemas/v1/openapi.yaml

@@ -18843,7 +18843,7 @@ components:
             $ref: "#/components/schemas/WidgetCustomLink"
           type: array
         requests:
-          description: One or more Topology requests.
+          description: One Topology request.
           items:
             $ref: "#/components/schemas/TopologyRequest"
           minItems: 1
@@ -18872,10 +18872,14 @@ components:
       x-enum-varnames:
         - TOPOLOGY_MAP
     TopologyQuery:
+      description: A topology data source query.
+      oneOf:
+        - $ref: "#/components/schemas/TopologyQueryDataStreamsOrServiceMap"
+    TopologyQueryDataStreamsOrServiceMap:
       description: Query to service-based topology data sources like the service map or data streams.
       properties:
         data_source:
-          $ref: "#/components/schemas/TopologyQueryDataSource"
+          $ref: "#/components/schemas/TopologyQueryDataStreamsOrServiceMapDataSource"
         filters:
           description: Your environment and primary tag (or * if enabled for your account).
           example: ["env:prod", "az:us-east"]
@@ -18884,16 +18888,24 @@ components:
             type: string
           minItems: 1
           type: array
+        query_string:
+          description: A search string for filtering services, used in `data_streams` queries only. When set, this replaces the `service` field
+          example: "service:myservice"
+          type: string
         service:
           description: Name of the service
-          example: myService
+          example: myservice
           type: string
+      required:
+        - data_source
+        - filters
       type: object
-    TopologyQueryDataSource:
+    TopologyQueryDataStreamsOrServiceMapDataSource:
       description: Name of the data source
       enum:
         - data_streams
         - service_map
+      example: data_streams
       type: string
       x-enum-varnames:
         - DATA_STREAMS

.generator/schemas/v2/openapi.yaml

@@ -56896,7 +56896,7 @@ components:
           $ref: "#/components/schemas/SecurityMonitoringCriticalAsset"
       type: object
     SecurityMonitoringCriticalAssetSeverity:
-      description: Severity associated with this critical asset. Either an explicit severity can be set, or the severity can be increased or decreased, or the severity can be left unchanged (no-op).
+      description: Severity associated with this critical asset. Either an explicit severity can be set, or the severity can be increased or decreased.
       enum:
         - info
         - low
@@ -56905,7 +56905,6 @@ components:
         - critical
         - increase
         - decrease
-        - no-op
       example: increase
       type: string
       x-enum-varnames:
@@ -56916,7 +56915,6 @@ components:
         - CRITICAL
         - INCREASE
         - DECREASE
-        - NO_OP
     SecurityMonitoringCriticalAssetType:
       default: critical_assets
       description: The type of the resource. The value should always be `critical_assets`.

cassettes/v1/Dashboards_1335235736/Create-a-new-dashboard-with-topology_map-data_streams-widget_1782213174/frozen.json

@@ -0,0 +1 @@
+"2026-03-20T18:16:51.929Z"

cassettes/v1/Dashboards_1335235736/Create-a-new-dashboard-with-topology_map-data_streams-widget_1782213174/recording.har

@@ -0,0 +1,110 @@
+{
+  "log": {
+    "_recordingName": "Dashboards/Create a new dashboard with topology_map data_streams widget",
+    "creator": {
+      "comment": "persister:fs",
+      "name": "Polly.JS",
+      "version": "6.0.5"
+    },
+    "entries": [
+      {
+        "_id": "5ef852d7c1bccb279d3a40ee81b48bd4",
+        "_order": 0,
+        "cache": {},
+        "request": {
+          "bodySize": 465,
+          "cookies": [],
+          "headers": [
+            {
+              "_fromType": "array",
+              "name": "accept",
+              "value": "application/json"
+            },
+            {
+              "_fromType": "array",
+              "name": "content-type",
+              "value": "application/json"
+            }
+          ],
+          "headersSize": 559,
+          "httpVersion": "HTTP/1.1",
+          "method": "POST",
+          "postData": {
+            "mimeType": "application/json",
+            "params": [],
+            "text": "{\"description\":\"\",\"layout_type\":\"free\",\"notify_list\":[],\"template_variables\":[],\"title\":\"Test-Create_a_new_dashboard_with_topology_map_data_streams_widget-1774030611\",\"widgets\":[{\"definition\":{\"requests\":[{\"query\":{\"data_source\":\"data_streams\",\"filters\":[\"env:prod\"],\"query_string\":\"service:myservice\",\"service\":\"\"},\"request_type\":\"topology\"}],\"title\":\"\",\"title_align\":\"left\",\"title_size\":\"16\",\"type\":\"topology_map\"},\"layout\":{\"height\":15,\"width\":47,\"x\":0,\"y\":0}}]}"
+          },
+          "queryString": [],
+          "url": "https://api.datadoghq.com/api/v1/dashboard"
+        },
+        "response": {
+          "bodySize": 806,
+          "content": {
+            "mimeType": "application/json",
+            "size": 806,
+            "text": "{\"id\":\"whr-253-7we\",\"title\":\"Test-Create_a_new_dashboard_with_topology_map_data_streams_widget-1774030611\",\"description\":\"\",\"author_handle\":\"9919ec9b-ebc7-49ee-8dc8-03626e717cca\",\"author_name\":\"CI Account\",\"layout_type\":\"free\",\"url\":\"/dashboard/whr-253-7we/test-createanewdashboardwithtopologymapdatastreamswidget-1774030611\",\"template_variables\":[],\"widgets\":[{\"definition\":{\"requests\":[{\"query\":{\"data_source\":\"data_streams\",\"filters\":[\"env:prod\"],\"query_string\":\"service:myservice\",\"service\":\"\"},\"request_type\":\"topology\"}],\"title\":\"\",\"title_align\":\"left\",\"title_size\":\"16\",\"type\":\"topology_map\"},\"layout\":{\"height\":15,\"width\":47,\"x\":0,\"y\":0},\"id\":1843670487553482}],\"notify_list\":[],\"created_at\":\"2026-03-20T18:16:52.209473+00:00\",\"modified_at\":\"2026-03-20T18:16:52.209473+00:00\",\"restricted_roles\":[]}"
+          },
+          "cookies": [],
+          "headers": [
+            {
+              "name": "content-type",
+              "value": "application/json"
+            }
+          ],
+          "headersSize": 379,
+          "httpVersion": "HTTP/1.1",
+          "redirectURL": "",
+          "status": 200,
+          "statusText": "OK"
+        },
+        "startedDateTime": "2026-03-20T18:16:51.938Z",
+        "time": 367
+      },
+      {
+        "_id": "33d0dcbd89c8bfed97293770bde62baa",
+        "_order": 0,
+        "cache": {},
+        "request": {
+          "bodySize": 0,
+          "cookies": [],
+          "headers": [
+            {
+              "_fromType": "array",
+              "name": "accept",
+              "value": "application/json"
+            }
+          ],
+          "headersSize": 520,
+          "httpVersion": "HTTP/1.1",
+          "method": "DELETE",
+          "queryString": [],
+          "url": "https://api.datadoghq.com/api/v1/dashboard/whr-253-7we"
+        },
+        "response": {
+          "bodySize": 38,
+          "content": {
+            "mimeType": "application/json",
+            "size": 38,
+            "text": "{\"deleted_dashboard_id\":\"whr-253-7we\"}"
+          },
+          "cookies": [],
+          "headers": [
+            {
+              "name": "content-type",
+              "value": "application/json"
+            }
+          ],
+          "headersSize": 378,
+          "httpVersion": "HTTP/1.1",
+          "redirectURL": "",
+          "status": 200,
+          "statusText": "OK"
+        },
+        "startedDateTime": "2026-03-20T18:16:52.316Z",
+        "time": 566
+      }
+    ],
+    "pages": [],
+    "version": "1.2"
+  }
+}

features/v1/dashboards.feature

@@ -1028,6 +1028,19 @@ Feature: Dashboards
     And the response "widgets[0].definition.requests[0].sort.order_by[0].type" is equal to "formula"
     And the response "widgets[0].definition.requests[0].sort.order_by[0].index" is equal to 0
 
+  @team:DataDog/dashboards-backend
+  Scenario: Create a new dashboard with topology_map data_streams widget
+    Given new "CreateDashboard" request
+    And body from file "dashboards_json_payload/topology_map_widget_data_streams.json"
+    When the request is sent
+    Then the response status is 200 OK
+    And the response "widgets[0].definition.type" is equal to "topology_map"
+    And the response "widgets[0].definition.requests[0].request_type" is equal to "topology"
+    And the response "widgets[0].definition.requests[0].query.data_source" is equal to "data_streams"
+    And the response "widgets[0].definition.requests[0].query.service" is equal to ""
+    And the response "widgets[0].definition.requests[0].query.filters" is equal to ["env:prod"]
+    And the response "widgets[0].definition.requests[0].query.query_string" is equal to "service:myservice"
+
   @team:DataDog/dashboards-backend
   Scenario: Create a new dashboard with topology_map widget
     Given new "CreateDashboard" request

features/v1/dashboards_json_payload/topology_map_widget_data_streams.json

@@ -0,0 +1,34 @@
+{
+  "title": "{{ unique }}",
+  "description": "",
+  "widgets": [
+    {
+      "layout": {
+        "x": 0,
+        "y": 0,
+        "width": 47,
+        "height": 15
+      },
+      "definition": {
+        "title": "",
+        "title_size": "16",
+        "title_align": "left",
+        "type": "topology_map",
+        "requests": [
+          {
+            "request_type": "topology",
+            "query": {
+              "data_source": "data_streams",
+              "service": "",
+              "filters": ["env:prod"],
+              "query_string": "service:myservice"
+            }
+          }
+        ]
+      }
+    }
+  ],
+  "template_variables": [],
+  "layout_type": "free",
+  "notify_list": []
+}

services/dashboards/src/v1/index.ts

@@ -259,7 +259,8 @@ export { ToplistWidgetStyle } from "./models/ToplistWidgetStyle";
 export { TopologyMapWidgetDefinition } from "./models/TopologyMapWidgetDefinition";
 export { TopologyMapWidgetDefinitionType } from "./models/TopologyMapWidgetDefinitionType";
 export { TopologyQuery } from "./models/TopologyQuery";
-export { TopologyQueryDataSource } from "./models/TopologyQueryDataSource";
+export { TopologyQueryDataStreamsOrServiceMap } from "./models/TopologyQueryDataStreamsOrServiceMap";
+export { TopologyQueryDataStreamsOrServiceMapDataSource } from "./models/TopologyQueryDataStreamsOrServiceMapDataSource";
 export { TopologyRequest } from "./models/TopologyRequest";
 export { TopologyRequestType } from "./models/TopologyRequestType";
 export { TreeMapColorBy } from "./models/TreeMapColorBy";

services/dashboards/src/v1/models/TopologyMapWidgetDefinition.ts

@@ -14,7 +14,7 @@ export class TopologyMapWidgetDefinition {
    */
   "customLinks"?: Array<WidgetCustomLink>;
   /**
-   * One or more Topology requests.
+   * One Topology request.
    */
   "requests": Array<TopologyRequest>;
   /**

services/dashboards/src/v1/models/TopologyQuery.ts

@@ -1,62 +1,10 @@
-import { AttributeTypeMap } from "@datadog/datadog-api-client";
+import { UnparsedObject } from "@datadog/datadog-api-client";
 
-import { TopologyQueryDataSource } from "./TopologyQueryDataSource";
+import { TopologyQueryDataStreamsOrServiceMap } from "./TopologyQueryDataStreamsOrServiceMap";
 
 /**
- * Query to service-based topology data sources like the service map or data streams.
+ * A topology data source query.
  */
-export class TopologyQuery {
-  /**
-   * Name of the data source
-   */
-  "dataSource"?: TopologyQueryDataSource;
-  /**
-   * Your environment and primary tag (or * if enabled for your account).
-   */
-  "filters"?: Array<string>;
-  /**
-   * Name of the service
-   */
-  "service"?: string;
-  /**
-   * A container for additional, undeclared properties.
-   * This is a holder for any undeclared properties as specified with
-   * the 'additionalProperties' keyword in the OAS document.
-   */
-  "additionalProperties"?: { [key: string]: any };
-  /**
-   * @ignore
-   */
-  "_unparsed"?: boolean;
-
-  /**
-   * @ignore
-   */
-  static readonly attributeTypeMap: AttributeTypeMap = {
-    dataSource: {
-      baseName: "data_source",
-      type: "TopologyQueryDataSource",
-    },
-    filters: {
-      baseName: "filters",
-      type: "Array<string>",
-    },
-    service: {
-      baseName: "service",
-      type: "string",
-    },
-    additionalProperties: {
-      baseName: "additionalProperties",
-      type: "{ [key: string]: any; }",
-    },
-  };
-
-  /**
-   * @ignore
-   */
-  static getAttributeTypeMap(): AttributeTypeMap {
-    return TopologyQuery.attributeTypeMap;
-  }
-
-  public constructor() {}
-}
+export type TopologyQuery =
+  | TopologyQueryDataStreamsOrServiceMap
+  | UnparsedObject;