sensu 0.11.0.beta.2 → 0.11.0.beta.3

data/CHANGELOG.md

@@ -9,6 +9,9 @@ are an experimental feature and not widely used.
 Sensu settings are now part of the extension API & are no longer passed
 as an argument to run.
 
+TCP handlers no longer have a socket timeout, instead they have a
+handler timeout for consistency.
+
 ### Features
 
 You can specify the Sensu log severity level using the -L (--log_level)
@@ -24,6 +27,8 @@ You can configure the Sensu client socket (UDP & TCP), bind & port, eg.
 You can choose to reconnect to RabbitMQ on initial TCP connection
 failure, eg. "rabbitmq": { "on_failure": "reconnect" }.
 
+Handlers & mutators can now have a timeout, in seconds.
+
 ### Other
 
 Sensu passes a dup of event data to mutator & handler extensions to
@@ -44,6 +49,8 @@ The keepalive & result queues will now auto-delete when there are no
 active consumers. This change stops the creation of a keepalive/result
 backlog, stale data that may overwhelm the recovering consumers.
 
+Improved Sensu client socket check validation.
+
 ## 0.10.2 - 2013-07-18
 
 ### Other

data/lib/sensu/constants.rb

@@ -1,6 +1,6 @@
 module Sensu
   unless defined?(Sensu::VERSION)
-    VERSION = '0.11.0.beta.2'
+    VERSION = '0.11.0.beta.3'
 
     LOG_LEVELS = [:debug, :info, :warn, :error, :fatal]
 

data/lib/sensu/io.rb

@@ -44,6 +44,25 @@ module Sensu
         end
       end
 
+      def async_popen(command, data=nil, timeout=nil, &block)
+        execute = Proc.new do
+          begin
+            popen(command, 'r+', timeout) do |child|
+              unless data.nil?
+                child.write(data.to_s)
+              end
+              child.close_write
+            end
+          rescue => error
+            [error.to_s, 2]
+          end
+        end
+        complete = Proc.new do |output, status|
+          block.call(output, status) if block
+        end
+        EM::defer(execute, complete)
+      end
+
       private
 
       def kill_process_group(group_id)

data/lib/sensu/server.rb

@@ -237,55 +237,23 @@ module Sensu
       end
     end
 
-    def execute_command(command, data=nil, on_error=nil, &block)
-      on_error ||= Proc.new do |error|
-        @logger.error('failed to execute command', {
-          :command => command,
-          :data => data,
-          :error => error.to_s
-        })
-      end
-      execute = Proc.new do
-        begin
-          output, status = IO.popen(command, 'r+') do |child|
-            unless data.nil?
-              child.write(data.to_s)
-            end
-            child.close_write
-          end
-          [true, output, status]
-        rescue => error
-          on_error.call(error)
-          [false, nil, nil]
-        end
-      end
-      complete = Proc.new do |success, output, status|
-        if success
-          block.call(output, status)
-        end
-      end
-      EM::defer(execute, complete)
-    end
-
     def mutate_event_data(mutator_name, event, &block)
       case
       when mutator_name.nil?
         block.call(Oj.dump(event))
       when @settings.mutator_exists?(mutator_name)
         mutator = @settings[:mutators][mutator_name]
-        on_error = Proc.new do |error|
-          @logger.error('mutator error', {
-            :event => event,
-            :mutator => mutator,
-            :error => error.to_s
-          })
-          @handlers_in_progress_count -= 1
-        end
-        execute_command(mutator[:command], Oj.dump(event), on_error) do |output, status|
+        IO.async_popen(mutator[:command], Oj.dump(event), mutator[:timeout]) do |output, status|
           if status == 0
             block.call(output)
           else
-            on_error.call('non-zero exit status (' + status.to_s + '): ' + output)
+            @logger.error('mutator error', {
+              :event => event,
+              :mutator => mutator,
+              :output => output,
+              :status => status
+            })
+            @handlers_in_progress_count -= 1
           end
         end
       when @extensions.mutator_exists?(mutator_name)
@@ -294,10 +262,11 @@ module Sensu
           if status == 0
             block.call(output)
           else
-            @logger.error('mutator error', {
+            @logger.error('mutator extension error', {
               :event => event,
               :extension => extension.definition,
-              :error => 'non-zero exit status (' + status.to_s + '): ' + output
+              :output => output,
+              :status => status
             })
             @handlers_in_progress_count -= 1
           end
@@ -330,9 +299,12 @@ module Sensu
         mutate_event_data(handler[:mutator], event) do |event_data|
           case handler[:type]
           when 'pipe'
-            execute_command(handler[:command], event_data, on_error) do |output, status|
-              output.split(/\n+/).each do |line|
-                @logger.info(line)
+            IO.async_popen(handler[:command], event_data, handler[:timeout]) do |output, status|
+              output.each_line do |line|
+                @logger.info('handler output', {
+                  :handler => handler,
+                  :output => line
+                })
               end
               @handlers_in_progress_count -= 1
             end
@@ -343,7 +315,7 @@ module Sensu
                   @handlers_in_progress_count -= 1
                 end
                 socket.on_error = on_error
-                timeout = handler[:socket][:timeout] || 10
+                timeout = handler[:timeout] || 10
                 socket.pending_connect_timeout = timeout
                 socket.comm_inactivity_timeout = timeout
                 socket.send_data(event_data.to_s)
@@ -374,8 +346,11 @@ module Sensu
             @handlers_in_progress_count -= 1
           when 'extension'
             handler.safe_run(event_data) do |output, status|
-              output.split(/\n+/).each do |line|
-                @logger.info(line)
+              output.each_line do |line|
+                @logger.info('handler extension output', {
+                  :extension => handler.definition,
+                  :output => line
+                })
               end
               @handlers_in_progress_count -= 1
             end

data/lib/sensu/settings.rb

@@ -272,6 +272,11 @@ module Sensu
       unless mutator[:command].is_a?(String)
         invalid_mutator(mutator, 'mutator is missing command')
       end
+      if mutator.has_key?(:timeout)
+        unless mutator[:timeout].is_a?(Numeric)
+          invalid_mutator(mutator, 'mutator timeout must be numeric')
+        end
+      end
     end
 
     def validate_filter(filter)
@@ -304,11 +309,6 @@ module Sensu
         unless handler[:socket][:port].is_a?(Integer)
           invalid_handler(handler, 'handler is missing socket port')
         end
-        if handler[:socket].has_key?(:timeout)
-          unless handler[:socket][:timeout].is_a?(Integer)
-            invalid_handler(handler, 'handler socket timeout must be an integer')
-          end
-        end
       when 'amqp'
         unless handler[:exchange].is_a?(Hash)
           invalid_handler(handler, 'handler is missing exchange hash')
@@ -336,6 +336,11 @@ module Sensu
       else
         invalid_handler(handler, 'unknown handler type')
       end
+      if handler.has_key?(:timeout)
+        unless handler[:timeout].is_a?(Numeric)
+          invalid_handler(handler, 'handler timeout must be numeric')
+        end
+      end
       if handler.has_key?(:filter)
         unless handler[:filter].is_a?(String)
           invalid_handler(handler, 'handler filter must be a string')

data/lib/sensu/socket.rb

@@ -21,12 +21,14 @@ module Sensu
         })
         begin
           check = Oj.load(data)
-          validates = [: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)
+          validates = [
+            check[:name] =~ /^[\w\.-]+$/,
+            check[:output].is_a?(String),
+            check[:status].is_a?(Integer)
+          ].all?
+          if validates
             payload = {
               :client => @settings[:client][:name],
               :check => check

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: sensu
 version: !ruby/object:Gem::Version 
-  hash: 2750769037
+  hash: 1103939663
   prerelease: true
   segments: 
   - 0
   - 11
   - 0
   - beta
-  - 2
-  version: 0.11.0.beta.2
+  - 3
+  version: 0.11.0.beta.3
 platform: ruby
 authors: 
 - Sean Porter
@@ -18,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-09-15 00:00:00 -07:00
+date: 2013-09-20 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency