sensu 0.9.9 → 0.9.10

data/CHANGELOG.md

@@ -1,3 +1,19 @@
+## 0.9.10 - 2013-01-30
+
+### Features
+
+Handlers can be subdued like checks, suppression windows.
+
+### Non-backwards compatible changes
+
+Extensions have access to settings.
+
+### Other
+
+Client queue names are now determined by the broker (RabbitMQ).
+
+Improved zombie reaping.
+
 ## 0.9.9 - 2013-01-14
 
 ### Features

data/lib/sensu/client.rb

@@ -134,42 +134,44 @@ module Sensu
 
     def setup_subscriptions
       @logger.debug('subscribing to client subscriptions')
-      @uniq_queue_name ||= rand(36 ** 32).to_s(36)
-      @check_request_queue = @amq.queue(@uniq_queue_name, :auto_delete => true)
-      @settings[:client][:subscriptions].uniq.each do |exchange_name|
-        @logger.debug('binding queue to exchange', {
-          :queue => @uniq_queue_name,
-          :exchange => {
-            :name => exchange_name
-          }
-        })
-        @check_request_queue.bind(@amq.fanout(exchange_name))
-      end
-      @check_request_queue.subscribe do |payload|
-        begin
-          check = JSON.parse(payload, :symbolize_names => true)
-          @logger.info('received check request', {
-            :check => check
+      @check_request_queue = @amq.queue('', :auto_delete => true) do |queue|
+        @settings[:client][:subscriptions].uniq.each do |exchange_name|
+          @logger.debug('binding queue to exchange', {
+            :queue => {
+              :name => queue.name
+            },
+            :exchange => {
+              :name => exchange_name
+            }
           })
-          if @settings.check_exists?(check[:name])
-            check.merge!(@settings[:checks][check[:name]])
-            execute_check(check)
-          elsif @safe_mode
-            @logger.warn('check is not defined', {
+          queue.bind(@amq.fanout(exchange_name))
+        end
+        queue.subscribe do |payload|
+          begin
+            check = JSON.parse(payload, :symbolize_names => true)
+            @logger.info('received check request', {
               :check => check
             })
-            check[:output] = 'Check is not defined (safe mode)'
-            check[:status] = 3
-            check[:handle] = false
-            publish_result(check)
-          else
-            execute_check(check)
+            if @settings.check_exists?(check[:name])
+              check.merge!(@settings[:checks][check[:name]])
+              execute_check(check)
+            elsif @safe_mode
+              @logger.warn('check is not defined', {
+                :check => check
+              })
+              check[:output] = 'Check is not defined (safe mode)'
+              check[:status] = 3
+              check[:handle] = false
+              publish_result(check)
+            else
+              execute_check(check)
+            end
+          rescue JSON::ParserError => error
+            @logger.warn('check request payload must be valid json', {
+              :payload => payload,
+              :error => error.to_s
+            })
           end
-        rescue JSON::ParserError => error
-          @logger.warn('check request payload must be valid json', {
-            :payload => payload,
-            :error => error.to_s
-          })
         end
       end
     end

data/lib/sensu/constants.rb

@@ -1,6 +1,6 @@
 module Sensu
   unless defined?(Sensu::VERSION)
-    VERSION = '0.9.9'
+    VERSION = '0.9.10'
 
     DEFAULT_OPTIONS = {
       :config_file => '/etc/sensu/config.json',

data/lib/sensu/extensions.rb

@@ -82,7 +82,7 @@ module Sensu
         definition.has_key?(key.to_sym)
       end
 
-      def run(event=nil, &block)
+      def run(event=nil, settings={}, &block)
         block.call('noop', 0)
       end
 

data/lib/sensu/extensions/handlers/debug.rb

@@ -9,7 +9,7 @@ module Sensu
         'outputs json event data'
       end
 
-      def run(event, &block)
+      def run(event, settings, &block)
         block.call(event.to_json, 0)
       end
     end

data/lib/sensu/extensions/mutators/only_check_output.rb

@@ -9,7 +9,7 @@ module Sensu
         'returns check output'
       end
 
-      def run(event, &block)
+      def run(event, settings, &block)
         block.call(event[:check][:output], 0)
       end
     end

data/lib/sensu/io.rb

@@ -37,6 +37,10 @@ module Sensu
           kill_process_group(child.pid)
           wait_on_process_group(child.pid)
           ['Execution timed out', 2]
+        rescue => error
+          kill_process_group(child.pid)
+          wait_on_process_group(child.pid)
+          raise error
         end
       end
 

data/lib/sensu/rabbitmq.rb

@@ -27,9 +27,6 @@ module Sensu
     end
 
     def connect(options={})
-      options.reject! do |key, value|
-        key == :heartbeat
-      end
       on_failure = Proc.new do
         error = RabbitMQError.new('cannot connect to rabbitmq')
         @on_error.call(error)

data/lib/sensu/server.rb

@@ -94,12 +94,20 @@ module Sensu
       end
     end
 
-    def check_subdued?(check, subdue_at)
+    def action_subdued?(check, handler=nil)
       subdue = false
-      if check[:subdue].is_a?(Hash)
-        if check[:subdue].has_key?(:begin) && check[:subdue].has_key?(:end)
-          begin_time = Time.parse(check[:subdue][:begin])
-          end_time = Time.parse(check[:subdue][:end])
+      subdue_at = handler ? 'handler' : 'publisher'
+      conditions = Array.new
+      if check[:subdue]
+        conditions.push(check[:subdue])
+      end
+      if handler && handler[:subdue]
+        conditions.push(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')
@@ -111,19 +119,26 @@ module Sensu
             subdue = true
           end
         end
-        if check[:subdue].has_key?(:days)
-          days = check[:subdue][:days].map(&:downcase)
+        if condition.has_key?(:days)
+          days = condition[:days].map(&:downcase)
           if days.include?(Time.now.strftime('%A').downcase)
             subdue = true
           end
         end
-        if subdue && check[:subdue].has_key?(:exceptions)
-          subdue = check[:subdue][:exceptions].none? do |exception|
+        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 subdue
+          if subdue_at == (condition[:at] || 'handler')
+            break
+          else
+            subdue = false
+          end
+        end
       end
-      subdue && subdue_at == (check[:subdue][:at] || 'handler').to_sym
+      subdue
     end
 
     def filter_attributes_match?(hash_one, hash_two)
@@ -202,8 +217,8 @@ module Sensu
           })
           next
         end
-        if check_subdued?(event[:check], :handler)
-          @logger.info('check is subdued at handler', {
+        if action_subdued?(event[:check], handler)
+          @logger.info('action is subdued', {
             :event => event,
             :handler => handler
           })
@@ -266,31 +281,36 @@ module Sensu
     end
 
     def mutate_event_data(mutator_name, event, &block)
-      on_error = Proc.new do |error|
-        @logger.error('mutator error', {
-          :event => event,
-          :mutator => mutator,
-          :error => error.to_s
-        })
-      end
       case
       when mutator_name.nil?
         block.call(event.to_json)
       when @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
             block.call(output)
           else
-            on_error.call('non-zero exit status (' + status + '): ' + output)
+            on_error.call('non-zero exit status (' + status.to_s + '): ' + output)
           end
         end
       when @extensions.mutator_exists?(mutator_name)
-        @extensions[:mutators][mutator_name].run(event) do |output, status|
+        extension = @extensions[:mutators][mutator_name]
+        extension.run(event, @settings.to_hash) do |output, status|
           if status == 0
             block.call(output)
           else
-            on_error.call('non-zero exit status (' + status + '): ' + output)
+            @logger.error('mutator error', {
+              :event => event,
+              :extension => extension,
+              :error => 'non-zero exit status (' + status.to_s + '): ' + output
+            })
           end
         end
       else
@@ -365,7 +385,7 @@ module Sensu
             end
             @handlers_in_progress_count -= 1
           when 'extension'
-            handler.run(event_data) do |output, status|
+            handler.run(event_data, @settings.to_hash) do |output, status|
               output.split(/\n+/).each do |line|
                 @logger.info(line)
               end
@@ -536,8 +556,12 @@ module Sensu
           @master_timers << EM::Timer.new(scheduling_delay) do
             interval = testing? ? 0.5 : check[:interval]
             @master_timers << EM::PeriodicTimer.new(interval) do
-              unless check_subdued?(check, :publisher)
+              unless action_subdued?(check)
                 publish_check_request(check)
+              else
+                @logger.info('action is subdued', {
+                  :check => check
+                })
               end
             end
           end

data/lib/sensu/settings.rb

@@ -20,11 +20,15 @@ module Sensu
       @indifferent_access = true
     end
 
-    def [](key)
+    def to_hash
       unless @indifferent_access
         indifferent_access!
       end
-      @settings[key.to_sym]
+      @settings
+    end
+
+    def [](key)
+      to_hash[key]
     end
 
     SETTINGS_CATEGORIES.each do |category|
@@ -137,6 +141,55 @@ module Sensu
       exit 2
     end
 
+    def validate_subdue(condition, details={})
+      type = details.has_key?(:check) ? 'check' : 'handler'
+      unless condition.is_a?(Hash)
+        invalid(type + ' subdue must be a hash', details)
+      end
+      if condition.has_key?(:at)
+        unless %w[handler publisher].include?(condition[:at])
+          invalid(type + ' subdue at must be either handler or publisher', details)
+        end
+      end
+      if condition.has_key?(:begin) || condition.has_key?(:end)
+        begin
+          Time.parse(condition[:begin])
+          Time.parse(condition[:end])
+        rescue
+          invalid(type + ' subdue begin & end times must be valid', details)
+        end
+      end
+      if condition.has_key?(:days)
+        unless condition[:days].is_a?(Array)
+          invalid(type + ' subdue days must be an array', details)
+        end
+        condition[:days].each do |day|
+          days = %w[sunday monday tuesday wednesday thursday friday saturday]
+          unless day.is_a?(String) && days.include?(day.downcase)
+            invalid(type + ' subdue days must be valid days of the week', details)
+          end
+        end
+      end
+      if condition.has_key?(:exceptions)
+        unless condition[:exceptions].is_a?(Array)
+          invalid(type + ' subdue exceptions must be an array', details)
+        end
+        condition[:exceptions].each do |exception|
+          unless exception.is_a?(Hash)
+            invalid(type + ' subdue exceptions must each be a hash', details)
+          end
+          if exception.has_key?(:begin) || exception.has_key?(:end)
+            begin
+              Time.parse(exception[:begin])
+              Time.parse(exception[:end])
+            rescue
+              invalid(type + ' subdue exception begin & end times must be valid', details)
+            end
+          end
+        end
+      end
+    end
+
     def validate_checks
       unless @settings[:checks].is_a?(Hash)
         invalid('checks must be a hash')
@@ -209,60 +262,9 @@ module Sensu
           end
         end
         if check.has_key?(:subdue)
-          unless check[:subdue].is_a?(Hash)
-            invalid('check subdue must be a hash', {
-              :check => check
-            })
-          end
-          if check[:subdue].has_key?(:begin) || check[:subdue].has_key?(:end)
-            begin
-              Time.parse(check[:subdue][:begin])
-              Time.parse(check[:subdue][:end])
-            rescue
-              invalid('check subdue begin & end times must be valid', {
-                :check => check
-              })
-            end
-          end
-          if check[:subdue].has_key?(:days)
-            unless check[:subdue][:days].is_a?(Array)
-              invalid('check subdue days must be an array', {
-                :check => check
-              })
-            end
-            check[:subdue][:days].each do |day|
-              days = %w[sunday monday tuesday wednesday thursday friday saturday]
-              unless day.is_a?(String) && days.include?(day.downcase)
-                invalid('check subdue days must be valid days of the week', {
-                  :check => check
-                })
-              end
-            end
-          end
-          if check[:subdue].has_key?(:exceptions)
-            unless check[:subdue][:exceptions].is_a?(Array)
-              invalid('check subdue exceptions must be an array', {
-                :check => check
-              })
-            end
-            check[:subdue][:exceptions].each do |exception|
-              unless exception.is_a?(Hash)
-                invalid('check subdue exceptions must each be a hash', {
-                  :check => check
-                })
-              end
-              if exception.has_key?(:begin) || exception.has_key?(:end)
-                begin
-                  Time.parse(exception[:begin])
-                  Time.parse(exception[:end])
-                rescue
-                  invalid('check subdue exception begin & end times must be valid', {
-                    :check => check
-                  })
-                end
-              end
-            end
-          end
+          validate_subdue(check[:subdue], {
+            :check => check
+          })
         end
       end
     end
@@ -459,6 +461,11 @@ module Sensu
             end
           end
         end
+        if handler.has_key?(:subdue)
+          validate_subdue(handler[:subdue], {
+            :handler => handler
+          })
+        end
       end
     end
   end

data/sensu.gemspec

@@ -1,3 +1,4 @@
+# -*- encoding: utf-8 -*-
 require File.join(File.dirname(__FILE__), 'lib', 'sensu', 'constants')
 
 Gem::Specification.new do |s|
@@ -13,6 +14,7 @@ Gem::Specification.new do |s|
   s.has_rdoc    = false
 
   s.add_dependency('eventmachine', '1.0.0')
+  s.add_dependency('amq-client', '0.9.11')
   s.add_dependency('amqp', '0.9.8')
   s.add_dependency('json')
   s.add_dependency('cabin', '0.4.4')

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sensu
 version: !ruby/object:Gem::Version 
-  hash: 41
+  hash: 47
   prerelease: false
   segments: 
   - 0
   - 9
-  - 9
-  version: 0.9.9
+  - 10
+  version: 0.9.10
 platform: ruby
 authors: 
 - Sean Porter
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-01-14 00:00:00 -08:00
+date: 2013-01-30 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -36,9 +36,25 @@ dependencies:
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: amqp
+  name: amq-client
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 45
+        segments: 
+        - 0
+        - 9
+        - 11
+        version: 0.9.11
+  type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: amqp
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -50,11 +66,11 @@ dependencies:
         - 8
         version: 0.9.8
   type: :runtime
-  version_requirements: *id002
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: json
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -64,11 +80,11 @@ dependencies:
         - 0
         version: "0"
   type: :runtime
-  version_requirements: *id003
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: cabin
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -80,11 +96,11 @@ dependencies:
         - 4
         version: 0.4.4
   type: :runtime
-  version_requirements: *id004
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: em-redis-unified
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -96,11 +112,11 @@ dependencies:
         - 1
         version: 0.4.1
   type: :runtime
-  version_requirements: *id005
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: thin
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -112,11 +128,11 @@ dependencies:
         - 0
         version: 1.5.0
   type: :runtime
-  version_requirements: *id006
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: async_sinatra
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -128,11 +144,11 @@ dependencies:
         - 0
         version: 1.0.0
   type: :runtime
-  version_requirements: *id007
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: rake
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -142,11 +158,11 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id008
+  version_requirements: *id009
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -156,11 +172,11 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id009
+  version_requirements: *id010
 - !ruby/object:Gem::Dependency 
   name: em-http-request
   prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -170,7 +186,7 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id010
+  version_requirements: *id011
 description: A monitoring framework that aims to be simple, malleable, and scalable. Uses the publish/subscribe model.
 email: 
 - portertech@gmail.com