dogapi 1.11.0 → 1.12.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    N2Y1MzNkOWZlNzJmODkxZmY0OTczYmQxOTI1NGZlZGViODc2OTkyMg==
-  data.tar.gz: !binary |-
-    M2JkNGNhMTI2N2Y4NDczNzU0NDYyZmI3NGQyNjU1MzBkMWQxNjhmMw==
+SHA1:
+  metadata.gz: 95f3c9690e24cc9136fa52d7ca188a37330772f6
+  data.tar.gz: 2e214f8924413926d12ba4880d296b89d3eb0190
 SHA512:
-  metadata.gz: !binary |-
-    YjYzZTAyY2U2ZDU4ZjcxODZiNTRkY2Y2OGZkZTZlNTI2ZWQxNzZhY2I4ZTZi
-    M2JmN2M2YmJhZDA0ODFkZDE2ZmE1YmMxM2YwZjQzNDUwOGRmNjk3OTRmZWM5
-    MGI5MjU1N2UxZjllMzUyNGM3M2QwZjczNzNhZWUwMjAzN2FlYTU=
-  data.tar.gz: !binary |-
-    OTBkNTA4YTY5OWRjY2M0YmQ3MjMyZjUxYWM5MDcyODk3ZDcxNDhhZTY5ZGQ4
-    Mjg2MzI4MjhiNmU3YTQwNTAxMDY2YzA2NjE2ZDQxMmI1ZGQyZDZhM2FkNGZk
-    NDAzYjEyYWExZjQ3M2M5OWI0YzQ5NDQ1MjRkODFiOTk1YWM4ZDc=
+  metadata.gz: 84310c8ba834959fc039443a13792e17e51e65d9324914318eda49bef91cdd51fb1ad7121df30f69e782aa3cc154ebea95d3231c4dfadbb2345b0feac607c1aa
+  data.tar.gz: 55f84d609ad8db3a80a560d8ca977154b036a57be56c0597ef189bc8d62b95ec03b067ec86f12cdd895d1825b71c77236c358f4293c32284e4f5c7aa40c398c9

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 Changes
 =======
+# 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)
+
 # 1.11.0 / 2014-07-03
 * Allow to send several metrics in the same http request
 * Add support for http proxy defined by the environment variables

data/lib/dogapi/event.rb

@@ -63,6 +63,8 @@ module Dogapi
   class EventService < Dogapi::Service
 
     API_VERSION = "1.0.0"
+    MAX_BODY_LENGTH = 4000
+    MAX_TITLE_LENGTH = 100
 
     # <b>DEPRECATED:</b> Going forward, use the V1 services. This legacy service will be
     # removed in an upcoming release.
@@ -82,8 +84,8 @@ module Dogapi
         :alert_type => event.alert_type,
         :event_type => event.event_type,
         :event_object => event.event_object,
-        :msg_title => event.msg_title,
-        :msg_text => event.msg_text,
+        :msg_title => event.msg_title[0..MAX_TITLE_LENGTH - 1],
+        :msg_text => event.msg_text[0..MAX_BODY_LENGTH - 1],
         :json_payload => event.json_payload,
       }
 

data/lib/dogapi/facade.rb

@@ -38,7 +38,8 @@ module Dogapi
       @user_svc = Dogapi::V1::UserService.new(@api_key, @application_key, silent, timeout)
       @snapshot_svc = Dogapi::V1::SnapshotService.new(@api_key, @application_key, silent, timeout)
       @screenboard_svc = Dogapi::V1::ScreenboardService.new(@api_key, @application_key, silent, timeout)
-
+      @monitor_svc = Dogapi::V1::MonitorService.new(@api_key, @application_key, silent, timeout)
+      @service_check_svc = Dogapi::V1::ServiceCheckService.new(@api_key, @application_key, silent, timeout)
       @legacy_event_svc = Dogapi::EventService.new(@datadog_host)
     end
 
@@ -317,6 +318,74 @@ module Dogapi
       @screenboard_svc.share_screenboard(board_id)
     end
 
+    #
+    # MONITORS
+    #
+
+    def monitor(type, query, options = {})
+      @monitor_svc.monitor(type, query, options)
+    end
+
+    def update_monitor(monitor_id, query, options = {})
+      @monitor_svc.update_monitor(monitor_id, query, options)
+    end
+
+    def get_monitor(monitor_id, options = {})
+      @monitor_svc.get_monitor(monitor_id, options)
+    end
+
+    def delete_monitor(monitor_id)
+      @monitor_svc.delete_monitor(monitor_id)
+    end
+
+    def get_all_monitors(options = {})
+      @monitor_svc.get_all_monitors(options)
+    end
+
+    def mute_monitors()
+      @monitor_svc.mute_monitors()
+    end
+
+    def unmute_monitors()
+      @monitor_svc.unmute_monitors()
+    end
+
+    def mute_monitor(monitor_id, options = {})
+      @monitor_svc.mute_monitor(monitor_id, options)
+    end
+
+    def unmute_monitor(monitor_id, options = {})
+      @monitor_svc.unmute_monitor(monitor_id, options)
+    end
+
+    #
+    # MONITOR DOWNTIME
+    #
+
+    def schedule_downtime(scope, start, options = {})
+      @monitor_svc.schedule_downtime(scope, start, options)
+    end
+
+    def get_downtime(downtime_id)
+      @monitor_svc.get_downtime(downtime_id)
+    end
+
+    def cancel_downtime(downtime_id)
+      @monitor_svc.cancel_downtime(downtime_id)
+    end
+
+    def get_all_downtimes(options = {})
+      @monitor_svc.get_all_downtimes(options)
+    end
+
+    #
+    # SERVICE CHECKS
+    #
+
+    def service_check(check, host, status, options = {})
+      @service_check_svc.service_check(check, host, status, options)
+    end
+
     private
 
     def override_scope(options= {})

data/lib/dogapi/v1/event.rb

@@ -7,6 +7,8 @@ module Dogapi
     class EventService < Dogapi::APIService
 
       API_VERSION = "v1"
+      MAX_BODY_LENGTH = 4000
+      MAX_TITLE_LENGTH = 100
 
       # Records an Event with no duration
       def post(event, scope=nil)
@@ -17,8 +19,8 @@ module Dogapi
           }
 
           body = event.to_hash.merge({
-            :title => event.msg_title,
-            :text => event.msg_text,
+            :title => event.msg_title[0..MAX_TITLE_LENGTH - 1],
+            :text => event.msg_text[0..MAX_BODY_LENGTH - 1],
             :date_happened => event.date_happened.to_i,
             :host => scope.host,
             :device => scope.device,

data/lib/dogapi/v1/monitor.rb

@@ -0,0 +1,220 @@
+require 'dogapi'
+
+module Dogapi
+  class V1 # for namespacing
+
+    class MonitorService < Dogapi::APIService
+
+      API_VERSION = 'v1'
+
+      def monitor(type, query, options = {})
+        begin
+          params = {
+            :api_key => @api_key,
+            :application_key => @application_key
+          }
+
+          body = {
+            'type' => type,
+            'query' => query,
+          }.merge options
+
+          request(Net::HTTP::Post, "/api/#{API_VERSION}/monitor", params, body, true)
+        rescue Exception => e
+          suppress_error_if_silent e
+        end
+      end
+
+      def update_monitor(monitor_id, query, options)
+        begin
+          params = {
+            :api_key => @api_key,
+            :application_key => @application_key
+          }
+
+          body = {
+            'query' => query,
+          }.merge options
+
+          request(Net::HTTP::Put, "/api/#{API_VERSION}/monitor/#{monitor_id}", params, body, true)
+        rescue Exception => e
+          suppress_error_if_silent e
+        end
+      end
+
+      def get_monitor(monitor_id, options = {})
+        begin
+          params = {
+            :api_key => @api_key,
+            :application_key => @application_key
+          }
+
+          # :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
+
+          request(Net::HTTP::Get, "/api/#{API_VERSION}/monitor/#{monitor_id}", params, nil, false)
+        rescue Exception => e
+          suppress_error_if_silent e
+        end
+      end
+
+      def delete_monitor(monitor_id)
+        begin
+          params = {
+            :api_key => @api_key,
+            :application_key => @application_key
+          }
+
+          request(Net::HTTP::Delete, "/api/#{API_VERSION}/monitor/#{monitor_id}", params, nil, false)
+        rescue Exception => e
+          suppress_error_if_silent e
+        end
+      end
+
+      def get_all_monitors(options = {})
+        begin
+          params = {
+            :api_key => @api_key,
+            :application_key => @application_key
+          }
+
+          # :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
+
+          request(Net::HTTP::Get, "/api/#{API_VERSION}/monitor", params, nil, false)
+        rescue Exception => e
+          suppress_error_if_silent e
+        end
+      end
+
+      def mute_monitors()
+        begin
+          params = {
+            :api_key => @api_key,
+            :application_key => @application_key
+          }
+
+          request(Net::HTTP::Post, "/api/#{API_VERSION}/monitor/mute_all", params, nil, false)
+        rescue Exception => e
+          suppress_error_if_silent e
+        end
+      end
+
+      def unmute_monitors()
+        begin
+          params = {
+            :api_key => @api_key,
+            :application_key => @application_key
+          }
+
+          request(Net::HTTP::Post, "/api/#{API_VERSION}/monitor/unmute_all", params, nil, false)
+        rescue Exception => e
+          suppress_error_if_silent e
+        end
+      end
+
+      def mute_monitor(monitor_id, options = {})
+        begin
+          params = {
+            :api_key => @api_key,
+            :application_key => @application_key
+          }
+
+          request(Net::HTTP::Post, "/api/#{API_VERSION}/monitor/#{monitor_id}/mute", params, options, true)
+        rescue Exception => e
+          suppress_error_if_silent e
+        end
+      end
+
+      def unmute_monitor(monitor_id, options = {})
+        begin
+          params = {
+            :api_key => @api_key,
+            :application_key => @application_key
+          }
+
+          request(Net::HTTP::Post, "/api/#{API_VERSION}/monitor/#{monitor_id}/unmute", params, options, true)
+        rescue Exception => e
+          suppress_error_if_silent e
+        end
+      end
+
+      #
+      # DOWNTIMES
+
+      def schedule_downtime(scope, start, options = {})
+        begin
+          params = {
+            :api_key => @api_key,
+            :application_key => @application_key
+          }
+
+          body = {
+            'scope' => scope,
+            'start' => start
+          }.merge options
+
+          request(Net::HTTP::Post, "/api/#{API_VERSION}/downtime", params, body, true)
+        rescue Exception => e
+          suppress_error_if_silent e
+        end
+      end
+
+      def get_downtime(downtime_id)
+        begin
+          params = {
+            :api_key => @api_key,
+            :application_key => @application_key
+          }
+
+          request(Net::HTTP::Get, "/api/#{API_VERSION}/downtime/#{downtime_id}", params, nil, false)
+        rescue Exception => e
+          suppress_error_if_silent e
+        end
+      end
+
+      def cancel_downtime(downtime_id)
+        begin
+          params = {
+            :api_key => @api_key,
+            :application_key => @application_key
+          }
+
+          request(Net::HTTP::Delete, "/api/#{API_VERSION}/downtime/#{downtime_id}", params, nil, false)
+        rescue Exception => e
+          suppress_error_if_silent e
+        end
+      end
+
+      def get_all_downtimes(options = {})
+        begin
+          params = {
+            :api_key => @api_key,
+            :application_key => @application_key
+          }
+
+          if options[:current_only]
+            params[:current_only] = options[:current_only]
+            options.delete :current_only
+          end
+
+          request(Net::HTTP::Get, "/api/#{API_VERSION}/downtime", params, nil, false)
+        rescue Exception => e
+          suppress_error_if_silent e
+        end
+      end
+
+    end
+
+  end
+end

data/lib/dogapi/v1/service_check.rb

@@ -0,0 +1,32 @@
+require 'dogapi'
+
+module Dogapi
+  class V1
+
+    class ServiceCheckService < Dogapi::APIService
+
+      API_VERSION = 'v1'
+
+      def service_check(check, host, status, options = {})
+        begin
+          params = {
+            :api_key => @api_key,
+            :application_key => @application_key
+          }
+
+          body = {
+            'check' => check,
+            'host_name' => host,
+            'status' => status
+          }.merge options
+
+          request(Net::HTTP::Post, "/api/#{API_VERSION}/check_run", params, body, true)
+        rescue Exception => e
+          suppress_error_if_silent e
+        end
+      end
+
+    end
+
+  end
+end

data/lib/dogapi/v1.rb

@@ -8,3 +8,5 @@ require 'dogapi/v1/alert'
 require 'dogapi/v1/user'
 require 'dogapi/v1/snapshot'
 require 'dogapi/v1/screenboard'
+require 'dogapi/v1/monitor'
+require 'dogapi/v1/service_check'

data/lib/dogapi/version.rb

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

data/spec/alerts_spec.rb

@@ -17,8 +17,8 @@ describe "Alerts", :vcr => true do
       @dog.delete_alert(@new_alert[1]['id'])
     end
 
-    it "returns HTTP code 201" do
-      expect(@new_alert[0]).to eq '201'
+    it "returns HTTP code 200" do
+      expect(@new_alert[0]).to eq '200'
     end
 
     it "returns a valid event ID" do

data/spec/facade_spec.rb

@@ -103,7 +103,7 @@ describe "Facade", :vcr => true do
 
       code, resp = @dog.emit_event(event)
       now_event_id = resp["event"]["id"]
-      sleep 5
+      sleep 8
       code, resp = @dog.get_event(now_event_id)
       expect(resp['event']).not_to be_nil
       expect(resp['event']['text']).to eq(now_message)
@@ -113,7 +113,7 @@ describe "Facade", :vcr => true do
       event = Dogapi::Event.new('test message', :msg_title => 'title', :date_happened => Time.now(), :priority => "low")
       code, resp = @dog.emit_event(event)
       low_event_id = resp["event"]["id"]
-      sleep 5
+      sleep 8
       code, resp = @dog.get_event(low_event_id)
       expect(resp['event']).not_to be_nil
       low_event = resp['event']
@@ -126,7 +126,7 @@ describe "Facade", :vcr => true do
       first = resp["event"]["id"]
       code, resp = @dog.emit_event(Dogapi::Event.new("Testing Aggregation (second)", :aggregation_key => now.to_i))
       second = resp["event"]["id"]
-      sleep 5
+      sleep 8
       code, resp = @dog.get_event(first)
       expect(resp["event"]).not_to be_nil
       code, resp = @dog.get_event(second)

data/spec/support/cassettes/Alerts/create/returns_HTTP_code_200.yml

@@ -0,0 +1,98 @@
+---
+http_interactions:
+- request:
+    method: post
+    uri: https://app.datadoghq.com/api/v1/alert?api_key=9775a026f1ca7d1c6c5af9d94d9595a4&application_key=87ce4a24b5553d2e482ea8a8500e71b8ad4554ff
+    body:
+      encoding: UTF-8
+      string: '{"query":"avg(last_10m):avg:test.metric.metric{host:test.metric.host}
+        > 5"}'
+    headers:
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      Accept:
+      - '*/*'
+      User-Agent:
+      - Ruby
+      Content-Type:
+      - application/json
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Cache-Control:
+      - no-cache
+      Content-Type:
+      - application/json; charset=utf-8
+      Date:
+      - Mon, 17 Nov 2014 18:26:23 GMT
+      Pragma:
+      - no-cache
+      Server:
+      - gunicorn/19.1.0
+      Strict-Transport-Security:
+      - max-age=15724800;
+      Vary:
+      - Accept-Encoding
+      X-Dd-Version:
+      - 31.1883.245-0
+      Content-Length:
+      - '288'
+      Connection:
+      - keep-alive
+    body:
+      encoding: UTF-8
+      string: '{"event_object":"d709ad144fa2ddcc5daa4f866747a991","notify_audit":true,"timeout_h":null,"silenced":{},"query":"avg(last_10m):avg:test.metric.metric{host:test.metric.host}
+        > 5","message":"","id":103961,"name":"**test.metric.metric** over **host:test.metric.host**
+        was **> 5** on average during the **last 10m**.","no_data_timeframe":false,"creator":3658,"notify_no_data":false,"renotify_interval":null,"state":"No
+        Data","escalation_message":""}'
+    http_version: 
+  recorded_at: Mon, 17 Nov 2014 18:26:23 GMT
+- request:
+    method: delete
+    uri: https://app.datadoghq.com/api/v1/alert/103961?api_key=9775a026f1ca7d1c6c5af9d94d9595a4&application_key=87ce4a24b5553d2e482ea8a8500e71b8ad4554ff
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      Accept:
+      - '*/*'
+      User-Agent:
+      - Ruby
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Cache-Control:
+      - no-cache
+      Content-Type:
+      - application/json; charset=utf-8
+      Date:
+      - Mon, 17 Nov 2014 18:26:23 GMT
+      Pragma:
+      - no-cache
+      Server:
+      - gunicorn/19.1.0
+      Strict-Transport-Security:
+      - max-age=15724800;
+      Vary:
+      - Accept-Encoding
+      X-Dd-Version:
+      - 31.1883.245-0
+      Content-Length:
+      - '279'
+      Connection:
+      - keep-alive
+    body:
+      encoding: UTF-8
+      string: '{"event_object":"d709ad144fa2ddcc5daa4f866747a991","notify_audit":true,"timeout_h":null,"silenced":{},"query":"avg(last_10m):avg:test.metric.metric{host:test.metric.host}
+        > 5","message":"","name":"**test.metric.metric** over **host:test.metric.host**
+        was **> 5** on average during the **last 10m**.","no_data_timeframe":false,"creator":3658,"notify_no_data":false,"renotify_interval":null,"state":"No
+        Data","escalation_message":""}'
+    http_version: 
+  recorded_at: Mon, 17 Nov 2014 18:26:23 GMT
+recorded_with: VCR 2.9.3