datadog_api_client 1.9.0 → 2.0.0

data/lib/datadog_api_client/v1/api/usage_metering_api.rb

@@ -19,7 +19,7 @@ module DatadogAPIClient::V1
   class UsageMeteringAPI
     attr_accessor :api_client
 
-    def initialize(api_client = APIClient.default)
+    def initialize(api_client = DatadogAPIClient::APIClient.default)
       @api_client = api_client
     end
 
@@ -42,14 +42,11 @@ module DatadogAPIClient::V1
     # @option opts [UsageSort] :sort The field to sort by: `[computed_on, size, start_date, end_date]`.
     # @return [Array<(UsageCustomReportsResponse, Integer, Hash)>] UsageCustomReportsResponse data, response status code and response headers
     def get_daily_custom_reports_with_http_info(opts = {})
-
-      if @api_client.config.unstable_operations.has_key?(:get_daily_custom_reports)
-        unstable_enabled = @api_client.config.unstable_operations[:get_daily_custom_reports]
-        if unstable_enabled
-          @api_client.config.logger.warn format("Using unstable operation '%s'", "get_daily_custom_reports")
-        else
-          raise APIError.new(message: format("Unstable operation '%s' is disabled", "get_daily_custom_reports"))
-        end
+      unstable_enabled = @api_client.config.unstable_operations["v1.get_daily_custom_reports".to_sym]
+      if unstable_enabled
+        @api_client.config.logger.warn format("Using unstable operation '%s'", "v1.get_daily_custom_reports")
+      else
+        raise DatadogAPIClient::APIError.new(message: format("Unstable operation '%s' is disabled", "v1.get_daily_custom_reports"))
       end
 
       if @api_client.config.debugging
@@ -97,7 +94,8 @@ module DatadogAPIClient::V1
         :form_params => form_params,
         :body => post_body,
         :auth_names => auth_names,
-        :return_type => return_type
+        :return_type => return_type,
+        :api_version => "V1"
       )
 
       data, status_code, headers = @api_client.call_api(Net::HTTP::Get, local_var_path, new_options)
@@ -107,7 +105,7 @@ module DatadogAPIClient::V1
       return data, status_code, headers
     end
 
-    # Get Hourly Usage Attribution.
+    # Get hourly usage attribution.
     #
     # @see #get_hourly_usage_attribution_with_http_info
     def get_hourly_usage_attribution(start_hr, usage_type, opts = {})
@@ -115,9 +113,9 @@ module DatadogAPIClient::V1
       data
     end
 
-    # Get Hourly Usage Attribution.
+    # Get hourly usage attribution.
     #
-    # Get Hourly Usage Attribution.
+    # Get hourly usage attribution.
     #
     # This API endpoint is paginated. To make sure you receive all records, check if the value of `next_record_id` is
     # set in the response. If it is, make another request and pass `next_record_id` as a parameter.
@@ -139,18 +137,10 @@ module DatadogAPIClient::V1
     # @option opts [Time] :end_hr Datetime in ISO-8601 format, UTC, precise to hour: `[YYYY-MM-DDThh]` for usage ending **before** this hour.
     # @option opts [String] :next_record_id List following results with a next_record_id provided in the previous query.
     # @option opts [String] :tag_breakdown_keys Comma separated list of tags used to group usage. If no value is provided the usage will not be broken down by tags.  To see which tags are available, look for the value of `tag_config_source` in the API response.
+    # @option opts [Boolean] :include_descendants Include child org usage in the response. Defaults to `true`.
     # @return [Array<(HourlyUsageAttributionResponse, Integer, Hash)>] HourlyUsageAttributionResponse data, response status code and response headers
     def get_hourly_usage_attribution_with_http_info(start_hr, usage_type, opts = {})
 
-      if @api_client.config.unstable_operations.has_key?(:get_hourly_usage_attribution)
-        unstable_enabled = @api_client.config.unstable_operations[:get_hourly_usage_attribution]
-        if unstable_enabled
-          @api_client.config.logger.warn format("Using unstable operation '%s'", "get_hourly_usage_attribution")
-        else
-          raise APIError.new(message: format("Unstable operation '%s' is disabled", "get_hourly_usage_attribution"))
-        end
-      end
-
       if @api_client.config.debugging
         @api_client.config.logger.debug 'Calling API: UsageMeteringAPI.get_hourly_usage_attribution ...'
       end
@@ -163,7 +153,7 @@ module DatadogAPIClient::V1
         fail ArgumentError, "Missing the required parameter 'usage_type' when calling UsageMeteringAPI.get_hourly_usage_attribution"
       end
       # verify enum value
-      allowable_values = ['api_usage', 'apm_host_usage', 'browser_usage', 'container_usage', 'custom_timeseries_usage', 'estimated_indexed_logs_usage', 'fargate_usage', 'functions_usage', 'indexed_logs_usage', 'infra_host_usage', 'invocations_usage', 'npm_host_usage', 'profiled_container_usage', 'profiled_host_usage', 'snmp_usage']
+      allowable_values = ['api_usage', 'apm_host_usage', 'appsec_usage', 'browser_usage', 'container_usage', 'cspm_containers_usage', 'cspm_hosts_usage', 'custom_timeseries_usage', 'cws_containers_usage', 'cws_hosts_usage', 'dbm_hosts_usage', 'dbm_queries_usage', 'estimated_indexed_logs_usage', 'estimated_indexed_spans_usage', 'estimated_ingested_spans_usage', 'fargate_usage', 'functions_usage', 'indexed_logs_usage', 'infra_host_usage', 'invocations_usage', 'npm_host_usage', 'profiled_container_usage', 'profiled_host_usage', 'snmp_usage']
       if @api_client.config.client_side_validation && !allowable_values.include?(usage_type)
         fail ArgumentError, "invalid value for \"usage_type\", must be one of #{allowable_values}"
       end
@@ -177,6 +167,7 @@ module DatadogAPIClient::V1
       query_params[:'end_hr'] = opts[:'end_hr'] if !opts[:'end_hr'].nil?
       query_params[:'next_record_id'] = opts[:'next_record_id'] if !opts[:'next_record_id'].nil?
       query_params[:'tag_breakdown_keys'] = opts[:'tag_breakdown_keys'] if !opts[:'tag_breakdown_keys'].nil?
+      query_params[:'include_descendants'] = opts[:'include_descendants'] if !opts[:'include_descendants'].nil?
 
       # header parameters
       header_params = opts[:header_params] || {}
@@ -202,7 +193,8 @@ module DatadogAPIClient::V1
         :form_params => form_params,
         :body => post_body,
         :auth_names => auth_names,
-        :return_type => return_type
+        :return_type => return_type,
+        :api_version => "V1"
       )
 
       data, status_code, headers = @api_client.call_api(Net::HTTP::Get, local_var_path, new_options)
@@ -223,6 +215,7 @@ module DatadogAPIClient::V1
     # Get hourly usage for incident management.
     #
     # Get hourly usage for incident management.
+    # **Note:** hourly usage data for all products is now available in the [Get hourly usage by product family API](https://docs.datadoghq.com/api/latest/usage-metering/#get-hourly-usage-by-product-family)
     #
     # @param start_hr [Time] Datetime in ISO-8601 format, UTC, precise to hour: `[YYYY-MM-DDThh]` for usage beginning at this hour.
     # @param opts [Hash] the optional parameters
@@ -230,15 +223,6 @@ module DatadogAPIClient::V1
     # @return [Array<(UsageIncidentManagementResponse, Integer, Hash)>] UsageIncidentManagementResponse data, response status code and response headers
     def get_incident_management_with_http_info(start_hr, opts = {})
 
-      if @api_client.config.unstable_operations.has_key?(:get_incident_management)
-        unstable_enabled = @api_client.config.unstable_operations[:get_incident_management]
-        if unstable_enabled
-          @api_client.config.logger.warn format("Using unstable operation '%s'", "get_incident_management")
-        else
-          raise APIError.new(message: format("Unstable operation '%s' is disabled", "get_incident_management"))
-        end
-      end
-
       if @api_client.config.debugging
         @api_client.config.logger.debug 'Calling API: UsageMeteringAPI.get_incident_management ...'
       end
@@ -278,7 +262,8 @@ module DatadogAPIClient::V1
         :form_params => form_params,
         :body => post_body,
         :auth_names => auth_names,
-        :return_type => return_type
+        :return_type => return_type,
+        :api_version => "V1"
       )
 
       data, status_code, headers = @api_client.call_api(Net::HTTP::Get, local_var_path, new_options)
@@ -299,6 +284,7 @@ module DatadogAPIClient::V1
     # Get hourly usage for ingested spans.
     #
     # Get hourly usage for ingested spans.
+    # **Note:** hourly usage data for all products is now available in the [Get hourly usage by product family API](https://docs.datadoghq.com/api/latest/usage-metering/#get-hourly-usage-by-product-family)
     #
     # @param start_hr [Time] Datetime in ISO-8601 format, UTC, precise to hour: `[YYYY-MM-DDThh]` for usage beginning at this hour.
     # @param opts [Hash] the optional parameters
@@ -306,15 +292,6 @@ module DatadogAPIClient::V1
     # @return [Array<(UsageIngestedSpansResponse, Integer, Hash)>] UsageIngestedSpansResponse data, response status code and response headers
     def get_ingested_spans_with_http_info(start_hr, opts = {})
 
-      if @api_client.config.unstable_operations.has_key?(:get_ingested_spans)
-        unstable_enabled = @api_client.config.unstable_operations[:get_ingested_spans]
-        if unstable_enabled
-          @api_client.config.logger.warn format("Using unstable operation '%s'", "get_ingested_spans")
-        else
-          raise APIError.new(message: format("Unstable operation '%s' is disabled", "get_ingested_spans"))
-        end
-      end
-
       if @api_client.config.debugging
         @api_client.config.logger.debug 'Calling API: UsageMeteringAPI.get_ingested_spans ...'
       end
@@ -354,7 +331,8 @@ module DatadogAPIClient::V1
         :form_params => form_params,
         :body => post_body,
         :auth_names => auth_names,
-        :return_type => return_type
+        :return_type => return_type,
+        :api_version => "V1"
       )
 
       data, status_code, headers = @api_client.call_api(Net::HTTP::Get, local_var_path, new_options)
@@ -383,14 +361,11 @@ module DatadogAPIClient::V1
     # @option opts [UsageSort] :sort The field to sort by: `[computed_on, size, start_date, end_date]`.
     # @return [Array<(UsageCustomReportsResponse, Integer, Hash)>] UsageCustomReportsResponse data, response status code and response headers
     def get_monthly_custom_reports_with_http_info(opts = {})
-
-      if @api_client.config.unstable_operations.has_key?(:get_monthly_custom_reports)
-        unstable_enabled = @api_client.config.unstable_operations[:get_monthly_custom_reports]
-        if unstable_enabled
-          @api_client.config.logger.warn format("Using unstable operation '%s'", "get_monthly_custom_reports")
-        else
-          raise APIError.new(message: format("Unstable operation '%s' is disabled", "get_monthly_custom_reports"))
-        end
+      unstable_enabled = @api_client.config.unstable_operations["v1.get_monthly_custom_reports".to_sym]
+      if unstable_enabled
+        @api_client.config.logger.warn format("Using unstable operation '%s'", "v1.get_monthly_custom_reports")
+      else
+        raise DatadogAPIClient::APIError.new(message: format("Unstable operation '%s' is disabled", "v1.get_monthly_custom_reports"))
       end
 
       if @api_client.config.debugging
@@ -438,7 +413,8 @@ module DatadogAPIClient::V1
         :form_params => form_params,
         :body => post_body,
         :auth_names => auth_names,
-        :return_type => return_type
+        :return_type => return_type,
+        :api_version => "V1"
       )
 
       data, status_code, headers = @api_client.call_api(Net::HTTP::Get, local_var_path, new_options)
@@ -448,7 +424,7 @@ module DatadogAPIClient::V1
       return data, status_code, headers
     end
 
-    # Get Monthly Usage Attribution.
+    # Get monthly usage attribution.
     #
     # @see #get_monthly_usage_attribution_with_http_info
     def get_monthly_usage_attribution(start_month, fields, opts = {})
@@ -456,9 +432,9 @@ module DatadogAPIClient::V1
       data
     end
 
-    # Get Monthly Usage Attribution.
+    # Get monthly usage attribution.
     #
-    # Get Monthly Usage Attribution.
+    # Get monthly usage attribution.
     #
     # This API endpoint is paginated. To make sure you receive all records, check if the value of `next_record_id` is
     # set in the response. If it is, make another request and pass `next_record_id` as a parameter.
@@ -482,18 +458,10 @@ module DatadogAPIClient::V1
     # @option opts [MonthlyUsageAttributionSupportedMetrics] :sort_name The field to sort by.
     # @option opts [String] :tag_breakdown_keys Comma separated list of tag keys used to group usage. If no value is provided the usage will not be broken down by tags.  To see which tags are available, look for the value of `tag_config_source` in the API response.
     # @option opts [String] :next_record_id List following results with a next_record_id provided in the previous query.
+    # @option opts [Boolean] :include_descendants Include child org usage in the response. Defaults to `true`.
     # @return [Array<(MonthlyUsageAttributionResponse, Integer, Hash)>] MonthlyUsageAttributionResponse data, response status code and response headers
     def get_monthly_usage_attribution_with_http_info(start_month, fields, opts = {})
 
-      if @api_client.config.unstable_operations.has_key?(:get_monthly_usage_attribution)
-        unstable_enabled = @api_client.config.unstable_operations[:get_monthly_usage_attribution]
-        if unstable_enabled
-          @api_client.config.logger.warn format("Using unstable operation '%s'", "get_monthly_usage_attribution")
-        else
-          raise APIError.new(message: format("Unstable operation '%s' is disabled", "get_monthly_usage_attribution"))
-        end
-      end
-
       if @api_client.config.debugging
         @api_client.config.logger.debug 'Calling API: UsageMeteringAPI.get_monthly_usage_attribution ...'
       end
@@ -506,7 +474,7 @@ module DatadogAPIClient::V1
         fail ArgumentError, "Missing the required parameter 'fields' when calling UsageMeteringAPI.get_monthly_usage_attribution"
       end
       # verify enum value
-      allowable_values = ['api_usage', 'api_percentage', 'apm_host_usage', 'apm_host_percentage', 'browser_usage', 'browser_percentage', 'container_usage', 'container_percentage', 'custom_timeseries_usage', 'custom_timeseries_percentage', 'estimated_indexed_logs_usage', 'estimated_indexed_logs_percentage', 'fargate_usage', 'fargate_percentage', 'functions_usage', 'functions_percentage', 'indexed_logs_usage', 'indexed_logs_percentage', 'infra_host_usage', 'infra_host_percentage', 'invocations_usage', 'invocations_percentage', 'npm_host_usage', 'npm_host_percentage', 'profiled_container_usage', 'profiled_container_percentage', 'profiled_host_usage', 'profiled_host_percentage', 'snmp_usage', 'snmp_percentage', '*']
+      allowable_values = ['api_usage', 'api_percentage', 'apm_host_usage', 'apm_host_percentage', 'appsec_usage', 'appsec_percentage', 'browser_usage', 'browser_percentage', 'container_usage', 'container_percentage', 'cspm_containers_percentage', 'cspm_containers_usage', 'cspm_hosts_percentage', 'cspm_hosts_usage', 'custom_timeseries_usage', 'custom_timeseries_percentage', 'cws_containers_percentage', 'cws_containers_usage', 'cws_hosts_percentage', 'cws_hosts_usage', 'dbm_hosts_percentage', 'dbm_hosts_usage', 'dbm_queries_percentage', 'dbm_queries_usage', 'estimated_indexed_logs_usage', 'estimated_indexed_logs_percentage', 'estimated_indexed_spans_usage', 'estimated_indexed_spans_percentage', 'estimated_ingested_spans_usage', 'estimated_ingested_spans_percentage', 'fargate_usage', 'fargate_percentage', 'functions_usage', 'functions_percentage', 'indexed_logs_usage', 'indexed_logs_percentage', 'infra_host_usage', 'infra_host_percentage', 'invocations_usage', 'invocations_percentage', 'npm_host_usage', 'npm_host_percentage', 'profiled_container_usage', 'profiled_container_percentage', 'profiled_host_usage', 'profiled_host_percentage', 'snmp_usage', 'snmp_percentage', '*']
       if @api_client.config.client_side_validation && !allowable_values.include?(fields)
         fail ArgumentError, "invalid value for \"fields\", must be one of #{allowable_values}"
       end
@@ -514,7 +482,7 @@ module DatadogAPIClient::V1
       if @api_client.config.client_side_validation && opts[:'sort_direction'] && !allowable_values.include?(opts[:'sort_direction'])
         fail ArgumentError, "invalid value for \"sort_direction\", must be one of #{allowable_values}"
       end
-      allowable_values = ['api_usage', 'api_percentage', 'apm_host_usage', 'apm_host_percentage', 'browser_usage', 'browser_percentage', 'container_usage', 'container_percentage', 'custom_timeseries_usage', 'custom_timeseries_percentage', 'estimated_indexed_logs_usage', 'estimated_indexed_logs_percentage', 'fargate_usage', 'fargate_percentage', 'functions_usage', 'functions_percentage', 'indexed_logs_usage', 'indexed_logs_percentage', 'infra_host_usage', 'infra_host_percentage', 'invocations_usage', 'invocations_percentage', 'npm_host_usage', 'npm_host_percentage', 'profiled_container_usage', 'profiled_container_percentage', 'profiled_host_usage', 'profiled_host_percentage', 'snmp_usage', 'snmp_percentage', '*']
+      allowable_values = ['api_usage', 'api_percentage', 'apm_host_usage', 'apm_host_percentage', 'appsec_usage', 'appsec_percentage', 'browser_usage', 'browser_percentage', 'container_usage', 'container_percentage', 'cspm_containers_percentage', 'cspm_containers_usage', 'cspm_hosts_percentage', 'cspm_hosts_usage', 'custom_timeseries_usage', 'custom_timeseries_percentage', 'cws_containers_percentage', 'cws_containers_usage', 'cws_hosts_percentage', 'cws_hosts_usage', 'dbm_hosts_percentage', 'dbm_hosts_usage', 'dbm_queries_percentage', 'dbm_queries_usage', 'estimated_indexed_logs_usage', 'estimated_indexed_logs_percentage', 'estimated_indexed_spans_usage', 'estimated_indexed_spans_percentage', 'estimated_ingested_spans_usage', 'estimated_ingested_spans_percentage', 'fargate_usage', 'fargate_percentage', 'functions_usage', 'functions_percentage', 'indexed_logs_usage', 'indexed_logs_percentage', 'infra_host_usage', 'infra_host_percentage', 'invocations_usage', 'invocations_percentage', 'npm_host_usage', 'npm_host_percentage', 'profiled_container_usage', 'profiled_container_percentage', 'profiled_host_usage', 'profiled_host_percentage', 'snmp_usage', 'snmp_percentage', '*']
       if @api_client.config.client_side_validation && opts[:'sort_name'] && !allowable_values.include?(opts[:'sort_name'])
         fail ArgumentError, "invalid value for \"sort_name\", must be one of #{allowable_values}"
       end
@@ -530,6 +498,7 @@ module DatadogAPIClient::V1
       query_params[:'sort_name'] = opts[:'sort_name'] if !opts[:'sort_name'].nil?
       query_params[:'tag_breakdown_keys'] = opts[:'tag_breakdown_keys'] if !opts[:'tag_breakdown_keys'].nil?
       query_params[:'next_record_id'] = opts[:'next_record_id'] if !opts[:'next_record_id'].nil?
+      query_params[:'include_descendants'] = opts[:'include_descendants'] if !opts[:'include_descendants'].nil?
 
       # header parameters
       header_params = opts[:header_params] || {}
@@ -555,7 +524,8 @@ module DatadogAPIClient::V1
         :form_params => form_params,
         :body => post_body,
         :auth_names => auth_names,
-        :return_type => return_type
+        :return_type => return_type,
+        :api_version => "V1"
       )
 
       data, status_code, headers = @api_client.call_api(Net::HTTP::Get, local_var_path, new_options)
@@ -581,14 +551,11 @@ module DatadogAPIClient::V1
     # @param opts [Hash] the optional parameters
     # @return [Array<(UsageSpecifiedCustomReportsResponse, Integer, Hash)>] UsageSpecifiedCustomReportsResponse data, response status code and response headers
     def get_specified_daily_custom_reports_with_http_info(report_id, opts = {})
-
-      if @api_client.config.unstable_operations.has_key?(:get_specified_daily_custom_reports)
-        unstable_enabled = @api_client.config.unstable_operations[:get_specified_daily_custom_reports]
-        if unstable_enabled
-          @api_client.config.logger.warn format("Using unstable operation '%s'", "get_specified_daily_custom_reports")
-        else
-          raise APIError.new(message: format("Unstable operation '%s' is disabled", "get_specified_daily_custom_reports"))
-        end
+      unstable_enabled = @api_client.config.unstable_operations["v1.get_specified_daily_custom_reports".to_sym]
+      if unstable_enabled
+        @api_client.config.logger.warn format("Using unstable operation '%s'", "v1.get_specified_daily_custom_reports")
+      else
+        raise DatadogAPIClient::APIError.new(message: format("Unstable operation '%s' is disabled", "v1.get_specified_daily_custom_reports"))
       end
 
       if @api_client.config.debugging
@@ -628,7 +595,8 @@ module DatadogAPIClient::V1
         :form_params => form_params,
         :body => post_body,
         :auth_names => auth_names,
