sensu 0.5.12 → 0.5.13

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    sensu (0.4.0)
+    sensu (0.5.12)
       amqp (= 0.7.4)
       async_sinatra
       em-hiredis
@@ -18,7 +18,7 @@ GEM
     async_sinatra (0.5.0)
       rack (>= 1.2.1)
       sinatra (>= 1.0)
-    callsite (0.0.5)
+    callsite (0.0.6)
       bundler (~> 1.0.0)
     daemons (1.1.4)
     em-hiredis (0.1.0)
@@ -30,12 +30,12 @@ GEM
       eventmachine
     eventmachine (0.12.10)
     hiredis (0.3.2)
-    json (1.5.4)
+    json (1.6.1)
     mime-types (1.16)
-    minitest (2.5.1)
-    rack (1.3.2)
+    minitest (2.6.0)
+    rack (1.3.3)
     rake (0.9.2)
-    rest-client (1.6.3)
+    rest-client (1.6.7)
       mime-types (>= 1.16)
     sinatra (1.2.6)
       rack (~> 1.1)

data/README.org

@@ -5,6 +5,8 @@
 
   Check results are handled by user created handlers.
 
+  Documentation can be found [[https://github.com/sonian/sensu/wiki][here]].
+
 * License
   Sensu is released under the [[https://github.com/sonian/sensu/blob/master/MIT-LICENSE.txt][MIT license]].
 
@@ -19,19 +21,20 @@
 *** A Client Will
   - Have a set of attributes to describe it, including its responsibilities
   - Send keep-alives to a server
-  - Subscribe to a set of queues bound to a set of fanout exchanges, determined by its responsibilities
+  - Subscribe to a queue bound to a set of fanout exchanges, determined by its responsibilities
   - Substitute tokens in check commands with their matching client attribute
+  - Report when it does not have a client attribute for token substitution
   - Receive checks from subscriptions, execute them, and publish the results to a queue with its client name
   - Not allow overlapping check executions of the same name
   - Report when it is unaware of a check it received from a subscription
 
 *** A Server Will
-  - Subscribe to a queue for check scheduling, another for check results
-  - Populate the check scheduling queue using a JSON config file
-  - Pull a check from the check scheduling queue and push it onto its associated fanout exchanges
+  - Subscribe to a queue for check results, another for keep-alives
+  - Pull keep-alives, storing client details
+  - Publish checks on defined intervals to their associated fanout exchanges
   - Pull check results, storing the latest events for clients, a good result will flush a previous event for that client
   - Create an event when it stops receiving keep-alives from a client, a new keep-alive for the client will clear the event
-  - Trigger a event handler, determined by the type of the check that produced the event, providing it with a JSON event file
+  - Trigger a event handler, either the default handler or one specified for the check, providing it with a JSON event file
 
 *** An API Will
   - List all current events

data/bin/sensu-api

@@ -3,4 +3,4 @@
 $: << File.dirname(__FILE__) + '/../lib' unless $:.include?(File.dirname(__FILE__) + '/../lib/')
 require 'sensu/api'
 
-Sensu::API.run
+Sensu::API.run(Sensu::Config.read_arguments(ARGV))

data/bin/sensu-client

@@ -3,4 +3,4 @@
 $: << File.dirname(__FILE__) + '/../lib' unless $:.include?(File.dirname(__FILE__) + '/../lib/')
 require 'sensu/client'
 
-Sensu::Client.run
+Sensu::Client.run(Sensu::Config.read_arguments(ARGV))

data/bin/sensu-server

@@ -3,4 +3,4 @@
 $: << File.dirname(__FILE__) + '/../lib' unless $:.include?(File.dirname(__FILE__) + '/../lib/')
 require 'sensu/server'
 
-Sensu::Server.run
+Sensu::Server.run(Sensu::Config.read_arguments(ARGV))

data/lib/sensu/client.rb

@@ -71,11 +71,11 @@ module Sensu
     end
 
     def setup_subscriptions
-      @uniq_queue = @amq.queue(UUIDTools::UUID.random_create.to_s, :exclusive => true)
+      @check_queue = @amq.queue(UUIDTools::UUID.random_create.to_s, :exclusive => true)
       @settings['client']['subscriptions'].each do |exchange|
-        @uniq_queue.bind(@amq.fanout(exchange))
+        @check_queue.bind(@amq.fanout(exchange))
       end
-      @uniq_queue.subscribe do |check_json|
+      @check_queue.subscribe do |check_json|
         check = JSON.parse(check_json)
         execute_check(check)
       end
@@ -83,8 +83,8 @@ module Sensu
 
     def monitor_queues
       EM.add_periodic_timer(5) do
-        unless @uniq_queue.subscribed?
-          @uniq_queue.delete
+        unless @check_queue.subscribed?
+          @check_queue.delete
           EM.add_timer(1) do
             setup_subscriptions
           end

data/lib/sensu/config.rb

@@ -1,4 +1,5 @@
 require 'rubygems' if RUBY_VERSION < '1.9.0'
+require 'optparse'
 require 'json'
 require 'uuidtools'
 require 'amqp'
@@ -38,6 +39,26 @@ module Sensu
       end
     end
 
+    def self.read_arguments(arguments)
+      options = Hash.new
+      optparse = OptionParser.new do |opts|
+        opts.on('-h', '--help', 'Display this screen') do
+          puts opts
+          exit
+        end
+        options[:worker] = false
+        opts.on('-w', '--worker', 'Only consume jobs, no check publishing (default: false)') do
+          options[:worker] = true
+        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
+      end
+      optparse.parse!(arguments)
+      options
+    end
+
     def create_working_directory
       begin
         Dir.mkdir('/tmp/sensu')

data/lib/sensu/server.rb

@@ -3,7 +3,7 @@ require 'em-hiredis'
 
 module Sensu
   class Server
-    attr_accessor :redis
+    attr_accessor :redis, :is_worker
     alias :redis_connection :redis
 
     def self.run(options={})
@@ -15,8 +15,10 @@ module Sensu
         server.setup_keepalives
         server.setup_handlers
         server.setup_results
-        server.setup_publisher
-        server.setup_keepalive_monitor
+        unless server.is_worker
+          server.setup_publisher
+          server.setup_keepalive_monitor
+        end
         server.monitor_queues
 
         Signal.trap('INT') do
@@ -33,6 +35,7 @@ module Sensu
       config = Sensu::Config.new(:config_file => options[:config_file])
       config.create_working_directory
       @settings = config.settings
+      @is_worker = options[:worker]
     end
 
     def setup_logging
@@ -155,7 +158,6 @@ module Sensu
     end
 
     def setup_keepalive_monitor
-      result_queue = @amq.queue('results')
       EM.add_periodic_timer(30) do
         @redis.smembers('clients').callback do |clients|
           clients.each do |client_id|
@@ -166,15 +168,15 @@ module Sensu
               case
               when time_since_last_check >= 180
                 result['check'].merge!({'status' => 2, 'output' => 'No keep-alive sent from host in over 180 seconds'})
-                result_queue.publish(result.to_json)
+                @result_queue.publish(result.to_json)
               when time_since_last_check >= 120
                 result['check'].merge!({'status' => 1, 'output' => 'No keep-alive sent from host in over 120 seconds'})
-                result_queue.publish(result.to_json)
+                @result_queue.publish(result.to_json)
               else
                 @redis.hexists('events:' + client_id, 'keepalive').callback do |exists|
                   if exists == 1
                     result['check'].merge!({'status' => 0, 'output' => 'Keep-alive sent from host'})
-                    result_queue.publish(result.to_json)
+                    @result_queue.publish(result.to_json)
                   end
                 end
               end
@@ -187,16 +189,10 @@ module Sensu
     def monitor_queues
       EM.add_periodic_timer(5) do
         unless @keepalive_queue.subscribed?
-          @keepalive_queue.delete
-          EM.add_timer(1) do
-            setup_keepalives
-          end
+          setup_keepalives
         end
         unless @result_queue.subscribed?
-          @result_queue.delete
-          EM.add_timer(1) do
-            setup_results
-          end
+          setup_results
         end
       end
     end

data/sensu.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = "sensu"
-  s.version     = "0.5.12"
+  s.version     = "0.5.13"
   s.authors     = ["Sean Porter", "Justin Kolberg"]
   s.email       = ["sean.porter@sonian.net", "justin.kolberg@sonian.net"]
   s.homepage    = "https://github.com/sonian/sensu"

metadata

@@ -2,7 +2,7 @@
 name: sensu
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.5.12
+  version: 0.5.13
 platform: ruby
 authors: 
 - Sean Porter
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-19 00:00:00 Z
+date: 2011-09-22 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: amqp