sensu 0.11.0.beta.1 → 0.11.0.beta.2

data/CHANGELOG.md

@@ -15,8 +15,14 @@ You can specify the Sensu log severity level using the -L (--log_level)
 CLI argument, providing a valid level (eg. warn).
 
 You can specify custom sensitive Sensu client key/values to be redacted
-from log events and keepalives, eg. "client": { "redact":
-["secret_access_key"] }.
+from log events and keepalives, eg. "client": { "redact": [
+"secret_access_key" ] }.
+
+You can configure the Sensu client socket (UDP & TCP), bind & port, eg.
+"client": { "socket": { "bind": "0.0.0.0", "port": 4040 } }.
+
+You can choose to reconnect to RabbitMQ on initial TCP connection
+failure, eg. "rabbitmq": { "on_failure": "reconnect" }.
 
 ### Other
 
@@ -29,8 +35,15 @@ UDP handler now binds to "0.0.0.0".
 
 Faster JSON parser.
 
+AMQP connection heartbeats will no longer attempt to use a closed
+channel.
+
 Missing AMQP connection heartbeats will result in a reconnect.
 
+The keepalive & result queues will now auto-delete when there are no
+active consumers. This change stops the creation of a keepalive/result
+backlog, stale data that may overwhelm the recovering consumers.
+
 ## 0.10.2 - 2013-07-18
 
 ### Other

data/lib/sensu/api.rb

@@ -188,6 +188,33 @@ module Sensu
         body ''
       end
 
+      def rabbitmq_info(&block)
+        info = {
+          :keepalives => {
+            :messages => nil,
+            :consumers => nil
+          },
+          :results => {
+            :messages => nil,
+            :consumers => nil
+          },
+          :connected => $rabbitmq.connected?
+        }
+        if $rabbitmq.connected?
+          $amq.queue('keepalives', :auto_delete => true).status do |messages, consumers|
+            info[:keepalives][:messages] = messages
+            info[:keepalives][:consumers] = consumers
+            $amq.queue('results', :auto_delete => true).status do |messages, consumers|
+              info[:results][:messages] = messages
+              info[:results][:consumers] = consumers
+              block.call(info)
+            end
+          end
+        else
+          block.call(info)
+        end
+      end
+
       def event_hash(event_json, client_name, check_name)
         Oj.load(event_json).merge(
           :client => client_name,
@@ -220,36 +247,16 @@ module Sensu
     end
 
     aget '/info' do
-      response = {
-        :sensu => {
-          :version => VERSION
-        },
-        :rabbitmq => {
-          :keepalives => {
-            :messages => nil,
-            :consumers => nil
-          },
-          :results => {
-            :messages => nil,
-            :consumers => nil
+      rabbitmq_info do |info|
+        response = {
+          :sensu => {
+            :version => VERSION
           },
-          :connected => $rabbitmq.connected?
-        },
-        :redis => {
-          :connected => $redis.connected?
+          :rabbitmq => info,
+          :redis => {
+            :connected => $redis.connected?
+          }
         }
-      }
-      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 Oj.dump(response)
-          end
-        end
-      else
         body Oj.dump(response)
       end
     end
@@ -259,22 +266,16 @@ module Sensu
         healthy = Array.new
         min_consumers = integer_parameter(params[:consumers])
         max_messages = integer_parameter(params[:messages])
-        $amq.queue('keepalives').status do |messages, consumers|
+        rabbitmq_info do |info|
           if min_consumers
-            healthy << (consumers >= min_consumers)
+            healthy << (info[:keepalives][:consumers] >= min_consumers)
+            healthy << (info[:results][:consumers] >= min_consumers)
           end
           if max_messages
-            healthy << (messages <= max_messages)
-          end
-          $amq.queue('results').status do |messages, consumers|
-            if min_consumers
-              healthy << (consumers >= min_consumers)
-            end
-            if max_messages
-              healthy << (messages <= max_messages)
-            end
-            healthy.all? ? no_content! : unavailable!
+            healthy << (info[:keepalives][:messages] <= max_messages)
+            healthy << (info[:results][:messages] <= max_messages)
           end
+          healthy.all? ? no_content! : unavailable!
         end
       else
         unavailable!

data/lib/sensu/client.rb

@@ -229,14 +229,18 @@ module Sensu
     end
 
     def setup_sockets
-      @logger.debug('binding client tcp socket')
-      EM::start_server('127.0.0.1', 3030, Socket) do |socket|
+      options = @settings[:client][:socket] || Hash.new
+      options[:bind] ||= '127.0.0.1'
+      options[:port] ||= 3030
+      @logger.debug('binding client tcp and udp sockets', {
+        :options => options
+      })
+      EM::start_server(options[:bind], options[:port], Socket) do |socket|
         socket.logger = @logger
         socket.settings = @settings
         socket.amq = @amq
       end
-      @logger.debug('binding client udp socket')
-      EM::open_datagram_socket('127.0.0.1', 3030, Socket) do |socket|
+      EM::open_datagram_socket(options[:bind], options[:port], Socket) do |socket|
         socket.logger = @logger
         socket.settings = @settings
         socket.amq = @amq

data/lib/sensu/constants.rb

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

data/lib/sensu/rabbitmq.rb

@@ -51,17 +51,22 @@ module Sensu
         error = RabbitMQError.new('cannot connect to rabbitmq')
         @on_error.call(error)
       end
-      @connection = AMQP.connect(options, {
-        :on_tcp_connection_failure => on_failure,
-        :on_possible_authentication_failure => on_failure
-      })
-      @connection.logger = Logger.get
       reconnect = Proc.new do
         unless @connection.reconnecting?
           @before_reconnect.call
           @connection.periodically_reconnect(5)
         end
       end
+      if options.is_a?(Hash)
+        if options[:on_failure] == 'reconnect'
+          on_failure = reconnect
+        end
+      end
+      @connection = AMQP.connect(options, {
+        :on_tcp_connection_failure => on_failure,
+        :on_possible_authentication_failure => on_failure
+      })
+      @connection.logger = Logger.get
       @connection.on_tcp_connection_loss(&reconnect)
       @connection.on_skipped_heartbeats(&reconnect)
       @channel = AMQP::Channel.new(@connection)

data/lib/sensu/server.rb

@@ -79,10 +79,12 @@ module Sensu
       @amq.prefetch(1)
     end
 
-    def setup_keepalives
+    def setup_keepalives(&block)
       @logger.debug('subscribing to keepalives')
-      @keepalive_queue = @amq.queue!('keepalives')
-      @keepalive_queue.bind(@amq.direct('keepalives'))
+      @keepalive_queue = @amq.queue!('keepalives', :auto_delete => true)
+      @keepalive_queue.bind(@amq.direct('keepalives')) do
+        block.call if block
+      end
       @keepalive_queue.subscribe(:ack => true) do |header, payload|
         client = Oj.load(payload)
         @logger.debug('received keepalive', {
@@ -96,51 +98,45 @@ module Sensu
       end
     end
 
-    def action_subdued?(check, handler=nil)
-      subdue = false
-      subdue_at = handler ? 'handler' : 'publisher'
-      conditions = Array.new
-      if check[:subdue]
-        conditions << check[:subdue]
-      end
-      if handler && handler[:subdue]
-        conditions << handler[:subdue]
-      end
-      conditions.each do |condition|
-        if condition.has_key?(:begin) && condition.has_key?(:end)
-          begin_time = Time.parse(condition[:begin])
-          end_time = Time.parse(condition[:end])
-          if end_time < begin_time
-            if Time.now < end_time
-              begin_time = Time.parse('12:00:00 AM')
-            else
-              end_time = Time.parse('11:59:59 PM')
-            end
-          end
-          if Time.now >= begin_time && Time.now <= end_time
-            subdue = true
+    def action_subdued?(condition)
+      subdued = false
+      if condition.has_key?(:begin) && condition.has_key?(:end)
+        begin_time = Time.parse(condition[:begin])
+        end_time = Time.parse(condition[:end])
+        if end_time < begin_time
+          if Time.now < end_time
+            begin_time = Time.parse('12:00:00 AM')
+          else
+            end_time = Time.parse('11:59:59 PM')
           end
         end
-        if condition.has_key?(:days)
-          days = condition[:days].map(&:downcase)
-          if days.include?(Time.now.strftime('%A').downcase)
-            subdue = true
-          end
+        if Time.now >= begin_time && Time.now <= end_time
+          subdued = true
         end
-        if subdue && condition.has_key?(:exceptions)
-          subdue = condition[:exceptions].none? do |exception|
-            Time.now >= Time.parse(exception[:begin]) && Time.now <= Time.parse(exception[:end])
-          end
+      end
+      if condition.has_key?(:days)
+        days = condition[:days].map(&:downcase)
+        if days.include?(Time.now.strftime('%A').downcase)
+          subdued = true
         end
-        if subdue
-          if subdue_at == (condition[:at] || 'handler')
-            break
-          else
-            subdue = false
-          end
+      end
+      if subdued && condition.has_key?(:exceptions)
+        subdued = condition[:exceptions].none? do |exception|
+          Time.now >= Time.parse(exception[:begin]) && Time.now <= Time.parse(exception[:end])
         end
       end
-      subdue
+      subdued
+    end
+
+    def handler_subdued?(handler, check)
+      subdued = Array.new
+      if handler[:subdue]
+        subdued << action_subdued?(handler[:subdue])
+      end
+      if check[:subdue] && check[:subdue][:at] != 'publisher'
+        subdued << action_subdued?(check[:subdue])
+      end
+      subdued.any?
     end
 
     def filter_attributes_match?(hash_one, hash_two)
@@ -208,8 +204,8 @@ module Sensu
           })
           next
         end
-        if action_subdued?(event[:check], handler)
-          @logger.info('action is subdued', {
+        if handler_subdued?(handler, event[:check])
+          @logger.info('handler is subdued', {
             :event => event,
             :handler => handler
           })
@@ -506,10 +502,12 @@ module Sensu
       end
     end
 
-    def setup_results
+    def setup_results(&block)
       @logger.debug('subscribing to results')
-      @result_queue = @amq.queue!('results')
-      @result_queue.bind(@amq.direct('results'))
+      @result_queue = @amq.queue!('results', :auto_delete => true)
+      @result_queue.bind(@amq.direct('results')) do
+        block.call if block
+      end
       @result_queue.subscribe(:ack => true) do |header, payload|
         result = Oj.load(payload)
         @logger.debug('received result', {
@@ -522,6 +520,14 @@ module Sensu
       end
     end
 
+    def check_request_subdued?(check)
+      if check[:subdue] && check[:subdue][:at] == 'publisher'
+        action_subdued?(check[:subdue])
+      else
+        false
+      end
+    end
+
     def publish_check_request(check)
       payload = {
         :name => check[:name],
@@ -548,7 +554,7 @@ module Sensu
         @master_timers << EM::Timer.new(scheduling_delay) do
           interval = testing? ? 0.5 : check[:interval]
           @master_timers << EM::PeriodicTimer.new(interval) do
-            unless action_subdued?(check)
+            unless check_request_subdued?(check)
               publish_check_request(check)
             else
               @logger.info('check request was subdued', {

data/lib/sensu/settings.rb

@@ -394,6 +394,21 @@ module Sensu
           invalid('client subscriptions must each be a string')
         end
       end
+      if @settings[:client].has_key?(:socket)
+        unless @settings[:client][:socket].is_a?(Hash)
+          invalid('client socket must be a hash')
+        end
+        if @settings[:client][:socket].has_key?(:bind)
+          unless @settings[:client][:socket][:bind].is_a?(String)
+            invalid('client socket bind must be a string')
+          end
+        end
+        if @settings[:client][:socket].has_key?(:port)
+          unless @settings[:client][:socket][:port].is_a?(Integer)
+            invalid('client socket port must be an integer')
+          end
+        end
+      end
       if @settings[:client].has_key?(:keepalive)
         unless @settings[:client][:keepalive].is_a?(Hash)
           invalid('client keepalive must be a hash')

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: sensu
 version: !ruby/object:Gem::Version 
-  hash: -2637871616
+  hash: 2750769037
   prerelease: true
   segments: 
   - 0
   - 11
   - 0
   - beta
-  - 1
-  version: 0.11.0.beta.1
+  - 2
+  version: 0.11.0.beta.2
 platform: ruby
 authors: 
 - Sean Porter
@@ -18,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-08-28 00:00:00 -07:00
+date: 2013-09-15 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency