sensu 0.5.1 → 0.5.2

data/lib/sensu/api.rb

@@ -71,7 +71,7 @@ module Sensu
               client_events.each do |key, value|
                 client_events[key] = JSON.parse(value)
               end
-              current_events.store(client, client_events) unless client_events.empty?
+              current_events[client] = client_events unless client_events.empty?
               body current_events.to_json if index == clients.size-1
             end
           end
@@ -88,7 +88,12 @@ module Sensu
             unless events_exist == 0
               conn.redis.hgetall('events:' + client).callback do |events|
                 Hash[*events].keys.each do |check|
-                  conn.amq.queue('results').publish({'check' => check, 'client' => client, 'status' => 0, 'output' => 'client is being removed...'}.to_json)
+                  conn.amq.queue('results').publish({
+                    'check' => check,
+                    'client' => client,
+                    'status' => 0,
+                    'output' => 'client is being removed...'
+                  }.to_json)
                 end
                 EM.add_timer(10) do
                   conn.redis.srem('clients', client)

data/lib/sensu/client.rb

@@ -40,19 +40,43 @@ module Sensu
     end
 
     def execute_check(check)
-      if @settings['checks'][check['name']]
+      if @settings['checks'].has_key?(check['name'])
         unless @checks_in_progress.include?(check['name'])
           @checks_in_progress.push(check['name'])
+          unmatched_tokens = Array.new
           command = @settings['checks'][check['name']]['command'].gsub(/:::(.*?):::/) do
-            @settings['client'][$1.to_s].to_s
+            key = $1.to_s
+            unmatched_tokens.push(key) unless @settings['client'].has_key?(key)
+            @settings['client'][key].to_s
           end
-          EM.system('sh', '-c', command + ' 2>&1') do |output, status|
-            @result_queue.publish({'check' => check['name'], 'client' => @settings['client']['name'], 'status' => status.exitstatus, 'output' => output}.to_json)
+          if unmatched_tokens.empty?
+            EM.system('sh', '-c', command + ' 2>&1') do |output, status|
+              @result_queue.publish({
+                'check' => check['name'],
+                'client' => @settings['client']['name'],
+                'status' => status.exitstatus,
+                'output' => output
+              }.to_json)
+              @checks_in_progress.delete(check['name'])
+            end
+          else
+            @result_queue.publish({
+              'check' => check['name'],
+              'client' => @settings['client']['name'],
+              'status' => 3,
+              'output' => 'Missing client attributes: ' + unmatched_tokens.join(', ')
+            }.to_json)
             @checks_in_progress.delete(check['name'])
           end
         end
       else
-        @result_queue.publish({'check' => check['name'], 'client' => @settings['client']['name'], 'status' => 3, 'output' => 'Unknown check'}.to_json)
+        @result_queue.publish({
+          'check' => check['name'],
+          'client' => @settings['client']['name'],
+          'status' => 3,
+          'output' => 'Unknown check'
+        }.to_json)
+        @checks_in_progress.delete(check['name'])
       end
     end
 

data/lib/sensu/server.rb

@@ -165,13 +165,28 @@ module Sensu
               time_since_last_check = Time.now.to_i - client['timestamp']
               case
               when time_since_last_check >= 180
-                result_queue.publish({'check' => 'keepalive', 'client' => client['name'], 'status' => 2, 'output' => 'No keep-alive sent from host in over 180 seconds'}.to_json)
+                result_queue.publish({
+                  'check' => 'keepalive',
+                  'client' => client['name'],
+                  'status' => 2,
+                  'output' => 'No keep-alive sent from host in over 180 seconds'
+                }.to_json)
               when time_since_last_check >= 120
-                result_queue.publish({'check' => 'keepalive', 'client' => client['name'], 'status' => 1, 'output' => 'No keep-alive sent from host in over 120 seconds'}.to_json)
+                result_queue.publish({
+                  'check' => 'keepalive',
+                  'client' => client['name'],
+                  'status' => 1,
+                  'output' => 'No keep-alive sent from host in over 120 seconds'
+                }.to_json)
               else
                 @redis.hexists('events:' + client_id, 'keepalive').callback do |exists|
                   if exists == 1
-                    result_queue.publish({'check' => 'keepalive', 'client' => client['name'], 'status' => 0, 'output' => 'Keep-alive sent from host'}.to_json)
+                    result_queue.publish({
+                      'check' => 'keepalive',
+                      'client' => client['name'],
+                      'status' => 0,
+                      'output' => 'Keep-alive sent from host'
+                    }.to_json)
                   end
                 end
               end

data/sensu.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = "sensu"
-  s.version     = "0.5.1"
+  s.version     = "0.5.2"
   s.authors     = ["Sean Porter", "Justin Kolberg"]
   s.email       = ["sean.porter@sonian.net", "justin.kolberg@sonian.net"]
   s.homepage    = "https://github.com/sonian/sensu"

metadata

@@ -2,7 +2,7 @@
 name: sensu
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors: 
 - Sean Porter