dogapi 1.8.1 → 1.9.0

data/spec/support/cassettes/Facade/Tags/adds_updates_and_detaches_tags.yml

@@ -0,0 +1,352 @@
+---
+http_interactions:
+- request:
+    method: post
+    uri: https://app.datadoghq.com/api/v1/series?api_key=9775a026f1ca7d1c6c5af9d94d9595a4
+    body:
+      encoding: UTF-8
+      string: ! '{"series":[{"metric":"test.tag.metric","points":[[1377814456,1.0]],"type":"gauge","host":"test.tag.host","device":null}]}'
+    headers:
+      Accept:
+      - ! '*/*'
+      User-Agent:
+      - Ruby
+      Content-Type:
+      - application/json
+  response:
+    status:
+      code: 202
+      message: Accepted
+    headers:
+      Content-Type:
+      - text/json; charset=UTF-8
+      Date:
+      - Thu, 29 Aug 2013 22:14:17 GMT
+      Server:
+      - dogdispatcher/4.7.0
+      Content-Length:
+      - '15'
+      Connection:
+      - keep-alive
+    body:
+      encoding: US-ASCII
+      string: ! '{"status":"ok"}'
+    http_version: 
+  recorded_at: Thu, 29 Aug 2013 22:14:17 GMT
+- request:
+    method: delete
+    uri: https://app.datadoghq.com/api/v1/tags/hosts/test.tag.host?api_key=9775a026f1ca7d1c6c5af9d94d9595a4&application_key=87ce4a24b5553d2e482ea8a8500e71b8ad4554ff
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Accept:
+      - ! '*/*'
+      User-Agent:
+      - Ruby
+  response:
+    status:
+      code: 204
+      message: No Content
+    headers:
+      Cache-Control:
+      - no-cache
+      Content-Length:
+      - '4'
+      Content-Type:
+      - application/json
+      Date:
+      - Thu, 29 Aug 2013 22:15:11 GMT
+      Pragma:
+      - no-cache
+      Server:
+      - gunicorn/0.17.4
+      Set-Cookie:
+      - user={"org":{"id":1499},"_type":"User","id":3658}; Path=/
+      X-Dd-Version:
+      - 31.161-301-21fcab4
+      Connection:
+      - keep-alive
+    body:
+      encoding: US-ASCII
+      string: ''
+    http_version: 
+  recorded_at: Thu, 29 Aug 2013 22:15:11 GMT
+- request:
+    method: get
+    uri: https://app.datadoghq.com/api/v1/tags/hosts/test.tag.host?api_key=9775a026f1ca7d1c6c5af9d94d9595a4&application_key=87ce4a24b5553d2e482ea8a8500e71b8ad4554ff
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Accept:
+      - ! '*/*'
+      User-Agent:
+      - Ruby
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Cache-Control:
+      - no-cache
+      Content-Type:
+      - application/json
+      Date:
+      - Thu, 29 Aug 2013 22:15:26 GMT
+      Pragma:
+      - no-cache
+      Server:
+      - gunicorn/0.17.4
+      Set-Cookie:
+      - user={"org":{"id":1499},"_type":"User","id":3658}; Path=/
+      X-Dd-Version:
+      - 31.161-301-21fcab4
+      Content-Length:
+      - '12'
+      Connection:
+      - keep-alive
+    body:
+      encoding: US-ASCII
+      string: ! '{"tags": []}'
+    http_version: 
+  recorded_at: Thu, 29 Aug 2013 22:15:26 GMT
+- request:
+    method: post
+    uri: https://app.datadoghq.com/api/v1/tags/hosts/test.tag.host?api_key=9775a026f1ca7d1c6c5af9d94d9595a4&application_key=87ce4a24b5553d2e482ea8a8500e71b8ad4554ff
+    body:
+      encoding: UTF-8
+      string: ! '{"tags":["test.tag.1","test.tag.2"]}'
+    headers:
+      Accept:
+      - ! '*/*'
+      User-Agent:
+      - Ruby
+      Content-Type:
+      - application/json
+  response:
+    status:
+      code: 201
+      message: Created
+    headers:
+      Cache-Control:
+      - no-cache
+      Content-Type:
+      - application/json
+      Date:
+      - Thu, 29 Aug 2013 22:17:11 GMT
+      Pragma:
+      - no-cache
+      Server:
+      - gunicorn/0.17.4
+      Set-Cookie:
+      - user={"org":{"id":1499},"_type":"User","id":3658}; Path=/
+      X-Dd-Version:
+      - 31.161-301-21fcab4
+      Content-Length:
+      - '63'
+      Connection:
+      - keep-alive
+    body:
+      encoding: US-ASCII
+      string: ! '{"host": "test.tag.host", "tags": ["test.tag.2", "test.tag.1"]}'
+    http_version: 
+  recorded_at: Thu, 29 Aug 2013 22:17:11 GMT
+- request:
+    method: get
+    uri: https://app.datadoghq.com/api/v1/tags/hosts/test.tag.host?api_key=9775a026f1ca7d1c6c5af9d94d9595a4&application_key=87ce4a24b5553d2e482ea8a8500e71b8ad4554ff
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Accept:
+      - ! '*/*'
+      User-Agent:
+      - Ruby
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Cache-Control:
+      - no-cache
+      Content-Type:
+      - application/json
+      Date:
+      - Thu, 29 Aug 2013 22:17:11 GMT
+      Pragma:
+      - no-cache
+      Server:
+      - gunicorn/0.17.4
+      Set-Cookie:
+      - user={"org":{"id":1499},"_type":"User","id":3658}; Path=/
+      X-Dd-Version:
+      - 31.161-301-21fcab4
+      Content-Length:
+      - '38'
+      Connection:
+      - keep-alive
+    body:
+      encoding: US-ASCII
+      string: ! '{"tags": ["test.tag.2", "test.tag.1"]}'
+    http_version: 
+  recorded_at: Thu, 29 Aug 2013 22:17:11 GMT
+- request:
+    method: post
+    uri: https://app.datadoghq.com/api/v1/tags/hosts/test.tag.host?api_key=9775a026f1ca7d1c6c5af9d94d9595a4&application_key=87ce4a24b5553d2e482ea8a8500e71b8ad4554ff
+    body:
+      encoding: UTF-8
+      string: ! '{"tags":["test.tag.3"]}'
+    headers:
+      Accept:
+      - ! '*/*'
+      User-Agent:
+      - Ruby
+      Content-Type:
+      - application/json
+  response:
+    status:
+      code: 201
+      message: Created
+    headers:
+      Cache-Control:
+      - no-cache
+      Content-Type:
+      - application/json
+      Date:
+      - Thu, 29 Aug 2013 22:22:15 GMT
+      Pragma:
+      - no-cache
+      Server:
+      - gunicorn/0.17.4
+      Set-Cookie:
+      - user={"org":{"id":1499},"_type":"User","id":3658}; Path=/
+      X-Dd-Version:
+      - 31.161-301-21fcab4
+      Content-Length:
+      - '77'
+      Connection:
+      - keep-alive
+    body:
+      encoding: US-ASCII
+      string: ! '{"host": "test.tag.host", "tags": ["test.tag.2", "test.tag.3", "test.tag.1"]}'
+    http_version: 
+  recorded_at: Thu, 29 Aug 2013 22:22:15 GMT
+- request:
+    method: get
+    uri: https://app.datadoghq.com/api/v1/tags/hosts/test.tag.host?api_key=9775a026f1ca7d1c6c5af9d94d9595a4&application_key=87ce4a24b5553d2e482ea8a8500e71b8ad4554ff
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Accept:
+      - ! '*/*'
+      User-Agent:
+      - Ruby
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Cache-Control:
+      - no-cache
+      Content-Type:
+      - application/json
+      Date:
+      - Thu, 29 Aug 2013 22:22:16 GMT
+      Pragma:
+      - no-cache
+      Server:
+      - gunicorn/0.17.4
+      Set-Cookie:
+      - user={"org":{"id":1499},"_type":"User","id":3658}; Path=/
+      X-Dd-Version:
+      - 31.161-301-21fcab4
+      Content-Length:
+      - '52'
+      Connection:
+      - keep-alive
+    body:
+      encoding: US-ASCII
+      string: ! '{"tags": ["test.tag.2", "test.tag.3", "test.tag.1"]}'
+    http_version: 
+  recorded_at: Thu, 29 Aug 2013 22:22:16 GMT
+- request:
+    method: delete
+    uri: https://app.datadoghq.com/api/v1/tags/hosts/test.tag.host?api_key=9775a026f1ca7d1c6c5af9d94d9595a4&application_key=87ce4a24b5553d2e482ea8a8500e71b8ad4554ff
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Accept:
+      - ! '*/*'
+      User-Agent:
+      - Ruby
+  response:
+    status:
+      code: 204
+      message: No Content
+    headers:
+      Cache-Control:
+      - no-cache
+      Content-Length:
+      - '4'
+      Content-Type:
+      - application/json
+      Date:
+      - Thu, 29 Aug 2013 22:23:47 GMT
+      Pragma:
+      - no-cache
+      Server:
+      - gunicorn/0.17.4
+      Set-Cookie:
+      - user={"org":{"id":1499},"_type":"User","id":3658}; Path=/
+      X-Dd-Version:
+      - 31.161-301-21fcab4
+      Connection:
+      - keep-alive
+    body:
+      encoding: US-ASCII
+      string: ''
+    http_version: 
+  recorded_at: Thu, 29 Aug 2013 22:23:47 GMT
+- request:
+    method: get
+    uri: https://app.datadoghq.com/api/v1/tags/hosts/test.tag.host?api_key=9775a026f1ca7d1c6c5af9d94d9595a4&application_key=87ce4a24b5553d2e482ea8a8500e71b8ad4554ff
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Accept:
+      - ! '*/*'
+      User-Agent:
+      - Ruby
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Cache-Control:
+      - no-cache
+      Content-Type:
+      - application/json
+      Date:
+      - Thu, 29 Aug 2013 22:23:47 GMT
+      Pragma:
+      - no-cache
+      Server:
+      - gunicorn/0.17.4
+      Set-Cookie:
+      - user={"org":{"id":1499},"_type":"User","id":3658}; Path=/
+      X-Dd-Version:
+      - 31.161-301-21fcab4
+      Content-Length:
+      - '12'
+      Connection:
+      - keep-alive
+    body:
+      encoding: US-ASCII
+      string: ! '{"tags": []}'
+    http_version: 
+  recorded_at: Thu, 29 Aug 2013 22:23:48 GMT
+recorded_with: VCR 2.5.0

data/tests/test_alerts.rb

@@ -8,7 +8,7 @@ class TestAlerts < Test::Unit::TestCase
   def test_alerts
     dog = Dogapi::Client.new(@api_key, @app_key)
 
-    query = 'sum(last_1d):sum:system.net.bytes_rcvd{host:host0} > 100'
+    query = 'avg(last_1h):sum:system.net.bytes_rcvd{host:host0} > 100'
 
     alert_id = dog.alert(query)[1]['id']
     status, alert = dog.get_alert(alert_id)
@@ -22,8 +22,8 @@ class TestAlerts < Test::Unit::TestCase
 
     dog.delete_alert(alert_id)
 
-    query1 = 'sum(last_1d):sum:system.net.bytes_rcvd{host:host0} > 100'
-    query2 = 'sum(last_1d):sum:system.net.bytes_rcvd{host:host0} > 200'
+    query1 = 'avg(last_1h):sum:system.net.bytes_rcvd{host:host0} > 100'
+    query2 = 'avg(last_1h):sum:system.net.bytes_rcvd{host:host0} > 200'
 
     alert_id1 = dog.alert(query1)[1]['id']
     alert_id2 = dog.alert(query2)[1]['id']

data/tests/test_client.rb

@@ -12,120 +12,6 @@ class TestClient < Test::Unit::TestCase
     assert Dogapi.find_localhost == %x[hostname -f].strip
   end
 
-  def test_tags
-    hostname = "test.tag.host.#{job_number}"
-    dog = Dogapi::Client.new(@api_key, @app_key)
-
-    # post a metric to make sure the test host context exists
-    dog.emit_point('test.tag.metric', 1, :host => hostname)
-
-    # Disable this call until we fix the timeouts
-    # dog.all_tags()
-
-    sleep 3
-
-    dog.detach_tags(hostname)
-    code, resp = dog.host_tags(hostname)
-    assert resp["tags"].size == 0
-
-    dog.add_tags(hostname, ['test.tag.1', 'test.tag.2'])
-    code, resp = dog.host_tags(hostname)
-    new_tags = resp["tags"]
-    assert new_tags.size == 2
-    assert new_tags.include?('test.tag.1')
-    assert new_tags.include?('test.tag.2')
-
-    dog.add_tags(hostname, ['test.tag.3'])
-    code, resp = dog.host_tags(hostname)
-    new_tags = resp["tags"]
-    assert new_tags.size == 3
-    assert new_tags.include?('test.tag.1')
-    assert new_tags.include?('test.tag.2')
-    assert new_tags.include?('test.tag.3')
-
-    dog.update_tags(hostname, ['test.tag.4'])
-    code, resp = dog.host_tags(hostname)
-    new_tags = resp["tags"]
-    assert new_tags.size == 1
-    assert new_tags.include?('test.tag.4')
-
-    dog.detach_tags(hostname)
-    code, resp = dog.host_tags(hostname)
-    assert resp["tags"].size == 0
-  end
-
-  def test_events
-    now = Time.now()
-
-    # Tag the events with the build number, because Travis parallel testing
-    # can cause problems with the event stream
-    tags = ["test-run:#{job_number}"]
-
-    now_ts = now
-    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 = '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)
-
-    e1 = Dogapi::Event.new(now_message, :msg_title => now_title,
-      :date_happened => now_ts, :tags => tags)
-    e2 = Dogapi::Event.new(before_message, :msg_title => before_title,
-      :date_happened => before_ts, :tags => tags)
-
-    code, resp = dog_r.emit_event(e1)
-    now_event_id = resp["event"]["id"]
-    code, resp = dog_r.emit_event(e2)
-    before_event_id = resp["event"]["id"]
-
-    sleep 5
-
-    code, resp = dog.stream(before_ts, now_ts + 1, :tags => tags)
-    stream = resp["events"]
-
-    code, resp = dog.get_event(now_event_id)
-    assert !resp['event'].nil?
-    now_event = resp['event']
-
-    code, resp = dog.get_event(before_event_id)
-    assert !resp['event'].nil?
-    before_event = resp['event']
-
-    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"]
-
-    sleep 5
-
-    code, resp = dog.get_event(low_event_id)
-    assert !resp['event'].nil?
-    low_event = resp['event']
-    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
     # FIXME: actually verify this once there's a way to look at metrics through the api
     dog = Dogapi::Client.new(@api_key, @app_key)