sensu 0.8.0 → 0.8.4

data/.gitignore

@@ -1,5 +1,6 @@
 pkg/*
 *~
+*.vagrant
 \#*
 dump.rdb
 .DS_Store

data/.travis.yml

@@ -0,0 +1,12 @@
+branches:
+  except:
+    - hacking
+notifications:
+  irc:
+    - "irc.freenode.net#sensu"
+env:
+  - RACK_ENV=development
+rvm:
+  - 1.8.7
+  - 1.9.2
+  - 1.9.3

data/Gemfile.lock

@@ -1,11 +1,11 @@
 PATH
   remote: .
   specs:
-    sensu (0.8.0)
+    sensu (0.8.3)
       amqp (= 0.7.4)
       async_sinatra
+      cabin (= 0.1.7)
       em-hiredis
-      em-syslog
       hashie
       json
       rack (~> 1.3.4)
@@ -20,32 +20,39 @@ GEM
     async_sinatra (0.5.0)
       rack (>= 1.2.1)
       sinatra (>= 1.0)
-    callsite (0.0.6)
-      bundler (~> 1.0.0)
+    bacon (1.1.0)
+    cabin (0.1.7)
+      json
     daemons (1.1.4)
+    diff-lcs (1.1.3)
     em-hiredis (0.1.0)
       hiredis (~> 0.3.0)
-    em-syslog (0.0.2)
-      eventmachine
-    em-ventually (0.1.2)
-      callsite (~> 0.0.5)
+    em-spec (0.2.5)
+      bacon
       eventmachine
+      rspec (~> 2.6.0)
+      test-unit
     eventmachine (0.12.10)
     hashie (1.2.0)
     hiredis (0.3.2)
     json (1.6.1)
-    mime-types (1.16)
-    minitest (2.7.0)
     rack (1.3.5)
     rack-protection (1.1.4)
       rack
     rake (0.9.2)
-    rest-client (1.6.7)
-      mime-types (>= 1.16)
+    rspec (2.6.0)
+      rspec-core (~> 2.6.0)
+      rspec-expectations (~> 2.6.0)
+      rspec-mocks (~> 2.6.0)
+    rspec-core (2.6.4)
+    rspec-expectations (2.6.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.6.0)
     sinatra (1.3.1)
       rack (~> 1.3, >= 1.3.4)
       rack-protection (~> 1.1, >= 1.1.2)
       tilt (~> 1.3, >= 1.3.3)
+    test-unit (2.4.0)
     thin (1.2.11)
       daemons (>= 1.0.9)
       eventmachine (>= 0.12.6)
@@ -57,8 +64,6 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  em-ventually
-  minitest (~> 2.7.0)
+  em-spec
   rake
-  rest-client
   sensu!

data/README.org

@@ -1,28 +1,35 @@
 * Welcome to Sensu
-  Sensu is a monitoring system framework.
+  Sensu, a monitoring framework that aims to be simple, malleable, and scalable.
 
   [[https://github.com/sonian/sensu/raw/master/sensu-logo.png]]
 
-  Checks can utilize user created plugins, returning an exit status code and outputting to STDOUT.
+  [[http://portertech.ca/2011/11/01/sensu-a-monitoring-framework][Blog post]]
 
-  Check results are handled by user created handlers, receiving JSON formatted event data from STDIN.
+  [[http://www.sonian.com/cloud-tools/cloud-monitoring-sensu/][Homepage]]
 * Documentation
-  Documentation can be found [[https://github.com/sonian/sensu/wiki][HERE]].
+  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-dashboard][Sensu Dashboard]]
 * License
   Sensu is released under the [[https://github.com/sonian/sensu/blob/master/MIT-LICENSE.txt][MIT license]].
 * Contributing
-  - [[http://help.github.com/fork-a-repo/][Fork]] [[https://github.com/sonian/sensu][Sensu]]
+  - [[http://help.github.com/fork-a-repo/][Fork]] Sensu
   - Use a [[https://github.com/dchelimsky/rspec/wiki/Topic-Branches][topic branch]]
   - Create a [[http://help.github.com/send-pull-requests/][pull request]]
 
   Keep it simple.
 ** Testing
-*** Requirements
+*** Travis CI
+  [[https://secure.travis-ci.org/sonian/sensu.png]]
+*** System Dependencies
+  - Ruby (MRI) & Rubygems
   - RabbitMQ
   - Redis
 *** Running
   : bundle install
-  : rake test
+  : rake
 * Contributors
-  - Sean Porter ([[https://twitter.com/#!/portertech][@portertech]])
-  - Justin Kolberg ([[https://twitter.com/#!/amdprophet][@amdprophet]])
+  - [[http://twitter.com/portertech][Sean Porter]]
+  - [[http://twitter.com/amdprophet][Justin Kolberg]]
+  - [[http://twitter.com/kartar][James Turnbull]]

data/bin/sensu-api

@@ -6,4 +6,5 @@ $: << File.dirname(__FILE__) + '/../lib' unless $:.include?(File.dirname(__FILE_
 require 'sensu/api'
 
 options = Sensu::Config.read_arguments(ARGV)
+options['type'] = 'api'
 Sensu::API.run(options)

data/bin/sensu-client

@@ -4,4 +4,5 @@ $: << File.dirname(__FILE__) + '/../lib' unless $:.include?(File.dirname(__FILE_
 require 'sensu/client'
 
 options = Sensu::Config.read_arguments(ARGV)
+options['type'] = 'client'
 Sensu::Client.run(options)

data/bin/sensu-server

@@ -6,4 +6,5 @@ $: << File.dirname(__FILE__) + '/../lib' unless $:.include?(File.dirname(__FILE_
 require 'sensu/server'
 
 options = Sensu::Config.read_arguments(ARGV)
+options['type'] = 'server'
 Sensu::Server.run(options)

data/lib/sensu.rb

@@ -1,3 +1,3 @@
 module Sensu
-  VERSION = "0.8.0"
+  VERSION = "0.8.4"
 end

data/lib/sensu/api.rb

@@ -13,10 +13,7 @@ module Sensu
 
         %w[INT TERM].each do |signal|
           Signal.trap(signal) do
-            EM.warning('[process] -- ' + signal + ' -- stopping sensu api')
-            EM.add_timer(1) do
-              EM.stop
-            end
+            self.stop(signal)
           end
         end
       end
@@ -25,17 +22,19 @@ module Sensu
     def self.setup(options={})
       config = Sensu::Config.new(options)
       @settings = config.settings
-      EM.syslog_setup(@settings.syslog.host, @settings.syslog.port)
-      EM.debug('[setup] -- connecting to redis')
-      set :redis, EM::Hiredis.connect('redis://' + @settings.redis.host + ':' + @settings.redis.port.to_s)
-      EM.debug('[setup] -- connecting to rabbitmq')
+      $logger = config.logger
+      $logger.debug('[setup] -- connecting to redis')
+      $redis = EM::Hiredis.connect('redis://' + @settings.redis.host + ':' + @settings.redis.port.to_s)
+      $logger.debug('[setup] -- connecting to rabbitmq')
       connection = AMQP.connect(@settings.rabbitmq.to_hash.symbolize_keys)
-      set :amq, MQ.new(connection)
+      $amq = MQ.new(connection)
     end
 
-    helpers do
-      include Rack::Utils
-      alias_method :conn, :settings
+    def self.stop(signal)
+      $logger.warn('[process] -- ' + signal + ' -- stopping sensu api')
+      EM.add_timer(1) do
+        EM.stop
+      end
     end
 
     before do
@@ -43,12 +42,12 @@ module Sensu
     end
 
     aget '/clients' do
-      EM.debug('[clients] -- ' + request.ip + ' -- GET -- request for client list')
+      $logger.debug('[clients] -- ' + request.ip + ' -- GET -- request for client list')
       current_clients = Array.new
-      conn.redis.smembers('clients').callback do |clients|
+      $redis.smembers('clients').callback do |clients|
         unless clients.empty?
           clients.each_with_index do |client, index|
-            conn.redis.get('client:' + client).callback do |client_json|
+            $redis.get('client:' + client).callback do |client_json|
               current_clients.push(JSON.parse(client_json))
               body current_clients.to_json if index == clients.size - 1
             end
@@ -60,34 +59,34 @@ module Sensu
     end
 
     aget '/client/:name' do |client|
-      EM.debug('[client] -- ' + request.ip + ' -- GET -- request for client -- ' + client)
-      conn.redis.get('client:' + client).callback do |client_json|
+      $logger.debug('[client] -- ' + request.ip + ' -- GET -- request for client -- ' + client)
+      $redis.get('client:' + client).callback do |client_json|
         status 404 if client_json.nil?
         body client_json
       end
     end
 
     adelete '/client/:name' do |client|
-      EM.debug('[client] -- ' + request.ip + ' -- DELETE -- request for client -- ' + client)
-      conn.redis.sismember('clients', client).callback do |client_exists|
+      $logger.debug('[client] -- ' + request.ip + ' -- DELETE -- request for client -- ' + client)
+      $redis.sismember('clients', client).callback do |client_exists|
         unless client_exists == 0
-          conn.redis.exists('events:' + client).callback do |events_exist|
+          $redis.exists('events:' + client).callback do |events_exist|
             unless events_exist == 0
-              conn.redis.hgetall('events:' + client).callback do |events|
+              $redis.hgetall('events:' + client).callback do |events|
                 Hash[*events].keys.each do |check_name|
                   check = {:name => check_name, :issued => Time.now.to_i, :status => 0, :output => 'Client is being removed'}
-                  conn.amq.queue('results').publish({:client => client, :check => check}.to_json)
+                  $amq.queue('results').publish({:client => client, :check => check}.to_json)
                 end
                 EM.add_timer(5) do
-                  conn.redis.srem('clients', client)
-                  conn.redis.del('events:' + client)
-                  conn.redis.del('client:' + client)
+                  $redis.srem('clients', client)
+                  $redis.del('events:' + client)
+                  $redis.del('client:' + client)
                 end
               end
             else
-              conn.redis.srem('clients', client)
-              conn.redis.del('events:' + client)
-              conn.redis.del('client:' + client)
+              $redis.srem('clients', client)
+              $redis.del('events:' + client)
+              $redis.del('client:' + client)
             end
             status 204
             body nil
@@ -100,12 +99,12 @@ module Sensu
     end
 
     aget '/events' do
-      EM.debug('[events] -- ' + request.ip + ' -- GET -- request for event list')
+      $logger.debug('[events] -- ' + request.ip + ' -- GET -- request for event list')
       current_events = Hash.new
-      conn.redis.smembers('clients').callback do |clients|
+      $redis.smembers('clients').callback do |clients|
         unless clients.empty?
           clients.each_with_index do |client, index|
-            conn.redis.hgetall('events:' + client).callback do |events|
+            $redis.hgetall('events:' + client).callback do |events|
               client_events = Hash[*events]
               client_events.each do |key, value|
                 client_events[key] = JSON.parse(value)
@@ -121,8 +120,8 @@ module Sensu
     end
 
     aget '/event/:client/:check' do |client, check|
-      EM.debug('[event] -- ' + request.ip + ' -- GET -- request for event -- ' + client + ' -- ' + check)
-      conn.redis.hgetall('events:' + client).callback do |events|
+      $logger.debug('[event] -- ' + request.ip + ' -- GET -- request for event -- ' + client + ' -- ' + check)
+      $redis.hgetall('events:' + client).callback do |events|
         client_events = Hash[*events]
         event = client_events[check]
         status 404 if event.nil?
@@ -131,21 +130,21 @@ module Sensu
     end
 
     apost '/stash/*' do |path|
-      EM.debug('[stash] -- ' + request.ip + ' -- POST -- request for stash -- ' + path)
+      $logger.debug('[stash] -- ' + request.ip + ' -- POST -- request for stash -- ' + path)
       begin
         stash = JSON.parse(request.body.read)
       rescue JSON::ParserError
         status 400
         body nil
       end
-      conn.redis.set('stash:' + path, stash.to_json).callback do
+      $redis.set('stash:' + path, stash.to_json).callback do
         status 201
         body nil
       end
     end
 
     apost '/stashes' do
-      EM.debug('[stashes] -- ' + request.ip + ' -- POST -- request for multiple stashes')
+      $logger.debug('[stashes] -- ' + request.ip + ' -- POST -- request for multiple stashes')
       begin
         paths = JSON.parse(request.body.read)
       rescue JSON::ParserError
@@ -155,7 +154,7 @@ module Sensu
       stashes = Hash.new
       if paths.is_a?(Array)
         paths.each_with_index do |path, index|
-          conn.redis.get('stash:' + path).callback do |stash|
+          $redis.get('stash:' + path).callback do |stash|
             stashes[path] = JSON.parse(stash) unless stash.nil?
             body stashes.to_json if index == paths.size - 1
           end
@@ -167,18 +166,18 @@ module Sensu
     end
 
     aget '/stash/*' do |path|
-      EM.debug('[stash] -- ' + request.ip + ' -- GET -- request for stash -- ' + path)
-      conn.redis.get('stash:' + path).callback do |stash|
+      $logger.debug('[stash] -- ' + request.ip + ' -- GET -- request for stash -- ' + path)
+      $redis.get('stash:' + path).callback do |stash|
         status 404 if stash.nil?
         body stash
       end
     end
 
     adelete '/stash/*' do |path|
-      EM.debug('[stash] -- ' + request.ip + ' -- DELETE -- request for stash -- ' + path)
-      conn.redis.exists('stash:' + path).callback do |stash_exist|
+      $logger.debug('[stash] -- ' + request.ip + ' -- DELETE -- request for stash -- ' + path)
+      $redis.exists('stash:' + path).callback do |stash_exist|
         unless stash_exist == 0
-          conn.redis.del('stash:' + path).callback do
+          $redis.del('stash:' + path).callback do
             status 204
             body nil
           end
@@ -189,31 +188,21 @@ module Sensu
       end
     end
 
-    apost '/test' do
-      EM.debug('[test] -- ' + request.ip + ' -- POST -- seeding for minitest')
-      client = '{
-        "name": "test",
-        "address": "localhost",
-        "subscriptions": [
-          "foo",
-          "bar"
-        ]
-      }'
-      conn.redis.set('client:test', client).callback do
-        conn.redis.sadd('clients', 'test').callback do
-          conn.redis.hset('events:test', 'test', {
+    def self.test(options={})
+      self.setup(options)
+      $redis.set('client:test', @settings.client).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
-            conn.redis.set('stash:test/test', '{"key": "value"}').callback do
-              status 201
-              body nil
-            end
+            $redis.set('stash:test/test', '{"key": "value"}')
           end
         end
       end
+      self.run!(:port => @settings.api.port)
     end
   end
 end

data/lib/sensu/client.rb

@@ -13,34 +13,39 @@ module Sensu
 
         %w[INT TERM].each do |signal|
           Signal.trap(signal) do
-            EM.warning('[process] -- ' + signal + ' -- stopping sensu client')
-            EM.add_timer(1) do
-              EM.stop
-            end
+            client.stop(signal)
           end
         end
       end
     end
 
     def initialize(options={})
-      config = Sensu::Config.new(:config_file => options[:config_file])
+      config = Sensu::Config.new(options)
       @settings = config.settings
-      EM.syslog_setup(@settings.syslog.host, @settings.syslog.port)
+      @logger = config.logger
+    end
+
+    def stop(signal)
+      @logger.warn('[process] -- ' + signal + ' -- stopping sensu client')
+      EM.add_timer(1) do
+        EM.stop
+      end
     end
 
     def setup_amqp
-      EM.debug("[amqp] -- connecting to rabbitmq")
+      @logger.debug('[amqp] -- connecting to rabbitmq')
       connection = AMQP.connect(@settings.rabbitmq.to_hash.symbolize_keys)
       @amq = MQ.new(connection)
     end
 
     def publish_keepalive
-      EM.debug('[keepalive] -- publishing keepalive -- ' + @settings.client.timestamp.to_s)
+      @logger.debug('[keepalive] -- publishing keepalive -- ' + @settings.client.timestamp.to_s)
       @keepalive_queue ||= @amq.queue('keepalives')
       @keepalive_queue.publish(@settings.client.to_json)
     end
 
     def setup_keepalives
+      @logger.debug('[keepalive] -- setup keepalives')
       @settings.client.timestamp = Time.now.to_i
       publish_keepalive
       EM.add_periodic_timer(30) do
@@ -50,7 +55,7 @@ module Sensu
     end
 
     def publish_result(check)
-      EM.info('[result] -- publishing check result -- ' + check.name)
+      @logger.info('[result] -- publishing check result -- ' + check.name)
       @result_queue ||= @amq.queue('results')
       @result_queue.publish({
         :client => @settings.client.name,
@@ -59,6 +64,7 @@ module Sensu
     end
 
     def execute_check(check)
+      @logger.debug('[execute] -- executing check -- ' + check.name)
       @checks_in_progress ||= Array.new
       if @settings.checks.key?(check.name)
         unless @checks_in_progress.include?(check.name)
@@ -82,7 +88,7 @@ module Sensu
             end
             EM.defer(execute, publish)
           else
-            EM.warning('[execute] -- missing client attributes -- ' + unmatched_tokens.join(', ') + ' -- ' + check.name)
+            @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
@@ -91,7 +97,7 @@ module Sensu
           end
         end
       else
-        EM.warning('[execute] -- unkown check -- ' + check.name)
+        @logger.warn('[execute] -- unkown check -- ' + check.name)
         check.status = 3
         check.output = 'Unknown check'
         check.internal = true
@@ -101,22 +107,24 @@ module Sensu
     end
 
     def setup_subscriptions
+      @logger.debug('[subscribe] -- setup subscriptions')
       @check_queue = @amq.queue(UUIDTools::UUID.random_create.to_s, :exclusive => true)
       @settings.client.subscriptions.each do |exchange|
-        EM.debug('[subscribe] -- queue binding to exchange -- ' + exchange)
+        @logger.debug('[subscribe] -- queue binding to exchange -- ' + exchange)
         @check_queue.bind(@amq.fanout(exchange))
       end
       @check_queue.subscribe do |check_json|
         check = Hashie::Mash.new(JSON.parse(check_json))
-        EM.info('[subscribe] -- received check -- ' + check.name)
+        @logger.info('[subscribe] -- received check -- ' + check.name)
         execute_check(check)
       end
     end
 
     def setup_queue_monitor
+      @logger.debug('[monitor] -- setup queue monitor')
       EM.add_periodic_timer(5) do
         unless @check_queue.subscribed?
-          EM.warning('[monitor] -- reconnecting to rabbitmq')
+          @logger.warn('[monitor] -- reconnecting to rabbitmq')
           @check_queue.delete
           EM.add_timer(1) do
             setup_subscriptions
@@ -126,8 +134,9 @@ module Sensu
     end
 
     def setup_socket
-      EM.debug('[socket] -- starting up socket server')
+      @logger.debug('[socket] -- starting up socket server')
       EM.start_server('127.0.0.1', 3030, ClientSocket) do |socket|
+        socket.logger = @logger
         socket.client_name = @settings.client.name
         socket.result_queue = @amq.queue('results')
       end
@@ -135,35 +144,32 @@ module Sensu
   end
 
   class ClientSocket < EM::Connection
-    attr_accessor :client_name, :result_queue
-
-    def post_init
-      EM.debug('[socket] -- client connected')
-    end
+    attr_accessor :logger, :client_name, :result_queue
 
     def receive_data(data)
+      @logger.debug('[socket] -- client connected')
       begin
         check = Hashie::Mash.new(JSON.parse(data))
         validates = %w[name status output].all? do |key|
           check.key?(key)
         end
         if validates
-          EM.info('[socket] -- publishing check result -- ' + check.name)
+          @logger.info('[socket] -- publishing check result -- ' + check.name)
           @result_queue.publish({
             :client => @client_name,
             :check => check.to_hash
           }.to_json)
         else
-          EM.warning('[socket] -- a check name, exit status, and output are required -- e.g. {name: x, status: 0, output: "y"}')
+          @logger.warn('[socket] -- a check name, exit status, and output are required -- e.g. {name: x, status: 0, output: "y"}')
         end
       rescue JSON::ParserError
-        EM.warning('[socket] -- could not parse check result -- expecting JSON')
+        @logger.warn('[socket] -- could not parse check result -- expecting JSON')
       end
       close_connection
     end
 
     def unbind
-      EM.debug('[socket] -- client disconnected')
+      @logger.debug('[socket] -- client disconnected')
     end
   end
 end

data/lib/sensu/config.rb

@@ -4,42 +4,83 @@ require 'json'
 require 'hashie'
 require 'uuidtools'
 require 'amqp'
-require 'em/syslog'
+require 'cabin'
+require 'cabin/outputs/em-stdlib-logger'
 require File.join(File.dirname(__FILE__), 'helpers')
 
 module Sensu
   class Config
-    attr_accessor :settings
+    attr_accessor :settings, :logger
 
     def initialize(options={})
       config_file = options[:config_file] || '/etc/sensu/config.json'
-      @settings = Hashie::Mash.new(JSON.parse(File.open(config_file, 'r').read))
-      validate_config
+      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)
+        end
+      else
+        invalid_config('configuration file does not exist or is not readable: ' + config_file)
+      end
+      @logger = Cabin::Channel.new
+      log_dir = File.writable?('/var/log') ? '/var/log' : '/tmp'
+      ruby_logger = Logger.new(File.join(log_dir, 'sensu.log'))
+      @logger.subscribe(Cabin::Outputs::EmStdlibLogger.new(ruby_logger))
+      @logger.level = options[:verbose] ? 'debug' : 'info'
+      validate_config(options['type'])
     end
 
-    def validate_config
+    def validate_config(type)
+      @logger.debug('[config] -- validating configuration')
+      has_keys(%w[rabbitmq])
+      case type
+      when 'server'
+        has_keys(%w[redis handlers checks])
+      when 'api'
+        has_keys(%w[redis api])
+      when 'client'
+        has_keys(%w[client checks])
+      end
       @settings.checks.each do |name, details|
         unless details.interval.is_a?(Integer) && details.interval > 0
-          raise 'configuration invalid, missing interval for check ' + name
+          invalid_config('missing interval for check ' + name)
         end
         unless details.command.is_a?(String)
-          raise 'configuration invalid, missing command for check ' + name
+          invalid_config('missing command for check ' + name)
         end
         unless details.subscribers.is_a?(Array) && details.subscribers.count > 0
-          raise 'configuration invalid, missing subscribers for check ' + name
+          invalid_config('missing subscribers for check ' + name)
         end
       end
       unless @settings.client.name.is_a?(String)
-        raise 'configuration invalid, client must have a name'
+        invalid_config('client must have a name')
       end
       unless @settings.client.address.is_a?(String)
-        raise 'configuration invalid, client must have an address (ip or hostname)'
+        invalid_config('client must have an address (ip or hostname)')
       end
       unless @settings.client.subscriptions.is_a?(Array) && @settings.client.subscriptions.count > 0
-        raise 'configuration invalid, client must have subscriptions'
+        invalid_config('client must have subscriptions')
+      end
+      if type
+        @logger.debug('[config] -- configuration valid -- running ' + type)
+        puts 'configuration valid -- running ' + type
       end
     end
 
+    def has_keys(keys)
+      keys.each do |key|
+        unless @settings.key?(key)
+          invalid_config('missing the following key: ' + key)
+        end
+      end
+    end
+
+    def invalid_config(message)
+      @logger.error('[config] -- configuration invalid -- ' + message)
+      raise 'configuration invalid, ' + message
+    end
+
     def self.read_arguments(arguments)
       options = Hash.new
       optparse = OptionParser.new do |opts|
@@ -54,10 +95,12 @@ module Sensu
             options[:worker] = true
           end
         end
-        options[:config_file] = nil
         opts.on('-c', '--config FILE', 'Sensu JSON config FILE (default: /etc/sensu/config.json)') do |file|
           options[:config_file] = file
         end
+        opts.on('-v', '--verbose', 'Enable verbose logging') do
+          options[:verbose] = true
+        end
       end
       optparse.parse!(arguments)
       options

data/lib/sensu/server.rb

@@ -21,38 +21,43 @@ module Sensu
 
         %w[INT TERM].each do |signal|
           Signal.trap(signal) do
-            EM.warning('[process] -- ' + signal + ' -- stopping sensu server')
-            EM.add_timer(1) do
-              EM.stop
-            end
+            server.stop(signal)
           end
         end
       end
     end
 
     def initialize(options={})
-      config = Sensu::Config.new(:config_file => options[:config_file])
+      config = Sensu::Config.new(options)
       @settings = config.settings
+      @logger = config.logger
       @is_worker = options[:worker]
-      EM.syslog_setup(@settings.syslog.host, @settings.syslog.port)
+    end
+
+    def stop(signal)
+      @logger.warn('[process] -- ' + signal + ' -- stopping sensu server')
+      EM.add_timer(1) do
+        EM.stop
+      end
     end
 
     def setup_redis
-      EM.debug('[redis] -- connecting to redis')
+      @logger.debug('[redis] -- connecting to redis')
       @redis = EM::Hiredis.connect('redis://' + @settings.redis.host + ':' + @settings.redis.port.to_s)
     end
 
     def setup_amqp
-      EM.debug('[amqp] -- connecting to rabbitmq')
+      @logger.debug('[amqp] -- connecting to rabbitmq')
       connection = AMQP.connect(@settings.rabbitmq.to_hash.symbolize_keys)
       @amq = MQ.new(connection)
     end
 
     def setup_keepalives
+      @logger.debug('[keepalive] -- setup keepalive')
       @keepalive_queue = @amq.queue('keepalives')
       @keepalive_queue.subscribe do |keepalive_json|
         client = Hashie::Mash.new(JSON.parse(keepalive_json))
-        EM.debug('[keepalive] -- received keepalive -- ' + client.name)
+        @logger.debug('[keepalive] -- received keepalive -- ' + client.name)
         @redis.set('client:' + client.name, keepalive_json).callback do
           @redis.sadd('clients', client.name)
         end
@@ -71,18 +76,19 @@ module Sensu
       end
       report = proc do |output|
         output.split(/\n+/).each do |line|
-          EM.info('[handler] -- ' + line)
+          @logger.info('[handler] -- ' + line)
         end
       end
       if @settings.handlers.key?(event.check.handler)
-        EM.debug('[event] -- handling event -- ' + [event.check.handler, event.client.name, event.check.name].join(' -- '))
+        @logger.debug('[event] -- handling event -- ' + [event.check.handler, event.client.name, event.check.name].join(' -- '))
         EM.defer(handler, report)
       else
-        EM.warning('[event] -- handler does not exist -- ' + event.check.handler)
+        @logger.warn('[event] -- handler does not exist -- ' + event.check.handler)
       end
     end
 
     def process_result(result)
+      @logger.debug('[result] -- processing result for ' + [result.client, result.check.name].join(' -- '))
       @redis.get('client:' + result.client).callback do |client_json|
         unless client_json.nil?
           client = Hashie::Mash.new(JSON.parse(client_json))
@@ -136,7 +142,7 @@ module Sensu
                         end
                       end
                     else
-                      EM.debug('[result] -- check is flapping -- ' + client.name + ' -- ' + check.name)
+                      @logger.debug('[result] -- check is flapping -- ' + client.name + ' -- ' + check.name)
                       @redis.hset('events:' + client.name, check.name, previous_event.merge({'flapping' => true}).to_json)
                     end
                   elsif check['status'] != 0
@@ -165,15 +171,17 @@ module Sensu
     end
 
     def setup_results
+      @logger.debug('[result] -- setup results')
       @result_queue = @amq.queue('results')
       @result_queue.subscribe do |result_json|
         result = Hashie::Mash.new(JSON.parse(result_json))
-        EM.info('[result] -- received result -- ' + result.client + ' -- ' + result.check.name)
+        @logger.info('[result] -- received result -- ' + result.client + ' -- ' + result.check.name)
         process_result(result)
       end
     end
 
     def setup_publisher(options={})
+      @logger.debug('[publisher] -- setup publisher')
       exchanges = Hash.new
       stagger = options[:test] ? 0 : 7
       @settings.checks.each_with_index do |(name, details), index|
@@ -185,7 +193,7 @@ module Sensu
               end
               interval = options[:test] ? 0.5 : details.interval
               EM.add_periodic_timer(interval) do
-                EM.info('[publisher] -- publishing check -- ' + name + ' -- ' + exchange)
+                @logger.info('[publisher] -- publishing check -- ' + name + ' -- ' + exchange)
                 exchanges[exchange].publish({'name' => name, 'issued' => Time.now.to_i}.to_json)
               end
             end
@@ -195,8 +203,9 @@ module Sensu
     end
 
     def setup_keepalive_monitor
+      @logger.debug('[keepalive] -- setup keepalive monitor')
       EM.add_periodic_timer(30) do
-        EM.debug('[keepalive] -- checking for stale clients')
+        @logger.debug('[keepalive] -- checking for stale clients')
         @redis.smembers('clients').callback do |clients|
           clients.each do |client_id|
             @redis.get('client:' + client_id).callback do |client_json|
@@ -234,13 +243,14 @@ module Sensu
     end
 
     def setup_queue_monitor
+      @logger.debug('[monitor] -- setup queue monitor')
       EM.add_periodic_timer(5) do
         unless @keepalive_queue.subscribed?
-          EM.warning('[monitor] -- reconnecting to rabbitmq')
+          @logger.warn('[monitor] -- reconnecting to rabbitmq')
           setup_keepalives
         end
         unless @result_queue.subscribed?
-          EM.warning('[monitor] -- reconnecting to rabbitmq')
+          @logger.warn('[monitor] -- reconnecting to rabbitmq')
           setup_results
         end
       end

data/sensu.gemspec

@@ -7,8 +7,8 @@ Gem::Specification.new do |s|
   s.authors     = ["Sean Porter", "Justin Kolberg"]
   s.email       = ["sean.porter@sonian.net", "justin.kolberg@sonian.net"]
   s.homepage    = "https://github.com/sonian/sensu"
-  s.summary     = %q{A server monitoring framework}
-  s.description = %q{A server monitoring framework using the publish-subscribe model}
+  s.summary     = %q{A monitoring framework}
+  s.description = %q{A monitoring framework that aims to be simple, malleable, and scalable. Uses the publish/subscribe model.}
   s.license     = "MIT"
   s.has_rdoc    = false
 
@@ -16,16 +16,14 @@ Gem::Specification.new do |s|
   s.add_dependency("json")
   s.add_dependency("hashie")
   s.add_dependency("uuidtools")
-  s.add_dependency("em-syslog")
+  s.add_dependency("cabin", "0.1.7")
   s.add_dependency("em-hiredis")
   s.add_dependency("rack", "~> 1.3.4")
   s.add_dependency("async_sinatra")
   s.add_dependency("thin")
 
   s.add_development_dependency("rake")
-  s.add_development_dependency("minitest", "~> 2.7.0")
-  s.add_development_dependency("em-ventually")
-  s.add_development_dependency("rest-client")
+  s.add_development_dependency("em-spec")
 
   s.files         = `git ls-files`.split("\n").reject {|f| f =~ /(dist|test|png)/}
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }

data/sensu.windows

@@ -6,8 +6,8 @@ Gem::Specification.new do |s|
   s.authors     = ["Sean Porter", "Justin Kolberg"]
   s.email       = ["sean.porter@sonian.net", "justin.kolberg@sonian.net"]
   s.homepage    = "https://github.com/sonian/sensu"
-  s.summary     = %q{A server monitoring framework}
-  s.description = %q{A server monitoring framework using the publish-subscribe model}
+  s.summary     = %q{A monitoring framework}
+  s.description = %q{A monitoring framework that aims to be simple, malleable, and scalable. Uses the publish/subscribe model.}
   s.license     = "MIT"
   s.has_rdoc    = false
 
@@ -23,7 +23,7 @@ Gem::Specification.new do |s|
   s.add_dependency("json")
   s.add_dependency("hashie")
   s.add_dependency("uuidtools")
-  s.add_dependency("em-syslog")
+  s.add_dependency("cabin", "0.1.7")
 
   s.files         = `git ls-files`.split("\n").reject {|f| f =~ /(dist|test|server|api|png)/}
   s.executables   = "sensu-client"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sensu
 version: !ruby/object:Gem::Version 
-  hash: 63
+  hash: 55
   prerelease: false
   segments: 
   - 0
   - 8
-  - 0
-  version: 0.8.0
+  - 4
+  version: 0.8.4
 platform: ruby
 authors: 
 - Sean Porter
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-31 00:00:00 -07:00
+date: 2011-11-09 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -78,17 +78,19 @@ dependencies:
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: em-syslog
+  name: cabin
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 21
         segments: 
         - 0
-        version: "0"
+        - 1
+        - 7
+        version: 0.1.7
   type: :runtime
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
@@ -164,25 +166,9 @@ dependencies:
   type: :development
   version_requirements: *id010
 - !ruby/object:Gem::Dependency 
-  name: minitest
+  name: em-spec
   prerelease: false
   requirement: &id011 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 2
-        - 7
-        - 0
-        version: 2.7.0
-  type: :development
-  version_requirements: *id011
-- !ruby/object:Gem::Dependency 
-  name: em-ventually
-  prerelease: false
-  requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -192,22 +178,8 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id012
-- !ruby/object:Gem::Dependency 
-  name: rest-client
-  prerelease: false
-  requirement: &id013 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :development
-  version_requirements: *id013
-description: A server monitoring framework using the publish-subscribe model
+  version_requirements: *id011
+description: A monitoring framework that aims to be simple, malleable, and scalable. Uses the publish/subscribe model.
 email: 
 - sean.porter@sonian.net
 - justin.kolberg@sonian.net
@@ -221,6 +193,7 @@ extra_rdoc_files: []
 
 files: 
 - .gitignore
+- .travis.yml
 - Gemfile
 - Gemfile.lock
 - MIT-LICENSE.txt
@@ -270,6 +243,6 @@ rubyforge_project:
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: A server monitoring framework
+summary: A monitoring framework
 test_files: []