diff --git a/.generator/schemas/v1/openapi.yaml b/.generator/schemas/v1/openapi.yaml
index 5f6006a6baaf..126f670e4472 100644
--- a/.generator/schemas/v1/openapi.yaml
+++ b/.generator/schemas/v1/openapi.yaml
@@ -2782,6 +2782,7 @@ components:
         peer_tags:
           description: Tags to query for a specific downstream entity (peer.service, peer.db_instance, peer.s3, peer.s3.bucket, etc.).
           items:
+            description: A tag identifying a specific downstream entity (e.g. peer.service, peer.db_instance).
             example: "peer.service:my-service"
             type: string
           type: array
@@ -6647,6 +6648,7 @@ components:
         sources:
           additionalProperties:
             items:
+              description: A fallback source attribute name.
               type: string
             type: array
           description: Fallback sources used to populate value of field.
@@ -6695,6 +6697,7 @@ components:
           description: Optional list of profiles to modify the schema.
           example: ["security_control", "host"]
           items:
+            description: A profile name that modifies the schema behavior.
             type: string
           type: array
         schema_type:
@@ -7730,25 +7733,13 @@ components:
         - L2NORM
         - PERCENTILE
         - STDDEV
-    MonitorFormulaAndFunctionCostDataSource:
-      description: Data source for cost queries.
-      enum:
-        - metrics
-        - cloud_cost
-        - datadog_usage
-      example: "cloud_cost"
-      type: string
-      x-enum-varnames:
-        - METRICS
-        - CLOUD_COST
-        - DATADOG_USAGE
     MonitorFormulaAndFunctionCostQueryDefinition:
       description: A formula and functions cost query.
       properties:
         aggregator:
           $ref: "#/components/schemas/MonitorFormulaAndFunctionCostAggregator"
         data_source:
-          $ref: "#/components/schemas/MonitorFormulaAndFunctionCostDataSource"
+          $ref: "#/components/schemas/MonitorFormulaAndFunctionMetricsDataSource"
         name:
           description: Name of the query for use in formulas.
           example: "query1"
@@ -7808,6 +7799,7 @@ components:
           description: Columns to group results by.
           example: ["col1", "col2"]
           items:
+            description: A column name to group results by.
             type: string
           type: array
         model_type_override:
@@ -7827,6 +7819,7 @@ components:
           description: Optional grouping fields for aggregation.
           example: ["entity_id"]
           items:
+            description: A field name to group results by.
             type: string
           type: array
         measure:
@@ -11161,8 +11154,10 @@ components:
       description: Product Analytics audience account subquery.
       properties:
         name:
+          description: The name of the account subquery.
           type: string
         query:
+          description: The query string for the account subquery.
           type: string
       type: object
     ProductAnalyticsAudienceFilters:
@@ -11173,6 +11168,7 @@ components:
             $ref: "#/components/schemas/ProductAnalyticsAudienceAccountSubquery"
           type: array
         filter_condition:
+          description: An optional filter condition applied to the audience subquery.
           type: string
         segments:
           items:
@@ -11184,26 +11180,33 @@ components:
           type: array
       type: object
     ProductAnalyticsAudienceOccurrenceFilter:
+      description: Filter applied to occurrence counts when building a Product Analytics audience.
       properties:
         operator:
+          description: The comparison operator used for the occurrence filter (e.g. `gt`, `lt`, `eq`).
           type: string
         value:
+          description: The threshold value to compare occurrence counts against.
           type: string
       type: object
     ProductAnalyticsAudienceSegmentSubquery:
       description: Product Analytics audience segment subquery.
       properties:
         name:
+          description: The name of the segment subquery.
           type: string
         segment_id:
+          description: The unique identifier of the segment.
           type: string
       type: object
     ProductAnalyticsAudienceUserSubquery:
       description: Product Analytics audience user subquery.
       properties:
         name:
+          description: The name of the user subquery.
           type: string
         query:
+          description: The query string for the user subquery.
           type: string
       type: object
     QuerySortOrder:
@@ -11772,6 +11775,7 @@ components:
         - $ref: "#/components/schemas/SLOCountDefinitionWithBadEventsFormula"
     SLOCountDefinitionWithBadEventsFormula:
       additionalProperties: false
