sensu 0.9.9.beta.2 → 0.9.9.beta.3

data/CHANGELOG.md

@@ -15,6 +15,8 @@ TCP handler socket timeout, which defaults to 10 seconds.
 
 Check execution timeout.
 
+Server extensions (mutators & handlers).
+
 ### Other
 
 Server is now using basic AMQP QoS (prefetch), just enough back pressure.

data/lib/sensu/api.rb

@@ -21,9 +21,10 @@ module Sensu
       end
 
       def bootstrap(options={})
-        $logger = Sensu::Logger.get
-        base = Sensu::Base.new(options)
+        base = Base.new(options)
+        $logger = base.logger
         $settings = base.settings
+        base.setup_process
         if $settings[:api][:user] && $settings[:api][:password]
           use Rack::Auth::Basic do |user, password|
             user == $settings[:api][:user] && password == $settings[:api][:password]
@@ -35,20 +36,18 @@ module Sensu
         $logger.debug('connecting to redis', {
           :settings => $settings[:redis]
         })
-        connection_failure = Proc.new do
-          $logger.fatal('cannot connect to redis', {
-            :settings => $settings[:redis]
+        $redis = Redis.connect($settings[:redis])
+        $redis.on_error do |error|
+          $logger.fatal('redis connection error', {
+            :error => error.to_s
           })
-          $logger.fatal('SENSU NOT RUNNING!')
-          if $rabbitmq
-            $rabbitmq.close
-          end
-          exit 2
+          stop
         end
-        $redis = Sensu::Redis.connect($settings[:redis], :on_tcp_connection_failure => connection_failure)
-        $redis.on_tcp_connection_loss do |connection, settings|
+        $redis.before_reconnect do
           $logger.warn('reconnecting to redis')
-          connection.reconnect(false, 10)
+        end
+        $redis.after_reconnect do
+          $logger.info('reconnected to redis')
         end
       end
 
@@ -56,30 +55,20 @@ module Sensu
         $logger.debug('connecting to rabbitmq', {
           :settings => $settings[:rabbitmq]
         })
-        connection_failure = Proc.new do
-          $logger.fatal('cannot connect to rabbitmq', {
-            :settings => $settings[:rabbitmq]
+        $rabbitmq = RabbitMQ.connect($settings[:rabbitmq])
+        $rabbitmq.on_error do |error|
+          $logger.fatal('rabbitmq connection error', {
+            :error => error.to_s
           })
-          $logger.fatal('SENSU NOT RUNNING!')
-          $redis.close
-          exit 2
+          stop
         end
-        $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|
-          unless connection.reconnecting?
-            $logger.warn('reconnecting to rabbitmq')
-            connection.periodically_reconnect(5)
-          end
+        $rabbitmq.before_reconnect do
+          $logger.warn('reconnecting to rabbitmq')
         end
-        $rabbitmq.on_skipped_heartbeats do
-          $logger.warn('skipped rabbitmq heartbeat')
+        $rabbitmq.after_reconnect do
+          $logger.info('reconnected to rabbitmq')
         end
-        $amq = AMQP::Channel.new($rabbitmq)
-        $amq.auto_recovery = true
+        $amq = $rabbitmq.channel
       end
 
       def start
@@ -108,29 +97,9 @@ module Sensu
         end
       end
 
-      def run_test(options={}, &block)
+      def test(options={})
         bootstrap(options)
         start
-        $settings[:client][:timestamp] = Time.now.to_i
-        $redis.set('client:' + $settings[:client][:name], $settings[:client].to_json).callback do
-          $redis.sadd('clients', $settings[:client][:name]).callback do
-            $redis.hset('events:' + $settings[:client][:name], 'test', {
-              :output => 'CRITICAL',
-              :status => 2,
-              :issued => Time.now.to_i,
-              :flapping => false,
-              :occurrences => 1
-            }.to_json).callback do
-              $redis.set('stash:test/test', {:key => 'value'}.to_json).callback do
-                $redis.sadd('stashes', 'test/test').callback do
-                  EM::Timer.new(0.5) do
-                    block.call
-                  end
-                end
-              end
-            end
-          end
-        end
       end
     end
 
@@ -227,7 +196,7 @@ module Sensu
     aget '/info' do
       response = {
         :sensu => {
-          :version => Sensu::VERSION
+          :version => VERSION
         },
         :rabbitmq => {
           :keepalives => {
@@ -261,10 +230,10 @@ module Sensu
 
     aget '/clients' do
       response = Array.new
-      $redis.smembers('clients').callback do |clients|
+      $redis.smembers('clients') do |clients|
         unless clients.empty?
           clients.each_with_index do |client_name, index|
-            $redis.get('client:' + client_name).callback do |client_json|
+            $redis.get('client:' + client_name) do |client_json|
               response.push(JSON.parse(client_json))
               if index == clients.size - 1
                 body response.to_json
@@ -278,7 +247,7 @@ module Sensu
     end
 
     aget %r{/clients?/([\w\.-]+)$} do |client_name|
-      $redis.get('client:' + client_name).callback do |client_json|
+      $redis.get('client:' + client_name) do |client_json|
         unless client_json.nil?
           body client_json
         else
@@ -288,9 +257,9 @@ module Sensu
     end
 
     adelete %r{/clients?/([\w\.-]+)$} do |client_name|
-      $redis.get('client:' + client_name).callback do |client_json|
+      $redis.get('client:' + client_name) do |client_json|
         unless client_json.nil?
-          $redis.hgetall('events:' + client_name).callback do |events|
+          $redis.hgetall('events:' + client_name) do |events|
             events.each do |check_name, event_json|
               resolve_event(event_hash(event_json, client_name, check_name))
             end
@@ -302,7 +271,7 @@ module Sensu
               $redis.srem('clients', client_name)
               $redis.del('events:' + client_name)
               $redis.del('client:' + client_name)
-              $redis.smembers('history:' + client_name).callback do |checks|
+              $redis.smembers('history:' + client_name) do |checks|
                 checks.each do |check_name|
                   $redis.del('history:' + client_name + ':' + check_name)
                 end
@@ -367,10 +336,10 @@ module Sensu
 
     aget '/events' do
       response = Array.new
-      $redis.smembers('clients').callback do |clients|
+      $redis.smembers('clients') do |clients|
         unless clients.empty?
           clients.each_with_index do |client_name, index|
-            $redis.hgetall('events:' + client_name).callback do |events|
+            $redis.hgetall('events:' + client_name) do |events|
               events.each do |check_name, event_json|
                 response.push(event_hash(event_json, client_name, check_name))
               end
@@ -387,7 +356,7 @@ module Sensu
 
     aget %r{/events/([\w\.-]+)$} do |client_name|
       response = Array.new
-      $redis.hgetall('events:' + client_name).callback do |events|
+      $redis.hgetall('events:' + client_name) do |events|
         events.each do |check_name, event_json|
           response.push(event_hash(event_json, client_name, check_name))
         end
@@ -396,7 +365,7 @@ module Sensu
     end
 
     aget %r{/events?/([\w\.-]+)/([\w\.-]+)$} do |client_name, check_name|
-      $redis.hgetall('events:' + client_name).callback do |events|
+      $redis.hgetall('events:' + client_name) do |events|
         event_json = events[check_name]
         unless event_json.nil?
           body event_hash(event_json, client_name, check_name).to_json
@@ -407,7 +376,7 @@ module Sensu
     end
 
     adelete %r{/events?/([\w\.-]+)/([\w\.-]+)$} do |client_name, check_name|
-      $redis.hgetall('events:' + client_name).callback do |events|
+      $redis.hgetall('events:' + client_name) do |events|
         if events.include?(check_name)
           resolve_event(event_hash(events[check_name], client_name, check_name))
           accepted!
@@ -423,7 +392,7 @@ module Sensu
         client_name = post_body[:client]
         check_name = post_body[:check]
         if client_name.is_a?(String) && check_name.is_a?(String)
-          $redis.hgetall('events:' + client_name).callback do |events|
+          $redis.hgetall('events:' + client_name) do |events|
             if events.include?(check_name)
               resolve_event(event_hash(events[check_name], client_name, check_name))
               accepted!
@@ -441,7 +410,7 @@ module Sensu
 
     aget '/aggregates' do
       response = Array.new
-      $redis.smembers('aggregates').callback do |checks|
+      $redis.smembers('aggregates') do |checks|
         unless checks.empty?
           limit = 10
           if params[:limit]
@@ -449,7 +418,7 @@ module Sensu
           end
           unless limit.nil?
             checks.each_with_index do |check_name, index|
-              $redis.smembers('aggregates:' + check_name).callback do |aggregates|
+              $redis.smembers('aggregates:' + check_name) do |aggregates|
                 collection = {
                   :check => check_name,
                   :issued => aggregates.sort.reverse.take(limit)
@@ -470,7 +439,7 @@ module Sensu
     end
 
     aget %r{/aggregates/([\w\.-]+)$} do |check_name|
-      $redis.smembers('aggregates:' + check_name).callback do |aggregates|
+      $redis.smembers('aggregates:' + check_name) do |aggregates|
         unless aggregates.empty?
           limit = 10
           if params[:limit]
@@ -488,15 +457,15 @@ module Sensu
     end
 
     adelete %r{/aggregates/([\w\.-]+)$} do |check_name|
-      $redis.smembers('aggregates:' + check_name).callback do |aggregates|
+      $redis.smembers('aggregates:' + check_name) do |aggregates|
         unless aggregates.empty?
           aggregates.each do |check_issued|
             result_set = check_name + ':' + check_issued
             $redis.del('aggregation:' + result_set)
             $redis.del('aggregate:' + result_set)
           end
-          $redis.del('aggregates:' + check_name).callback do
-            $redis.srem('aggregates', check_name).callback do
+          $redis.del('aggregates:' + check_name) do
+            $redis.srem('aggregates', check_name) do
               no_content!
             end
           end
@@ -508,13 +477,13 @@ module Sensu
 
     aget %r{/aggregates?/([\w\.-]+)/([\w\.-]+)$} do |check_name, check_issued|
       result_set = check_name + ':' + check_issued
-      $redis.hgetall('aggregate:' + result_set).callback do |aggregate|
+      $redis.hgetall('aggregate:' + result_set) do |aggregate|
         unless aggregate.empty?
           response = aggregate.inject(Hash.new) do |totals, (status, count)|
             totals[status] = Integer(count)
             totals
           end
-          $redis.hgetall('aggregation:' + result_set).callback do |results|
+          $redis.hgetall('aggregation:' + result_set) 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))
@@ -543,8 +512,8 @@ module Sensu
     apost %r{/stash(?:es)?/(.*)} do |path|
       begin
         post_body = JSON.parse(request.body.read)
-        $redis.set('stash:' + path, post_body.to_json).callback do
-          $redis.sadd('stashes', path).callback do
+        $redis.set('stash:' + path, post_body.to_json) do
+          $redis.sadd('stashes', path) do
             created!
           end
         end
@@ -554,7 +523,7 @@ module Sensu
     end
 
     aget %r{/stash(?:es)?/(.*)} do |path|
-      $redis.get('stash:' + path).callback do |stash_json|
+      $redis.get('stash:' + path) do |stash_json|
         unless stash_json.nil?
           body stash_json
         else
@@ -564,10 +533,10 @@ module Sensu
     end
 
     adelete %r{/stash(?:es)?/(.*)} do |path|
-      $redis.exists('stash:' + path).callback do |stash_exists|
+      $redis.exists('stash:' + path) do |stash_exists|
         if stash_exists
-          $redis.srem('stashes', path).callback do
-            $redis.del('stash:' + path).callback do
+          $redis.srem('stashes', path) do
+            $redis.del('stash:' + path) do
               no_content!
             end
           end
@@ -589,7 +558,7 @@ module Sensu
         if post_body.is_a?(Array) && post_body.size > 0
           response = Hash.new
           post_body.each_with_index do |path, index|
-            $redis.get('stash:' + path).callback do |stash_json|
+            $redis.get('stash:' + path) do |stash_json|
               unless stash_json.nil?
                 response[path] = JSON.parse(stash_json)
               end

data/lib/sensu/base.rb

@@ -1,52 +1,58 @@
 require 'rubygems'
 
 gem 'eventmachine', '1.0.0'
-gem 'amqp', '0.9.7'
 
 require 'json'
-require 'timeout'
 require 'time'
 require 'uri'
-require 'amqp'
 
 require File.join(File.dirname(__FILE__), 'constants')
+require File.join(File.dirname(__FILE__), 'utilities')
 require File.join(File.dirname(__FILE__), 'cli')
-require File.join(File.dirname(__FILE__), 'logger')
+require File.join(File.dirname(__FILE__), 'logstream')
 require File.join(File.dirname(__FILE__), 'settings')
+require File.join(File.dirname(__FILE__), 'extensions')
 require File.join(File.dirname(__FILE__), 'process')
 require File.join(File.dirname(__FILE__), 'io')
+require File.join(File.dirname(__FILE__), 'rabbitmq')
 
 module Sensu
   class Base
-    attr_reader :options, :settings
-
     def initialize(options={})
-      @options = Sensu::DEFAULT_OPTIONS.merge(options)
-      setup_logging
-      setup_settings
-      setup_process
+      @options = DEFAULT_OPTIONS.merge(options)
+    end
+
+    def logger
+      stream = LogStream.new
+      stream.level = @options[:log_level]
+      if @options[:log_file]
+        stream.reopen(@options[:log_file])
+      end
+      stream.setup_traps
+      stream.logger
     end
 
-    def setup_logging
-      logger = Sensu::Logger.new
-      logger.level = @options[:verbose] ? :debug : @options[:log_level] || :info
-      logger.reopen(@options[:log_file])
-      logger.setup_traps
+    def settings
+      settings = Settings.new
+      settings.load_env
+      settings.load_file(@options[:config_file])
+      settings.load_directory(@options[:config_dir])
+      settings.validate
+      settings.set_env
+      settings
     end
 
-    def setup_settings
-      @settings = Sensu::Settings.new
-      @settings.load_env
-      @settings.load_file(@options[:config_file])
-      Dir[@options[:config_dir] + '/**/*.json'].each do |file|
-        @settings.load_file(file)
+    def extensions
+      extensions = Extensions.new
+      if @options[:extension_dir]
+        extensions.require_directory(@options[:extension_dir])
       end
-      @settings.validate
-      @settings.set_env
+      extensions.load_all
+      extensions
     end
 
     def setup_process
-      process = Sensu::Process.new
+      process = Process.new
       if @options[:daemonize]
         process.daemonize
       end

data/lib/sensu/cli.rb

@@ -10,20 +10,23 @@ module Sensu
           exit
         end
         opts.on('-V', '--version', 'Display version') do
-          puts Sensu::VERSION
+          puts VERSION
           exit
         end
-        opts.on('-c', '--config FILE', 'Sensu JSON config FILE. Default is /etc/sensu/config.json') do |file|
+        opts.on('-c', '--config FILE', 'Sensu JSON config FILE. Default: /etc/sensu/config.json') do |file|
           options[:config_file] = file
         end
-        opts.on('-d', '--config_dir DIR', 'DIR for supplemental Sensu JSON config files. Default is /etc/sensu/conf.d/') do |dir|
+        opts.on('-d', '--config_dir DIR', 'DIR for supplemental Sensu JSON config files. Default: /etc/sensu/conf.d/') do |dir|
           options[:config_dir] = dir
         end
-        opts.on('-l', '--log FILE', 'Log to a given FILE. Default is to log to stdout') do |file|
+        opts.on('-e', '--extension_dir DIR', 'DIR for Sensu extensions (experimental)') do |dir|
+          options[:extension_dir] = dir
+        end
+        opts.on('-l', '--log FILE', 'Log to a given FILE. Default: STDOUT') do |file|
           options[:log_file] = file
         end
         opts.on('-v', '--verbose', 'Enable verbose logging') do
-          options[:verbose] = true
+          options[:log_level] = :debug
         end
         opts.on('-b', '--background', 'Fork into the background') do
           options[:daemonize] = true
@@ -33,7 +36,7 @@ module Sensu
         end
       end
       optparse.parse!(arguments)
-      Sensu::DEFAULT_OPTIONS.merge(options)
+      DEFAULT_OPTIONS.merge(options)
     end
   end
 end

data/lib/sensu/client.rb

@@ -3,6 +3,10 @@ require File.join(File.dirname(__FILE__), 'socket')
 
 module Sensu
   class Client
+    include Utilities
+
+    attr_accessor :safe_mode
+
     def self.run(options={})
       client = self.new(options)
       EM::run do
@@ -12,41 +16,33 @@ module Sensu
     end
 
     def initialize(options={})
-      @logger = Sensu::Logger.get
-      base = Sensu::Base.new(options)
+      base = Base.new(options)
+      @logger = base.logger
       @settings = base.settings
+      base.setup_process
       @timers = Array.new
       @checks_in_progress = Array.new
+      @safe_mode = @settings[:client][:safe_mode] || false
     end
 
     def setup_rabbitmq
       @logger.debug('connecting to rabbitmq', {
         :settings => @settings[:rabbitmq]
       })
-      connection_failure = Proc.new do
-        @logger.fatal('cannot connect to rabbitmq', {
-          :settings => @settings[:rabbitmq]
+      @rabbitmq = RabbitMQ.connect(@settings[:rabbitmq])
+      @rabbitmq.on_error do |error|
+        @logger.fatal('rabbitmq connection error', {
+          :error => error.to_s
         })
-        @logger.fatal('SENSU NOT RUNNING!')
-        exit 2
+        stop
       end
-      @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|
-        unless connection.reconnecting?
-          @logger.warn('reconnecting to rabbitmq')
-          connection.periodically_reconnect(5)
-        end
+      @rabbitmq.before_reconnect do
+        @logger.warn('reconnecting to rabbitmq')
       end
-      @rabbitmq.on_skipped_heartbeats do
-        @logger.warn('skipped rabbitmq heartbeat')
-        @logger.warn('rabbitmq heartbeats are not recommended for clients')
+      @rabbitmq.after_reconnect do
+        @logger.info('reconnected to rabbitmq')
       end
-      @amq = AMQP::Channel.new(@rabbitmq)
-      @amq.auto_recovery = true
+      @amq = @rabbitmq.channel
     end
 
     def publish_keepalive
@@ -102,7 +98,7 @@ module Sensu
           execute = Proc.new do
             started = Time.now.to_f
             begin
-              check[:output], check[:status] = Sensu::IO.popen(command, 'r', check[:timeout])
+              check[:output], check[:status] = IO.popen(command, 'r', check[:timeout])
             rescue => error
               @logger.warn('unexpected error', {
                 :error => error.to_s
@@ -158,7 +154,7 @@ module Sensu
           if @settings.check_exists?(check[:name])
             check.merge!(@settings[:checks][check[:name]])
             execute_check(check)
-          elsif @settings[:client][:safe_mode]
+          elsif @safe_mode
             @logger.warn('check is not defined', {
               :check => check
             })
@@ -184,8 +180,9 @@ module Sensu
       stagger = testing? ? 0 : 2
       @settings.checks.each do |check|
         if check[:standalone]
-          standalone_check_count = (standalone_check_count + 1) % 30
-          @timers << EM::Timer.new(stagger * standalone_check_count) do
+          standalone_check_count += 1
+          scheduling_delay = stagger * standalone_check_count % 30
+          @timers << EM::Timer.new(scheduling_delay) do
             interval = testing? ? 0.5 : check[:interval]
             @timers << EM::PeriodicTimer.new(interval) do
               if @rabbitmq.connected?
@@ -200,14 +197,14 @@ module Sensu
 
     def setup_sockets
       @logger.debug('binding client tcp socket')
-      EM::start_server('127.0.0.1', 3030, Sensu::Socket) do |socket|
+      EM::start_server('127.0.0.1', 3030, Socket) do |socket|
         socket.protocol = :tcp
         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, Sensu::Socket) do |socket|
+      EM::open_datagram_socket('127.0.0.1', 3030, Socket) do |socket|
         socket.protocol = :udp
         socket.logger = @logger
         socket.settings = @settings
@@ -265,19 +262,5 @@ module Sensu
         end
       end
     end
-
-    private
-
-    def testing?
-      File.basename($0) == 'rake'
-    end
-
-    def retry_until_true(wait=0.5, &block)
-      EM::Timer.new(wait) do
-        unless block.call
-          retry_until_true(wait, &block)
-        end
-      end
-    end
   end
 end