dogapi 1.25.0 → 1.26.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 75fa2cad892972518ea3174bb4422c9d60462aa6
-  data.tar.gz: c7856800aaf8f41a50a51930d28f2f6726bdcd96
+  metadata.gz: a9bf8f406b6802f4b75bf0c1a7347672ef1813e1
+  data.tar.gz: 91672b6f969fec52c9b0b83502d039b64f86fd0f
 SHA512:
-  metadata.gz: 14b6376e95b9c4090dbd91f860c9b3dd7c51d119e516416d8fbbd3d2bf999024d382c170e46d6fec688cfd274116dd1b585bc6da6844bf40f62ca8535d30263a
-  data.tar.gz: dd880166b4ec0a3aa8fd7e3943374cf635f0cf0341eefa28c52a9742bab9f1e526947611b180e8855f5ef5a5d6445eaa25ef0ac027cd50703403328468bc0d26
+  metadata.gz: 4d82924ea9143144a8a62fe15734a4d2b75980bbb2d2ffd512d76d46d1aa3ba9ad6f21c108331230bf30b19cd79c5b15bff262a7d0e6369fafa60a468ed7ae35
+  data.tar.gz: de50e88ee99964572e0a951dd9aecc5926be1fabcfec6f7a031fe8b9cd3c4957c2029f74fff5d469a85c7c6042336f131dccdfd2747fe0306ee13b0e77b382de

data/CHANGELOG.md

@@ -1,7 +1,11 @@
 Changes
 =======
 
-# 1.25.0 / UNRELEASED
+# 1.26.0 / 2017-04-10
+
+* [IMPROVEMENT] Allow additional options to be passed to monitor API calls. See [#125][] (thanks [@jimmyngo][])
+
+# 1.25.0 / 2017-02-14
 
 * [FEATURE] Add Datadog endpoint for metrics metadata. See [#120][]
 
@@ -173,6 +177,7 @@ This is the last release compatible with Ruby 1.8. ([EOL 2013-06-30](https://www
 [#114]: https://github.com/DataDog/dogapi-rb/issues/114
 [#115]: https://github.com/DataDog/dogapi-rb/issues/115
 [#120]: https://github.com/DataDog/dogapi-rb/issues/120
+[#125]: https://github.com/DataDog/dogapi-rb/issues/125
 [@ArjenSchwarz]: https://github.com/ArjenSchwarz
 [@Kaixiang]: https://github.com/Kaixiang
 [@ansel1]: https://github.com/ansel1
@@ -181,9 +186,10 @@ This is the last release compatible with Ruby 1.8. ([EOL 2013-06-30](https://www
 [@byroot]: https://github.com/byroot
 [@casperisfine]: https://github.com/casperisfine
 [@hnovikov]: https://github.com/hnovikov
+[@jimmyngo]: https://github.com/jimmyngo
 [@miknight]: https://github.com/miknight
 [@nots]: https://github.com/nots
 [@rmoriz]: https://github.com/rmoriz
 [@treeder]: https://github.com/treeder
 [@winebarrel]: https://github.com/winebarrel
-[@yyuu]: https://github.com/yyuu
+[@yyuu]: https://github.com/yyuu

data/lib/dogapi/v1/monitor.rb

@@ -25,11 +25,11 @@ module Dogapi
       end
 
       def get_monitor(monitor_id, options = {})
+        extra_params = options.clone
         # :group_states is an optional list of statuses to filter returned
         # groups. If no value is given then no group states will be returned.
         # Possible values are: "all", "ok", "warn", "alert", "no data".
-        extra_params = {}
-        extra_params[:group_states] = options[:group_states].join(',') if options[:group_states]
+        extra_params[:group_states] = extra_params[:group_states].join(',') if extra_params[:group_states]
 
         request(Net::HTTP::Get, "/api/#{API_VERSION}/monitor/#{monitor_id}", extra_params, nil, false)
       end
@@ -39,22 +39,16 @@ module Dogapi
       end
 
       def get_all_monitors(options = {})
-        extra_params = {}
+        extra_params = options.clone
         # :group_states is an optional list of statuses to filter returned
         # groups. If no value is given then no group states will be returned.
         # Possible values are: "all", "ok", "warn", "alert", "no data".
-        if options[:group_states]
-          extra_params[:group_states] = options[:group_states]
-          extra_params[:group_states] = extra_params[:group_states].join(',') if extra_params[:group_states].respond_to?(:join)
-        end
+        extra_params[:group_states] = extra_params[:group_states].join(',') if extra_params[:group_states].respond_to?(:join)
 
         # :tags is an optional list of scope tags to filter the list of monitors
         # returned. If no value is given, then all monitors, regardless of
         # scope, will be returned.
-        if options[:tags]
-          extra_params[:tags] = options[:tags]
-          extra_params[:tags] = extra_params[:tags].join(',') if extra_params[:tags].respond_to?(:join)
-        end
+        extra_params[:tags] = extra_params[:tags].join(',') if extra_params[:tags].respond_to?(:join)
 
         request(Net::HTTP::Get, "/api/#{API_VERSION}/monitor", extra_params, nil, false)
       end
@@ -99,13 +93,7 @@ module Dogapi
       end
 
       def get_all_downtimes(options = {})
-        extra_params = {}
-        if options[:current_only]
-          extra_params[:current_only] = options[:current_only]
-          options.delete :current_only
-        end
-
-        request(Net::HTTP::Get, "/api/#{API_VERSION}/downtime", extra_params, nil, false)
+        request(Net::HTTP::Get, "/api/#{API_VERSION}/downtime", options, nil, false)
       end
 
       #

data/lib/dogapi/version.rb

@@ -1,3 +1,3 @@
 module Dogapi
-  VERSION = '1.25.0'
+  VERSION = '1.26.0'
 end

data/spec/integration/monitor_spec.rb

@@ -35,7 +35,7 @@ describe Dogapi::Client do
   describe '#get_all_monitors' do
     it_behaves_like 'an api method with optional params',
                     :get_all_monitors, [],
-                    :get, '/monitor', group_states: %w(custom all), tags: ['test', 'key:value']
+                    :get, '/monitor', group_states: %w(custom all), tags: ['test', 'key:value'], name: 'test'
   end
 
   describe '#mute_monitors' do
@@ -87,9 +87,9 @@ describe Dogapi::Client do
   end
 
   describe '#get_all_downtimes' do
-    it_behaves_like 'an api method',
+    it_behaves_like 'an api method with optional params',
                     :get_all_downtimes, [],
-                    :get, '/downtime'
+                    :get, '/downtime', current_only: true
   end
 
   describe '#mute_host' do

metadata

@@ -1,69 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: dogapi
 version: !ruby/object:Gem::Version
-  version: 1.25.0
+  version: 1.26.0
 platform: ruby
 authors:
 - Datadog, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-14 00:00:00.000000000 Z
+date: 2017-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Ruby bindings for Datadog's API
@@ -74,11 +74,11 @@ extensions: []
 extra_rdoc_files:
 - README.rdoc
 files:
-- .gitignore
-- .rspec
-- .rubocop.yml
-- .tailor
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".rubocop.yml"
+- ".tailor"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE
@@ -137,27 +137,27 @@ licenses:
 metadata: {}
 post_install_message: 
 rdoc_options:
-- --title
+- "--title"
 - DogAPI -- Datadog Client
-- --main
+- "--main"
 - README.rdoc
-- --line-numbers
-- --inline-source
+- "--line-numbers"
+- "--inline-source"
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14.1
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Ruby bindings for Datadog's API