+      description: SLO count definition using a bad events formula alongside a good events formula.
       properties:
         bad_events_formula:
           $ref: "#/components/schemas/SLOFormula"
@@ -11798,6 +11802,7 @@ components:
       type: object
     SLOCountDefinitionWithTotalEventsFormula:
       additionalProperties: false
+      description: SLO count definition using a total events formula alongside a good events formula.
       properties:
         good_events_formula:
           $ref: "#/components/schemas/SLOFormula"
@@ -13004,6 +13009,7 @@ components:
           description: Fields to group by.
           example: ["source", "destination"]
           items:
+            description: A field name to group by.
             type: string
           type: array
         limit:
@@ -13626,6 +13632,7 @@ components:
             Always included in service level objective responses (but may be empty).
           example: ["env:prod", "app:core"]
           items:
+            description: A tag associated with the service level objective.
             type: string
           type: array
         created_at:
@@ -13649,6 +13656,7 @@ components:
         env_tags:
           description: Tags with the `env` tag key.
           items:
+            description: A tag with the `env` tag key.
             type: string
           type: array
         groups:
@@ -13693,6 +13701,7 @@ components:
         service_tags:
           description: Tags with the `service` tag key.
           items:
+            description: A tag with the `service` tag key.
             type: string
           type: array
         slo_type:
@@ -13702,6 +13711,7 @@ components:
         team_tags:
           description: Tags with the `team` tag key.
           items:
+            description: A tag with the `team` tag key.
             type: string
           type: array
         thresholds:
@@ -14712,6 +14722,7 @@ components:
           description: The tag values.
           example: ["env"]
           items:
+            description: A tag value string.
             minLength: 1
             type: string
           type: array
@@ -17989,6 +18000,7 @@ components:
         blockedRequestPatterns:
           description: Array of URL patterns to block.
           items:
+            description: A URL pattern to block during the Synthetic test.
             type: string
           type: array
         checkCertificateRevocation:
diff --git a/examples/v1/monitors/CreateMonitor_1303514967.rb b/examples/v1/monitors/CreateMonitor_1303514967.rb
index 8f3f1546eee9..61f0addfa3b4 100644
--- a/examples/v1/monitors/CreateMonitor_1303514967.rb
+++ b/examples/v1/monitors/CreateMonitor_1303514967.rb
@@ -20,7 +20,7 @@
     }),
     variables: [
       DatadogAPIClient::V1::MonitorFormulaAndFunctionCostQueryDefinition.new({
-        data_source: DatadogAPIClient::V1::MonitorFormulaAndFunctionCostDataSource::CLOUD_COST,
+        data_source: DatadogAPIClient::V1::MonitorFormulaAndFunctionMetricsDataSource::CLOUD_COST,
         query: "sum:aws.cost.net.amortized.shared.resources.allocated{aws_product IN (amplify ,athena, backup, bedrock ) } by {aws_product}.rollup(sum, 86400)",
         name: "query1",
         aggregator: DatadogAPIClient::V1::MonitorFormulaAndFunctionCostAggregator::SUM,
diff --git a/lib/datadog_api_client/inflector.rb b/lib/datadog_api_client/inflector.rb
index b38f547854a2..33f6d982ffb7 100644
--- a/lib/datadog_api_client/inflector.rb
+++ b/lib/datadog_api_client/inflector.rb
@@ -359,7 +359,6 @@ def overrides
           "v1.monitor_formula_and_function_aggregate_query_join_condition" => "MonitorFormulaAndFunctionAggregateQueryJoinCondition",
           "v1.monitor_formula_and_function_aggregate_query_join_type" => "MonitorFormulaAndFunctionAggregateQueryJoinType",
           "v1.monitor_formula_and_function_cost_aggregator" => "MonitorFormulaAndFunctionCostAggregator",
-          "v1.monitor_formula_and_function_cost_data_source" => "MonitorFormulaAndFunctionCostDataSource",
           "v1.monitor_formula_and_function_cost_query_definition" => "MonitorFormulaAndFunctionCostQueryDefinition",
           "v1.monitor_formula_and_function_data_quality_data_source" => "MonitorFormulaAndFunctionDataQualityDataSource",
           "v1.monitor_formula_and_function_data_quality_model_type_override" => "MonitorFormulaAndFunctionDataQualityModelTypeOverride",
diff --git a/lib/datadog_api_client/v1/models/monitor_formula_and_function_cost_data_source.rb b/lib/datadog_api_client/v1/models/monitor_formula_and_function_cost_data_source.rb
deleted file mode 100644
index 7aeec1c04c40..000000000000
--- a/lib/datadog_api_client/v1/models/monitor_formula_and_function_cost_data_source.rb
+++ /dev/null
@@ -1,28 +0,0 @@
-=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
-  # Data source for cost queries.
-  class MonitorFormulaAndFunctionCostDataSource
-    include BaseEnumModel
-
-    METRICS = "metrics".freeze
-    CLOUD_COST = "cloud_cost".freeze
-    DATADOG_USAGE = "datadog_usage".freeze
-  end
-end
diff --git a/lib/datadog_api_client/v1/models/monitor_formula_and_function_cost_query_definition.rb b/lib/datadog_api_client/v1/models/monitor_formula_and_function_cost_query_definition.rb
index 6166082d1e94..bf0bfb7a494d 100644
--- a/lib/datadog_api_client/v1/models/monitor_formula_and_function_cost_query_definition.rb
+++ b/lib/datadog_api_client/v1/models/monitor_formula_and_function_cost_query_definition.rb
@@ -24,7 +24,7 @@ class MonitorFormulaAndFunctionCostQueryDefinition
     # Aggregation methods for metric queries.
     attr_accessor :aggregator
 
-    # Data source for cost queries.
+    # Data source for metrics queries.
     attr_reader :data_source
 
     # Name of the query for use in formulas.
@@ -51,7 +51,7 @@ def self.attribute_map
     def self.openapi_types
       {
         :'aggregator' => :'MonitorFormulaAndFunctionCostAggregator',
-        :'data_source' => :'MonitorFormulaAndFunctionCostDataSource',
+        :'data_source' => :'MonitorFormulaAndFunctionMetricsDataSource',
         :'name' => :'String',
         :'query' => :'String'
       }
diff --git a/lib/datadog_api_client/v1/models/product_analytics_audience_account_subquery.rb b/lib/datadog_api_client/v1/models/product_analytics_audience_account_subquery.rb
index d112a42c07f9..3d368c8ae3fb 100644
--- a/lib/datadog_api_client/v1/models/product_analytics_audience_account_subquery.rb
+++ b/lib/datadog_api_client/v1/models/product_analytics_audience_account_subquery.rb
@@ -21,10 +21,10 @@ module DatadogAPIClient::V1
   class ProductAnalyticsAudienceAccountSubquery
     include BaseGenericModel
 
-    #
+    # The name of the account subquery.
     attr_accessor :name
 
-    #
+    # The query string for the account subquery.
     attr_accessor :query
 
     attr_accessor :additional_properties
diff --git a/lib/datadog_api_client/v1/models/product_analytics_audience_filters.rb b/lib/datadog_api_client/v1/models/product_analytics_audience_filters.rb
index 65132499059f..3b52b5b44650 100644
--- a/lib/datadog_api_client/v1/models/product_analytics_audience_filters.rb
+++ b/lib/datadog_api_client/v1/models/product_analytics_audience_filters.rb
@@ -24,7 +24,7 @@ class ProductAnalyticsAudienceFilters
     #
     attr_accessor :accounts
 
-    #
+    # An optional filter condition applied to the audience subquery.
     attr_accessor :filter_condition
 
     #
diff --git a/lib/datadog_api_client/v1/models/product_analytics_audience_occurrence_filter.rb b/lib/datadog_api_client/v1/models/product_analytics_audience_occurrence_filter.rb
index dd05a1aef74c..cb8496fb1c6a 100644
--- a/lib/datadog_api_client/v1/models/product_analytics_audience_occurrence_filter.rb
+++ b/lib/datadog_api_client/v1/models/product_analytics_audience_occurrence_filter.rb
@@ -17,14 +17,14 @@
 require 'time'
 
 module DatadogAPIClient::V1
-  # 
+  # Filter applied to occurrence counts when building a Product Analytics audience.
   class ProductAnalyticsAudienceOccurrenceFilter
     include BaseGenericModel
 
-    #
+    # The comparison operator used for the occurrence filter (e.g. `gt`, `lt`, `eq`).
     attr_accessor :operator
 
-    #
+    # The threshold value to compare occurrence counts against.
     attr_accessor :value
 
     attr_accessor :additional_properties
diff --git a/lib/datadog_api_client/v1/models/product_analytics_audience_segment_subquery.rb b/lib/datadog_api_client/v1/models/product_analytics_audience_segment_subquery.rb
index d1bed71c20d8..4788ea102e85 100644
--- a/lib/datadog_api_client/v1/models/product_analytics_audience_segment_subquery.rb
+++ b/lib/datadog_api_client/v1/models/product_analytics_audience_segment_subquery.rb
@@ -21,10 +21,10 @@ module DatadogAPIClient::V1
   class ProductAnalyticsAudienceSegmentSubquery
     include BaseGenericModel
 
-    #
+    # The name of the segment subquery.
     attr_accessor :name
 
-    #
+    # The unique identifier of the segment.
     attr_accessor :segment_id
 
     attr_accessor :additional_properties
diff --git a/lib/datadog_api_client/v1/models/product_analytics_audience_user_subquery.rb b/lib/datadog_api_client/v1/models/product_analytics_audience_user_subquery.rb
index e73df00e5c87..6b0628e1637c 100644
--- a/lib/datadog_api_client/v1/models/product_analytics_audience_user_subquery.rb
+++ b/lib/datadog_api_client/v1/models/product_analytics_audience_user_subquery.rb
@@ -21,10 +21,10 @@ module DatadogAPIClient::V1
   class ProductAnalyticsAudienceUserSubquery
     include BaseGenericModel
 
-    #
+    # The name of the user subquery.
     attr_accessor :name
 
-    #
+    # The query string for the user subquery.
     attr_accessor :query
 
     attr_accessor :additional_properties
diff --git a/lib/datadog_api_client/v1/models/sankey_rum_query.rb b/lib/datadog_api_client/v1/models/sankey_rum_query.rb
index b0b96020dadf..da33641462d7 100644
--- a/lib/datadog_api_client/v1/models/sankey_rum_query.rb
+++ b/lib/datadog_api_client/v1/models/sankey_rum_query.rb
@@ -39,7 +39,7 @@ class SankeyRumQuery
     # Number of steps.
     attr_accessor :number_of_steps
 
-    #
+    # Filter applied to occurrence counts when building a Product Analytics audience.
     attr_accessor :occurrences
 
     # Query string.
diff --git a/lib/datadog_api_client/v1/models/slo_count_definition_with_bad_events_formula.rb b/lib/datadog_api_client/v1/models/slo_count_definition_with_bad_events_formula.rb
index 4edd168b210d..0cf8b2a1b70c 100644
--- a/lib/datadog_api_client/v1/models/slo_count_definition_with_bad_events_formula.rb
+++ b/lib/datadog_api_client/v1/models/slo_count_definition_with_bad_events_formula.rb
@@ -17,7 +17,7 @@
 require 'time'
 
 module DatadogAPIClient::V1
-  # 
+  # SLO count definition using a bad events formula alongside a good events formula.
   class SLOCountDefinitionWithBadEventsFormula
     include BaseGenericModel
 
diff --git a/lib/datadog_api_client/v1/models/slo_count_definition_with_total_events_formula.rb b/lib/datadog_api_client/v1/models/slo_count_definition_with_total_events_formula.rb
index 25e3054dc1fb..32aa82bb20a1 100644
--- a/lib/datadog_api_client/v1/models/slo_count_definition_with_total_events_formula.rb
+++ b/lib/datadog_api_client/v1/models/slo_count_definition_with_total_events_formula.rb
@@ -17,7 +17,7 @@
 require 'time'
 
 module DatadogAPIClient::V1
-  # 
+  # SLO count definition using a total events formula alongside a good events formula.
   class SLOCountDefinitionWithTotalEventsFormula
     include BaseGenericModel