datadog_api_client 2.13.0 → 2.14.0

data/lib/datadog_api_client/api_client.rb

@@ -55,71 +55,99 @@ module DatadogAPIClient
     #   the data deserialized from response body (could be nil), response status code and response headers.
     def call_api(http_method, path, opts = {})
       request = build_request(http_method, path, opts)
-      if opts[:stream_body]
-        tempfile = nil
-        encoding = nil
-
-        response = request.perform do | chunk |
-          unless tempfile
-            content_disposition = chunk.http_response.header['Content-Disposition']
-            if content_disposition && content_disposition =~ /filename=/i
-              filename = content_disposition[/filename=['"]?([^'"\s]+)['"]?/, 1]
-              prefix = sanitize_filename(filename)
-            else
-              prefix = 'download-'
-            end
-            prefix = prefix + '-' unless prefix.end_with?('-')
-            unless encoding
-              encoding = chunk.encoding
+      attempt = 0
+      loop do
+        if opts[:stream_body]
+          tempfile = nil
+          encoding = nil
+
+          response = request.perform do | chunk |
+            unless tempfile
+              content_disposition = chunk.http_response.header['Content-Disposition']
+              if content_disposition && content_disposition =~ /filename=/i
+                filename = content_disposition[/filename=['"]?([^'"\s]+)['"]?/, 1]
+                prefix = sanitize_filename(filename)
+              else
+                prefix = 'download-'
+              end
+              prefix = prefix + '-' unless prefix.end_with?('-')
+              unless encoding
+                encoding = chunk.encoding
+              end
+              tempfile = Tempfile.open(prefix, @config.temp_folder_path, encoding: encoding)
+              @tempfile = tempfile
             end
-            tempfile = Tempfile.open(prefix, @config.temp_folder_path, encoding: encoding)
-            @tempfile = tempfile
+            chunk.force_encoding(encoding)
+            tempfile.write(chunk)
+          end
+          if tempfile
+            tempfile.close
+            @config.logger.info "Temp file written to #{tempfile.path}, please copy the file to a proper folder "\
+                              "with e.g. `FileUtils.cp(tempfile.path, '/new/file/path')` otherwise the temp file "\
+                              "will be deleted automatically with GC. It's also recommended to delete the temp file "\
+                              "explicitly with `tempfile.delete`"
           end
-          chunk.force_encoding(encoding)
-          tempfile.write(chunk)
+        else
+          response = request.perform
         end
-        if tempfile
-          tempfile.close
-          @config.logger.info "Temp file written to #{tempfile.path}, please copy the file to a proper folder "\
-                            "with e.g. `FileUtils.cp(tempfile.path, '/new/file/path')` otherwise the temp file "\
-                            "will be deleted automatically with GC. It's also recommended to delete the temp file "\
-                            "explicitly with `tempfile.delete`"
+
+        if @config.debugging
+          @config.logger.debug "HTTP response body ~BEGIN~\n#{response.body}\n~END~\n"
         end
-      else
-        response = request.perform
-      end
 
-      if @config.debugging
-        @config.logger.debug "HTTP response body ~BEGIN~\n#{response.body}\n~END~\n"
-      end
+        unless response.success?
+          if response.request_timeout?
+            fail APIError.new('Connection timed out')
+          elsif response.code == 0
+            # Errors from libcurl will be made visible here
+            fail APIError.new(:code => 0,
+                              :message => response.return_message)
+          else
+            body = response.body
+            if response.headers['Content-Encoding'].eql?('gzip') && !(body.nil? || body.empty?) then
+              gzip = Zlib::Inflate.new(Zlib::MAX_WBITS + 16)
+              body = gzip.inflate(body)
+              gzip.close
+            end
+            if should_retry(attempt, @config.max_retries, response.code, @config.enable_retry)
+              sleep calculate_retry_interval(response, @config.backoff_base, @config.backoff_multiplier, attempt, @config.timeout)
+              attempt = attempt + 1
+              next
+            else
+              fail APIError.new(:code => response.code,
+                :response_headers => response.headers,
+                :response_body => body),
+              response.message
+            end
+          end
+        end
 
-      unless response.success?
-        if response.request_timeout?
-          fail APIError.new('Connection timed out')
-        elsif response.code == 0
-          # Errors from libcurl will be made visible here
-          fail APIError.new(:code => 0,
-                            :message => response.return_message)
+        if opts[:return_type]
+          data = deserialize(opts[:api_version], response, opts[:return_type])
         else
-          body = response.body
-          if response.headers['Content-Encoding'].eql?('gzip') && !(body.nil? || body.empty?) then
-            gzip = Zlib::Inflate.new(Zlib::MAX_WBITS + 16)
-            body = gzip.inflate(body)
-            gzip.close
-          end
-          fail APIError.new(:code => response.code,
-                            :response_headers => response.headers,
-                            :response_body => body),
-               response.message
+          data = nil
         end
+        return data, response.code, response.headers
       end
+    end
+
+    # Check if an http request should be retried
+    def should_retry(attempt, max_retries, http_code, enable_retry)
+      (http_code == 429 || http_code >= 500) && max_retries > attempt && enable_retry
+    end
 
-      if opts[:return_type]
-        data = deserialize(opts[:api_version], response, opts[:return_type])
+    # Calculate the sleep interval between 2 retry attempts
+    def calculate_retry_interval(response, backoff_base, backoff_multiplier, attempt, timeout)
+      reset_header = response.headers['X-Ratelimit-Reset']
+      if  !reset_header.nil? && !reset_header.empty?
+        sleep_time = reset_header.to_i
       else
-        data = nil
+        sleep_time = (backoff_multiplier**attempt) * backoff_base
+        if timeout && timeout > 0
+          sleep_time = [timeout, sleep_time].min
+        end
       end
-      return data, response.code, response.headers
+      sleep_time
     end
 
     # Build the HTTP request

data/lib/datadog_api_client/configuration.rb

@@ -149,6 +149,16 @@ module DatadogAPIClient
     # Password for proxy server authentication
     attr_accessor :http_proxypass
 
+    # Enable retry when rate limited
+    attr_accessor :enable_retry
+
+    # Retry backoff calculation parameters
+    attr_accessor :backoff_base
+    attr_accessor :backoff_multiplier
+
+    # Maximum number of retry attempts allowed
+    attr_accessor :max_retries
+
     def initialize
       @scheme = 'https'
       @host = 'api.datadoghq.com'
@@ -159,6 +169,10 @@ module DatadogAPIClient
       @server_operation_variables = {}
       @api_key = {}
       @api_key_prefix = {}
+      @enable_retry = false
+      @backoff_base = 2
+      @backoff_multiplier = 2
+      @max_retries = 3
       @timeout = nil
       @client_side_validation = true
       @verify_ssl = true
@@ -175,6 +189,7 @@ module DatadogAPIClient
       @http_proxypass = nil
       @logger = defined?(Rails) ? Rails.logger : Logger.new(STDOUT)
       @unstable_operations = {
+            "v2.create_ci_app_pipeline_event": false,
             "v2.cancel_downtime": false,
             "v2.create_downtime": false,
             "v2.get_downtime": false,
@@ -229,6 +244,13 @@ module DatadogAPIClient
       @@default ||= Configuration.new
     end
 
+    def backoff_base=(value)
+      if value < 2
+        raise ArgumentError, 'backoff_base cannot be smaller than 2'
+      end
+      @backoff_base = value
+    end
+
     def configure
       yield(self) if block_given?
     end

data/lib/datadog_api_client/inflector.rb

@@ -881,6 +881,7 @@ module DatadogAPIClient
           "v2.ci_app_group_by_total" => "CIAppGroupByTotal",
           "v2.ci_app_host_info" => "CIAppHostInfo",
           "v2.ci_app_pipeline_event" => "CIAppPipelineEvent",
+          "v2.ci_app_pipeline_event_attributes" => "CIAppPipelineEventAttributes",
           "v2.ci_app_pipeline_event_job" => "CIAppPipelineEventJob",
           "v2.ci_app_pipeline_event_job_level" => "CIAppPipelineEventJobLevel",
           "v2.ci_app_pipeline_event_job_status" => "CIAppPipelineEventJobStatus",
@@ -898,6 +899,7 @@ module DatadogAPIClient
           "v2.ci_app_pipeline_event_step_level" => "CIAppPipelineEventStepLevel",
           "v2.ci_app_pipeline_event_step_status" => "CIAppPipelineEventStepStatus",
           "v2.ci_app_pipeline_event_type_name" => "CIAppPipelineEventTypeName",
+          "v2.ci_app_pipeline_level" => "CIAppPipelineLevel",
           "v2.ci_app_pipelines_aggregate_request" => "CIAppPipelinesAggregateRequest",
           "v2.ci_app_pipelines_aggregation_buckets_response" => "CIAppPipelinesAggregationBucketsResponse",
           "v2.ci_app_pipelines_analytics_aggregate_response" => "CIAppPipelinesAnalyticsAggregateResponse",
@@ -917,6 +919,7 @@ module DatadogAPIClient
           "v2.ci_app_test_events_request" => "CIAppTestEventsRequest",
           "v2.ci_app_test_events_response" => "CIAppTestEventsResponse",
           "v2.ci_app_test_event_type_name" => "CIAppTestEventTypeName",
+          "v2.ci_app_test_level" => "CIAppTestLevel",
           "v2.ci_app_tests_aggregate_request" => "CIAppTestsAggregateRequest",
           "v2.ci_app_tests_aggregation_buckets_response" => "CIAppTestsAggregationBucketsResponse",
           "v2.ci_app_tests_analytics_aggregate_response" => "CIAppTestsAnalyticsAggregateResponse",
@@ -1421,6 +1424,7 @@ module DatadogAPIClient
           "v2.on_demand_concurrency_cap" => "OnDemandConcurrencyCap",
           "v2.on_demand_concurrency_cap_attributes" => "OnDemandConcurrencyCapAttributes",
           "v2.on_demand_concurrency_cap_response" => "OnDemandConcurrencyCapResponse",
+          "v2.on_demand_concurrency_cap_type" => "OnDemandConcurrencyCapType",
           "v2.opsgenie_service_create_attributes" => "OpsgenieServiceCreateAttributes",
           "v2.opsgenie_service_create_data" => "OpsgenieServiceCreateData",
           "v2.opsgenie_service_create_request" => "OpsgenieServiceCreateRequest",
@@ -1620,6 +1624,8 @@ module DatadogAPIClient
           "v2.security_monitoring_signal_list_request" => "SecurityMonitoringSignalListRequest",
           "v2.security_monitoring_signal_list_request_filter" => "SecurityMonitoringSignalListRequestFilter",
           "v2.security_monitoring_signal_list_request_page" => "SecurityMonitoringSignalListRequestPage",
+          "v2.security_monitoring_signal_metadata_type" => "SecurityMonitoringSignalMetadataType",
+          "v2.security_monitoring_signal_response" => "SecurityMonitoringSignalResponse",
           "v2.security_monitoring_signal_rule_create_payload" => "SecurityMonitoringSignalRuleCreatePayload",
           "v2.security_monitoring_signal_rule_query" => "SecurityMonitoringSignalRuleQuery",
           "v2.security_monitoring_signal_rule_response" => "SecurityMonitoringSignalRuleResponse",
@@ -1813,7 +1819,6 @@ module DatadogAPIClient
           "v2.team_create_attributes" => "TeamCreateAttributes",
           "v2.team_create_relationships" => "TeamCreateRelationships",
           "v2.team_create_request" => "TeamCreateRequest",
-          "v2.team_data" => "TeamData",
           "v2.team_included" => "TeamIncluded",
           "v2.team_link" => "TeamLink",
           "v2.team_link_attributes" => "TeamLinkAttributes",
@@ -1833,8 +1838,12 @@ module DatadogAPIClient
           "v2.team_permission_setting_update_request" => "TeamPermissionSettingUpdateRequest",
           "v2.team_permission_setting_value" => "TeamPermissionSettingValue",
           "v2.team_relationships" => "TeamRelationships",
+          "v2.team_relationships_links" => "TeamRelationshipsLinks",
           "v2.team_response" => "TeamResponse",
           "v2.teams_response" => "TeamsResponse",
+          "v2.teams_response_links" => "TeamsResponseLinks",
+          "v2.teams_response_meta" => "TeamsResponseMeta",
+          "v2.teams_response_meta_pagination" => "TeamsResponseMetaPagination",
           "v2.team_type" => "TeamType",
           "v2.team_update" => "TeamUpdate",
           "v2.team_update_attributes" => "TeamUpdateAttributes",

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

@@ -70,7 +70,7 @@ module DatadogAPIClient::V1
       return_type = opts[:debug_return_type] || 'SLOCorrectionResponse'
 
       # auth_names
-      auth_names = opts[:debug_auth_names] || [:apiKeyAuth, :appKeyAuth]
+      auth_names = opts[:debug_auth_names] || [:apiKeyAuth, :appKeyAuth, :AuthZ]
 
       new_options = opts.merge(
         :operation => :create_slo_correction,
@@ -264,7 +264,7 @@ module DatadogAPIClient::V1
       return_type = opts[:debug_return_type] || 'SLOCorrectionListResponse'
 
       # auth_names
-      auth_names = opts[:debug_auth_names] || [:apiKeyAuth, :appKeyAuth]
+      auth_names = opts[:debug_auth_names] || [:apiKeyAuth, :appKeyAuth, :AuthZ]
 
       new_options = opts.merge(
         :operation => :list_slo_correction,

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

@@ -70,7 +70,7 @@ module DatadogAPIClient::V1
       return_type = opts[:debug_return_type] || 'CheckCanDeleteSLOResponse'
 
       # auth_names
-      auth_names = opts[:debug_auth_names] || [:apiKeyAuth, :appKeyAuth]
+      auth_names = opts[:debug_auth_names] || [:apiKeyAuth, :appKeyAuth, :AuthZ]
 
       new_options = opts.merge(
         :operation => :check_can_delete_slo,
@@ -137,7 +137,7 @@ module DatadogAPIClient::V1
       return_type = opts[:debug_return_type] || 'SLOListResponse'
 
       # auth_names
-      auth_names = opts[:debug_auth_names] || [:apiKeyAuth, :appKeyAuth]
+      auth_names = opts[:debug_auth_names] || [:apiKeyAuth, :appKeyAuth, :AuthZ]
 
       new_options = opts.merge(
         :operation => :create_slo,
@@ -207,7 +207,7 @@ module DatadogAPIClient::V1
       return_type = opts[:debug_return_type] || 'SLODeleteResponse'
 
       # auth_names
-      auth_names = opts[:debug_auth_names] || [:apiKeyAuth, :appKeyAuth]
+      auth_names = opts[:debug_auth_names] || [:apiKeyAuth, :appKeyAuth, :AuthZ]
 
       new_options = opts.merge(
         :operation => :delete_slo,
@@ -278,7 +278,7 @@ module DatadogAPIClient::V1
       return_type = opts[:debug_return_type] || 'SLOBulkDeleteResponse'
 
       # auth_names
-      auth_names = opts[:debug_auth_names] || [:apiKeyAuth, :appKeyAuth]
+      auth_names = opts[:debug_auth_names] || [:apiKeyAuth, :appKeyAuth, :AuthZ]
 
       new_options = opts.merge(
         :operation => :delete_slo_timeframe_in_bulk,
@@ -345,7 +345,7 @@ module DatadogAPIClient::V1
       return_type = opts[:debug_return_type] || 'SLOResponse'
 
       # auth_names
-      auth_names = opts[:debug_auth_names] || [:apiKeyAuth, :appKeyAuth]
+      auth_names = opts[:debug_auth_names] || [:apiKeyAuth, :appKeyAuth, :AuthZ]
 
       new_options = opts.merge(
         :operation => :get_slo,
@@ -410,7 +410,7 @@ module DatadogAPIClient::V1
       return_type = opts[:debug_return_type] || 'SLOCorrectionListResponse'
 
       # auth_names
-      auth_names = opts[:debug_auth_names] || [:apiKeyAuth, :appKeyAuth]
+      auth_names = opts[:debug_auth_names] || [:apiKeyAuth, :appKeyAuth, :AuthZ]
 
       new_options = opts.merge(
         :operation => :get_slo_corrections,
@@ -504,7 +504,7 @@ module DatadogAPIClient::V1
       return_type = opts[:debug_return_type] || 'SLOHistoryResponse'
 
       # auth_names
-      auth_names = opts[:debug_auth_names] || [:apiKeyAuth, :appKeyAuth]
+      auth_names = opts[:debug_auth_names] || [:apiKeyAuth, :appKeyAuth, :AuthZ]
 
       new_options = opts.merge(
         :operation => :get_slo_history,
@@ -576,7 +576,7 @@ module DatadogAPIClient::V1
       return_type = opts[:debug_return_type] || 'SLOListResponse'
 
       # auth_names
-      auth_names = opts[:debug_auth_names] || [:apiKeyAuth, :appKeyAuth]
+      auth_names = opts[:debug_auth_names] || [:apiKeyAuth, :appKeyAuth, :AuthZ]
 
       new_options = opts.merge(
         :operation => :list_slos,
@@ -644,7 +644,7 @@ module DatadogAPIClient::V1
       return_type = opts[:debug_return_type] || 'SearchSLOResponse'
 
       # auth_names
-      auth_names = opts[:debug_auth_names] || [:apiKeyAuth, :appKeyAuth]
+      auth_names = opts[:debug_auth_names] || [:apiKeyAuth, :appKeyAuth, :AuthZ]
 
       new_options = opts.merge(
         :operation => :search_slo,
@@ -716,7 +716,7 @@ module DatadogAPIClient::V1
       return_type = opts[:debug_return_type] || 'SLOListResponse'
 
       # auth_names
-      auth_names = opts[:debug_auth_names] || [:apiKeyAuth, :appKeyAuth]
+      auth_names = opts[:debug_auth_names] || [:apiKeyAuth, :appKeyAuth, :AuthZ]
 
       new_options = opts.merge(
         :operation => :update_slo,

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

@@ -152,7 +152,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_fargate_usage', 'apm_host_usage', 'appsec_fargate_usage', 'appsec_usage', 'browser_usage', 'container_excl_agent_usage', 'container_usage', 'cspm_containers_usage', 'cspm_hosts_usage', 'custom_ingested_timeseries_usage', 'custom_timeseries_usage', 'cws_containers_usage', 'cws_hosts_usage', 'dbm_hosts_usage', 'dbm_queries_usage', 'estimated_indexed_logs_usage', 'estimated_ingested_logs_usage', 'estimated_indexed_spans_usage', 'estimated_ingested_spans_usage', 'fargate_usage', 'functions_usage', 'infra_host_usage', 'invocations_usage', 'npm_host_usage', 'obs_pipeline_bytes_usage', 'profiled_container_usage', 'profiled_fargate_usage', 'profiled_host_usage', 'snmp_usage', 'estimated_rum_sessions_usage', 'universal_service_monitoring_usage', 'vuln_management_hosts_usage']
+      allowable_values = ['api_usage', 'apm_fargate_usage', 'apm_host_usage', 'apm_usm_usage', 'appsec_fargate_usage', 'appsec_usage', 'browser_usage', 'container_excl_agent_usage', 'ci_visibility_itr_usage', 'container_usage', 'cspm_containers_usage', 'cspm_hosts_usage', 'custom_ingested_timeseries_usage', 'custom_timeseries_usage', 'cws_containers_usage', 'cws_hosts_usage', 'dbm_hosts_usage', 'dbm_queries_usage', 'estimated_indexed_logs_usage', 'estimated_ingested_logs_usage', 'estimated_indexed_spans_usage', 'estimated_ingested_spans_usage', 'fargate_usage', 'functions_usage', 'infra_host_usage', 'invocations_usage', 'npm_host_usage', 'obs_pipeline_bytes_usage', 'profiled_container_usage', 'profiled_fargate_usage', 'profiled_host_usage', 'snmp_usage', 'estimated_rum_sessions_usage', 'universal_service_monitoring_usage', 'vuln_management_hosts_usage', 'sds_scanned_bytes_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
@@ -472,7 +472,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_fargate_usage', 'apm_fargate_percentage', 'appsec_fargate_usage', 'appsec_fargate_percentage', 'apm_host_usage', 'apm_host_percentage', 'appsec_usage', 'appsec_percentage', 'browser_usage', 'browser_percentage', 'container_excl_agent_usage', 'container_excl_agent_percentage', 'container_usage', 'container_percentage', 'cspm_containers_percentage', 'cspm_containers_usage', 'cspm_hosts_percentage', 'cspm_hosts_usage', 'custom_timeseries_usage', 'custom_timeseries_percentage', 'custom_ingested_timeseries_usage', 'custom_ingested_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_ingested_logs_usage', 'estimated_ingested_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', 'infra_host_usage', 'infra_host_percentage', 'invocations_usage', 'invocations_percentage', 'npm_host_usage', 'npm_host_percentage', 'obs_pipeline_bytes_usage', 'obs_pipeline_bytes_percentage', 'profiled_container_usage', 'profiled_container_percentage', 'profiled_fargate_usage', 'profiled_fargate_percentage', 'profiled_host_usage', 'profiled_host_percentage', 'snmp_usage', 'snmp_percentage', 'estimated_rum_sessions_usage', 'estimated_rum_sessions_percentage', 'universal_service_monitoring_usage', 'universal_service_monitoring_percentage', 'vuln_management_hosts_usage', 'vuln_management_hosts_percentage', '*']
+      allowable_values = ['api_usage', 'api_percentage', 'apm_fargate_usage', 'apm_fargate_percentage', 'appsec_fargate_usage', 'appsec_fargate_percentage', 'apm_host_usage', 'apm_host_percentage', 'apm_usm_usage', 'apm_usm_percentage', 'appsec_usage', 'appsec_percentage', 'browser_usage', 'browser_percentage', 'ci_visibility_itr_usage', 'ci_visibility_itr_percentage', 'container_excl_agent_usage', 'container_excl_agent_percentage', 'container_usage', 'container_percentage', 'cspm_containers_percentage', 'cspm_containers_usage', 'cspm_hosts_percentage', 'cspm_hosts_usage', 'custom_timeseries_usage', 'custom_timeseries_percentage', 'custom_ingested_timeseries_usage', 'custom_ingested_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_ingested_logs_usage', 'estimated_ingested_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', 'infra_host_usage', 'infra_host_percentage', 'invocations_usage', 'invocations_percentage', 'npm_host_usage', 'npm_host_percentage', 'obs_pipeline_bytes_usage', 'obs_pipeline_bytes_percentage', 'profiled_container_usage', 'profiled_container_percentage', 'profiled_fargate_usage', 'profiled_fargate_percentage', 'profiled_host_usage', 'profiled_host_percentage', 'snmp_usage', 'snmp_percentage', 'estimated_rum_sessions_usage', 'estimated_rum_sessions_percentage', 'universal_service_monitoring_usage', 'universal_service_monitoring_percentage', 'vuln_management_hosts_usage', 'vuln_management_hosts_percentage', 'sds_scanned_bytes_usage', 'sds_scanned_bytes_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
@@ -480,7 +480,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_fargate_usage', 'apm_fargate_percentage', 'appsec_fargate_usage', 'appsec_fargate_percentage', 'apm_host_usage', 'apm_host_percentage', 'appsec_usage', 'appsec_percentage', 'browser_usage', 'browser_percentage', 'container_excl_agent_usage', 'container_excl_agent_percentage', 'container_usage', 'container_percentage', 'cspm_containers_percentage', 'cspm_containers_usage', 'cspm_hosts_percentage', 'cspm_hosts_usage', 'custom_timeseries_usage', 'custom_timeseries_percentage', 'custom_ingested_timeseries_usage', 'custom_ingested_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_ingested_logs_usage', 'estimated_ingested_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', 'infra_host_usage', 'infra_host_percentage', 'invocations_usage', 'invocations_percentage', 'npm_host_usage', 'npm_host_percentage', 'obs_pipeline_bytes_usage', 'obs_pipeline_bytes_percentage', 'profiled_container_usage', 'profiled_container_percentage', 'profiled_fargate_usage', 'profiled_fargate_percentage', 'profiled_host_usage', 'profiled_host_percentage', 'snmp_usage', 'snmp_percentage', 'estimated_rum_sessions_usage', 'estimated_rum_sessions_percentage', 'universal_service_monitoring_usage', 'universal_service_monitoring_percentage', 'vuln_management_hosts_usage', 'vuln_management_hosts_percentage', '*']
+      allowable_values = ['api_usage', 'api_percentage', 'apm_fargate_usage', 'apm_fargate_percentage', 'appsec_fargate_usage', 'appsec_fargate_percentage', 'apm_host_usage', 'apm_host_percentage', 'apm_usm_usage', 'apm_usm_percentage', 'appsec_usage', 'appsec_percentage', 'browser_usage', 'browser_percentage', 'ci_visibility_itr_usage', 'ci_visibility_itr_percentage', 'container_excl_agent_usage', 'container_excl_agent_percentage', 'container_usage', 'container_percentage', 'cspm_containers_percentage', 'cspm_containers_usage', 'cspm_hosts_percentage', 'cspm_hosts_usage', 'custom_timeseries_usage', 'custom_timeseries_percentage', 'custom_ingested_timeseries_usage', 'custom_ingested_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_ingested_logs_usage', 'estimated_ingested_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', 'infra_host_usage', 'infra_host_percentage', 'invocations_usage', 'invocations_percentage', 'npm_host_usage', 'npm_host_percentage', 'obs_pipeline_bytes_usage', 'obs_pipeline_bytes_percentage', 'profiled_container_usage', 'profiled_container_percentage', 'profiled_fargate_usage', 'profiled_fargate_percentage', 'profiled_host_usage', 'profiled_host_percentage', 'snmp_usage', 'snmp_percentage', 'estimated_rum_sessions_usage', 'estimated_rum_sessions_percentage', 'universal_service_monitoring_usage', 'universal_service_monitoring_percentage', 'vuln_management_hosts_usage', 'vuln_management_hosts_percentage', 'sds_scanned_bytes_usage', 'sds_scanned_bytes_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

data/lib/datadog_api_client/v1/models/azure_account.rb

@@ -21,6 +21,10 @@ module DatadogAPIClient::V1
   class AzureAccount
     include BaseGenericModel
 
+    # Limit the Azure app service plans that are pulled into Datadog using tags.
+    # Only app service plans that match one of the defined tags are imported into Datadog.
+    attr_accessor :app_service_plan_filters
+
     # Silence monitors for expected Azure VM shutdowns.
     attr_accessor :automute
 
@@ -30,6 +34,12 @@ module DatadogAPIClient::V1
     # Your Azure web application secret key.
     attr_accessor :client_secret
 
+    # Enable Cloud Security Management Misconfigurations for your organization.
+    attr_accessor :cspm_enabled
+
+    # Enable custom metrics for your organization.
+    attr_accessor :custom_metrics_enabled
+
     # Errors in your configuration.
     attr_accessor :errors
 
@@ -50,9 +60,12 @@ module DatadogAPIClient::V1
     # @!visibility private
     def self.attribute_map
       {
+        :'app_service_plan_filters' => :'app_service_plan_filters',
         :'automute' => :'automute',
         :'client_id' => :'client_id',
         :'client_secret' => :'client_secret',
+        :'cspm_enabled' => :'cspm_enabled',
+        :'custom_metrics_enabled' => :'custom_metrics_enabled',
         :'errors' => :'errors',
         :'host_filters' => :'host_filters',
         :'new_client_id' => :'new_client_id',
@@ -65,9 +78,12 @@ module DatadogAPIClient::V1
     # @!visibility private
     def self.openapi_types
       {
+        :'app_service_plan_filters' => :'String',
         :'automute' => :'Boolean',
         :'client_id' => :'String',
         :'client_secret' => :'String',
+        :'cspm_enabled' => :'Boolean',
+        :'custom_metrics_enabled' => :'Boolean',
         :'errors' => :'Array<String>',
         :'host_filters' => :'String',
         :'new_client_id' => :'String',
@@ -92,6 +108,10 @@ module DatadogAPIClient::V1
         h[k.to_sym] = v
       }
 
+      if attributes.key?(:'app_service_plan_filters')
+        self.app_service_plan_filters = attributes[:'app_service_plan_filters']
+      end
+
       if attributes.key?(:'automute')
         self.automute = attributes[:'automute']
       end
@@ -104,6 +124,14 @@ module DatadogAPIClient::V1
         self.client_secret = attributes[:'client_secret']
       end
 
+      if attributes.key?(:'cspm_enabled')
+        self.cspm_enabled = attributes[:'cspm_enabled']
+      end
+
+      if attributes.key?(:'custom_metrics_enabled')
+        self.custom_metrics_enabled = attributes[:'custom_metrics_enabled']
+      end
+
       if attributes.key?(:'errors')
         if (value = attributes[:'errors']).is_a?(Array)
           self.errors = value
@@ -133,9 +161,12 @@ module DatadogAPIClient::V1
     def ==(o)
       return true if self.equal?(o)
       self.class == o.class &&
+          app_service_plan_filters == o.app_service_plan_filters &&
           automute == o.automute &&
           client_id == o.client_id &&
           client_secret == o.client_secret &&
+          cspm_enabled == o.cspm_enabled &&
+          custom_metrics_enabled == o.custom_metrics_enabled &&
           errors == o.errors &&
           host_filters == o.host_filters &&
           new_client_id == o.new_client_id &&
@@ -147,7 +178,7 @@ module DatadogAPIClient::V1
     # @return [Integer] Hash code
     # @!visibility private
     def hash
-      [automute, client_id, client_secret, errors, host_filters, new_client_id, new_tenant_name, tenant_name].hash
+      [app_service_plan_filters, automute, client_id, client_secret, cspm_enabled, custom_metrics_enabled, errors, host_filters, new_client_id, new_tenant_name, tenant_name].hash
     end
   end
 end

data/lib/datadog_api_client/v1/models/distribution_widget_definition.rb

@@ -23,6 +23,9 @@ module DatadogAPIClient::V1
   class DistributionWidgetDefinition
     include BaseGenericModel
 
+    # A list of custom links.
+    attr_accessor :custom_links
+
     # (Deprecated) The widget legend was replaced by a tooltip and sidebar.
     attr_accessor :legend_size
 
@@ -63,6 +66,7 @@ module DatadogAPIClient::V1
     # @!visibility private
     def self.attribute_map
       {
+        :'custom_links' => :'custom_links',
         :'legend_size' => :'legend_size',
         :'markers' => :'markers',
         :'requests' => :'requests',
@@ -81,6 +85,7 @@ module DatadogAPIClient::V1
     # @!visibility private
     def self.openapi_types
       {
+        :'custom_links' => :'Array<WidgetCustomLink>',
         :'legend_size' => :'String',
         :'markers' => :'Array<WidgetMarker>',
         :'requests' => :'Array<DistributionWidgetRequest>',
@@ -111,6 +116,12 @@ module DatadogAPIClient::V1
         h[k.to_sym] = v
       }
 
+      if attributes.key?(:'custom_links')
+        if (value = attributes[:'custom_links']).is_a?(Array)
+          self.custom_links = value
+        end
+      end
+
       if attributes.key?(:'legend_size')
         self.legend_size = attributes[:'legend_size']
       end
@@ -203,6 +214,7 @@ module DatadogAPIClient::V1
     def ==(o)
       return true if self.equal?(o)
       self.class == o.class &&
+          custom_links == o.custom_links &&
           legend_size == o.legend_size &&
           markers == o.markers &&
           requests == o.requests &&
@@ -220,7 +232,7 @@ module DatadogAPIClient::V1
     # @return [Integer] Hash code
     # @!visibility private
     def hash
-      [legend_size, markers, requests, show_legend, time, title, title_align, title_size, type, xaxis, yaxis].hash
+      [custom_links, legend_size, markers, requests, show_legend, time, title, title_align, title_size, type, xaxis, yaxis].hash
     end
   end
 end

data/lib/datadog_api_client/v1/models/hourly_usage_attribution_usage_type.rb

@@ -24,10 +24,12 @@ module DatadogAPIClient::V1
     API_USAGE = "api_usage".freeze
     APM_FARGATE_USAGE = "apm_fargate_usage".freeze
     APM_HOST_USAGE = "apm_host_usage".freeze
+    APM_USM_USAGE = "apm_usm_usage".freeze
     APPSEC_FARGATE_USAGE = "appsec_fargate_usage".freeze
     APPSEC_USAGE = "appsec_usage".freeze
     BROWSER_USAGE = "browser_usage".freeze
     CONTAINER_EXCL_AGENT_USAGE = "container_excl_agent_usage".freeze
+    CI_VISIBILITY_ITR_USAGE = "ci_visibility_itr_usage".freeze
     CONTAINER_USAGE = "container_usage".freeze
     CSPM_CONTAINERS_USAGE = "cspm_containers_usage".freeze
     CSPM_HOSTS_USAGE = "cspm_hosts_usage".freeze
@@ -54,5 +56,6 @@ module DatadogAPIClient::V1
     ESTIMATED_RUM_SESSIONS_USAGE = "estimated_rum_sessions_usage".freeze
     UNIVERSAL_SERVICE_MONITORING_USAGE = "universal_service_monitoring_usage".freeze
     VULN_MANAGEMENT_HOSTS_USAGE = "vuln_management_hosts_usage".freeze
+    SDS_SCANNED_BYTES_USAGE = "sds_scanned_bytes_usage".freeze
   end
 end

data/lib/datadog_api_client/v1/models/monthly_usage_attribution_supported_metrics.rb

@@ -29,10 +29,14 @@ module DatadogAPIClient::V1
     APPSEC_FARGATE_PERCENTAGE = "appsec_fargate_percentage".freeze
     APM_HOST_USAGE = "apm_host_usage".freeze
     APM_HOST_PERCENTAGE = "apm_host_percentage".freeze
+    APM_USM_USAGE = "apm_usm_usage".freeze
+    APM_USM_PERCENTAGE = "apm_usm_percentage".freeze
     APPSEC_USAGE = "appsec_usage".freeze
     APPSEC_PERCENTAGE = "appsec_percentage".freeze
     BROWSER_USAGE = "browser_usage".freeze
     BROWSER_PERCENTAGE = "browser_percentage".freeze
+    CI_VISIBILITY_ITR_USAGE = "ci_visibility_itr_usage".freeze
+    CI_VISIBILITY_ITR_PERCENTAGE = "ci_visibility_itr_percentage".freeze
     CONTAINER_EXCL_AGENT_USAGE = "container_excl_agent_usage".freeze
     CONTAINER_EXCL_AGENT_PERCENTAGE = "container_excl_agent_percentage".freeze
     CONTAINER_USAGE = "container_usage".freeze
@@ -87,6 +91,8 @@ module DatadogAPIClient::V1
     UNIVERSAL_SERVICE_MONITORING_PERCENTAGE = "universal_service_monitoring_percentage".freeze
     VULN_MANAGEMENT_HOSTS_USAGE = "vuln_management_hosts_usage".freeze
     VULN_MANAGEMENT_HOSTS_PERCENTAGE = "vuln_management_hosts_percentage".freeze
+    SDS_SCANNED_BYTES_USAGE = "sds_scanned_bytes_usage".freeze
+    SDS_SCANNED_BYTES_PERCENTAGE = "sds_scanned_bytes_percentage".freeze
     ALL = "*".freeze
   end
 end