-        :return_type => return_type
+        :return_type => return_type,
+        :api_version => "V1"
       )
 
       data, status_code, headers = @api_client.call_api(Net::HTTP::Get, local_var_path, new_options)
@@ -654,14 +622,11 @@ module DatadogAPIClient::V1
     # @param opts [Hash] the optional parameters
     # @return [Array<(UsageSpecifiedCustomReportsResponse, Integer, Hash)>] UsageSpecifiedCustomReportsResponse data, response status code and response headers
     def get_specified_monthly_custom_reports_with_http_info(report_id, opts = {})
-
-      if @api_client.config.unstable_operations.has_key?(:get_specified_monthly_custom_reports)
-        unstable_enabled = @api_client.config.unstable_operations[:get_specified_monthly_custom_reports]
-        if unstable_enabled
-          @api_client.config.logger.warn format("Using unstable operation '%s'", "get_specified_monthly_custom_reports")
-        else
-          raise APIError.new(message: format("Unstable operation '%s' is disabled", "get_specified_monthly_custom_reports"))
-        end
+      unstable_enabled = @api_client.config.unstable_operations["v1.get_specified_monthly_custom_reports".to_sym]
+      if unstable_enabled
+        @api_client.config.logger.warn format("Using unstable operation '%s'", "v1.get_specified_monthly_custom_reports")
+      else
+        raise DatadogAPIClient::APIError.new(message: format("Unstable operation '%s' is disabled", "v1.get_specified_monthly_custom_reports"))
       end
 
       if @api_client.config.debugging
@@ -701,7 +666,8 @@ module DatadogAPIClient::V1
         :form_params => form_params,
         :body => post_body,
         :auth_names => auth_names,
-        :return_type => return_type
+        :return_type => return_type,
+        :api_version => "V1"
       )
 
       data, status_code, headers = @api_client.call_api(Net::HTTP::Get, local_var_path, new_options)
@@ -722,6 +688,7 @@ module DatadogAPIClient::V1
     # Get hourly usage for analyzed logs.
     #
     # Get hourly usage for analyzed logs (Security Monitoring).
+    # **Note:** hourly usage data for all products is now available in the [Get hourly usage by product family API](https://docs.datadoghq.com/api/latest/usage-metering/#get-hourly-usage-by-product-family)
     #
     # @param start_hr [Time] Datetime in ISO-8601 format, UTC, precise to hour: `[YYYY-MM-DDThh]` for usage beginning at this hour.
     # @param opts [Hash] the optional parameters
@@ -729,15 +696,6 @@ module DatadogAPIClient::V1
     # @return [Array<(UsageAnalyzedLogsResponse, Integer, Hash)>] UsageAnalyzedLogsResponse data, response status code and response headers
     def get_usage_analyzed_logs_with_http_info(start_hr, opts = {})
 
-      if @api_client.config.unstable_operations.has_key?(:get_usage_analyzed_logs)
-        unstable_enabled = @api_client.config.unstable_operations[:get_usage_analyzed_logs]
-        if unstable_enabled
-          @api_client.config.logger.warn format("Using unstable operation '%s'", "get_usage_analyzed_logs")
-        else
-          raise APIError.new(message: format("Unstable operation '%s' is disabled", "get_usage_analyzed_logs"))
-        end
-      end
-
       if @api_client.config.debugging
         @api_client.config.logger.debug 'Calling API: UsageMeteringAPI.get_usage_analyzed_logs ...'
       end
@@ -777,7 +735,8 @@ module DatadogAPIClient::V1
         :form_params => form_params,
         :body => post_body,
         :auth_names => auth_names,
-        :return_type => return_type
+        :return_type => return_type,
+        :api_version => "V1"
       )
 
       data, status_code, headers = @api_client.call_api(Net::HTTP::Get, local_var_path, new_options)
@@ -787,7 +746,7 @@ module DatadogAPIClient::V1
       return data, status_code, headers
     end
 
-    # Get Usage Attribution.
+    # Get usage attribution.
     #
     # @see #get_usage_attribution_with_http_info
     def get_usage_attribution(start_month, fields, opts = {})
@@ -795,9 +754,9 @@ module DatadogAPIClient::V1
       data
     end
 
-    # Get Usage Attribution.
+    # Get usage attribution.
     #
-    # Get Usage Attribution.
+    # Get usage attribution.
     #
     # @param start_month [Time] Datetime in ISO-8601 format, UTC, precise to month: `[YYYY-MM]` for usage beginning in this month. Maximum of 15 months ago.
     # @param fields [UsageAttributionSupportedMetrics] Comma-separated list of usage types to return, or `*` for all usage types.
@@ -810,14 +769,11 @@ module DatadogAPIClient::V1
     # @option opts [Integer] :limit Maximum number of records to be returned.
     # @return [Array<(UsageAttributionResponse, Integer, Hash)>] UsageAttributionResponse data, response status code and response headers
     def get_usage_attribution_with_http_info(start_month, fields, opts = {})
-
-      if @api_client.config.unstable_operations.has_key?(:get_usage_attribution)
-        unstable_enabled = @api_client.config.unstable_operations[:get_usage_attribution]
-        if unstable_enabled
-          @api_client.config.logger.warn format("Using unstable operation '%s'", "get_usage_attribution")
-        else
-          raise APIError.new(message: format("Unstable operation '%s' is disabled", "get_usage_attribution"))
-        end
+      unstable_enabled = @api_client.config.unstable_operations["v1.get_usage_attribution".to_sym]
+      if unstable_enabled
+        @api_client.config.logger.warn format("Using unstable operation '%s'", "v1.get_usage_attribution")
+      else
+        raise DatadogAPIClient::APIError.new(message: format("Unstable operation '%s' is disabled", "v1.get_usage_attribution"))
       end
 
       if @api_client.config.debugging
@@ -832,7 +788,7 @@ module DatadogAPIClient::V1
         fail ArgumentError, "Missing the required parameter 'fields' when calling UsageMeteringAPI.get_usage_attribution"
       end
       # verify enum value
-      allowable_values = ['custom_timeseries_usage', 'container_usage', 'snmp_percentage', 'apm_host_usage', 'browser_usage', 'npm_host_percentage', 'infra_host_usage', 'custom_timeseries_percentage', 'container_percentage', 'api_usage', 'apm_host_percentage', 'infra_host_percentage', 'snmp_usage', 'browser_percentage', 'api_percentage', 'npm_host_usage', 'lambda_functions_usage', 'lambda_functions_percentage', 'lambda_invocations_usage', 'lambda_invocations_percentage', 'fargate_usage', 'fargate_percentage', 'profiled_host_usage', 'profiled_host_percentage', 'profiled_container_usage', 'profiled_container_percentage', 'dbm_hosts_usage', 'dbm_hosts_percentage', 'dbm_queries_usage', 'dbm_queries_percentage', 'estimated_indexed_logs_usage', 'estimated_indexed_logs_percentage', '*']
+      allowable_values = ['custom_timeseries_usage', 'container_usage', 'snmp_percentage', 'apm_host_usage', 'browser_usage', 'npm_host_percentage', 'infra_host_usage', 'custom_timeseries_percentage', 'container_percentage', 'api_usage', 'apm_host_percentage', 'infra_host_percentage', 'snmp_usage', 'browser_percentage', 'api_percentage', 'npm_host_usage', 'lambda_functions_usage', 'lambda_functions_percentage', 'lambda_invocations_usage', 'lambda_invocations_percentage', 'fargate_usage', 'fargate_percentage', 'profiled_host_usage', 'profiled_host_percentage', 'profiled_container_usage', 'profiled_container_percentage', 'dbm_hosts_usage', 'dbm_hosts_percentage', 'dbm_queries_usage', 'dbm_queries_percentage', 'estimated_indexed_logs_usage', 'estimated_indexed_logs_percentage', 'appsec_usage', 'appsec_percentage', 'estimated_indexed_spans_usage', 'estimated_indexed_spans_percentage', 'estimated_ingested_spans_usage', 'estimated_ingested_spans_percentage', '*']
       if @api_client.config.client_side_validation && !allowable_values.include?(fields)
         fail ArgumentError, "invalid value for \"fields\", must be one of #{allowable_values}"
       end
@@ -840,7 +796,7 @@ module DatadogAPIClient::V1
       if @api_client.config.client_side_validation && opts[:'sort_direction'] && !allowable_values.include?(opts[:'sort_direction'])
         fail ArgumentError, "invalid value for \"sort_direction\", must be one of #{allowable_values}"
       end
-      allowable_values = ['api_percentage', 'snmp_usage', 'apm_host_usage', 'api_usage', 'container_usage', 'custom_timeseries_percentage', 'container_percentage', 'apm_host_percentage', 'npm_host_percentage', 'browser_percentage', 'browser_usage', 'infra_host_percentage', 'snmp_percentage', 'npm_host_usage', 'infra_host_usage', 'custom_timeseries_usage', 'lambda_functions_usage', 'lambda_functions_percentage', 'lambda_invocations_usage', 'lambda_invocations_percentage', 'estimated_indexed_logs_usage', 'estimated_indexed_logs_percentage']
+      allowable_values = ['api_percentage', 'snmp_usage', 'apm_host_usage', 'api_usage', 'appsec_usage', 'appsec_percentage', 'container_usage', 'custom_timeseries_percentage', 'container_percentage', 'apm_host_percentage', 'npm_host_percentage', 'browser_percentage', 'browser_usage', 'infra_host_percentage', 'snmp_percentage', 'npm_host_usage', 'infra_host_usage', 'custom_timeseries_usage', 'lambda_functions_usage', 'lambda_functions_percentage', 'lambda_invocations_usage', 'lambda_invocations_percentage', 'estimated_indexed_logs_usage', 'estimated_indexed_logs_percentage', 'estimated_indexed_spans_usage', 'estimated_indexed_spans_percentage', 'estimated_ingested_spans_usage', 'estimated_ingested_spans_percentage']
       if @api_client.config.client_side_validation && opts[:'sort_name'] && !allowable_values.include?(opts[:'sort_name'])
         fail ArgumentError, "invalid value for \"sort_name\", must be one of #{allowable_values}"
       end
@@ -882,7 +838,8 @@ module DatadogAPIClient::V1
         :form_params => form_params,
         :body => post_body,
         :auth_names => auth_names,
-        :return_type => return_type
+        :return_type => return_type,
+        :api_version => "V1"
       )
 
       data, status_code, headers = @api_client.call_api(Net::HTTP::Get, local_var_path, new_options)
@@ -903,6 +860,7 @@ module DatadogAPIClient::V1
     # Get hourly usage for audit logs.
     #
     # Get hourly usage for audit logs.
+    # **Note:** hourly usage data for all products is now available in the [Get hourly usage by product family API](https://docs.datadoghq.com/api/latest/usage-metering/#get-hourly-usage-by-product-family)
     #
     # @param start_hr [Time] Datetime in ISO-8601 format, UTC, precise to hour: `[YYYY-MM-DDThh]` for usage beginning at this hour.
     # @param opts [Hash] the optional parameters
@@ -910,15 +868,6 @@ module DatadogAPIClient::V1
     # @return [Array<(UsageAuditLogsResponse, Integer, Hash)>] UsageAuditLogsResponse data, response status code and response headers
     def get_usage_audit_logs_with_http_info(start_hr, opts = {})
 
-      if @api_client.config.unstable_operations.has_key?(:get_usage_audit_logs)
-        unstable_enabled = @api_client.config.unstable_operations[:get_usage_audit_logs]
-        if unstable_enabled
-          @api_client.config.logger.warn format("Using unstable operation '%s'", "get_usage_audit_logs")
-        else
-          raise APIError.new(message: format("Unstable operation '%s' is disabled", "get_usage_audit_logs"))
-        end
-      end
-
       if @api_client.config.debugging
         @api_client.config.logger.debug 'Calling API: UsageMeteringAPI.get_usage_audit_logs ...'
       end
@@ -958,7 +907,8 @@ module DatadogAPIClient::V1
         :form_params => form_params,
         :body => post_body,
         :auth_names => auth_names,
-        :return_type => return_type
+        :return_type => return_type,
+        :api_version => "V1"
       )
 
       data, status_code, headers = @api_client.call_api(Net::HTTP::Get, local_var_path, new_options)
@@ -985,15 +935,6 @@ module DatadogAPIClient::V1
     # @return [Array<(UsageBillableSummaryResponse, Integer, Hash)>] UsageBillableSummaryResponse data, response status code and response headers
     def get_usage_billable_summary_with_http_info(opts = {})
 
-      if @api_client.config.unstable_operations.has_key?(:get_usage_billable_summary)
-        unstable_enabled = @api_client.config.unstable_operations[:get_usage_billable_summary]
-        if unstable_enabled
-          @api_client.config.logger.warn format("Using unstable operation '%s'", "get_usage_billable_summary")
-        else
-          raise APIError.new(message: format("Unstable operation '%s' is disabled", "get_usage_billable_summary"))
-        end
-      end
-
       if @api_client.config.debugging
         @api_client.config.logger.debug 'Calling API: UsageMeteringAPI.get_usage_billable_summary ...'
       end
@@ -1028,7 +969,8 @@ module DatadogAPIClient::V1
         :form_params => form_params,
         :body => post_body,
         :auth_names => auth_names,
-        :return_type => return_type
+        :return_type => return_type,
+        :api_version => "V1"
       )
 
       data, status_code, headers = @api_client.call_api(Net::HTTP::Get, local_var_path, new_options)
@@ -1038,7 +980,7 @@ module DatadogAPIClient::V1
       return data, status_code, headers
     end
 
-    # Get hourly usage for CI Visibility.
+    # Get hourly usage for CI visibility.
     #
     # @see #get_usage_ci_app_with_http_info
     def get_usage_ci_app(start_hr, opts = {})
@@ -1046,9 +988,10 @@ module DatadogAPIClient::V1
       data
     end
 
-    # Get hourly usage for CI Visibility.
+    # Get hourly usage for CI visibility.
     #
-    # Get hourly usage for CI Visibility (Tests, Pipeline, Combo, and Spans).
+    # Get hourly usage for CI visibility (tests, pipeline, and spans).
+    # **Note:** hourly usage data for all products is now available in the [Get hourly usage by product family API](https://docs.datadoghq.com/api/latest/usage-metering/#get-hourly-usage-by-product-family)
     #
     # @param start_hr [Time] Datetime in ISO-8601 format, UTC, precise to hour: `[YYYY-MM-DDThh]` for usage beginning at this hour.
     # @param opts [Hash] the optional parameters
@@ -1056,15 +999,6 @@ module DatadogAPIClient::V1
     # @return [Array<(UsageCIVisibilityResponse, Integer, Hash)>] UsageCIVisibilityResponse data, response status code and response headers
     def get_usage_ci_app_with_http_info(start_hr, opts = {})
 
-      if @api_client.config.unstable_operations.has_key?(:get_usage_ci_app)
-        unstable_enabled = @api_client.config.unstable_operations[:get_usage_ci_app]
-        if unstable_enabled
-          @api_client.config.logger.warn format("Using unstable operation '%s'", "get_usage_ci_app")
-        else
-          raise APIError.new(message: format("Unstable operation '%s' is disabled", "get_usage_ci_app"))
-        end
-      end
-
       if @api_client.config.debugging
         @api_client.config.logger.debug 'Calling API: UsageMeteringAPI.get_usage_ci_app ...'
       end
@@ -1104,7 +1038,8 @@ module DatadogAPIClient::V1
         :form_params => form_params,
         :body => post_body,
         :auth_names => auth_names,
-        :return_type => return_type
+        :return_type => return_type,
+        :api_version => "V1"
       )
 
       data, status_code, headers = @api_client.call_api(Net::HTTP::Get, local_var_path, new_options)
@@ -1124,7 +1059,8 @@ module DatadogAPIClient::V1
 
     # Get hourly usage for CSPM.
     #
-    # Get hourly usage for Cloud Security Posture Management (CSPM).
+    # Get hourly usage for cloud security posture management (CSPM).
+    # **Note:** hourly usage data for all products is now available in the [Get hourly usage by product family API](https://docs.datadoghq.com/api/latest/usage-metering/#get-hourly-usage-by-product-family)
     #
     # @param start_hr [Time] Datetime in ISO-8601 format, UTC, precise to hour: `[YYYY-MM-DDThh]` for usage beginning at this hour.
     # @param opts [Hash] the optional parameters
@@ -1132,15 +1068,6 @@ module DatadogAPIClient::V1
     # @return [Array<(UsageCloudSecurityPostureManagementResponse, Integer, Hash)>] UsageCloudSecurityPostureManagementResponse data, response status code and response headers
     def get_usage_cloud_security_posture_management_with_http_info(start_hr, opts = {})
 
-      if @api_client.config.unstable_operations.has_key?(:get_usage_cloud_security_posture_management)
-        unstable_enabled = @api_client.config.unstable_operations[:get_usage_cloud_security_posture_management]
-        if unstable_enabled
-          @api_client.config.logger.warn format("Using unstable operation '%s'", "get_usage_cloud_security_posture_management")
-        else
-          raise APIError.new(message: format("Unstable operation '%s' is disabled", "get_usage_cloud_security_posture_management"))
-        end
-      end
-
       if @api_client.config.debugging
         @api_client.config.logger.debug 'Calling API: UsageMeteringAPI.get_usage_cloud_security_posture_management ...'
       end
@@ -1180,7 +1107,8 @@ module DatadogAPIClient::V1
         :form_params => form_params,
         :body => post_body,
         :auth_names => auth_names,
-        :return_type => return_type
+        :return_type => return_type,
+        :api_version => "V1"
       )
 
       data, status_code, headers = @api_client.call_api(Net::HTTP::Get, local_var_path, new_options)
@@ -1190,7 +1118,7 @@ module DatadogAPIClient::V1
       return data, status_code, headers
     end
 
-    # Get hourly usage for Cloud Workload Security.
+    # Get hourly usage for cloud workload security.
     #
     # @see #get_usage_cws_with_http_info
     def get_usage_cws(start_hr, opts = {})
@@ -1198,9 +1126,10 @@ module DatadogAPIClient::V1
       data
     end
 
-    # Get hourly usage for Cloud Workload Security.
+    # Get hourly usage for cloud workload security.
     #
-    # Get hourly usage for Cloud Workload Security.
+    # Get hourly usage for cloud workload security.
+    # **Note:** hourly usage data for all products is now available in the [Get hourly usage by product family API](https://docs.datadoghq.com/api/latest/usage-metering/#get-hourly-usage-by-product-family)
     #
     # @param start_hr [Time] Datetime in ISO-8601 format, UTC, precise to hour: `[YYYY-MM-DDThh]` for usage beginning at this hour.
     # @param opts [Hash] the optional parameters
@@ -1208,15 +1137,6 @@ module DatadogAPIClient::V1
     # @return [Array<(UsageCWSResponse, Integer, Hash)>] UsageCWSResponse data, response status code and response headers
     def get_usage_cws_with_http_info(start_hr, opts = {})
 
-      if @api_client.config.unstable_operations.has_key?(:get_usage_cws)
-        unstable_enabled = @api_client.config.unstable_operations[:get_usage_cws]
-        if unstable_enabled
-          @api_client.config.logger.warn format("Using unstable operation '%s'", "get_usage_cws")
-        else
-          raise APIError.new(message: format("Unstable operation '%s' is disabled", "get_usage_cws"))
-        end
-      end
-
       if @api_client.config.debugging
         @api_client.config.logger.debug 'Calling API: UsageMeteringAPI.get_usage_cws ...'
       end
@@ -1256,7 +1176,8 @@ module DatadogAPIClient::V1
         :form_params => form_params,
         :body => post_body,
         :auth_names => auth_names,
-        :return_type => return_type
+        :return_type => return_type,
+        :api_version => "V1"
       )
 
       data, status_code, headers = @api_client.call_api(Net::HTTP::Get, local_var_path, new_options)
@@ -1266,7 +1187,7 @@ module DatadogAPIClient::V1
       return data, status_code, headers
     end
 
-    # Get hourly usage for Database Monitoring.
+    # Get hourly usage for database monitoring.
     #
     # @see #get_usage_dbm_with_http_info
     def get_usage_dbm(start_hr, opts = {})
@@ -1274,9 +1195,10 @@ module DatadogAPIClient::V1
       data
     end
 
-    # Get hourly usage for Database Monitoring.
+    # Get hourly usage for database monitoring.
     #
-    # Get hourly usage for Database Monitoring
+    # Get hourly usage for database monitoring
+    # **Note:** hourly usage data for all products is now available in the [Get hourly usage by product family API](https://docs.datadoghq.com/api/latest/usage-metering/#get-hourly-usage-by-product-family)
     #
     # @param start_hr [Time] Datetime in ISO-8601 format, UTC, precise to hour: `[YYYY-MM-DDThh]` for usage beginning at this hour.
     # @param opts [Hash] the optional parameters
@@ -1284,15 +1206,6 @@ module DatadogAPIClient::V1
     # @return [Array<(UsageDBMResponse, Integer, Hash)>] UsageDBMResponse data, response status code and response headers
     def get_usage_dbm_with_http_info(start_hr, opts = {})
 
-      if @api_client.config.unstable_operations.has_key?(:get_usage_dbm)
-        unstable_enabled = @api_client.config.unstable_operations[:get_usage_dbm]
-        if unstable_enabled
-          @api_client.config.logger.warn format("Using unstable operation '%s'", "get_usage_dbm")
-        else
-          raise APIError.new(message: format("Unstable operation '%s' is disabled", "get_usage_dbm"))
-        end
-      end
-
       if @api_client.config.debugging
         @api_client.config.logger.debug 'Calling API: UsageMeteringAPI.get_usage_dbm ...'
       end
@@ -1332,7 +1245,8 @@ module DatadogAPIClient::V1
         :form_params => form_params,
         :body => post_body,
         :auth_names => auth_names,
-        :return_type => return_type
+        :return_type => return_type,
+        :api_version => "V1"
       )
 
       data, status_code, headers = @api_client.call_api(Net::HTTP::Get, local_var_path, new_options)
@@ -1353,6 +1267,7 @@ module DatadogAPIClient::V1
     # Get hourly usage for Fargate.
     #
     # Get hourly usage for [Fargate](https://docs.datadoghq.com/integrations/ecs_fargate/).
+    # **Note:** hourly usage data for all products is now available in the [Get hourly usage by product family API](https://docs.datadoghq.com/api/latest/usage-metering/#get-hourly-usage-by-product-family)
     #
     # @param start_hr [Time] Datetime in ISO-8601 format, UTC, precise to hour: [YYYY-MM-DDThh] for usage beginning at this hour.
     # @param opts [Hash] the optional parameters
@@ -1360,15 +1275,6 @@ module DatadogAPIClient::V1
     # @return [Array<(UsageFargateResponse, Integer, Hash)>] UsageFargateResponse data, response status code and response headers
     def get_usage_fargate_with_http_info(start_hr, opts = {})
 
-      if @api_client.config.unstable_operations.has_key?(:get_usage_fargate)
-        unstable_enabled = @api_client.config.unstable_operations[:get_usage_fargate]
-        if unstable_enabled
-          @api_client.config.logger.warn format("Using unstable operation '%s'", "get_usage_fargate")
-        else
-          raise APIError.new(message: format("Unstable operation '%s' is disabled", "get_usage_fargate"))
-        end
-      end
-
       if @api_client.config.debugging
         @api_client.config.logger.debug 'Calling API: UsageMeteringAPI.get_usage_fargate ...'
       end
@@ -1408,7 +1314,8 @@ module DatadogAPIClient::V1
         :form_params => form_params,
         :body => post_body,
         :auth_names => auth_names,
-        :return_type => return_type
+        :return_type => return_type,
+        :api_version => "V1"
       )
 
       data, status_code, headers = @api_client.call_api(Net::HTTP::Get, local_var_path, new_options)
@@ -1429,6 +1336,7 @@ module DatadogAPIClient::V1
     # Get hourly usage for hosts and containers.
     #
     # Get hourly usage for hosts and containers.
+    # **Note:** hourly usage data for all products is now available in the [Get hourly usage by product family API](https://docs.datadoghq.com/api/latest/usage-metering/#get-hourly-usage-by-product-family)
     #
     # @param start_hr [Time] Datetime in ISO-8601 format, UTC, precise to hour: [YYYY-MM-DDThh] for usage beginning at this hour.
     # @param opts [Hash] the optional parameters
@@ -1436,15 +1344,6 @@ module DatadogAPIClient::V1
     # @return [Array<(UsageHostsResponse, Integer, Hash)>] UsageHostsResponse data, response status code and response headers
     def get_usage_hosts_with_http_info(start_hr, opts = {})
 
-      if @api_client.config.unstable_operations.has_key?(:get_usage_hosts)
-        unstable_enabled = @api_client.config.unstable_operations[:get_usage_hosts]
-        if unstable_enabled
-          @api_client.config.logger.warn format("Using unstable operation '%s'", "get_usage_hosts")
-        else
-          raise APIError.new(message: format("Unstable operation '%s' is disabled", "get_usage_hosts"))
-        end
-      end
-
       if @api_client.config.debugging
         @api_client.config.logger.debug 'Calling API: UsageMeteringAPI.get_usage_hosts ...'
       end
@@ -1484,7 +1383,8 @@ module DatadogAPIClient::V1
         :form_params => form_params,
         :body => post_body,
         :auth_names => auth_names,
-        :return_type => return_type
+        :return_type => return_type,
+        :api_version => "V1"
       )
 
       data, status_code, headers = @api_client.call_api(Net::HTTP::Get, local_var_path, new_options)
@@ -1505,6 +1405,7 @@ module DatadogAPIClient::V1
     # Get hourly usage for indexed spans.
     #
     # Get hourly usage for indexed spans.
+    # **Note:** hourly usage data for all products is now available in the [Get hourly usage by product family API](https://docs.datadoghq.com/api/latest/usage-metering/#get-hourly-usage-by-product-family)
     #
     # @param start_hr [Time] Datetime in ISO-8601 format, UTC, precise to hour: `[YYYY-MM-DDThh]` for usage beginning at this hour.
     # @param opts [Hash] the optional parameters
@@ -1512,15 +1413,6 @@ module DatadogAPIClient::V1
     # @return [Array<(UsageIndexedSpansResponse, Integer, Hash)>] UsageIndexedSpansResponse data, response status code and response headers
     def get_usage_indexed_spans_with_http_info(start_hr, opts = {})
 
-      if @api_client.config.unstable_operations.has_key?(:get_usage_indexed_spans)
-        unstable_enabled = @api_client.config.unstable_operations[:get_usage_indexed_spans]
-        if unstable_enabled
-          @api_client.config.logger.warn format("Using unstable operation '%s'", "get_usage_indexed_spans")
-        else
-          raise APIError.new(message: format("Unstable operation '%s' is disabled", "get_usage_indexed_spans"))
-        end
-      end
-
       if @api_client.config.debugging
         @api_client.config.logger.debug 'Calling API: UsageMeteringAPI.get_usage_indexed_spans ...'
       end
@@ -1560,7 +1452,8 @@ module DatadogAPIClient::V1
         :form_params => form_params,
         :body => post_body,
         :auth_names => auth_names,
-        :return_type => return_type
+        :return_type => return_type,
+        :api_version => "V1"
       )
 
       data, status_code, headers = @api_client.call_api(Net::HTTP::Get, local_var_path, new_options)
@@ -1581,6 +1474,7 @@ module DatadogAPIClient::V1
     # Get hourly usage for IoT.
     #
     # Get hourly usage for IoT.
+    # **Note:** hourly usage data for all products is now available in the [Get hourly usage by product family API](https://docs.datadoghq.com/api/latest/usage-metering/#get-hourly-usage-by-product-family)
     #
     # @param start_hr [Time] Datetime in ISO-8601 format, UTC, precise to hour: `[YYYY-MM-DDThh]` for usage beginning at this hour.
     # @param opts [Hash] the optional parameters
@@ -1588,15 +1482,6 @@ module DatadogAPIClient::V1
     # @return [Array<(UsageIoTResponse, Integer, Hash)>] UsageIoTResponse data, response status code and response headers
     def get_usage_internet_of_things_with_http_info(start_hr, opts = {})
 
-      if @api_client.config.unstable_operations.has_key?(:get_usage_internet_of_things)
-        unstable_enabled = @api_client.config.unstable_operations[:get_usage_internet_of_things]
-        if unstable_enabled
-          @api_client.config.logger.warn format("Using unstable operation '%s'", "get_usage_internet_of_things")
-        else
-          raise APIError.new(message: format("Unstable operation '%s' is disabled", "get_usage_internet_of_things"))
-        end
-      end
-
       if @api_client.config.debugging
         @api_client.config.logger.debug 'Calling API: UsageMeteringAPI.get_usage_internet_of_things ...'
       end
@@ -1636,7 +1521,8 @@ module DatadogAPIClient::V1
         :form_params => form_params,
         :body => post_body,
         :auth_names => auth_names,
-        :return_type => return_type
+        :return_type => return_type,
+        :api_version => "V1"
       )
 
       data, status_code, headers = @api_client.call_api(Net::HTTP::Get, local_var_path, new_options)
@@ -1646,7 +1532,7 @@ module DatadogAPIClient::V1
       return data, status_code, headers
     end
 
-    # Get hourly usage for Lambda.
+    # Get hourly usage for lambda.
     #
     # @see #get_usage_lambda_with_http_info
     def get_usage_lambda(start_hr, opts = {})
@@ -1654,9 +1540,10 @@ module DatadogAPIClient::V1
       data
     end
 
-    # Get hourly usage for Lambda.
+    # Get hourly usage for lambda.
     #
     # Get hourly usage for lambda.
+    # **Note:** hourly usage data for all products is now available in the [Get hourly usage by product family API](https://docs.datadoghq.com/api/latest/usage-metering/#get-hourly-usage-by-product-family)
     #
     # @param start_hr [Time] Datetime in ISO-8601 format, UTC, precise to hour: [YYYY-MM-DDThh] for usage beginning at this hour.
     # @param opts [Hash] the optional parameters
@@ -1664,15 +1551,6 @@ module DatadogAPIClient::V1
     # @return [Array<(UsageLambdaResponse, Integer, Hash)>] UsageLambdaResponse data, response status code and response headers
     def get_usage_lambda_with_http_info(start_hr, opts = {})
 
-      if @api_client.config.unstable_operations.has_key?(:get_usage_lambda)
-        unstable_enabled = @api_client.config.unstable_operations[:get_usage_lambda]
-        if unstable_enabled
-          @api_client.config.logger.warn format("Using unstable operation '%s'", "get_usage_lambda")
-        else
-          raise APIError.new(message: format("Unstable operation '%s' is disabled", "get_usage_lambda"))
-        end
-      end
-
       if @api_client.config.debugging
         @api_client.config.logger.debug 'Calling API: UsageMeteringAPI.get_usage_lambda ...'
       end
@@ -1712,7 +1590,8 @@ module DatadogAPIClient::V1
         :form_params => form_params,
         :body => post_body,
         :auth_names => auth_names,
-        :return_type => return_type
+        :return_type => return_type,
+        :api_version => "V1"
       )
 
       data, status_code, headers = @api_client.call_api(Net::HTTP::Get, local_var_path, new_options)
@@ -1722,7 +1601,7 @@ module DatadogAPIClient::V1
       return data, status_code, headers
     end
 
-    # Get hourly usage for Logs.
+    # Get hourly usage for logs.
     #
     # @see #get_usage_logs_with_http_info
     def get_usage_logs(start_hr, opts = {})
@@ -1730,9 +1609,10 @@ module DatadogAPIClient::V1
       data
     end
 
-    # Get hourly usage for Logs.
+    # Get hourly usage for logs.
     #
     # Get hourly usage for logs.
+    # **Note:** hourly usage data for all products is now available in the [Get hourly usage by product family API](https://docs.datadoghq.com/api/latest/usage-metering/#get-hourly-usage-by-product-family)
     #
     # @param start_hr [Time] Datetime in ISO-8601 format, UTC, precise to hour: [YYYY-MM-DDThh] for usage beginning at this hour.
     # @param opts [Hash] the optional parameters
@@ -1740,15 +1620,6 @@ module DatadogAPIClient::V1
     # @return [Array<(UsageLogsResponse, Integer, Hash)>] UsageLogsResponse data, response status code and response headers
     def get_usage_logs_with_http_info(start_hr, opts = {})
 
-      if @api_client.config.unstable_operations.has_key?(:get_usage_logs)
-        unstable_enabled = @api_client.config.unstable_operations[:get_usage_logs]
-        if unstable_enabled
-          @api_client.config.logger.warn format("Using unstable operation '%s'", "get_usage_logs")
-        else
-          raise APIError.new(message: format("Unstable operation '%s' is disabled", "get_usage_logs"))
-        end
-      end
-
       if @api_client.config.debugging
         @api_client.config.logger.debug 'Calling API: UsageMeteringAPI.get_usage_logs ...'
       end
@@ -1788,7 +1659,8 @@ module DatadogAPIClient::V1
         :form_params => form_params,
         :body => post_body,
         :auth_names => auth_names,
-        :return_type => return_type
+        :return_type => return_type,
+        :api_version => "V1"
       )
 
       data, status_code, headers = @api_client.call_api(Net::HTTP::Get, local_var_path, new_options)
@@ -1798,7 +1670,7 @@ module DatadogAPIClient::V1
       return data, status_code, headers
     end
 
-    # Get hourly usage for Logs by Index.
+    # Get hourly usage for logs by index.
     #
     # @see #get_usage_logs_by_index_with_http_info
     def get_usage_logs_by_index(start_hr, opts = {})
@@ -1806,7 +1678,7 @@ module DatadogAPIClient::V1
       data
     end
 
-    # Get hourly usage for Logs by Index.
+    # Get hourly usage for logs by index.
     #
     # Get hourly usage for logs by index.
     #
@@ -1817,15 +1689,6 @@ module DatadogAPIClient::V1
     # @return [Array<(UsageLogsByIndexResponse, Integer, Hash)>] UsageLogsByIndexResponse data, response status code and response headers
     def get_usage_logs_by_index_with_http_info(start_hr, opts = {})
 
-      if @api_client.config.unstable_operations.has_key?(:get_usage_logs_by_index)
-        unstable_enabled = @api_client.config.unstable_operations[:get_usage_logs_by_index]
-        if unstable_enabled
-          @api_client.config.logger.warn format("Using unstable operation '%s'", "get_usage_logs_by_index")
-        else
-          raise APIError.new(message: format("Unstable operation '%s' is disabled", "get_usage_logs_by_index"))
-        end
-      end
-
       if @api_client.config.debugging
         @api_client.config.logger.debug 'Calling API: UsageMeteringAPI.get_usage_logs_by_index ...'
       end
@@ -1866,7 +1729,8 @@ module DatadogAPIClient::V1
         :form_params => form_params,
         :body => post_body,
         :auth_names => auth_names,
-        :return_type => return_type
+        :return_type => return_type,
+        :api_version => "V1"
       )
 
       data, status_code, headers = @api_client.call_api(Net::HTTP::Get, local_var_path, new_options)
@@ -1887,6 +1751,7 @@ module DatadogAPIClient::V1
     # Get hourly logs usage by retention.
     #
     # Get hourly usage for indexed logs by retention period.
+    # **Note:** hourly usage data for all products is now available in the [Get hourly usage by product family API](https://docs.datadoghq.com/api/latest/usage-metering/#get-hourly-usage-by-product-family)
     #
     # @param start_hr [Time] Datetime in ISO-8601 format, UTC, precise to hour: `[YYYY-MM-DDThh]` for usage beginning at this hour.
     # @param opts [Hash] the optional parameters
@@ -1894,15 +1759,6 @@ module DatadogAPIClient::V1
     # @return [Array<(UsageLogsByRetentionResponse, Integer, Hash)>] UsageLogsByRetentionResponse data, response status code and response headers
     def get_usage_logs_by_retention_with_http_info(start_hr, opts = {})
 
-      if @api_client.config.unstable_operations.has_key?(:get_usage_logs_by_retention)
-        unstable_enabled = @api_client.config.unstable_operations[:get_usage_logs_by_retention]
-        if unstable_enabled
-          @api_client.config.logger.warn format("Using unstable operation '%s'", "get_usage_logs_by_retention")
-        else
-          raise APIError.new(message: format("Unstable operation '%s' is disabled", "get_usage_logs_by_retention"))
-        end
-      end
-
       if @api_client.config.debugging
         @api_client.config.logger.debug 'Calling API: UsageMeteringAPI.get_usage_logs_by_retention ...'
       end
@@ -1942,7 +1798,8 @@ module DatadogAPIClient::V1
         :form_params => form_params,
         :body => post_body,
         :auth_names => auth_names,
-        :return_type => return_type
+        :return_type => return_type,
+        :api_version => "V1"
       )
 
       data, status_code, headers = @api_client.call_api(Net::HTTP::Get, local_var_path, new_options)
@@ -1952,7 +1809,7 @@ module DatadogAPIClient::V1
       return data, status_code, headers
     end
 
-    # Get hourly usage for Network Flows.
+    # get hourly usage for network flows.
     #
     # @see #get_usage_network_flows_with_http_info
     def get_usage_network_flows(start_hr, opts = {})
@@ -1960,9 +1817,10 @@ module DatadogAPIClient::V1
       data
     end
 
-    # Get hourly usage for Network Flows.
+    # get hourly usage for network flows.
     #
     # Get hourly usage for network flows.
+    # **Note:** hourly usage data for all products is now available in the [Get hourly usage by product family API](https://docs.datadoghq.com/api/latest/usage-metering/#get-hourly-usage-by-product-family)
     #
     # @param start_hr [Time] Datetime in ISO-8601 format, UTC, precise to hour: `[YYYY-MM-DDThh]` for usage beginning at this hour.
     # @param opts [Hash] the optional parameters
@@ -1970,15 +1828,6 @@ module DatadogAPIClient::V1
     # @return [Array<(UsageNetworkFlowsResponse, Integer, Hash)>] UsageNetworkFlowsResponse data, response status code and response headers
     def get_usage_network_flows_with_http_info(start_hr, opts = {})
 
-      if @api_client.config.unstable_operations.has_key?(:get_usage_network_flows)
-        unstable_enabled = @api_client.config.unstable_operations[:get_usage_network_flows]
-        if unstable_enabled
-          @api_client.config.logger.warn format("Using unstable operation '%s'", "get_usage_network_flows")
-        else
-          raise APIError.new(message: format("Unstable operation '%s' is disabled", "get_usage_network_flows"))
-        end
-      end
-
       if @api_client.config.debugging
         @api_client.config.logger.debug 'Calling API: UsageMeteringAPI.get_usage_network_flows ...'
       end
@@ -2018,7 +1867,8 @@ module DatadogAPIClient::V1
         :form_params => form_params,
         :body => post_body,
         :auth_names => auth_names,
-        :return_type => return_type
+        :return_type => return_type,
+        :api_version => "V1"
       )
 
       data, status_code, headers = @api_client.call_api(Net::HTTP::Get, local_var_path, new_options)
@@ -2028,7 +1878,7 @@ module DatadogAPIClient::V1
       return data, status_code, headers
     end
 
-    # Get hourly usage for Network Hosts.
+    # Get hourly usage for network hosts.
     #
     # @see #get_usage_network_hosts_with_http_info
     def get_usage_network_hosts(start_hr, opts = {})
@@ -2036,9 +1886,10 @@ module DatadogAPIClient::V1
       data
     end
 
-    # Get hourly usage for Network Hosts.
+    # Get hourly usage for network hosts.
     #
     # Get hourly usage for network hosts.
+    # **Note:** hourly usage data for all products is now available in the [Get hourly usage by product family API](https://docs.datadoghq.com/api/latest/usage-metering/#get-hourly-usage-by-product-family)
     #
     # @param start_hr [Time] Datetime in ISO-8601 format, UTC, precise to hour: [YYYY-MM-DDThh] for usage beginning at this hour.
     # @param opts [Hash] the optional parameters
@@ -2046,15 +1897,6 @@ module DatadogAPIClient::V1
     # @return [Array<(UsageNetworkHostsResponse, Integer, Hash)>] UsageNetworkHostsResponse data, response status code and response headers
     def get_usage_network_hosts_with_http_info(start_hr, opts = {})
 
-      if @api_client.config.unstable_operations.has_key?(:get_usage_network_hosts)
-        unstable_enabled = @api_client.config.unstable_operations[:get_usage_network_hosts]
-        if unstable_enabled
-          @api_client.config.logger.warn format("Using unstable operation '%s'", "get_usage_network_hosts")
-        else
-          raise APIError.new(message: format("Unstable operation '%s' is disabled", "get_usage_network_hosts"))
-        end
-      end
-
       if @api_client.config.debugging
         @api_client.config.logger.debug 'Calling API: UsageMeteringAPI.get_usage_network_hosts ...'
       end
@@ -2094,7 +1936,8 @@ module DatadogAPIClient::V1
         :form_params => form_params,
         :body => post_body,
         :auth_names => auth_names,
-        :return_type => return_type
+        :return_type => return_type,
+        :api_version => "V1"
       )
 
       data, status_code, headers = @api_client.call_api(Net::HTTP::Get, local_var_path, new_options)
@@ -2104,7 +1947,7 @@ module DatadogAPIClient::V1
       return data, status_code, headers
     end
 
-    # Get hourly usage for Online Archive.
+    # Get hourly usage for online archive.
     #
     # @see #get_usage_online_archive_with_http_info
     def get_usage_online_archive(start_hr, opts = {})
@@ -2112,9 +1955,10 @@ module DatadogAPIClient::V1
       data
     end
 
-    # Get hourly usage for Online Archive.
+    # Get hourly usage for online archive.
     #
-    # Get hourly usage for Online Archive.
+    # Get hourly usage for online archive.
+    # **Note:** hourly usage data for all products is now available in the [Get hourly usage by product family API](https://docs.datadoghq.com/api/latest/usage-metering/#get-hourly-usage-by-product-family)
     #
     # @param start_hr [Time] Datetime in ISO-8601 format, UTC, precise to hour: `[YYYY-MM-DDThh]` for usage beginning at this hour.
     # @param opts [Hash] the optional parameters
@@ -2122,15 +1966,6 @@ module DatadogAPIClient::V1
     # @return [Array<(UsageOnlineArchiveResponse, Integer, Hash)>] UsageOnlineArchiveResponse data, response status code and response headers
     def get_usage_online_archive_with_http_info(start_hr, opts = {})
 
-      if @api_client.config.unstable_operations.has_key?(:get_usage_online_archive)
-        unstable_enabled = @api_client.config.unstable_operations[:get_usage_online_archive]
-        if unstable_enabled
-          @api_client.config.logger.warn format("Using unstable operation '%s'", "get_usage_online_archive")
-        else
-          raise APIError.new(message: format("Unstable operation '%s' is disabled", "get_usage_online_archive"))
-        end
-      end
-
       if @api_client.config.debugging
         @api_client.config.logger.debug 'Calling API: UsageMeteringAPI.get_usage_online_archive ...'
       end
@@ -2170,7 +2005,8 @@ module DatadogAPIClient::V1
         :form_params => form_params,
         :body => post_body,
         :auth_names => auth_names,
-        :return_type => return_type
+        :return_type => return_type,
+        :api_version => "V1"
       )
 
       data, status_code, headers = @api_client.call_api(Net::HTTP::Get, local_var_path, new_options)
@@ -2191,6 +2027,7 @@ module DatadogAPIClient::V1
     # Get hourly usage for profiled hosts.
     #
     # Get hourly usage for profiled hosts.
+    # **Note:** hourly usage data for all products is now available in the [Get hourly usage by product family API](https://docs.datadoghq.com/api/latest/usage-metering/#get-hourly-usage-by-product-family)
     #
     # @param start_hr [Time] Datetime in ISO-8601 format, UTC, precise to hour: `[YYYY-MM-DDThh]` for usage beginning at this hour.
     # @param opts [Hash] the optional parameters
@@ -2198,15 +2035,6 @@ module DatadogAPIClient::V1
     # @return [Array<(UsageProfilingResponse, Integer, Hash)>] UsageProfilingResponse data, response status code and response headers
     def get_usage_profiling_with_http_info(start_hr, opts = {})
 
-      if @api_client.config.unstable_operations.has_key?(:get_usage_profiling)
-        unstable_enabled = @api_client.config.unstable_operations[:get_usage_profiling]
-        if unstable_enabled
-          @api_client.config.logger.warn format("Using unstable operation '%s'", "get_usage_profiling")
-        else
-          raise APIError.new(message: format("Unstable operation '%s' is disabled", "get_usage_profiling"))
-        end
-      end
-
       if @api_client.config.debugging
         @api_client.config.logger.debug 'Calling API: UsageMeteringAPI.get_usage_profiling ...'
       end
@@ -2246,7 +2074,8 @@ module DatadogAPIClient::V1
         :form_params => form_params,
         :body => post_body,
         :auth_names => auth_names,
-        :return_type => return_type
+        :return_type => return_type,
+        :api_version => "V1"
       )
 
       data, status_code, headers = @api_client.call_api(Net::HTTP::Get, local_var_path, new_options)
@@ -2256,7 +2085,7 @@ module DatadogAPIClient::V1
       return data, status_code, headers
     end
 
-    # Get hourly usage for RUM Sessions.
+    # Get hourly usage for RUM sessions.
     #
     # @see #get_usage_rum_sessions_with_http_info
     def get_usage_rum_sessions(start_hr, opts = {})
@@ -2264,9 +2093,10 @@ module DatadogAPIClient::V1
       data
     end
 
-    # Get hourly usage for RUM Sessions.
+    # Get hourly usage for RUM sessions.
     #
     # Get hourly usage for [RUM](https://docs.datadoghq.com/real_user_monitoring/) Sessions.
+    # **Note:** hourly usage data for all products is now available in the [Get hourly usage by product family API](https://docs.datadoghq.com/api/latest/usage-metering/#get-hourly-usage-by-product-family)
     #
     # @param start_hr [Time] Datetime in ISO-8601 format, UTC, precise to hour: [YYYY-MM-DDThh] for usage beginning at this hour.
     # @param opts [Hash] the optional parameters
@@ -2275,15 +2105,6 @@ module DatadogAPIClient::V1
     # @return [Array<(UsageRumSessionsResponse, Integer, Hash)>] UsageRumSessionsResponse data, response status code and response headers
     def get_usage_rum_sessions_with_http_info(start_hr, opts = {})
 
-      if @api_client.config.unstable_operations.has_key?(:get_usage_rum_sessions)
-        unstable_enabled = @api_client.config.unstable_operations[:get_usage_rum_sessions]
-        if unstable_enabled
-          @api_client.config.logger.warn format("Using unstable operation '%s'", "get_usage_rum_sessions")
-        else
-          raise APIError.new(message: format("Unstable operation '%s' is disabled", "get_usage_rum_sessions"))
-        end
-      end
-
       if @api_client.config.debugging
         @api_client.config.logger.debug 'Calling API: UsageMeteringAPI.get_usage_rum_sessions ...'
       end
@@ -2324,7 +2145,8 @@ module DatadogAPIClient::V1
         :form_params => form_params,
         :body => post_body,
         :auth_names => auth_names,
-        :return_type => return_type
+        :return_type => return_type,
+        :api_version => "V1"
       )
 
       data, status_code, headers = @api_client.call_api(Net::HTTP::Get, local_var_path, new_options)
@@ -2334,7 +2156,7 @@ module DatadogAPIClient::V1
       return data, status_code, headers
     end
 
-    # Get hourly usage for RUM Units.
+    # Get hourly usage for RUM units.
     #
     # @see #get_usage_rum_units_with_http_info
     def get_usage_rum_units(start_hr, opts = {})
@@ -2342,9 +2164,10 @@ module DatadogAPIClient::V1
       data
     end
 
-    # Get hourly usage for RUM Units.
+    # Get hourly usage for RUM units.
     #
     # Get hourly usage for [RUM](https://docs.datadoghq.com/real_user_monitoring/) Units.
+    # **Note:** hourly usage data for all products is now available in the [Get hourly usage by product family API](https://docs.datadoghq.com/api/latest/usage-metering/#get-hourly-usage-by-product-family)
     #
     # @param start_hr [Time] Datetime in ISO-8601 format, UTC, precise to hour: [YYYY-MM-DDThh] for usage beginning at this hour.
     # @param opts [Hash] the optional parameters
@@ -2352,15 +2175,6 @@ module DatadogAPIClient::V1
     # @return [Array<(UsageRumUnitsResponse, Integer, Hash)>] UsageRumUnitsResponse data, response status code and response headers
     def get_usage_rum_units_with_http_info(start_hr, opts = {})
 
-      if @api_client.config.unstable_operations.has_key?(:get_usage_rum_units)
-        unstable_enabled = @api_client.config.unstable_operations[:get_usage_rum_units]
-        if unstable_enabled
-          @api_client.config.logger.warn format("Using unstable operation '%s'", "get_usage_rum_units")
-        else
-          raise APIError.new(message: format("Unstable operation '%s' is disabled", "get_usage_rum_units"))
-        end
-      end
-
       if @api_client.config.debugging
         @api_client.config.logger.debug 'Calling API: UsageMeteringAPI.get_usage_rum_units ...'
       end
@@ -2400,7 +2214,8 @@ module DatadogAPIClient::V1
         :form_params => form_params,
         :body => post_body,
         :auth_names => auth_names,
-        :return_type => return_type
+        :return_type => return_type,
+        :api_version => "V1"
       )
 
       data, status_code, headers = @api_client.call_api(Net::HTTP::Get, local_var_path, new_options)
@@ -2410,7 +2225,7 @@ module DatadogAPIClient::V1
       return data, status_code, headers
     end
 
-    # Get hourly usage for Sensitive Data Scanner.
+    # Get hourly usage for sensitive data scanner.
     #
     # @see #get_usage_sds_with_http_info
     def get_usage_sds(start_hr, opts = {})
@@ -2418,9 +2233,10 @@ module DatadogAPIClient::V1
       data
     end
 
-    # Get hourly usage for Sensitive Data Scanner.
+    # Get hourly usage for sensitive data scanner.
     #
-    # Get hourly usage for Sensitive Data Scanner.
+    # Get hourly usage for sensitive data scanner.
+    # **Note:** hourly usage data for all products is now available in the [Get hourly usage by product family API](https://docs.datadoghq.com/api/latest/usage-metering/#get-hourly-usage-by-product-family)
     #
     # @param start_hr [Time] Datetime in ISO-8601 format, UTC, precise to hour: `[YYYY-MM-DDThh]` for usage beginning at this hour.
     # @param opts [Hash] the optional parameters
@@ -2428,15 +2244,6 @@ module DatadogAPIClient::V1
     # @return [Array<(UsageSDSResponse, Integer, Hash)>] UsageSDSResponse data, response status code and response headers
     def get_usage_sds_with_http_info(start_hr, opts = {})
 
-      if @api_client.config.unstable_operations.has_key?(:get_usage_sds)
-        unstable_enabled = @api_client.config.unstable_operations[:get_usage_sds]
-        if unstable_enabled
-          @api_client.config.logger.warn format("Using unstable operation '%s'", "get_usage_sds")
-        else
-          raise APIError.new(message: format("Unstable operation '%s' is disabled", "get_usage_sds"))
-        end
-      end
-
       if @api_client.config.debugging
         @api_client.config.logger.debug 'Calling API: UsageMeteringAPI.get_usage_sds ...'
       end
@@ -2476,7 +2283,8 @@ module DatadogAPIClient::V1
         :form_params => form_params,
         :body => post_body,
         :auth_names => auth_names,
-        :return_type => return_type
+        :return_type => return_type,
+        :api_version => "V1"
       )
 
       data, status_code, headers = @api_client.call_api(Net::HTTP::Get, local_var_path, new_options)
@@ -2497,6 +2305,7 @@ module DatadogAPIClient::V1
     # Get hourly usage for SNMP devices.
     #
     # Get hourly usage for SNMP devices.
+    # **Note:** hourly usage data for all products is now available in the [Get hourly usage by product family API](https://docs.datadoghq.com/api/latest/usage-metering/#get-hourly-usage-by-product-family)
     #
     # @param start_hr [Time] Datetime in ISO-8601 format, UTC, precise to hour: `[YYYY-MM-DDThh]` for usage beginning at this hour.
     # @param opts [Hash] the optional parameters
@@ -2504,15 +2313,6 @@ module DatadogAPIClient::V1
     # @return [Array<(UsageSNMPResponse, Integer, Hash)>] UsageSNMPResponse data, response status code and response headers
     def get_usage_snmp_with_http_info(start_hr, opts = {})
 
-      if @api_client.config.unstable_operations.has_key?(:get_usage_snmp)
-        unstable_enabled = @api_client.config.unstable_operations[:get_usage_snmp]
-        if unstable_enabled
-          @api_client.config.logger.warn format("Using unstable operation '%s'", "get_usage_snmp")
-        else
-          raise APIError.new(message: format("Unstable operation '%s' is disabled", "get_usage_snmp"))
-        end
-      end
-
       if @api_client.config.debugging
         @api_client.config.logger.debug 'Calling API: UsageMeteringAPI.get_usage_snmp ...'
       end
@@ -2552,7 +2352,8 @@ module DatadogAPIClient::V1
         :form_params => form_params,
         :body => post_body,
         :auth_names => auth_names,
-        :return_type => return_type
+        :return_type => return_type,
+        :api_version => "V1"
       )
 
       data, status_code, headers = @api_client.call_api(Net::HTTP::Get, local_var_path, new_options)
@@ -2581,15 +2382,6 @@ module DatadogAPIClient::V1
     # @return [Array<(UsageSummaryResponse, Integer, Hash)>] UsageSummaryResponse data, response status code and response headers
     def get_usage_summary_with_http_info(start_month, opts = {})
 
-      if @api_client.config.unstable_operations.has_key?(:get_usage_summary)
-        unstable_enabled = @api_client.config.unstable_operations[:get_usage_summary]
-        if unstable_enabled
-          @api_client.config.logger.warn format("Using unstable operation '%s'", "get_usage_summary")
-        else
-          raise APIError.new(message: format("Unstable operation '%s' is disabled", "get_usage_summary"))
-        end
-      end
-
       if @api_client.config.debugging
         @api_client.config.logger.debug 'Calling API: UsageMeteringAPI.get_usage_summary ...'
       end
@@ -2630,7 +2422,8 @@ module DatadogAPIClient::V1
         :form_params => form_params,
         :body => post_body,
         :auth_names => auth_names,
-        :return_type => return_type
+        :return_type => return_type,
+        :api_version => "V1"
       )
 
       data, status_code, headers = @api_client.call_api(Net::HTTP::Get, local_var_path, new_options)
@@ -2640,7 +2433,7 @@ module DatadogAPIClient::V1
       return data, status_code, headers
     end
 
-    # Get hourly usage for Synthetics Checks.
+    # Get hourly usage for synthetics checks.
     #
     # @see #get_usage_synthetics_with_http_info
     def get_usage_synthetics(start_hr, opts = {})
@@ -2648,9 +2441,10 @@ module DatadogAPIClient::V1
       data
     end
 
-    # Get hourly usage for Synthetics Checks.
+    # Get hourly usage for synthetics checks.
     #
-    # Get hourly usage for [Synthetics checks](https://docs.datadoghq.com/synthetics/).
+    # Get hourly usage for [synthetics checks](https://docs.datadoghq.com/synthetics/).
+    # **Note:** hourly usage data for all products is now available in the [Get hourly usage by product family API](https://docs.datadoghq.com/api/latest/usage-metering/#get-hourly-usage-by-product-family)
     #
     # @param start_hr [Time] Datetime in ISO-8601 format, UTC, precise to hour: [YYYY-MM-DDThh] for usage beginning at this hour.
     # @param opts [Hash] the optional parameters
@@ -2658,15 +2452,6 @@ module DatadogAPIClient::V1
     # @return [Array<(UsageSyntheticsResponse, Integer, Hash)>] UsageSyntheticsResponse data, response status code and response headers
     def get_usage_synthetics_with_http_info(start_hr, opts = {})
 
-      if @api_client.config.unstable_operations.has_key?(:get_usage_synthetics)
-        unstable_enabled = @api_client.config.unstable_operations[:get_usage_synthetics]
-        if unstable_enabled
-          @api_client.config.logger.warn format("Using unstable operation '%s'", "get_usage_synthetics")
-        else
-          raise APIError.new(message: format("Unstable operation '%s' is disabled", "get_usage_synthetics"))
-        end
-      end
-
       if @api_client.config.debugging
         @api_client.config.logger.debug 'Calling API: UsageMeteringAPI.get_usage_synthetics ...'
       end
@@ -2706,7 +2491,8 @@ module DatadogAPIClient::V1
         :form_params => form_params,
         :body => post_body,
         :auth_names => auth_names,
-        :return_type => return_type
+        :return_type => return_type,
+        :api_version => "V1"
       )
 
       data, status_code, headers = @api_client.call_api(Net::HTTP::Get, local_var_path, new_options)
@@ -2716,7 +2502,7 @@ module DatadogAPIClient::V1
       return data, status_code, headers
     end
 
-    # Get hourly usage for Synthetics API Checks.
+    # Get hourly usage for synthetics API checks.
     #
     # @see #get_usage_synthetics_api_with_http_info
     def get_usage_synthetics_api(start_hr, opts = {})
@@ -2724,9 +2510,10 @@ module DatadogAPIClient::V1
       data
     end
 
-    # Get hourly usage for Synthetics API Checks.
+    # Get hourly usage for synthetics API checks.
     #
     # Get hourly usage for [synthetics API checks](https://docs.datadoghq.com/synthetics/).
+    # **Note:** hourly usage data for all products is now available in the [Get hourly usage by product family API](https://docs.datadoghq.com/api/latest/usage-metering/#get-hourly-usage-by-product-family)
     #
     # @param start_hr [Time] Datetime in ISO-8601 format, UTC, precise to hour: [YYYY-MM-DDThh] for usage beginning at this hour.
     # @param opts [Hash] the optional parameters
@@ -2734,15 +2521,6 @@ module DatadogAPIClient::V1
     # @return [Array<(UsageSyntheticsAPIResponse, Integer, Hash)>] UsageSyntheticsAPIResponse data, response status code and response headers
     def get_usage_synthetics_api_with_http_info(start_hr, opts = {})
 
-      if @api_client.config.unstable_operations.has_key?(:get_usage_synthetics_api)
-        unstable_enabled = @api_client.config.unstable_operations[:get_usage_synthetics_api]
-        if unstable_enabled
-          @api_client.config.logger.warn format("Using unstable operation '%s'", "get_usage_synthetics_api")
-        else
-          raise APIError.new(message: format("Unstable operation '%s' is disabled", "get_usage_synthetics_api"))
-        end
-      end
-
       if @api_client.config.debugging
         @api_client.config.logger.debug 'Calling API: UsageMeteringAPI.get_usage_synthetics_api ...'
       end
@@ -2782,7 +2560,8 @@ module DatadogAPIClient::V1
         :form_params => form_params,
         :body => post_body,
         :auth_names => auth_names,
-        :return_type => return_type
+        :return_type => return_type,
+        :api_version => "V1"
       )
 
       data, status_code, headers = @api_client.call_api(Net::HTTP::Get, local_var_path, new_options)
@@ -2792,7 +2571,7 @@ module DatadogAPIClient::V1
       return data, status_code, headers
     end
 
-    # Get hourly usage for Synthetics Browser Checks.
+    # Get hourly usage for synthetics browser checks.
     #
     # @see #get_usage_synthetics_browser_with_http_info
     def get_usage_synthetics_browser(start_hr, opts = {})
@@ -2800,9 +2579,10 @@ module DatadogAPIClient::V1
       data
     end
 
-    # Get hourly usage for Synthetics Browser Checks.
+    # Get hourly usage for synthetics browser checks.
     #
     # Get hourly usage for synthetics browser checks.
+    # **Note:** hourly usage data for all products is now available in the [Get hourly usage by product family API](https://docs.datadoghq.com/api/latest/usage-metering/#get-hourly-usage-by-product-family)
     #
     # @param start_hr [Time] Datetime in ISO-8601 format, UTC, precise to hour: [YYYY-MM-DDThh] for usage beginning at this hour.
     # @param opts [Hash] the optional parameters
@@ -2810,15 +2590,6 @@ module DatadogAPIClient::V1
     # @return [Array<(UsageSyntheticsBrowserResponse, Integer, Hash)>] UsageSyntheticsBrowserResponse data, response status code and response headers
     def get_usage_synthetics_browser_with_http_info(start_hr, opts = {})
 
-      if @api_client.config.unstable_operations.has_key?(:get_usage_synthetics_browser)
-        unstable_enabled = @api_client.config.unstable_operations[:get_usage_synthetics_browser]
-        if unstable_enabled
-          @api_client.config.logger.warn format("Using unstable operation '%s'", "get_usage_synthetics_browser")
-        else
-          raise APIError.new(message: format("Unstable operation '%s' is disabled", "get_usage_synthetics_browser"))
-        end
-      end
-
       if @api_client.config.debugging
         @api_client.config.logger.debug 'Calling API: UsageMeteringAPI.get_usage_synthetics_browser ...'
       end
@@ -2858,7 +2629,8 @@ module DatadogAPIClient::V1
         :form_params => form_params,
         :body => post_body,
         :auth_names => auth_names,
-        :return_type => return_type
+        :return_type => return_type,
+        :api_version => "V1"
       )
 
       data, status_code, headers = @api_client.call_api(Net::HTTP::Get, local_var_path, new_options)
@@ -2879,6 +2651,7 @@ module DatadogAPIClient::V1
     # Get hourly usage for custom metrics.
     #
     # Get hourly usage for [custom metrics](https://docs.datadoghq.com/developers/metrics/custom_metrics/).
+    # **Note:** hourly usage data for all products is now available in the [Get hourly usage by product family API](https://docs.datadoghq.com/api/latest/usage-metering/#get-hourly-usage-by-product-family)
     #
     # @param start_hr [Time] Datetime in ISO-8601 format, UTC, precise to hour: [YYYY-MM-DDThh] for usage beginning at this hour.
     # @param opts [Hash] the optional parameters
@@ -2886,15 +2659,6 @@ module DatadogAPIClient::V1
     # @return [Array<(UsageTimeseriesResponse, Integer, Hash)>] UsageTimeseriesResponse data, response status code and response headers
     def get_usage_timeseries_with_http_info(start_hr, opts = {})
 
-      if @api_client.config.unstable_operations.has_key?(:get_usage_timeseries)
-        unstable_enabled = @api_client.config.unstable_operations[:get_usage_timeseries]
-        if unstable_enabled
-          @api_client.config.logger.warn format("Using unstable operation '%s'", "get_usage_timeseries")
-        else
-          raise APIError.new(message: format("Unstable operation '%s' is disabled", "get_usage_timeseries"))
-        end
-      end
-
       if @api_client.config.debugging
         @api_client.config.logger.debug 'Calling API: UsageMeteringAPI.get_usage_timeseries ...'
       end
@@ -2934,7 +2698,8 @@ module DatadogAPIClient::V1
         :form_params => form_params,
         :body => post_body,
         :auth_names => auth_names,
-        :return_type => return_type
+        :return_type => return_type,
+        :api_version => "V1"
       )
 
       data, status_code, headers = @api_client.call_api(Net::HTTP::Get, local_var_path, new_options)
@@ -2965,15 +2730,6 @@ module DatadogAPIClient::V1
     # @return [Array<(UsageTopAvgMetricsResponse, Integer, Hash)>] UsageTopAvgMetricsResponse data, response status code and response headers
     def get_usage_top_avg_metrics_with_http_info(opts = {})
 
-      if @api_client.config.unstable_operations.has_key?(:get_usage_top_avg_metrics)
-        unstable_enabled = @api_client.config.unstable_operations[:get_usage_top_avg_metrics]
-        if unstable_enabled
-          @api_client.config.logger.warn format("Using unstable operation '%s'", "get_usage_top_avg_metrics")
-        else
-          raise APIError.new(message: format("Unstable operation '%s' is disabled", "get_usage_top_avg_metrics"))
-        end
-      end
-
       if @api_client.config.debugging
         @api_client.config.logger.debug 'Calling API: UsageMeteringAPI.get_usage_top_avg_metrics ...'
       end
@@ -3018,7 +2774,8 @@ module DatadogAPIClient::V1
         :form_params => form_params,
         :body => post_body,
         :auth_names => auth_names,
-        :return_type => return_type
+        :return_type => return_type,
+        :api_version => "V1"
       )
 
       data, status_code, headers = @api_client.call_api(Net::HTTP::Get, local_var_path, new_options)