sensu 0.9.5 → 0.9.6.beta

data/README.org

@@ -1,46 +1,12 @@
-* Welcome to Sensu
-  Sensu, a monitoring framework that aims to be simple, malleable, and scalable.
+* Sensu
+  A monitoring framework that aims to be simple, malleable, and scalable.
 
-  [[https://github.com/sonian/sensu/raw/master/sensu-logo.png]]
+  [[https://github.com/sensu/sensu/raw/master/sensu-logo.png]]
 
-  [[http://portertech.ca/2011/11/01/sensu-a-monitoring-framework][Blog post]]
+  [[https://secure.travis-ci.org/sensu/sensu.png]]
 
-  [[http://www.sonian.com/cloud-tools/cloud-monitoring-sensu/][Homepage]]
-* Documentation
-  - [[https://github.com/sonian/sensu/wiki][Sensu Wiki]].
-  - [[http://joemiller.me/2012/01/19/getting-started-with-the-sensu-monitoring-framework/][Getting Started]]
-  - [[http://joemiller.me/2012/01/24/re-use-nagios-plugins-in-sensu-for-quick-profit/][How to reuse your existing Nagios plugins]]
-  - [[http://joemiller.me/2012/02/02/sensu-and-graphite/][Sensu and Graphite]]
-* Other Projects
-  - [[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
+  [[https://gemnasium.com/portertech/sensu.png]]
+** Documentation
+  Please refer to the [[https://github.com/sensu/sensu/wiki][Sensu Wiki]].
+** 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]] 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
-*** Travis CI
-  [[https://secure.travis-ci.org/sonian/sensu.png]]
-*** System Dependencies
-  - Ruby (MRI) & Rubygems
-  - RabbitMQ
-  - Redis
-*** Running
-  : bundle install
-  : rake
-* Contributors
-  - [[http://twitter.com/portertech][Sean Porter]]
-  - [[http://twitter.com/amdprophet][Justin Kolberg]]
-  - [[http://twitter.com/kartar][James Turnbull]]
-  - [[http://twitter.com/joshpasqualetto][Josh Pasqualetto]]
-  - [[http://github.com/lum][Steve Lum]]
-  - [[http://twitter.com/miller_joe][Joe Miller]]
-  - [[http://twitter.com/decklin][Decklin Foster]]
-  - [[http://twitter.com/ohlol][Scott Smith]]
-  - [[http://twitter.com/webframp][Sean Escriva]]
-  - [[http://twitter.com/fujin_][AJ Christensen]]

data/bin/sensu-api

@@ -1,7 +1,10 @@
 #!/usr/bin/env ruby
 
-$: << File.dirname(__FILE__) + '/../lib' unless $:.include?(File.dirname(__FILE__) + '/../lib/')
+unless $:.include?(File.dirname(__FILE__) + '/../lib/')
+  $: << File.dirname(__FILE__) + '/../lib'
+end
+
 require 'sensu/api'
 
-options = Sensu::Config.read_arguments(ARGV)
+options = Sensu::CLI.read
 Sensu::API.run(options)

data/bin/sensu-client

@@ -1,7 +1,10 @@
 #!/usr/bin/env ruby
 
-$: << File.dirname(__FILE__) + '/../lib' unless $:.include?(File.dirname(__FILE__) + '/../lib/')
+unless $:.include?(File.dirname(__FILE__) + '/../lib/')
+  $: << File.dirname(__FILE__) + '/../lib'
+end
+
 require 'sensu/client'
 
-options = Sensu::Config.read_arguments(ARGV)
+options = Sensu::CLI.read
 Sensu::Client.run(options)

data/bin/sensu-server

@@ -1,7 +1,10 @@
 #!/usr/bin/env ruby
 
-$: << File.dirname(__FILE__) + '/../lib' unless $:.include?(File.dirname(__FILE__) + '/../lib/')
+unless $:.include?(File.dirname(__FILE__) + '/../lib/')
+  $: << File.dirname(__FILE__) + '/../lib'
+end
+
 require 'sensu/server'
 
-options = Sensu::Config.read_arguments(ARGV)
+options = Sensu::CLI.read
 Sensu::Server.run(options)

data/lib/sensu/api.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), 'config')
+require File.join(File.dirname(__FILE__), 'base')
 
 require 'thin'
 require 'sinatra/async'
@@ -15,7 +15,7 @@ module Sensu
         self.setup(options)
 
         Thin::Logging.silent = true
-        Thin::Server.start(self, $settings.api.port)
+        Thin::Server.start(self, $settings[:api][:port])
 
         %w[INT TERM].each do |signal|
           Signal.trap(signal) do
@@ -26,27 +26,36 @@ module Sensu
     end
 
     def self.setup(options={})
-      config = Sensu::Config.new(options)
-      $logger = config.logger
-      $settings = config.settings
-      if options[:daemonize]
-        Process.daemonize
-      end
-      if options[:pid_file]
-        Process.write_pid(options[:pid_file])
-      end
-      $logger.debug('[setup] -- connecting to redis')
-      $redis = Redis.connect($settings.redis.to_hash.symbolize_keys)
-      $logger.debug('[setup] -- connecting to rabbitmq')
-      $rabbitmq = AMQP.connect($settings.rabbitmq.to_hash.symbolize_keys)
+      base = Sensu::Base.new(options)
+      $logger = base.logger
+      $settings = base.settings
+      $logger.debug('connecting to redis', {
+        :settings => $settings[:redis]
+      })
+      $redis = Redis.connect($settings[:redis])
+      $logger.debug('connecting to rabbitmq', {
+        :settings => $settings[:rabbitmq]
+      })
+      $rabbitmq = AMQP.connect($settings[:rabbitmq])
       $amq = AMQP::Channel.new($rabbitmq)
-      if $settings.api.user && $settings.api.password
+      if $settings[:api][:user] && $settings[:api][:password]
         use Rack::Auth::Basic do |user, password|
-          user == $settings.api.user && password == $settings.api.password
+          user == $settings[:api][:user] && password == $settings[:api][:password]
         end
       end
     end
 
+    def request_log(env)
+      $logger.info([env['REQUEST_METHOD'], env['REQUEST_PATH']].join(' '), {
+        :remote_address => env['REMOTE_ADDR'],
+        :user_agent => env['HTTP_USER_AGENT'],
+        :request_method => env['REQUEST_METHOD'],
+        :request_uri => env['REQUEST_URI'],
+        :request_body =>  env['rack.input'].read
+      })
+      env['rack.input'].rewind
+    end
+
     configure do
       disable :protection
     end
@@ -60,10 +69,10 @@ module Sensu
     end
 
     aget '/info' do
-      $logger.debug('[info] -- ' + request.ip + ' -- GET -- request for sensu info')
+      request_log(env)
       response = {
         :sensu => {
-          :version => Sensu::VERSION
+          :version => VERSION
         },
         :health => {
           :redis => 'ok',
@@ -80,12 +89,12 @@ module Sensu
     end
 
     aget '/clients' do
-      $logger.debug('[clients] -- ' + request.ip + ' -- GET -- request for client list')
+      request_log(env)
       response = Array.new
       $redis.smembers('clients').callback do |clients|
         unless clients.empty?
-          clients.each_with_index do |client, index|
-            $redis.get('client:' + client).callback do |client_json|
+          clients.each_with_index do |client_name, index|
+            $redis.get('client:' + client_name).callback do |client_json|
               response.push(JSON.parse(client_json))
               if index == clients.size - 1
                 body response.to_json
@@ -98,9 +107,9 @@ module Sensu
       end
     end
 
-    aget '/client/:name' do |client|
-      $logger.debug('[client] -- ' + request.ip + ' -- GET -- request for client -- ' + client)
-      $redis.get('client:' + client).callback do |client_json|
+    aget '/client/:name' do |client_name|
+      request_log(env)
+      $redis.get('client:' + client_name).callback do |client_json|
         unless client_json.nil?
           body client_json
         else
@@ -110,30 +119,37 @@ module Sensu
       end
     end
 
-    adelete '/client/:name' do |client|
-      $logger.debug('[client] -- ' + request.ip + ' -- DELETE -- request for client -- ' + client)
-      $redis.sismember('clients', client).callback do |client_exists|
-        if client_exists
-          $redis.hgetall('events:' + client).callback do |events|
-            events.keys.each do |check_name|
-              $logger.info('[client] -- publishing check result to resolve event -- ' + client + ' -- ' + check_name)
-              check = {
-                :name => check_name,
-                :output => 'Client is being removed on request of the API',
-                :status => 0,
-                :issued => Time.now.to_i,
-                :force_resolve => true
+    adelete '/client/:name' do |client_name|
+      request_log(env)
+      $redis.get('client:' + client_name).callback do |client_json|
+        unless client_json.nil?
+          client = JSON.parse(client_json, :symbolize_names => true)
+          $logger.info('deleting client', {
+            :client => client
+          })
+          $redis.hgetall('events:' + client_name).callback do |events|
+            events.each_key do |check_name|
+              payload = {
+                :client => client_name,
+                :check => {
+                  :name => check_name,
+                  :output => 'Client is being removed on request of the API',
+                  :status => 0,
+                  :issued => Time.now.to_i,
+                  :force_resolve => true
+                }
               }
-              $amq.queue('results').publish({:client => client, :check => check}.to_json)
+              $logger.info('publishing check result', {
+                :payload => payload
+              })
+              $amq.queue('results').publish(payload.to_json)
             end
-            $logger.info('[client] -- client will be deleted -- ' + client)
             EM::Timer.new(5) do
-              $logger.info('[client] -- deleting client -- ' + client)
-              $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)
+              $redis.srem('clients', client_name)
+              $redis.del('events:' + client_name)
+              $redis.del('client:' + client_name)
+              $settings[:checks].each_key do |check_name|
+                $redis.del('history:' + client_name + ':' + check_name)
               end
             end
             status 204
@@ -147,15 +163,14 @@ module Sensu
     end
 
     aget '/checks' do
-      $logger.debug('[checks] -- ' + request.ip + ' -- GET -- request for check list')
-      response = $settings.checks.map { |check, details| details.merge(:name => check) }
-      body response.to_json
+      request_log(env)
+      body $settings.checks.to_json
     end
 
-    aget '/check/:name' do |check|
-      $logger.debug('[check] -- ' + request.ip + ' -- GET -- request for check -- ' + check)
-      if $settings.checks.key?(check)
-        response = $settings.checks[check].merge(:name => check)
+    aget '/check/:name' do |check_name|
+      request_log(env)
+      if $settings.check_exists?(check_name)
+        response = $settings[:checks][check_name].merge(:name => check_name)
         body response.to_json
       else
         status 404
@@ -164,17 +179,24 @@ module Sensu
     end
 
     apost '/check/request' do
-      $logger.debug('[check] -- ' + request.ip + ' -- POST -- request to publish a check request')
+      request_log(env)
       begin
-        post_body = Hashie::Mash.new(JSON.parse(request.body.read))
+        post_body = JSON.parse(request.body.read, :symbolize_names => true)
       rescue JSON::ParserError
         status 400
         body ''
       end
-      if post_body.check.is_a?(String) && post_body.subscribers.is_a?(Array)
-        post_body.subscribers.each do |exchange|
-          $logger.info('[check] -- publishing check request -- ' + post_body.check + ' -- ' + exchange)
-          $amq.fanout(exchange).publish({:name => post_body.check, :issued => Time.now.to_i}.to_json)
+      if post_body[:check].is_a?(String) && post_body[:subscribers].is_a?(Array)
+        payload = {
+          :name => post_body[:check],
+          :issued => Time.now.to_i
+        }
+        $logger.info('publishing check request', {
+          :payload => payload,
+          :subscribers => post_body[:subscribers]
+        })
+        post_body[:subscribers].uniq.each do |exchange_name|
+          $amq.fanout(exchange_name).publish(payload.to_json)
         end
         status 201
       else
@@ -184,14 +206,14 @@ module Sensu
     end
 
     aget '/events' do
-      $logger.debug('[events] -- ' + request.ip + ' -- GET -- request for event list')
+      request_log(env)
       response = Array.new
       $redis.smembers('clients').callback do |clients|
         unless clients.empty?
-          clients.each_with_index do |client, index|
-            $redis.hgetall('events:' + client).callback do |events|
-              events.each do |check, details|
-                response.push(JSON.parse(details).merge(:client => client, :check => check))
+          clients.each_with_index do |client_name, index|
+            $redis.hgetall('events:' + client_name).callback do |events|
+              events.each do |check_name, event_json|
+                response.push(JSON.parse(event_json).merge(:client => client_name, :check => check_name))
               end
               if index == clients.size - 1
                 body response.to_json
@@ -204,12 +226,12 @@ module Sensu
       end
     end
 
-    aget '/event/:client/:check' do |client, check|
-      $logger.debug('[event] -- ' + request.ip + ' -- GET -- request for event -- ' + client + ' -- ' + check)
-      $redis.hgetall('events:' + client).callback do |events|
-        event_json = events[check]
+    aget '/event/:client/:check' do |client_name, check_name|
+      request_log(env)
+      $redis.hgetall('events:' + client_name).callback do |events|
+        event_json = events[check_name]
         unless event_json.nil?
-          response = JSON.parse(event_json).merge(:client => client, :check => check)
+          response = JSON.parse(event_json).merge(:client => client_name, :check => check_name)
           body response.to_json
         else
           status 404
@@ -219,25 +241,30 @@ module Sensu
     end
 
     apost '/event/resolve' do
-      $logger.debug('[event] -- ' + request.ip + ' -- POST -- request to resolve event')
+      request_log(env)
       begin
-        post_body = Hashie::Mash.new(JSON.parse(request.body.read))
+        post_body = JSON.parse(request.body.read, :symbolize_names => true)
       rescue JSON::ParserError
         status 400
         body ''
       end
-      if post_body.client.is_a?(String) && post_body.check.is_a?(String)
-        $redis.hgetall('events:' + post_body.client).callback do |events|
-          if events.include?(post_body.check)
-            $logger.info('[event] -- publishing check result to resolve event -- ' + post_body.client + ' -- ' + post_body.check)
-            check = {
-              :name => post_body.check,
-              :output => 'Resolving on request of the API',
-              :status => 0,
-              :issued => Time.now.to_i,
-              :force_resolve => true
+      if post_body[:client].is_a?(String) && post_body[:check].is_a?(String)
+        $redis.hgetall('events:' + post_body[:client]).callback do |events|
+          if events.include?(post_body[:check])
+            payload = {
+              :client => post_body[:client],
+              :check => {
+                :name => post_body[:check],
+                :output => 'Resolving on request of the API',
+                :status => 0,
+                :issued => Time.now.to_i,
+                :force_resolve => true
+              }
             }
-            $amq.queue('results').publish({:client => post_body.client, :check => check}.to_json)
+            $logger.info('publishing check result', {
+              :payload => payload
+            })
+            $amq.queue('results').publish(payload.to_json)
             status 201
           else
             status 404
@@ -251,7 +278,7 @@ module Sensu
     end
 
     apost '/stash/*' do |path|
-      $logger.debug('[stash] -- ' + request.ip + ' -- POST -- request for stash -- ' + path)
+      request_log(env)
       begin
         post_body = JSON.parse(request.body.read)
       rescue JSON::ParserError
@@ -267,7 +294,7 @@ module Sensu
     end
 
     aget '/stash/*' do |path|
-      $logger.debug('[stash] -- ' + request.ip + ' -- GET -- request for stash -- ' + path)
+      request_log(env)
       $redis.get('stash:' + path).callback do |stash_json|
         if stash_json.nil?
           status 404
@@ -279,7 +306,7 @@ module Sensu
     end
 
     adelete '/stash/*' do |path|
-      $logger.debug('[stash] -- ' + request.ip + ' -- DELETE -- request for stash -- ' + path)
+      request_log(env)
       $redis.exists('stash:' + path).callback do |stash_exists|
         if stash_exists
           $redis.srem('stashes', path).callback do
@@ -296,14 +323,14 @@ module Sensu
     end
 
     aget '/stashes' do
-      $logger.debug('[stashes] -- ' + request.ip + ' -- GET -- request for list of stashes')
+      request_log(env)
       $redis.smembers('stashes') do |stashes|
         body stashes.to_json
       end
     end
 
     apost '/stashes' do
-      $logger.debug('[stashes] -- ' + request.ip + ' -- POST -- request for multiple stashes')
+      request_log(env)
       begin
         post_body = JSON.parse(request.body.read)
       rescue JSON::ParserError
@@ -330,20 +357,20 @@ module Sensu
 
     def self.run_test(options={}, &block)
       self.setup(options)
-      $settings.client.timestamp = Time.now.to_i
-      $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', {
+      $settings[:client][:timestamp] = Time.now.to_i
+      $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', {
             :output => "CRITICAL\n",
             :status => 2,
-            :issued => Time.now.utc.iso8601,
+            :issued => Time.now.to_i,
             :flapping => false,
             :occurrences => 1
           }.to_json).callback do
             $redis.set('stash:test/test', '{"key": "value"}').callback do
               $redis.sadd('stashes', 'test/test').callback do
                 Thin::Logging.silent = true
-                Thin::Server.start(self, $settings.api.port)
+                Thin::Server.start(self, $settings[:api][:port])
                 block.call
               end
             end
@@ -353,8 +380,11 @@ module Sensu
     end
 
     def self.stop(signal)
-      $logger.warn('[stop] -- stopping sensu api -- ' + signal)
-      $logger.warn('[stop] -- stopping reactor')
+      $logger.warn('received signal', {
+        :signal => signal
+      })
+      $logger.warn('stopping')
+      $logger.warn('stopping reactor')
       EM::PeriodicTimer.new(0.25) do
         EM::stop_event_loop
       end