sensu 0.11.0.beta.4 → 0.11.0

data/CHANGELOG.md

@@ -1,4 +1,4 @@
-## 0.11.0 - TBD
+## 0.11.0 - 2013-10-02
 
 ### Non-backwards compatible changes
 
@@ -26,6 +26,9 @@ You can configure the Sensu client socket (UDP & TCP), bind & port, eg.
 
 Handlers & mutators can now have a timeout, in seconds.
 
+You can configure the RabbitMQ channel prefetch value (advanced), eg.
+"rabbitmq": { "prefetch": 100 }.
+
 ### Other
 
 Sensu passes a dup of event data to mutator & handler extensions to

data/lib/sensu/api.rb

@@ -356,15 +356,16 @@ module Sensu
               $logger.info('deleting client', {
                 :client => client
               })
-              $redis.srem('clients', client_name)
-              $redis.del('events:' + client_name)
-              $redis.del('client:' + client_name)
-              $redis.smembers('history:' + client_name) do |checks|
-                checks.each do |check_name|
-                  $redis.del('history:' + client_name + ':' + check_name)
-                  $redis.del('execution:' + client_name + ':' + check_name)
+              $redis.srem('clients', client_name) do
+                $redis.del('client:' + client_name)
+                $redis.del('events:' + client_name)
+                $redis.smembers('history:' + client_name) do |checks|
+                  checks.each do |check_name|
+                    $redis.del('history:' + client_name + ':' + check_name)
+                    $redis.del('execution:' + client_name + ':' + check_name)
+                  end
+                  $redis.del('history:' + client_name)
                 end
-                $redis.del('history:' + client_name)
               end
             end
             issued!

data/lib/sensu/constants.rb

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

data/lib/sensu/extensions.rb

@@ -81,7 +81,7 @@ module Sensu
           extension
         end
       end
-      all.flatten!
+      all.flatten
     end
 
     def loaded(type, name, description)

data/lib/sensu/rabbitmq.rb

@@ -77,9 +77,15 @@ module Sensu
         error = RabbitMQError.new('rabbitmq channel closed')
         @on_error.call(error)
       end
+      prefetch = 1
+      if options.is_a?(Hash)
+        prefetch = options[:prefetch] || 1
+      end
       @channel.on_recovery do
         @after_reconnect.call
+        @channel.prefetch(prefetch)
       end
+      @channel.prefetch(prefetch)
     end
 
     def connected?

data/lib/sensu/server.rb

@@ -72,11 +72,9 @@ module Sensu
       end
       @rabbitmq.after_reconnect do
         @logger.info('reconnected to rabbitmq')
-        @amq.prefetch(1)
         resume
       end
       @amq = @rabbitmq.channel
-      @amq.prefetch(1)
     end
 
     def setup_keepalives(&block)
@@ -571,35 +569,30 @@ module Sensu
             unless client_json.nil?
               client = Oj.load(client_json)
               check = {
-                :name => 'keepalive',
-                :issued => Time.now.to_i,
-                :executed => Time.now.to_i
-              }
-              thresholds = {
-                :warning => 120,
-                :critical => 180
+                :thresholds => {
+                  :warning => 120,
+                  :critical => 180
+                }
               }
               if client.has_key?(:keepalive)
-                if client[:keepalive].has_key?(:handler) || client[:keepalive].has_key?(:handlers)
-                  check[:handlers] = Array(client[:keepalive][:handlers] || client[:keepalive][:handler])
-                end
-                if client[:keepalive].has_key?(:thresholds)
-                  thresholds.merge!(client[:keepalive][:thresholds])
-                end
+                check = deep_merge(check, client[:keepalive])
               end
+              check[:name] = 'keepalive'
+              check[:issued] = Time.now.to_i
+              check[:executed] = Time.now.to_i
               time_since_last_keepalive = Time.now.to_i - client[:timestamp]
               case
-              when time_since_last_keepalive >= thresholds[:critical]
+              when time_since_last_keepalive >= check[:thresholds][:critical]
                 check[:output] = 'No keep-alive sent from client in over '
-                check[:output] << thresholds[:critical].to_s + ' seconds'
+                check[:output] << check[:thresholds][:critical].to_s + ' seconds'
                 check[:status] = 2
-              when time_since_last_keepalive >= thresholds[:warning]
+              when time_since_last_keepalive >= check[:thresholds][:warning]
                 check[:output] = 'No keep-alive sent from client in over '
-                check[:output] << thresholds[:warning].to_s + ' seconds'
+                check[:output] << check[:thresholds][:warning].to_s + ' seconds'
                 check[:status] = 1
               else
                 check[:output] = 'Keep-alive sent from client less than '
-                check[:output] << thresholds[:warning].to_s + ' seconds ago'
+                check[:output] << check[:thresholds][:warning].to_s + ' seconds ago'
                 check[:status] = 0
               end
               publish_result(client, check)

data/lib/sensu/settings.rb

@@ -439,10 +439,12 @@ module Sensu
           unless thresholds.is_a?(Hash)
             invalid('client keepalive thresholds must be a hash')
           end
-          if thresholds.has_key?(:warning) || thresholds.has_key?(:critical)
+          if thresholds.has_key?(:warning)
             unless thresholds[:warning].is_a?(Integer)
               invalid('client keepalive warning threshold must be an integer')
             end
+          end
+          if thresholds.has_key?(:critical)
             unless thresholds[:critical].is_a?(Integer)
               invalid('client keepalive critical threshold must be an integer')
             end

metadata

@@ -1,15 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sensu
 version: !ruby/object:Gem::Version 
-  hash: 346800981
-  prerelease: true
+  hash: 51
+  prerelease: false
   segments: 
   - 0
   - 11
   - 0
-  - beta
-  - 4
-  version: 0.11.0.beta.4
+  version: 0.11.0
 platform: ruby
 authors: 
 - Sean Porter
@@ -18,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-09-30 00:00:00 -07:00
+date: 2013-10-02 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -235,14 +233,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
-      hash: 25
+      hash: 3
       segments: 
-      - 1
-      - 3
-      - 1
-      version: 1.3.1
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: