sensu 0.9.1 → 0.9.2.beta

data/lib/sensu.rb

@@ -1,3 +1,3 @@
 module Sensu
-  VERSION = "0.9.1"
+  VERSION = "0.9.2.beta"
 end

data/lib/sensu/api.rb

@@ -1,5 +1,6 @@
 require File.join(File.dirname(__FILE__), 'config')
 
+require 'thin'
 require 'sinatra/async'
 require 'redis'
 
@@ -12,7 +13,9 @@ module Sensu
     def self.run(options={})
       EM::run do
         self.setup(options)
-        self.run!(:port => $settings.api.port)
+
+        Thin::Logging.silent = true
+        Thin::Server.start(self, $settings.api.port)
 
         %w[INT TERM].each do |signal|
           Signal.trap(signal) do
@@ -24,8 +27,8 @@ module Sensu
 
     def self.setup(options={})
       config = Sensu::Config.new(options)
+      $logger = config.logger
       $settings = config.settings
-      $logger = config.logger || config.open_log
       if options[:daemonize]
         Process.daemonize
       end
@@ -246,7 +249,7 @@ module Sensu
       end
     end
 
-    def self.create_test_scaffolding(options={})
+    def self.setup_test_scaffolding(options={})
       self.setup(options)
       $settings.client.timestamp = Time.now.to_i
       $redis.set('client:' + $settings.client.name, $settings.client.to_json).callback do
@@ -258,7 +261,8 @@ module Sensu
             :occurrences => 1
           }.to_json).callback do
             $redis.set('stash:test/test', '{"key": "value"}').callback do
-              self.run!(:port => $settings.api.port)
+              Thin::Logging.silent = true
+              Thin::Server.start(self, $settings.api.port)
             end
           end
         end
@@ -267,7 +271,8 @@ module Sensu
 
     def self.stop(signal)
       $logger.warn('[stop] -- stopping sensu api -- ' + signal)
-      EM::Timer.new(1) do
+      $logger.warn('[stop] -- stopping reactor')
+      EM::PeriodicTimer.new(0.25) do
         EM::stop_event_loop
       end
     end

data/lib/sensu/client.rb

@@ -15,6 +15,7 @@ module Sensu
         client.setup_keepalives
         client.setup_subscriptions
         client.setup_queue_monitor
+        client.setup_standalone
         client.setup_socket
 
         %w[INT TERM].each do |signal|
@@ -27,8 +28,10 @@ module Sensu
 
     def initialize(options={})
       config = Sensu::Config.new(options)
+      @logger = config.logger
       @settings = config.settings
-      @logger = config.logger || config.open_log
+      @timers = Array.new
+      @checks_in_progress = Array.new
     end
 
     def setup_amqp
@@ -46,7 +49,7 @@ module Sensu
     def setup_keepalives
       @logger.debug('[keepalive] -- setup keepalives')
       publish_keepalive
-      EM::PeriodicTimer.new(30) do
+      @timers << EM::PeriodicTimer.new(30) do
         publish_keepalive
       end
     end
@@ -60,16 +63,24 @@ module Sensu
     end
 
     def execute_check(check)
-      @logger.debug('[execute] -- executing check -- ' + check.name)
-      @checks_in_progress ||= Array.new
+      @logger.debug('[execute] -- attempting to execute check -- ' + check.name)
       if @settings.checks.key?(check.name)
         unless @checks_in_progress.include?(check.name)
+          @logger.debug('[execute] -- executing check -- ' + check.name)
           @checks_in_progress.push(check.name)
           unmatched_tokens = Array.new
           command = @settings.checks[check.name].command.gsub(/:::(.*?):::/) do
-            key = $1.to_s
-            unmatched_tokens.push(key) unless @settings.client.key?(key)
-            @settings.client[key].to_s
+            token = $1.to_s
+            begin
+              value = @settings.client.instance_eval(token)
+              if value.nil?
+                unmatched_tokens.push(token)
+              end
+            rescue NoMethodError
+              value = nil
+              unmatched_tokens.push(token)
+            end
+            value
           end
           if unmatched_tokens.empty?
             execute = proc do
@@ -97,6 +108,8 @@ module Sensu
             publish_result(check)
             @checks_in_progress.delete(check.name)
           end
+        else
+          @logger.debug('[execute] -- previous check execution still in progress -- ' + check.name)
         end
       else
         @logger.warn('[execute] -- unkown check -- ' + check.name)
@@ -110,60 +123,50 @@ module Sensu
 
     def setup_subscriptions
       @logger.debug('[subscribe] -- setup subscriptions')
-      @check_queue = @amq.queue(String.unique, :exclusive => true)
-      @settings.client.subscriptions.push('uchiwa').uniq!
-      @settings.client.subscriptions.each do |exchange|
+      @check_request_queue = @amq.queue(String.unique, :exclusive => true)
+      @settings.client.subscriptions.uniq.each do |exchange|
         @logger.debug('[subscribe] -- queue binding to exchange -- ' + exchange)
-        @check_queue.bind(@amq.fanout(exchange))
+        @check_request_queue.bind(@amq.fanout(exchange))
       end
-      @check_queue.subscribe do |check_json|
-        check = Hashie::Mash.new(JSON.parse(check_json))
-        @logger.info('[subscribe] -- received check -- ' + check.name)
-        if check.key?('matching')
-          @logger.info('[subscribe] -- check requires matching -- ' + check.name)
-          matches = check.matching.all? do |key, value|
-            desired = case key
-            when /^!/
-              key = key.slice(1..-1)
-              false
-            else
-              true
-            end
-            matched = case key
-            when 'subscribes'
-              value.all? do |subscription|
-                @settings.client.subscriptions.include?(subscription)
-              end
-            else
-              @settings.client[key] == value
-            end
-            desired == matched
-          end
-          if matches
-            @logger.info('[subscribe] -- client matches -- ' + check.name)
-            execute_check(check)
-          else
-            @logger.info('[subscribe] -- client does not match -- ' + check.name)
-          end
-        else
-          execute_check(check)
-        end
+      @check_request_queue.subscribe do |check_request_json|
+        check = Hashie::Mash.new(JSON.parse(check_request_json))
+        @logger.info('[subscribe] -- received check request -- ' + check.name)
+        execute_check(check)
       end
     end
 
     def setup_queue_monitor
       @logger.debug('[monitor] -- setup queue monitor')
-      EM::PeriodicTimer.new(5) do
-        unless @check_queue.subscribed?
+      @timers << EM::PeriodicTimer.new(5) do
+        unless @check_request_queue.subscribed?
           @logger.warn('[monitor] -- re-subscribing to subscriptions')
-          @check_queue.delete
-          EM::Timer.new(1) do
+          @check_request_queue.delete
+          @timers << EM::Timer.new(1) do
             setup_subscriptions
           end
         end
       end
     end
 
+    def setup_standalone(options={})
+      @logger.debug('[standalone] -- setup standalone')
+      standalone_count = 0
+      @settings.checks.each do |name, details|
+        if details.standalone
+          standalone_count += 1
+          check = Hashie::Mash.new(details.merge({:name => name}))
+          stagger = options[:test] ? 0 : 7
+          @timers << EM::Timer.new(stagger*standalone_count) do
+            interval = options[:test] ? 0.5 : details.interval
+            @timers << EM::PeriodicTimer.new(interval) do
+              check.issued = Time.now.to_i
+              execute_check(check)
+            end
+          end
+        end
+      end
+    end
+
     def setup_socket
       @logger.debug('[socket] -- starting up socket')
       EM::start_server('127.0.0.1', 3030, ClientSocket) do |socket|
@@ -173,10 +176,29 @@ module Sensu
       end
     end
 
+    def stop_reactor
+      @logger.info('[stop] -- completing checks in progress')
+      complete_in_progress = EM::tick_loop do
+        if @checks_in_progress.empty?
+          :stop
+        end
+      end
+      complete_in_progress.on_stop do
+        @logger.warn('[stop] -- stopping reactor')
+        EM::PeriodicTimer.new(0.25) do
+          EM::stop_event_loop
+        end
+      end
+    end
+
     def stop(signal)
       @logger.warn('[stop] -- stopping sensu client -- ' + signal)
-      EM::Timer.new(1) do
-        EM::stop_event_loop
+      @timers.each do |timer|
+        timer.cancel
+      end
+      @logger.warn('[stop] -- unsubscribing from subscriptions')
+      @check_request_queue.unsubscribe do
+        stop_reactor
       end
     end
   end
@@ -201,7 +223,7 @@ module Sensu
           @logger.warn('[socket] -- a check name, exit status, and output are required -- e.g. {"name": "x", "status": 0, "output": "y"}')
         end
       rescue JSON::ParserError => error
-        @logger.warn('[socket] -- check result must be valid JSON: ' + error.to_s)
+        @logger.warn('[socket] -- check result must be valid JSON: ' + error)
       end
       close_connection
     end

data/lib/sensu/config.rb

@@ -15,85 +15,45 @@ require 'cabin/outputs/em-stdlib-logger'
 
 module Sensu
   class Config
-    attr_accessor :settings, :logger
+    attr_accessor :logger, :settings
 
     DEFAULT_OPTIONS = {
-      :log_file => '/tmp/sensu.log',
       :config_file => '/etc/sensu/config.json',
-      :config_dir => '/etc/sensu/conf.d',
-      :validate => true,
-      :daemonize => false,
-      :pid_file => '/tmp/' + File.basename($0) + '.pid',
-      :service => File.basename($0)
+      :config_dir => '/etc/sensu/conf.d'
     }
 
     def initialize(options={})
       @options = DEFAULT_OPTIONS.merge(options)
-      if options[:log_file]
-        open_log
-      end
-      read_config
-      if @options[:validate]
-        validate_config
-      end
+      setup_logging
+      setup_settings
     end
 
     def invalid_config(message)
       raise 'configuration invalid, ' + message
     end
 
-    def open_log
-      @logger = Cabin::Channel.new
-      if File.writable?(@options[:log_file]) || !File.exist?(@options[:log_file]) && File.writable?(File.dirname(@options[:log_file]))
-        ruby_logger = case @options[:service]
-        when 'rake'
-          Logger.new(@options[:log_file])
-        else
+    def setup_logging
+      if @options[:log_file]
+        if File.writable?(@options[:log_file]) || !File.exist?(@options[:log_file]) && File.writable?(File.dirname(@options[:log_file]))
           STDOUT.reopen(@options[:log_file], 'a')
           STDERR.reopen(STDOUT)
           STDOUT.sync = true
-          Logger.new(STDOUT)
+        else
+          invalid_config('log file is not writable: ' + @options[:log_file])
         end
-      else
-        invalid_config('log file is not writable: ' + @options[:log_file])
       end
-      @logger.subscribe(Cabin::Outputs::EmStdlibLogger.new(ruby_logger))
+      @logger = Cabin::Channel.new
+      log_output = File.basename($0) == 'rake' ? '/tmp/sensu_test.log' : STDOUT
+      @logger.subscribe(Cabin::Outputs::EmStdlibLogger.new(Logger.new(log_output)))
       @logger.level = @options[:verbose] ? :debug : :info
       if Signal.list.include?('USR1')
         Signal.trap('USR1') do
           @logger.level = @logger.level == :info ? :debug : :info
         end
       end
-      @logger
-    end
-
-    def read_config
-      if File.readable?(@options[:config_file])
-        begin
-          @settings = Hashie::Mash.new(JSON.parse(File.open(@options[:config_file], 'r').read))
-        rescue JSON::ParserError => error
-          invalid_config('configuration file (' + @options[:config_file] + ') must be valid JSON: ' + error.to_s)
-        end
-      else
-        invalid_config('configuration file does not exist or is not readable: ' + @options[:config_file])
-      end
-      if File.exists?(@options[:config_dir])
-        Dir[@options[:config_dir] + '/**/*.json'].each do |snippet_file|
-          begin
-            snippet_hash = JSON.parse(File.open(snippet_file, 'r').read)
-          rescue JSON::ParserError => error
-            invalid_config('configuration snippet file (' + snippet_file + ') must be valid JSON: ' + error.to_s)
-          end
-          merged_settings = @settings.to_hash.deep_merge(snippet_hash)
-          if @logger
-            @logger.warn('[settings] configuration snippet (' + snippet_file + ') applied changes: ' + @settings.deep_diff(merged_settings).to_json)
-          end
-          @settings = Hashie::Mash.new(merged_settings)
-        end
-      end
     end
 
-    def validate_common_config
+    def validate_common_settings
       @settings.checks.each do |name, details|
         unless details.interval.is_a?(Integer) && details.interval > 0
           invalid_config('missing interval for check ' + name)
@@ -101,8 +61,10 @@ module Sensu
         unless details.command.is_a?(String)
           invalid_config('missing command for check ' + name)
         end
-        unless details.subscribers.is_a?(Array) && details.subscribers.count > 0
-          invalid_config('missing subscribers for check ' + name)
+        unless details.standalone
+          unless details.subscribers.is_a?(Array) && details.subscribers.count > 0
+            invalid_config('missing subscribers for check ' + name)
+          end
         end
         if details.key?('handler')
           unless details.handler.is_a?(String)
@@ -117,7 +79,7 @@ module Sensu
       end
     end
 
-    def validate_server_config
+    def validate_server_settings
       unless @settings.handlers.include?('default')
         invalid_config('missing default handler')
       end
@@ -125,28 +87,32 @@ module Sensu
         unless details.is_a?(Hash)
           invalid_config('hander details must be a hash ' + name)
         end
-        unless details.key?('type')
+        unless details['type'].is_a?(String)
           invalid_config('missing type for handler ' + name)
         end
         case details['type']
         when 'pipe'
-          unless details.key?('command')
+          unless details.command.is_a?(String)
             invalid_config('missing command for pipe handler ' + name)
           end
         when 'amqp'
-          unless details.key?('exchange')
+          unless details.exchange.is_a?(Hash)
             invalid_config('missing exchange details for amqp handler ' + name)
           end
-          unless details.exchange.key?('name')
+          unless details.exchange.name.is_a?(String)
             invalid_config('missing exchange name for amqp handler ' + name)
           end
+        when 'set'
+          unless details.handlers.is_a?(Array) && details.handlers.count > 0
+            invalid_config('missing handler set for handler ' + name)
+          end
         else
           invalid_config('unknown type for handler ' + name)
         end
       end
     end
 
-    def validate_client_config
+    def validate_client_settings
       unless @settings.client.name.is_a?(String)
         invalid_config('client must have a name')
       end
@@ -166,54 +132,80 @@ module Sensu
       end
     end
 
-    def validate_config
-      if @logger
-        @logger.debug('[config] -- validating configuration')
-      end
+    def validate_settings
+      @logger.debug('[validate] -- validating configuration')
       has_keys(%w[rabbitmq checks])
-      validate_common_config
-      case @options[:service]
+      validate_common_settings
+      case File.basename($0)
       when 'rake'
         has_keys(%w[redis api handlers client])
-        validate_server_config
-        validate_client_config
+        validate_server_settings
+        validate_client_settings
       when 'sensu-server'
         has_keys(%w[redis handlers])
-        validate_server_config
+        validate_server_settings
       when 'sensu-api'
         has_keys(%w[redis api])
       when 'sensu-client'
         has_keys(%w[client])
-        validate_client_config
+        validate_client_settings
+      end
+      @logger.info('[validate] -- configuration valid -- running')
+    end
+
+    def setup_settings
+      if File.readable?(@options[:config_file])
+        begin
+          config_hash = JSON.parse(File.open(@options[:config_file], 'r').read)
+        rescue JSON::ParserError => error
+          invalid_config('configuration file (' + @options[:config_file] + ') must be valid JSON: ' + error)
+        end
+        @settings = Hashie::Mash.new(config_hash)
+      else
+        invalid_config('configuration file does not exist or is not readable: ' + @options[:config_file])
       end
-      if @logger
-        @logger.debug('[config] -- configuration valid -- running ' + @options[:service])
+      if File.exists?(@options[:config_dir])
+        Dir[@options[:config_dir] + '/**/*.json'].each do |snippet_file|
+          if File.readable?(snippet_file)
+            begin
+              snippet_hash = JSON.parse(File.open(snippet_file, 'r').read)
+            rescue JSON::ParserError => error
+              invalid_config('configuration snippet file (' + snippet_file + ') must be valid JSON: ' + error)
+            end
+            merged_settings = @settings.to_hash.deep_merge(snippet_hash)
+            @logger.warn('[settings] configuration snippet (' + snippet_file + ') applied changes: ' + @settings.deep_diff(merged_settings).to_json)
+            @settings = Hashie::Mash.new(merged_settings)
+          else
+            invalid_config('configuration snippet file is not readable: ' + snippet_file)
+          end
+        end
       end
+      validate_settings
     end
 
     def self.read_arguments(arguments)
       options = Hash.new
       optparse = OptionParser.new do |opts|
-        opts.on('-h', '--help', 'Display this screen') do
+        opts.on('-h', '--help', 'Display this message') do
           puts opts
           exit
         end
-        opts.on('-c', '--config FILE', 'Sensu JSON config FILE (default: /etc/sensu/config.json)') do |file|
+        opts.on('-c', '--config FILE', 'Sensu JSON config FILE. Default is /etc/sensu/config.json') do |file|
           options[:config_file] = file
         end
-        opts.on('-d', '--config_dir DIR', 'Directory for supplemental Sensu JSON config files (default: /etc/sensu/conf.d/)') do |dir|
+        opts.on('-d', '--config_dir DIR', 'DIR for supplemental Sensu JSON config files. Default is /etc/sensu/conf.d/') do |dir|
           options[:config_dir] = dir
         end
-        opts.on('-l', '--log FILE', 'Sensu log FILE (default: /tmp/sensu.log)') do |file|
+        opts.on('-l', '--log FILE', 'Log to a given FILE. Default is to log to stdout') do |file|
           options[:log_file] = file
         end
-        opts.on('-v', '--verbose', 'Enable verbose logging (default: false)') do
+        opts.on('-v', '--verbose', 'Enable verbose logging') do
           options[:verbose] = true
         end
-        opts.on('-b', '--background', 'Fork into backgaround (daemon mode) (default: false)') do
+        opts.on('-b', '--background', 'Fork into the background') do
           options[:daemonize] = true
         end
-        opts.on('-p', '--pid_file FILE', 'Sensu PID FILE (default: ' + DEFAULT_OPTIONS[:pid_file] + ')') do |file|
+        opts.on('-p', '--pid_file FILE', 'Write the PID to a given FILE') do |file|
           options[:pid_file] = file
         end
       end

data/lib/sensu/patches/ruby.rb

@@ -33,7 +33,13 @@ class Hash
 
   def deep_merge(hash)
     merger = proc do |key, value1, value2|
-      value1.is_a?(Hash) && value2.is_a?(Hash) ? value1.merge(value2, &merger) : value2
+      if value1.is_a?(Hash) && value2.is_a?(Hash)
+        value1.merge(value2, &merger)
+      elsif value1.is_a?(Array) && value2.is_a?(Array)
+        value1.concat(value2).uniq
+      else
+        value2
+      end
     end
     self.merge(hash, &merger)
   end

data/lib/sensu/server.rb

@@ -35,9 +35,10 @@ module Sensu
 
     def initialize(options={})
       config = Sensu::Config.new(options)
+      @logger = config.logger
       @settings = config.settings
-      @logger = config.logger || config.open_log
       @timers = Array.new
+      @handlers_in_progress = 0
     end
 
     def setup_redis
@@ -72,14 +73,21 @@ module Sensu
       else
         ['default']
       end
+      handlers.map! do |handler|
+        @settings.handlers[handler]['type'] == 'set' ? @settings.handlers[handler].handlers : handler
+      end
+      handlers.flatten!
+      handlers.uniq!
       report = proc do |output|
         output.split(/\n+/).each do |line|
           @logger.info('[handler] -- ' + line)
         end
+        @handlers_in_progress -= 1
       end
       handlers.each do |handler|
         if @settings.handlers.key?(handler)
           @logger.debug('[event] -- handling event -- ' + [handler, event.client.name, event.check.name].join(' -- '))
+          @handlers_in_progress += 1
           details = @settings.handlers[handler]
           case details['type']
           when 'pipe'
@@ -93,7 +101,7 @@ module Sensu
                     output = io.read
                   end
                 rescue Errno::EPIPE => error
-                  output = handler + ' -- broken pipe: ' + error.to_s
+                  output = handler + ' -- broken pipe: ' + error
                 end
               end
               output
@@ -106,6 +114,10 @@ module Sensu
             @logger.debug('[event] -- publishing event to rabbitmq exchange -- ' + [exchange, event.client.name, event.check.name].join(' -- '))
             payload = details.send_only_check_output ? event.check.output : event.to_json
             @amq.method(exchange_type).call(exchange, exchange_options).publish(payload)
+            @handlers_in_progress -= 1
+          when 'set'
+            @logger.warn('[event] -- handler sets cannot be nested -- ' + handler)
+            @handlers_in_progress -= 1
           end
         else
           @logger.warn('[event] -- unknown handler -- ' + handler)
@@ -214,20 +226,13 @@ module Sensu
       stagger = options[:test] ? 0 : 7
       @settings.checks.each_with_index do |(name, details), index|
         check_request = Hashie::Mash.new({:name => name})
-        unless details.publish == false
+        unless details.publish == false || details.standalone
           @timers << EM::Timer.new(stagger*index) do
-            details.subscribers.each do |target|
-              if target.is_a?(Hash)
-                @logger.debug('[publisher] -- check requires matching -- ' + target.to_hash.to_s + ' -- ' + name)
-                check_request.matching = target
-                exchange = 'uchiwa'
-              else
-                exchange = target
-              end
+            details.subscribers.each do |exchange|
               interval = options[:test] ? 0.5 : details.interval
               @timers << EM::PeriodicTimer.new(interval) do
-                check_request.issued = Time.now.to_i
                 @logger.info('[publisher] -- publishing check request -- ' + name + ' -- ' + exchange)
+                check_request.issued = Time.now.to_i
                 @amq.fanout(exchange).publish(check_request.to_json)
               end
             end
@@ -333,9 +338,19 @@ module Sensu
     end
 
     def stop_reactor
-      @logger.warn('[stop] -- stopping reactor')
-      EM::Timer.new(3) do
-        EM::stop_event_loop
+      EM::Timer.new(1) do
+        @logger.info('[stop] -- completing handlers in progress')
+        complete_in_progress = EM::tick_loop do
+          if @handlers_in_progress == 0
+            :stop
+          end
+        end
+        complete_in_progress.on_stop do
+          @logger.warn('[stop] -- stopping reactor')
+          EM::PeriodicTimer.new(0.25) do
+            EM::stop_event_loop
+          end
+        end
       end
     end
 
@@ -344,10 +359,10 @@ module Sensu
       @timers.each do |timer|
         timer.cancel
       end
+      @logger.warn('[stop] -- unsubscribing from keepalives')
       @keepalive_queue.unsubscribe do
-        @logger.warn('[stop] -- unsubscribed from rabbitmq queue -- keepalives')
+        @logger.warn('[stop] -- unsubscribing from results')
         @result_queue.unsubscribe do
-          @logger.warn('[stop] -- unsubscribed from rabbitmq queue -- results')
           if @is_master
             @redis.del('lock:master').callback do
               @logger.warn('[stop] -- resigned as master')

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: sensu
 version: !ruby/object:Gem::Version 
-  hash: 57
-  prerelease: false
+  hash: 31098113
+  prerelease: true
   segments: 
   - 0
   - 9
-  - 1
-  version: 0.9.1
+  - 2
+  - beta
+  version: 0.9.2.beta
 platform: ruby
 authors: 
 - Sean Porter
@@ -16,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-27 00:00:00 -08:00
+date: 2012-01-04 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -258,12 +259,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: