sensu 0.9.2 → 0.9.3.beta

data/lib/sensu.rb

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

data/lib/sensu/client.rb

@@ -10,6 +10,7 @@ module Sensu
       if options[:pid_file]
         Process.write_pid(options[:pid_file])
       end
+      EM::threadpool_size = 16
       EM::run do
         client.setup_amqp
         client.setup_keepalives
@@ -150,13 +151,13 @@ module Sensu
 
     def setup_standalone(options={})
       @logger.debug('[standalone] -- setup standalone')
-      standalone_count = 0
+      standalone_check_count = 0
       @settings.checks.each do |name, details|
         if details.standalone
-          standalone_count += 1
-          check = Hashie::Mash.new(details.merge({:name => name}))
+          standalone_check_count += 1
+          check = Hashie::Mash.new(details.merge(:name => name))
           stagger = options[:test] ? 0 : 7
-          @timers << EM::Timer.new(stagger*standalone_count) do
+          @timers << EM::Timer.new(stagger*standalone_check_count) do
             interval = options[:test] ? 0.5 : details.interval
             @timers << EM::PeriodicTimer.new(interval) do
               check.issued = Time.now.to_i
@@ -207,29 +208,33 @@ module Sensu
     attr_accessor :settings, :logger, :amq
 
     def receive_data(data)
-      @logger.debug('[socket] -- new connection -- received data from external source')
-      begin
-        check = Hashie::Mash.new(JSON.parse(data))
-        validates = %w[name status output].all? do |key|
-          check.key?(key)
-        end
-        if validates
-          @logger.info('[socket] -- publishing check result -- ' + check.name)
-          @amq.queue('results').publish({
-            :client => @settings.client.name,
-            :check => check.to_hash
-          }.to_json)
-        else
-          @logger.warn('[socket] -- a check name, exit status, and output are required -- e.g. {"name": "x", "status": 0, "output": "y"}')
+      if data == 'ping'
+        @logger.debug('[socket] -- received ping')
+        send_data('pong')
+      else
+        @logger.debug('[socket] -- received data -- ' + data)
+        begin
+          check = Hashie::Mash.new(JSON.parse(data))
+          validates = %w[name output].all? do |key|
+            check[key].is_a?(String)
+          end
+          check.status ||= 0
+          if validates && check.status.is_a?(Integer)
+            @logger.info('[socket] -- publishing check result -- ' + [check.name, check.status, check.output].join(' -- '))
+            @amq.queue('results').publish({
+              :client => @settings.client.name,
+              :check => check.to_hash
+            }.to_json)
+            send_data('ok')
+          else
+            @logger.warn('[socket] -- check name and output must be strings, status defaults to 0 -- e.g. {"name": "x", "output": "y"}')
+            send_data('invalid')
+          end
+        rescue JSON::ParserError => error
+          @logger.warn('[socket] -- check result must be valid JSON: ' + error.to_s)
+          send_data('invalid')
         end
-      rescue JSON::ParserError => error
-        @logger.warn('[socket] -- check result must be valid JSON: ' + error.to_s)
       end
-      close_connection
-    end
-
-    def unbind
-      @logger.debug('[socket] -- connection closed')
     end
   end
 end

data/lib/sensu/config.rb

@@ -55,6 +55,9 @@ 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)
+        end
         unless details.interval.is_a?(Integer) && details.interval > 0
           invalid_config('missing interval for check ' + name)
         end

data/lib/sensu/patches/ruby.rb

@@ -1,3 +1,9 @@
+class Array
+  def deep_merge(other_array, &merger)
+    concat(other_array).uniq
+  end
+end
+
 class Hash
   def symbolize_keys(item=self)
     case item
@@ -31,17 +37,11 @@ class Hash
     end
   end
 
-  def deep_merge(hash)
-    merger = proc do |key, value1, value2|
-      if value1.is_a?(Hash) && value2.is_a?(Hash)
-        value1.merge(value2, &merger)
-      elsif value1.is_a?(Array) && value2.is_a?(Array)
-        value1.concat(value2).uniq
-      else
-        value2
-      end
+  def deep_merge(other_hash, &merger)
+    merger ||= proc do |key, oldval, newval|
+      oldval.deep_merge(newval, &merger) rescue newval
     end
-    self.merge(hash, &merger)
+    merge(other_hash, &merger)
   end
 end
 

data/lib/sensu/server.rb

@@ -91,22 +91,20 @@ module Sensu
           details = @settings.handlers[handler]
           case details['type']
           when 'pipe'
-            handle = proc do
-              output = ''
+            execute = proc do
               Bundler.with_clean_env do
                 begin
                   IO.popen(details.command + ' 2>&1', 'r+') do |io|
                     io.write(event.to_json)
                     io.close_write
-                    output = io.read
+                    io.read
                   end
                 rescue Errno::EPIPE => error
-                  output = handler + ' -- broken pipe: ' + error.to_s
+                  handler + ' -- broken pipe: ' + error.to_s
                 end
               end
-              output
             end
-            EM::defer(handle, report)
+            EM::defer(execute, report)
           when 'amqp'
             exchange = details.exchange.name
             exchange_type = details.exchange.key?('type') ? details.exchange['type'].to_sym : :direct
@@ -130,79 +128,86 @@ module Sensu
       @redis.get('client:' + result.client).callback do |client_json|
         unless client_json.nil?
           client = Hashie::Mash.new(JSON.parse(client_json))
-          check = @settings.checks.key?(result.check.name) ? result.check.merge(@settings.checks[result.check.name]) : result.check
-          event = Hashie::Mash.new({
+          check = @settings.checks.key?(result.check.name) ? @settings.checks[result.check.name].merge(result.check) : result.check
+          event = Hashie::Mash.new(
             :client => client,
             :check => check,
             :occurrences => 1
-          })
-          if check['type'] == 'metric'
-            handle_event(event)
-          else
-            history_key = 'history:' + client.name + ':' + check.name
-            @redis.rpush(history_key, check.status).callback do
-              @redis.lrange(history_key, -21, -1).callback do |history|
-                event.check.history = history
-                total_state_change = 0
-                unless history.count < 21
-                  state_changes = 0
-                  change_weight = 0.8
-                  history.each do |status|
-                    previous_status ||= status
-                    unless status == previous_status
-                      state_changes += change_weight
-                    end
-                    change_weight += 0.02
-                    previous_status = status
+          )
+          history_key = 'history:' + client.name + ':' + check.name
+          @redis.rpush(history_key, check.status).callback do
+            @redis.lrange(history_key, -21, -1).callback do |history|
+              event.check.history = history
+              total_state_change = 0
+              unless history.count < 21
+                state_changes = 0
+                change_weight = 0.8
+                history.each do |status|
+                  previous_status ||= status
+                  unless status == previous_status
+                    state_changes += change_weight
+                  end
+                  change_weight += 0.02
+                  previous_status = status
+                end
+                total_state_change = (state_changes.fdiv(20) * 100).to_i
+                @redis.lpop(history_key)
+              end
+              @redis.hget('events:' + client.name, check.name).callback do |event_json|
+                previous_occurrence = event_json ? Hashie::Mash.new(JSON.parse(event_json)) : false
+                is_flapping = false
+                if check.key?('low_flap_threshold') && check.key?('high_flap_threshold')
+                  was_flapping = previous_occurrence ? previous_occurrence.flapping : false
+                  is_flapping = case
+                  when total_state_change >= check.high_flap_threshold
+                    true
+                  when was_flapping && total_state_change <= check.low_flap_threshold
+                    false
+                  else
+                    was_flapping
                   end
-                  total_state_change = (state_changes.fdiv(20) * 100).to_i
-                  @redis.lpop(history_key)
                 end
-                @redis.hget('events:' + client.name, check.name).callback do |event_json|
-                  previous_occurrence = event_json ? Hashie::Mash.new(JSON.parse(event_json)) : false
-                  is_flapping = false
-                  if check.key?('low_flap_threshold') && check.key?('high_flap_threshold')
-                    was_flapping = previous_occurrence ? previous_occurrence.flapping : false
-                    is_flapping = case
-                    when total_state_change >= check.high_flap_threshold
-                      true
-                    when was_flapping && total_state_change <= check.low_flap_threshold
-                      false
+                if check.status != 0
+                  if previous_occurrence && check.status == previous_occurrence.status
+                    event.occurrences = previous_occurrence.occurrences += 1
+                  end
+                  @redis.hset('events:' + client.name, check.name, {
+                    :status => check.status,
+                    :output => check.output,
+                    :flapping => is_flapping,
+                    :occurrences => event.occurrences
+                  }.to_json).callback do
+                    unless check.handle == false
+                      event.check.flapping = is_flapping
+                      event.action = 'create'
+                      handle_event(event)
                     else
-                      was_flapping
+                      @logger.debug('[result] -- handling disabled -- ' + [client.name, check.name, check.status].join(' -- '))
                     end
                   end
-                  if previous_occurrence && check.status == 0
-                    unless is_flapping
-                      unless check.auto_resolve == false && !check.force_resolve
-                        @redis.hdel('events:' + client.name, check.name).callback do
-                          unless check.handle == false
-                            event.action = 'resolve'
-                            handle_event(event)
-                          end
+                elsif previous_occurrence
+                  unless is_flapping
+                    unless check.auto_resolve == false && !check.force_resolve
+                      @redis.hdel('events:' + client.name, check.name).callback do
+                        unless check.handle == false
+                          event.action = 'resolve'
+                          handle_event(event)
+                        else
+                          @logger.debug('[result] -- handling disabled -- ' + [client.name, check.name, check.status].join(' -- '))
                         end
                       end
-                    else
-                      @logger.debug('[result] -- check is flapping -- ' + client.name + ' -- ' + check.name)
-                      @redis.hset('events:' + client.name, check.name, previous_occurrence.merge({'flapping' => true}).to_json)
-                    end
-                  elsif check.status != 0
-                    if previous_occurrence && check.status == previous_occurrence.status
-                      event.occurrences = previous_occurrence.occurrences += 1
                     end
-                    @redis.hset('events:' + client.name, check.name, {
-                      :status => check.status,
-                      :output => check.output,
-                      :flapping => is_flapping,
-                      :occurrences => event.occurrences
-                    }.to_json).callback do
-                      unless check.handle == false
+                  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'
                         event.check.flapping = is_flapping
-                        event.action = 'create'
                         handle_event(event)
                       end
                     end
                   end
+                elsif check['type'] == 'metric'
+                  handle_event(event)
                 end
               end
             end
@@ -225,7 +230,7 @@ module Sensu
       @logger.debug('[publisher] -- setup publisher')
       stagger = options[:test] ? 0 : 7
       @settings.checks.each_with_index do |(name, details), index|
-        check_request = Hashie::Mash.new({:name => name})
+        check_request = Hashie::Mash.new(:name => name)
         unless details.publish == false || details.standalone
           @timers << EM::Timer.new(stagger*index) do
             details.subscribers.each do |exchange|
@@ -250,13 +255,13 @@ module Sensu
             @redis.get('client:' + client_id).callback do |client_json|
               client = Hashie::Mash.new(JSON.parse(client_json))
               time_since_last_keepalive = Time.now.to_i - client.timestamp
-              result = Hashie::Mash.new({
+              result = Hashie::Mash.new(
                 :client => client.name,
                 :check => {
                   :name => 'keepalive',
                   :issued => Time.now.to_i
                 }
-              })
+              )
               case
               when time_since_last_keepalive >= 180
                 result.check.status = 2

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: sensu
 version: !ruby/object:Gem::Version 
-  hash: 63
-  prerelease: false
+  hash: 31098117
+  prerelease: true
   segments: 
   - 0
   - 9
-  - 2
-  version: 0.9.2
+  - 3
+  - beta
+  version: 0.9.3.beta
 platform: ruby
 authors: 
 - Sean Porter
@@ -16,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-05 00:00:00 -08:00
+date: 2012-01-12 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -258,12 +259,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: