sensu 0.10.2 → 0.11.0.beta

data/CHANGELOG.md

@@ -1,3 +1,28 @@
+## 0.11.0 - TBD
+
+### Non-backwards compatible changes
+
+WARNING: Extensions compatible with previous versions of Sensu will
+NO LONGER FUNCTION until they are updated for Sensu 0.11.x! Extensions
+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.
+
+### Features
+
+You can specify the Sensu log severity level using the -L (--log_level)
+CLI argument, providing a valid level (eg. warn).
+
+### Other
+
+Sensu passes a dup of event data to mutator & handler extensions to
+prevent mutation.
+
+Extension runs are wrapped in a begin/rescue block, a safety net.
+
+UDP handler now binds to "0.0.0.0".
+
 ## 0.10.2 - 2013-07-18
 
 ### Other

data/lib/sensu/cli.rb

@@ -25,6 +25,14 @@ module Sensu
         opts.on('-l', '--log FILE', 'Log to a given FILE. Default: STDOUT') do |file|
           options[:log_file] = file
         end
+        opts.on('-L', '--log_level LEVEL', 'Log severity LEVEL') do |level|
+          log_level = level.to_s.downcase.to_sym
+          unless LOG_LEVELS.include?(log_level)
+            puts 'Unknown log level: ' + level.to_s
+            exit 1
+          end
+          options[:log_level] = log_level
+        end
         opts.on('-v', '--verbose', 'Enable verbose logging') do
           options[:log_level] = :debug
         end

data/lib/sensu/client.rb

@@ -21,6 +21,7 @@ module Sensu
       @settings = base.settings
       @extensions = base.extensions
       base.setup_process
+      @extensions.load_settings(@settings.to_hash)
       @timers = Array.new
       @checks_in_progress = Array.new
       @safe_mode = @settings[:client][:safe_mode] || false
@@ -143,7 +144,7 @@ module Sensu
       })
       check[:executed] = Time.now.to_i
       extension = @extensions[:checks][check[:name]]
-      extension.run do |output, status|
+      extension.safe_run do |output, status|
         check[:output] = output
         check[:status] = status
         publish_result(check)

data/lib/sensu/constants.rb

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

data/lib/sensu/extensions/handlers/debug.rb

@@ -9,7 +9,7 @@ module Sensu
         'outputs json event data'
       end
 
-      def run(event, settings, &block)
+      def run(event, &block)
         block.call(event, 0)
       end
     end

data/lib/sensu/extensions/mutators/only_check_output.rb

@@ -9,7 +9,7 @@ module Sensu
         'returns check output'
       end
 
-      def run(event, settings, &block)
+      def run(event, &block)
         block.call(event[:check][:output], 0)
       end
     end

data/lib/sensu/extensions.rb

@@ -53,27 +53,37 @@ module Sensu
       end
     end
 
-    def stop_all(&block)
-      all = @extensions.map do |category, extensions|
-        extensions.map do |name, extension|
-          extension
-        end
+    def load_settings(settings={})
+      all_extensions.each do |extension|
+        extension.settings = settings
       end
-      all.flatten!
+    end
+
+    def stop_all(&block)
+      extensions = all_extensions
       stopper = Proc.new do |extension|
         if extension.nil?
           block.call
         else
           extension.stop do
-            stopper.call(all.pop)
+            stopper.call(extensions.pop)
           end
         end
       end
-      stopper.call(all.pop)
+      stopper.call(extensions.pop)
     end
 
     private
 
+    def all_extensions
+      all = @extensions.map do |category, extensions|
+        extensions.map do |name, extension|
+          extension
+        end
+      end
+      all.flatten!
+    end
+
     def loaded(type, name, description)
       @logger.info('loaded extension', {
         :type => type,
@@ -85,6 +95,8 @@ module Sensu
 
   module Extension
     class Base
+      attr_accessor :settings
+
       def initialize
         EM::next_tick do
           post_init
@@ -106,19 +118,11 @@ module Sensu
         }
       end
 
-      def [](key)
-        definition[key.to_sym]
-      end
-
-      def has_key?(key)
-        definition.has_key?(key.to_sym)
-      end
-
       def post_init
         true
       end
 
-      def run(event=nil, settings={}, &block)
+      def run(data=nil, &block)
         block.call('noop', 0)
       end
 
@@ -126,6 +130,22 @@ module Sensu
         block.call
       end
 
+      def [](key)
+        definition[key.to_sym]
+      end
+
+      def has_key?(key)
+        definition.has_key?(key.to_sym)
+      end
+
+      def safe_run(data=nil, &block)
+        begin
+          data ? run(data.dup, &block) : run(&block)
+        rescue => error
+          block.call(error.to_s, 2)
+        end
+      end
+
       def self.descendants
         ObjectSpace.each_object(Class).select do |klass|
           klass < self

data/lib/sensu/server.rb

@@ -23,6 +23,7 @@ module Sensu
       @settings = base.settings
       @extensions = base.extensions
       base.setup_process
+      @extensions.load_settings(@settings.to_hash)
       @timers = Array.new
       @master_timers = Array.new
       @handlers_in_progress_count = 0
@@ -293,7 +294,7 @@ module Sensu
         end
       when @extensions.mutator_exists?(mutator_name)
         extension = @extensions[:mutators][mutator_name]
-        extension.run(event, @settings.to_hash) do |output, status|
+        extension.safe_run(event) do |output, status|
           if status == 0
             block.call(output)
           else
@@ -357,7 +358,7 @@ module Sensu
             end
           when 'udp'
             begin
-              EM::open_datagram_socket('127.0.0.1', 0, nil) do |socket|
+              EM::open_datagram_socket('0.0.0.0', 0, nil) do |socket|
                 socket.send_datagram(event_data.to_s, handler[:socket][:host], handler[:socket][:port])
                 socket.close_connection_after_writing
                 @handlers_in_progress_count -= 1
@@ -376,7 +377,7 @@ module Sensu
             end
             @handlers_in_progress_count -= 1
           when 'extension'
-            handler.run(event_data, @settings.to_hash) do |output, status|
+            handler.safe_run(event_data) do |output, status|
               output.split(/\n+/).each do |line|
                 @logger.info(line)
               end

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: sensu
 version: !ruby/object:Gem::Version 
-  hash: 51
-  prerelease: false
+  hash: -1487621072
+  prerelease: true
   segments: 
   - 0
-  - 10
-  - 2
-  version: 0.10.2
+  - 11
+  - 0
+  - beta
+  version: 0.11.0.beta
 platform: ruby
 authors: 
 - Sean Porter
@@ -16,13 +17,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-07-18 00:00:00 -07:00
+date: 2013-08-14 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: oj
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -33,12 +32,12 @@ dependencies:
         - 0
         - 9
         version: 2.0.9
+  requirement: *id001
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: eventmachine
+  name: oj
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -49,12 +48,12 @@ dependencies:
         - 0
         - 3
         version: 1.0.3
+  requirement: *id002
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: amqp
+  name: eventmachine
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -65,12 +64,12 @@ dependencies:
         - 9
         - 10
         version: 0.9.10
+  requirement: *id003
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: em-redis-unified
+  name: amqp
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -81,12 +80,12 @@ dependencies:
         - 4
         - 1
         version: 0.4.1
+  requirement: *id004
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: thin
+  name: em-redis-unified
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -97,12 +96,12 @@ dependencies:
         - 5
         - 0
         version: 1.5.0
+  requirement: *id005
   type: :runtime
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: sinatra
+  name: thin
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -113,12 +112,12 @@ dependencies:
         - 3
         - 5
         version: 1.3.5
+  requirement: *id006
   type: :runtime
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: async_sinatra
+  name: sinatra
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -129,12 +128,12 @@ dependencies:
         - 0
         - 0
         version: 1.0.0
+  requirement: *id007
   type: :runtime
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: rake
+  name: async_sinatra
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -143,12 +142,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  requirement: *id008
   type: :development
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
-  name: rspec
+  name: rake
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -157,12 +156,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  requirement: *id009
   type: :development
-  version_requirements: *id009
-- !ruby/object:Gem::Dependency 
-  name: em-http-request
+  name: rspec
   prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -171,42 +170,44 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  requirement: *id010
   type: :development
-  version_requirements: *id010
+  name: em-http-request
+  prerelease: false
 description: A monitoring framework that aims to be simple, malleable, and scalable. Uses the publish/subscribe model.
 email: 
 - portertech@gmail.com
 - justin.kolberg@sonian.net
 executables: 
 - sensu-api
-- sensu-server
 - sensu-client
+- sensu-server
 extensions: []
 
 extra_rdoc_files: []
 
 files: 
 - bin/sensu-api
-- bin/sensu-server
 - bin/sensu-client
-- lib/sensu/socket.rb
-- lib/sensu/constants.rb
+- bin/sensu-server
 - lib/sensu/api.rb
-- lib/sensu/sandbox.rb
-- lib/sensu/settings.rb
-- lib/sensu/redis.rb
-- lib/sensu/server.rb
-- lib/sensu/utilities.rb
+- lib/sensu/base.rb
+- lib/sensu/cli.rb
 - lib/sensu/client.rb
-- lib/sensu/rabbitmq.rb
-- lib/sensu/process.rb
+- lib/sensu/constants.rb
 - lib/sensu/extensions/handlers/debug.rb
 - lib/sensu/extensions/mutators/only_check_output.rb
-- lib/sensu/cli.rb
-- lib/sensu/logstream.rb
 - lib/sensu/extensions.rb
 - lib/sensu/io.rb
-- lib/sensu/base.rb
+- lib/sensu/logstream.rb
+- lib/sensu/process.rb
+- lib/sensu/rabbitmq.rb
+- lib/sensu/redis.rb
+- lib/sensu/sandbox.rb
+- lib/sensu/server.rb
+- lib/sensu/settings.rb
+- lib/sensu/socket.rb
+- lib/sensu/utilities.rb
 - lib/sensu.rb
 - sensu.gemspec
 - README.md
@@ -233,12 +234,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: