sensu 0.12.3 → 0.12.4

data/CHANGELOG.md

@@ -1,3 +1,20 @@
+## 0.12.4 - 2014-01-17
+
+### Other
+
+Fixed filter "eval:" on Ruby 2.1.0, and logging errors.
+
+Fixed handler severity filtering when event action is "resolve". Events
+with an action of "resolve" will be negated if the severity conditions have
+not been met since the last OK status.
+
+## 0.12.3 - 2013-12-19
+
+### Other
+
+The pipe handler and mutator concurrency limit is now imposed by
+`EM::Worker`. A maximum of 12 processes may be spawned at a time.
+
 ## 0.12.2 - 2013-11-22
 
 ### Other

data/lib/sensu/constants.rb

@@ -1,6 +1,6 @@
 module Sensu
   unless defined?(Sensu::VERSION)
-    VERSION = '0.12.3'
+    VERSION = '0.12.4'
 
     LOG_LEVELS = [:debug, :info, :warn, :error, :fatal]
 

data/lib/sensu/sandbox.rb

@@ -2,7 +2,7 @@ module Sensu
   module Sandbox
     def self.eval(expression, value=nil)
       result = Proc.new do
-        $SAFE = 4
+        $SAFE = (RUBY_VERSION < '2.1.0' ? 4 : 3)
         Kernel.eval(expression)
       end
       result.call

data/lib/sensu/server.rb

@@ -148,7 +148,11 @@ module Sensu
           begin
             expression = hash_one[key].gsub(/^eval:(\s+)?/, '')
             !!Sandbox.eval(expression, hash_two[key])
-          rescue
+          rescue => error
+            @logger.error('filter eval error', {
+              :attributes => [hash_one, hash_two],
+              :error => error.to_s
+            })
             false
           end
         else
@@ -193,7 +197,6 @@ module Sensu
     def event_handlers(event)
       handler_list = Array((event[:check][:handlers] || event[:check][:handler]) || 'default')
       handlers = derive_handlers(handler_list)
-      event_severity = SEVERITIES[event[:check][:status]] || 'unknown'
       handlers.select do |handler|
         if event[:action] == :flapping && !handler[:handle_flapping]
           @logger.info('handler does not handle flapping events', {
@@ -209,8 +212,21 @@ module Sensu
           })
           next
         end
-        if handler.has_key?(:severities) && !handler[:severities].include?(event_severity)
-          unless event[:action] == :resolve
+        if handler.has_key?(:severities)
+          handle = case event[:action]
+          when :resolve
+            event[:check][:history].reverse[1..-1].any? do |status|
+              if status == 0
+                break
+              end
+              severity = SEVERITIES[status] || 'unknown'
+              handler[:severities].include?(severity)
+            end
+          else
+            severity = SEVERITIES[event[:check][:status]] || 'unknown'
+            handler[:severities].include?(severity)
+          end
+          unless handle
             @logger.debug('handler does not handle event severity', {
               :event => event,
               :handler => handler

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sensu
 version: !ruby/object:Gem::Version 
-  hash: 41
+  hash: 39
   prerelease: false
   segments: 
   - 0
   - 12
-  - 3
-  version: 0.12.3
+  - 4
+  version: 0.12.4
 platform: ruby
 authors: 
 - Sean Porter
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-12-19 00:00:00 -08:00
+date: 2014-01-17 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency