datadog_api_client 1.9.0 → 2.0.0

data/examples/v2/logs-archives/UpdateLogsArchive.rb

@@ -18,6 +18,7 @@ body = DatadogAPIClient::V2::LogsArchiveCreateRequest.new({
       include_tags: false,
       name: "Nginx Archive",
       query: "source:nginx",
+      rehydration_max_scan_size_in_gb: 100,
       rehydration_tags: [
         "team:intake",
         "team:app",

data/examples/v2/metrics/CreateTagConfiguration.rb

@@ -1,9 +1,6 @@
 # Create a tag configuration returns "Created" response
 
 require "datadog_api_client"
-DatadogAPIClient::V2.configure do |config|
-  config.unstable_operations[:create_tag_configuration] = true
-end
 api_instance = DatadogAPIClient::V2::MetricsAPI.new
 
 body = DatadogAPIClient::V2::MetricTagConfigurationCreateRequest.new({

data/examples/v2/metrics/DeleteTagConfiguration.rb

@@ -1,8 +1,5 @@
 # Delete a tag configuration returns "No Content" response
 
 require "datadog_api_client"
-DatadogAPIClient::V2.configure do |config|
-  config.unstable_operations[:delete_tag_configuration] = true
-end
 api_instance = DatadogAPIClient::V2::MetricsAPI.new
 api_instance.delete_tag_configuration("ExampleDeleteatagconfigurationreturnsNoContentresponse")

data/examples/v2/metrics/EstimateMetricsOutputSeries.rb

@@ -0,0 +1,9 @@
+# Tag Configuration Cardinality Estimator returns "Success" response
+
+require "datadog_api_client"
+api_instance = DatadogAPIClient::V2::MetricsAPI.new
+opts = {
+  filter_groups: "app,host",
+  filter_num_aggregations: 4,
+}
+p api_instance.estimate_metrics_output_series("system.cpu.idle", opts)

data/examples/v2/metrics/ListTagConfigurationByName.rb

@@ -1,9 +1,6 @@
 # List tag configuration by name returns "Success" response
 
 require "datadog_api_client"
-DatadogAPIClient::V2.configure do |config|
-  config.unstable_operations[:list_tag_configuration_by_name] = true
-end
 api_instance = DatadogAPIClient::V2::MetricsAPI.new
 
 # there is a valid "metric_tag_configuration" in the system

data/examples/v2/metrics/ListTagConfigurations.rb

@@ -1,8 +1,5 @@
 # List tag configurations returns "Success" response
 
 require "datadog_api_client"
-DatadogAPIClient::V2.configure do |config|
-  config.unstable_operations[:list_tag_configurations] = true
-end
 api_instance = DatadogAPIClient::V2::MetricsAPI.new
 p api_instance.list_tag_configurations()

data/examples/v2/metrics/ListTagConfigurations_103226315.rb

@@ -1,9 +1,6 @@
 # List tag configurations with configured filter returns "Success" response
 
 require "datadog_api_client"
-DatadogAPIClient::V2.configure do |config|
-  config.unstable_operations[:list_tag_configurations] = true
-end
 api_instance = DatadogAPIClient::V2::MetricsAPI.new
 opts = {
   filter_configured: true,

data/examples/v2/metrics/ListTagConfigurations_1799362914.rb

@@ -1,9 +1,6 @@
 # List tag configurations with a tag filter returns "Success" response
 
 require "datadog_api_client"
-DatadogAPIClient::V2.configure do |config|
-  config.unstable_operations[:list_tag_configurations] = true
-end
 api_instance = DatadogAPIClient::V2::MetricsAPI.new
 opts = {
   filter_tags: "ExampleListtagconfigurationswithatagfilterreturnsSuccessresponse",

data/examples/v2/metrics/SubmitMetrics.rb

@@ -0,0 +1,26 @@
+# Submit metrics returns "Payload accepted" response
+
+require "datadog_api_client"
+api_instance = DatadogAPIClient::V2::MetricsAPI.new
+
+body = DatadogAPIClient::V2::MetricPayload.new({
+  series: [
+    DatadogAPIClient::V2::MetricSeries.new({
+      metric: "system.load.1",
+      type: DatadogAPIClient::V2::MetricIntakeType::UNSPECIFIED,
+      points: [
+        DatadogAPIClient::V2::MetricPoint.new({
+          timestamp: Time.now.to_i,
+          value: 0.7,
+        }),
+      ],
+      resources: [
+        DatadogAPIClient::V2::MetricResource.new({
+          name: "dummyhost",
+          type: "host",
+        }),
+      ],
+    }),
+  ],
+})
+p api_instance.submit_metrics(body)

data/examples/v2/metrics/UpdateTagConfiguration.rb

@@ -1,9 +1,6 @@
 # Update a tag configuration returns "OK" response
 
 require "datadog_api_client"
-DatadogAPIClient::V2.configure do |config|
-  config.unstable_operations[:update_tag_configuration] = true
-end
 api_instance = DatadogAPIClient::V2::MetricsAPI.new
 
 # there is a valid "metric_tag_configuration" in the system

data/examples/v2/opsgenie-integration/CreateOpsgenieService.rb

@@ -0,0 +1,16 @@
+# Create a new service object returns "CREATED" response
+
+require "datadog_api_client"
+api_instance = DatadogAPIClient::V2::OpsgenieIntegrationAPI.new
+
+body = DatadogAPIClient::V2::OpsgenieServiceCreateRequest.new({
+  data: DatadogAPIClient::V2::OpsgenieServiceCreateData.new({
+    attributes: DatadogAPIClient::V2::OpsgenieServiceCreateAttributes.new({
+      name: "Example-Create_a_new_service_object_returns_CREATED_response",
+      opsgenie_api_key: "00000000-0000-0000-0000-000000000000",
+      region: DatadogAPIClient::V2::OpsgenieServiceRegionType::US,
+    }),
+    type: DatadogAPIClient::V2::OpsgenieServiceType::OPSGENIE_SERVICE,
+  }),
+})
+p api_instance.create_opsgenie_service(body)

data/examples/v2/opsgenie-integration/DeleteOpsgenieService.rb

@@ -0,0 +1,8 @@
+# Delete a single service object returns "OK" response
+
+require "datadog_api_client"
+api_instance = DatadogAPIClient::V2::OpsgenieIntegrationAPI.new
+
+# there is a valid "opsgenie_service" in the system
+OPSGENIE_SERVICE_DATA_ID = ENV["OPSGENIE_SERVICE_DATA_ID"]
+api_instance.delete_opsgenie_service(OPSGENIE_SERVICE_DATA_ID)

data/examples/v2/opsgenie-integration/GetOpsgenieService.rb

@@ -0,0 +1,8 @@
+# Get a single service object returns "OK" response
+
+require "datadog_api_client"
+api_instance = DatadogAPIClient::V2::OpsgenieIntegrationAPI.new
+
+# there is a valid "opsgenie_service" in the system
+OPSGENIE_SERVICE_DATA_ID = ENV["OPSGENIE_SERVICE_DATA_ID"]
+p api_instance.get_opsgenie_service(OPSGENIE_SERVICE_DATA_ID)

data/examples/v2/opsgenie-integration/ListOpsgenieServices.rb

@@ -0,0 +1,5 @@
+# Get all service objects returns "OK" response
+
+require "datadog_api_client"
+api_instance = DatadogAPIClient::V2::OpsgenieIntegrationAPI.new
+p api_instance.list_opsgenie_services()

data/examples/v2/opsgenie-integration/UpdateOpsgenieService.rb

@@ -0,0 +1,21 @@
+# Update a single service object returns "OK" response
+
+require "datadog_api_client"
+api_instance = DatadogAPIClient::V2::OpsgenieIntegrationAPI.new
+
+# there is a valid "opsgenie_service" in the system
+OPSGENIE_SERVICE_DATA_ATTRIBUTES_NAME = ENV["OPSGENIE_SERVICE_DATA_ATTRIBUTES_NAME"]
+OPSGENIE_SERVICE_DATA_ID = ENV["OPSGENIE_SERVICE_DATA_ID"]
+
+body = DatadogAPIClient::V2::OpsgenieServiceUpdateRequest.new({
+  data: DatadogAPIClient::V2::OpsgenieServiceUpdateData.new({
+    attributes: DatadogAPIClient::V2::OpsgenieServiceUpdateAttributes.new({
+      name: "fake-opsgenie-service-name--updated",
+      opsgenie_api_key: "00000000-0000-0000-0000-000000000000",
+      region: DatadogAPIClient::V2::OpsgenieServiceRegionType::EU,
+    }),
+    id: OPSGENIE_SERVICE_DATA_ID,
+    type: DatadogAPIClient::V2::OpsgenieServiceType::OPSGENIE_SERVICE,
+  }),
+})
+p api_instance.update_opsgenie_service(OPSGENIE_SERVICE_DATA_ID, body)

data/examples/v2/security-monitoring/EditSecurityMonitoringSignalAssignee.rb

@@ -0,0 +1,15 @@
+# Modify the triage assignee of a security signal returns "OK" response
+
+require "datadog_api_client"
+api_instance = DatadogAPIClient::V2::SecurityMonitoringAPI.new
+
+body = DatadogAPIClient::V2::SecurityMonitoringSignalAssigneeUpdateRequest.new({
+  data: DatadogAPIClient::V2::SecurityMonitoringSignalAssigneeUpdateData.new({
+    attributes: DatadogAPIClient::V2::SecurityMonitoringSignalAssigneeUpdateAttributes.new({
+      assignee: DatadogAPIClient::V2::SecurityMonitoringTriageUser.new({
+        uuid: "",
+      }),
+    }),
+  }),
+})
+p api_instance.edit_security_monitoring_signal_assignee("AQAAAYG1bl5K4HuUewAAAABBWUcxYmw1S0FBQmt2RmhRN0V4ZUVnQUE", body)

data/examples/v2/security-monitoring/EditSecurityMonitoringSignalIncidents.rb

@@ -0,0 +1,15 @@
+# Change the related incidents of a security signal returns "OK" response
+
+require "datadog_api_client"
+api_instance = DatadogAPIClient::V2::SecurityMonitoringAPI.new
+
+body = DatadogAPIClient::V2::SecurityMonitoringSignalIncidentsUpdateRequest.new({
+  data: DatadogAPIClient::V2::SecurityMonitoringSignalIncidentsUpdateData.new({
+    attributes: DatadogAPIClient::V2::SecurityMonitoringSignalIncidentsUpdateAttributes.new({
+      incident_ids: [
+        2066,
+      ],
+    }),
+  }),
+})
+p api_instance.edit_security_monitoring_signal_incidents("AQAAAYG1bl5K4HuUewAAAABBWUcxYmw1S0FBQmt2RmhRN0V4ZUVnQUE", body)

data/examples/v2/security-monitoring/EditSecurityMonitoringSignalState.rb

@@ -0,0 +1,14 @@
+# Change the triage state of a security signal returns "OK" response
+
+require "datadog_api_client"
+api_instance = DatadogAPIClient::V2::SecurityMonitoringAPI.new
+
+body = DatadogAPIClient::V2::SecurityMonitoringSignalStateUpdateRequest.new({
+  data: DatadogAPIClient::V2::SecurityMonitoringSignalStateUpdateData.new({
+    attributes: DatadogAPIClient::V2::SecurityMonitoringSignalStateUpdateAttributes.new({
+      archive_reason: DatadogAPIClient::V2::SecurityMonitoringSignalArchiveReason::NONE,
+      state: DatadogAPIClient::V2::SecurityMonitoringSignalState::OPEN,
+    }),
+  }),
+})
+p api_instance.edit_security_monitoring_signal_state("AQAAAYG1bl5K4HuUewAAAABBWUcxYmw1S0FBQmt2RmhRN0V4ZUVnQUE", body)

data/examples/v2/security-monitoring/ListSecurityMonitoringSignals.rb

@@ -1,8 +1,5 @@
 # Get a quick list of security signals returns "OK" response
 
 require "datadog_api_client"
-DatadogAPIClient::V2.configure do |config|
-  config.unstable_operations[:list_security_monitoring_signals] = true
-end
 api_instance = DatadogAPIClient::V2::SecurityMonitoringAPI.new
 p api_instance.list_security_monitoring_signals()

data/examples/v2/security-monitoring/SearchSecurityMonitoringSignals.rb

@@ -1,9 +1,6 @@
 # Get a list of security signals returns "OK" response
 
 require "datadog_api_client"
-DatadogAPIClient::V2.configure do |config|
-  config.unstable_operations[:search_security_monitoring_signals] = true
-end
 api_instance = DatadogAPIClient::V2::SecurityMonitoringAPI.new
 
 body = DatadogAPIClient::V2::SecurityMonitoringSignalListRequest.new({

data/examples/v2/security-monitoring/UpdateSecurityMonitoringRule.rb

@@ -17,8 +17,10 @@ body = DatadogAPIClient::V2::SecurityMonitoringRuleUpdatePayload.new({
   ],
   has_extended_title: true,
   options: DatadogAPIClient::V2::SecurityMonitoringRuleOptions.new({
+    decrease_criticality_based_on_env: false,
     detection_method: DatadogAPIClient::V2::SecurityMonitoringRuleDetectionMethod::THRESHOLD,
     evaluation_window: DatadogAPIClient::V2::SecurityMonitoringRuleEvaluationWindow::ZERO_MINUTES,
+    hardcoded_evaluator_type: DatadogAPIClient::V2::SecurityMonitoringRuleHardcodedEvaluatorType::LOG4SHELL,
     impossible_travel_options: DatadogAPIClient::V2::SecurityMonitoringRuleImpossibleTravelOptions.new({
       baseline_user_locations: true,
     }),
@@ -27,6 +29,8 @@ body = DatadogAPIClient::V2::SecurityMonitoringRuleUpdatePayload.new({
     new_value_options: DatadogAPIClient::V2::SecurityMonitoringRuleNewValueOptions.new({
       forget_after: DatadogAPIClient::V2::SecurityMonitoringRuleNewValueOptionsForgetAfter::ONE_DAY,
       learning_duration: DatadogAPIClient::V2::SecurityMonitoringRuleNewValueOptionsLearningDuration::ZERO_DAYS,
+      learning_method: DatadogAPIClient::V2::SecurityMonitoringRuleNewValueOptionsLearningMethod::DURATION,
+      learning_threshold: DatadogAPIClient::V2::SecurityMonitoringRuleNewValueOptionsLearningThreshold::ZERO_OCCURRENCES,
     }),
   }),
   queries: [
@@ -34,6 +38,7 @@ body = DatadogAPIClient::V2::SecurityMonitoringRuleUpdatePayload.new({
       aggregation: DatadogAPIClient::V2::SecurityMonitoringRuleQueryAggregation::COUNT,
       distinct_fields: [],
       group_by_fields: [],
+      metrics: [],
     }),
   ],
   tags: [],

data/examples/v2/usage-metering/GetCostByOrg.rb

@@ -0,0 +1,5 @@
+# Get cost across multi-org account returns "OK" response
+
+require "datadog_api_client"
+api_instance = DatadogAPIClient::V2::UsageMeteringAPI.new
+p api_instance.get_cost_by_org((Time.now + -3 * 86400))

data/examples/v2/usage-metering/GetEstimatedCostByOrg.rb

@@ -0,0 +1,8 @@
+# Get estimated cost across your account returns "OK" response
+
+require "datadog_api_client"
+DatadogAPIClient::V2.configure do |config|
+  config.unstable_operations["v2.get_estimated_cost_by_org".to_sym] = true
+end
+api_instance = DatadogAPIClient::V2::UsageMeteringAPI.new
+p api_instance.get_estimated_cost_by_org("view")

data/examples/v2/usage-metering/GetEstimatedCostByOrg_2734954020.rb

@@ -0,0 +1,11 @@
+# GetEstimatedCostByOrg with start_date returns "OK" response
+
+require "datadog_api_client"
+DatadogAPIClient::V2.configure do |config|
+  config.unstable_operations["v2.get_estimated_cost_by_org".to_sym] = true
+end
+api_instance = DatadogAPIClient::V2::UsageMeteringAPI.new
+opts = {
+  start_date: (Time.now + -5 * 86400),
+}
+p api_instance.get_estimated_cost_by_org("sub-org", opts)

data/examples/v2/usage-metering/GetEstimatedCostByOrg_3186693804.rb

@@ -0,0 +1,11 @@
+# GetEstimatedCostByOrg with start_month returns "OK" response
+
+require "datadog_api_client"
+DatadogAPIClient::V2.configure do |config|
+  config.unstable_operations["v2.get_estimated_cost_by_org".to_sym] = true
+end
+api_instance = DatadogAPIClient::V2::UsageMeteringAPI.new
+opts = {
+  start_month: (Time.now + -5 * 86400),
+}
+p api_instance.get_estimated_cost_by_org("sub-org", opts)

data/examples/v2/usage-metering/GetUsageApplicationSecurityMonitoring.rb

@@ -0,0 +1,5 @@
+# Get hourly usage for application security returns "OK" response
+
+require "datadog_api_client"
+api_instance = DatadogAPIClient::V2::UsageMeteringAPI.new
+p api_instance.get_usage_application_security_monitoring("2021-11-11T11:11:11.111+00:00")

data/examples/v2/usage-metering/GetUsageApplicationSecurityMonitoring_3959166796.rb

@@ -0,0 +1,8 @@
+# Get hourly usage for Application Security returns "OK" response
+
+require "datadog_api_client"
+api_instance = DatadogAPIClient::V2::UsageMeteringAPI.new
+opts = {
+  end_hr: (Time.now + -3 * 86400),
+}
+p api_instance.get_usage_application_security_monitoring((Time.now + -5 * 86400), opts)

data/examples/v2/usage-metering/GetUsageLambdaTracedInvocations.rb

@@ -0,0 +1,5 @@
+# Get hourly usage for lambda traced invocations returns "OK" response
+
+require "datadog_api_client"
+api_instance = DatadogAPIClient::V2::UsageMeteringAPI.new
+p api_instance.get_usage_lambda_traced_invocations("2021-11-11T11:11:11.111+00:00")

data/examples/v2/usage-metering/GetUsageLambdaTracedInvocations_1436752065.rb

@@ -0,0 +1,8 @@
+# Get hourly usage for Lambda Traced Invocations returns "OK" response
+
+require "datadog_api_client"
+api_instance = DatadogAPIClient::V2::UsageMeteringAPI.new
+opts = {
+  end_hr: (Time.now + -3 * 86400),
+}
+p api_instance.get_usage_lambda_traced_invocations((Time.now + -5 * 86400), opts)

data/examples/v2/usage-metering/GetUsageObservabilityPipelines.rb

@@ -1,8 +1,5 @@
-# Get hourly usage for Observability Pipelines returns "OK" response
+# Get hourly usage for observability pipelines returns "OK" response
 
 require "datadog_api_client"
 api_instance = DatadogAPIClient::V2::UsageMeteringAPI.new
-opts = {
-  end_hr: (Time.now + -3 * 86400),
-}
-p api_instance.get_usage_observability_pipelines((Time.now + -5 * 86400), opts)
+p api_instance.get_usage_observability_pipelines("2021-11-11T11:11:11.111+00:00")

data/examples/v2/usage-metering/GetUsageObservabilityPipelines_970725512.rb

@@ -0,0 +1,8 @@
+# Get hourly usage for Observability Pipelines returns "OK" response
+
+require "datadog_api_client"
+api_instance = DatadogAPIClient::V2::UsageMeteringAPI.new
+opts = {
+  end_hr: (Time.now + -3 * 86400),
+}
+p api_instance.get_usage_observability_pipelines((Time.now + -5 * 86400), opts)

data/lib/datadog_api_client/{v2/api_client.rb → api_client.rb}

@@ -19,8 +19,12 @@ require 'logger'
 require 'tempfile'
 require 'time'
 require 'httparty'
+begin
+  require 'zstandard'
+rescue LoadError
+end
 
-module DatadogAPIClient::V2
+module DatadogAPIClient
   class APIClient
     # The Configuration object holding settings to be used in the API client.
     attr_accessor :config
@@ -36,7 +40,6 @@ module DatadogAPIClient::V2
       @config = config
       @user_agent = "#{DatadogAPIClient::USER_AGENT}"
       @default_headers = {
-        'Content-Type' => 'application/json',
         'User-Agent' => @user_agent
       }
       @default_headers['Accept-Encoding'] = 'gzip' if @config.compress
@@ -112,7 +115,7 @@ module DatadogAPIClient::V2
       end
 
       if opts[:return_type]
-        data = deserialize(response, opts[:return_type])
+        data = deserialize(opts[:api_version], response, opts[:return_type])
       else
         data = nil
       end
@@ -199,6 +202,8 @@ module DatadogAPIClient::V2
         gzip.close
       elsif header_params['Content-Encoding'] == 'deflate'
         data = Zlib::deflate(data)
+      elsif header_params['Content-Encoding'] == 'zstd1'
+        data = Zstandard.deflate(data)
       end
       data
     end
@@ -217,9 +222,10 @@ module DatadogAPIClient::V2
 
     # Deserialize the response to the given return type.
     #
+    # @param [String] the api version
     # @param [Response] response HTTP response
     # @param [String] return_type some examples: "User", "Array<User>", "Hash<String, Integer>"
-    def deserialize(response, return_type)
+    def deserialize(api_version, response, return_type)
       body = response.body
 
       # handle file downloading - return the File instance processed in request callbacks
@@ -252,14 +258,14 @@ module DatadogAPIClient::V2
         end
       end
 
-      convert_to_type data, return_type
+      convert_to_type data, return_type, api_version
     end
 
     # Convert data to the given return type.
     # @param [Object] data Data to be converted
     # @param [String] return_type Return type
     # @return [Mixed] Data in a particular type
-    def convert_to_type(data, return_type)
+    def convert_to_type(data, return_type, api_version)
       return nil if data.nil?
       case return_type
       when 'String'
@@ -282,16 +288,16 @@ module DatadogAPIClient::V2
       when /\AArray<(.+)>\z/
         # e.g. Array<Pet>
         sub_type = $1
-        data.map { |item| convert_to_type(item, sub_type) }
+        data.map { |item| convert_to_type(item, sub_type, api_version) }
       when /\AHash\<String, (.+)\>\z/
         # e.g. Hash<String, Integer>
         sub_type = $1
         {}.tap do |hash|
-          data.each { |k, v| hash[k] = convert_to_type(v, sub_type) }
+          data.each { |k, v| hash[k] = convert_to_type(v, sub_type, api_version) }
         end
       else
         # models (e.g. Pet) or oneOf
-        klass = DatadogAPIClient::V2.const_get(return_type)
+        klass = DatadogAPIClient.const_get(api_version).const_get(return_type)
         klass.respond_to?(:openapi_one_of) ? klass.build(data) : klass.build_from_hash(data)
       end
     end
@@ -308,7 +314,7 @@ module DatadogAPIClient::V2
     def build_request_url(path, opts = {})
       # Add leading and trailing slashes to path
       path = "/#{path}".gsub(/\/+/, '/')
-      @config.base_url(opts[:operation]) + path
+      @config.base_url("#{opts[:api_version].respond_to?(:downcase) ? opts[:api_version].downcase : opts[:api_version]}.#{opts[:operation]}") + path
     end
 
     # Update header and query params based on authentication settings.
@@ -341,9 +347,7 @@ module DatadogAPIClient::V2
     # @return [String] the Accept header (e.g. application/json)
     def select_header_accept(accepts)
       return nil if accepts.nil? || accepts.empty?
-      # use JSON when present, otherwise use all of the provided
-      json_accept = accepts.find { |s| json_mime?(s) }
-      json_accept || accepts.join(',')
+      accepts.join(', ')
     end
 
     # Return Content-Type header based on an array of content types provided.
@@ -425,12 +429,13 @@ module DatadogAPIClient::V2
 
     # Set an attribute at the given path
     #
+    # @param [String] api_version The api version
     # @param [Object] obj The source object
     # @param [String] attribute_path The path spefication, separated by "."
     # @param [Object] builder The class matching the top level attribute
     # @param [Object] value The value to set
     # @!visibility private
-    def set_attribute_from_path(obj, attribute_path, builder, value)
+    def set_attribute_from_path(api_version, obj, attribute_path, builder, value)
       attrs = attribute_path.split(".")
       last = attrs.pop
       i = 0
@@ -441,7 +446,7 @@ module DatadogAPIClient::V2
         else
           obj = obj.send(attr)
         end
-        builder = DatadogAPIClient::V2.const_get(builder.openapi_types[attr.to_sym]) if i > 0
+        builder = DatadogAPIClient.const_get(api_version).const_get(builder.openapi_types[attr.to_sym]) if i > 0
         obj = builder.new if obj.nil?
         i += 1
       end
@@ -453,4 +458,48 @@ module DatadogAPIClient::V2
       end
     end
   end
+
+  class APIError < StandardError
+    attr_reader :code, :response_headers, :response_body
+
+    # Usage examples:
+    #   APIError.new
+    #   APIError.new("message")
+    #   APIError.new(:code => 500, :response_headers => {}, :response_body => "")
+    #   APIError.new(:code => 404, :message => "Not Found")
+    def initialize(arg = nil)
+      if arg.is_a? Hash
+        if arg.key?(:message) || arg.key?('message')
+          super(arg[:message] || arg['message'])
+        else
+          super arg
+        end
+
+        arg.each do |k, v|
+          instance_variable_set "@#{k}", v
+        end
+      else
+        super arg
+      end
+    end
+
+    # Override to_s to display a friendly error message
+    def to_s
+      message
+    end
+
+    def message
+      if @message.nil?
+        msg = "Error message: the server returns an error"
+      else
+        msg = @message
+      end
+
+      msg += "\nHTTP status code: #{code}" if code
+      msg += "\nResponse headers: #{response_headers}" if response_headers
+      msg += "\nResponse body: #{response_body}" if response_body
+
+      msg
+    end
+  end
 end

data/lib/datadog_api_client/api_key_configuration.rb

@@ -1,24 +1,7 @@
-require 'datadog_api_client/v1'
-require 'datadog_api_client/v2'
-
 # Extend the automatically-generated client configuration classes with a user-friendly
 # authentication configuration, hiding the original #api_key method.
 
-module DatadogAPIClient::V1
-  class Configuration
-    private :api_key # Make original getter private
-
-    def api_key=(api_key)
-      @api_key['apiKeyAuth'] = api_key
-    end
-
-    def application_key=(app_key)
-      @api_key['appKeyAuth'] = app_key
-    end
-  end
-end
-
-module DatadogAPIClient::V2
+module DatadogAPIClient
   class Configuration
     private :api_key # Make original getter private