sensu 0.8.16 → 0.8.18

data/Gemfile

@@ -6,7 +6,7 @@ gem("amqp", "0.7.4")
 gem("json")
 gem("hashie")
 gem("cabin", "0.1.7")
-gem("ruby-redis-portertech")
+gem("ruby-redis")
 gem("rack", "~> 1.3.4")
 gem("async_sinatra")
 gem("thin")

data/Gemfile.lock

@@ -40,7 +40,7 @@ GEM
     rspec-expectations (2.6.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.6.0)
-    ruby-redis-portertech (0.0.3)
+    ruby-redis (0.0.2)
       eventmachine
     sinatra (1.3.1)
       rack (~> 1.3, >= 1.3.4)
@@ -68,5 +68,5 @@ DEPENDENCIES
   json
   rack (~> 1.3.4)
   rake
-  ruby-redis-portertech
+  ruby-redis
   thin

data/README.org

@@ -9,7 +9,7 @@
 * Documentation
   Find it [[https://github.com/sonian/sensu/wiki][HERE]].
 * Other Projects
-  - [[https://github.com/sonian/sensu-plugins][Sensu Community Plugins]]
+  - [[https://github.com/sonian/sensu-plugin][Sensu Community Plugins]]
   - [[https://github.com/sonian/sensu-dashboard][Sensu Dashboard]]
 * License
   Sensu is released under the [[https://github.com/sonian/sensu/blob/master/MIT-LICENSE.txt][MIT license]].
@@ -34,3 +34,5 @@
   - [[http://twitter.com/amdprophet][Justin Kolberg]]
   - [[http://twitter.com/kartar][James Turnbull]]
   - [[http://twitter.com/joshpasqualetto][Josh Pasqualetto]]
+  - Steve Lum
+  - [[http://twitter.com/miller_joe][Joe Miller]]

data/lib/sensu/api.rb

@@ -3,6 +3,8 @@ require File.join(File.dirname(__FILE__), 'config')
 require 'sinatra/async'
 require 'redis'
 
+require File.join(File.dirname(__FILE__), 'helpers', 'redis')
+
 module Sensu
   class API < Sinatra::Base
     register Sinatra::Async
@@ -10,7 +12,7 @@ module Sensu
     def self.run(options={})
       EM.run do
         self.setup(options)
-        self.run!(:port => @settings.api.port)
+        self.run!(:port => $settings.api.port)
 
         %w[INT TERM].each do |signal|
           Signal.trap(signal) do
@@ -22,12 +24,12 @@ module Sensu
 
     def self.setup(options={})
       config = Sensu::Config.new(options)
-      @settings = config.settings
+      $settings = config.settings
       $logger = config.logger
       $logger.debug('[setup] -- connecting to redis')
-      $redis = EM.connect(@settings.redis.host, @settings.redis.port, Redis::Client)
+      $redis = EM.connect($settings.redis.host, $settings.redis.port, Redis::Reconnect)
       $logger.debug('[setup] -- connecting to rabbitmq')
-      connection = AMQP.connect(@settings.rabbitmq.to_hash.symbolize_keys)
+      connection = AMQP.connect($settings.rabbitmq.to_hash.symbolize_keys)
       $amq = MQ.new(connection)
     end
 
@@ -86,6 +88,9 @@ module Sensu
               $redis.srem('clients', client)
               $redis.del('events:' + client)
               $redis.del('client:' + client)
+              $settings.checks.each_key do |check_name|
+                $redis.del('history:' + client + ':' + check_name)
+              end
             end
             status 204
             body nil
@@ -229,16 +234,16 @@ module Sensu
 
     def self.test(options={})
       self.setup(options)
-      $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', {
+      $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', {
             :status => 2,
             :output => 'CRITICAL',
             :flapping => false,
             :occurrences => 1
           }.to_json).callback do
             $redis.set('stash:test/test', '{"key": "value"}').callback do
-              self.run!(:port => @settings.api.port)
+              self.run!(:port => $settings.api.port)
             end
           end
         end

data/lib/sensu/client.rb

@@ -84,8 +84,12 @@ module Sensu
               end
               check.status = $?.exitstatus
             end
-            publish = proc do |result|
-              publish_result(check)
+            publish = proc do
+              unless check.status.nil?
+                publish_result(check)
+              else
+                @logger.warn('[execute] -- nil exit status code -- ' + check.name)
+              end
               @checks_in_progress.delete(check.name)
             end
             EM.defer(execute, publish)
@@ -182,8 +186,8 @@ module Sensu
         else
           @logger.warn('[socket] -- a check name, exit status, and output are required -- e.g. {name: x, status: 0, output: "y"}')
         end
-      rescue JSON::ParserError
-        @logger.warn('[socket] -- could not parse check result -- expecting JSON')
+      rescue JSON::ParserError => error
+        @logger.warn('[socket] -- check result must be valid JSON: ' + error)
       end
       close_connection
     end

data/lib/sensu/config.rb

@@ -1,9 +1,9 @@
+require File.join(File.dirname(__FILE__), 'helpers', 'ruby')
+
 require 'rubygems' if RUBY_VERSION < '1.9.0'
 require 'bundler'
 require 'bundler/setup'
 
-require File.join(File.dirname(__FILE__), 'helpers')
-
 gem 'eventmachine', '~> 1.0.0.beta.4'
 
 require 'optparse'
@@ -34,12 +34,25 @@ module Sensu
       if File.readable?(config_file)
         begin
           @settings = Hashie::Mash.new(JSON.parse(File.open(config_file, 'r').read))
-        rescue JSON::ParserError => e
-          invalid_config('configuration file must be valid JSON: ' + e)
+        rescue JSON::ParserError => error
+          invalid_config('configuration file (' + config_file + ') must be valid JSON: ' + error)
         end
       else
         invalid_config('configuration file does not exist or is not readable: ' + 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|
+          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)
+          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)
+          @settings = Hashie::Mash.new(merged_settings)
+        end
+      end
       validate_config(options['type'])
     end
 
@@ -122,6 +135,9 @@ module Sensu
         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', 'Directory for supplemental Sensu JSON config files (default: /etc/sensu/conf.d/)') do |dir|
+          options[:config_dir] = dir
+        end
         opts.on('-l', '--log FILE', 'Sensu log FILE (default: /tmp/sensu.log)') do |file|
           options[:log_file] = file
         end

data/lib/sensu/helpers/redis.rb

@@ -0,0 +1,25 @@
+module Redis
+  class Reconnect < Redis::Client
+    def connection_completed
+      @connected = true
+      @port, @host = Socket.unpack_sockaddr_in(get_peername)
+    end
+
+    def close
+      @closing_connection = true
+      close_connection_after_writing
+    end
+
+    def unbind
+      unless !@connected || @closing_connection
+        EM.add_timer(1) do
+          reconnect(@host, @port)
+        end
+      else
+        until @queue.empty?
+          @queue.shift.fail RuntimeError.new 'connection closed'
+        end
+      end
+    end
+  end
+end

data/lib/sensu/helpers/ruby.rb

@@ -0,0 +1,46 @@
+class Hash
+  def symbolize_keys(item=self)
+    case item
+    when Array
+      item.map do |i|
+        symbolize_keys(i)
+      end
+    when Hash
+      Hash[
+        item.map do |key, value|
+          new_key = key.is_a?(String) ? key.to_sym : key
+          new_value = symbolize_keys(value)
+          [new_key, new_value]
+        end
+      ]
+    else
+      item
+    end
+  end
+
+  def deep_diff(hash)
+    (self.keys | hash.keys).inject(Hash.new) do |diff, key|
+      unless self[key] == hash[key]
+        if self[key].is_a?(Hash) && hash[key].is_a?(Hash)
+          diff[key] = self[key].deep_diff(hash[key])
+        else
+          diff[key] = [self[key], hash[key]]
+        end
+      end
+      diff
+    end
+  end
+
+  def deep_merge(hash)
+    merger = proc do |key, value1, value2|
+      value1.is_a?(Hash) && value2.is_a?(Hash) ? value1.merge(value2, &merger) : value2
+    end
+    self.merge(hash, &merger)
+  end
+end
+
+class String
+  def self.unique(chars=32)
+    rand(36**chars).to_s(36)
+  end
+end

data/lib/sensu/server.rb

@@ -2,6 +2,8 @@ require File.join(File.dirname(__FILE__), 'config')
 
 require 'redis'
 
+require File.join(File.dirname(__FILE__), 'helpers', 'redis')
+
 module Sensu
   class Server
     attr_accessor :redis, :is_worker
@@ -44,7 +46,7 @@ module Sensu
 
     def setup_redis
       @logger.debug('[redis] -- connecting to redis')
-      @redis = EM.connect(@settings.redis.host, @settings.redis.port, Redis::Client)
+      @redis = EM.connect(@settings.redis.host, @settings.redis.port, Redis::Reconnect)
     end
 
     def setup_amqp
@@ -85,10 +87,14 @@ module Sensu
           handle = proc do
             output = ''
             Bundler.with_clean_env do
-              IO.popen(@settings.handlers[handler] + ' 2>&1', 'r+') do |io|
-                io.write(event.to_json)
-                io.close_write
-                output = io.read
+              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
             end
             output

data/lib/sensu.rb

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

data/sensu.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
   s.add_dependency("json")
   s.add_dependency("hashie")
   s.add_dependency("cabin", "0.1.7")
-  s.add_dependency("ruby-redis-portertech")
+  s.add_dependency("ruby-redis")
   s.add_dependency("rack", "~> 1.3.4")
   s.add_dependency("async_sinatra")
   s.add_dependency("thin")

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sensu
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 27
   prerelease: false
   segments: 
   - 0
   - 8
-  - 16
-  version: 0.8.16
+  - 18
+  version: 0.8.18
 platform: ruby
 authors: 
 - Sean Porter
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-02 00:00:00 -08:00
+date: 2011-12-13 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -112,7 +112,7 @@ dependencies:
   type: :runtime
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: ruby-redis-portertech
+  name: ruby-redis
   prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
@@ -238,7 +238,8 @@ files:
 - lib/sensu/api.rb
 - lib/sensu/client.rb
 - lib/sensu/config.rb
-- lib/sensu/helpers.rb
+- lib/sensu/helpers/redis.rb
+- lib/sensu/helpers/ruby.rb
 - lib/sensu/server.rb
 - sensu.gemspec
 has_rdoc: true

data/lib/sensu/helpers.rb

@@ -1,26 +0,0 @@
-class Hash
-  def symbolize_keys(item=self)
-    case item
-    when Array
-      item.map do |i|
-        symbolize_keys(i)
-      end
-    when Hash
-      Hash[
-        item.map do |key, value|
-          new_key = key.is_a?(String) ? key.to_sym : key
-          new_value = symbolize_keys(value)
-          [new_key, new_value]
-        end
-      ]
-    else
-      item
-    end
-  end
-end
-
-class String
-  def self.unique(chars=32)
-    rand(36**chars).to_s(36)
-  end
-end