dogapi 1.22.0 → 1.23.0

data/lib/dogapi/v1/comment.rb

@@ -5,55 +5,24 @@ module Dogapi
 
     class CommentService < Dogapi::APIService
 
-      API_VERSION = "v1"
+      API_VERSION = 'v1'
 
       # Submit a comment.
       def comment(message, options = {})
-        begin
-          params = {
-            :api_key => @api_key,
-            :application_key => @application_key
-          }
-
-          body = {
-            'message' => message,
-          }.merge options
-
-          request(Net::HTTP::Post, "/api/#{API_VERSION}/comments", params, body, true)
-        rescue Exception => e
-          suppress_error_if_silent e
-        end
+        body = {
+          'message' => message,
+        }.merge options
+
+        request(Net::HTTP::Post, "/api/#{API_VERSION}/comments", nil, body, true)
       end
 
       # Update a comment.
       def update_comment(comment_id, options = {})
-        begin
-          params = {
-            :api_key => @api_key,
-            :application_key => @application_key
-          }
-
-          if options.empty?
-            raise "Must update something."
-          end
-
-          request(Net::HTTP::Put, "/api/#{API_VERSION}/comments/#{comment_id}", params, options, true)
-        rescue Exception => e
-          suppress_error_if_silent e
-        end
+        request(Net::HTTP::Put, "/api/#{API_VERSION}/comments/#{comment_id}", nil, options, true)
       end
 
       def delete_comment(comment_id)
-        begin
-          params = {
-            :api_key => @api_key,
-            :application_key => @application_key
-          }
-
-          request(Net::HTTP::Delete, "/api/#{API_VERSION}/comments/#{comment_id}", params, nil, false)
-        rescue Exception => e
-          suppress_error_if_silent e
-        end
+        request(Net::HTTP::Delete, "/api/#{API_VERSION}/comments/#{comment_id}", nil, nil, false)
       end
 
     end

data/lib/dogapi/v1/dash.rb

@@ -5,87 +5,40 @@ module Dogapi
 
     class DashService < Dogapi::APIService
 
-      API_VERSION = "v1"
+      API_VERSION = 'v1'
 
       def create_dashboard(title, description, graphs, template_variables = nil)
-
-        begin
-          params = {
-            :api_key => @api_key,
-            :application_key => @application_key
-          }
-
-          body = {
-            :title => title,
-            :description => description,
-            :graphs => graphs,
-            :template_variables => (template_variables or [])
-          }
-
-          request(Net::HTTP::Post, "/api/#{API_VERSION}/dash", params, body, true)
-        rescue Exception => e
-          suppress_error_if_silent e
-        end
+        body = {
+          :title => title,
+          :description => description,
+          :graphs => graphs,
+          :template_variables => (template_variables or [])
+        }
+
+        request(Net::HTTP::Post, "/api/#{API_VERSION}/dash", nil, body, true)
       end
 
       def update_dashboard(dash_id, title, description, graphs, template_variables=nil)
-
-        begin
-          params = {
-            :api_key => @api_key,
-            :application_key => @application_key
-          }
-
-          body = {
-            :title => title,
-            :description => description,
-            :graphs => graphs,
-            :template_variables => (template_variables or [])
-          }
-
-          request(Net::HTTP::Put, "/api/#{API_VERSION}/dash/#{dash_id}", params, body, true)
-        rescue Exception => e
-          suppress_error_if_silent e
-        end
+        body = {
+          :title => title,
+          :description => description,
+          :graphs => graphs,
+          :template_variables => (template_variables or [])
+        }
+
+        request(Net::HTTP::Put, "/api/#{API_VERSION}/dash/#{dash_id}", nil, body, true)
       end
 
       def get_dashboard(dash_id)
-        begin
-          params = {
-            :api_key => @api_key,
-            :application_key => @application_key
-          }
-
-          request(Net::HTTP::Get, "/api/#{API_VERSION}/dash/#{dash_id}", params, nil, false)
-        rescue Exception => e
-          suppress_error_if_silent e
-        end
+        request(Net::HTTP::Get, "/api/#{API_VERSION}/dash/#{dash_id}", nil, nil, false)
       end
 
       def get_dashboards
-        begin
-          params = {
-            :api_key => @api_key,
-            :application_key => @application_key
-          }
-
-          request(Net::HTTP::Get, "/api/#{API_VERSION}/dash", params, nil, false)
-        rescue Exception => e
-          suppress_error_if_silent e
-        end
+        request(Net::HTTP::Get, "/api/#{API_VERSION}/dash", nil, nil, false)
       end
 
       def delete_dashboard(dash_id)
-        begin
-          params = {
-            :api_key => @api_key,
-            :application_key => @application_key
-          }
-
-          request(Net::HTTP::Delete, "/api/#{API_VERSION}/dash/#{dash_id}", params, nil, false)
-        rescue Exception => e
-          suppress_error_if_silent e
-        end
+        request(Net::HTTP::Delete, "/api/#{API_VERSION}/dash/#{dash_id}", nil, nil, false)
       end
 
     end

data/lib/dogapi/v1/embed.rb

@@ -4,44 +4,25 @@ module Dogapi
   class V1 # for namespacing
 
     # ================
-    #    EMBED API 
+    #    EMBED API
     # ================
     class EmbedService < Dogapi::APIService
 
-      API_VERSION = "v1"
+      API_VERSION = 'v1'
 
       # Get all embeds for the API user's org
       def get_all_embeds()
-        begin
-          params = {
-            :api_key => @api_key,
-            :application_key => @application_key
-          }
-
-          request(Net::HTTP::Get, "/api/#{API_VERSION}/graph/embed", params, nil, false)
-        rescue Exception => e
-          suppress_error_if_silent e
-        end
+        request(Net::HTTP::Get, "/api/#{API_VERSION}/graph/embed", nil, nil, false)
       end
 
       # Get a specific embed
       #
       # :embed_id       => String: embed token for a specific embed
-      # :size           => String: "small", "medium"(defualt), "large", or "xlarge". 
+      # :size           => String: "small", "medium"(defualt), "large", or "xlarge".
       # :legend         => String: "yes" or "no"(default)
       # :template_vars  => String: variable name => variable value (any number of template vars)
       def get_embed(embed_id, description= {})
-        begin
-          # Initialize parameters and merge with description
-          params = {
-            :api_key => @api_key,
-            :application_key => @application_key,
-          }.merge(description)
-
-          request(Net::HTTP::Get, "/api/#{API_VERSION}/graph/embed/#{embed_id}", params, nil, false)
-        rescue Exception => e
-          suppress_error_if_silent e
-        end
+        request(Net::HTTP::Get, "/api/#{API_VERSION}/graph/embed/#{embed_id}", description, nil, false)
       end
 
       # Create an embeddable graph
@@ -52,52 +33,25 @@ module Dogapi
       # :legend      => String: flag representing whether a legend is displayed. Default is "no".
       # :title       => String: represents title of the graph. Default is "Embed created through API."
       def create_embed(graph_json, description= {})
-        begin
-          params = {
-            :api_key => @api_key,
-            :application_key => @application_key
-          }
-
-          body = {
-            :graph_json => graph_json,
-          }.merge(description)
+        body = {
+          :graph_json => graph_json,
+        }.merge(description)
 
-          request(Net::HTTP::Post, "/api/#{API_VERSION}/graph/embed", params, body, true)
-        rescue Exception => e
-          suppress_error_if_silent e
-        end
+        request(Net::HTTP::Post, "/api/#{API_VERSION}/graph/embed", nil, body, true)
       end
 
       # Enable a specific embed
       #
       # :embed_id  => String: embed token for a specific embed
       def enable_embed(embed_id)
-        begin
-          params = {
-            :api_key => @api_key,
-            :application_key => @application_key
-          }
-
-          request(Net::HTTP::Get, "/api/#{API_VERSION}/graph/embed/#{embed_id}/enable", params, nil, false)
-        rescue Exception => e
-          suppress_error_if_silent e
-        end
+        request(Net::HTTP::Get, "/api/#{API_VERSION}/graph/embed/#{embed_id}/enable", nil, nil, false)
       end
 
       # Revoke a specific embed
       #
       # :embed_id  => String: embed token for a specific embed
       def revoke_embed(embed_id)
-        begin
-          params = {
-            :api_key => @api_key,
-            :application_key => @application_key
-          }
-
-          request(Net::HTTP::Get, "/api/#{API_VERSION}/graph/embed/#{embed_id}/revoke", params, nil, false)
-        rescue Exception => e
-          suppress_error_if_silent e
-        end
+        request(Net::HTTP::Get, "/api/#{API_VERSION}/graph/embed/#{embed_id}/revoke", nil, nil, false)
       end
 
     end

data/lib/dogapi/v1/event.rb

@@ -6,93 +6,58 @@ module Dogapi
     # Event-specific client affording more granular control than the simple Dogapi::Client
     class EventService < Dogapi::APIService
 
-      API_VERSION = "v1"
+      API_VERSION = 'v1'
       MAX_BODY_LENGTH = 4000
       MAX_TITLE_LENGTH = 100
 
       # Records an Event with no duration
       def post(event, scope=nil)
-        begin
-          scope = scope || Dogapi::Scope.new()
-          params = {
-            :api_key => @api_key
-          }
+        scope = scope || Dogapi::Scope.new()
+        body = event.to_hash.merge({
+          :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,
+          :aggregation_key => event.aggregation_key.to_s
+        })
 
-          body = event.to_hash.merge({
-            :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,
-            :aggregation_key => event.aggregation_key.to_s
-          })
-
-          request(Net::HTTP::Post, '/api/v1/events', params, body, true)
-        rescue Exception => e
-          if @silent
-            warn e
-            return -1, {}
-          else
-            raise e
-          end
-        end
+        request(Net::HTTP::Post, '/api/v1/events', nil, body, true, false)
       end
 
       def get(id)
-        begin
-          params = {
-            :api_key => @api_key,
-            :application_key => @application_key
-          }
-
-          request(Net::HTTP::Get, '/api/' + API_VERSION + '/events/' + id.to_s, params, nil, false)
-        rescue Exception => e
-          if @silent
-            warn e
-            return -1, {}
-          else
-            raise e
-          end
-        end
+        request(Net::HTTP::Get, '/api/' + API_VERSION + '/events/' + id.to_s, nil, nil, false)
       end
 
-      def stream(start, stop, options = {})
-        begin
-          defaults = {
-            :priority => nil,
-            :sources => nil,
-            :tags => nil
-          }
-          options = defaults.merge(options)
-
-          params = {
-            :api_key => @api_key,
-            :application_key => @application_key,
+      def delete(id)
+        request(Net::HTTP::Delete, '/api/' + API_VERSION + '/events/' + id.to_s, nil, nil, false)
+      end
 
-            :start => start.to_i,
-            :end => stop.to_i
-          }
+      def stream(start, stop, options= {})
+        defaults = {
+          :priority => nil,
+          :sources => nil,
+          :tags => nil
+        }
+        options = defaults.merge(options)
 
-          if options[:priority]
-            params[:priority] = options[:priority]
-          end
-          if options[:sources]
-            params[:sources] = options[:sources]
-          end
-          if options[:tags]
-            tags = options[:tags]
-            params[:tags] = tags.kind_of?(Array) ? tags.join(",") : tags
-          end
+        extra_params = {
+          :start => start.to_i,
+          :end => stop.to_i
+        }
 
-          request(Net::HTTP::Get, '/api/' + API_VERSION + '/events', params, nil, false)
-        rescue Exception => e
-          if @silent
-            warn e
-            return -1, {}
-          else
-            raise e
-          end
+        if options[:priority]
+          extra_params[:priority] = options[:priority]
+        end
+        if options[:sources]
+          extra_params[:sources] = options[:sources]
         end
+        if options[:tags]
+          tags = options[:tags]
+          extra_params[:tags] = tags.kind_of?(Array) ? tags.join(',') : tags
+        end
+
+        request(Net::HTTP::Get, '/api/' + API_VERSION + '/events', extra_params, nil, false)
       end
 
     end

data/lib/dogapi/v1/metric.rb

@@ -6,54 +6,30 @@ module Dogapi
     # Event-specific client affording more granular control than the simple Dogapi::Client
     class MetricService < Dogapi::APIService
 
-      API_VERSION = "v1"
+      API_VERSION = 'v1'
 
       def get(query, from, to)
-        begin
-          params = {
-            :api_key => @api_key,
-            :application_key => @application_key,
-
-            from: from.to_i,
-            to: to.to_i,
-            query: query
-          }
-          request(Net::HTTP::Get, '/api/' + API_VERSION + '/query', params, nil, false)
-        rescue Exception => e
-          if @silent
-            warn e
-            return -1, {}
-          else
-            raise e
-          end
-        end
+        extra_params = {
+          from: from.to_i,
+          to: to.to_i,
+          query: query
+        }
+        request(Net::HTTP::Get, '/api/' + API_VERSION + '/query', extra_params, nil, false)
       end
 
       def upload(metrics)
-        begin
-          params = {
-            :api_key => @api_key
-          }
-          body = {
-            :series => metrics
-          }
-          request(Net::HTTP::Post, '/api/' + API_VERSION + '/series', params, body, true)
-        rescue Exception => e
-          if @silent
-            warn e
-            return -1, {}
-          else
-            raise e
-          end
-        end
+        body = {
+          :series => metrics
+        }
+        request(Net::HTTP::Post, '/api/' + API_VERSION + '/series', nil, body, true, false)
       end
 
-      def submit_to_api(metric, points, scope, options = {})
+      def submit_to_api(metric, points, scope, options= {})
         payload = self.make_metric_payload(metric, points, scope, options)
         self.upload([payload])
       end
 
-      def submit_to_buffer(metric, points, scope, options = {})
+      def submit_to_buffer(metric, points, scope, options= {})
         payload = self.make_metric_payload(metric, points, scope, options)
         @buffer << payload
         return 200, {}
@@ -83,10 +59,10 @@ module Dogapi
 
       def make_metric_payload(metric, points, scope, options)
         begin
-          typ = options[:type] || "gauge"
+          typ = options[:type] || 'gauge'
 
-          if typ != "gauge" && typ != "counter"
-            raise ArgumentError, "metric type must be gauge or counter"
+          if typ != 'gauge' && typ != 'counter'
+            raise ArgumentError, 'metric type must be gauge or counter'
           end
 
           metric_payload = {
@@ -104,12 +80,7 @@ module Dogapi
 
           return metric_payload
         rescue Exception => e
-          if @silent
-            warn e
-            return -1, {}
-          else
-            raise e
-          end
+          suppress_error_if_silent e
         end
       end
     end