sensu 0.9.6 → 0.9.7.beta

data/CHANGELOG.md

@@ -0,0 +1,12 @@
+## 0.9.7 - TBD
+
+### Features
+
+Event data mutators, manipulate event data and its format prior to
+sending to a handler.
+
+### Non-backwards compatible changes
+
+AMQP handlers can no longer use `"send_only_check_output": true`, but
+instead have access to the built-in mutators `"mutator": "only_check_output"` and
+`"mutator": "only_check_output_split"`.

data/README.md

@@ -0,0 +1,12 @@
+# Sensu
+  A monitoring framework that aims to be simple, malleable, and scalable.
+
+  ![sensu](https://raw.github.com/sensu/sensu/master/sensu-logo.png)
+
+  ![travis](https://secure.travis-ci.org/sensu/sensu.png)
+
+## Documentation
+  Please refer to the [Sensu Wiki](https://github.com/sensu/sensu/wiki).
+
+## License
+  Sensu is released under the [MIT license](https://raw.github.com/sensu/sensu/master/MIT-LICENSE.txt).

data/lib/sensu/constants.rb

@@ -1,6 +1,6 @@
 module Sensu
   unless defined?(Sensu::VERSION)
-    VERSION = '0.9.6'
+    VERSION = '0.9.7.beta'
   end
 
   unless defined?(Sensu::DEFAULT_OPTIONS)

data/lib/sensu/server.rb

@@ -154,6 +154,55 @@ module Sensu
       end
     end
 
+    def mutate_event_data(handler, event)
+      if handler.has_key?(:mutator)
+        mutated = nil
+        case handler[:mutator]
+        when /^only_check_output/
+          if handler[:type] == 'amqp' && handler[:mutator] =~ /split$/
+            mutated = Array.new
+            event[:check][:output].split(/\n+/).each do |line|
+              mutated.push(line)
+            end
+          else
+            mutated = event[:check][:output]
+          end
+        else
+          if @settings.mutator_exists?(handler[:mutator])
+            mutator = @settings[:mutators][handler[:mutator]]
+            begin
+              IO.popen(mutator[:command], 'r+') do |io|
+                io.write(event.to_json)
+                io.close_write
+                mutated = io.read
+              end
+              unless $?.exitstatus == 0
+                @logger.warn('mutator had a non-zero exit status', {
+                  :event => event,
+                  :mutator => mutator
+                })
+              end
+            rescue => error
+              @logger.error('mutator error', {
+                :event => event,
+                :mutator => mutator,
+                :error => error.to_s
+              })
+            end
+          else
+            @logger.error('unknown mutator', {
+              :mutator => {
+                :name => handler[:mutator]
+              }
+            })
+          end
+        end
+        mutated
+      else
+        event.to_json
+      end
+    end
+
     def handle_event(event)
       unless check_subdued?(event[:check], :handler)
         handlers = check_handlers(event[:check])
@@ -167,27 +216,18 @@ module Sensu
           when 'pipe'
             execute = Proc.new do
               begin
-                IO.popen(handler[:command] + ' 2>&1', 'r+') do |io|
-                  io.write(event.to_json)
-                  io.close_write
-                  io.read.split(/\n+/).each do |line|
-                    @logger.info(line)
+                mutated_event_data = mutate_event_data(handler, event)
+                unless mutated_event_data.nil? || mutated_event_data.empty?
+                  IO.popen(handler[:command] + ' 2>&1', 'r+') do |io|
+                    io.write(mutated_event_data)
+                    io.close_write
+                    io.read.split(/\n+/).each do |line|
+                      @logger.info(line)
+                    end
                   end
                 end
-              rescue Errno::ENOENT => error
-                @logger.error('handler does not exist', {
-                  :event => event,
-                  :handler => handler,
-                  :error => error.to_s
-                })
-              rescue Errno::EPIPE => error
-                @logger.error('broken pipe', {
-                  :event => event,
-                  :handler => handler,
-                  :error => error.to_s
-                })
               rescue => error
-                @logger.error('unexpected error', {
+                @logger.error('handler error', {
                   :event => event,
                   :handler => handler,
                   :error => error.to_s
@@ -208,24 +248,18 @@ module Sensu
               :event => event,
               :exchange => handler[:exchange]
             })
-            payloads = Array.new
-            if handler[:send_only_check_output]
-              if handler[:split_check_output]
-                event[:check][:output].split(/\n+/).each do |line|
-                  payloads.push(line)
-                end
-              else
-                payloads.push(event[:check][:output])
-              end
-            else
-              payloads.push(event.to_json)
+            payloads = Proc.new do
+              Array(mutate_event_data(handler, event))
             end
-            payloads.each do |payload|
-              unless payload.empty?
-                @amq.method(exchange_type).call(exchange_name, exchange_options).publish(payload)
+            publish = Proc.new do |payloads|
+              payloads.each do |payload|
+                unless payload.empty?
+                  @amq.method(exchange_type).call(exchange_name, exchange_options).publish(payload)
+                end
               end
+              @handlers_in_progress -= 1
             end
-            @handlers_in_progress -= 1
+            EM::defer(payloads, publish)
           when 'set'
             @logger.error('handler sets cannot be nested', {
               :handler => handler

data/lib/sensu/settings.rb

@@ -5,7 +5,9 @@ module Sensu
     def initialize
       @logger = Cabin::Channel.get
       @settings = Hash.new
-      @settings[:checks] = Hash.new
+      [:checks, :handlers, :mutators].each do |key|
+        @settings[key] = Hash.new
+      end
       @indifferent_access = false
       @loaded_env = false
       @loaded_files = Array.new
@@ -87,26 +89,18 @@ module Sensu
       ENV['SENSU_CONFIG_FILES'] = @loaded_files.join(':')
     end
 
-    def checks
-      @settings[:checks].map do |check_name, check_details|
-        check_details.merge(:name => check_name.to_s)
+    [:checks, :handlers, :mutators].each do |key|
+      define_method(key) do
+        @settings[key].map do |name, details|
+          details.merge(:name => name.to_s)
+        end
       end
-    end
 
-    def handlers
-      @settings[:handlers].map do |handler_name, handler_details|
-        handler_details.merge(:name => handler_name.to_s)
+      define_method((key.to_s.chop + '_exists?').to_sym) do |name|
+        @settings[key].has_key?(name.to_sym)
       end
     end
 
-    def check_exists?(check_name)
-      @settings[:checks].has_key?(check_name.to_sym)
-    end
-
-    def handler_exists?(handler_name)
-      @settings[:handlers].has_key?(handler_name.to_sym)
-    end
-
     def validate
       @logger.debug('validating settings')
       validate_checks
@@ -322,7 +316,7 @@ module Sensu
 
     def validate_server
       unless @settings[:handlers].is_a?(Hash)
-        invalid('missing handlers configuration')
+        invalid('handlers must be a hash')
       end
       unless @settings[:handlers].include?(:default)
         invalid('missing default handler')
@@ -370,6 +364,16 @@ module Sensu
           })
         end
       end
+      unless @settings[:mutators].is_a?(Hash)
+        invalid('mutators must be a hash')
+      end
+      mutators.each do |mutator|
+        unless mutator[:command].is_a?(String)
+          invalid('mutator is missing command', {
+            :mutator => mutator
+          })
+        end
+      end
     end
   end
 end

data/sensu.gemspec

@@ -24,7 +24,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency('em-spec')
   s.add_development_dependency('em-http-request')
 
-  s.files         = Dir.glob('{bin,lib}/**/*') + %w[sensu.gemspec README.org MIT-LICENSE.txt]
+  s.files         = Dir.glob('{bin,lib}/**/*') + %w[sensu.gemspec README.md CHANGELOG.md MIT-LICENSE.txt]
   s.executables   = Dir.glob('bin/**/*').map { |file| File.basename(file) }
   s.require_paths = ['lib']
 end

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: sensu
 version: !ruby/object:Gem::Version 
-  hash: 55
-  prerelease: false
+  hash: 31098133
+  prerelease: true
   segments: 
   - 0
   - 9
-  - 6
-  version: 0.9.6
+  - 7
+  - beta
+  version: 0.9.7.beta
 platform: ruby
 authors: 
 - Sean Porter
@@ -16,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-07-09 00:00:00 -07:00
+date: 2012-07-18 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -200,7 +201,8 @@ files:
 - lib/sensu/socket.rb
 - lib/sensu.rb
 - sensu.gemspec
-- README.org
+- README.md
+- CHANGELOG.md
 - MIT-LICENSE.txt
 has_rdoc: true
 homepage: https://github.com/sensu/sensu
@@ -223,12 +225,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: 

data/README.org

@@ -1,12 +0,0 @@
-* Sensu
-  A monitoring framework that aims to be simple, malleable, and scalable.
-
-  [[https://github.com/sensu/sensu/raw/master/sensu-logo.png]]
-
-  [[https://secure.travis-ci.org/sensu/sensu.png]]
-
-  [[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/sensu/sensu/blob/master/MIT-LICENSE.txt][MIT license]].