sensu 0.5.2 → 0.5.3

data/lib/sensu/api.rb

@@ -87,15 +87,11 @@ module Sensu
           conn.redis.exists('events:' + client).callback do |events_exist|
             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)
+                Hash[*events].keys.each do |check_name|
+                  check = {'name' => check_name, 'issued' => Time.now.to_i, 'status' => 0, 'output' => 'client is being removed...'}
+                  conn.amq.queue('results').publish({'client' => client, 'check' => check}.to_json)
                 end
-                EM.add_timer(10) do
+                EM.add_timer(8) do
                   conn.redis.srem('clients', client)
                   conn.redis.del('events:' + client)
                   conn.redis.del('client:' + client)
@@ -117,15 +113,15 @@ module Sensu
     end
 
     apost '/test/client' do
-      client = '{
+      attributes = '{
         "name": "test",
-        "address": "127.0.0.1",
+        "address": "localhost",
         "subscriptions": [
           "foo",
           "bar"
         ]
       }'
-      conn.redis.set('client:test', client).callback do
+      conn.redis.set('client:test', attributes).callback do
         conn.redis.sadd('clients', 'test')
         status 201
         body ''
@@ -133,7 +129,7 @@ module Sensu
     end
 
     apost '/test/event' do
-      conn.redis.hset('events:test', 'test', {'status' => 2, 'output' => 'CRITICAL :: test'}.to_json).callback do
+      conn.redis.hset('events:test', 'test', {'status' => 2, 'output' => 'CRITICAL :: test', 'occurrences' => 1}.to_json).callback do
         status 201
         body ''
       end

data/lib/sensu/client.rb

@@ -43,6 +43,7 @@ module Sensu
       if @settings['checks'].has_key?(check['name'])
         unless @checks_in_progress.include?(check['name'])
           @checks_in_progress.push(check['name'])
+          result = {'client' => @settings['client']['name'], 'check' => check}
           unmatched_tokens = Array.new
           command = @settings['checks'][check['name']]['command'].gsub(/:::(.*?):::/) do
             key = $1.to_s
@@ -51,31 +52,19 @@ module Sensu
           end
           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)
+              result['check'].merge!({'status' => status.exitstatus, 'output' => output})
+              @result_queue.publish(result.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)
+            result['check'].merge!({'status' => 3, 'output' => 'Missing client attributes: ' + unmatched_tokens.join(', ')})
+            @result_queue.publish(result.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['check'].merge!({'status' => 3, 'output' => 'Unknown check'})
+        @result_queue.publish(result.to_json)
         @checks_in_progress.delete(check['name'])
       end
     end

data/lib/sensu/server.rb

@@ -98,30 +98,38 @@ module Sensu
         @redis.get('client:' + result['client']).callback do |client_json|
           unless client_json.nil?
             client = JSON.parse(client_json)
-            check = {'name' => result['check']}
-            check.merge!(@settings['checks'][result['check']]) if @settings['checks'].has_key?(result['check'])
+            check = result['check']
+            check.merge!(@settings['checks'][check['name']]) if @settings['checks'].has_key?(check['name'])
             check['handler'] = 'default' unless check['handler']
             event = {
               'client' => client,
-              'check' => check,
-              'status' => result['status'],
-              'output' => result['output']
+              'check' => check
             }
-            if check['handler'] == 'metric'
+            if check['type'] == 'metric'
               handle_event(event)
             else
               if result['status'] == 0
-                @redis.hexists('events:' + client['name'], result['check']).callback do |exists|
+                @redis.hexists('events:' + client['name'], check['name']).callback do |exists|
                   if exists == 1
-                    @redis.hdel('events:' + client['name'], result['check'])
+                    @redis.hdel('events:' + client['name'], check['name'])
                     event['action'] = 'resolve'
                     handle_event(event)
                   end
                 end
               else
-                @redis.hset('events:' + client['name'], result['check'], {'status' => result['status'], 'output' => result['output']}.to_json).callback do
-                  event['action'] = 'create'
-                  handle_event(event)
+                @redis.hget('events:' + client['name'], check['name']).callback do |event_json|
+                  occurrences = 1
+                  unless event_json.nil?
+                    previous_event = JSON.parse(event_json)
+                    if previous_event['status'] == check['status']
+                      occurrences = previous_event['occurrences'] += 1
+                    end
+                  end
+                  @redis.hset('events:' + client['name'], check['name'], {'status' => check['status'], 'output' => check['output'], 'occurrences' => occurrences}.to_json).callback do
+                    event['occurrences'] = occurrences
+                    event['action'] = 'create'
+                    handle_event(event)
+                  end
                 end
               end
             end
@@ -138,7 +146,7 @@ module Sensu
           if exchanges[exchange].nil?
             exchanges[exchange] = @amq.fanout(exchange)
           end
-          exchanges[exchange].publish({'name' => check['name']}.to_json)
+          exchanges[exchange].publish({'name' => check['name'], 'issued' => Time.now.to_i}.to_json)
           EM.debug('published :: ' + exchange + ' :: ' + check['name'])
         end
       end
@@ -146,10 +154,10 @@ module Sensu
 
     def setup_populator
       check_queue = @amq.queue('checks')
-      @settings['checks'].each_with_index do |(name, info), index|
+      @settings['checks'].each_with_index do |(name, details), index|
         EM.add_timer(7*index) do
-          EM.add_periodic_timer(info['interval']) do
-            check_queue.publish({'name' => name, 'subscribers' => info['subscribers']}.to_json)
+          EM.add_periodic_timer(details['interval']) do
+            check_queue.publish({'name' => name, 'subscribers' => details['subscribers']}.to_json)
           end
         end
       end
@@ -163,30 +171,19 @@ module Sensu
             @redis.get('client:' + client_id).callback do |client_json|
               client = JSON.parse(client_json)
               time_since_last_check = Time.now.to_i - client['timestamp']
+              result = {'client' => client['name'], 'check' => {'name' => 'keepalive', 'issued' => Time.now.to_i}}
               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['check'].merge!({'status' => 2, 'output' => 'No keep-alive sent from host in over 180 seconds'})
+                result_queue.publish(result.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['check'].merge!({'status' => 1, 'output' => 'No keep-alive sent from host in over 120 seconds'})
+                result_queue.publish(result.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['check'].merge!({'status' => 0, 'output' => 'Keep-alive sent from host'})
+                    result_queue.publish(result.to_json)
                   end
                 end
               end

data/sensu.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = "sensu"
-  s.version     = "0.5.2"
+  s.version     = "0.5.3"
   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.2
+  version: 0.5.3
 platform: ruby
 authors: 
 - Sean Porter
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-09 00:00:00 Z
+date: 2011-09-15 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: amqp