riemann-smith 0.2.1 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ddabc131163b71844a1d0252bd9f5eecf18e06c0
-  data.tar.gz: 6f9b585f1491efdfe0d4f766893451506842ae12
+  metadata.gz: 599a249192095c3c61053316cb92d3768a1d49df
+  data.tar.gz: 6daf55d263d32f3f222a6d397e9ab7155ed45e0c
 SHA512:
-  metadata.gz: ac33d63cb456c2a4a22e9ce616e04e4551f58220d9c7c6f4b79e386e06fa64c1fa443181abc860b81b7b5e99411192ecd061b37a859fd2df2a4adb75545aaa37
-  data.tar.gz: 49a96af674fc7fa8133abd16477d7c8c37bf11e4edaf18df7447382178472ef721d0448550bd6eb6849a26a09804de8de8404c6d74f69e9721eacdc5cef39174
+  metadata.gz: 3e7049aa2f7d3c41240ff7c482aaff2515ee4611d6666a813f0f9ab2ef56c2bd26af15eb4d5bbacf006fb220b3f68da723c6452b7dc34adf3915a966664d978a
+  data.tar.gz: 53bbeea669d614a7eede325e48fe923272f58c74ffb9c4427517b1c24847616d7b2324488bea931dafb035a0dc4b2e489cfbe682fa5e97a42bcdc71cbe8dd479

data/bin/riemann-smith

@@ -22,8 +22,6 @@ class Smith::Riemann
       options[:agents].uniq!
     end
 
-    @reply_queue = "riemann.#{Digest::SHA1.hexdigest(Time.now.to_s + $$.to_s)}"
-
     Smith.compile_acls
   end
 
@@ -41,11 +39,15 @@ class Smith::Riemann
           return
         end
 
-        queue.on_reply(:auto_ack => true, :reply_queue_name => @reply_queue) do |reply_payload, r|
+        # TODO remove this when smith randomises the reply queue name (probably > 0.7.2).
+        reply_queue = "riemann.#{Digest::SHA1.hexdigest(Time.now.to_s + $$.to_s)}"
+
+        queue.on_reply(:auto_ack => true, :reply_queue_name => reply_queue) do |reply_payload, r|
           results = parse_response(reply_payload.response)
 
           options[:agents].each do |agent|
-            if results.has_key?(agent) and Sys::ProcTable.ps(results[agent][:pid].to_i)
+            if results.has_key?(agent) && results[agent].any? { |a| a[:state] == "running" && Sys::ProcTable.ps(a[:pid].to_i) }
+              $stderr.puts "#{agent}: ok"
               report(
                 :host        => options[:event_host],
                 :service     => "#{options[:service_name]}.#{agent}",
@@ -53,6 +55,7 @@ class Smith::Riemann
                 :description => "Agent is running"
               )
             else
+              $stderr.puts "#{agent}: critical"
               report(
                 :host        => options[:event_host],
                 :service     => "#{options[:service_name]}.#{agent}",
@@ -87,18 +90,14 @@ class Smith::Riemann
 
   # Returns a Nested hash representing the running agents.
   def parse_response(response)
-    split_response = response.split(/\n/)
-    ((/^total/.match(split_response.first)) ? split_response[1..-1] : []).inject({}) do |a, entry|
-      a.tap do |acc|
-        fields = entry.split(/ +/).map(&:strip)
-        acc[fields.last] = {}.tap do |res|
-          res[:given_state] = fields[0]
-          res[:uuid] = fields[1]
-          res[:pid] = fields[2]
-          res[:date] = fields[3]
-          res[:description] = fields.last
-        end
-      end
+    split_response = response.split(/\n/).map(&:strip)
+    ((/^total/.match(split_response.first)) ? split_response[1..-1] : []).each_with_object(Hash.new { |h,k| h[k] = []}) do |entry, h|
+      fields = entry.split(/\s +/)
+      h[fields.last] << {
+        :state => fields[0],
+        :uuid  => fields[1],
+        :pid   => fields[2]
+      }
     end
   end
 end

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: riemann-smith
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.1
 platform: ruby
 authors:
 - Richard Heycock
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-19 00:00:00.000000000 Z
+date: 2015-05-17 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: git-version-bump
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.10'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.10'
 - !ruby/object:Gem::Dependency
   name: riemann-tools
   requirement: !ruby/object:Gem::Requirement
@@ -108,20 +94,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: github-release
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: 
 email: rgh@digivizer.com
 executables:
@@ -154,7 +126,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Monitor smith agents, reporting to Riemann