sensu 0.9.8.beta.1 → 0.9.8.beta.2

data/CHANGELOG.md

@@ -1,3 +1,19 @@
+## 0.9.8 - TBD
+
+### Features
+
+Aggregates, pooling and summarizing check results, very handy for
+monitoring a horizontally scaled or distributed system.
+
+Event handler severities, only handle events that have specific
+severities.
+
+### Other
+
+Fixed flap detection.
+
+Gracefully handle possible failed RabbitMQ authentication.
+
 ## 0.9.7 - 2012-09-20
 
 ### Features

data/lib/sensu/constants.rb

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

data/lib/sensu/server.rb

@@ -124,26 +124,23 @@ module Sensu
       subdue && subdue_at == (check[:subdue][:at] || 'handler').to_sym
     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
-      handlers = handler_list.inject(Array.new) do |handlers, handler_name|
+    def derive_handlers(handler_list, nested=false)
+      handler_list.inject(Array.new) do |handlers, handler_name|
         if @settings.handler_exists?(handler_name)
           handler = @settings[:handlers][handler_name]
           if handler[:type] == 'set'
-            handlers + handler[:handlers]
+            unless nested
+              handlers = handlers + derive_handlers(handler[:handlers], true)
+            else
+              @logger.error('handler sets cannot be nested', {
+                :handler => handler
+              })
+            end
           else
             handlers.push(handler)
           end
         else
-          @logger.warn('unknown handler', {
-            :event => event,
+          @logger.error('unknown handler', {
             :handler => {
               :name => handler_name
             }
@@ -151,15 +148,21 @@ module Sensu
         end
         handlers.uniq
       end
+    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
+      handlers = derive_handlers(handler_list)
       event_severity = Sensu::SEVERITIES[event[:check][:status]] || 'unknown'
       handlers.select do |handler|
-        if handler[:type] == 'set'
-          @logger.error('handler sets cannot be nested', {
-            :event => event,
-            :handler => handler
-          })
-          false
-        elsif handler.has_key?(:severities) && !handler[:severities].include?(event_severity)
+        if handler.has_key?(:severities) && !handler[:severities].include?(event_severity)
           @logger.debug('handler does not handle event severity', {
             :event => event,
             :handler => handler
@@ -236,8 +239,7 @@ module Sensu
             block.call(output)
           end
         else
-          @logger.warn('unknown mutator', {
-            :event => event,
+          @logger.error('unknown mutator', {
             :mutator => {
               :name => mutator_name
             }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sensu
 version: !ruby/object:Gem::Version
-  version: 0.9.8.beta.1
+  version: 0.9.8.beta.2
   prerelease: 6
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-06 00:00:00.000000000 Z
+date: 2012-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &5377080 !ruby/object:Gem::Requirement
+  requirement: &9708760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -22,10 +22,10 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *5377080
+  version_requirements: *9708760
 - !ruby/object:Gem::Dependency
   name: amqp
-  requirement: &5375340 !ruby/object:Gem::Requirement
+  requirement: &9707060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -33,10 +33,10 @@ dependencies:
         version: 0.9.7
   type: :runtime
   prerelease: false
-  version_requirements: *5375340
+  version_requirements: *9707060
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &5374380 !ruby/object:Gem::Requirement
+  requirement: &9706020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *5374380
+  version_requirements: *9706020
 - !ruby/object:Gem::Dependency
   name: cabin
-  requirement: &5371840 !ruby/object:Gem::Requirement
+  requirement: &9703280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -55,10 +55,10 @@ dependencies:
         version: 0.4.4
   type: :runtime
   prerelease: false
-  version_requirements: *5371840
+  version_requirements: *9703280
 - !ruby/object:Gem::Dependency
   name: ruby-redis
-  requirement: &5368960 !ruby/object:Gem::Requirement
+  requirement: &9700500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -66,10 +66,10 @@ dependencies:
         version: 0.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *5368960
+  version_requirements: *9700500
 - !ruby/object:Gem::Dependency
   name: thin
-  requirement: &5367040 !ruby/object:Gem::Requirement
+  requirement: &9698660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -77,10 +77,10 @@ dependencies:
         version: 1.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *5367040
+  version_requirements: *9698660
 - !ruby/object:Gem::Dependency
   name: async_sinatra
-  requirement: &5365940 !ruby/object:Gem::Requirement
+  requirement: &9697480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -88,10 +88,10 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *5365940
+  version_requirements: *9697480
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &5365200 !ruby/object:Gem::Requirement
+  requirement: &9696760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,10 +99,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *5365200
+  version_requirements: *9696760
 - !ruby/object:Gem::Dependency
   name: em-spec
-  requirement: &5364600 !ruby/object:Gem::Requirement
+  requirement: &9696120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -110,10 +110,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *5364600
+  version_requirements: *9696120
 - !ruby/object:Gem::Dependency
   name: em-http-request
-  requirement: &5364040 !ruby/object:Gem::Requirement
+  requirement: &9695580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -121,7 +121,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *5364040
+  version_requirements: *9695580
 description: A monitoring framework that aims to be simple, malleable, and scalable.
   Uses the publish/subscribe model.
 email: