riemann-smith 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4e513e2a5d743c3065f035c53b2206b0aa30b7f1
-  data.tar.gz: 8d76647517a2059142b7308845903d40575bd2ef
+  metadata.gz: 318b6d3321fd9d8cd53d7bb4582e1cda69af0fac
+  data.tar.gz: e3b8b58e0104eb1aa30b82bb15ad4ae5b09d6660
 SHA512:
-  metadata.gz: 5e9be2c0b8cb1e011ca50d82922fbe0c1227569da4b7c9875542e7c7aec213af57411700f7c256ab457b73dba2625705b41485acc0b7b026f1d9d8bd789ebd9f
-  data.tar.gz: a93f19496d1acc391622179a638fb303f0f9c20ea79f2137c194b3a98f866afe4477d9f9d33f56bd9abfbb0d4c706f94b93ab4bff1f5d30a6c994e905dd15955
+  metadata.gz: 666be04360f26430b87637dc927b8a80b6781a27d5509b3d972f4bf890299f1dffbc9f2f484f91435b5d497676d5d041cd552469444acf6e5001f8aa4477b6ea
+  data.tar.gz: 33e25bcd21727b7b404954f2e946b657e2ffb9cea6e2c859b4ad355078ea654a6bd463d9526b3919efce8565cee721402306e749705f59677acb6e93872643af

data/bin/riemann-smith

@@ -7,6 +7,11 @@ require 'sys/proctable'
 require 'smith'
 require 'smith/commands/common'
 
+class Riemann::Client
+  def send_maybe_recv(*a)
+    @tcp.send_maybe_recv *a
+  end
+end
 
 class Smith::Riemann
 
@@ -16,12 +21,11 @@ class Smith::Riemann
   RIEMANN_SERVICE_NAME = "smith-agent"
 
   def initialize
-    log_level :info
     @riemann = Riemann::Client.new(:host => options[:host], :port => options[:port])
   end
 
   def run
-    Smith::Messaging::Sender.new(Smith::QueueDefinitions::Agency_control) do |queue|
+    Smith::Messaging::Sender.new(Smith::QueueDefinitions::Agency_control.call) do |queue|
       on_check { |check| @riemann << check }
 
       EM.add_periodic_timer(options[:interval]) { run_check(queue) }
@@ -68,9 +72,7 @@ class Smith::Riemann
           end
         end
       rescue RuntimeError => e
-        pp e
-        alert("group #{group}", :critical, e.message)
-        options[:agents]
+        alert("Group #{group}: #{e.message}", :critical, e.message)
       end
     end.flatten
   end
@@ -86,7 +88,7 @@ class Smith::Riemann
 
   # 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| puts "#{a[:service]}: #{state(state)}" }
+    {:tags => options[:tags], :ttl => options[:ttl], :service => service(service), :state => state(state), :description => description}.tap { |a| logger.info { "#{a[:service]}: #{state(state)}" } }
   end
 
   # Return true if the given pid exists in the process table.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: riemann-smith
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Richard Heycock
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-09 00:00:00.000000000 Z
+date: 2015-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: smith
@@ -17,6 +17,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.7'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.7.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -24,6 +27,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.7'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.7.4
 - !ruby/object:Gem::Dependency
   name: sys-proctable
   requirement: !ruby/object:Gem::Requirement