sensu 0.9.4 → 0.9.5.beta

data/README.org

@@ -6,13 +6,11 @@
   [[http://portertech.ca/2011/11/01/sensu-a-monitoring-framework][Blog post]]
 
   [[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]]

data/lib/sensu.rb

@@ -1,3 +1,3 @@
 module Sensu
-  VERSION = "0.9.4"
+  VERSION = "0.9.5.beta"
 end

data/lib/sensu/api.rb

@@ -46,6 +46,16 @@ module Sensu
       content_type 'application/json'
     end
 
+    aget '/info' do
+      $logger.debug('[info] -- ' + request.ip + ' -- GET -- request for sensu info')
+      response = {
+        :sensu => {
+          :version => Sensu::VERSION
+        }
+      }
+      body response.to_json
+    end
+
     aget '/clients' do
       $logger.debug('[clients] -- ' + request.ip + ' -- GET -- request for client list')
       response = Array.new
@@ -86,9 +96,9 @@ module Sensu
               $logger.info('[client] -- publishing check result to resolve event -- ' + client + ' -- ' + check_name)
               check = {
                 :name => check_name,
-                :issued => Time.now.to_i,
-                :status => 0,
                 :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)
@@ -150,16 +160,13 @@ module Sensu
 
     aget '/events' do
       $logger.debug('[events] -- ' + request.ip + ' -- GET -- request for event list')
-      response = Hash.new
+      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 |key, value|
-                events[key] = JSON.parse(value)
-              end
-              unless events.empty?
-                response[client] = events
+              events.each do |check, details|
+                response.push(JSON.parse(details).merge(:client => client, :check => check))
               end
               if index == clients.size - 1
                 body response.to_json
@@ -176,10 +183,13 @@ module Sensu
       $logger.debug('[event] -- ' + request.ip + ' -- GET -- request for event -- ' + client + ' -- ' + check)
       $redis.hgetall('events:' + client).callback do |events|
         event_json = events[check]
-        if event_json.nil?
+        unless event_json.nil?
+          response = JSON.parse(event_json).merge(:client => client, :check => check)
+          body response.to_json
+        else
           status 404
+          body ''
         end
-        body event_json
       end
     end
 
@@ -197,9 +207,9 @@ module Sensu
             $logger.info('[event] -- publishing check result to resolve event -- ' + post_body.client + ' -- ' + post_body.check)
             check = {
               :name => post_body.check,
-              :issued => Time.now.to_i,
-              :status => 0,
               :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)
@@ -297,8 +307,8 @@ module Sensu
       $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', {
-            :status => 2,
             :output => "CRITICAL\n",
+            :status => 2,
             :issued => Time.now.utc.iso8601,
             :flapping => false,
             :occurrences => 1

data/lib/sensu/client.rb

@@ -56,7 +56,7 @@ module Sensu
     end
 
     def publish_result(check)
-      @logger.info('[result] -- publishing check result -- ' + [check.name, check.status, check.output].join(' -- '))
+      @logger.info('[result] -- publishing check result -- ' + [check.name, check.status, check.output.gsub(/\n/, '\n')].join(' -- '))
       @amq.queue('results').publish({
         :client => @settings.client.name,
         :check => check.to_hash
@@ -91,12 +91,14 @@ module Sensu
                   IO.popen(command + ' 2>&1') do |io|
                     check.output = io.read
                   end
+                  check.status = $?.exitstatus
                 rescue => error
-                  check.output = 'unexpected error: ' + error.to_s
+                  @logger.warn('[execute] -- unexpected error: ' + error.to_s)
+                  check.output = 'Unexpected error: ' + error.to_s
+                  check.status = 2
                 end
                 check.duration = ('%.3f' % (Time.now.to_f - started)).to_f
               end
-              check.status = $?.exitstatus
             end
             publish = proc do
               unless check.status.nil?
@@ -109,8 +111,8 @@ module Sensu
             EM::defer(execute, publish)
           else
             @logger.warn('[execute] -- missing client attributes -- ' + unmatched_tokens.join(', ') + ' -- ' + check.name)
-            check.status = 3
             check.output = 'Missing client attributes: ' + unmatched_tokens.join(', ')
+            check.status = 3
             check.handle = false
             publish_result(check)
             @checks_in_progress.delete(check.name)
@@ -120,8 +122,8 @@ module Sensu
         end
       else
         @logger.warn('[execute] -- unkown check -- ' + check.name)
-        check.status = 3
         check.output = 'Unknown check'
+        check.status = 3
         check.handle = false
         publish_result(check)
         @checks_in_progress.delete(check.name)
@@ -137,9 +139,17 @@ module Sensu
         @check_request_queue.bind(@amq.fanout(exchange))
       end
       @check_request_queue.subscribe do |check_request_json|
-        check = Hashie::Mash.new(JSON.parse(check_request_json))
-        @logger.info('[subscribe] -- received check request -- ' + check.name)
-        execute_check(check)
+        begin
+          check = Hashie::Mash.new(JSON.parse(check_request_json))
+          if check.name.is_a?(String) && check.issued.is_a?(Integer)
+            @logger.info('[subscribe] -- received check request -- ' + check.name)
+            execute_check(check)
+          else
+            @logger.warn('[subscribe] -- invalid check request: ' + check_request_json)
+          end
+        rescue JSON::ParserError => error
+          @logger.warn('[subscribe] -- check request must be valid JSON: ' + error.to_s)
+        end
       end
     end
 
@@ -229,7 +239,7 @@ module Sensu
           check.issued = Time.now.to_i
           check.status ||= 0
           if validates && check.status.is_a?(Integer)
-            @logger.info('[socket] -- publishing check result -- ' + [check.name, check.status, check.output].join(' -- '))
+            @logger.info('[socket] -- publishing check result -- ' + [check.name, check.status, check.output.gsub(/\n/, '\n')].join(' -- '))
             @amq.queue('results').publish({
               :client => @settings.client.name,
               :check => check.to_hash

data/lib/sensu/config.rb

@@ -12,6 +12,7 @@ require 'amqp'
 require 'cabin'
 require 'cabin/outputs/em/stdlib-logger'
 
+require File.join(File.dirname(__FILE__), '..', 'sensu')
 require File.join(File.dirname(__FILE__), 'patches', 'ruby')
 require File.join(File.dirname(__FILE__), 'patches', 'amqp')
 
@@ -49,7 +50,7 @@ module Sensu
         end
       end
       @logger = Cabin::Channel.new
-      log_output = File.basename($0) == 'rake' ? '/tmp/sensu_test.log' : STDOUT
+      log_output = File.basename($0) == 'rake' ? '/tmp/sensu-test.log' : STDOUT
       @logger.subscribe(Cabin::Outputs::EM::StdlibLogger.new(Logger.new(log_output)))
       @logger.level = @options[:verbose] ? :debug : :info
       if Signal.list.include?('USR1')
@@ -62,7 +63,7 @@ module Sensu
     def validate_common_settings
       @settings.checks.each do |name, details|
         if details.key?('status') || details.key?('output')
-          invalid_config('reserved key (status or output) defined in check ' + name)
+          invalid_config('reserved key (output or status) defined in check ' + name)
         end
         unless details.interval.is_a?(Integer) && details.interval > 0
           invalid_config('missing interval for check ' + name)

data/lib/sensu/patches/redis.rb

@@ -29,6 +29,13 @@ module Redis
   def self.connect(options={})
     host = options[:host] || 'localhost'
     port = options[:port] || 6379
-    EM::connect(host, port, Redis::Client)
+    redis = EM::connect(host, port, Redis::Client)
+    redis.info do |info|
+      redis_version = info.split(/\n/).first.split(/:/).last
+      unless redis_version.to_i >= 2
+        raise "redis version must be >= 2.0"
+      end
+    end
+    redis
   end
 end

data/lib/sensu/server.rb

@@ -178,8 +178,8 @@ module Sensu
                     event.occurrences = previous_occurrence.occurrences += 1
                   end
                   @redis.hset('events:' + client.name, check.name, {
-                    :status => check.status,
                     :output => check.output,
+                    :status => check.status,
                     :issued => Time.at(check.issued).utc.iso8601,
                     :flapping => is_flapping,
                     :occurrences => event.occurrences
@@ -228,7 +228,7 @@ 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, result.check.status, result.check.output].join(' -- '))
+        @logger.info('[result] -- received result -- ' + [result.client, result.check.name, result.check.status, result.check.output.gsub(/\n/, '\n')].join(' -- '))
         process_result(result)
       end
     end
@@ -239,7 +239,7 @@ module Sensu
       @settings.checks.each_with_index do |(name, details), index|
         check_request = Hashie::Mash.new(:name => name)
         unless details.publish == false || details.standalone
-          @timers << EM::Timer.new(stagger*index) do
+          @timers << EM::Timer.new(stagger * index) do
             details.subscribers.each do |exchange|
               interval = options[:test] ? 0.5 : details.interval
               @timers << EM::PeriodicTimer.new(interval) do
@@ -271,18 +271,18 @@ module Sensu
               )
               case
               when time_since_last_keepalive >= 180
-                result.check.status = 2
                 result.check.output = 'No keep-alive sent from host in over 180 seconds'
+                result.check.status = 2
                 @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.check.status = 1
                 @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.check.status = 0
                     @amq.queue('results').publish(result.to_json)
                   end
                 end

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: sensu
 version: !ruby/object:Gem::Version 
-  hash: 51
-  prerelease: false
+  hash: 31098141
+  prerelease: true
   segments: 
   - 0
   - 9
-  - 4
-  version: 0.9.4
+  - 5
+  - beta
+  version: 0.9.5.beta
 platform: ruby
 authors: 
 - Sean Porter
@@ -16,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-02-24 00:00:00 -08:00
+date: 2012-03-05 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -245,12 +246,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: