dogapi 1.35.0 → 1.36.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: d244a23455c972c66ba9ea1a15da6f23a233f1ccf88792b0660266cf0f41989e
-  data.tar.gz: 5d5a59735ad5c52cb47fb349dcba9da76525a39a04c6fd76941fd5005f1d8e67
+SHA1:
+  metadata.gz: 5c534abc672555cbdf8ae3e4ad066a06bc6d066b
+  data.tar.gz: 349b0b8721a13b3bbe97d4f3183dc739a259a4d7
 SHA512:
-  metadata.gz: '059749f5e615aeb4dc4ff5a782cb3e561c0adb8dd0d98ef949b974bd4ee9f7ab0fb2ddf36ddfcd4f2cc69395696290a333c46944e939dfeb6e6e3b62c2361e89'
-  data.tar.gz: c8a256db3095c70a676f7cfcf97ec966afefb5c00853d386da27cecbdbeb2d0ded3967fa99d7518af927112d9e7e42084300a6ce68f7227070405943717b98db
+  metadata.gz: b23eaa485025ad841b5a74683c85009fc3eca097b2681ae9045af8a146adc1f6b881c49d46919f40fe54ff691d671b162928b07eab83666ccad1f5c23fea593e
+  data.tar.gz: a8d31cf15e3f1d61e6fc0da448994b57fae3d5f6a6846b3713bbb95ced32890da0af5f05a281040cfccc75015adb68921679b7a1769ec8cefb9570b3c2696738

data/.rubocop.yml

@@ -11,5 +11,7 @@
 # URISchemes: http, https
 Metrics/LineLength:
   Max: 122
+Metrics/ModuleLength:
+  Max: 200
 
 inherit_from: .rubocop_todo.yml

data/.rubocop_todo.yml

@@ -209,6 +209,8 @@ Metrics/AbcSize:
 # Configuration parameters: CountComments, ExcludedMethods.
 Metrics/BlockLength:
   Max: 96
+  Exclude:
+    - 'spec/integration/monitor_spec.rb'
 
 # Offense count: 2
 Metrics/CyclomaticComplexity:
@@ -340,6 +342,8 @@ Style/Documentation:
     - 'lib/dogapi/v1/snapshot.rb'
     - 'lib/dogapi/v1/user.rb'
     - 'lib/dogapi/v1/integration.rb'
+    - 'lib/dogapi/v1/usage.rb'
+    - 'lib/dogapi/v1/metric.rb'
 
 # Offense count: 1
 # Cop supports --auto-correct.

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changes
 
+## 1.36.0 / 2019-06-05
+
+* [BUGFIX] Pass the options as params to request, not body content. See [#157][], thanks [@wonko][]
+* [FEATURE] Add support for dashboard list API v2. See [#174][]
+* [IMPROVEMENT] Add `get_active_metrics` and `resolve_monitors` methods for missing api endpoints. See [#172][]
+* [IMPROVEMENT] Add methods for missing hourly usage api endpoints. See [#173][]
+
 ## 1.35.0 / 2019-03-21
 
 * [FEATURE] Add get_all_boards and support for 'free' layout. See [#171][].
@@ -227,6 +234,7 @@ This is the last release compatible with Ruby 1.8. ([EOL 2013-06-30](https://www
 [#147]: https://github.com/DataDog/dogapi-rb/issues/147
 [#151]: https://github.com/DataDog/dogapi-rb/issues/151
 [#152]: https://github.com/DataDog/dogapi-rb/issues/152
+[#157]: https://github.com/DataDog/dogapi-rb/issues/157
 [#159]: https://github.com/DataDog/dogapi-rb/issues/159
 [#160]: https://github.com/DataDog/dogapi-rb/issues/160
 [#162]: https://github.com/DataDog/dogapi-rb/issues/162
@@ -235,6 +243,9 @@ This is the last release compatible with Ruby 1.8. ([EOL 2013-06-30](https://www
 [#167]: https://github.com/DataDog/dogapi-rb/issues/167
 [#170]: https://github.com/DataDog/dogapi-rb/issues/170
 [#171]: https://github.com/DataDog/dogapi-rb/issues/171
+[#172]: https://github.com/DataDog/dogapi-rb/issues/172
+[#173]: https://github.com/DataDog/dogapi-rb/issues/173
+[#174]: https://github.com/DataDog/dogapi-rb/issues/174
 [@ArjenSchwarz]: https://github.com/ArjenSchwarz
 [@Kaixiang]: https://github.com/Kaixiang
 [@TaylURRE]: https://github.com/TaylURRE
@@ -257,4 +268,5 @@ This is the last release compatible with Ruby 1.8. ([EOL 2013-06-30](https://www
 [@rmoriz]: https://github.com/rmoriz
 [@treeder]: https://github.com/treeder
 [@winebarrel]: https://github.com/winebarrel
+[@wonko]: https://github.com/wonko
 [@yyuu]: https://github.com/yyuu

data/lib/dogapi/common.rb

@@ -1,6 +1,5 @@
 require 'cgi'
 require 'net/https'
-require 'pp'
 require 'socket'
 require 'uri'
 

data/lib/dogapi/facade.rb

@@ -1,8 +1,51 @@
 require 'time'
 require 'dogapi/v1'
+require 'dogapi/v2'
 
 module Dogapi
 
+  # A simple DogAPI client supporting the version 2.
+  #
+  # See Dogapi::V2  for the thick underlying clients
+  class ClientV2
+    attr_accessor :datadog_host
+    def initialize(api_key, application_key=nil, host=nil, device=nil, silent=true, timeout=nil, endpoint=nil)
+
+      if api_key
+        @api_key = api_key
+      else
+        raise 'Please provide an API key to submit your data'
+      end
+
+      @application_key = application_key
+      @datadog_host = endpoint || Dogapi.find_datadog_host()
+      @host = host || Dogapi.find_localhost()
+      @device = device
+
+      @dashboard_list_service_v2 = Dogapi::V2::DashboardListService.new(
+        @api_key, @application_key, silent, timeout, @datadog_host
+      )
+
+    end
+
+    def add_items_to_dashboard_list(dashboard_list_id, dashboards)
+      @dashboard_list_service_v2.add_items(dashboard_list_id, dashboards)
+    end
+
+    def update_items_of_dashboard_list(dashboard_list_id, dashboards)
+      @dashboard_list_service_v2.update_items(dashboard_list_id, dashboards)
+    end
+
+    def delete_items_from_dashboard_list(dashboard_list_id, dashboards)
+      @dashboard_list_service_v2.delete_items(dashboard_list_id, dashboards)
+    end
+
+    def get_items_of_dashboard_list(dashboard_list_id)
+      @dashboard_list_service_v2.get_items(dashboard_list_id)
+    end
+
+  end
+
   # A simple DogAPI client
   #
   # See Dogapi::V1  for the thick underlying clients
@@ -13,6 +56,8 @@ module Dogapi
   # documentation, here[https://github.com/DataDog/dogapi/wiki].
   class Client # rubocop:disable Metrics/ClassLength
     attr_accessor :datadog_host
+    attr_accessor :v2
+    # Support for API version 2.
 
     def initialize(api_key, application_key=nil, host=nil, device=nil, silent=true, timeout=nil, endpoint=nil)
 
@@ -49,6 +94,11 @@ module Dogapi
       @legacy_event_svc = Dogapi::EventService.new(@datadog_host)
       @hosts_svc = Dogapi::V1::HostsService.new(@api_key, @application_key, silent, timeout, @datadog_host)
       @integration_svc = Dogapi::V1::IntegrationService.new(@api_key, @application_key, silent, timeout, @datadog_host)
+      @usage_svc = Dogapi::V1::UsageService.new(@api_key, @application_key, silent, timeout, @datadog_host)
+
+      # Support for Dashboard List API v2.
+      @v2 = Dogapi::ClientV2.new(@api_key, @application_key, true, true, @datadog_host)
+
     end
 
     #
@@ -118,6 +168,13 @@ module Dogapi
       end
     end
 
+    # Get a list of active metrics since a given time
+    # +from+ The seconds since the unix epoch <tt>[Time, Integer]</tt>
+    #
+    def get_active_metrics(from)
+      @metric_svc.get_active_metrics(from)
+    end
+
     #
     # EVENTS
 
@@ -507,6 +564,10 @@ module Dogapi
       @monitor_svc.unmute_monitor(monitor_id, options)
     end
 
+    def resolve_monitors(monitor_groups = [], options = {}, version = nil)
+      @monitor_svc.resolve_monitors(monitor_groups, options, version)
+    end
+
     def search_monitors(options = {})
       @monitor_svc.search_monitors(options)
     end
@@ -621,6 +682,41 @@ module Dogapi
       @integration_svc.delete_integration(source_type_name)
     end
 
+    #
+    # USAGE
+    #
+
+    # Get hourly usage information for different datadog service
+    # Usage data is delayed by up to 72 hours from when it was incurred. It is retained for the past 15 months.#
+    # format of dates is ISO-8601 UTC YYYY-MM-DDThh
+    # ex:
+    #   require 'time'
+    #   Time.now.utc.strftime('%Y-%m-%dT%H')
+    # => "2019-05-05T13"
+    def get_hosts_usage(start_hr, end_hr = nil)
+      @usage_svc.get_hosts_usage(start_hr, end_hr)
+    end
+
+    def get_logs_usage(start_hr, end_hr = nil)
+      @usage_svc.get_logs_usage(start_hr, end_hr)
+    end
+
+    def get_custom_metrics_usage(start_hr, end_hr = nil)
+      @usage_svc.get_custom_metrics_usage(start_hr, end_hr)
+    end
+
+    def get_traces_usage(start_hr, end_hr = nil)
+      @usage_svc.get_traces_usage(start_hr, end_hr)
+    end
+
+    def get_synthetics_usage(start_hr, end_hr = nil)
+      @usage_svc.get_synthetics_usage(start_hr, end_hr)
+    end
+
+    def get_fargate_usage(start_hr, end_hr = nil)
+      @usage_svc.get_fargate_usage(start_hr, end_hr)
+    end
+
     private
 
     def override_scope(options= {})

data/lib/dogapi/v1.rb

@@ -16,3 +16,4 @@ require 'dogapi/v1/tag'
 require 'dogapi/v1/user'
 require 'dogapi/v1/hosts'
 require 'dogapi/v1/integration'
+require 'dogapi/v1/usage'

data/lib/dogapi/v1/hosts.rb

@@ -9,7 +9,7 @@ module Dogapi
       API_VERSION = 'v1'
 
       def search(options = {})
-        request(Net::HTTP::Get, "/api/#{API_VERSION}/hosts", nil, options, true)
+        request(Net::HTTP::Get, "/api/#{API_VERSION}/hosts", options, nil, true)
       end
 
       def totals

data/lib/dogapi/v1/metric.rb

@@ -83,7 +83,14 @@ module Dogapi
           suppress_error_if_silent e
         end
       end
-    end
 
+      def get_active_metrics(from)
+        params = {
+          from: from.to_i
+        }
+
+        request(Net::HTTP::Get, '/api/' + API_VERSION + '/metrics', params, nil, false)
+      end
+    end
   end
 end

data/lib/dogapi/v1/monitor.rb

@@ -83,6 +83,17 @@ module Dogapi
         request(Net::HTTP::Post, "/api/#{API_VERSION}/monitor/#{monitor_id}/unmute", nil, options, true)
       end
 
+      def resolve_monitors(monitor_groups = [], options = {}, version = nil)
+        body = {
+          'resolve' => monitor_groups
+        }.merge options
+
+        # Currently not part of v1 at this time but adding future compatibility option
+        endpoint = version.nil? ? '/api/monitor/bulk_resolve' : "/api/#{version}/monitor/bulk_resolve"
+
+        request(Net::HTTP::Post, endpoint, nil, body, true)
+      end
+
       def search_monitors(options = {})
         request(Net::HTTP::Get, "/api/#{API_VERSION}/monitor/search", options, nil, false)
       end
@@ -133,6 +144,5 @@ module Dogapi
         request(Net::HTTP::Post, "/api/#{API_VERSION}/host/#{hostname}/unmute", nil, {}, true)
       end
     end
-
   end
 end

data/lib/dogapi/v1/usage.rb

@@ -0,0 +1,95 @@
+require 'dogapi'
+
+module Dogapi
+  class V1 # for namespacing
+
+    class UsageService < Dogapi::APIService
+
+      API_VERSION = 'v1'
+
+      # Retrieve hourly host usage information
+      #
+      # :start_hr => String: Datetime ISO-8601 UTC YYYY-MM-DDThh, for usage beginning at this hour
+      # :end_hr => String: Datetime ISO-8601 UTC YYYY-MM-DDThh, default start_hr+1d, for usage ending BEFORE this hour
+      def get_hosts_usage(start_hr, end_hr = nil)
+        params = {
+          start_hr: start_hr
+        }
+
+        params['end_hr'] = end_hr if end_hr
+
+        request(Net::HTTP::Get, "/api/#{API_VERSION}/usage/hosts", params, nil, false)
+      end
+
+      # Retrieve hourly logs usage information
+      #
+      # :start_hr => String: Datetime ISO-8601 UTC YYYY-MM-DDThh, for usage beginning at this hour
+      # :end_hr => String: Datetime ISO-8601 UTC YYYY-MM-DDThh, default start_hr+1d, for usage ending BEFORE this hour
+      def get_logs_usage(start_hr, end_hr = nil)
+        params = {
+          start_hr: start_hr
+        }
+
+        params['end_hr'] = end_hr if end_hr
+
+        request(Net::HTTP::Get, "/api/#{API_VERSION}/usage/logs", params, nil, false)
+      end
+
+      # Retrieve hourly custom metrics usage information
+      #
+      # :start_hr => String: Datetime ISO-8601 UTC YYYY-MM-DDThh, for usage beginning at this hour
+      # :end_hr => String: Datetime ISO-8601 UTC YYYY-MM-DDThh, default start_hr+1d, for usage ending BEFORE this hour
+      def get_custom_metrics_usage(start_hr, end_hr = nil)
+        params = {
+          start_hr: start_hr
+        }
+
+        params['end_hr'] = end_hr if end_hr
+
+        request(Net::HTTP::Get, "/api/#{API_VERSION}/usage/timeseries", params, nil, false)
+      end
+
+      # Retrieve hourly trace search usage information
+      #
+      # :start_hr => String: Datetime ISO-8601 UTC YYYY-MM-DDThh, for usage beginning at this hour
+      # :end_hr => String: Datetime ISO-8601 UTC YYYY-MM-DDThh, default start_hr+1d, for usage ending BEFORE this hour
+      def get_traces_usage(start_hr, end_hr = nil)
+        params = {
+          start_hr: start_hr
+        }
+
+        params['end_hr'] = end_hr if end_hr
+
+        request(Net::HTTP::Get, "/api/#{API_VERSION}/usage/traces", params, nil, false)
+      end
+
+      # Retrieve hourly synthetics usage information
+      #
+      # :start_hr => String: Datetime ISO-8601 UTC YYYY-MM-DDThh, for usage beginning at this hour
+      # :end_hr => String: Datetime ISO-8601 UTC YYYY-MM-DDThh, default start_hr+1d, for usage ending BEFORE this hour
+      def get_synthetics_usage(start_hr, end_hr = nil)
+        params = {
+          start_hr: start_hr
+        }
+
+        params['end_hr'] = end_hr if end_hr
+
+        request(Net::HTTP::Get, "/api/#{API_VERSION}/usage/synthetics", params, nil, false)
+      end
+
+      # Retrieve hourly fargate usage information
+      #
+      # :start_hr => String: Datetime ISO-8601 UTC YYYY-MM-DDThh, for usage beginning at this hour
+      # :end_hr => String: Datetime ISO-8601 UTC YYYY-MM-DDThh, default start_hr+1d, for usage ending BEFORE this hour
+      def get_fargate_usage(start_hr, end_hr = nil)
+        params = {
+          start_hr: start_hr
+        }
+
+        params['end_hr'] = end_hr if end_hr
+
+        request(Net::HTTP::Get, "/api/#{API_VERSION}/usage/fargate", params, nil, false)
+      end
+    end
+  end
+end

data/lib/dogapi/v2.rb

@@ -0,0 +1 @@
+require 'dogapi/v2/dashboard_list'

data/lib/dogapi/v2/dashboard_list.rb

@@ -0,0 +1,68 @@
+require 'dogapi'
+
+module Dogapi
+  class V2 # for namespacing
+
+    # Dashboard List API
+    class DashboardListService < Dogapi::APIService
+
+      API_VERSION = 'v2'
+      RESOURCE_NAME = 'dashboard/lists/manual'
+      SUB_RESOURCE_NAME = 'dashboards'
+
+      def get_items(resource_id)
+        request(
+          Net::HTTP::Get,
+          "/api/#{API_VERSION}/#{RESOURCE_NAME}/#{resource_id}/#{SUB_RESOURCE_NAME}",
+          nil,
+          nil,
+          false
+        )
+      end
+
+      def add_items(resource_id, dashboards)
+        body = {
+          dashboards: dashboards
+        }
+
+        request(
+          Net::HTTP::Post,
+          "/api/#{API_VERSION}/#{RESOURCE_NAME}/#{resource_id}/#{SUB_RESOURCE_NAME}",
+          nil,
+          body,
+          true
+        )
+      end
+
+      def update_items(resource_id, dashboards)
+        body = {
+          dashboards: dashboards
+        }
+
+        request(
+          Net::HTTP::Put,
+          "/api/#{API_VERSION}/#{RESOURCE_NAME}/#{resource_id}/#{SUB_RESOURCE_NAME}",
+          nil,
+          body,
+          true
+        )
+      end
+
+      def delete_items(resource_id, dashboards)
+        body = {
+          dashboards: dashboards
+        }
+
+        request(
+          Net::HTTP::Delete,
+          "/api/#{API_VERSION}/#{RESOURCE_NAME}/#{resource_id}/#{SUB_RESOURCE_NAME}",
+          nil,
+          body,
+          true
+        )
+      end
+
+    end
+
+  end
+end

data/lib/dogapi/version.rb

@@ -1,3 +1,3 @@
 module Dogapi
-  VERSION = '1.35.0'
+  VERSION = '1.36.0'
 end

data/spec/integration/dashboard_list_spec.rb

@@ -6,7 +6,6 @@ describe Dogapi::Client do
 
   DASHBOARD_LIST_ID = 1_234_567
   DASHBOARD_LIST_NAME = 'My new dashboard list'.freeze
-
   DASHBOARDS = [
     {
       'type' => 'custom_timeboard',
@@ -83,3 +82,48 @@ describe Dogapi::Client do
                     :get, "/#{RESOURCE_NAME}/#{DASHBOARD_LIST_ID}/#{SUB_RESOURCE_NAME}"
   end
 end
+
+describe Dogapi::ClientV2 do
+  RESOURCE_NAME = 'dashboard/lists/manual'.freeze
+  SUB_RESOURCE_NAME = 'dashboards'.freeze
+
+  DASHBOARD_LIST_ID = 1_234_567
+  DASHBOARD_LIST_NAME = 'My new dashboard list'.freeze
+  DASHBOARDS = [
+    {
+      'type' => 'custom_timeboard',
+      'id' => 1234
+    },
+    {
+      'type' => 'custom_screenboard',
+      'id' => 1234
+    }
+  ].freeze
+
+  describe '#add_items_to_dashboard_list' do
+    it_behaves_like 'an api v2 method',
+                    :add_items_to_dashboard_list, [DASHBOARD_LIST_ID] + [DASHBOARDS],
+                    :post, "/#{RESOURCE_NAME}/#{DASHBOARD_LIST_ID}/#{SUB_RESOURCE_NAME}",
+                    DASHBOARD_LIST_WITH_DASHES_BODY
+  end
+
+  describe '#update_items_of_dashboard_list' do
+    it_behaves_like 'an api v2 method',
+                    :update_items_of_dashboard_list, [DASHBOARD_LIST_ID] + [DASHBOARDS],
+                    :put, "/#{RESOURCE_NAME}/#{DASHBOARD_LIST_ID}/#{SUB_RESOURCE_NAME}",
+                    DASHBOARD_LIST_WITH_DASHES_BODY
+  end
+
+  describe '#delete_items_from_dashboard_list' do
+    it_behaves_like 'an api v2 method',
+                    :delete_items_from_dashboard_list, [DASHBOARD_LIST_ID] + [DASHBOARDS],
+                    :delete, "/#{RESOURCE_NAME}/#{DASHBOARD_LIST_ID}/#{SUB_RESOURCE_NAME}",
+                    DASHBOARD_LIST_WITH_DASHES_BODY
+  end
+
+  describe '#get_items_of_dashboard_list' do
+    it_behaves_like 'an api v2 method',
+                    :get_items_of_dashboard_list, [DASHBOARD_LIST_ID],
+                    :get, "/#{RESOURCE_NAME}/#{DASHBOARD_LIST_ID}/#{SUB_RESOURCE_NAME}"
+  end
+end

data/spec/integration/metric_spec.rb

@@ -34,6 +34,7 @@ describe Dogapi::Client do
   }.freeze
 
   METRIC_PARAMS = { query: METRIC_QUERY, from: FROM.to_i, to: TO.to_i }.freeze
+  ACTIVE_METRICS_PARAMS = { from: FROM.to_i }.freeze
 
   describe '#emit_point' do
     it 'queries the api' do
@@ -93,4 +94,10 @@ describe Dogapi::Client do
       )
     end
   end
+
+  describe '#get_active_metrics' do
+    it_behaves_like 'an api method with params',
+                    :get_active_metrics, [],
+                    :get, '/metrics', ACTIVE_METRICS_PARAMS
+  end
 end

data/spec/integration/monitor_spec.rb

@@ -7,6 +7,7 @@ describe Dogapi::Client do
   DOWNTIME_SCOPE = 'host:vagrant-ubuntu-trusty-64'.freeze
   DOWNTIME_ID = 424_242_424_242
   MUTE_HOSTNAME = 'vagrant-ubuntu-trusty-32'.freeze
+  MONITOR_GROUPS = [{ 'check_a' => 'group_x' }, { 'check_a' => 'group_y' }, { 'check_b' => 'ALL_GROUPS' }].freeze
 
   describe '#monitor' do
     it_behaves_like 'an api method with options',
@@ -68,6 +69,12 @@ describe Dogapi::Client do
                     :post, "/monitor/#{MONITOR_ID}/unmute", {}
   end
 
+  describe '#resolve_monitors' do
+    it_behaves_like 'an api method with options',
+                    :resolve_monitors, [MONITOR_GROUPS],
+                    :post, '/monitor/bulk_resolve', 'resolve' => MONITOR_GROUPS
+  end
+
   describe '#schedule_downtime' do
     it_behaves_like 'an api method with options',
                     :schedule_downtime, [DOWNTIME_SCOPE],

data/spec/integration/usage_spec.rb

@@ -0,0 +1,44 @@
+require_relative '../spec_helper'
+
+describe Dogapi::Client do
+  USAGE_PARAMS = {
+    start_hr: (Time.now - (3600 * 24)).utc.strftime('%Y-%m-%dT%H'),
+    end_hr: Time.now.utc.strftime('%Y-%m-%dT%H')
+  }.freeze
+
+  describe '#get_hosts_usage' do
+    it_behaves_like 'an api method with params',
+                    :get_hosts_usage, [],
+                    :get, '/usage/hosts', USAGE_PARAMS
+  end
+
+  describe '#get_logs_usage' do
+    it_behaves_like 'an api method with params',
+                    :get_logs_usage, [],
+                    :get, '/usage/logs', USAGE_PARAMS
+  end
+
+  describe '#get_custom_metrics_usage' do
+    it_behaves_like 'an api method with params',
+                    :get_custom_metrics_usage, [],
+                    :get, '/usage/timeseries', USAGE_PARAMS
+  end
+
+  describe '#get_traces_usage' do
+    it_behaves_like 'an api method with params',
+                    :get_traces_usage, [],
+                    :get, '/usage/traces', USAGE_PARAMS
+  end
+
+  describe '#get_synthetics_usage' do
+    it_behaves_like 'an api method with params',
+                    :get_synthetics_usage, [],
+                    :get, '/usage/synthetics', USAGE_PARAMS
+  end
+
+  describe '#get_fargate_usage' do
+    it_behaves_like 'an api method with params',
+                    :get_fargate_usage, [],
+                    :get, '/usage/fargate', USAGE_PARAMS
+  end
+end

data/spec/spec_helper.rb

@@ -20,18 +20,23 @@ module SpecDog
   let(:api_key) { 'API_KEY' }
   let(:app_key) { 'APP_KEY' }
   let(:dog) { Dogapi::Client.new(api_key, app_key, 'data.dog', nil, false) }
+  let(:dog2) { Dogapi::ClientV2.new(api_key, app_key, 'data.dog', nil, false) }
   let(:api_url) { "#{DATADOG_HOST}/api/v1" }
+  let(:old_api_url) { "#{DATADOG_HOST}/api" }
+  let(:api_v2_url) { "#{DATADOG_HOST}/api/v2" }
+
   let(:default_query) { { api_key: api_key, application_key: app_key } }
 
   shared_examples 'an api method' do |command, args, request, endpoint, body|
     it 'queries the api' do
       url = api_url + endpoint
-      stub_request(request, /#{url}/).to_return(body: '{}').then.to_raise(StandardError)
+      old_url = old_api_url + endpoint
+      stub_request(request, /#{url}|#{old_url}/).to_return(body: '{}').then.to_raise(StandardError)
       expect(dog.send(command, *args)).to eq ['200', {}]
 
       body = MultiJson.dump(body) if body
 
-      expect(WebMock).to have_requested(request, url).with(
+      expect(WebMock).to have_requested(request, /#{url}|#{old_url}/).with(
         query: default_query,
         body: body
       )
@@ -42,13 +47,14 @@ module SpecDog
     include_examples 'an api method', command, args, request, endpoint, body
     it 'queries the api with options' do
       url = api_url + endpoint
+      old_url = old_api_url + endpoint
       options = { 'zzz' => 'aaa' }
-      stub_request(request, /#{url}/).to_return(body: '{}').then.to_raise(StandardError)
+      stub_request(request, /#{url}|#{old_url}/).to_return(body: '{}').then.to_raise(StandardError)
       expect(dog.send(command, *args, options)).to eq ['200', {}]
 
       body = MultiJson.dump(body ? (body.merge options) : options)
 
-      expect(WebMock).to have_requested(request, url).with(
+      expect(WebMock).to have_requested(request, /#{url}|#{old_url}/).with(
         query: default_query,
         body: body
       )
@@ -60,7 +66,6 @@ module SpecDog
       url = api_url + endpoint
       stub_request(request, /#{url}/).to_return(body: '{}').then.to_raise(StandardError)
       expect(dog.send(command, *args, *params.values)).to eq ['200', {}]
-
       params.each { |k, v| params[k] = v.join(',') if v.is_a? Array }
       params = params.merge default_query
 
@@ -85,6 +90,67 @@ module SpecDog
       )
     end
   end
+
+  # Support for new API version (v2)
+
+  shared_examples 'an api v2 method' do |command, args, request, endpoint, body|
+    it 'queries the api v2' do
+      url = api_v2_url + endpoint
+      stub_request(request, /#{url}/).to_return(body: '{}').then.to_raise(StandardError)
+      expect(dog2.send(command, *args)).to eq ['200', {}]
+      body = MultiJson.dump(body) if body
+
+      expect(WebMock).to have_requested(request, url).with(
+        query: default_query,
+        body: body
+      )
+    end
+  end
+
+  shared_examples 'an api v2 method with options' do |command, args, request, endpoint, body|
+    include_examples 'an api method', command, args, request, endpoint, body
+    it 'queries the api v2 with options' do
+      url = api_v2_url + endpoint
+      options = { 'zzz' => 'aaa' }
+      stub_request(request, /#{url}/).to_return(body: '{}').then.to_raise(StandardError)
+      expect(dog2.send(command, *args, options)).to eq ['200', {}]
+      body = MultiJson.dump(body ? (body.merge options) : options)
+
+      expect(WebMock).to have_requested(request, url).with(
+        query: default_query,
+        body: body
+      )
+    end
+  end
+
+  shared_examples 'an api v2 method with params' do |command, args, request, endpoint, params|
+    it 'queries the api v2 with params' do
+      url = api_v2_url + endpoint
+      stub_request(request, /#{url}/).to_return(body: '{}').then.to_raise(StandardError)
+      expect(dog2.send(command, *args, *params.values)).to eq ['200', {}]
+      params.each { |k, v| params[k] = v.join(',') if v.is_a? Array }
+      params = params.merge default_query
+
+      expect(WebMock).to have_requested(request, url).with(
+        query: params
+      )
+    end
+  end
+
+  shared_examples 'an api v2 method with optional params' do |command, args, request, endpoint, opt_params|
+    include_examples 'an api v2 method', command, args, request, endpoint
+    it 'queries the api v2 with optional params' do
+      url = api_v2_url + endpoint
+      stub_request(request, /#{url}/).to_return(body: '{}').then.to_raise(StandardError)
+      expect(dog2.send(command, *args, opt_params)).to eq ['200', {}]
+      opt_params.each { |k, v| opt_params[k] = v.join(',') if v.is_a? Array }
+      params = opt_params.merge default_query
+
+      expect(WebMock).to have_requested(request, url).with(
+        query: params
+      )
+    end
+  end
 end
 
 # See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dogapi
 version: !ruby/object:Gem::Version
-  version: 1.35.0
+  version: 1.36.0
 platform: ruby
 authors:
 - Datadog, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-21 00:00:00.000000000 Z
+date: 2019-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -116,7 +116,10 @@ files:
 - lib/dogapi/v1/service_check.rb
 - lib/dogapi/v1/snapshot.rb
 - lib/dogapi/v1/tag.rb
+- lib/dogapi/v1/usage.rb
 - lib/dogapi/v1/user.rb
+- lib/dogapi/v2.rb
+- lib/dogapi/v2/dashboard_list.rb
 - lib/dogapi/version.rb
 - spec/integration/alert_spec.rb
 - spec/integration/comment_spec.rb
@@ -135,6 +138,7 @@ files:
 - spec/integration/service_check_spec.rb
 - spec/integration/snapshot_spec.rb
 - spec/integration/tag_spec.rb
+- spec/integration/usage_spec.rb
 - spec/integration/user_spec.rb
 - spec/spec_helper.rb
 - spec/unit/capistrano_spec.rb
@@ -169,7 +173,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.2
+rubyforge_project: 
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Ruby bindings for Datadog's API
@@ -191,6 +196,7 @@ test_files:
 - spec/integration/service_check_spec.rb
 - spec/integration/snapshot_spec.rb
 - spec/integration/tag_spec.rb
+- spec/integration/usage_spec.rb
 - spec/integration/user_spec.rb
 - spec/spec_helper.rb
 - spec/unit/capistrano_spec.rb