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`.

examples/v1/dashboards/CreateDashboard_2652180930.java

@@ -8,7 +8,8 @@
 import com.datadog.api.client.v1.model.TopologyMapWidgetDefinition;
 import com.datadog.api.client.v1.model.TopologyMapWidgetDefinitionType;
 import com.datadog.api.client.v1.model.TopologyQuery;
-import com.datadog.api.client.v1.model.TopologyQueryDataSource;
+import com.datadog.api.client.v1.model.TopologyQueryDataStreamsOrServiceMap;
+import com.datadog.api.client.v1.model.TopologyQueryDataStreamsOrServiceMapDataSource;
 import com.datadog.api.client.v1.model.TopologyRequest;
 import com.datadog.api.client.v1.model.TopologyRequestType;
 import com.datadog.api.client.v1.model.Widget;
@@ -43,13 +44,16 @@ public static void main(String[] args) {
                                             new TopologyRequest()
                                                 .requestType(TopologyRequestType.TOPOLOGY)
                                                 .query(
-                                                    new TopologyQuery()
-                                                        .dataSource(
-                                                            TopologyQueryDataSource.SERVICE_MAP)
-                                                        .service("")
-                                                        .filters(
-                                                            Arrays.asList(
-                                                                "env:none", "environment:*")))))))))
+                                                    new TopologyQuery(
+                                                        new TopologyQueryDataStreamsOrServiceMap()
+                                                            .dataSource(
+                                                                TopologyQueryDataStreamsOrServiceMapDataSource
+                                                                    .SERVICE_MAP)
+                                                            .service("")
+                                                            .filters(
+                                                                Arrays.asList(
+                                                                    "env:none",
+                                                                    "environment:*"))))))))))
             .layoutType(DashboardLayoutType.FREE);
 
     try {

examples/v1/dashboards/CreateDashboard_2815497946.java

@@ -0,0 +1,70 @@
+// Create a new dashboard with topology_map data_streams widget
+
+import com.datadog.api.client.ApiClient;
+import com.datadog.api.client.ApiException;
+import com.datadog.api.client.v1.api.DashboardsApi;
+import com.datadog.api.client.v1.model.Dashboard;
+import com.datadog.api.client.v1.model.DashboardLayoutType;
+import com.datadog.api.client.v1.model.TopologyMapWidgetDefinition;
+import com.datadog.api.client.v1.model.TopologyMapWidgetDefinitionType;
+import com.datadog.api.client.v1.model.TopologyQuery;
+import com.datadog.api.client.v1.model.TopologyQueryDataStreamsOrServiceMap;
+import com.datadog.api.client.v1.model.TopologyQueryDataStreamsOrServiceMapDataSource;
+import com.datadog.api.client.v1.model.TopologyRequest;
+import com.datadog.api.client.v1.model.TopologyRequestType;
+import com.datadog.api.client.v1.model.Widget;
+import com.datadog.api.client.v1.model.WidgetDefinition;
+import com.datadog.api.client.v1.model.WidgetLayout;
+import com.datadog.api.client.v1.model.WidgetTextAlign;
+import java.util.Collections;
+
+public class Example {
+  public static void main(String[] args) {
+    ApiClient defaultClient = ApiClient.getDefaultApiClient();
+    DashboardsApi apiInstance = new DashboardsApi(defaultClient);
+
+    Dashboard body =
+        new Dashboard()
+            .title("Example-Dashboard")
+            .description("")
+            .widgets(
+                Collections.singletonList(
+                    new Widget()
+                        .layout(new WidgetLayout().x(0L).y(0L).width(47L).height(15L))
+                        .definition(
+                            new WidgetDefinition(
+                                new TopologyMapWidgetDefinition()
+                                    .title("")
+                                    .titleSize("16")
+                                    .titleAlign(WidgetTextAlign.LEFT)
+                                    .type(TopologyMapWidgetDefinitionType.TOPOLOGY_MAP)
+                                    .requests(
+                                        Collections.singletonList(
+                                            new TopologyRequest()
+                                                .requestType(TopologyRequestType.TOPOLOGY)
+                                                .query(
+                                                    new TopologyQuery(
+                                                        new TopologyQueryDataStreamsOrServiceMap()
+                                                            .dataSource(
+                                                                TopologyQueryDataStreamsOrServiceMapDataSource
+                                                                    .DATA_STREAMS)
+                                                            .service("")
+                                                            .filters(
+                                                                Collections.singletonList(
+                                                                    "env:prod"))
+                                                            .queryString(
+                                                                "service:myservice")))))))))
+            .layoutType(DashboardLayoutType.FREE);
+
+    try {
+      Dashboard result = apiInstance.createDashboard(body);
+      System.out.println(result);
+    } catch (ApiException e) {
+      System.err.println("Exception when calling DashboardsApi#createDashboard");
+      System.err.println("Status code: " + e.getCode());
+      System.err.println("Reason: " + e.getResponseBody());
+      System.err.println("Response headers: " + e.getResponseHeaders());
+      e.printStackTrace();
+    }
+  }
+}

src/main/java/com/datadog/api/client/v1/model/TopologyMapWidgetDefinition.java

@@ -113,7 +113,7 @@ public TopologyMapWidgetDefinition addRequestsItem(TopologyRequest requestsItem)
   }
 
   /**
-   * One or more Topology requests.
+   * One Topology request.
    *
    * @return requests
    */