sensu 0.7.2 → 0.8.0

data/Gemfile.lock

@@ -1,13 +1,14 @@
 PATH
   remote: .
   specs:
-    sensu (0.7.0)
+    sensu (0.8.0)
       amqp (= 0.7.4)
       async_sinatra
       em-hiredis
       em-syslog
       hashie
       json
+      rack (~> 1.3.4)
       thin
       uuidtools
 
@@ -30,12 +31,12 @@ GEM
       callsite (~> 0.0.5)
       eventmachine
     eventmachine (0.12.10)
-    hashie (1.1.0)
+    hashie (1.2.0)
     hiredis (0.3.2)
     json (1.6.1)
     mime-types (1.16)
-    minitest (2.6.0)
-    rack (1.3.4)
+    minitest (2.7.0)
+    rack (1.3.5)
     rack-protection (1.1.4)
       rack
     rake (0.9.2)
@@ -57,7 +58,7 @@ PLATFORMS
 
 DEPENDENCIES
   em-ventually
-  minitest
+  minitest (~> 2.7.0)
   rake
   rest-client
   sensu!

data/Rakefile

@@ -1,10 +1,13 @@
 require 'bundler/gem_tasks'
-require 'rake/testtask'
 
 task :default => 'test'
 
-Rake::TestTask.new do |test|
-  test.pattern = 'test/*_test.rb'
+desc "Run tests"
+task :test do
+  require File.join(File.dirname(__FILE__), 'test', 'helper')
+  Dir['test/*_test.rb'].each do |test|
+    require File.join(File.dirname(__FILE__), test)
+  end
 end
 
 desc "Build Sensu for Windows"

data/lib/sensu.rb

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

data/lib/sensu/api.rb

@@ -11,12 +11,13 @@ module Sensu
         self.setup(options)
         self.run!(:port => @settings.api.port)
 
-        Signal.trap('INT') do
-          EM.stop
-        end
-
-        Signal.trap('TERM') do
-          EM.stop
+        %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
+          end
         end
       end
     end
@@ -24,7 +25,10 @@ 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')
       connection = AMQP.connect(@settings.rabbitmq.to_hash.symbolize_keys)
       set :amq, MQ.new(connection)
     end
@@ -39,13 +43,14 @@ module Sensu
     end
 
     aget '/clients' do
+      EM.debug('[clients] -- ' + request.ip + ' -- GET -- request for client list')
       current_clients = Array.new
       conn.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|
               current_clients.push(JSON.parse(client_json))
-              body current_clients.to_json if index == clients.size-1
+              body current_clients.to_json if index == clients.size - 1
             end
           end
         else
@@ -55,6 +60,7 @@ 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|
         status 404 if client_json.nil?
         body client_json
@@ -62,6 +68,7 @@ module Sensu
     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|
         unless client_exists == 0
           conn.redis.exists('events:' + client).callback do |events_exist|
@@ -92,16 +99,8 @@ module Sensu
       end
     end
 
-    aget '/event/:client/:check' do |client, check|
-      conn.redis.hgetall('events:' + client).callback do |events|
-        client_events = Hash[*events]
-        event = client_events[check]
-        status 404 if event.nil?
-        body event
-      end
-    end
-
     aget '/events' do
+      EM.debug('[events] -- ' + request.ip + ' -- GET -- request for event list')
       current_events = Hash.new
       conn.redis.smembers('clients').callback do |clients|
         unless clients.empty?
@@ -112,7 +111,7 @@ module Sensu
                 client_events[key] = JSON.parse(value)
               end
               current_events[client] = client_events unless client_events.empty?
-              body current_events.to_json if index == clients.size-1
+              body current_events.to_json if index == clients.size - 1
             end
           end
         else
@@ -121,14 +120,54 @@ module Sensu
       end
     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|
+        client_events = Hash[*events]
+        event = client_events[check]
+        status 404 if event.nil?
+        body event
+      end
+    end
+
     apost '/stash/*' do |path|
-      conn.redis.set('stash:' + path, request.body.read).callback do
+      EM.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
         status 201
         body nil
       end
     end
 
+    apost '/stashes' do
+      EM.debug('[stashes] -- ' + request.ip + ' -- POST -- request for multiple stashes')
+      begin
+        paths = JSON.parse(request.body.read)
+      rescue JSON::ParserError
+        status 400
+        body nil
+      end
+      stashes = Hash.new
+      if paths.is_a?(Array)
+        paths.each_with_index do |path, index|
+          conn.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
+        end
+      else
+        status 400
+        body nil
+      end
+    end
+
     aget '/stash/*' do |path|
+      EM.debug('[stash] -- ' + request.ip + ' -- GET -- request for stash -- ' + path)
       conn.redis.get('stash:' + path).callback do |stash|
         status 404 if stash.nil?
         body stash
@@ -136,6 +175,7 @@ module Sensu
     end
 
     adelete '/stash/*' do |path|
+      EM.debug('[stash] -- ' + request.ip + ' -- DELETE -- request for stash -- ' + path)
       conn.redis.exists('stash:' + path).callback do |stash_exist|
         unless stash_exist == 0
           conn.redis.del('stash:' + path).callback do
@@ -150,6 +190,7 @@ module Sensu
     end
 
     apost '/test' do
+      EM.debug('[test] -- ' + request.ip + ' -- POST -- seeding for minitest')
       client = '{
         "name": "test",
         "address": "localhost",

data/lib/sensu/client.rb

@@ -9,13 +9,15 @@ module Sensu
         client.setup_keepalives
         client.setup_subscriptions
         client.setup_queue_monitor
+        client.setup_socket
 
-        Signal.trap('INT') do
-          EM.stop
-        end
-
-        Signal.trap('TERM') do
-          EM.stop
+        %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
+          end
         end
       end
     end
@@ -23,24 +25,32 @@ module Sensu
     def initialize(options={})
       config = Sensu::Config.new(:config_file => options[:config_file])
       @settings = config.settings
+      EM.syslog_setup(@settings.syslog.host, @settings.syslog.port)
     end
 
     def setup_amqp
+      EM.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)
+      @keepalive_queue ||= @amq.queue('keepalives')
+      @keepalive_queue.publish(@settings.client.to_json)
+    end
+
     def setup_keepalives
-      keepalive_queue = @amq.queue('keepalives')
       @settings.client.timestamp = Time.now.to_i
-      keepalive_queue.publish(@settings.client.to_json)
+      publish_keepalive
       EM.add_periodic_timer(30) do
         @settings.client.timestamp = Time.now.to_i
-        keepalive_queue.publish(@settings.client.to_json)
+        publish_keepalive
       end
     end
 
     def publish_result(check)
+      EM.info('[result] -- publishing check result -- ' + check.name)
       @result_queue ||= @amq.queue('results')
       @result_queue.publish({
         :client => @settings.client.name,
@@ -72,6 +82,7 @@ module Sensu
             end
             EM.defer(execute, publish)
           else
+            EM.warning('[execute] -- missing client attributes -- ' + unmatched_tokens.join(', ') + ' -- ' + check.name)
             check.status = 3
             check.output = 'Missing client attributes: ' + unmatched_tokens.join(', ')
             check.internal = true
@@ -80,6 +91,7 @@ module Sensu
           end
         end
       else
+        EM.warning('[execute] -- unkown check -- ' + check.name)
         check.status = 3
         check.output = 'Unknown check'
         check.internal = true
@@ -91,10 +103,12 @@ module Sensu
     def 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)
         @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)
         execute_check(check)
       end
     end
@@ -102,6 +116,7 @@ module Sensu
     def setup_queue_monitor
       EM.add_periodic_timer(5) do
         unless @check_queue.subscribed?
+          EM.warning('[monitor] -- reconnecting to rabbitmq')
           @check_queue.delete
           EM.add_timer(1) do
             setup_subscriptions
@@ -109,5 +124,46 @@ module Sensu
         end
       end
     end
+
+    def setup_socket
+      EM.debug('[socket] -- starting up socket server')
+      EM.start_server('127.0.0.1', 3030, ClientSocket) do |socket|
+        socket.client_name = @settings.client.name
+        socket.result_queue = @amq.queue('results')
+      end
+    end
+  end
+
+  class ClientSocket < EM::Connection
+    attr_accessor :client_name, :result_queue
+
+    def post_init
+      EM.debug('[socket] -- client connected')
+    end
+
+    def receive_data(data)
+      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)
+          @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"}')
+        end
+      rescue JSON::ParserError
+        EM.warning('[socket] -- could not parse check result -- expecting JSON')
+      end
+      close_connection
+    end
+
+    def unbind
+      EM.debug('[socket] -- client disconnected')
+    end
   end
 end

data/lib/sensu/config.rb

@@ -48,7 +48,7 @@ module Sensu
           exit
         end
         current_process = $0.split('/').last
-        if current_process == 'sensu-server' || current_process == 'rake_test_loader.rb'
+        if current_process == 'sensu-server' || current_process == 'rake'
           options[:worker] = false
           opts.on('-w', '--worker', 'Only consume jobs, no check publishing (default: false)') do
             options[:worker] = true

data/lib/sensu/server.rb

@@ -4,13 +4,11 @@ require 'em-hiredis'
 module Sensu
   class Server
     attr_accessor :redis, :is_worker
-    alias :redis_connection :redis
 
     def self.run(options={})
-      EM.threadpool_size = 15
+      EM.threadpool_size = 16
       EM.run do
         server = self.new(options)
-        server.setup_logging
         server.setup_redis
         server.setup_amqp
         server.setup_keepalives
@@ -21,12 +19,13 @@ module Sensu
         end
         server.setup_queue_monitor
 
-        Signal.trap('INT') do
-          EM.stop
-        end
-
-        Signal.trap('TERM') do
-          EM.stop
+        %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
+          end
         end
       end
     end
