sensu 0.9.8.beta → 0.9.8.beta.1

data/lib/sensu/api.rb

@@ -1,6 +1,9 @@
 require File.join(File.dirname(__FILE__), 'base')
 require File.join(File.dirname(__FILE__), 'redis')
 
+gem 'thin', '1.5.0'
+gem 'async_sinatra', '1.0.0'
+
 require 'thin'
 require 'sinatra/async'
 
@@ -61,11 +64,16 @@ module Sensu
           $redis.close
           exit 2
         end
-        $rabbitmq = AMQP.connect($settings[:rabbitmq], :on_tcp_connection_failure => connection_failure)
+        $rabbitmq = AMQP.connect($settings[:rabbitmq], {
+          :on_tcp_connection_failure => connection_failure,
+          :on_possible_authentication_failure => connection_failure
+        })
         $rabbitmq.logger = Sensu::NullLogger.get
         $rabbitmq.on_tcp_connection_loss do |connection, settings|
-          $logger.warn('reconnecting to rabbitmq')
-          connection.reconnect(false, 10)
+          unless connection.reconnecting?
+            $logger.warn('reconnecting to rabbitmq')
+            connection.periodically_reconnect(5)
+          end
         end
         $rabbitmq.on_skipped_heartbeats do
           $logger.warn('skipped rabbitmq heartbeat')

data/lib/sensu/base.rb

@@ -1,6 +1,7 @@
 require 'rubygems'
 
-gem 'eventmachine', '1.0.0.rc.4'
+gem 'eventmachine', '1.0.0'
+gem 'amqp', '0.9.7'
 
 require 'json'
 require 'time'

data/lib/sensu/client.rb

@@ -30,11 +30,16 @@ module Sensu
         @logger.fatal('SENSU NOT RUNNING!')
         exit 2
       end
-      @rabbitmq = AMQP.connect(@settings[:rabbitmq], :on_tcp_connection_failure => connection_failure)
+      @rabbitmq = AMQP.connect(@settings[:rabbitmq], {
+        :on_tcp_connection_failure => connection_failure,
+        :on_possible_authentication_failure => connection_failure
+      })
       @rabbitmq.logger = Sensu::NullLogger.get
       @rabbitmq.on_tcp_connection_loss do |connection, settings|
-        @logger.warn('reconnecting to rabbitmq')
-        connection.reconnect(false, 10)
+        unless connection.reconnecting?
+          @logger.warn('reconnecting to rabbitmq')
+          connection.periodically_reconnect(5)
+        end
       end
       @rabbitmq.on_skipped_heartbeats do
         @logger.warn('skipped rabbitmq heartbeat')

data/lib/sensu/constants.rb

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

data/lib/sensu/logger.rb

@@ -1,3 +1,5 @@
+gem 'cabin', '0.4.4'
+
 require 'cabin'
 
 module Sensu

data/lib/sensu/redis.rb

@@ -1,3 +1,5 @@
+gem 'ruby-redis', '0.0.2'
+
 require 'redis'
 
 module Sensu

data/lib/sensu/server.rb

@@ -58,12 +58,17 @@ module Sensu
         @redis.close
         exit 2
       end
-      @rabbitmq = AMQP.connect(@settings[:rabbitmq], :on_tcp_connection_failure => connection_failure)
+      @rabbitmq = AMQP.connect(@settings[:rabbitmq], {
+        :on_tcp_connection_failure => connection_failure,
+        :on_possible_authentication_failure => connection_failure
+      })
       @rabbitmq.logger = Sensu::NullLogger.get
       @rabbitmq.on_tcp_connection_loss do |connection, settings|
-        @logger.warn('reconnecting to rabbitmq')
-        resign_as_master do
-          connection.reconnect(false, 10)
+        unless connection.reconnecting?
+          @logger.warn('reconnecting to rabbitmq')
+          resign_as_master do
+            connection.periodically_reconnect(5)
+          end
         end
       end
       @rabbitmq.on_skipped_heartbeats do
@@ -128,94 +133,116 @@ module Sensu
       else
         ['default']
       end
-      handler_list.map! do |handler_name|
-        if @settings.handler_exists?(handler_name) && @settings[:handlers][handler_name][:type] == 'set'
-          @settings[:handlers][handler_name][:handlers]
-        else
-          handler_name
-        end
-      end
-      handler_list.flatten!
-      handler_list.uniq!
-      handlers = handler_list.map do |handler_name|
+      handlers = handler_list.inject(Array.new) do |handlers, handler_name|
         if @settings.handler_exists?(handler_name)
-          handler = @settings[:handlers][handler_name].merge(:name => handler_name)
-          if handler.has_key?(:severities)
-            event_severity = Sensu::SEVERITIES[event[:check][:status]] || 'unknown'
-            unless handler[:severities].include?(event_severity)
-              @logger.debug('handler does not handle event severity', {
-                :event => event,
-                :handler => handler
-              })
-              next
-            end
-          end
-          if check_subdued?(event[:check], :handler)
-            @logger.info('check is subdued at handler', {
-              :event => event,
-              :handler => handler
-            })
-            next
+          handler = @settings[:handlers][handler_name]
+          if handler[:type] == 'set'
+            handlers + handler[:handlers]
+          else
+            handlers.push(handler)
           end
-          handler
         else
           @logger.warn('unknown handler', {
+            :event => event,
             :handler => {
               :name => handler_name
             }
           })
-          next
+        end
+        handlers.uniq
+      end
+      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)
+          @logger.debug('handler does not handle event severity', {
+            :event => event,
+            :handler => handler
+          })
+          false
+        elsif check_subdued?(event[:check], :handler)
+          @logger.info('check is subdued at handler', {
+            :event => event,
+            :handler => handler
+          })
+          false
+        else
+          true
         end
       end
-      handlers.compact
     end
 
-    def mutate_event_data(handler, event)
-      if handler.has_key?(:mutator)
-        mutated = nil
-        case handler[:mutator]
-        when /^only_check_output/
-          if handler[:type] == 'amqp' && handler[:mutator] =~ /split$/
-            mutated = Array.new
-            event[:check][:output].split(/\n+/).each do |line|
-              mutated.push(line)
+    def execute_command(command, data=nil, on_error=nil, &block)
+      execute = Proc.new do
+        output = ''
+        status = 0
+        begin
+          IO.popen(command + ' 2>&1', 'r+') do |io|
+            unless data.nil?
+              io.write(data.to_s)
             end
-          else
-            mutated = event[:check][:output]
+            io.close_write
+            output = io.read
+          end
+          status = $?.exitstatus
+        rescue => error
+          status = 2
+          if on_error.respond_to?(:call)
+            on_error.call(error)
           end
+        end
+        [output, status]
+      end
+      complete = Proc.new do |output, status|
+        block.call(output, status)
+      end
+      EM::defer(execute, complete)
+    end
+
+    def mutate_event_data(mutator_name, event, &block)
+      case mutator_name
+      when nil
+        block.call(event.to_json)
+      when /^only_check_output/
+        mutated = case mutator_name
+        when /split$/
+          event[:check][:output].split(/\n+/)
         else
-          if @settings.mutator_exists?(handler[:mutator])
-            mutator = @settings[:mutators][handler[:mutator]]
-            begin
-              IO.popen(mutator[:command], 'r+') do |io|
-                io.write(event.to_json)
-                io.close_write
-                mutated = io.read
-              end
-            rescue => error
-              @logger.error('mutator error', {
-                :event => event,
-                :mutator => mutator,
-                :error => error.to_s
-              })
-            end
-            if $?.exitstatus != 0
+          event[:check][:output]
+        end
+        block.call(mutated)
+      else
+        if @settings.mutator_exists?(mutator_name)
+          mutator = @settings[:mutators][mutator_name]
+          on_error = Proc.new do |error|
+            @logger.error('mutator error', {
+              :event => event,
+              :mutator => mutator,
+              :error => error.to_s
+            })
+          end
+          execute_command(mutator[:command], event.to_json, on_error) do |output, status|
+            if status != 0
               @logger.warn('mutator had a non-zero exit status', {
                 :event => event,
                 :mutator => mutator
               })
             end
-          else
-            @logger.warn('unknown mutator', {
-              :mutator => {
-                :name => handler[:mutator]
-              }
-            })
+            block.call(output)
           end
+        else
+          @logger.warn('unknown mutator', {
+            :event => event,
+            :mutator => {
+              :name => mutator_name
+            }
+          })
         end
-        mutated
-      else
-        event.to_json
       end
     end
 
@@ -228,70 +255,50 @@ module Sensu
           :handler => handler
         })
         @handlers_in_progress_count += 1
-        case handler[:type]
-        when 'pipe'
-          execute = Proc.new do
+        on_error = Proc.new do |error|
+          @logger.error('handler error', {
+            :event => event,
+            :handler => handler,
+            :error => error.to_s
+          })
+          @handlers_in_progress_count -= 1
+        end
+        mutate_event_data(handler[:mutator], event) do |event_data|
+          case handler[:type]
+          when 'pipe'
+            execute_command(handler[:command], event_data, on_error) do |output, status|
+              output.split(/\n+/).each do |line|
+                @logger.info(line)
+              end
+              @handlers_in_progress_count -= 1
+            end
+          when 'tcp'
             begin
-              event_data = mutate_event_data(handler, event)
-              unless event_data.nil? || event_data.empty?
-                IO.popen(handler[:command] + ' 2>&1', 'r+') do |io|
-                  io.write(event_data)
-                  io.close_write
-                  io.read.split(/\n+/).each do |line|
-                    @logger.info(line)
-                  end
-                end
+              EM::connect(handler[:socket][:host], handler[:socket][:port], nil) do |socket|
+                socket.send_data(event_data.to_s)
+                socket.close_connection_after_writing
+                @handlers_in_progress_count -= 1
               end
             rescue => error
-              @logger.error('handler error', {
-                :event => event,
-                :handler => handler,
-                :error => error.to_s
-              })
+              on_error.call(error)
             end
-          end
-          complete = Proc.new do
-            @handlers_in_progress_count -= 1
-          end
-          EM::defer(execute, complete)
-        when 'tcp', 'udp'
-          event_data = Proc.new do
-            mutate_event_data(handler, event)
-          end
-          write = Proc.new do |event_data|
+          when 'udp'
             begin
-              case handler[:type]
-              when 'tcp'
-                EM::connect(handler[:socket][:host], handler[:socket][:port], nil) do |socket|
-                  socket.send_data(event_data)
-                  socket.close_connection_after_writing
-                end
-              when 'udp'
-                EM::open_datagram_socket('127.0.0.1', 0, nil) do |socket|
-                  socket.send_datagram(event_data, handler[:socket][:host], handler[:socket][:port])
-                  socket.close_connection_after_writing
-                end
+              EM::open_datagram_socket('127.0.0.1', 0, nil) do |socket|
+                socket.send_datagram(event_data.to_s, handler[:socket][:host], handler[:socket][:port])
+                socket.close_connection_after_writing
+                @handlers_in_progress_count -= 1
               end
             rescue => error
-              @logger.error('handler error', {
-                :event => event,
-                :handler => handler,
-                :error => error.to_s
-              })
+              on_error.call(error)
             end
-            @handlers_in_progress_count -= 1
-          end
-          EM::defer(event_data, write)
-        when 'amqp'
-          exchange_name = handler[:exchange][:name]
-          exchange_type = handler[:exchange].has_key?(:type) ? handler[:exchange][:type].to_sym : :direct
-          exchange_options = handler[:exchange].reject do |key, value|
-            [:name, :type].include?(key)
-          end
-          payloads = Proc.new do
-            Array(mutate_event_data(handler, event))
-          end
-          publish = Proc.new do |payloads|
+          when 'amqp'
+            exchange_name = handler[:exchange][:name]
+            exchange_type = handler[:exchange].has_key?(:type) ? handler[:exchange][:type].to_sym : :direct
+            exchange_options = handler[:exchange].reject do |key, value|
+              [:name, :type].include?(key)
+            end
+            payloads = Array(event_data)
             payloads.each do |payload|
               unless payload.empty?
                 @amq.method(exchange_type).call(exchange_name, exchange_options).publish(payload)
@@ -299,12 +306,6 @@ module Sensu
             end
             @handlers_in_progress_count -= 1
           end
-          EM::defer(payloads, publish)
-        when 'set'
-          @logger.error('handler sets cannot be nested', {
-            :handler => handler
-          })
-          @handlers_in_progress_count -= 1
         end
       end
     end

data/lib/sensu/settings.rb

@@ -281,7 +281,7 @@ module Sensu
       unless @settings[:client].is_a?(Hash)
         invalid('missing client configuration')
       end
-      unless @settings[:client][:name].is_a?(String)
+      unless @settings[:client][:name].is_a?(String) && !@settings[:client][:name].empty?
         invalid('client must have a name')
       end
       unless @settings[:client][:address].is_a?(String)

data/sensu.gemspec

@@ -12,13 +12,13 @@ Gem::Specification.new do |s|
   s.license     = 'MIT'
   s.has_rdoc    = false
 
-  s.add_dependency('eventmachine', '1.0.0.rc.4')
+  s.add_dependency('eventmachine', '1.0.0')
   s.add_dependency('amqp', '0.9.7')
   s.add_dependency('json')
   s.add_dependency('cabin', '0.4.4')
   s.add_dependency('ruby-redis', '0.0.2')
+  s.add_dependency('thin', '1.5.0')
   s.add_dependency('async_sinatra', '1.0.0')
-  s.add_dependency('thin', '1.4.1')
 
   s.add_development_dependency('rake')
   s.add_development_dependency('em-spec')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sensu
 version: !ruby/object:Gem::Version
-  version: 0.9.8.beta
+  version: 0.9.8.beta.1
   prerelease: 6
 platform: ruby
 authors:
@@ -10,22 +10,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-25 00:00:00.000000000 Z
+date: 2012-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &22192440 !ruby/object:Gem::Requirement
+  requirement: &5377080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
       - !ruby/object:Gem::Version
-        version: 1.0.0.rc.4
+        version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *22192440
+  version_requirements: *5377080
 - !ruby/object:Gem::Dependency
   name: amqp
-  requirement: &22191880 !ruby/object:Gem::Requirement
+  requirement: &5375340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -33,10 +33,10 @@ dependencies:
         version: 0.9.7
   type: :runtime
   prerelease: false
-  version_requirements: *22191880
+  version_requirements: *5375340
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &22191380 !ruby/object:Gem::Requirement
+  requirement: &5374380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *22191380
+  version_requirements: *5374380
 - !ruby/object:Gem::Dependency
   name: cabin
-  requirement: &22190740 !ruby/object:Gem::Requirement
+  requirement: &5371840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -55,10 +55,10 @@ dependencies:
         version: 0.4.4
   type: :runtime
   prerelease: false
-  version_requirements: *22190740
+  version_requirements: *5371840
 - !ruby/object:Gem::Dependency
   name: ruby-redis
-  requirement: &22189740 !ruby/object:Gem::Requirement
+  requirement: &5368960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -66,32 +66,32 @@ dependencies:
         version: 0.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *22189740
+  version_requirements: *5368960
 - !ruby/object:Gem::Dependency
-  name: async_sinatra
-  requirement: &22166160 !ruby/object:Gem::Requirement
+  name: thin
+  requirement: &5367040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *22166160
+  version_requirements: *5367040
 - !ruby/object:Gem::Dependency
-  name: thin
-  requirement: &22164620 !ruby/object:Gem::Requirement
+  name: async_sinatra
+  requirement: &5365940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
       - !ruby/object:Gem::Version
-        version: 1.4.1
+        version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *22164620
+  version_requirements: *5365940
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &22163460 !ruby/object:Gem::Requirement
+  requirement: &5365200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,10 +99,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *22163460
+  version_requirements: *5365200
 - !ruby/object:Gem::Dependency
   name: em-spec
-  requirement: &22161740 !ruby/object:Gem::Requirement
+  requirement: &5364600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -110,10 +110,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *22161740
+  version_requirements: *5364600
 - !ruby/object:Gem::Dependency
   name: em-http-request
-  requirement: &22160720 !ruby/object:Gem::Requirement
+  requirement: &5364040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -121,7 +121,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *22160720
+  version_requirements: *5364040
 description: A monitoring framework that aims to be simple, malleable, and scalable.
   Uses the publish/subscribe model.
 email: