sensu 0.9.11 → 0.9.12.beta

data/CHANGELOG.md

@@ -1,3 +1,23 @@
+## 0.9.12 - TBD
+
+### Features
+
+Check extensions.
+
+### Non-backwards compatible changes
+
+No longer defaults to or enforces a specific config file or directory.
+
+### Other
+
+Running on Ruby 2.0.0p0.
+
+Faster JSON parser.
+
+Lightweight logger.
+
+Improved config validation.
+
 ## 0.9.11 - 2013-02-22
 
 ### Features

data/lib/sensu/api.rb

@@ -87,8 +87,15 @@ module Sensu
       end
 
       def trap_signals
-        %w[INT TERM].each do |signal|
+        $signals = Array.new
+        STOP_SIGNALS.each do |signal|
           Signal.trap(signal) do
+            $signals << signal
+          end
+        end
+        EM::PeriodicTimer.new(1) do
+          signal = $signals.shift
+          if STOP_SIGNALS.include?(signal)
             $logger.warn('received signal', {
               :signal => signal
             })
@@ -152,7 +159,7 @@ module Sensu
       end
 
       def event_hash(event_json, client_name, check_name)
-        JSON.parse(event_json, :symbolize_names => true).merge(
+        Oj.load(event_json).merge(
           :client => client_name,
           :check => check_name
         )
@@ -173,7 +180,7 @@ module Sensu
         $logger.info('publishing check result', {
           :payload => payload
         })
-        $amq.direct('results').publish(payload.to_json)
+        $amq.direct('results').publish(Oj.dump(payload))
       end
     end
 
@@ -209,11 +216,11 @@ module Sensu
           $amq.queue('results').status do |messages, consumers|
             response[:rabbitmq][:results][:messages] = messages
             response[:rabbitmq][:results][:consumers] = consumers
-            body response.to_json
+            body Oj.dump(response)
           end
         end
       else
-        body response.to_json
+        body Oj.dump(response)
       end
     end
 
@@ -223,14 +230,14 @@ module Sensu
         unless clients.empty?
           clients.each_with_index do |client_name, index|
             $redis.get('client:' + client_name) do |client_json|
-              response.push(JSON.parse(client_json))
+              response << Oj.load(client_json)
               if index == clients.size - 1
-                body response.to_json
+                body Oj.dump(response)
               end
             end
           end
         else
-          body response.to_json
+          body Oj.dump(response)
         end
       end
     end
@@ -253,7 +260,7 @@ module Sensu
               resolve_event(event_hash(event_json, client_name, check_name))
             end
             EM::Timer.new(5) do
-              client = JSON.parse(client_json, :symbolize_names => true)
+              client = Oj.load(client_json)
               $logger.info('deleting client', {
                 :client => client
               })
@@ -276,13 +283,13 @@ module Sensu
     end
 
     aget '/checks' do
-      body $settings.checks.to_json
+      body Oj.dump($settings.checks)
     end
 
     aget %r{/checks?/([\w\.-]+)$} do |check_name|
       if $settings.check_exists?(check_name)
         response = $settings[:checks][check_name].merge(:name => check_name)
-        body response.to_json
+        body Oj.dump(response)
       else
         not_found!
       end
@@ -290,7 +297,7 @@ module Sensu
 
     apost %r{/(?:check/)?request$} do
       begin
-        post_body = JSON.parse(request.body.read, :symbolize_names => true)
+        post_body = Oj.load(request.body.read)
         check_name = post_body[:check]
         subscribers = post_body[:subscribers] || Array.new
         if check_name.is_a?(String) && subscribers.is_a?(Array)
@@ -309,7 +316,7 @@ module Sensu
               :subscribers => subscribers
             })
             subscribers.uniq.each do |exchange_name|
-              $amq.fanout(exchange_name).publish(payload.to_json)
+              $amq.fanout(exchange_name).publish(Oj.dump(payload))
             end
             created!
           else
@@ -318,7 +325,7 @@ module Sensu
         else
           bad_request!
         end
-      rescue JSON::ParserError, TypeError
+      rescue Oj::ParseError, TypeError
         bad_request!
       end
     end
@@ -330,15 +337,15 @@ module Sensu
           clients.each_with_index do |client_name, index|
             $redis.hgetall('events:' + client_name) do |events|
               events.each do |check_name, event_json|
-                response.push(event_hash(event_json, client_name, check_name))
+                response << event_hash(event_json, client_name, check_name)
               end
               if index == clients.size - 1
-                body response.to_json
+                body Oj.dump(response)
               end
             end
           end
         else
-          body response.to_json
+          body Oj.dump(response)
         end
       end
     end
@@ -347,9 +354,9 @@ module Sensu
       response = Array.new
       $redis.hgetall('events:' + client_name) do |events|
         events.each do |check_name, event_json|
-          response.push(event_hash(event_json, client_name, check_name))
+          response << event_hash(event_json, client_name, check_name)
         end
-        body response.to_json
+        body Oj.dump(response)
       end
     end
 
@@ -357,7 +364,7 @@ module Sensu
       $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
+          body Oj.dump(event_hash(event_json, client_name, check_name))
         else
           not_found!
         end
@@ -377,7 +384,7 @@ module Sensu
 
     apost %r{/(?:event/)?resolve$} do
       begin
-        post_body = JSON.parse(request.body.read, :symbolize_names => true)
+        post_body = Oj.load(request.body.read)
         client_name = post_body[:client]
         check_name = post_body[:check]
         if client_name.is_a?(String) && check_name.is_a?(String)
@@ -392,7 +399,7 @@ module Sensu
         else
           bad_request!
         end
-      rescue JSON::ParserError, TypeError
+      rescue Oj::ParseError, TypeError
         bad_request!
       end
     end
@@ -407,14 +414,14 @@ module Sensu
                 :check => check_name,
                 :issued => aggregates.sort.reverse
               }
-              response.push(collection)
+              response << collection
               if index == checks.size - 1
-                body response.to_json
+                body Oj.dump(response)
               end
             end
           end
         else
-          body response.to_json
+          body Oj.dump(response)
         end
       end
     end
@@ -442,7 +449,7 @@ module Sensu
             end
           end
           if valid_request
-            body aggregates.sort.reverse.take(limit).to_json
+            body Oj.dump(aggregates.sort.reverse.take(limit))
           else
             bad_request!
           end
@@ -481,8 +488,8 @@ module Sensu
           end
           $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))
+              check = Oj.load(check_json)
+              parsed << check.merge(:client => client_name)
             end
             if params[:summarize]
               options = params[:summarize].split(',')
@@ -497,7 +504,7 @@ module Sensu
             if params[:results]
               response[:results] = parsed_results
             end
-            body response.to_json
+            body Oj.dump(response)
           end
         else
           not_found!
@@ -507,13 +514,13 @@ module Sensu
 
     apost %r{/stash(?:es)?/(.*)} do |path|
       begin
-        post_body = JSON.parse(request.body.read)
-        $redis.set('stash:' + path, post_body.to_json) do
+        post_body = Oj.load(request.body.read)
+        $redis.set('stash:' + path, Oj.dump(post_body)) do
           $redis.sadd('stashes', path) do
             created!
           end
         end
-      rescue JSON::ParserError
+      rescue Oj::ParseError
         bad_request!
       end
     end
@@ -544,29 +551,29 @@ module Sensu
 
     aget '/stashes' do
       $redis.smembers('stashes') do |stashes|
-        body stashes.to_json
+        body Oj.dump(stashes)
       end
     end
 
     apost '/stashes' do
       begin
-        post_body = JSON.parse(request.body.read)
+        post_body = Oj.load(request.body.read)
         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) do |stash_json|
               unless stash_json.nil?
-                response[path] = JSON.parse(stash_json)
+                response[path] = Oj.load(stash_json)
               end
               if index == post_body.size - 1
-                body response.to_json
+                body Oj.dump(response)
               end
             end
           end
         else
           bad_request!
         end
-      rescue JSON::ParserError
+      rescue Oj::ParseError
         bad_request!
       end
     end

data/lib/sensu/base.rb

@@ -1,10 +1,11 @@
 require 'rubygems'
 
-gem 'eventmachine', '1.0.0'
+gem 'oj', '2.0.8'
+gem 'eventmachine', '1.0.1'
 
-require 'json'
 require 'time'
 require 'uri'
+require 'oj'
 
 require File.join(File.dirname(__FILE__), 'constants')
 require File.join(File.dirname(__FILE__), 'utilities')
@@ -16,27 +17,35 @@ require File.join(File.dirname(__FILE__), 'process')
 require File.join(File.dirname(__FILE__), 'io')
 require File.join(File.dirname(__FILE__), 'rabbitmq')
 
+Oj.default_options = {:symbol_keys => true}
+
 module Sensu
   class Base
     def initialize(options={})
-      @options = DEFAULT_OPTIONS.merge(options)
+      @options = options
     end
 
     def logger
-      stream = LogStream.new
-      stream.level = @options[:log_level]
+      logger = Logger.get
+      if @options[:log_level]
+        logger.level = @options[:log_level]
+      end
       if @options[:log_file]
-        stream.reopen(@options[:log_file])
+        logger.reopen(@options[:log_file])
       end
-      stream.setup_traps
-      stream.logger
+      logger.setup_traps
+      logger
     end
 
     def settings
       settings = Settings.new
       settings.load_env
-      settings.load_file(@options[:config_file])
-      settings.load_directory(@options[:config_dir])
+      if @options[:config_file]
+        settings.load_file(@options[:config_file])
+      end
+      if @options[:config_dir]
+        settings.load_directory(@options[:config_dir])
+      end
       settings.validate
       settings.set_env
       settings

data/lib/sensu/cli.rb

@@ -13,13 +13,13 @@ module Sensu
           puts VERSION
           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') do |file|
           options[:config_file] = file
         end
-        opts.on('-d', '--config_dir DIR', 'DIR for supplemental Sensu JSON config files. Default: /etc/sensu/conf.d/') do |dir|
+        opts.on('-d', '--config_dir DIR', 'DIR for Sensu JSON config files') do |dir|
           options[:config_dir] = dir
         end
-        opts.on('-e', '--extension_dir DIR', 'DIR for Sensu extensions (experimental)') do |dir|
+        opts.on('-e', '--extension_dir DIR', 'DIR for Sensu extensions') do |dir|
           options[:extension_dir] = dir
         end
         opts.on('-l', '--log FILE', 'Log to a given FILE. Default: STDOUT') do |file|
@@ -36,7 +36,7 @@ module Sensu
         end
       end
       optparse.parse!(arguments)
-      DEFAULT_OPTIONS.merge(options)
+      options
     end
   end
 end

data/lib/sensu/client.rb

@@ -19,6 +19,7 @@ module Sensu
       base = Base.new(options)
       @logger = base.logger
       @settings = base.settings
+      @extensions = base.extensions
       base.setup_process
       @timers = Array.new
       @checks_in_progress = Array.new
@@ -50,7 +51,7 @@ module Sensu
       @logger.debug('publishing keepalive', {
         :payload => payload
       })
-      @amq.direct('keepalives').publish(payload.to_json)
+      @amq.direct('keepalives').publish(Oj.dump(payload))
     end
 
     def setup_keepalives
@@ -71,38 +72,40 @@ module Sensu
       @logger.info('publishing check result', {
         :payload => payload
       })
-      @amq.direct('results').publish(payload.to_json)
+      @amq.direct('results').publish(Oj.dump(payload))
     end
 
-    def execute_check(check)
-      @logger.debug('attempting to execute check', {
+    def substitute_command_tokens(check)
+      unmatched_tokens = Array.new
+      substituted = check[:command].gsub(/:::(.*?):::/) do
+        token = $1.to_s
+        matched = token.split('.').inject(@settings[:client]) do |client, attribute|
+          client[attribute].nil? ? break : client[attribute]
+        end
+        if matched.nil?
+          unmatched_tokens << token
+        end
+        matched
+      end
+      [substituted, unmatched_tokens]
+    end
+
+    def execute_check_command(check)
+      @logger.debug('attempting to execute check command', {
         :check => check
       })
       unless @checks_in_progress.include?(check[:name])
-        @logger.debug('executing check', {
-          :check => check
-        })
-        @checks_in_progress.push(check[:name])
-        unmatched_tokens = Array.new
-        command = check[:command].gsub(/:::(.*?):::/) do
-          token = $1.to_s
-          matched = token.split('.').inject(@settings[:client]) do |client, attribute|
-            client[attribute].nil? ? break : client[attribute]
-          end
-          if matched.nil?
-            unmatched_tokens.push(token)
-          end
-          matched
-        end
+        @checks_in_progress << check[:name]
+        command, unmatched_tokens = substitute_command_tokens(check)
         if unmatched_tokens.empty?
           execute = Proc.new do
+            @logger.debug('executing check command', {
+              :check => check
+            })
             started = Time.now.to_f
             begin
               check[:output], check[:status] = IO.popen(command, 'r', check[:timeout])
             rescue => error
-              @logger.warn('unexpected error', {
-                :error => error.to_s
-              })
               check[:output] = 'Unexpected error: ' + error.to_s
               check[:status] = 2
             end
@@ -115,58 +118,76 @@ module Sensu
           end
           EM::defer(execute, publish)
         else
-          @logger.warn('missing client attributes', {
-            :check => check,
-            :unmatched_tokens => unmatched_tokens
-          })
-          check[:output] = 'Missing client attributes: ' + unmatched_tokens.join(', ')
+          check[:output] = 'Unmatched command tokens: ' + unmatched_tokens.join(', ')
           check[:status] = 3
           check[:handle] = false
           publish_result(check)
           @checks_in_progress.delete(check[:name])
         end
       else
-        @logger.warn('previous check execution in progress', {
+        @logger.warn('previous check command execution in progress', {
           :check => check
         })
       end
     end
 
+    def run_check_extension(check)
+      @logger.debug('attempting to run check extension', {
+        :check => check
+      })
+      extension = @extensions[:checks][check[:name]]
+      extension.run do |output, status|
+        check[:output] = output
+        check[:status] = status
+        publish_result(check)
+      end
+    end
+
+    def process_check(check)
+      @logger.debug('processing check', {
+        :check => check
+      })
+      if check.has_key?(:command)
+        if @settings.check_exists?(check[:name])
+          check.merge!(@settings[:checks][check[:name]])
+          execute_check_command(check)
+        elsif @safe_mode
+          check[:output] = 'Check is not locally defined (safe mode)'
+          check[:status] = 3
+          check[:handle] = false
+          publish_result(check)
+        else
+          execute_check_command(check)
+        end
+      else
+        if @extensions.check_exists?(check[:name])
+          run_check_extension(check)
+        else
+          @logger.warn('unknown check extension', {
+            :check => check
+          })
+        end
+      end
+    end
+
     def setup_subscriptions
       @logger.debug('subscribing to client subscriptions')
       @check_request_queue = @amq.queue('', :auto_delete => true) do |queue|
-        @settings[:client][:subscriptions].uniq.each do |exchange_name|
+        @settings[:client][:subscriptions].each do |exchange_name|
           @logger.debug('binding queue to exchange', {
-            :queue => {
-              :name => queue.name
-            },
-            :exchange => {
-              :name => exchange_name
-            }
+            :queue_name => queue.name,
+            :exchange_name => exchange_name
           })
           queue.bind(@amq.fanout(exchange_name))
         end
         queue.subscribe do |payload|
           begin
-            check = JSON.parse(payload, :symbolize_names => true)
+            check = Oj.load(payload)
             @logger.info('received check request', {
               :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
+            process_check(check)
+          rescue Oj::ParseError => error
             @logger.warn('check request payload must be valid json', {
               :payload => payload,
               :error => error.to_s
@@ -176,41 +197,48 @@ module Sensu
       end
     end
 
-    def setup_standalone
-      @logger.debug('scheduling standalone checks')
-      standalone_check_count = 0
+    def schedule_checks(checks)
+      check_count = 0
       stagger = testing? ? 0 : 2
-      @settings.checks.each do |check|
-        if check[:standalone]
-          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?
-                check[:issued] = Time.now.to_i
-                execute_check(check)
-              end
+      checks.each do |check|
+        check_count += 1
+        scheduling_delay = stagger * 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?
+              check[:issued] = Time.now.to_i
+              process_check(check)
             end
           end
         end
       end
     end
 
+    def setup_standalone
+      @logger.debug('scheduling standalone checks')
+      standard_checks = @settings.checks.select do |check|
+        check[:standalone]
+      end
+      extension_checks = @extensions.checks.select do |check|
+        check[:standalone] && check[:interval].is_a?(Integer)
+      end
+      schedule_checks(standard_checks + extension_checks)
+    end
+
     def setup_sockets
       @logger.debug('binding client tcp 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, Socket) do |socket|
-        socket.protocol = :udp
         socket.logger = @logger
         socket.settings = @settings
         socket.amq = @amq
+        socket.reply = false
       end
     end
 
@@ -255,8 +283,15 @@ module Sensu
     end
 
     def trap_signals
-      %w[INT TERM].each do |signal|
+      @signals = Array.new
+      STOP_SIGNALS.each do |signal|
         Signal.trap(signal) do
+          @signals << signal
+        end
+      end
+      EM::PeriodicTimer.new(1) do
+        signal = @signals.shift
+        if STOP_SIGNALS.include?(signal)
           @logger.warn('received signal', {
             :signal => signal
           })