sensu 0.8.18 → 0.8.19

data/README.org

@@ -36,3 +36,4 @@
   - [[http://twitter.com/joshpasqualetto][Josh Pasqualetto]]
   - Steve Lum
   - [[http://twitter.com/miller_joe][Joe Miller]]
+  - [[http://twitter.com/decklin][Decklin Foster]]

data/lib/sensu.rb

@@ -1,3 +1,3 @@
 module Sensu
-  VERSION = "0.8.18"
+  VERSION = "0.8.19"
 end

data/lib/sensu/api.rb

@@ -25,7 +25,7 @@ module Sensu
     def self.setup(options={})
       config = Sensu::Config.new(options)
       $settings = config.settings
-      $logger = config.logger
+      $logger = config.open_log
       $logger.debug('[setup] -- connecting to redis')
       $redis = EM.connect($settings.redis.host, $settings.redis.port, Redis::Reconnect)
       $logger.debug('[setup] -- connecting to rabbitmq')
@@ -102,6 +102,21 @@ module Sensu
       end
     end
 
+    aget '/checks' do
+      $logger.debug('[checks] -- ' + request.ip + ' -- GET -- request for check list')
+      body $settings.checks.to_json
+    end
+
+    aget '/check/:name' do |check|
+      $logger.debug('[check] -- ' + request.ip + ' -- GET -- request for check -- ' + check)
+      if $settings.checks.key?(check)
+        body $settings.checks[check].to_json
+      else
+        status 404
+        body nil
+      end
+    end
+
     aget '/events' do
       $logger.debug('[events] -- ' + request.ip + ' -- GET -- request for event list')
       response = Hash.new

data/lib/sensu/client.rb

@@ -22,7 +22,7 @@ module Sensu
     def initialize(options={})
       config = Sensu::Config.new(options)
       @settings = config.settings
-      @logger = config.logger
+      @logger = config.open_log
     end
 
     def stop(signal)
@@ -97,7 +97,7 @@ module Sensu
             @logger.warn('[execute] -- missing client attributes -- ' + unmatched_tokens.join(', ') + ' -- ' + check.name)
             check.status = 3
             check.output = 'Missing client attributes: ' + unmatched_tokens.join(', ')
-            check.internal = true
+            check.handle = false
             publish_result(check)
             @checks_in_progress.delete(check.name)
           end
@@ -106,7 +106,7 @@ module Sensu
         @logger.warn('[execute] -- unkown check -- ' + check.name)
         check.status = 3
         check.output = 'Unknown check'
-        check.internal = true
+        check.handle = false
         publish_result(check)
         @checks_in_progress.delete(check.name)
       end
@@ -126,11 +126,22 @@ module Sensu
         if check.key?('matching')
           @logger.info('[subscribe] -- check requires matching -- ' + check.name)
           matches = check.matching.all? do |key, value|
-            if key == 'subscribes'
-              @settings.client.subscriptions.include?(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)

data/lib/sensu/config.rb

@@ -17,49 +17,62 @@ module Sensu
   class Config
     attr_accessor :settings, :logger
 
+    DEFAULT_OPTIONS = {
+      :log_file => '/tmp/sensu.log',
+      :config_file => '/etc/sensu/config.json',
+      :config_dir => '/etc/sensu/conf.d',
+      :validate => true,
+    }
+
     def initialize(options={})
+      @options = DEFAULT_OPTIONS.merge(options)
+      read_config
+      validate_config if @options[:validate]
+    end
+
+    def open_log
       @logger = Cabin::Channel.new
-      log_file = options[:log_file] || '/tmp/sensu.log'
-      if File.writable?(log_file) || !File.exist?(log_file) && File.writable?(File.dirname(log_file))
-        ruby_logger = Logger.new(log_file)
+      if File.writable?(@options[:log_file]) || !File.exist?(@options[:log_file]) && File.writable?(File.dirname(@options[:log_file]))
+        ruby_logger = Logger.new(@options[:log_file])
       else
-        invalid_config('log file is not writable: ' + log_file)
+        invalid_config('log file is not writable: ' + @options[:log_file])
       end
       @logger.subscribe(Cabin::Outputs::EmStdlibLogger.new(ruby_logger))
-      @logger.level = options[:verbose] ? :debug : :info
+      @logger.level = @options[:verbose] ? :debug : :info
       Signal.trap('USR1') do
         @logger.level = @logger.level == :info ? :debug : :info
       end
-      config_file = options[:config_file] || '/etc/sensu/config.json'
-      if File.readable?(config_file)
+      @logger
+    end
+
+    def read_config
+      if File.readable?(@options[:config_file])
         begin
-          @settings = Hashie::Mash.new(JSON.parse(File.open(config_file, 'r').read))
+          @settings = Hashie::Mash.new(JSON.parse(File.open(@options[:config_file], 'r').read))
         rescue JSON::ParserError => error
-          invalid_config('configuration file (' + config_file + ') must be valid JSON: ' + 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: ' + config_file)
+        invalid_config('configuration file does not exist or is not readable: ' + @options[:config_file])
       end
-      config_dir = options[:config_dir] || '/etc/sensu/conf.d'
-      if File.exists?(config_dir)
-        Dir[config_dir + '/**/*.json'].each do |snippet_file|
+      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)
+            invalid_config('configuration snippet file (' + snippet_file + ') must be valid JSON: ' + error.to_s)
           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)
+          @logger.warn('[settings] configuration snippet (' + snippet_file + ') applied changes: ' + @settings.deep_diff(merged_settings).to_json) if @logger
           @settings = Hashie::Mash.new(merged_settings)
         end
       end
-      validate_config(options['type'])
     end
 
-    def validate_config(type)
-      @logger.debug('[config] -- validating configuration')
+    def validate_config
+      @logger.debug('[config] -- validating configuration') if @logger
       has_keys(%w[rabbitmq])
-      case type
+      case @options['type']
       when 'server'
         has_keys(%w[redis handlers checks])
         unless @settings.handlers.include?('default')
@@ -100,9 +113,9 @@ module Sensu
           end
         end
       end
-      if type
-        @logger.debug('[config] -- configuration valid -- running ' + type)
-        puts 'configuration valid -- running ' + type
+      if @options['type']
+        @logger.debug('[config] -- configuration valid -- running ' + @options['type']) if @logger
+        puts 'configuration valid -- running ' + @options['type']
       end
     end
 
@@ -115,7 +128,7 @@ module Sensu
     end
 
     def invalid_config(message)
-      @logger.error('[config] -- configuration invalid -- ' + message)
+      @logger.error('[config] -- configuration invalid -- ' + message) if @logger
       raise 'configuration invalid, ' + message
     end
 

data/lib/sensu/server.rb

@@ -6,7 +6,7 @@ require File.join(File.dirname(__FILE__), 'helpers', 'redis')
 
 module Sensu
   class Server
-    attr_accessor :redis, :is_worker
+    attr_accessor :redis, :amq, :is_worker
 
     def self.run(options={})
       EM.threadpool_size = 16
@@ -33,7 +33,7 @@ module Sensu
     def initialize(options={})
       config = Sensu::Config.new(options)
       @settings = config.settings
-      @logger = config.logger
+      @logger = config.open_log
       @is_worker = options[:worker]
     end
 
@@ -84,22 +84,35 @@ module Sensu
       handlers.each do |handler|
         if @settings.handlers.key?(handler)
           @logger.debug('[event] -- handling event -- ' + [handler, event.client.name, event.check.name].join(' -- '))
-          handle = proc do
-            output = ''
-            Bundler.with_clean_env do
-              begin
-                IO.popen(@settings.handlers[handler] + ' 2>&1', 'r+') do |io|
-                  io.write(event.to_json)
-                  io.close_write
-                  output = io.read
+          if @settings.handlers[handler].is_a?(Hash)
+            details = @settings.handlers[handler]
+            case details.type
+            when "amqp"
+              exchange = details.exchange || 'events'
+              @logger.debug('[event] -- publishing event to amqp exchange -- ' + [exchange, event.client.name, event.check.name].join(' -- '))
+              message = details.send_only_check_output ? event.check.output : event.to_json
+              @amq.direct(exchange).publish(message)
+            else
+              @logger.warn('[event] -- unknown handler type -- ' + details.type)
+            end
+          else
+            handle = proc do
+              output = ''
+              Bundler.with_clean_env do
+                begin
+                  IO.popen(@settings.handlers[handler] + ' 2>&1', 'r+') do |io|
+                    io.write(event.to_json)
+                    io.close_write
+                    output = io.read
+                  end
+                rescue Errno::EPIPE => error
+                  output = handler + ' -- broken pipe: ' + error
                 end
-              rescue Errno::EPIPE => error
-                output = handler + ' -- broken pipe: ' + error
               end
+              output
             end
-            output
+            EM.defer(handle, report)
           end
-          EM.defer(handle, report)
         else
           @logger.warn('[event] -- handler does not exist -- ' + handler)
         end
@@ -123,6 +136,7 @@ module Sensu
             history_key = 'history:' + client.name + ':' + check.name
             @redis.rpush(history_key, check.status).callback do
               @redis.lrange(history_key, -21, -1).callback do |history|
+                event.check.history = history
                 total_state_change = 0
                 unless history.count < 21
                   state_changes = 0
@@ -156,7 +170,7 @@ module Sensu
                     unless is_flapping
                       unless check.auto_resolve == false && !check.force_resolve
                         @redis.hdel('events:' + client.name, check.name).callback do
-                          unless check.internal
+                          unless check.handle == false
                             event.action = 'resolve'
                             handle_event(event)
                           end
@@ -166,7 +180,7 @@ module Sensu
                       @logger.debug('[result] -- check is flapping -- ' + client.name + ' -- ' + check.name)
                       @redis.hset('events:' + client.name, check.name, previous_occurrence.merge({'flapping' => true}).to_json)
                     end
-                  elsif check['status'] != 0
+                  elsif check.status != 0
                     if previous_occurrence && check.status == previous_occurrence.status
                       event.occurrences = previous_occurrence.occurrences += 1
                     end
@@ -176,7 +190,7 @@ module Sensu
                       :flapping => is_flapping,
                       :occurrences => event.occurrences
                     }.to_json).callback do
-                      unless check.internal
+                      unless check.handle == false
                         event.check.flapping = is_flapping
                         event.action = 'create'
                         handle_event(event)
@@ -206,24 +220,23 @@ module Sensu
       exchanges = Hash.new
       stagger = options[:test] ? 0 : 7
       @settings.checks.each_with_index do |(name, details), index|
-        check = Hashie::Mash.new
-        check.name = name
+        check_request = Hashie::Mash.new({:name => name})
         unless details.publish == false
           EM.add_timer(stagger*index) do
-            details.subscribers.each do |subscriber|
-              if subscriber.is_a?(Hash)
-                @logger.debug('[publisher] -- check requires matching -- ' + subscriber.to_hash.to_s + ' -- ' + name)
-                check.matching = subscriber
+            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 = subscriber
+                exchange = target
               end
               exchanges[exchange] ||= @amq.fanout(exchange)
               interval = options[:test] ? 0.5 : details.interval
               EM.add_periodic_timer(interval) do
-                check.issued = Time.now.to_i
+                check_request.issued = Time.now.to_i
                 @logger.info('[publisher] -- publishing check -- ' + name + ' -- ' + exchange)
-                exchanges[exchange].publish(check.to_json)
+                exchanges[exchange].publish(check_request.to_json)
               end
             end
           end
@@ -239,7 +252,7 @@ module Sensu
           clients.each do |client_id|
             @redis.get('client:' + client_id).callback do |client_json|
               client = Hashie::Mash.new(JSON.parse(client_json))
-              time_since_last_check = Time.now.to_i - client.timestamp
+              time_since_last_keepalive = Time.now.to_i - client.timestamp
               result = Hashie::Mash.new({
                 :client => client.name,
                 :check => {
@@ -248,11 +261,11 @@ module Sensu
                 }
               })
               case
-              when time_since_last_check >= 180
+              when time_since_last_keepalive >= 180
                 result.check.status = 2
                 result.check.output = 'No keep-alive sent from host in over 180 seconds'
                 @result_queue.publish(result.to_json)
-              when time_since_last_check >= 120
+              when time_since_last_keepalive >= 120
                 result.check.status = 1
                 result.check.output = 'No keep-alive sent from host in over 120 seconds'
                 @result_queue.publish(result.to_json)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sensu
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 8
-  - 18
-  version: 0.8.18
+  - 19
+  version: 0.8.19
 platform: ruby
 authors: 
 - Sean Porter
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-13 00:00:00 -08:00
+date: 2011-12-16 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency