sensu 0.9.7.beta.3 → 0.9.7.beta.4

data/CHANGELOG.md

@@ -9,6 +9,9 @@ TCP and UDP handler types, for writing event data to sockets.
 
 API resources now support singular & plural, Rails friendly.
 
+Client safe mode, require local check definition in order to execute
+a check, disable for simpler deployment (default).
+
 ### Non-backwards compatible changes
 
 AMQP handlers can no longer use `"send_only_check_output": true`, but
@@ -19,6 +22,11 @@ Ruby 1.8.7-p249 is no longer supported, as the AMQP library no longer
 does. Please use the Sensu APT/YUM packages which contain an embedded
 Ruby.
 
+Client expects check requests to contain a command, be sure to upgrade
+servers prior to upgrading clients.
+
+Check subdue options have been modified, "start" is now "begin".
+
 ### Other
 
 Improved RabbitMQ and Redis connection recovery.
@@ -33,4 +41,4 @@ Improved client socket ping/pong.
 
 Strict dependency version locking.
 
-Adjusted logging level for metric check results and events.
+Adjusted logging level for metric events.

data/lib/sensu/api.rb

@@ -18,7 +18,7 @@ module Sensu
       end
 
       def bootstrap(options={})
-        $logger = Cabin::Channel.get
+        $logger = Sensu::Logger.get
         base = Sensu::Base.new(options)
         $settings = base.settings
         if $settings[:api][:user] && $settings[:api][:password]
@@ -62,10 +62,14 @@ module Sensu
           exit 2
         end
         $rabbitmq = AMQP.connect($settings[:rabbitmq], :on_tcp_connection_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)
         end
+        $rabbitmq.on_skipped_heartbeats do
+          $logger.warn('skipped rabbitmq heartbeat')
+        end
         $amq = AMQP::Channel.new($rabbitmq)
         $amq.auto_recovery = true
       end

data/lib/sensu/base.rb

@@ -2,15 +2,11 @@ require 'rubygems'
 
 gem 'eventmachine', '1.0.0.rc.4'
 
-require 'optparse'
 require 'json'
 require 'time'
 require 'uri'
-require 'cabin'
 require 'amqp'
 
-require File.join(File.dirname(__FILE__), 'patches', 'ruby')
-
 require File.join(File.dirname(__FILE__), 'constants')
 require File.join(File.dirname(__FILE__), 'cli')
 require File.join(File.dirname(__FILE__), 'logger')
@@ -29,8 +25,9 @@ module Sensu
     end
 
     def setup_logging
-      logger = Sensu::Logger.new(@options)
-      logger.reopen
+      logger = Sensu::Logger.new
+      logger.level = @options[:verbose] ? :debug : @options[:log_level] || :info
+      logger.reopen(@options[:log_file])
       logger.setup_traps
     end
 

data/lib/sensu/cli.rb

@@ -1,3 +1,5 @@
+require 'optparse'
+
 module Sensu
   class CLI
     def self.read(arguments=ARGV)

data/lib/sensu/client.rb

@@ -12,7 +12,7 @@ module Sensu
     end
 
     def initialize(options={})
-      @logger = Cabin::Channel.get
+      @logger = Sensu::Logger.get
       base = Sensu::Base.new(options)
       @settings = base.settings
       @timers = Array.new
@@ -31,10 +31,15 @@ module Sensu
         exit 2
       end
       @rabbitmq = AMQP.connect(@settings[:rabbitmq], :on_tcp_connection_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)
       end
+      @rabbitmq.on_skipped_heartbeats do
+        @logger.warn('skipped rabbitmq heartbeat')
+        @logger.warn('rabbitmq heartbeats are not recommended for clients')
+      end
       @amq = AMQP::Channel.new(@rabbitmq)
       @amq.auto_recovery = true
     end
@@ -62,13 +67,7 @@ module Sensu
         :client => @settings[:client][:name],
         :check => check
       }
-      log_level = :info
-      if @settings.check_exists?(check[:name])
-        if @settings[:checks][check[:name]][:type] == 'metric'
-          log_level = :debug
-        end
-      end
-      @logger.send(log_level, 'publishing check result', {
+      @logger.info('publishing check result', {
         :payload => payload
       })
       @amq.queue('results').publish(payload.to_json)
@@ -78,76 +77,62 @@ module Sensu
       @logger.debug('attempting to execute check', {
         :check => check
       })
-      if @settings.check_exists?(check[:name])
-        unless @checks_in_progress.include?(check[:name])
-          @logger.debug('executing check', {
-            :check => check
-          })
-          @checks_in_progress.push(check[:name])
-          unmatched_tokens = Array.new
-          command = @settings[:checks][check[:name]][:command].gsub(/:::(.*?):::/) do
-            token = $1.to_s
-            begin
-              substitute = @settings[:client].instance_eval(token)
-            rescue NameError, NoMethodError
-              substitute = nil
-            end
-            if substitute.nil?
-              unmatched_tokens.push(token)
-            end
-            substitute
+      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
-          if unmatched_tokens.empty?
-            execute = Proc.new do
-              check = check.dup
-              started = Time.now.to_f
-              begin
-                IO.popen(command + ' 2>&1') do |io|
-                  check[:output] = io.read
-                end
-                check[:status] = $?.exitstatus
-              rescue => error
-                @logger.warn('unexpected error', {
-                  :error => error.to_s
-                })
-                check[:output] = 'Unexpected error: ' + error.to_s
-                check[:status] = 2
+          matched
+        end
+        if unmatched_tokens.empty?
+          execute = Proc.new do
+            started = Time.now.to_f
+            begin
+              IO.popen(command + ' 2>&1') do |io|
+                check[:output] = io.read
               end
-              check[:duration] = ('%.3f' % (Time.now.to_f - started)).to_f
-              check
+              check[:status] = $?.exitstatus
+            rescue => error
+              @logger.warn('unexpected error', {
+                :error => error.to_s
+              })
+              check[:output] = 'Unexpected error: ' + error.to_s
+              check[:status] = 2
             end
-            publish = Proc.new do |check|
-              unless check[:status].nil?
-                publish_result(check)
-              end
-              @checks_in_progress.delete(check[:name])
+            check[:duration] = ('%.3f' % (Time.now.to_f - started)).to_f
+            check
+          end
+          publish = Proc.new do |check|
+            unless check[:status].nil?
+              publish_result(check)
             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[:status] = 3
-            check[:handle] = false
-            publish_result(check)
             @checks_in_progress.delete(check[:name])
           end
+          EM::defer(execute, publish)
         else
-          @logger.warn('previous check execution in progress', {
-            :check => check
+          @logger.warn('missing client attributes', {
+            :check => check,
+            :unmatched_tokens => unmatched_tokens
           })
+          check[:output] = 'Missing client attributes: ' + unmatched_tokens.join(', ')
+          check[:status] = 3
+          check[:handle] = false
+          publish_result(check)
+          @checks_in_progress.delete(check[:name])
         end
       else
-        @logger.warn('unknown check', {
+        @logger.warn('previous check execution in progress', {
           :check => check
         })
-        check[:output] = 'Unknown check'
-        check[:status] = 3
-        check[:handle] = false
-        publish_result(check)
-        @checks_in_progress.delete(check[:name])
       end
     end
 
@@ -159,8 +144,7 @@ module Sensu
         @logger.debug('binding queue to exchange', {
           :queue => @uniq_queue_name,
           :exchange => {
-            :name => exchange_name,
-            :type => 'fanout'
+            :name => exchange_name
           }
         })
         @check_request_queue.bind(@amq.fanout(exchange_name))
@@ -171,7 +155,20 @@ module Sensu
           @logger.info('received check request', {
             :check => check
           })
-          execute_check(check)
+          if @settings.check_exists?(check[:name])
+            check.merge!(@settings[:checks][check[:name]])
+            execute_check(check)
+          elsif @settings[:client][: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,

data/lib/sensu/constants.rb

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

data/lib/sensu/logger.rb

@@ -1,11 +1,16 @@
+require 'cabin'
+
 module Sensu
   class Logger
-    def initialize(options={})
+    def initialize
       @logger = Cabin::Channel.get
       STDOUT.sync = true
+      STDERR.reopen(STDOUT)
       @logger.subscribe(STDOUT)
-      @logger.level = options[:verbose] ? :debug : options[:log_level] || :info
-      @log_file = options[:log_file]
+    end
+
+    def level=(log_level)
+      @logger.level = log_level
     end
 
     def reopen(file=nil)
@@ -14,8 +19,8 @@ module Sensu
         @log_file = file
         if File.writable?(file) || !File.exist?(file) && File.writable?(File.dirname(file))
           STDOUT.reopen(file, 'a')
-          STDERR.reopen(STDOUT)
           STDOUT.sync = true
+          STDERR.reopen(STDOUT)
         else
           @logger.error('log file is not writable', {
             :log_file => file
@@ -36,5 +41,20 @@ module Sensu
         end
       end
     end
+
+    def self.get
+      Cabin::Channel.get
+    end
+  end
+
+  class NullLogger
+    [:debug, :info, :warn, :error, :fatal].each do |method|
+      define_method(method) do |*arguments|
+      end
+    end
+
+    def self.get
+      self.new
+    end
   end
 end

data/lib/sensu/process.rb

@@ -1,7 +1,7 @@
 module Sensu
   class Process
     def initialize
-      @logger = Cabin::Channel.get
+      @logger = Sensu::Logger.get
     end
 
     def write_pid(file)

data/lib/sensu/redis.rb

@@ -8,7 +8,7 @@ module Sensu
 
     def initialize(*arguments)
       super
-      @logger = Cabin::Channel.get
+      @logger = Sensu::Logger.get
       @settings = Hash.new
       @connection_established = false
       @connected = false

data/lib/sensu/server.rb

@@ -14,7 +14,7 @@ module Sensu
     end
 
     def initialize(options={})
-      @logger = Cabin::Channel.get
+      @logger = Sensu::Logger.get
       base = Sensu::Base.new(options)
       @settings = base.settings
       @timers = Array.new
@@ -59,12 +59,16 @@ module Sensu
         exit 2
       end
       @rabbitmq = AMQP.connect(@settings[:rabbitmq], :on_tcp_connection_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)
         end
       end
+      @rabbitmq.on_skipped_heartbeats do
+        @logger.warn('skipped rabbitmq heartbeat')
+      end
       @amq = AMQP::Channel.new(@rabbitmq)
       @amq.auto_recovery = true
     end
@@ -86,17 +90,17 @@ module Sensu
     def check_subdued?(check, subdue_at)
       subdue = false
       if check[:subdue].is_a?(Hash)
-        if check[:subdue].has_key?(:start) && check[:subdue].has_key?(:end)
-          start_time = Time.parse(check[:subdue][:start])
+        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])
-          if end_time < start_time
+          if end_time < begin_time
             if Time.now < end_time
-              start_time = Time.parse('12:00:00 AM')
+              begin_time = Time.parse('12:00:00 AM')
             else
               end_time = Time.parse('11:59:59 PM')
             end
           end
-          if Time.now >= start_time && Time.now <= end_time
+          if Time.now >= begin_time && Time.now <= end_time
             subdue = true
           end
         end
@@ -108,13 +112,12 @@ module Sensu
         end
         if subdue && check[:subdue].has_key?(:exceptions)
           subdue = check[:subdue][:exceptions].none? do |exception|
-            Time.now >= Time.parse(exception[:start]) && Time.now <= Time.parse(exception[:end])
+            Time.now >= Time.parse(exception[:begin]) && Time.now <= Time.parse(exception[:end])
           end
         end
       end
       if subdue
-        (!check[:subdue].has_key?(:at) && subdue_at == :handler) ||
-          (check[:subdue].has_key?(:at) && check[:subdue][:at].to_sym == subdue_at)
+        subdue_at == (check[:subdue][:at] || 'handler').to_sym
       else
         false
       end
@@ -191,7 +194,7 @@ module Sensu
               })
             end
           else
-            @logger.error('unknown mutator', {
+            @logger.warn('unknown mutator', {
               :mutator => {
                 :name => handler[:mutator]
               }
@@ -208,7 +211,8 @@ module Sensu
       unless check_subdued?(event[:check], :handler)
         handlers = check_handlers(event[:check])
         handlers.each do |handler|
-          @logger.send(event[:check][:type] == 'metric' ? :debug : :info, 'handling event', {
+          log_level = event[:check][:type] == 'metric' ? :debug : :info
+          @logger.send(log_level, 'handling event', {
             :event => event,
             :handler => handler
           })
@@ -416,6 +420,21 @@ module Sensu
       end
     end
 
+    def publish_check_request(check)
+      payload = {
+        :name => check[:name],
+        :command => check[:command],
+        :issued => Time.now.to_i
+      }
+      @logger.info('publishing check request', {
+        :payload => payload,
+        :subscribers => check[:subscribers]
+      })
+      check[:subscribers].uniq.each do |exchange_name|
+        @amq.fanout(exchange_name).publish(payload.to_json)
+      end
+    end
+
     def setup_publisher
       @logger.debug('scheduling check requests')
       check_count = 0
@@ -427,17 +446,7 @@ module Sensu
             interval = testing? ? 0.5 : check[:interval]
             @master_timers << EM::PeriodicTimer.new(interval) do
               unless check_subdued?(check, :publisher)
-                payload = {
-                  :name => check[:name],
-                  :issued => Time.now.to_i
-                }
-                @logger.info('publishing check request', {
-                  :payload => payload,
-                  :subscribers => check[:subscribers]
-                })
-                check[:subscribers].uniq.each do |exchange_name|
-                  @amq.fanout(exchange_name).publish(payload.to_json)
-                end
+                publish_check_request(check)
               end
             end
           end

data/lib/sensu/settings.rb

@@ -3,7 +3,7 @@ module Sensu
     attr_reader :indifferent_access, :loaded_env, :loaded_files
 
     def initialize
-      @logger = Cabin::Channel.get
+      @logger = Sensu::Logger.get
       @settings = Hash.new
       [:checks, :handlers, :mutators].each do |key|
         @settings[key] = Hash.new
@@ -224,12 +224,12 @@ module Sensu
               :check => check
             })
           end
-          if check[:subdue].has_key?(:start) || check[:subdue].has_key?(:end)
+          if check[:subdue].has_key?(:begin) || check[:subdue].has_key?(:end)
             begin
-              Time.parse(check[:subdue][:start])
+              Time.parse(check[:subdue][:begin])
               Time.parse(check[:subdue][:end])
             rescue
-              invalid('check subdue start & end times must be valid', {
+              invalid('check subdue begin & end times must be valid', {
                 :check => check
               })
             end
@@ -261,12 +261,12 @@ module Sensu
                   :check => check
                 })
               end
-              if exception.has_key?(:start) || exception.has_key?(:end)
+              if exception.has_key?(:begin) || exception.has_key?(:end)
                 begin
-                  Time.parse(exception[:start])
+                  Time.parse(exception[:begin])
                   Time.parse(exception[:end])
                 rescue
-                  invalid('check subdue exception start & end times must be valid', {
+                  invalid('check subdue exception begin & end times must be valid', {
                     :check => check
                   })
                 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: sensu
 version: !ruby/object:Gem::Version 
-  hash: 62196237
+  hash: 62196227
   prerelease: true
   segments: 
   - 0
   - 9
   - 7
   - beta
-  - 3
-  version: 0.9.7.beta.3
+  - 4
+  version: 0.9.7.beta.4
 platform: ruby
 authors: 
 - Sean Porter
@@ -18,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-08-25 00:00:00 -07:00
+date: 2012-09-19 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -197,7 +197,6 @@ files:
 - lib/sensu/client.rb
 - lib/sensu/constants.rb
 - lib/sensu/logger.rb
-- lib/sensu/patches/ruby.rb
 - lib/sensu/process.rb
 - lib/sensu/redis.rb
 - lib/sensu/server.rb

data/lib/sensu/patches/ruby.rb

@@ -1,9 +0,0 @@
-class Hash
-  def method_missing(method, *arguments, &block)
-    if has_key?(method)
-      self[method]
-    else
-      super
-    end
-  end
-end