dogapi 1.22.0 → 1.23.0

data/lib/dogapi/v1/monitor.rb

@@ -8,255 +8,115 @@ module Dogapi
       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
 
-          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
+        request(Net::HTTP::Post, "/api/#{API_VERSION}/monitor", nil, body, true)
       end
 
       def update_monitor(monitor_id, query, options)
-        begin
-          params = {
-            :api_key => @api_key,
-            :application_key => @application_key
-          }
-
-          body = {
-            'query' => query,
-          }.merge options
+        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
+        request(Net::HTTP::Put, "/api/#{API_VERSION}/monitor/#{monitor_id}", nil, body, true)
       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".
-          params[:group_states] = options[:group_states].join(',') if options[:group_states]
+        # :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]
 
-          request(Net::HTTP::Get, "/api/#{API_VERSION}/monitor/#{monitor_id}", params, nil, false)
-        rescue Exception => e
-          suppress_error_if_silent e
-        end
+        request(Net::HTTP::Get, "/api/#{API_VERSION}/monitor/#{monitor_id}", extra_params, nil, false)
       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
+        request(Net::HTTP::Delete, "/api/#{API_VERSION}/monitor/#{monitor_id}", nil, nil, false)
       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]
-            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)
-        rescue Exception => e
-          suppress_error_if_silent e
+        extra_params = {}
+        # :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
-      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
+        # :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
+
+        request(Net::HTTP::Get, "/api/#{API_VERSION}/monitor", extra_params, nil, false)
       end
 
-      def unmute_monitors()
-        begin
-          params = {
-            :api_key => @api_key,
-            :application_key => @application_key
-          }
+      def mute_monitors
+        request(Net::HTTP::Post, "/api/#{API_VERSION}/monitor/mute_all", nil, nil, false)
+      end
 
-          request(Net::HTTP::Post, "/api/#{API_VERSION}/monitor/unmute_all", params, nil, false)
-        rescue Exception => e
-          suppress_error_if_silent e
-        end
+      def unmute_monitors
+        request(Net::HTTP::Post, "/api/#{API_VERSION}/monitor/unmute_all", nil, nil, false)
       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
+        request(Net::HTTP::Post, "/api/#{API_VERSION}/monitor/#{monitor_id}/mute", nil, options, true)
       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
+        request(Net::HTTP::Post, "/api/#{API_VERSION}/monitor/#{monitor_id}/unmute", nil, options, true)
       end
 
       #
       # DOWNTIMES
 
       def schedule_downtime(scope, options = {})
-        begin
-          params = {
-            :api_key => @api_key,
-            :application_key => @application_key
-          }
-
-          body = {
-            'scope' => scope
-          }.merge options
+        body = {
+          'scope' => scope
+        }.merge options
 
-          request(Net::HTTP::Post, "/api/#{API_VERSION}/downtime", params, body, true)
-        rescue Exception => e
-          suppress_error_if_silent e
-        end
+        request(Net::HTTP::Post, "/api/#{API_VERSION}/downtime", nil, body, true)
       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
+        request(Net::HTTP::Put, "/api/#{API_VERSION}/downtime/#{downtime_id}", nil, options, true)
       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
+        request(Net::HTTP::Get, "/api/#{API_VERSION}/downtime/#{downtime_id}", nil, nil, false)
       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
+        request(Net::HTTP::Delete, "/api/#{API_VERSION}/downtime/#{downtime_id}", nil, nil, false)
       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
+        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)
       end
 
       #
       # HOST MUTING
 
       def mute_host(hostname, options = {})
-        begin
-          params = {
-            :api_key => @api_key,
-            :application_key => @application_key
-          }
-
-          request(Net::HTTP::Post, "/api/#{API_VERSION}/host/#{hostname}/mute", params, options, true)
-        rescue Exception => e
-          suppress_error_if_silent e
-        end
+        request(Net::HTTP::Post, "/api/#{API_VERSION}/host/#{hostname}/mute", nil, options, true)
       end
-      def unmute_host(hostname)
-        begin
-          params = {
-            :api_key => @api_key,
-            :application_key => @application_key
-          }
 
-          request(Net::HTTP::Post, "/api/#{API_VERSION}/host/#{hostname}/unmute", params, nil, true)
-        rescue Exception => e
-          suppress_error_if_silent e
-        end
+      def unmute_host(hostname)
+        request(Net::HTTP::Post, "/api/#{API_VERSION}/host/#{hostname}/unmute", nil, {}, true)
       end
     end
 

data/lib/dogapi/v1/screenboard.rb

@@ -5,103 +5,34 @@ module Dogapi
 
     class ScreenboardService < Dogapi::APIService
 
-      API_VERSION = "v1"
+      API_VERSION = 'v1'
 
       def create_screenboard(description)
-
-        begin
-          params = {
-            :api_key => @api_key,
-            :application_key => @application_key
-          }
-
-          body = description
-
-          request(Net::HTTP::Post, "/api/#{API_VERSION}/screen", params, description, true)
-        rescue Exception => e
-          suppress_error_if_silent e
-        end
+        request(Net::HTTP::Post, "/api/#{API_VERSION}/screen", nil, description, true)
       end
 
       def update_screenboard(board_id, description)
-
-        begin
-          params = {
-            :api_key => @api_key,
-            :application_key => @application_key
-          }
-
-          body = description
-
-          request(Net::HTTP::Put, "/api/#{API_VERSION}/screen/#{board_id}", params, body, true)
-        rescue Exception => e
-          suppress_error_if_silent e
-        end
+        request(Net::HTTP::Put, "/api/#{API_VERSION}/screen/#{board_id}", nil, description, true)
       end
 
       def get_screenboard(board_id)
-        begin
-          params = {
-            :api_key => @api_key,
-            :application_key => @application_key
-          }
-
-          request(Net::HTTP::Get, "/api/#{API_VERSION}/screen/#{board_id}", params, nil, false)
-        rescue Exception => e
-          suppress_error_if_silent e
-        end
+        request(Net::HTTP::Get, "/api/#{API_VERSION}/screen/#{board_id}", nil, nil, false)
       end
 
       def get_all_screenboards()
-        begin
-          params = {
-            :api_key => @api_key,
-            :application_key => @application_key
-          }
-
-          request(Net::HTTP::Get, "/api/#{API_VERSION}/screen", params, nil, false)
-        rescue Exception => e
-          suppress_error_if_silent e
-        end
+        request(Net::HTTP::Get, "/api/#{API_VERSION}/screen", nil, nil, false)
       end
 
       def delete_screenboard(board_id)
-        begin
-          params = {
-            :api_key => @api_key,
-            :application_key => @application_key
-          }
-
-          request(Net::HTTP::Delete, "/api/#{API_VERSION}/screen/#{board_id}", params, nil, false)
-        rescue Exception => e
-          suppress_error_if_silent e
-        end
+        request(Net::HTTP::Delete, "/api/#{API_VERSION}/screen/#{board_id}", nil, nil, false)
       end
 
       def share_screenboard(board_id)
-        begin
-          params = {
-            :api_key => @api_key,
-            :application_key => @application_key
-          }
-
-          request(Net::HTTP::Get, "/api/#{API_VERSION}/screen/share/#{board_id}", params, nil, false)
-        rescue Exception => e
-          suppress_error_if_silent e
-        end
+        request(Net::HTTP::Get, "/api/#{API_VERSION}/screen/share/#{board_id}", nil, nil, false)
       end
 
       def revoke_screenboard(board_id)
-        begin
-          params = {
-            :api_key => @api_key,
-            :application_key => @application_key
-          }
-
-          request(Net::HTTP::Delete, "/api/#{API_VERSION}/screen/share/#{board_id}", params, nil, false)
-        rescue Exception => e
-          suppress_error_if_silent e
-        end
+        request(Net::HTTP::Delete, "/api/#{API_VERSION}/screen/share/#{board_id}", nil, nil, false)
       end
 
     end

data/lib/dogapi/v1/search.rb

@@ -5,20 +5,14 @@ module Dogapi
 
     class SearchService < Dogapi::APIService
 
-      API_VERSION = "v1"
+      API_VERSION = 'v1'
 
       def search(query)
-        begin
-          params = {
-            :api_key => @api_key,
-            :application_key => @application_key,
-            :q => query
-          }
+        extra_params = {
+          :q => query
+        }
 
-          request(Net::HTTP::Get, "/api/#{API_VERSION}/search", params, nil, false)
-        rescue Exception => e
-          suppress_error_if_silent e
-        end
+        request(Net::HTTP::Get, "/api/#{API_VERSION}/search", extra_params, nil, false)
       end
 
     end

data/lib/dogapi/v1/service_check.rb

@@ -8,22 +8,13 @@ module Dogapi
       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
 
-          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
+        request(Net::HTTP::Post, "/api/#{API_VERSION}/check_run", nil, body, true)
       end
 
     end