@@ -35,17 +34,16 @@ module Sensu
       config = Sensu::Config.new(:config_file => options[:config_file])
       @settings = config.settings
       @is_worker = options[:worker]
-    end
-
-    def setup_logging
       EM.syslog_setup(@settings.syslog.host, @settings.syslog.port)
     end
 
     def setup_redis
+      EM.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')
       connection = AMQP.connect(@settings.rabbitmq.to_hash.symbolize_keys)
       @amq = MQ.new(connection)
     end
@@ -53,9 +51,10 @@ module Sensu
     def setup_keepalives
       @keepalive_queue = @amq.queue('keepalives')
       @keepalive_queue.subscribe do |keepalive_json|
-        client_id = JSON.parse(keepalive_json)['name']
-        @redis.set('client:' + client_id, keepalive_json).callback do
-          @redis.sadd('clients', client_id)
+        client = Hashie::Mash.new(JSON.parse(keepalive_json))
+        EM.debug('[keepalive] -- received keepalive -- ' + client.name)
+        @redis.set('client:' + client.name, keepalive_json).callback do
+          @redis.sadd('clients', client.name)
         end
       end
     end
@@ -72,10 +71,15 @@ module Sensu
       end
       report = proc do |output|
         output.split(/\n+/).each do |line|
-          EM.debug(line)
+          EM.info('[handler] -- ' + line)
         end
       end
-      EM.defer(handler, report)
+      if @settings.handlers.key?(event.check.handler)
+        EM.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)
+      end
     end
 
     def process_result(result)
@@ -132,6 +136,7 @@ module Sensu
                         end
                       end
                     else
+                      EM.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
@@ -163,6 +168,7 @@ module Sensu
       @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)
         process_result(result)
       end
     end
@@ -179,8 +185,8 @@ module Sensu
               end
               interval = options[:test] ? 0.5 : details.interval
               EM.add_periodic_timer(interval) do
+                EM.info('[publisher] -- publishing check -- ' + name + ' -- ' + exchange)
                 exchanges[exchange].publish({'name' => name, 'issued' => Time.now.to_i}.to_json)
-                EM.debug('name="Published Check" event_id=server action="Published check ' + name + ' to the ' + exchange + ' exchange"')
               end
             end
           end
@@ -190,6 +196,7 @@ module Sensu
 
     def setup_keepalive_monitor
       EM.add_periodic_timer(30) do
+        EM.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|
@@ -229,9 +236,11 @@ module Sensu
     def setup_queue_monitor
       EM.add_periodic_timer(5) do
         unless @keepalive_queue.subscribed?
+          EM.warning('[monitor] -- reconnecting to rabbitmq')
           setup_keepalives
         end
         unless @result_queue.subscribed?
+          EM.warning('[monitor] -- reconnecting to rabbitmq')
           setup_results
         end
       end

data/sensu.gemspec

@@ -18,13 +18,14 @@ Gem::Specification.new do |s|
   s.add_dependency("uuidtools")
   s.add_dependency("em-syslog")
   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')
-  s.add_development_dependency('em-ventually')
-  s.add_development_dependency('rest-client')
+  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.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) }

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sensu
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 63
   prerelease: false
   segments: 
   - 0
-  - 7
-  - 2
-  version: 0.7.2
+  - 8
+  - 0
+  version: 0.8.0
 platform: ruby
 authors: 
 - Sean Porter
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-14 00:00:00 -07:00
+date: 2011-10-31 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -106,21 +106,23 @@ dependencies:
   type: :runtime
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: async_sinatra
+  name: rack
   prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 19
         segments: 
-        - 0
-        version: "0"
+        - 1
+        - 3
+        - 4
+        version: 1.3.4
   type: :runtime
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
-  name: thin
+  name: async_sinatra
   prerelease: false
   requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
@@ -134,7 +136,7 @@ dependencies:
   type: :runtime
   version_requirements: *id008
 - !ruby/object:Gem::Dependency 
-  name: rake
+  name: thin
   prerelease: false
   requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
@@ -145,10 +147,10 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
+  type: :runtime
   version_requirements: *id009
 - !ruby/object:Gem::Dependency 
-  name: minitest
+  name: rake
   prerelease: false
   requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
@@ -162,9 +164,25 @@ dependencies:
   type: :development
   version_requirements: *id010
 - !ruby/object:Gem::Dependency 
-  name: em-ventually
+  name: minitest
   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: 
     - - ">="
@@ -174,11 +192,11 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id011
+  version_requirements: *id012
 - !ruby/object:Gem::Dependency 
   name: rest-client
   prerelease: false
-  requirement: &id012 !ruby/object:Gem::Requirement 
+  requirement: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -188,7 +206,7 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id012
+  version_requirements: *id013
 description: A server monitoring framework using the publish-subscribe model
 email: 
 - sean.porter@sonian.net