diff --git a/.generator/schemas/v1/openapi.yaml b/.generator/schemas/v1/openapi.yaml
index 6eb50c8c0370..c48ba0ad971e 100644
--- a/.generator/schemas/v1/openapi.yaml
+++ b/.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
diff --git a/.generator/schemas/v2/openapi.yaml b/.generator/schemas/v2/openapi.yaml
index 74e037558834..3f6672109912 100644
--- a/.generator/schemas/v2/openapi.yaml
+++ b/.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`.
diff --git a/cassettes/features/v1/dashboards/Create-a-new-dashboard-with-topology-map-data-streams-widget.frozen b/cassettes/features/v1/dashboards/Create-a-new-dashboard-with-topology-map-data-streams-widget.frozen
new file mode 100644
index 000000000000..21a59912fa38
--- /dev/null
+++ b/cassettes/features/v1/dashboards/Create-a-new-dashboard-with-topology-map-data-streams-widget.frozen
@@ -0,0 +1 @@
+2026-03-20T18:16:51.929Z
\ No newline at end of file
diff --git a/cassettes/features/v1/dashboards/Create-a-new-dashboard-with-topology-map-data-streams-widget.yml b/cassettes/features/v1/dashboards/Create-a-new-dashboard-with-topology-map-data-streams-widget.yml
new file mode 100644
index 000000000000..a3b11a66d08d
--- /dev/null
+++ b/cassettes/features/v1/dashboards/Create-a-new-dashboard-with-topology-map-data-streams-widget.yml
@@ -0,0 +1,43 @@
+http_interactions:
+- recorded_at: Fri, 20 Mar 2026 18:16:51 GMT
+  request:
+    body:
+      encoding: UTF-8
+      string: '{"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}}]}'
+    headers:
+      Accept:
+      - application/json
+      Content-Type:
+      - application/json
+    method: POST
+    uri: https://api.datadoghq.com/api/v1/dashboard
+  response:
+    body:
+      encoding: UTF-8
+      string: '{"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":[]}'
+    headers:
+      Content-Type:
+      - application/json
+    status:
+      code: 200
+      message: OK
+- recorded_at: Fri, 20 Mar 2026 18:16:51 GMT
+  request:
+    body: null
+    headers:
+      Accept:
+      - application/json
+    method: DELETE
+    uri: https://api.datadoghq.com/api/v1/dashboard/whr-253-7we
+  response:
+    body:
+      encoding: UTF-8
+      string: '{"deleted_dashboard_id":"whr-253-7we"}'
+    headers:
+      Content-Type:
+      - application/json
+    status:
+      code: 200
+      message: OK
+recorded_with: VCR 6.0.0
diff --git a/examples/v1/dashboards/CreateDashboard_2652180930.rb b/examples/v1/dashboards/CreateDashboard_2652180930.rb
index 964876583be3..62d8baaed6c2 100644
--- a/examples/v1/dashboards/CreateDashboard_2652180930.rb
+++ b/examples/v1/dashboards/CreateDashboard_2652180930.rb
@@ -22,8 +22,8 @@
         requests: [
           DatadogAPIClient::V1::TopologyRequest.new({
             request_type: DatadogAPIClient::V1::TopologyRequestType::TOPOLOGY,
-            query: DatadogAPIClient::V1::TopologyQuery.new({
-              data_source: DatadogAPIClient::V1::TopologyQueryDataSource::SERVICE_MAP,
+            query: DatadogAPIClient::V1::TopologyQueryDataStreamsOrServiceMap.new({
+              data_source: DatadogAPIClient::V1::TopologyQueryDataStreamsOrServiceMapDataSource::SERVICE_MAP,
               service: "",
               filters: [
                 "env:none",
diff --git a/examples/v1/dashboards/CreateDashboard_2815497946.rb b/examples/v1/dashboards/CreateDashboard_2815497946.rb
new file mode 100644
index 000000000000..d326ede370ad
--- /dev/null
+++ b/examples/v1/dashboards/CreateDashboard_2815497946.rb
@@ -0,0 +1,42 @@
+# Create a new dashboard with topology_map data_streams widget
+
+require "datadog_api_client"
+api_instance = DatadogAPIClient::V1::DashboardsAPI.new
+
+body = DatadogAPIClient::V1::Dashboard.new({
+  title: "Example-Dashboard",
+  description: "",
+  widgets: [
+    DatadogAPIClient::V1::Widget.new({
+      layout: DatadogAPIClient::V1::WidgetLayout.new({
+        x: 0,
+        y: 0,
+        width: 47,
+        height: 15,
+      }),
+      definition: DatadogAPIClient::V1::TopologyMapWidgetDefinition.new({
+        title: "",
+        title_size: "16",
+        title_align: DatadogAPIClient::V1::WidgetTextAlign::LEFT,
+        type: DatadogAPIClient::V1::TopologyMapWidgetDefinitionType::TOPOLOGY_MAP,
+        requests: [
+          DatadogAPIClient::V1::TopologyRequest.new({
+            request_type: DatadogAPIClient::V1::TopologyRequestType::TOPOLOGY,
+            query: DatadogAPIClient::V1::TopologyQueryDataStreamsOrServiceMap.new({
+              data_source: DatadogAPIClient::V1::TopologyQueryDataStreamsOrServiceMapDataSource::DATA_STREAMS,
+              service: "",
+              filters: [
+                "env:prod",
+              ],
+              query_string: "service:myservice",
+            }),
+          }),
+        ],
+      }),
+    }),
+  ],
+  template_variables: [],
+  layout_type: DatadogAPIClient::V1::DashboardLayoutType::FREE,
+  notify_list: [],
+})
+p api_instance.create_dashboard(body)
diff --git a/features/v1/dashboards.feature b/features/v1/dashboards.feature
index 0b753ac17b9a..fb95df356c5d 100644
--- a/features/v1/dashboards.feature
+++ b/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
diff --git a/features/v1/dashboards_json_payload/topology_map_widget_data_streams.json b/features/v1/dashboards_json_payload/topology_map_widget_data_streams.json
new file mode 100644
index 000000000000..f454b974e6be
--- /dev/null
+++ b/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": []
+}
diff --git a/lib/datadog_api_client/inflector.rb b/lib/datadog_api_client/inflector.rb
index 540940108c71..82aa6d5f372d 100644
--- a/lib/datadog_api_client/inflector.rb
+++ b/lib/datadog_api_client/inflector.rb
@@ -839,7 +839,8 @@ def overrides
           "v1.topology_map_widget_definition" => "TopologyMapWidgetDefinition",
           "v1.topology_map_widget_definition_type" => "TopologyMapWidgetDefinitionType",
           "v1.topology_query" => "TopologyQuery",
-          "v1.topology_query_data_source" => "TopologyQueryDataSource",
+          "v1.topology_query_data_streams_or_service_map" => "TopologyQueryDataStreamsOrServiceMap",
+          "v1.topology_query_data_streams_or_service_map_data_source" => "TopologyQueryDataStreamsOrServiceMapDataSource",
           "v1.topology_request" => "TopologyRequest",
           "v1.topology_request_type" => "TopologyRequestType",
           "v1.tree_map_color_by" => "TreeMapColorBy",
diff --git a/lib/datadog_api_client/v1/models/topology_map_widget_definition.rb b/lib/datadog_api_client/v1/models/topology_map_widget_definition.rb
index cc6bf85b8884..6460018063f5 100644
--- a/lib/datadog_api_client/v1/models/topology_map_widget_definition.rb
+++ b/lib/datadog_api_client/v1/models/topology_map_widget_definition.rb
@@ -24,7 +24,7 @@ class TopologyMapWidgetDefinition
     # List of custom links.
     attr_accessor :custom_links
 
-    # One or more Topology requests.
+    # One Topology request.
     attr_reader :requests
 
     # Title of your widget.
diff --git a/lib/datadog_api_client/v1/models/topology_query.rb b/lib/datadog_api_client/v1/models/topology_query.rb
index c0e025798220..315a40c7f123 100644
--- a/lib/datadog_api_client/v1/models/topology_query.rb
+++ b/lib/datadog_api_client/v1/models/topology_query.rb
@@ -17,129 +17,46 @@
 require 'time'
 
 module DatadogAPIClient::V1
-  # Query to service-based topology data sources like the service map or data streams.
-  class TopologyQuery
-    include BaseGenericModel
-
-    # Name of the data source
-    attr_accessor :data_source
-
-    # Your environment and primary tag (or * if enabled for your account).
-    attr_reader :filters
-
-    # Name of the service
-    attr_accessor :service
-
-    attr_accessor :additional_properties
-
-    # Attribute mapping from ruby-style variable name to JSON key.
-    # @!visibility private
-    def self.attribute_map
-      {
-        :'data_source' => :'data_source',
-        :'filters' => :'filters',
-        :'service' => :'service'
-      }
-    end
-
-    # Attribute type mapping.
-    # @!visibility private
-    def self.openapi_types
-      {
-        :'data_source' => :'TopologyQueryDataSource',
-        :'filters' => :'Array<String>',
-        :'service' => :'String'
-      }
-    end
-
-    # Initializes the object
-    # @param attributes [Hash] Model attributes in the form of hash
-    # @!visibility private
-    def initialize(attributes = {})
-      if (!attributes.is_a?(Hash))
-        fail ArgumentError, "The input argument (attributes) must be a hash in `DatadogAPIClient::V1::TopologyQuery` initialize method"
-      end
-
-      self.additional_properties = {}
-      # check to see if the attribute exists and convert string to symbol for hash key
-      attributes = attributes.each_with_object({}) { |(k, v), h|
-        if (!self.class.attribute_map.key?(k.to_sym))
-          self.additional_properties[k.to_sym] = v
-        else
-          h[k.to_sym] = v
-        end
-      }
-
-      if attributes.key?(:'data_source')
-        self.data_source = attributes[:'data_source']
+  # A topology data source query.
+  module TopologyQuery
+    class << self
+      include BaseOneOfModel
+      include BaseOneOfModelNoDiscriminator
+
+      # List of class defined in oneOf (OpenAPI v3)
+      def openapi_one_of
+        [
+          :'TopologyQueryDataStreamsOrServiceMap'
+        ]
       end
-
-      if attributes.key?(:'filters')
-        if (value = attributes[:'filters']).is_a?(Array)
-          self.filters = value
+      # Builds the object
+      # @param data [Mixed] Data to be matched against the list of oneOf items
+      # @return [Object] Returns the model or the data itself
+      def build(data)
+        # Go through the list of oneOf items and attempt to identify the appropriate one.
+        # Note:
+        # - We do not attempt to check whether exactly one item matches.
+        # - No advanced validation of types in some cases (e.g. "x: { type: string }" will happily match { x: 123 })
+        #   due to the way the deserialization is made in the base_object template (it just casts without verifying).
+        # - TODO: scalar values are de facto behaving as if they were nullable.
+        # - TODO: logging when debugging is set.
+        openapi_one_of.each do |klass|
+          begin
+            next if klass == :AnyType # "nullable: true"
+            typed_data = find_and_cast_into_type(klass, data)
+            next if typed_data.respond_to?(:_unparsed) && typed_data._unparsed
+            return typed_data if typed_data
+          rescue # rescue all errors so we keep iterating even if the current item lookup raises
+          end
         end
-      end
 
-      if attributes.key?(:'service')
-        self.service = attributes[:'service']
-      end
-    end
-
-    # Check to see if the all the properties in the model are valid
-    # @return true if the model is valid
-    # @!visibility private
-    def valid?
-      return false if !@filters.nil? && @filters.length < 1
-      true
-    end
-
-    # Custom attribute writer method with validation
-    # @param filters [Object] Object to be assigned
-    # @!visibility private
-    def filters=(filters)
-      if !filters.nil? && filters.length < 1
-        fail ArgumentError, 'invalid value for "filters", number of items must be greater than or equal to 1.'
-      end
-      @filters = filters
-    end
-
-    # Returns the object in the form of hash, with additionalProperties support.
-    # @return [Hash] Returns the object in the form of hash
-    # @!visibility private
-    def to_hash
-      hash = {}
-      self.class.attribute_map.each_pair do |attr, param|
-        value = self.send(attr)
-        if value.nil?
-          is_nullable = self.class.openapi_nullable.include?(attr)
-          next if !is_nullable || (is_nullable && !instance_variable_defined?(:"@#{attr}"))
+        if openapi_one_of.include?(:AnyType)
+          data
+        else
+          self._unparsed = true
+          DatadogAPIClient::UnparsedObject.new(data)
         end
-
-        hash[param] = _to_hash(value)
       end
-      self.additional_properties.each_pair do |attr, value|
-        hash[attr] = value
-      end
-      hash
-    end
-
-    # Checks equality by comparing each attribute.
-    # @param o [Object] Object to be compared
-    # @!visibility private
-    def ==(o)
-      return true if self.equal?(o)
-      self.class == o.class &&
-          data_source == o.data_source &&
-          filters == o.filters &&
-          service == o.service &&
-          additional_properties == o.additional_properties
-    end
-
-    # Calculates hash code according to all attributes.
-    # @return [Integer] Hash code
-    # @!visibility private
-    def hash
-      [data_source, filters, service, additional_properties].hash
     end
   end
 end
diff --git a/lib/datadog_api_client/v1/models/topology_query_data_streams_or_service_map.rb b/lib/datadog_api_client/v1/models/topology_query_data_streams_or_service_map.rb
new file mode 100644
index 000000000000..59eaae298f72
--- /dev/null
+++ b/lib/datadog_api_client/v1/models/topology_query_data_streams_or_service_map.rb
@@ -0,0 +1,170 @@
+=begin
+#Datadog API V1 Collection
+
+#Collection of all Datadog Public endpoints.
+
+The version of the OpenAPI document: 1.0
+Contact: support@datadoghq.com
+Generated by: https://github.com/DataDog/datadog-api-client-ruby/tree/master/.generator
+
+ Unless explicitly stated otherwise all files in this repository are licensed under the Apache-2.0 License.
+ This product includes software developed at Datadog (https://www.datadoghq.com/).
+ Copyright 2020-Present Datadog, Inc.
+
+=end
+
+require 'date'
+require 'time'
+
+module DatadogAPIClient::V1
+  # Query to service-based topology data sources like the service map or data streams.
+  class TopologyQueryDataStreamsOrServiceMap
+    include BaseGenericModel
+
+    # Name of the data source
+    attr_reader :data_source
+
+    # Your environment and primary tag (or * if enabled for your account).
+    attr_reader :filters
+
+    # A search string for filtering services, used in `data_streams` queries only. When set, this replaces the `service` field
+    attr_accessor :query_string
+
+    # Name of the service
+    attr_accessor :service
+
+    attr_accessor :additional_properties
+
+    # Attribute mapping from ruby-style variable name to JSON key.
+    # @!visibility private
+    def self.attribute_map
+      {
+        :'data_source' => :'data_source',
+        :'filters' => :'filters',
+        :'query_string' => :'query_string',
+        :'service' => :'service'
+      }
+    end
+
+    # Attribute type mapping.
+    # @!visibility private
+    def self.openapi_types
+      {
+        :'data_source' => :'TopologyQueryDataStreamsOrServiceMapDataSource',
+        :'filters' => :'Array<String>',
+        :'query_string' => :'String',
+        :'service' => :'String'
+      }
+    end
+
+    # Initializes the object
+    # @param attributes [Hash] Model attributes in the form of hash
+    # @!visibility private
+    def initialize(attributes = {})
+      if (!attributes.is_a?(Hash))
+        fail ArgumentError, "The input argument (attributes) must be a hash in `DatadogAPIClient::V1::TopologyQueryDataStreamsOrServiceMap` initialize method"
+      end
+
+      self.additional_properties = {}
+      # check to see if the attribute exists and convert string to symbol for hash key
+      attributes = attributes.each_with_object({}) { |(k, v), h|
+        if (!self.class.attribute_map.key?(k.to_sym))
+          self.additional_properties[k.to_sym] = v
+        else
+          h[k.to_sym] = v
+        end
+      }
+
+      if attributes.key?(:'data_source')
+        self.data_source = attributes[:'data_source']
+      end
+
+      if attributes.key?(:'filters')
+        if (value = attributes[:'filters']).is_a?(Array)
+          self.filters = value
+        end
+      end
+
+      if attributes.key?(:'query_string')
+        self.query_string = attributes[:'query_string']
+      end
+
+      if attributes.key?(:'service')
+        self.service = attributes[:'service']
+      end
+    end
+
+    # Check to see if the all the properties in the model are valid
+    # @return true if the model is valid
+    # @!visibility private
+    def valid?
+      return false if @data_source.nil?
+      return false if @filters.nil?
+      return false if @filters.length < 1
+      true
+    end
+
+    # Custom attribute writer method with validation
+    # @param data_source [Object] Object to be assigned
+    # @!visibility private
+    def data_source=(data_source)
+      if data_source.nil?
+        fail ArgumentError, 'invalid value for "data_source", data_source cannot be nil.'
+      end
+      @data_source = data_source
+    end
+
+    # Custom attribute writer method with validation
+    # @param filters [Object] Object to be assigned
+    # @!visibility private
+    def filters=(filters)
+      if filters.nil?
+        fail ArgumentError, 'invalid value for "filters", filters cannot be nil.'
+      end
+      if filters.length < 1
+        fail ArgumentError, 'invalid value for "filters", number of items must be greater than or equal to 1.'
+      end
+      @filters = filters
+    end
+
+    # Returns the object in the form of hash, with additionalProperties support.
+    # @return [Hash] Returns the object in the form of hash
+    # @!visibility private
+    def to_hash
+      hash = {}
+      self.class.attribute_map.each_pair do |attr, param|
+        value = self.send(attr)
+        if value.nil?
+          is_nullable = self.class.openapi_nullable.include?(attr)
+          next if !is_nullable || (is_nullable && !instance_variable_defined?(:"@#{attr}"))
+        end
+
+        hash[param] = _to_hash(value)
+      end
+      self.additional_properties.each_pair do |attr, value|
+        hash[attr] = value
+      end
+      hash
+    end
+
+    # Checks equality by comparing each attribute.
+    # @param o [Object] Object to be compared
+    # @!visibility private
+    def ==(o)
+      return true if self.equal?(o)
+      self.class == o.class &&
+          data_source == o.data_source &&
+          filters == o.filters &&
+          query_string == o.query_string &&
+          service == o.service &&
+          additional_properties == o.additional_properties
+    end
+
+    # Calculates hash code according to all attributes.
+    # @return [Integer] Hash code
+    # @!visibility private
+    def hash
+      [data_source, filters, query_string, service, additional_properties].hash
+    end
+  end
+end
diff --git a/lib/datadog_api_client/v1/models/topology_query_data_source.rb b/lib/datadog_api_client/v1/models/topology_query_data_streams_or_service_map_data_source.rb
similarity index 92%
rename from lib/datadog_api_client/v1/models/topology_query_data_source.rb
rename to lib/datadog_api_client/v1/models/topology_query_data_streams_or_service_map_data_source.rb
index a10175b21452..e4f36d54aec4 100644
--- a/lib/datadog_api_client/v1/models/topology_query_data_source.rb
+++ b/lib/datadog_api_client/v1/models/topology_query_data_streams_or_service_map_data_source.rb
@@ -18,7 +18,7 @@
 
 module DatadogAPIClient::V1
   # Name of the data source
-  class TopologyQueryDataSource
+  class TopologyQueryDataStreamsOrServiceMapDataSource
     include BaseEnumModel
 
     DATA_STREAMS = "data_streams".freeze
diff --git a/lib/datadog_api_client/v1/models/topology_request.rb b/lib/datadog_api_client/v1/models/topology_request.rb
index def430e23f6a..50c6beddc500 100644
--- a/lib/datadog_api_client/v1/models/topology_request.rb
+++ b/lib/datadog_api_client/v1/models/topology_request.rb
@@ -21,7 +21,7 @@ module DatadogAPIClient::V1
   class TopologyRequest
     include BaseGenericModel
 
-    # Query to service-based topology data sources like the service map or data streams.
+    # A topology data source query.
     attr_accessor :query
 
     # Widget request type.
diff --git a/lib/datadog_api_client/v2/models/security_monitoring_critical_asset_attributes.rb b/lib/datadog_api_client/v2/models/security_monitoring_critical_asset_attributes.rb
index 162132382bf2..f6032b273b94 100644
--- a/lib/datadog_api_client/v2/models/security_monitoring_critical_asset_attributes.rb
+++ b/lib/datadog_api_client/v2/models/security_monitoring_critical_asset_attributes.rb
@@ -39,7 +39,7 @@ class SecurityMonitoringCriticalAssetAttributes
     # The rule query of the critical asset, with the same syntax as the search bar for detection rules. This determines which rules this critical asset will apply to.
     attr_accessor :rule_query
 
-    # 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).
+    # Severity associated with this critical asset. Either an explicit severity can be set, or the severity can be increased or decreased.
     attr_accessor :severity
 
     # List of tags associated with the critical asset.
diff --git a/lib/datadog_api_client/v2/models/security_monitoring_critical_asset_create_attributes.rb b/lib/datadog_api_client/v2/models/security_monitoring_critical_asset_create_attributes.rb
index 4cc74084657e..342d9edcf6fa 100644
--- a/lib/datadog_api_client/v2/models/security_monitoring_critical_asset_create_attributes.rb
+++ b/lib/datadog_api_client/v2/models/security_monitoring_critical_asset_create_attributes.rb
@@ -30,7 +30,7 @@ class SecurityMonitoringCriticalAssetCreateAttributes
     # The rule query of the critical asset, with the same syntax as the search bar for detection rules. This determines which rules this critical asset will apply to.
     attr_reader :rule_query
 
-    # 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).
+    # Severity associated with this critical asset. Either an explicit severity can be set, or the severity can be increased or decreased.
     attr_reader :severity
 
     # List of tags associated with the critical asset.
diff --git a/lib/datadog_api_client/v2/models/security_monitoring_critical_asset_severity.rb b/lib/datadog_api_client/v2/models/security_monitoring_critical_asset_severity.rb
index 19a98724552d..e83bca5cd3c0 100644
--- a/lib/datadog_api_client/v2/models/security_monitoring_critical_asset_severity.rb
+++ b/lib/datadog_api_client/v2/models/security_monitoring_critical_asset_severity.rb
@@ -17,7 +17,7 @@
 require 'time'
 
 module DatadogAPIClient::V2
-  # 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).
+  # Severity associated with this critical asset. Either an explicit severity can be set, or the severity can be increased or decreased.
   class SecurityMonitoringCriticalAssetSeverity
     include BaseEnumModel
 
@@ -28,6 +28,5 @@ class SecurityMonitoringCriticalAssetSeverity
     CRITICAL = "critical".freeze
     INCREASE = "increase".freeze
     DECREASE = "decrease".freeze
-    NO_OP = "no-op".freeze
   end
 end
diff --git a/lib/datadog_api_client/v2/models/security_monitoring_critical_asset_update_attributes.rb b/lib/datadog_api_client/v2/models/security_monitoring_critical_asset_update_attributes.rb
index f2f1852d3a59..f9e19b6da5dc 100644
--- a/lib/datadog_api_client/v2/models/security_monitoring_critical_asset_update_attributes.rb
+++ b/lib/datadog_api_client/v2/models/security_monitoring_critical_asset_update_attributes.rb
@@ -30,7 +30,7 @@ class SecurityMonitoringCriticalAssetUpdateAttributes
     # The rule query of the critical asset, with the same syntax as the search bar for detection rules. This determines which rules this critical asset will apply to.
     attr_accessor :rule_query
 
-    # 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).
+    # Severity associated with this critical asset. Either an explicit severity can be set, or the severity can be increased or decreased.
     attr_accessor :severity
 
     # List of tags associated with the critical asset.