dogapi 1.12.0 → 1.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 95f3c9690e24cc9136fa52d7ca188a37330772f6
-  data.tar.gz: 2e214f8924413926d12ba4880d296b89d3eb0190
+  metadata.gz: 956ac3cdbbcc21917fe835e1857513ed612f1b70
+  data.tar.gz: 8c1a5434a0aa26ffe0dfa6bd14c6e40950699300
 SHA512:
-  metadata.gz: 84310c8ba834959fc039443a13792e17e51e65d9324914318eda49bef91cdd51fb1ad7121df30f69e782aa3cc154ebea95d3231c4dfadbb2345b0feac607c1aa
-  data.tar.gz: 55f84d609ad8db3a80a560d8ca977154b036a57be56c0597ef189bc8d62b95ec03b067ec86f12cdd895d1825b71c77236c358f4293c32284e4f5c7aa40c398c9
+  metadata.gz: fca5bb8a66a263e41d1987ffeb9a2481cece0baafb78a8e9ef1e7247b8dca666a4088273a44e6182b7223d511d970a1a1c00e321a518983d75b88db0d7f2662e
+  data.tar.gz: 4f7475ae3fbcba75d0acf61ff74bb26b5c1fd13edf7a9786b9bd82bf862d0c187f50c65ab86849defff97cfce7f5a5abf457afdfba4db68b47c6ac62756c4ee3

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 Changes
 =======
+# 1.13.0 / 2014-12-10
+* Add tag filter to get_all_monitors [#58](https://github.com/DataDog/dogapi-rb/pull/58)
+* Add update downtime method [#59](https://github.com/DataDog/dogapi-rb/pull/59)
+
 # 1.12.0 / 2014-11-17
 * Add support for the Monitor API [#51](https://github.com/DataDog/dogapi-rb/pull/51)
 * Truncate event title and text before submission [#53](https://github.com/DataDog/dogapi-rb/pull/53)

data/lib/dogapi/facade.rb

@@ -366,6 +366,10 @@ module Dogapi
       @monitor_svc.schedule_downtime(scope, start, options)
     end
 
+    def update_downtime(downtime_id, options = {})
+      @monitor_svc.update_downtime(downtime_id, options)
+    end
+
     def get_downtime(downtime_id)
       @monitor_svc.get_downtime(downtime_id)
     end

data/lib/dogapi/v1/monitor.rb

@@ -52,10 +52,7 @@ module Dogapi
           # :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]
-            params[:group_states] = options[:group_states].join(',')
-            options.delete :group_states
-          end
+          params[:group_states] = options[:group_states].join(',') if options[:group_states]
 
           request(Net::HTTP::Get, "/api/#{API_VERSION}/monitor/#{monitor_id}", params, nil, false)
         rescue Exception => e
@@ -87,8 +84,16 @@ module Dogapi
           # 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]
-            params[:group_states] = options[:group_states].join(',')
-            options.delete :group_states
+            params[:group_states] = options[:group_states]
+            params[:group_states] = params[:group_states].join(',') if params[:group_states].respond_to?(:join)
+          end
+
+          # :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]
+            params[:tags] = options[:tags]
+            params[:tags] = params[:tags].join(',') if params[:tags].respond_to?(:join)
           end
 
           request(Net::HTTP::Get, "/api/#{API_VERSION}/monitor", params, nil, false)
@@ -170,6 +175,19 @@ module Dogapi
         end
       end
 
+      def update_downtime(downtime_id, options = {})
+        begin
+          params = {
+            :api_key => @api_key,
+            :application_key => @application_key
+          }
+
+          request(Net::HTTP::Put, "/api/#{API_VERSION}/downtime/#{downtime_id}", params, options, true)
+        rescue Exception => e
+          suppress_error_if_silent e
+        end
+      end
+
       def get_downtime(downtime_id)
         begin
           params = {

data/lib/dogapi/version.rb

@@ -1,3 +1,3 @@
 module Dogapi
-  VERSION = "1.12.0"
+  VERSION = "1.13.0"
 end

data/tests/test_alerts.rb

@@ -13,12 +13,12 @@ class TestAlerts < Test::Unit::TestCase
     alert_id = dog.alert(query)[1]['id']
     status, alert = dog.get_alert(alert_id)
     assert_equal alert['query'], query, alert['query']
-    assert_equal alert['silenced'], {}, alert['silenced']
+    assert_equal alert['silenced'], false, alert['silenced']
 
     dog.update_alert(alert_id, query, :silenced => true)
     status, alert = dog.get_alert(alert_id)
     assert_equal alert['query'], query, alert['query']
-    assert_equal alert['silenced'], {'*' => nil}, alert['silenced']
+    assert_equal alert['silenced'], true, alert['silenced']
 
     dog.delete_alert(alert_id)
 

data/tests/test_monitors.rb

@@ -38,17 +38,26 @@ class TestAlerts < Test::Unit::TestCase
 
     query1 = "avg(last_1h):sum:system.net.bytes_rcvd{host:host0} > 100"
     query2 = "avg(last_1h):sum:system.net.bytes_rcvd{host:host0} > 200"
+    query3 = "avg(last_1h):sum:system.net.bytes_rcvd{host:host1} > 200"
 
     monitor_id1 = dog.monitor('metric alert', query1)[1]['id']
     monitor_id2 = dog.monitor('metric alert', query2)[1]['id']
+    monitor_id3 = dog.monitor('metric alert', query3)[1]['id']
     status, monitors = dog.get_all_monitors(:group_states => ['alert', 'warn'])
     monitor1 = monitors.map{|m| m if m['id'] == monitor_id1}.compact[0]
     monitor2 = monitors.map{|m| m if m['id'] == monitor_id2}.compact[0]
     assert_equal monitor1['query'], query1, monitor1['query']
     assert_equal monitor2['query'], query2, monitor2['query']
 
+    status, monitors = dog.get_all_monitors(:tags => ['host:host1'])
+    monitor3 = monitors.map{|m| m if m['id'] == monitor_id3}.compact[0]
+    assert_equal monitor3['query'], query3, monitor3['query']
+    assert_equal nil, monitors.map{|m| m if m['id'] == monitor_id1}.compact[0]
+    assert_equal nil, monitors.map{|m| m if m['id'] == monitor_id2}.compact[0]
+
     dog.delete_monitor(monitor_id1)
     dog.delete_monitor(monitor_id2)
+    dog.delete_monitor(monitor_id3)
   end
 
   def test_checks
@@ -120,11 +129,21 @@ class TestAlerts < Test::Unit::TestCase
     dog = Dogapi::Client.new(@api_key, @app_key)
     start_ts = Time.now.to_i
     end_ts = start_ts + 1000
-    downtime_id = dog.schedule_downtime('env:staging', start_ts, :end => end_ts)[1]['id']
+    downtime_id = dog.schedule_downtime('env:staging', start_ts, :end => end_ts,
+                                        :message=>'Message!')[1]['id']
     status, dt = dog.get_downtime(downtime_id)
     assert_equal dt['start'], start_ts, dt['start']
     assert_equal dt['end'], end_ts, dt['end']
     assert_equal dt['scope'], ['env:staging'], dt['scope']
+    assert_equal dt['message'], 'Message!', dt['messsage']
+
+    dog.update_downtime(downtime_id, :start => start_ts + 1, :end => end_ts + 1,
+                        :scope => 'env:prod', :message => 'New Message!')
+    status, dt = dog.get_downtime(downtime_id)
+    assert_equal dt['start'], start_ts + 1, dt['start']
+    assert_equal dt['end'], end_ts + 1, dt['end']
+    assert_equal dt['scope'], ['env:prod'], dt['scope']
+    assert_equal dt['message'], 'New Message!', dt['messsage']
 
     dog.cancel_downtime(downtime_id)
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dogapi
 version: !ruby/object:Gem::Version
-  version: 1.12.0
+  version: 1.13.0
 platform: ruby
 authors:
 - Datadog, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-17 00:00:00.000000000 Z
+date: 2014-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json