riemann-smith 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 318b6d3321fd9d8cd53d7bb4582e1cda69af0fac
-  data.tar.gz: e3b8b58e0104eb1aa30b82bb15ad4ae5b09d6660
+  metadata.gz: 73b18722a66fbd815116418e7f2d9fc0f53aefc0
+  data.tar.gz: dae5a014912e70e5598e482d16413076cd9b50e1
 SHA512:
-  metadata.gz: 666be04360f26430b87637dc927b8a80b6781a27d5509b3d972f4bf890299f1dffbc9f2f484f91435b5d497676d5d041cd552469444acf6e5001f8aa4477b6ea
-  data.tar.gz: 33e25bcd21727b7b404954f2e946b657e2ffb9cea6e2c859b4ad355078ea654a6bd463d9526b3919efce8565cee721402306e749705f59677acb6e93872643af
+  metadata.gz: ba7674902ec5866d7c62717df4ec6fafdfd10ba4bcddf28647026cc820b268bc3fc042fafa425a2fac7bf58bf7a3177067ed9dfa9be85927a9ecc08cf554e9ef
+  data.tar.gz: 9872a6ce88a8a3e8ab1ccc57f5b6b26f0a71ee8eac05d1cea1bd1ae046ae717eb213748cdc05a62a297769beedcea781103d2aeda5cc29efdf7c794b3fb90408

data/bin/riemann-smith

@@ -18,7 +18,7 @@ class Smith::Riemann
   include Smith::Commands::Common
   include Smith::Logger
 
-  RIEMANN_SERVICE_NAME = "smith-agent"
+  SERVICE_NAME = "Smith"
 
   def initialize
     @riemann = Riemann::Client.new(:host => options[:host], :port => options[:port])
@@ -26,13 +26,17 @@ class Smith::Riemann
 
   def run
     Smith::Messaging::Sender.new(Smith::QueueDefinitions::Agency_control.call) do |queue|
-      on_check { |check| @riemann << check }
+      on_check do |check|
+        @riemann << check
+      end
 
       EM.add_periodic_timer(options[:interval]) { run_check(queue) }
     end
   end
 
   def run_check(queue)
+    @on_check.call(alert(:heartbeat, :running, "riemann-smith heatbeat", :ttl => options[:interval] * 2))
+
     queue.on_timeout(options[:timeout]) do |message_id|
       @on_check.call(alert(:agency, :timeout, "Agency timeout."))
     end
@@ -87,8 +91,8 @@ class Smith::Riemann
   end
 
   # Construct an alert messages
-  def alert(service, state, description)
-    {:tags => options[:tags], :ttl => options[:ttl], :service => service(service), :state => state(state), :description => description}.tap { |a| logger.info { "#{a[:service]}: #{state(state)}" } }
+  def alert(service, state, description, extra={})
+    {:tags => options[:tags], :ttl => options[:ttl], :service => service(service), :state => state(state), :description => description}.merge(extra).tap { |a| logger.info { "#{a[:service]}: #{state(state)}" } }
   end
 
   # Return true if the given pid exists in the process table.
@@ -98,7 +102,7 @@ class Smith::Riemann
 
   # Return the service name
   def service(name)
-    "#{RIEMANN_SERVICE_NAME}:#{name}"
+    "#{SERVICE_NAME} #{name}"
   end
 
   def state(state)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: riemann-smith
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Richard Heycock
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-02 00:00:00.000000000 Z
+date: 2015-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: smith
@@ -19,7 +19,7 @@ dependencies:
         version: '0.7'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.4
+        version: 0.7.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: '0.7'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.4
+        version: 0.7.9
 - !ruby/object:Gem::Dependency
   name: sys-proctable
   requirement: !ruby/object:Gem::Requirement