sensu 0.8.19 → 0.9.0.beta

data/README.org

@@ -9,8 +9,9 @@
 * Documentation
   Find it [[https://github.com/sonian/sensu/wiki][HERE]].
 * Other Projects
-  - [[https://github.com/sonian/sensu-plugin][Sensu Community Plugins]]
+  - [[https://github.com/sonian/sensu-community-plugins][Sensu Community Plugins]]
   - [[https://github.com/sonian/sensu-dashboard][Sensu Dashboard]]
+  - [[https://github.com/sonian/sensu-plugin][Sensu Plugin & Handler Helper]]
 * License
   Sensu is released under the [[https://github.com/sonian/sensu/blob/master/MIT-LICENSE.txt][MIT license]].
 * Contributing

data/lib/sensu.rb

@@ -1,3 +1,3 @@
 module Sensu
-  VERSION = "0.8.19"
+  VERSION = "0.9.0.beta"
 end

data/lib/sensu/api.rb

@@ -26,11 +26,15 @@ module Sensu
       config = Sensu::Config.new(options)
       $settings = config.settings
       $logger = config.open_log
+      if options[:daemonize]
+        Process.daemonize
+      end
+      Process.write_pid(options[:pid_file])
       $logger.debug('[setup] -- connecting to redis')
-      $redis = EM.connect($settings.redis.host, $settings.redis.port, Redis::Reconnect)
+      $redis = Redis.connect($settings.redis.to_hash.symbolize_keys)
       $logger.debug('[setup] -- connecting to rabbitmq')
-      connection = AMQP.connect($settings.rabbitmq.to_hash.symbolize_keys)
-      $amq = MQ.new(connection)
+      rabbitmq = AMQP.connect($settings.rabbitmq.to_hash.symbolize_keys)
+      $amq = AMQP::Channel.new(rabbitmq)
     end
 
     def self.stop(signal)

data/lib/sensu/client.rb

@@ -3,8 +3,12 @@ require File.join(File.dirname(__FILE__), 'config')
 module Sensu
   class Client
     def self.run(options={})
+      client = self.new(options)
+      if options[:daemonize]
+        Process.daemonize
+      end
+      Process.write_pid(options[:pid_file])
       EM.run do
-        client = self.new(options)
         client.setup_amqp
         client.setup_keepalives
         client.setup_subscriptions
@@ -34,30 +38,27 @@ module Sensu
 
     def setup_amqp
       @logger.debug('[amqp] -- connecting to rabbitmq')
-      connection = AMQP.connect(@settings.rabbitmq.to_hash.symbolize_keys)
-      @amq = MQ.new(connection)
+      rabbitmq = AMQP.connect(@settings.rabbitmq.to_hash.symbolize_keys)
+      @amq = AMQP::Channel.new(rabbitmq)
     end
 
     def publish_keepalive
+      @settings.client.timestamp = Time.now.to_i
       @logger.debug('[keepalive] -- publishing keepalive -- ' + @settings.client.timestamp.to_s)
-      @keepalive_queue ||= @amq.queue('keepalives')
-      @keepalive_queue.publish(@settings.client.to_json)
+      @amq.queue('keepalives').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
-        @settings.client.timestamp = Time.now.to_i
         publish_keepalive
       end
     end
 
     def publish_result(check)
       @logger.info('[result] -- publishing check result -- ' + check.status.to_s + ' -- ' + check.name)
-      @result_queue ||= @amq.queue('results')
-      @result_queue.publish({
+      @amq.queue('results').publish({
         :client => @settings.client.name,
         :check => check.to_hash
       }.to_json)
@@ -115,7 +116,7 @@ module Sensu
     def setup_subscriptions
       @logger.debug('[subscribe] -- setup subscriptions')
       @check_queue = @amq.queue(String.unique, :exclusive => true)
-      @settings.client.subscriptions.push('uchiwa')
+      @settings.client.subscriptions.push('uchiwa').uniq!
       @settings.client.subscriptions.each do |exchange|
         @logger.debug('[subscribe] -- queue binding to exchange -- ' + exchange)
         @check_queue.bind(@amq.fanout(exchange))
@@ -171,18 +172,18 @@ module Sensu
     def setup_socket
       @logger.debug('[socket] -- starting up socket server')
       EM.start_server('127.0.0.1', 3030, ClientSocket) do |socket|
+        socket.settings = @settings
         socket.logger = @logger
-        socket.client_name = @settings.client.name
-        socket.result_queue = @amq.queue('results')
+        socket.amq = @amq
       end
     end
   end
 
   class ClientSocket < EM::Connection
-    attr_accessor :logger, :client_name, :result_queue
+    attr_accessor :settings, :logger, :amq
 
     def receive_data(data)
-      @logger.debug('[socket] -- received data from client')
+      @logger.debug('[socket] -- new connection -- received data from external source')
       begin
         check = Hashie::Mash.new(JSON.parse(data))
         validates = %w[name status output].all? do |key|
@@ -190,21 +191,21 @@ module Sensu
         end
         if validates
           @logger.info('[socket] -- publishing check result -- ' + check.name)
-          @result_queue.publish({
-            :client => @client_name,
+          @amq.queue('results').publish({
+            :client => @settings.client.name,
             :check => check.to_hash
           }.to_json)
         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 => error
-        @logger.warn('[socket] -- check result must be valid JSON: ' + error)
+        @logger.warn('[socket] -- check result must be valid JSON: ' + error.to_s)
       end
       close_connection
     end
 
     def unbind
-      @logger.debug('[socket] -- client disconnected')
+      @logger.debug('[socket] -- connection closed')
     end
   end
 end

data/lib/sensu/config.rb

@@ -22,6 +22,8 @@ module Sensu
       :config_file => '/etc/sensu/config.json',
       :config_dir => '/etc/sensu/conf.d',
       :validate => true,
+      :pid_file => '/tmp/' + File.basename($0) + '.pid',
+      :daemonize => false
     }
 
     def initialize(options={})
@@ -33,7 +35,9 @@ module Sensu
     def open_log
       @logger = Cabin::Channel.new
       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])
+        STDOUT.reopen(@options[:log_file], 'a')
+        STDERR.reopen(STDOUT)
+        ruby_logger = Logger.new(STDOUT)
       else
         invalid_config('log file is not writable: ' + @options[:log_file])
       end
@@ -78,6 +82,26 @@ module Sensu
         unless @settings.handlers.include?('default')
           invalid_config('missing default handler')
         end
+        @settings.handlers.each do |name, details|
+          unless details.key?('type')
+            invalid_config('missing type for handler ' + name)
+          end
+          case details.type
+          when 'pipe'
+            unless details.key?('command')
+              invalid_config('missing command for pipe handler ' + name)
+            end
+          when 'amqp'
+            unless details.key?('exchange')
+              invalid_config('missing exchange details for amqp handler ' + name)
+            end
+            unless details.exchange.key?('name')
+              invalid_config('missing exchange name for amqp handler ' + name)
+            end
+          else
+            invalid_config('unknown type for handler ' + name)
+          end
+        end
       when 'api'
         has_keys(%w[redis api])
       when 'client'
@@ -139,12 +163,7 @@ module Sensu
           puts opts
           exit
         end
-        current_process = $0.split('/').last
-        if current_process == 'sensu-server' || current_process == 'rake'
-          opts.on('-w', '--worker', 'Only consume jobs, no check publishing (default: false)') do
-            options[:worker] = true
-          end
-        end
+        current_process = File.basename($0)
         opts.on('-c', '--config FILE', 'Sensu JSON config FILE (default: /etc/sensu/config.json)') do |file|
           options[:config_file] = file
         end
@@ -157,9 +176,15 @@ module Sensu
         opts.on('-v', '--verbose', 'Enable verbose logging (default: false)') do
           options[:verbose] = true
         end
+        opts.on('-b', '--background', 'Fork into backgaround (daemon mode) (default: false)') do
+          options[:daemonize] = true
+        end
+        opts.on('-p', '--pid_file FILE', 'Sensu PID FILE (default: ' + DEFAULT_OPTIONS[:pid_file] + ')') do |file|
+          options[:pid_file] = file
+        end
       end
       optparse.parse!(arguments)
-      options
+      DEFAULT_OPTIONS.merge(options)
     end
   end
 end

data/lib/sensu/helpers/redis.rb

@@ -1,5 +1,5 @@
 module Redis
-  class Reconnect < Redis::Client
+  class Client
     def connection_completed
       @connected = true
       @port, @host = Socket.unpack_sockaddr_in(get_peername)
@@ -22,4 +22,10 @@ module Redis
       end
     end
   end
+
+  def self.connect(options={})
+    host = options[:host] || 'localhost'
+    port = options[:port] || 6379
+    EM.connect(host, port, Redis::Client)
+  end
 end

data/lib/sensu/helpers/ruby.rb

@@ -44,3 +44,37 @@ class String
     rand(36**chars).to_s(36)
   end
 end
+
+module Process
+  def self.write_pid(pid_file)
+    begin
+      File.open(pid_file, 'w') do |file|
+        file.write(self.pid.to_s + "\n")
+      end
+    rescue
+      raise 'could not write to pid file: ' + pid_file
+    end
+  end
+
+  def self.daemonize
+    srand
+    fork and exit
+    unless session_id = self.setsid
+      raise 'cannot detach from controlling terminal'
+    end
+    trap 'SIGHUP', 'IGNORE'
+    exit if pid = fork
+    Dir.chdir "/"
+    ObjectSpace.each_object(IO) do |io|
+      unless [STDIN, STDOUT, STDERR].include?(io)
+        begin
+          unless io.closed?
+            io.close
+          end
+        rescue
+        end
+      end
+    end
+    return session_id
+  end
+end

data/lib/sensu/server.rb

@@ -6,20 +6,21 @@ require File.join(File.dirname(__FILE__), 'helpers', 'redis')
 
 module Sensu
   class Server
-    attr_accessor :redis, :amq, :is_worker
+    attr_accessor :redis, :amq, :is_master
 
     def self.run(options={})
+      server = self.new(options)
+      if options[:daemonize]
+        Process.daemonize
+      end
+      Process.write_pid(options[:pid_file])
       EM.threadpool_size = 16
       EM.run do
-        server = self.new(options)
         server.setup_redis
         server.setup_amqp
         server.setup_keepalives
         server.setup_results
-        unless server.is_worker
-          server.setup_publisher
-          server.setup_keepalive_monitor
-        end
+        server.setup_master_monitor
         server.setup_queue_monitor
 
         %w[INT TERM].each do |signal|
@@ -34,7 +35,6 @@ module Sensu
       config = Sensu::Config.new(options)
       @settings = config.settings
       @logger = config.open_log
-      @is_worker = options[:worker]
     end
 
     def stop(signal)
@@ -46,13 +46,13 @@ module Sensu
 
     def setup_redis
       @logger.debug('[redis] -- connecting to redis')
-      @redis = EM.connect(@settings.redis.host, @settings.redis.port, Redis::Reconnect)
+      @redis = Redis.connect(@settings.redis.to_hash.symbolize_keys)
     end
 
     def setup_amqp
       @logger.debug('[amqp] -- connecting to rabbitmq')
-      connection = AMQP.connect(@settings.rabbitmq.to_hash.symbolize_keys)
-      @amq = MQ.new(connection)
+      rabbitmq = AMQP.connect(@settings.rabbitmq.to_hash.symbolize_keys)
+      @amq = AMQP::Channel.new(rabbitmq)
     end
 
     def setup_keepalives
@@ -84,37 +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(' -- '))
-          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
+          details = @settings.handlers[handler]
+          case details.type
+          when "pipe"
             handle = proc do
               output = ''
               Bundler.with_clean_env do
                 begin
-                  IO.popen(@settings.handlers[handler] + ' 2>&1', 'r+') do |io|
+                  IO.popen(details.command + ' 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
+                  output = handler + ' -- broken pipe: ' + error.to_s
                 end
               end
               output
             end
             EM.defer(handle, report)
+          when "amqp"
+            exchange = details.exchange.name
+            exchange_type = details.exchange.key?('type') ? details.exchange.type.to_sym : :direct
+            exchange_options = details.exchange.reject { |key, value| %w[name type].include?(key) }
+            @logger.debug('[event] -- publishing event to amqp exchange -- ' + [exchange, event.client.name, event.check.name].join(' -- '))
+            payload = details.send_only_check_output ? event.check.output : event.to_json
+            @amq.method(exchange_type).call(exchange, exchange_options).publish(payload)
           end
         else
-          @logger.warn('[event] -- handler does not exist -- ' + handler)
+          @logger.warn('[event] -- unknown handler -- ' + handler)
         end
       end
     end
@@ -210,14 +208,13 @@ module Sensu
       @result_queue = @amq.queue('results')
       @result_queue.subscribe do |result_json|
         result = Hashie::Mash.new(JSON.parse(result_json))
-        @logger.info('[result] -- received result -- ' + result.client + ' -- ' + result.check.name)
+        @logger.info('[result] -- received result -- ' + [result.check.name, result.client, result.check.status, result.check.output].join(' -- '))
         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|
         check_request = Hashie::Mash.new({:name => name})
@@ -231,12 +228,11 @@ module Sensu
               else
                 exchange = target
               end
-              exchanges[exchange] ||= @amq.fanout(exchange)
               interval = options[:test] ? 0.5 : details.interval
               EM.add_periodic_timer(interval) do
                 check_request.issued = Time.now.to_i
                 @logger.info('[publisher] -- publishing check -- ' + name + ' -- ' + exchange)
-                exchanges[exchange].publish(check_request.to_json)
+                @amq.fanout(exchange).publish(check_request.to_json)
               end
             end
           end
@@ -264,17 +260,17 @@ module Sensu
               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)
+                @amq.queue('results').publish(result.to_json)
               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)
+                @amq.queue('results').publish(result.to_json)
               else
                 @redis.hexists('events:' + client_id, 'keepalive').callback do |exists|
                   if exists
                     result.check.status = 0
                     result.check.output = 'Keep-alive sent from host'
-                    @result_queue.publish(result.to_json)
+                    @amq.queue('results').publish(result.to_json)
                   end
                 end
               end
@@ -284,15 +280,57 @@ module Sensu
       end
     end
 
+    def master_duties
+      setup_publisher
+      setup_keepalive_monitor
+    end
+
+    def request_master_election
+      @is_master ||= false
+      @redis.setnx('lock:master', Time.now.to_i).callback do |created|
+        if created
+          @logger.info('[master] -- i am the master')
+          @is_master = true
+          master_duties
+        else
+          @redis.get('lock:master') do |timestamp|
+            if Time.now.to_i - timestamp.to_i >= 60
+              @redis.getset('lock:master', Time.now.to_i).callback do |previous|
+                if previous == timestamp
+                  @logger.info('[master] -- i am now the master')
+                  @is_master = true
+                  master_duties
+                end
+              end
+            end
+          end
+        end
+      end
+    end
+
+    def setup_master_monitor
+      request_master_election
+      EM.add_periodic_timer(20) do
+        if @is_master
+          timestamp = Time.now.to_i
+          @redis.set('lock:master', timestamp).callback do
+            @logger.debug('[master] -- updated master lock timestamp -- ' + timestamp.to_s)
+          end
+        else
+          request_master_election
+        end
+      end
+    end
+
     def setup_queue_monitor
       @logger.debug('[monitor] -- setup queue monitor')
       EM.add_periodic_timer(5) do
         unless @keepalive_queue.subscribed?
-          @logger.warn('[monitor] -- reconnecting to rabbitmq')
+          @logger.warn('[monitor] -- reconnecting to rabbitmq -- keepalives')
           setup_keepalives
         end
         unless @result_queue.subscribed?
-          @logger.warn('[monitor] -- reconnecting to rabbitmq')
+          @logger.warn('[monitor] -- reconnecting to rabbitmq -- results')
           setup_results
         end
       end

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: sensu
 version: !ruby/object:Gem::Version 
-  hash: 25
-  prerelease: false
+  hash: 31098121
+  prerelease: true
   segments: 
   - 0
-  - 8
-  - 19
-  version: 0.8.19
+  - 9
+  - 0
+  - beta
+  version: 0.9.0.beta
 platform: ruby
 authors: 
 - Sean Porter
@@ -16,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-16 00:00:00 -08:00
+date: 2011-12-21 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -263,12 +264,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 25
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: