dogapi 1.3.1 → 1.3.2

data/lib/dogapi/event.rb

@@ -12,7 +12,8 @@ module Dogapi
       :msg_text,
       :priority,
       :parent,
-      :tags
+      :tags,
+      :aggregation_key
 
   # Optional arguments:
   #  :date_happened => time in seconds since the epoch (defaults to now)
@@ -24,13 +25,15 @@ module Dogapi
   #  :alert_type    => 'success', 'error'
   #  :event_type    => String
   #  :source_type_name => String
+  #  :aggregation_key => String
     def initialize(msg_text, options={})
       defaults = {
         :date_happened => Time.now.to_i,
         :msg_title => '',
         :priority => "normal",
         :parent => nil,
-        :tags => []
+        :tags => [],
+        :aggregation_key => nil
       }
       options = defaults.merge(options)
 
@@ -40,7 +43,7 @@ module Dogapi
       @priority = options[:priority]
       @parent = options[:parent]
       @tags = options[:tags]
-      @event_object = options[:event_object]
+      @aggregation_key = options[:event_object] || options[:aggregation_key]
       @alert_type = options[:alert_type]
       @event_type = options[:event_type]
       @source_type_name = options[:source_type_name]

data/lib/dogapi/v1/event.rb

@@ -20,9 +20,10 @@ module Dogapi
           :text => event.msg_text,
           :date_happened => event.date_happened.to_i,
           :host => scope.host,
-          :device => scope.device
+          :device => scope.device,
+          :aggregation_key => event.aggregation_key.to_s
         })
-        
+
         request(Net::HTTP::Post, '/api/v1/events', params, body, true)
       end
 

data/tests/test_client.rb

@@ -61,20 +61,23 @@ class TestClient < Test::Unit::TestCase
     now = Time.now()
 
     now_ts = now
-    now_title = 'end test title ' + now_ts.to_i.to_s
+    now_title = 'dogapi-rb end test title ' + now_ts.to_i.to_s
     now_message = 'test message ' + now_ts.to_i.to_s
 
     before_ts = (now - 5*60)
-    before_title = 'start test title ' + before_ts.to_i.to_s
+    before_title = 'dogapi-rb start test title ' + before_ts.to_i.to_s
     before_message = 'test message ' + before_ts.to_i.to_s
 
     dog = Dogapi::Client.new(@api_key, @app_key)
     dog_r = Dogapi::Client.new(@api_key)
 
-    code, resp = dog_r.emit_event(Dogapi::Event.new(now_message, :msg_title =>now_title, :date_happened => now_ts))
+    e1 = Dogapi::Event.new(now_message, :msg_title =>now_title, :date_happened => now_ts)
+    e2 = Dogapi::Event.new(before_message, :msg_title =>before_title, :date_happened => before_ts)
+    code, resp = dog_r.emit_event(e1)
     now_event_id = resp["event"]["id"]
-    code, resp = dog_r.emit_event(Dogapi::Event.new(before_message, :msg_title =>before_title, :date_happened => before_ts))
+    code, resp = dog_r.emit_event(e2)
     before_event_id = resp["event"]["id"]
+
     sleep 3
 
     code, resp = dog.stream(before_ts, now_ts + 1)
@@ -97,7 +100,23 @@ class TestClient < Test::Unit::TestCase
     code, resp = dog.get_event(low_event_id)
     low_event = resp['event']
     puts low_event
-    assert low_event['priority'] == "low" 
+    assert low_event['priority'] == "low"
+
+    # Testing aggregates
+    agg_ts = Time.now()
+    code, resp = dog_r.emit_event(Dogapi::Event.new("Testing Aggregation (first)", :aggregation_key => now_ts.to_i))
+    first = resp["event"]["id"]
+    code, resp = dog_r.emit_event(Dogapi::Event.new("Testing Aggregation (second)", :aggregation_key => now_ts.to_i))
+    second = resp["event"]["id"]
+
+    sleep 3
+
+    code, resp = dog.get_event(first)
+    agg1 = resp["event"]
+    code, resp = dog.get_event(second)
+    agg2 = resp["event"]
+
+    # FIXME Need to export is_aggregate/children fields
   end
 
   def test_metrics
@@ -110,5 +129,4 @@ class TestClient < Test::Unit::TestCase
 
     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

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 3
-  - 1
-  version: 1.3.1
+  - 2
+  version: 1.3.2
 platform: ruby
 authors: 
 - Datadog, Inc.
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-05-24 00:00:00 -04:00
+date: 2012-06-04 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency