sensu 0.9.6.beta.3 → 0.9.6.beta.4

data/lib/sensu/api.rb

@@ -77,7 +77,7 @@ module Sensu
     aget '/info' do
       response = {
         :sensu => {
-          :version => VERSION
+          :version => Sensu::VERSION
         },
         :health => {
           :redis => 'ok',

data/lib/sensu/base.rb

@@ -4,6 +4,8 @@ gem 'eventmachine', '~> 1.0.0.beta.4'
 
 require 'optparse'
 require 'json'
+require 'time'
+require 'uri'
 require 'cabin'
 require 'amqp'
 
@@ -21,7 +23,7 @@ module Sensu
     attr_reader :options, :logger, :settings
 
     def initialize(options={})
-      @options = DEFAULT_OPTIONS.merge(options)
+      @options = Sensu::DEFAULT_OPTIONS.merge(options)
       @logger = Cabin::Channel.get
       setup_logging
       setup_settings
@@ -29,7 +31,9 @@ module Sensu
     end
 
     def setup_logging
-      Sensu::Logger.new(@options)
+      logger = Sensu::Logger.new(@options)
+      logger.reopen
+      logger.setup_traps
     end
 
     def setup_settings
@@ -42,7 +46,7 @@ module Sensu
       begin
         @settings.validate
       rescue => error
-        @logger.fatal('CONFIG INVALID', {
+        @logger.fatal('config invalid', {
           :error => error.to_s
         })
         @logger.fatal('SENSU NOT RUNNING!')
@@ -52,7 +56,14 @@ module Sensu
     end
 
     def setup_process
-      Sensu::Process.new(@options)
+      process = Sensu::Process.new
+      if @options[:daemonize]
+        process.daemonize
+      end
+      if @options[:pid_file]
+        process.write_pid(@options[:pid_file])
+      end
+      process.setup_eventmachine
     end
   end
 end

data/lib/sensu/cli.rb

@@ -8,7 +8,7 @@ module Sensu
           exit
         end
         opts.on('-V', '--version', 'Display version') do
-          puts VERSION
+          puts Sensu::VERSION
           exit
         end
         opts.on('-c', '--config FILE', 'Sensu JSON config FILE. Default is /etc/sensu/config.json') do |file|
@@ -31,7 +31,7 @@ module Sensu
         end
       end
       optparse.parse!(arguments)
-      DEFAULT_OPTIONS.merge(options)
+      Sensu::DEFAULT_OPTIONS.merge(options)
     end
   end
 end

data/lib/sensu/constants.rb

@@ -1,8 +1,12 @@
 module Sensu
-  VERSION = '0.9.6.beta.3'
+  unless defined?(Sensu::VERSION)
+    VERSION = '0.9.6.beta.4'
+  end
 
-  DEFAULT_OPTIONS = {
-    :config_file => '/etc/sensu/config.json',
-    :config_dir => '/etc/sensu/conf.d'
-  }
+  unless defined?(Sensu::DEFAULT_OPTIONS)
+    DEFAULT_OPTIONS = {
+      :config_file => '/etc/sensu/config.json',
+      :config_dir => '/etc/sensu/conf.d'
+    }
+  end
 end

data/lib/sensu/logger.rb

@@ -4,26 +4,26 @@ module Sensu
       @logger = Cabin::Channel.get
       @logger.subscribe(STDOUT)
       @logger.level = options[:verbose] ? :debug : options[:log_level] || :info
-      reopen(options)
-      setup_traps(options)
+      @log_file = options[:log_file]
     end
 
-    def reopen(options={})
-      unless options[:log_file].nil?
-        if File.writable?(options[:log_file]) ||
-            !File.exist?(options[:log_file]) && File.writable?(File.dirname(options[:log_file]))
-          STDOUT.reopen(options[:log_file], 'a')
+    def reopen(file=nil)
+      file ||= @log_file
+      unless file.nil?
+        @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
         else
           @logger.error('log file is not writable', {
-            :log_file => options[:log_file]
+            :log_file => file
           })
         end
       end
     end
 
-    def setup_traps(options={})
+    def setup_traps
       if Signal.list.include?('USR1')
         Signal.trap('USR1') do
           @logger.level = @logger.level == :info ? :debug : :info
@@ -31,7 +31,7 @@ module Sensu
       end
       if Signal.list.include?('USR2')
         Signal.trap('USR2') do
-          reopen(options)
+          reopen(@log_file)
         end
       end
     end

data/lib/sensu/patches/redis.rb

@@ -46,13 +46,26 @@ module Redis
     end
   end
 
-  def self.connect(options={})
-    host = options[:host] || 'localhost'
-    port = options[:port] || 6379
+  def self.connect(options)
+    options ||= Hash.new
+    if options.is_a?(String)
+      begin
+        uri = URI.parse(options)
+        host = uri.host
+        port = uri.port || 6379
+        password = uri.password
+      rescue
+        raise('invalid redis url')
+      end
+    else
+      host = options[:host] || 'localhost'
+      port = options[:port] || 6379
+      password = options[:password]
+    end
     EM::connect(host, port, Redis::Client) do |client|
       client.redis_host = host
       client.redis_port = port
-      client.redis_password = options[:password]
+      client.redis_password = password
     end
   end
 end

data/lib/sensu/process.rb

@@ -1,25 +1,19 @@
 module Sensu
   class Process
-    def initialize(options={})
+    def initialize
       @logger = Cabin::Channel.get
-      if options[:daemonize]
-        daemonize
-      end
-      if options[:pid_file]
-        write_pid(options[:pid_file])
-      end
-      setup_eventmachine
     end
 
-    def write_pid(pid_file)
+    def write_pid(file)
       begin
-        File.open(pid_file, 'w') do |file|
-          file.puts(::Process.pid)
+        File.open(file, 'w') do |pid_file|
+          pid_file.puts(::Process.pid)
         end
       rescue
         @logger.fatal('could not write to pid file', {
-          :pid_file => pid_file
+          :pid_file => file
         })
+        @logger.fatal('SENSU NOT RUNNING!')
         exit 2
       end
     end
@@ -31,6 +25,7 @@ module Sensu
       end
       unless ::Process.setsid
         @logger.fatal('cannot detach from controlling terminal')
+        @logger.fatal('SENSU NOT RUNNING!')
         exit 2
       end
       Signal.trap('SIGHUP', 'IGNORE')

data/lib/sensu/server.rb

@@ -63,6 +63,43 @@ module Sensu
       end
     end
 
+    def check_subdued?(check, subdue_type)
+      subdue = false
+      if check[:subdue].is_a?(Hash)
+        if check[:subdue].has_key?(:start) && check[:subdue].has_key?(:end)
+          start = Time.parse(check[:subdue][:start])
+          stop = Time.parse(check[:subdue][:end])
+          if stop < start
+            if Time.now < stop
+              start = Time.parse('12:00:00 AM')
+            else
+              stop = Time.parse('11:59:59 PM')
+            end
+          end
+          if Time.now >= start && Time.now <= stop
+            subdue = true
+          end
+        end
+        if check[:subdue].has_key?(:days)
+          days = check[:subdue][: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|
+            Time.now >= Time.parse(exception[:start]) && Time.now <= Time.parse(exception[:end])
+          end
+        end
+      end
+      if subdue
+        (!check[:subdue].has_key?(:at) && subdue_type == :handler) ||
+          (check[:subdue].has_key?(:at) && check[:subdue][:at].to_sym == subdue_type)
+      else
+        false
+      end
+    end
+
     def check_handlers(check)
       handler_list = case
       when check.has_key?(:handler)
@@ -93,73 +130,75 @@ module Sensu
     end
 
     def handle_event(event)
-      report = proc do |output|
-        if output.is_a?(String)
-          output.split(/\n+/).each do |line|
-            @logger.info('handler output', {
-              :output => line
-            })
-          end
-        end
-        @handlers_in_progress -= 1
-      end
-      handlers = check_handlers(event[:check])
-      handlers.each do |handler|
-        @logger.debug('handling event', {
-          :event => event,
-          :handler => handler
-        })
-        @handlers_in_progress += 1
-        case handler[:type]
-        when 'pipe'
-          execute = proc do
-            begin
-              IO.popen(handler[:command] + ' 2>&1', 'r+') do |io|
-                io.write(event.to_json)
-                io.close_write
-                io.read
-              end
-            rescue Errno::ENOENT => error
-              @logger.error('handler does not exist', {
-                :event => event,
-                :handler => handler,
-                :error => error.to_s
-              })
-            rescue Errno::EPIPE => error
-              @logger.error('broken pipe', {
-                :event => event,
-                :handler => handler,
-                :error => error.to_s
-              })
-            rescue => error
-              @logger.error('unexpected error', {
-                :event => event,
-                :handler => handler,
-                :error => error.to_s
+      unless check_subdued?(event[:check], :handler)
+        report = proc do |output|
+          if output.is_a?(String)
+            output.split(/\n+/).each do |line|
+              @logger.info('handler output', {
+                :output => line
               })
             end
           end
-          EM::defer(execute, report)
-        when 'amqp'
-          exchange_name = handler[:exchange][:name]
-          exchange_type = handler[:exchange].has_key?(:type) ? handler[:exchange][:type].to_sym : :direct
-          exchange_options = handler[:exchange].reject do |key, value|
-            [:name, :type].include?(key)
-          end
-          @logger.debug('publishing event to an amqp exchange', {
-            :event => event,
-            :exchange => handler[:exchange]
-          })
-          payload = handler[:send_only_check_output] ? event[:check][:output] : event.to_json
-          unless payload.empty?
-            @amq.method(exchange_type).call(exchange_name, exchange_options).publish(payload)
-          end
           @handlers_in_progress -= 1
-        when 'set'
-          @logger.error('handler sets cannot be nested', {
+        end
+        handlers = check_handlers(event[:check])
+        handlers.each do |handler|
+          @logger.debug('handling event', {
+            :event => event,
             :handler => handler
           })
-          @handlers_in_progress -= 1
+          @handlers_in_progress += 1
+          case handler[:type]
+          when 'pipe'
+            execute = proc do
+              begin
+                IO.popen(handler[:command] + ' 2>&1', 'r+') do |io|
+                  io.write(event.to_json)
+                  io.close_write
+                  io.read
+                end
+              rescue Errno::ENOENT => error
+                @logger.error('handler does not exist', {
+                  :event => event,
+                  :handler => handler,
+                  :error => error.to_s
+                })
+              rescue Errno::EPIPE => error
+                @logger.error('broken pipe', {
+                  :event => event,
+                  :handler => handler,
+                  :error => error.to_s
+                })
+              rescue => error
+                @logger.error('unexpected error', {
+                  :event => event,
+                  :handler => handler,
+                  :error => error.to_s
+                })
+              end
+            end
+            EM::defer(execute, report)
+          when 'amqp'
+            exchange_name = handler[:exchange][:name]
+            exchange_type = handler[:exchange].has_key?(:type) ? handler[:exchange][:type].to_sym : :direct
+            exchange_options = handler[:exchange].reject do |key, value|
+              [:name, :type].include?(key)
+            end
+            @logger.debug('publishing event to an amqp exchange', {
+              :event => event,
+              :exchange => handler[:exchange]
+            })
+            payload = handler[:send_only_check_output] ? event[:check][:output] : event.to_json
+            unless payload.empty?
+              @amq.method(exchange_type).call(exchange_name, exchange_options).publish(payload)
+            end
+            @handlers_in_progress -= 1
+          when 'set'
+            @logger.error('handler sets cannot be nested', {
+              :handler => handler
+            })
+            @handlers_in_progress -= 1
+          end
         end
       end
     end
@@ -242,6 +281,7 @@ module Sensu
                     unless check[:auto_resolve] == false && !check[:force_resolve]
                       @redis.hdel('events:' + client[:name], check[:name]).callback do
                         unless check[:handle] == false
+                          event[:occurrences] = previous_occurrence[:occurrences]
                           event[:action] = 'resolve'
                           handle_event(event)
                         else
@@ -294,17 +334,19 @@ module Sensu
           @timers << EM::Timer.new(stagger * check_count) do
             interval = options[:test] ? 0.5 : check[:interval]
             @timers << EM::PeriodicTimer.new(interval) do
-              unless @rabbitmq.reconnecting?
-                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)
+              unless check_subdued?(check, :publisher)
+                unless @rabbitmq.reconnecting?
+                  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
                 end
               end
             end

data/lib/sensu/settings.rb

@@ -203,6 +203,48 @@ module Sensu
             raise('handlers must be an array for check: ' + check[:name])
           end
         end
+        if check.has_key?(:subdue)
+          unless check[:subdue].is_a?(Hash)
+            raise('subdue must be a hash for check: ' + check[:name])
+          end
+          if check[:subdue].has_key?(:start) || check[:subdue].has_key?(:end)
+            begin
+              Time.parse(check[:subdue][:start])
+              Time.parse(check[:subdue][:end])
+            rescue
+              raise('subdue start & end times must be valid for check: ' + check[:name])
+            end
+          end
+          if check[:subdue].has_key?(:days)
+            unless check[:subdue][:days].is_a?(Array)
+              raise('subdue days must be an array for check: ' + check[:name])
+            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)
+                raise('subdue days must be valid days of the week for check: ' + check[:name])
+              end
+            end
+          end
+          if check[:subdue].has_key?(:exceptions)
+            unless check[:subdue][:exceptions].is_a?(Array)
+              raise('subdue exceptions must be an array for check: ' + check[:name])
+            end
+            check[:subdue][:exceptions].each do |exception|
+              unless exception.is_a?(Hash)
+                raise('subdue exception items must be a hash for check: ' + check[:name])
+              end
+              if exception.has_key?(:start) || exception.has_key?(:end)
+                begin
+                  Time.parse(exception[:start])
+                  Time.parse(exception[:end])
+                rescue
+                  raise('subdue exception start & end times must be valid for check: ' + check[:name])
+                end
+              end
+            end
+          end
+        end
       end
     end
 

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: sensu
 version: !ruby/object:Gem::Version 
-  hash: 62196229
+  hash: 62196235
   prerelease: true
   segments: 
   - 0
   - 9
   - 6
   - beta
-  - 3
-  version: 0.9.6.beta.3
+  - 4
+  version: 0.9.6.beta.4
 platform: ruby
 authors: 
 - Sean Porter
@@ -18,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-05-04 00:00:00 -07:00
+date: 2012-05-19 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency