dogapi 1.3.0 → 1.3.1

data/lib/dogapi/facade.rb

@@ -42,14 +42,17 @@ module Dogapi
     #  :timestamp => Ruby stdlib Time
     #  :host      => String
     #  :device    => String
+    #  :options   => Map
+    #
+    # options[:type] = "counter" to specify a counter metric
+    # options[:tags] = ["tag1", "tag2"] to tag the point
     def emit_point(metric, value, options={})
       defaults = {:timestamp => Time.now, :host => nil, :device => nil}
       options = defaults.merge(options)
 
       self.emit_points(metric,
                        [[options[:timestamp], value]],
-                       :host => options[:host],
-                       :device => options[:device])
+                       options)
     end
 
     # Record a set of points of metric data
@@ -59,6 +62,10 @@ module Dogapi
     # Optional arguments:
     #  :host   => String
     #  :device => String
+    #  :options   => Map
+    #
+    # options[:type] = "counter" to specify a counter metric
+    # options[:tags] = ["tag1", "tag2"] to tag the point
     def emit_points(metric, points, options={})
       defaults = {:host => nil, :device => nil}
       options = defaults.merge(options)
@@ -71,7 +78,7 @@ module Dogapi
         p[1] = p[1].to_f # TODO: stupid to_f will never raise an exception
       end
 
-      @metric_svc.submit(metric, points, scope)
+      @metric_svc.submit(metric, points, scope, options)
     end
 
     #

data/lib/dogapi/v1/metric.rb

@@ -9,22 +9,33 @@ module Dogapi
       API_VERSION = "v1"
 
       # Records an Event with no duration
-      def submit(metric, points, scope)
+      def submit(metric, points, scope, options={})
         params = {
           :api_key => @api_key
         }
+        typ = options[:type] || "gauge"
+
+        if typ != "gauge" && typ == "counter"
+          raise ArgumentError, "metric type must be gauge or counter"
+        end
 
         body = { :series => [
             {
               :metric => metric,
               :points => points,
-              :type => "gauge",
+              :type => typ,
               :host => scope.host,
               :device => scope.device
             }
           ]
         }
 
+
+        # Add tags if there are any
+        if not options[:tags].nil?
+          body[:series][0][:tags] = options[:tags]
+        end
+
         request(Net::HTTP::Post, '/api/' + API_VERSION + '/series', params, body, true)
       end
     end

data/tests/test_client.rb

@@ -90,6 +90,14 @@ class TestClient < Test::Unit::TestCase
 
     assert now_event['text'] == now_message
     assert before_event['text'] == before_message
+
+    # Testing priorities
+    code, resp = dog_r.emit_event(Dogapi::Event.new(now_message, :msg_title =>now_title, :date_happened => now_ts, :priority => "low"))
+    low_event_id = resp["event"]["id"]
+    code, resp = dog.get_event(low_event_id)
+    low_event = resp['event']
+    puts low_event
+    assert low_event['priority'] == "low" 
   end
 
   def test_metrics
@@ -99,6 +107,8 @@ class TestClient < Test::Unit::TestCase
 
     dog_r.emit_point('test.metric.metric', 10, :host => 'test.metric.host')
     dog_r.emit_points('test.metric.metric', [[Time.now-5*60, 0]], :host => 'test.metric.host')
+
+    dog_r.emit_points('test.metric.metric', [[Time.now-60, 20], [Time.now-30, 10], [Time.now, 5]], :tags => ["test:tag.1", "test:tag2"])
   end
 
 end

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: dogapi
 version: !ruby/object:Gem::Version 
-  hash: 27
-  prerelease: 
+  prerelease: false
   segments: 
   - 1
   - 3
-  - 0
-  version: 1.3.0
+  - 1
+  version: 1.3.1
 platform: ruby
 authors: 
 - Datadog, Inc.
@@ -15,17 +14,16 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-04-30 00:00:00 Z
+date: 2012-05-24 00:00:00 -04:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: json
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 1
         segments: 
         - 1
         - 5
@@ -55,6 +53,7 @@ files:
 - lib/dogapi.rb
 - tests/test_client.rb
 - README.rdoc
+has_rdoc: true
 homepage: http://datadoghq.com/
 licenses: 
 - BSD
@@ -69,27 +68,23 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Ruby bindings for Datadog's API