lita-datadog 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d792f049f2c903792f8cb120c287e363c3f7db64
-  data.tar.gz: 2b2be86036fbd45be1d6790e952ecfb943be5ed3
+  metadata.gz: fd4e57520c88208a94b5c25e9097ddb937434faa
+  data.tar.gz: 83cb05a53cfc3fb0a92599d4ca5bf9aa3423c6fe
 SHA512:
-  metadata.gz: 8284cb8a9a066aecfe14f0a48aefc90a803fffb3a168cd191939cc9874327322df3a12a6e917def236ce1918e99910565d83de412350fa6ed0663995314f3e1e
-  data.tar.gz: f3443b1b0f27fce7981a533706641f58ac6f67048dd12765c7d5d32201747fae1c790280e0880eca20cc8e7fea8431739eac4186f16beab7f0b22f6f0a225f0d
+  metadata.gz: 6b69e3ff4a8a1929187424cef95957ee6dfcc7644fc9cf631bb0cd2438368c87eff14e628377e4fec97678b2db03e22434075ce63905d29a6423bee507c27757
+  data.tar.gz: 146518897c2d1ce891f12f0ddbaf27b130895e5f7be0ef40e03b75d1fe84f404b8178781ca54db09c5e6d7cdad4b47bd84c17c922c00589ffdc45b460388d0b6

data/.rubocop.yml

@@ -3,7 +3,10 @@ AllCops:
     - lita-datadog.gemspec
 
 LineLength:
-  Max: 99
+  Max: 120
+
+MethodLength:
+  Max: 20
 
 Documentation:
   Enabled: false

data/.travis.yml

@@ -1,6 +1,6 @@
 language: ruby
 rvm:
-  - 2.0.0
+  - 2.1.0
 script: bundle exec rake
 before_install:
   - gem update --system

data/README.md

@@ -25,7 +25,8 @@ You will need to get your API key, and configure an application key.  Go to http
 
 ### Optional attributes
 
-* `default_timerange` (Integer) - How long in seconds a default time range will be for graphs.  Default: `3600`
+* `timerange` (Integer) - How long in seconds a time range will be for graphs. Default: `3600`
+* `waittime` (Integer) - How long to wait after getting a URL from Datadog to display it (sometimes the graph isn't ready yet). Default: `1`
 
 ### Example
 
@@ -33,9 +34,25 @@ You will need to get your API key, and configure an application key.  Go to http
 
 ```
 Lita graph metric:"system.load.1{*}"
+Lita graph metric:"system.load.1{host:hostname01}"
 Lita graph metric:"system.load.1{*},system.load.5{*}"
+Lita graph metric:"system.load.1{*}" event:"sources:sourcename"
+Lita graph metric:"system.load.1{*}" start:"2 hours ago"
+Lita graph metric:"system.load.1{*}" from:"2 hours ago" to:"30 minutes ago"
 ```
 
+Graph takes the following arguments:
+```
+metric:"<metric>"
+event:"<event>"
+start:"<time description>"
+end:"<time description>"
+from:"<time description>"
+to:"<time description>"
+```
+
+Time descriptions are parsed by https://github.com/mojombo/chronic
+
 ## License
 
 [MIT](http://opensource.org/licenses/MIT)

data/lib/lita/handlers/datadog.rb

@@ -1,29 +1,30 @@
 require 'dogapi'
+require 'chronic'
 
 module Lita
   module Handlers
     class Datadog < Handler
       route(
-        /^graph\smetric:"(\S+)"$/,
-        :simple_metric,
+        /^graph\s(.*)$/,
+        :graph,
         command: true,
         help: { 'graph metric:"simple.metric.1{*},simple.metric.5{*}"' =>
-          'Graph those metrics across all events, for the default time range' }
+          'Graph those metrics, for the default time range' }
       )
 
       def self.default_config(config)
         config.api_key = nil
         config.application_key = nil
-        config.default_timerange = 3600
+        config.timerange = 3600
+        config.waittime = 1
       end
 
-      def simple_metric(response)
-        metric = response.matches[0][0]
-        end_ts = Time.now.to_i
-        start_ts = end_ts - Lita.config.handlers.datadog.default_timerange
-        _return_code, snapshot = graph_snapshot(metric, start_ts, end_ts, '*')
-        if snapshot
-          sleep 1  # TODO: Requesting the image immediately causes a blank image to be cached.
+      def graph(response)
+        args = parse_arguments(response.matches[0][0])
+        return_code, snapshot = graph_snapshot(args[:metric], args[:start],
+                                               args[:end], args[:event])
+        if return_code.to_s == '200'
+          sleep Lita.config.handlers.datadog.waittime
           response.reply(snapshot['snapshot_url'])
         else
           response.reply('Error requesting Datadog graph')
@@ -41,6 +42,21 @@ module Lita
 
         return client.graph_snapshot(metric_query, start_ts, end_ts, event_query) if client
       end
+
+      def parse_arguments(arg_string)
+        end_m    = /(to|end):"(.+?)"/.match(arg_string)
+        end_ts   = end_m ? Chronic.parse(end_m[2]).to_i : Time.now.to_i
+        start_m  = /(from|start):"(.+?)"/.match(arg_string)
+        start_ts = start_m ? Chronic.parse(start_m[2]).to_i : end_ts - Lita.config.handlers.datadog.timerange
+        metric_m = /metric:"(.+?)"/.match(arg_string)
+        metric   = metric_m ? metric_m[1] : 'system.load.1{*}'
+        event_m  = /event:"(.+?)"/.match(arg_string)
+        event    = event_m ? event_m[1] : ''
+        { metric: metric,
+          start: start_ts,
+          end: end_ts,
+          event: event }
+      end
     end
 
     Lita.register_handler(Datadog)

data/lita-datadog.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name          = "lita-datadog"
-  spec.version       = "0.1.0"
+  spec.version       = "0.2.0"
   spec.authors       = ["Eric Sigler"]
   spec.email         = ["me@esigler.com"]
   spec.description   = %q{A Lita handler for interacting with Datadog}
@@ -16,6 +16,7 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency "lita", ">= 3.0"
   spec.add_runtime_dependency "dogapi"
+  spec.add_runtime_dependency "chronic"
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"

data/spec/lita/handlers/datadog_spec.rb

@@ -1,8 +1,13 @@
 require 'spec_helper'
 
 describe Lita::Handlers::Datadog, lita_handler: true do
-  it { routes_command('graph metric:"system.load.1{*}"').to(:simple_metric) }
-  it { routes_command('graph metric:"system.load.1{*},system.load.5{*}"').to(:simple_metric) }
+  EXAMPLE_IMAGE_URL = 'http://www.example.com/path/that/ends/in.png'
+  EXAMPLE_ERROR_MSG = 'Error requesting Datadog graph'
+
+  it { routes_command('graph metric:"system.load.1{*}"').to(:graph) }
+  it { routes_command('graph metric:"system.load.1{host:hostname01}"').to(:graph) }
+  it { routes_command('graph metric:"system.load.1{*},system.load.5{*}"').to(:graph) }
+  it { routes_command('graph metric:"system.load.1{*}" event:"sources:something"').to(:graph) }
 
   describe '.default_config' do
     it 'sets the api_key to nil' do
@@ -13,25 +18,51 @@ describe Lita::Handlers::Datadog, lita_handler: true do
       expect(Lita.config.handlers.datadog.application_key).to be_nil
     end
 
-    it 'sets the default_timerange to 3600' do
-      expect(Lita.config.handlers.datadog.default_timerange).to eq(3600)
+    it 'sets the timerange to 3600' do
+      expect(Lita.config.handlers.datadog.timerange).to eq(3600)
+    end
+
+    it 'sets the waittime to 1' do
+      expect(Lita.config.handlers.datadog.waittime).to eq(1)
     end
   end
 
-  describe '#simple_metric' do
+  describe '#graph' do
     it 'with valid metric returns an image url' do
-      response = { 'snapshot_url' => 'http://www.example.com/path/that/ends/in.png' }
+      response = { 'snapshot_url' => EXAMPLE_IMAGE_URL }
       allow_any_instance_of(Lita::Handlers::Datadog).to \
         receive(:graph_snapshot).with(any_args).and_return([200, response])
       send_command('graph metric:"system.load.1{*}"')
-      expect(replies.last).to eq('http://www.example.com/path/that/ends/in.png')
+      expect(replies.last).to eq(EXAMPLE_IMAGE_URL)
     end
 
     it 'with invalid metric returns an error' do
       allow_any_instance_of(Lita::Handlers::Datadog).to \
         receive(:graph_snapshot).with(any_args).and_return([500, nil])
       send_command('graph metric:"omg.wtf.bbq{*}"')
-      expect(replies.last).to eq('Error requesting Datadog graph')
+      expect(replies.last).to eq(EXAMPLE_ERROR_MSG)
+    end
+
+    it 'with valid metric and event returns an image url' do
+      response = { 'snapshot_url' => EXAMPLE_IMAGE_URL }
+      allow_any_instance_of(Lita::Handlers::Datadog).to \
+        receive(:graph_snapshot).with(any_args).and_return([200, response])
+      send_command('graph metric:"system.load.1{*}"')
+      expect(replies.last).to eq(EXAMPLE_IMAGE_URL)
+    end
+
+    it 'with an invalid metric returns an error' do
+      allow_any_instance_of(Lita::Handlers::Datadog).to \
+        receive(:graph_snapshot).with(any_args).and_return([500, nil])
+      send_command('graph metric:"omg.wtf.bbq{*}" event:"sources:sourcename"')
+      expect(replies.last).to eq(EXAMPLE_ERROR_MSG)
+    end
+
+    it 'with an invalid event returns an error' do
+      allow_any_instance_of(Lita::Handlers::Datadog).to \
+        receive(:graph_snapshot).with(any_args).and_return([500, nil])
+      send_command('graph metric:"system.load.1{*}" event:"omg:wtf"')
+      expect(replies.last).to eq(EXAMPLE_ERROR_MSG)
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lita-datadog
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Eric Sigler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-11 00:00:00.000000000 Z
+date: 2014-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lita
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: chronic
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement