smith-datadog 0.7.2 → 0.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ba11bf20d379770b3c2e176d83a0d1257c6a3ca7
-  data.tar.gz: 5fa91ac9777e6ba7488a6dcfc5e2a5a1a67f28b6
+  metadata.gz: 41640d80038b9cb4159cd19eaec1ef8fef4e88ac
+  data.tar.gz: 0d9e37b306a27cb21b0a92df3b6fb64afc5bc6a5
 SHA512:
-  metadata.gz: 26aa348d8a9f8b79c46497852f4af48b742e287f139626cd5881d9b581d159e9bd1cd0e72624d74de3e12d70dc3874e99ac3a2cadc98cbb89cc50d1a49b39de8
-  data.tar.gz: 0f50cce864a9bfb3e26cafc0b14639c66064416486e3e7ec19de6b73fead962e7bf82577f6431cafea9cf387dc3609c5505cfbaf64e0d4fba9661b47d4e72c32
+  metadata.gz: f0bc4064523666f54ec42fa0d9f464d22f56db3d95f1cdbd59300f1263af6db713e150b7f6b32611db1ecd906c1aa3649fdf4824fdb37bc0e6bb60a786bb9f86
+  data.tar.gz: 0be95ccd1e844c223c1e6bcf84e6fd1f29e2a6887c745aa4e0910ab2865eb0a8d2a99889b12498ac64934c1763062497e905af6f672972c0bcb1224794cf6d58

data/bin/smith-datadog

@@ -4,6 +4,7 @@ require 'pp'
 require 'dogapi'
 require 'sys/proctable'
 
+require 'active_support/inflector'
 require 'smith'
 require 'smith/commands/common'
 
@@ -12,7 +13,7 @@ class Smith::Datadog
   include Smith::Commands::Common
   include Smith::Logger
 
-  SERVICE_NAME = "Smith"
+  SERVICE_NAME = "smith.agent"
   API_KEY = ENV.fetch('DATADOG_API_KEY')
 
   def initialize
@@ -21,11 +22,13 @@ class Smith::Datadog
 
   def run
     Smith::Messaging::Sender.new(Smith::QueueDefinitions::Agency_control.call) do |queue|
-      on_check do |check|
-        @datadog.emit_event(Dogapi::Event.new(check[:description], check))
+      on_check do |c|
+        logger.debug { options.inspect }
+        logger.debug { c.inspect }
+        @datadog.service_check(SERVICE_NAME, options[:host], c[:alert_type], :message => c[:description], :tags => ["agent:#{c[:service]}"])
       end
 
-      queue.on_error do |channel, channel_close|
+      queue.on_error do |_, channel_close|
         logger.fatal { "Channel error: #{channel_close.reply_code}: #{channel_close.reply_text}." }
         Smith.stop
       end
@@ -92,7 +95,11 @@ class Smith::Datadog
 
   # Construct an alert messages
   def alert(service, state, description, extra={})
-    {:source_type_name => 'name', :description => description, :alert_type => 'info', :source_type_name => SERVICE_NAME, :msg_title => "#{service} #{description}", :aggregation_key => service(service)}.merge(extra).tap { |a| logger.info { "#{a[:service]}: #{state(state)}" } }
+    {
+      :service => service(service),
+      :description => description,
+      :alert_type => state(state),
+    }.merge(extra).tap { |a| logger.info { "#{a[:service]}: #{state(state)}" } }
   end
 
   # Return true if the given pid exists in the process table.
@@ -102,11 +109,11 @@ class Smith::Datadog
 
   # Return the service name
   def service(name)
-    "#{SERVICE_NAME} #{name}"
+    "#{SERVICE_NAME.downcase}.#{name.to_s.underscore}"
   end
 
   def state(state)
-    {:timeout => "warning", :running => "info", :critical => "error"}[state]
+    {:timeout => 1, :running => 0, :critical => 2}[state]
   end
 
   def options

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: smith-datadog
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.7.3
 platform: ruby
 authors:
 - Richard Heycock
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-12 00:00:00.000000000 Z
+date: 2016-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: smith