sensu 0.9.8 → 0.9.9.beta

data/CHANGELOG.md

@@ -1,3 +1,21 @@
+## 0.9.9 - TBD
+
+### Features
+
+RabbitMQ keepalives & results queue message and consumer counts available
+via the API (/info).
+
+Aggregate results available via the API when using a parameter
+(?results=true).
+
+### Other
+
+Server is now using basic AMQP QoS (prefetch), just enough back pressure.
+
+Fixed server execute command method error handling.
+
+Events with a resolve action bypass handler severity filtering.
+
 ## 0.9.8 - 2012-11-15
 
 ### Features

data/lib/sensu/api.rb

@@ -229,12 +229,34 @@ module Sensu
         :sensu => {
           :version => Sensu::VERSION
         },
+        :rabbitmq => {
+          :keepalives => {
+            :messages => nil,
+            :consumers => nil
+          },
+          :results => {
+            :messages => nil,
+            :consumers => nil
+          }
+        },
         :health => {
           :redis => $redis.connected? ? 'ok' : 'down',
           :rabbitmq => $rabbitmq.connected? ? 'ok' : 'down'
         }
       }
-      body response.to_json
+      if $rabbitmq.connected?
+        $amq.queue('keepalives').status do |messages, consumers|
+          response[:rabbitmq][:keepalives][:messages] = messages
+          response[:rabbitmq][:keepalives][:consumers] = consumers
+          $amq.queue('results').status do |messages, consumers|
+            response[:rabbitmq][:results][:messages] = messages
+            response[:rabbitmq][:results][:consumers] = consumers
+            body response.to_json
+          end
+        end
+      else
+        body response.to_json
+      end
     end
 
     aget '/clients' do
@@ -449,27 +471,28 @@ module Sensu
       result_set = check_name + ':' + check_issued
       $redis.hgetall('aggregate:' + result_set).callback do |aggregate|
         unless aggregate.empty?
-          response = aggregate.inject(Hash.new) do |formatted, (status, count)|
-            formatted[status] = Integer(count)
-            formatted
+          response = aggregate.inject(Hash.new) do |totals, (status, count)|
+            totals[status] = Integer(count)
+            totals
           end
-          if params[:summarize]
-            options = params[:summarize].split(',')
-            $redis.hgetall('aggregation:' + result_set).callback do |results|
-              formatted_results = results.inject(Hash.new) do |formatted, (client_name, check_json)|
-                formatted[client_name] = JSON.parse(check_json, :symbolize_names => true)
-                formatted
-              end
+          $redis.hgetall('aggregation:' + result_set).callback do |results|
+            parsed_results = results.inject(Array.new) do |parsed, (client_name, check_json)|
+              check = JSON.parse(check_json, :symbolize_names => true)
+              parsed.push(check.merge(:client => client_name))
+            end
+            if params[:summarize]
+              options = params[:summarize].split(',')
               if options.include?('output')
                 outputs = Hash.new(0)
-                formatted_results.each do |client_name, check|
-                  outputs[check[:output]] += 1
+                parsed_results.each do |result|
+                  outputs[result[:output]] += 1
                 end
                 response[:outputs] = outputs
               end
-              body response.to_json
             end
-          else
+            if params[:results]
+              response[:results] = parsed_results
+            end
             body response.to_json
           end
         else

data/lib/sensu/client.rb

@@ -186,10 +186,10 @@ module Sensu
     def setup_standalone
       @logger.debug('scheduling standalone checks')
       standalone_check_count = 0
-      stagger = testing? ? 0 : 7
+      stagger = testing? ? 0 : 2
       @settings.checks.each do |check|
         if check[:standalone]
-          standalone_check_count += 1
+          standalone_check_count = (standalone_check_count + 1) % 30
           @timers << EM::Timer.new(stagger * standalone_check_count) do
             interval = testing? ? 0.5 : check[:interval]
             @timers << EM::PeriodicTimer.new(interval) do

data/lib/sensu/constants.rb

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

data/lib/sensu/server.rb

@@ -76,6 +76,7 @@ module Sensu
       end
       @amq = AMQP::Channel.new(@rabbitmq)
       @amq.auto_recovery = true
+      @amq.prefetch(1)
       @amq.on_error do |channel, channel_close|
         @logger.fatal('rabbitmq channel closed', {
           :error => {
@@ -90,13 +91,15 @@ module Sensu
     def setup_keepalives
       @logger.debug('subscribing to keepalives')
       @keepalive_queue = @amq.queue('keepalives')
-      @keepalive_queue.subscribe do |payload|
+      @keepalive_queue.subscribe(:ack => true) do |header, payload|
         client = JSON.parse(payload, :symbolize_names => true)
         @logger.debug('received keepalive', {
           :client => client
         })
         @redis.set('client:' + client[:name], client.to_json).callback do
-          @redis.sadd('clients', client[:name])
+          @redis.sadd('clients', client[:name]).callback do
+            header.ack
+          end
         end
       end
     end
@@ -164,14 +167,16 @@ module Sensu
       handlers = derive_handlers(handler_list)
       event_severity = Sensu::SEVERITIES[event[:check][:status]] || 'unknown'
       handlers.select do |handler|
-        if handler.has_key?(:severities) && !handler[:severities].include?(event_severity)
-          @logger.debug('handler does not handle event severity', {
+        if check_subdued?(event[:check], :handler)
+          @logger.info('check is subdued at handler', {
             :event => event,
             :handler => handler
           })
           false
-        elsif check_subdued?(event[:check], :handler)
-          @logger.info('check is subdued at handler', {
+        elsif event[:action] == :resolve
+          true
+        elsif handler.has_key?(:severities) && !handler[:severities].include?(event_severity)
+          @logger.debug('handler does not handle event severity', {
             :event => event,
             :handler => handler
           })
@@ -183,10 +188,16 @@ module Sensu
     end
 
     def execute_command(command, data=nil, on_error=nil, &block)
+      on_error ||= Proc.new do |error|
+        @logger.error('failed to execute command', {
+          :command => command,
+          :data => data,
+          :error => error.to_s
+        })
+      end
       execute = Proc.new do
-        output = ''
-        status = 0
         begin
+          output = ''
           IO.popen(command + ' 2>&1', 'r+') do |io|
             unless data.nil?
               io.write(data.to_s)
@@ -195,16 +206,16 @@ module Sensu
             output = io.read
           end
           status = $?.exitstatus
+          [true, output, status]
         rescue => error
-          status = 2
-          if on_error.respond_to?(:call)
-            on_error.call(error)
-          end
+          on_error.call(error)
+          [false, nil, nil]
         end
-        [output, status]
       end
-      complete = Proc.new do |output, status|
-        block.call(output, status)
+      complete = Proc.new do |success, output, status|
+        if success
+          block.call(output, status)
+        end
       end
       EM::defer(execute, complete)
     end
@@ -434,12 +445,15 @@ module Sensu
     def setup_results
       @logger.debug('subscribing to results')
       @result_queue = @amq.queue('results')
-      @result_queue.subscribe do |payload|
+      @result_queue.subscribe(:ack => true) do |header, payload|
         result = JSON.parse(payload, :symbolize_names => true)
         @logger.debug('received result', {
           :result => result
         })
         process_result(result)
+        EM::next_tick do
+          header.ack
+        end
       end
     end
 
@@ -461,10 +475,10 @@ module Sensu
     def setup_publisher
       @logger.debug('scheduling check requests')
       check_count = 0
-      stagger = testing? ? 0 : 7
+      stagger = testing? ? 0 : 2
       @settings.checks.each do |check|
         unless check[:publish] == false || check[:standalone]
-          check_count += 1
+          check_count = (check_count + 1) % 30
           @master_timers << EM::Timer.new(stagger * check_count) do
             interval = testing? ? 0.5 : check[:interval]
             @master_timers << EM::PeriodicTimer.new(interval) do

data/lib/sensu/settings.rb

@@ -388,6 +388,13 @@ module Sensu
               :handler => handler
             })
           end
+          handler[:handlers].each do |handler_name|
+            unless handler_name.is_a?(String)
+              invalid('handler set handlers must be strings', {
+                :handler => handler
+              })
+            end
+          end
         else
           invalid('unknown handler type', {
             :handler => handler

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: sensu
 version: !ruby/object:Gem::Version 
-  hash: 43
-  prerelease: false
+  hash: -1732117756
+  prerelease: true
   segments: 
   - 0
   - 9
-  - 8
-  version: 0.9.8
+  - 9
+  - beta
+  version: 0.9.9.beta
 platform: ruby
 authors: 
 - Sean Porter
@@ -16,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-11-15 00:00:00 -08:00
+date: 2012-11-27 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -224,12 +225,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 25
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: