sensu 0.17.0.beta.1 → 0.17.0.beta.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 23b2db451f31f89aba603541b9d4154bb2cf5ac9
-  data.tar.gz: 7919b87e10f33dd688538f03ac2f02031c4f88c8
+  metadata.gz: 47f5f3a7c52be2c090710bd09728d3169d3d2de9
+  data.tar.gz: 7b0eb7d4ba23c1f87b31ee70450eb0e2dbd5f3d9
 SHA512:
-  metadata.gz: cdb5f52f14d6260c3dbb60e2a8596c6cdde582f97638b87ebf02e505f2bdb36dcf1f433747ad9aec5ebc87d730459a79344adc0611eb480b891cfe2b59f01ac6
-  data.tar.gz: 784e7f18dd9c3ebd44926489c8d48410614aa33a422e9cf2abd0492f6b52171b9e599ffcc804e5c8c2bb7771724b69539a02e98801b8588402d28f38a939d42f
+  metadata.gz: a34c81ce0909a8b30c729284324a3bef61ce02818a92c6b25df32c94941d96658fb6da88a2a17dfaa0c22b6e54e84ef58473b6440b4db98db5e8b67210f423cc
+  data.tar.gz: 19aa55da62e7321ae9f0a88fc646903d3a299827f558ddf4ef05c7ba24a222d9651444c24f03d8f852ebb3546959e44d2983d1c84765eb4f72471dda4450d0c7

data/CHANGELOG.md

@@ -11,6 +11,19 @@ Handler output with multiple lines is now logged as a single log event.
 
 Support for Sensu filter extensions.
 
+Check definitions can now specify a Sensu check extension to run,
+"extension", instead of a command.
+
+Sensu transport "reconnect_on_error" configuration option, to enable
+transport reconnect in the event of an unexpected error. This is set to
+false by default, as some errors are unrecoverable. The Sensu transport
+will always reconnect when there is a loss of connectivity.
+
+Sensu Redis "reconnect_on_error" configuration option, to enable Redis
+reconnect in the event of an unexpected error. This is set to false by
+default, as some errors are unrecoverable. The Redis client will always
+reconnect when there is a loss of connectivity.
+
 ### Other
 
 Fixed TLS/SSL on Windows.

data/lib/sensu/client/process.rb

@@ -171,7 +171,10 @@ module Sensu
       # Run a check extension and publish the result. The Sensu client
       # loads check extensions, checks that run within the Sensu Ruby
       # VM and the EventMachine event loop, using the Sensu Extension
-      # API.
+      # API. If a check definition includes `:extension`, use it's
+      # value for the extension name, otherwise use the check name.
+      # The check definition is passed to the extension `safe_run()`
+      # method as a parameter, the extension may utilize it.
       #
       # https://github.com/sensu/sensu-extension
       #
@@ -179,8 +182,9 @@ module Sensu
       def run_check_extension(check)
         @logger.debug("attempting to run check extension", :check => check)
         check[:executed] = Time.now.to_i
-        extension = @extensions[:checks][check[:name]]
-        extension.safe_run do |output, status|
+        extension_name = check[:extension] || check[:name]
+        extension = @extensions[:checks][extension_name]
+        extension.safe_run(check) do |output, status|
           check[:output] = output
           check[:status] = status
           publish_check_result(check)
@@ -188,14 +192,19 @@ module Sensu
       end
 
       # Process a check request. If a check request has a check
-      # command, it will be executed. A check request without a check
-      # command indicates a check extension run. A check request will
-      # be merged with a local check definition, if present. Client
-      # safe mode is enforced in this method, requiring a local check
+      # command, it will be executed. A standard check request will be
+      # merged with a local check definition, if present. Client safe
+      # mode is enforced in this method, requiring a local check
       # definition in order to execute the check command. If a local
       # check definition does not exist when operating with client
       # safe mode, a check result will be published to report the
-      # missing check definition.
+      # missing check definition. A check request without a
+      # command indicates a check extension run. The check request may
+      # contain `:extension`, the name of the extension to run. If
+      # `:extension` is not present, the check name is used for the
+      # extension name. If a check extension does not exist for a
+      # name, a check result will be published to report the unknown
+      # check extension.
       #
       # @param check [Hash]
       def process_check_request(check)
@@ -214,7 +223,8 @@ module Sensu
             execute_check_command(check)
           end
         else
-          if @extensions.check_exists?(check[:name])
+          extension_name = check[:extension] || check[:name]
+          if @extensions.check_exists?(extension_name)
             run_check_extension(check)
           else
             @logger.warn("unknown check extension", :check => check)

data/lib/sensu/constants.rb

@@ -1,7 +1,7 @@
 module Sensu
   unless defined?(Sensu::VERSION)
     # Sensu release version.
-    VERSION = "0.17.0.beta.1"
+    VERSION = "0.17.0.beta.2"
 
     # Sensu check severities.
     SEVERITIES = %w[ok warning critical unknown]

data/lib/sensu/daemon.rb

@@ -5,9 +5,9 @@ gem "eventmachine", "1.0.3"
 
 gem "sensu-em", "2.4.1"
 gem "sensu-logger", "1.0.0"
-gem "sensu-settings", "1.2.0"
+gem "sensu-settings", "1.3.0"
 gem "sensu-extension", "1.1.2"
-gem "sensu-extensions", "1.1.0"
+gem "sensu-extensions", "1.2.0"
 gem "sensu-transport", "2.4.0"
 gem "sensu-spawn", "1.1.0"
 
@@ -185,7 +185,11 @@ module Sensu
       @transport = Transport.connect(transport_name, transport_settings)
       @transport.on_error do |error|
         @logger.fatal("transport connection error", :error => error.to_s)
-        stop
+        if @settings[:transport][:reconnect_on_error]
+          @transport.reconnect
+        else
+          stop
+        end
       end
       @transport.before_reconnect do
         unless testing?

data/lib/sensu/redis.rb

@@ -1,4 +1,4 @@
-gem "em-redis-unified", "0.5.0"
+gem "em-redis-unified", "0.6.0"
 
 require "em-redis"
 

data/sensu.gemspec

@@ -19,12 +19,12 @@ Gem::Specification.new do |s|
   s.add_dependency "eventmachine", "1.0.3"
   s.add_dependency "sensu-em", "2.4.1"
   s.add_dependency "sensu-logger", "1.0.0"
-  s.add_dependency "sensu-settings", "1.2.0"
+  s.add_dependency "sensu-settings", "1.3.0"
   s.add_dependency "sensu-extension", "1.1.2"
-  s.add_dependency "sensu-extensions", "1.1.0"
+  s.add_dependency "sensu-extensions", "1.2.0"
   s.add_dependency "sensu-transport", "2.4.0"
   s.add_dependency "sensu-spawn", "1.1.0"
-  s.add_dependency "em-redis-unified", "0.5.0"
+  s.add_dependency "em-redis-unified", "0.6.0"
   s.add_dependency "sinatra", "1.3.5"
   s.add_dependency "async_sinatra", "1.0.0"
   s.add_dependency "thin", "1.5.0" unless RUBY_PLATFORM =~ /java/

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sensu
 version: !ruby/object:Gem::Version
-  version: 0.17.0.beta.1
+  version: 0.17.0.beta.2
 platform: ruby
 authors:
 - Sean Porter
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-10 00:00:00.000000000 Z
+date: 2015-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -87,14 +87,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: sensu-extension
   requirement: !ruby/object:Gem::Requirement
@@ -115,14 +115,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: sensu-transport
   requirement: !ruby/object:Gem::Requirement
@@ -157,14 +157,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.6.0
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement