sensu 0.17.0.beta.1-java → 0.17.0.beta.2-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 527ae4bad6db09b92d1bcdf168319b8de1e219d5
-  data.tar.gz: 8907b3f93f547df6a0181534c66b4a6f5549ad4f
+  metadata.gz: 1211c5ad9ff7c8e426994a580d6311818368d958
+  data.tar.gz: 843bd1f44c74f99a0d1e66787f52de53153fd365
 SHA512:
-  metadata.gz: 9ec6b9aa193780c2a4e3019c1b7c811c6af167e93f44bb7c8cf61af7a4c19fa7af5cc4b9d95605d485e065c4f2fc15ac21811842ef92d1fd3cdcd3baeb7dee17
-  data.tar.gz: cf39bb13d3018b360a5032a59364f8225157c2119765cc00cfc725ba9b6f8ed2fd5a032c65655fb813ca792f54f09a92aa7cd7c2b09dc8fcbf3cae439bd291e6
+  metadata.gz: c369defff476341b02f87a029a0db3a4838528a9c969a677492f69311dd5c120e6e0cb8a691f291684b6651b8561971bb4f3c00d52662a33235480bb1f8794d9
+  data.tar.gz: e4e33db49f8496360be5608273af981831d283f07b2fe812d191955c370b094cd2327042e2d6f54d1d466185feb4f6e6903a85bc9ebe29a230fc808148231da6

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: java
 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,12 +87,12 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.3.0
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.3.0
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency
@@ -115,12 +115,12 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.2.0
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.2.0
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency
@@ -157,12 +157,12 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.6.0
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.6.0
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency