sensu 0.9.8.beta.3 → 0.9.8.beta.4

data/lib/sensu/api.rb

@@ -199,14 +199,15 @@ module Sensu
         )
       end
 
-      def resolve_event(client_name, check_name)
+      def resolve_event(event)
         payload = {
-          :client => client_name,
+          :client => event[:client],
           :check => {
-            :name => check_name,
+            :name => event[:check],
             :output => 'Resolving on request of the API',
             :status => 0,
             :issued => Time.now.to_i,
+            :handlers => event[:handlers],
             :force_resolve => true
           }
         }
@@ -268,8 +269,8 @@ module Sensu
       $redis.get('client:' + client_name).callback do |client_json|
         unless client_json.nil?
           $redis.hgetall('events:' + client_name).callback do |events|
-            events.each_key do |check_name|
-              resolve_event(client_name, check_name)
+            events.each do |check_name, event_json|
+              resolve_event(event_hash(event_json, client_name, check_name))
             end
             EM::Timer.new(5) do
               client = JSON.parse(client_json, :symbolize_names => true)
@@ -386,7 +387,7 @@ module Sensu
     adelete %r{/events?/([\w\.-]+)/([\w\.-]+)$} do |client_name, check_name|
       $redis.hgetall('events:' + client_name).callback do |events|
         if events.include?(check_name)
-          resolve_event(client_name, check_name)
+          resolve_event(event_hash(events[check_name], client_name, check_name))
           accepted!
         else
           not_found!
@@ -402,7 +403,7 @@ module Sensu
         if client_name.is_a?(String) && check_name.is_a?(String)
           $redis.hgetall('events:' + client_name).callback do |events|
             if events.include?(check_name)
-              resolve_event(client_name, check_name)
+              resolve_event(event_hash(events[check_name], client_name, check_name))
               accepted!
             else
               not_found!

data/lib/sensu/constants.rb

@@ -1,6 +1,6 @@
 module Sensu
   unless defined?(Sensu::VERSION)
-    VERSION = '0.9.8.beta.3'
+    VERSION = '0.9.8.beta.4'
   end
 
   unless defined?(Sensu::DEFAULT_OPTIONS)

data/lib/sensu/redis.rb

@@ -39,7 +39,7 @@ module Sensu
         end
       end
       info.callback do |reply|
-        redis_version = reply.split(/\n/).first.split(/:/).last.chomp
+        redis_version = reply.split(/\n/).select { |v| v =~ /^redis_version/ }.first.split(/:/).last.chomp
         if redis_version < '1.3.14'
           @logger.fatal('redis version must be >= 2.0 RC 1')
           close_connection

data/lib/sensu/server.rb

@@ -160,14 +160,7 @@ module Sensu
     end
 
     def event_handlers(event)
-      handler_list = case
-      when event[:check].has_key?(:handlers)
-        event[:check][:handlers]
-      when event[:check].has_key?(:handler)
-        [event[:check][:handler]]
-      else
-        ['default']
-      end
+      handler_list = Array((event[:check][:handlers] || event[:check][:handler]) || 'default')
       handlers = derive_handlers(handler_list)
       event_severity = Sensu::SEVERITIES[event[:check][:status]] || 'unknown'
       handlers.select do |handler|
@@ -409,6 +402,7 @@ module Sensu
                     :output => check[:output],
                     :status => check[:status],
                     :issued => check[:issued],
+                    :handlers => Array((check[:handlers] || check[:handler]) || 'default'),
                     :flapping => is_flapping,
                     :occurrences => event[:occurrences]
                   }.to_json).callback do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sensu
 version: !ruby/object:Gem::Version
-  version: 0.9.8.beta.3
+  version: 0.9.8.beta.4
   prerelease: 6
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-16 00:00:00.000000000 Z
+date: 2012-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &19119920 !ruby/object:Gem::Requirement
+  requirement: &17833920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -22,10 +22,10 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *19119920
+  version_requirements: *17833920
 - !ruby/object:Gem::Dependency
   name: amqp
-  requirement: &19040560 !ruby/object:Gem::Requirement
+  requirement: &17830820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -33,10 +33,10 @@ dependencies:
         version: 0.9.7
   type: :runtime
   prerelease: false
-  version_requirements: *19040560
+  version_requirements: *17830820
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &19037500 !ruby/object:Gem::Requirement
+  requirement: &17828500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *19037500
+  version_requirements: *17828500
 - !ruby/object:Gem::Dependency
   name: cabin
-  requirement: &18662780 !ruby/object:Gem::Requirement
+  requirement: &17453980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -55,10 +55,10 @@ dependencies:
         version: 0.4.4
   type: :runtime
   prerelease: false
-  version_requirements: *18662780
+  version_requirements: *17453980
 - !ruby/object:Gem::Dependency
   name: ruby-redis
-  requirement: &18661760 !ruby/object:Gem::Requirement
+  requirement: &17453060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -66,10 +66,10 @@ dependencies:
         version: 0.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *18661760
+  version_requirements: *17453060
 - !ruby/object:Gem::Dependency
   name: thin
-  requirement: &18660860 !ruby/object:Gem::Requirement
+  requirement: &17451780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -77,10 +77,10 @@ dependencies:
         version: 1.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *18660860
+  version_requirements: *17451780
 - !ruby/object:Gem::Dependency
   name: async_sinatra
-  requirement: &18658720 !ruby/object:Gem::Requirement
+  requirement: &17449880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -88,10 +88,10 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *18658720
+  version_requirements: *17449880
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &18657720 !ruby/object:Gem::Requirement
+  requirement: &17449020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,10 +99,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *18657720
+  version_requirements: *17449020
 - !ruby/object:Gem::Dependency
   name: em-spec
-  requirement: &18656940 !ruby/object:Gem::Requirement
+  requirement: &17448380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -110,10 +110,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *18656940
+  version_requirements: *17448380
 - !ruby/object:Gem::Dependency
   name: em-http-request
-  requirement: &18656480 !ruby/object:Gem::Requirement
+  requirement: &17447880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -121,7 +121,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *18656480
+  version_requirements: *17447880
 description: A monitoring framework that aims to be simple, malleable, and scalable.
   Uses the publish/subscribe model.
 email: