sensu 0.9.3.beta.1 → 0.9.3.beta.2

data/lib/sensu/api.rb

@@ -54,7 +54,9 @@ module Sensu
           clients.each_with_index do |client, index|
             $redis.get('client:' + client).callback do |client_json|
               response.push(JSON.parse(client_json))
-              body response.to_json if index == clients.size - 1
+              if index == clients.size - 1
+                body response.to_json
+              end
             end
           end
         else
@@ -66,7 +68,9 @@ module Sensu
     aget '/client/:name' do |client|
       $logger.debug('[client] -- ' + request.ip + ' -- GET -- request for client -- ' + client)
       $redis.get('client:' + client).callback do |client_json|
-        status 404 if client_json.nil?
+        if client_json.nil?
+          status 404
+        end
         body client_json
       end
     end
@@ -77,6 +81,7 @@ module Sensu
         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,
                 :issued => Time.now.to_i,
@@ -86,7 +91,9 @@ module Sensu
               }
               $amq.queue('results').publish({:client => client, :check => check}.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)
@@ -119,6 +126,26 @@ module Sensu
       end
     end
 
+    apost '/check/request' do
+      $logger.debug('[check] -- ' + request.ip + ' -- POST -- request to publish a check request')
+      begin
+        post_body = Hashie::Mash.new(JSON.parse(request.body.read))
+      rescue JSON::ParserError
+        status 400
+        body nil
+      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)
+        end
+        status 201
+      else
+        status 400
+      end
+      body nil
+    end
+
     aget '/events' do
       $logger.debug('[events] -- ' + request.ip + ' -- GET -- request for event list')
       response = Hash.new
@@ -129,8 +156,12 @@ module Sensu
               events.each do |key, value|
                 events[key] = JSON.parse(value)
               end
-              response[client] = events unless events.empty?
-              body response.to_json if index == clients.size - 1
+              unless events.empty?
+                response[client] = events
+              end
+              if index == clients.size - 1
+                body response.to_json
+              end
             end
           end
         else
@@ -142,31 +173,34 @@ module Sensu
     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 = events[check]
-        status 404 if event.nil?
-        body event
+        event_json = events[check]
+        if event_json.nil?
+          status 404
+        end
+        body event_json
       end
     end
 
     apost '/event/resolve' do
       $logger.debug('[event] -- ' + request.ip + ' -- POST -- request to resolve event')
       begin
-        event = JSON.parse(request.body.read)
+        post_body = Hashie::Mash.new(JSON.parse(request.body.read))
       rescue JSON::ParserError
         status 400
         body nil
       end
-      if event.has_key?('client') && event.has_key?('check')
-        $redis.hgetall('events:' + event['client']).callback do |events|
-          if events.has_key?(event['check'])
+      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 => event['check'],
+              :name => post_body.check,
               :issued => Time.now.to_i,
               :status => 0,
               :output => 'Resolving on request of the API',
               :force_resolve => true
             }
-            $amq.queue('results').publish({:client => event['client'], :check => check}.to_json)
+            $amq.queue('results').publish({:client => post_body.client, :check => check}.to_json)
             status 201
           else
             status 404
@@ -182,12 +216,12 @@ module Sensu
     apost '/stash/*' do |path|
       $logger.debug('[stash] -- ' + request.ip + ' -- POST -- request for stash -- ' + path)
       begin
-        stash = JSON.parse(request.body.read)
+        post_body = JSON.parse(request.body.read)
       rescue JSON::ParserError
         status 400
         body nil
       end
-      $redis.set('stash:' + path, stash.to_json).callback do
+      $redis.set('stash:' + path, post_body.to_json).callback do
         $redis.sadd('stashes', path).callback do
           status 201
           body nil
@@ -197,16 +231,18 @@ module Sensu
 
     aget '/stash/*' do |path|
       $logger.debug('[stash] -- ' + request.ip + ' -- GET -- request for stash -- ' + path)
-      $redis.get('stash:' + path).callback do |stash|
-        status 404 if stash.nil?
-        body stash
+      $redis.get('stash:' + path).callback do |stash_json|
+        if stash_json.nil?
+          status 404
+        end
+        body stash_json
       end
     end
 
     adelete '/stash/*' do |path|
       $logger.debug('[stash] -- ' + request.ip + ' -- DELETE -- request for stash -- ' + path)
-      $redis.exists('stash:' + path).callback do |stash_exist|
-        if stash_exist
+      $redis.exists('stash:' + path).callback do |stash_exists|
+        if stash_exists
           $redis.srem('stashes', path).callback do
             $redis.del('stash:' + path).callback do
               status 204
@@ -230,17 +266,21 @@ module Sensu
     apost '/stashes' do
       $logger.debug('[stashes] -- ' + request.ip + ' -- POST -- request for multiple stashes')
       begin
-        paths = JSON.parse(request.body.read)
+        post_body = JSON.parse(request.body.read)
       rescue JSON::ParserError
         status 400
         body nil
       end
       response = Hash.new
