riemann-smith 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: abe727427108fb93a1597b67f52c52a41150aa9c
-  data.tar.gz: 0ef96af51a6fcd3a78703e42a9aac5edbbde8251
+  metadata.gz: 4e513e2a5d743c3065f035c53b2206b0aa30b7f1
+  data.tar.gz: 8d76647517a2059142b7308845903d40575bd2ef
 SHA512:
-  metadata.gz: 28f120246ee14e7e4e72b694a87159b94e81239daee8370179273df96d6bc123688f888d8d9fad8f75c91d878866052fa8c791f64a072c73c1708383bf979042
-  data.tar.gz: 5c9fc151c4aced5fe8c9cdee03dcb13d25a2ecf7a562d0b706a5de1739e6d5eb80aa897612cb144ced2357004f807b13ef88b89525b083f5a6422e2d430b4c2a
+  metadata.gz: 5e9be2c0b8cb1e011ca50d82922fbe0c1227569da4b7c9875542e7c7aec213af57411700f7c256ab457b73dba2625705b41485acc0b7b026f1d9d8bd789ebd9f
+  data.tar.gz: a93f19496d1acc391622179a638fb303f0f9c20ea79f2137c194b3a98f866afe4477d9f9d33f56bd9abfbb0d4c706f94b93ab4bff1f5d30a6c994e905dd15955

data/bin/riemann-smith

@@ -13,7 +13,7 @@ class Smith::Riemann
   include Smith::Commands::Common
   include Smith::Logger
 
-  RIEMANN_SERVICE_NAME = "smith"
+  RIEMANN_SERVICE_NAME = "smith-agent"
 
   def initialize
     log_level :info
@@ -55,15 +55,24 @@ class Smith::Riemann
   # Checks that the list of agents return from the list command matches
   # the list of know agents and composes an appropriate alert.
   def check(response)
-    agents = parse_response(response)
-
-    options[:agents].map do |agent_name|
-      if agents.has_key?(agent_name) && agents[agent_name].any? { |a| a[:state] == "running" && running?(a[:pid]) }
-        alert(agent_name, :running, "Agent running")
-      else
-        alert(agent_name, :critical, "Agent not running")
+    options[:group].map do |group|
+      begin
+        group_agents = options[:agents] + agent_group(group)
+        running_agents = parse_response(response)
+
+        group_agents.map do |agent_name|
+          if running_agents.has_key?(agent_name) && running_agents[agent_name].any? { |a| a[:state] == "running" && running?(a[:pid]) }
+            alert(agent_name, :running, "Agent running")
+          else
+            alert(agent_name, :critical, "Agent not running")
+          end
+        end
+      rescue RuntimeError => e
+        pp e
+        alert("group #{group}", :critical, e.message)
+        options[:agents]
       end
-    end
+    end.flatten
   end
 
   # Returns a Nested hash representing the running agents.
@@ -77,7 +86,7 @@ class Smith::Riemann
 
   # Construct an alert messages
   def alert(service, state, description)
-    {:tags => options[:tags], :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| puts "#{a[:service]}: #{state(state)}" }
   end
 
   # Return true if the given pid exists in the process table.
@@ -98,7 +107,7 @@ class Smith::Riemann
     @options ||= begin
       OptionParser.accept(Pathname) {|p,| Pathname.new(p) if p}
 
-      defaults = {:interval => 30, :timeout => 10, :agents => [], :tags => [], :host => 'localhost', :port => 5555, :agency_timeout => 60}
+      defaults = {:interval => 30, :ttl => nil, :timeout => 11, :agents => [], :group => [], :tags => [], :host => 'localhost', :port => 5555, :agency_timeout => 60}
       defaults.tap do |options|
         parser = OptionParser.new do |opts|
           opts.separator "\n"
@@ -107,15 +116,15 @@ class Smith::Riemann
           opts.banner = "\nUsage: #{opts.program_name} OPTIONS"
           opts.on_head "\n  Periodically lists the running agents and sends the result to riemann."
 
+          opts.on("--ttl <i>", Integer, "TTL for events") { |t| options[:ttl] = t }
           opts.on("--interval <i>", Integer, "Polling interval in seconds (default #{options[:interval]})") { |t| options[:interval] = t }
           opts.on("--timeout <i>", Integer, "Agency timeout (default #{options[:timeout]})") { |t| options[:interval] = t }
           opts.on("--host <s>", String, "Riemann host (default #{options[:host]})") { |v| options[:host] = v }
           opts.on("--port <i>", Integer, "Riemann port (default #{options[:port]})") { |v| options[:port] = v }
           opts.on("--tags <tag1,tag1,...>", Array, "Tags to add to the alert") { |t| options[:tags] = t }
+
           opts.on("--agents <agent1,agent2,...>", Array, "Agents to monitor") { |v| options[:agents] + v }
-          opts.on("--agent-group  <group name>>", Array, "The name of an 'agent group' to monitor") do |g|
-            options[:agents] += g.map { |g| agent_group(g) }.flatten
-          end
+          opts.on("--agent-group  <group name>>", Array, "The name of an 'agent group' to monitor") { |g| options[:group] += g }
 
           opts.separator "\n"
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: riemann-smith
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Richard Heycock
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-12 00:00:00.000000000 Z
+date: 2015-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: smith