sensu 0.8.10 → 0.8.11

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    sensu (0.8.10)
+    sensu (0.8.11)
       amqp (= 0.7.4)
       async_sinatra
       bundler
@@ -10,7 +10,7 @@ PATH
       hashie
       json
       rack (~> 1.3.4)
-      ruby-redis
+      ruby-redis-portertech
       thin
       uuidtools
 
@@ -56,7 +56,7 @@ GEM
     rspec-expectations (2.6.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.6.0)
-    ruby-redis (0.0.2)
+    ruby-redis-portertech (0.0.3)
       eventmachine
     sinatra (1.3.1)
       rack (~> 1.3, >= 1.3.4)

data/lib/sensu.rb

@@ -1,3 +1,3 @@
 module Sensu
-  VERSION = "0.8.10"
+  VERSION = "0.8.11"
 end

data/lib/sensu/api.rb

@@ -133,7 +133,13 @@ module Sensu
       if event.has_key?('client') && event.has_key?('check')
         $redis.hgetall('events:' + event['client']).callback do |events|
           if events.has_key?(event['check'])
-            check = {:name => event['check'], :issued => Time.now.to_i, :status => 0, :output => 'Resolving on request of the API'}
+            check = {
+              :name => event['check'],
+              :issued => Time.now.to_i,
+              :status => 0,
+              :output => 'Resolving on request of the API',
+              :force_resolve => true
+            }
             $amq.queue('results').publish({:client => event['client'], :check => check}.to_json)
             status 201
           else

data/lib/sensu/client.rb

@@ -111,6 +111,7 @@ module Sensu
     def setup_subscriptions
       @logger.debug('[subscribe] -- setup subscriptions')
       @check_queue = @amq.queue(UUIDTools::UUID.random_create.to_s, :exclusive => true)
+      @settings.client.subscriptions.push('uchiwa')
       @settings.client.subscriptions.each do |exchange|
         @logger.debug('[subscribe] -- queue binding to exchange -- ' + exchange)
         @check_queue.bind(@amq.fanout(exchange))
@@ -118,7 +119,24 @@ module Sensu
       @check_queue.subscribe do |check_json|
         check = Hashie::Mash.new(JSON.parse(check_json))
         @logger.info('[subscribe] -- received check -- ' + check.name)
-        execute_check(check)
+        if check.key?('matching')
+          @logger.info('[subscribe] -- check requires matching -- ' + check.name)
+          matches = check.matching.all? do |key, value|
+            if key == 'subscribes'
+              @settings.client.subscriptions.include?(value)
+            else
+              @settings.client[key] == value
+            end
+          end
+          if matches
+            @logger.info('[subscribe] -- client matches -- ' + check.name)
+            execute_check(check)
+          else
+            @logger.info('[subscribe] -- client does not match -- ' + check.name)
+          end
+        else
+          execute_check(check)
+        end
       end
     end
 
@@ -149,7 +167,7 @@ module Sensu
     attr_accessor :logger, :client_name, :result_queue
 
     def receive_data(data)
-      @logger.debug('[socket] -- client connected')
+      @logger.debug('[socket] -- received data from client')
       begin
         check = Hashie::Mash.new(JSON.parse(data))
         validates = %w[name status output].all? do |key|

data/lib/sensu/config.rb

@@ -46,6 +46,9 @@ module Sensu
       case type
       when 'server'
         has_keys(%w[redis handlers checks])
+        unless @settings.handlers.include?('default')
+          invalid_config('missing default handler')
+        end
       when 'api'
         has_keys(%w[redis api])
       when 'client'
@@ -70,6 +73,16 @@ module Sensu
         unless details.subscribers.is_a?(Array) && details.subscribers.count > 0
           invalid_config('missing subscribers for check ' + name)
         end
+        if details.key?('handler')
+          unless details.handler.is_a?(String)
+            invalid_config('handler must be a string for check ' + name)
+          end
+        end
+        if details.key?('handlers')
+          unless details.handlers.is_a?(Array)
+            invalid_config('handlers must be an array for check ' + name)
+          end
+        end
       end
       if type
         @logger.debug('[config] -- configuration valid -- running ' + type)

data/lib/sensu/server.rb

@@ -66,27 +66,37 @@ module Sensu
     end
 
     def handle_event(event)
-      handler = proc do
-        output = ''
-        Bundler.with_clean_env do
-          IO.popen(@settings.handlers[event.check.handler] + ' 2>&1', 'r+') do |io|
-            io.write(event.to_json)
-            io.close_write
-            output = io.read
-          end
-        end
-        output
+      handlers = case
+      when event.check.key?('handler')
+        [event.check.handler]
+      when event.check.key?('handlers')
+        event.check.handlers
+      else
+        ['default']
       end
       report = proc do |output|
         output.split(/\n+/).each do |line|
           @logger.info('[handler] -- ' + line)
         end
       end
-      if @settings.handlers.key?(event.check.handler)
-        @logger.debug('[event] -- handling event -- ' + [event.check.handler, event.client.name, event.check.name].join(' -- '))
-        EM.defer(handler, report)
-      else
-        @logger.warn('[event] -- handler does not exist -- ' + event.check.handler)
+      handlers.each do |handler|
+        if @settings.handlers.key?(handler)
+          @logger.debug('[event] -- handling event -- ' + [handler, event.client.name, event.check.name].join(' -- '))
+          handle = proc do
+            output = ''
+            Bundler.with_clean_env do
+              IO.popen(@settings.handlers[handler] + ' 2>&1', 'r+') do |io|
+                io.write(event.to_json)
+                io.close_write
+                output = io.read
+              end
+            end
+            output
+          end
+          EM.defer(handle, report)
+        else
+          @logger.warn('[event] -- handler does not exist -- ' + handler)
+        end
       end
     end
 
@@ -96,7 +106,6 @@ module Sensu
         unless client_json.nil?
           client = Hashie::Mash.new(JSON.parse(client_json))
           check = @settings.checks.key?(result.check.name) ? result.check.merge(@settings.checks[result.check.name]) : result.check
-          check.handler ||= 'default'
           event = Hashie::Mash.new({
             :client => client,
             :check => check,
@@ -138,10 +147,12 @@ module Sensu
                   end
                   if previous_event && check.status == 0
                     unless is_flapping
-                      @redis.hdel('events:' + client.name, check.name).callback do
-                        unless check.internal
-                          event.action = 'resolve'
-                          handle_event(event)
+                      unless check.auto_resolve == false && !check.force_resolve
+                        @redis.hdel('events:' + client.name, check.name).callback do
+                          unless check.internal
+                            event.action = 'resolve'
+                            handle_event(event)
+                          end
                         end
                       end
                     else
@@ -188,16 +199,24 @@ module Sensu
       exchanges = Hash.new
       stagger = options[:test] ? 0 : 7
       @settings.checks.each_with_index do |(name, details), index|
+        check = Hashie::Mash.new
+        check.name = name
         unless details.enabled == false
           EM.add_timer(stagger*index) do
-            details.subscribers.each do |exchange|
-              if exchanges[exchange].nil?
-                exchanges[exchange] = @amq.fanout(exchange)
+            details.subscribers.each do |subscriber|
+              if subscriber.is_a?(Hash)
+                @logger.debug('[publisher] -- check requires matching -- ' + subscriber.to_hash.to_s + ' -- ' + name)
+                check.matching = subscriber
+                exchange = 'uchiwa'
+              else
+                exchange = subscriber
               end
+              exchanges[exchange] ||= @amq.fanout(exchange)
               interval = options[:test] ? 0.5 : details.interval
               EM.add_periodic_timer(interval) do
+                check.issued = Time.now.to_i
                 @logger.info('[publisher] -- publishing check -- ' + name + ' -- ' + exchange)
-                exchanges[exchange].publish({'name' => name, 'issued' => Time.now.to_i}.to_json)
+                exchanges[exchange].publish(check.to_json)
               end
             end
           end

data/sensu.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
   s.add_dependency("hashie")
   s.add_dependency("uuidtools")
   s.add_dependency("cabin", "0.1.7")
-  s.add_dependency("ruby-redis")
+  s.add_dependency("ruby-redis-portertech")
   s.add_dependency("rack", "~> 1.3.4")
   s.add_dependency("async_sinatra")
   s.add_dependency("thin")

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sensu
 version: !ruby/object:Gem::Version 
-  hash: 43
+  hash: 41
   prerelease: false
   segments: 
   - 0
   - 8
-  - 10
-  version: 0.8.10
+  - 11
+  version: 0.8.11
 platform: ruby
 authors: 
 - Sean Porter
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-18 00:00:00 -08:00
+date: 2011-11-22 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -126,7 +126,7 @@ dependencies:
   type: :runtime
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
-  name: ruby-redis
+  name: ruby-redis-portertech
   prerelease: false
   requirement: &id008 !ruby/object:Gem::Requirement 
     none: false