-      if paths.is_a?(Array) && paths.size > 0
-        paths.each_with_index do |path, index|
-          $redis.get('stash:' + path).callback do |stash|
-            response[path] = JSON.parse(stash) unless stash.nil?
-            body response.to_json if index == paths.size - 1
+      if post_body.is_a?(Array) && post_body.size > 0
+        post_body.each_with_index do |path, index|
+          $redis.get('stash:' + path).callback do |stash_json|
+            unless stash_json.nil?
+              response[path] = JSON.parse(stash_json)
+            end
+            if index == post_body.size - 1
+              body response.to_json
+            end
           end
         end
       else
@@ -249,20 +289,22 @@ module Sensu
       end
     end
 
-    def self.setup_test_scaffolding(options={})
+    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', {
             :status => 2,
-            :output => 'CRITICAL',
+            :output => "CRITICAL\n",
+            :issued => Time.now.utc.iso8601,
             :flapping => false,
             :occurrences => 1
           }.to_json).callback do
             $redis.set('stash:test/test', '{"key": "value"}').callback do
               Thin::Logging.silent = true
               Thin::Server.start(self, $settings.api.port)
+              block.call
             end
           end
         end

data/lib/sensu/client.rb

@@ -10,7 +10,7 @@ module Sensu
       if options[:pid_file]
         Process.write_pid(options[:pid_file])
       end
-      EM::threadpool_size = 16
+      EM::threadpool_size = 14
       EM::run do
         client.setup_amqp
         client.setup_keepalives
@@ -86,9 +86,15 @@ module Sensu
           if unmatched_tokens.empty?
             execute = proc do
               Bundler.with_clean_env do
-                IO.popen(command + ' 2>&1') do |io|
-                  check.output = io.read
+                started = Time.now.to_f
+                begin
+                  IO.popen(command + ' 2>&1') do |io|
+                    check.output = io.read
+                  end
+                rescue => error
+                  check.output = 'unexpected error: ' + error.to_s
                 end
+                check.duration = ('%.3f' % (Time.now.to_f - started)).to_f
               end
               check.status = $?.exitstatus
             end
@@ -218,6 +224,7 @@ module Sensu
           validates = %w[name output].all? do |key|
             check[key].is_a?(String)
           end
+          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(' -- '))

data/lib/sensu/config.rb

@@ -1,17 +1,22 @@
 require File.join(File.dirname(__FILE__), 'patches', 'ruby')
 
-require 'rubygems' if RUBY_VERSION < '1.9.0'
+require 'rubygems'
 require 'bundler'
 require 'bundler/setup'
 
 gem 'eventmachine', '~> 1.0.0.beta.4'
 
 require 'optparse'
+require 'time'
 require 'json'
 require 'hashie'
 require 'amqp'
 require 'cabin'
-require 'cabin/outputs/em-stdlib-logger'
+require 'cabin/outputs/em/stdlib-logger'
+
+if ENV['RBTRACE']
+  require 'rbtrace'
+end
 
 module Sensu
   class Config
@@ -44,7 +49,7 @@ module Sensu
       end
       @logger = Cabin::Channel.new
       log_output = File.basename($0) == 'rake' ? '/tmp/sensu_test.log' : STDOUT
-      @logger.subscribe(Cabin::Outputs::EmStdlibLogger.new(Logger.new(log_output)))
+      @logger.subscribe(Cabin::Outputs::EM::StdlibLogger.new(Logger.new(log_output)))
       @logger.level = @options[:verbose] ? :debug : :info
       if Signal.list.include?('USR1')
         Signal.trap('USR1') do
@@ -93,7 +98,7 @@ module Sensu
         unless details['type'].is_a?(String)
           invalid_config('missing type for handler ' + name)
         end
-        case details['type']
+        case details.type
         when 'pipe'
           unless details.command.is_a?(String)
             invalid_config('missing command for pipe handler ' + name)
@@ -176,7 +181,7 @@ module Sensu
               invalid_config('configuration snippet file (' + snippet_file + ') must be valid JSON: ' + error.to_s)
             end
             merged_settings = @settings.to_hash.deep_merge(snippet_hash)
-            @logger.warn('[settings] configuration snippet (' + snippet_file + ') applied changes: ' + @settings.deep_diff(merged_settings).to_json)
+            @logger.warn('[settings] -- configuration snippet (' + snippet_file + ') applied changes: ' + @settings.deep_diff(merged_settings).to_json)
             @settings = Hashie::Mash.new(merged_settings)
           else
             invalid_config('configuration snippet file is not readable: ' + snippet_file)

data/lib/sensu/server.rb

@@ -16,7 +16,7 @@ module Sensu
       if options[:pid_file]
         Process.write_pid(options[:pid_file])
       end
-      EM::threadpool_size = 16
+      EM::threadpool_size = 14
       EM::run do
         server.setup_redis
         server.setup_amqp
@@ -74,7 +74,7 @@ module Sensu
         ['default']
       end
       handlers.map! do |handler|
-        @settings.handlers[handler]['type'] == 'set' ? @settings.handlers[handler].handlers : handler
+        @settings.handlers[handler].type == 'set' ? @settings.handlers[handler].handlers : handler
       end
       handlers.flatten!
       handlers.uniq!
@@ -89,7 +89,7 @@ module Sensu
           @logger.debug('[event] -- handling event -- ' + [handler, event.client.name, event.check.name].join(' -- '))
           @handlers_in_progress += 1
           details = @settings.handlers[handler]
-          case details['type']
+          case details.type
           when 'pipe'
             execute = proc do
               Bundler.with_clean_env do
@@ -99,15 +99,19 @@ module Sensu
                     io.close_write
                     io.read
                   end
+                rescue Errno::ENOENT => error
+                  handler + ' -- does not exist: ' + error.to_s
                 rescue Errno::EPIPE => error
                   handler + ' -- broken pipe: ' + error.to_s
+                rescue => error
+                  handler + ' -- unexpected error: ' + error.to_s
                 end
               end
             end
             EM::defer(execute, report)
           when 'amqp'
             exchange = details.exchange.name
-            exchange_type = details.exchange.key?('type') ? details.exchange['type'].to_sym : :direct
+            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 rabbitmq exchange -- ' + [exchange, event.client.name, event.check.name].join(' -- '))
             payload = details.send_only_check_output ? event.check.output : event.to_json
@@ -174,10 +178,11 @@ module Sensu
                   @redis.hset('events:' + client.name, check.name, {
                     :status => check.status,
                     :output => check.output,
+                    :issued => Time.at(check.issued).utc.iso8601,
                     :flapping => is_flapping,
                     :occurrences => event.occurrences
                   }.to_json).callback do
-                    unless check.internal || check.handle == false
+                    unless check.handle == false
                       event.check.flapping = is_flapping
                       event.action = 'create'
                       handle_event(event)
@@ -189,7 +194,7 @@ module Sensu
                   unless is_flapping
                     unless check.auto_resolve == false && !check.force_resolve
                       @redis.hdel('events:' + client.name, check.name).callback do
-                        unless check.internal || check.handle == false
+                        unless check.handle == false
                           event.action = 'resolve'
                           handle_event(event)
                         else
@@ -200,13 +205,13 @@ module Sensu
                   else
                     @logger.debug('[result] -- check is flapping -- ' + [client.name, check.name, check.status].join(' -- '))
                     @redis.hset('events:' + client.name, check.name, previous_occurrence.merge(:flapping => true).to_json).callback do
-                      if check['type'] == 'metric'
+                      if check.type == 'metric'
                         event.check.flapping = is_flapping
                         handle_event(event)
                       end
                     end
                   end
-                elsif check['type'] == 'metric'
+                elsif check.type == 'metric'
                   handle_event(event)
                 end
               end

data/lib/sensu.rb

@@ -1,3 +1,3 @@
 module Sensu
-  VERSION = "0.9.3.beta.1"
+  VERSION = "0.9.3.beta.2"
 end

data/sensu.gemspec

@@ -16,8 +16,8 @@ Gem::Specification.new do |s|
   s.add_dependency("eventmachine", "~> 1.0.0.beta.4")
   s.add_dependency("amqp", "0.7.4")
   s.add_dependency("json")
-  s.add_dependency("hashie")
-  s.add_dependency("cabin", "0.1.7")
+  s.add_dependency("hashie", "~> 1.2.0")
+  s.add_dependency("cabin", "0.1.8")
   s.add_dependency("ruby-redis")
   s.add_dependency("rack", "~> 1.3.4")
   s.add_dependency("async_sinatra")
@@ -26,6 +26,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency("rake")
   s.add_development_dependency("em-spec")
   s.add_development_dependency("em-http-request")
+  s.add_development_dependency("rbtrace")
 
   s.files         = Dir.glob("{bin,lib}/**/*") + %w[sensu.gemspec README.org MIT-LICENSE.txt]
   s.executables   = Dir.glob("bin/**/*").map { |file| File.basename(file) }

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: sensu
 version: !ruby/object:Gem::Version 
-  hash: 62196265
+  hash: 62196271
   prerelease: true
   segments: 
   - 0
   - 9
   - 3
   - beta
-  - 1
-  version: 0.9.3.beta.1
+  - 2
+  version: 0.9.3.beta.2
 platform: ruby
 authors: 
 - Sean Porter
@@ -18,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-12 00:00:00 -08:00
+date: 2012-01-17 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -89,12 +89,14 @@ dependencies:
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 31
         segments: 
+        - 1
+        - 2
         - 0
-        version: "0"
+        version: 1.2.0
   type: :runtime
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
@@ -105,12 +107,12 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 21
+        hash: 11
         segments: 
         - 0
         - 1
-        - 7
-        version: 0.1.7
+        - 8
+        version: 0.1.8
   type: :runtime
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
@@ -213,6 +215,20 @@ dependencies:
         version: "0"
   type: :development
   version_requirements: *id013
+- !ruby/object:Gem::Dependency 
+  name: rbtrace
+  prerelease: false
+  requirement: &id014 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id014
 description: A monitoring framework that aims to be simple, malleable, and scalable. Uses the publish/subscribe model.
 email: 
 - sean.porter@sonian.net