sensu 1.6.2 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7d92df9cfdb9c845a0c5bb841f2f3bfb459f0d81
-  data.tar.gz: 3caaa8d79d44cc3ea6868cef24fcc52fc980dcfb
+  metadata.gz: abc95454535a1de5457e625a992d6d4de138bc9c
+  data.tar.gz: cdb41cd96c00967d8c7653edb03b4dddc23f5800
 SHA512:
-  metadata.gz: 9f90edb5abefe6f6dabed9c4da2c4b54e4cd30345f34fcb01c0c5b9715c8ee1325a431cec7c29d0caf5dbc2ad012bfa59d363cf295807b076504294143846cd7
-  data.tar.gz: ad5cf09094b96df12fba2d621586d90ccc437306377887a307283bf025bc3c19eec96a1c2d30bc3cf0ab69fd0aac842872596f9cc55fcc57f11ff35fb4e09124
+  metadata.gz: e211d7fc0dc37af916333af52a926d1fa41d5be94d5472ec1deb8dfb2edcb775a5246ca3ea32df21de7c41fb3a811549f5cb13f8bf444b3800cd02564d33295f
+  data.tar.gz: 8d6790cbca39aec06b05e3a1874eae7a15d580e079d7a5b8edc1ab94bf8a85e21a402c09a1e51dd2bd9692558b2eee3c5e859543bfdb51e467c556fd1a701b56

data.tar.gz.sig

@@ -1 +1 @@
-0���s���~��G^ܒ�sj�ۿ�_4t{I3Qk09���t�+2(�2�V� _JZ��\��^"/���n���"I��$��6���s���V�_h���8K@�F�E��A�ت�4�G�`�c7��'
0H��e3�Vi0*2�~�3k��fs����{���N��۹
g�Ienj�|�$��q\������I�Y�:�l,�N���#���):~�.��.����r9E��ڨM0;Lr�3���R?�
+�W�T��F��󷅃�P����E)��tLթ�A���\c��)<|w�|�M�z�9ݾ������Wϰ�-����)&�%]�aD����a��N�hϱ�Q�W��.�������h+/�m{���L��-}����qs.�'7�^PS��/�83�4��_���\d?}ԫrJ����_��P���TY1����^�w
�3�L���,`V��$����5H�E��
�l���e�7��b�<N�a

data/CHANGELOG.md

@@ -5,6 +5,20 @@ This CHANGELOG follows the format listed [here](https://github.com/sensu-plugins
 
 ## [Unreleased]
 
+## [1.7.0] - 2018-02-19
+
+### Added
+- Added a response body to the api health endpoint including transport consumer & message counts.
+- Bump sensu-extensions to 1.11.0 to add support for built-in sensu-extensions-deregistration handler.
+- Added an eventmachine globbal catch-all error handler.
+
+### Fixed
+- Token substitution will now only split on the first instance of the pipe character.
+- Use `deep_dup` in api token substitution to prevent an issue where substitution could use an incorrect value.
+- Redacted attributes are now redacted from the `/clients` and `/clients/:client` routes.
+- Server registry entires that fail to expire are now cleaned up.
+- Improved error logging.
+
 ## [1.6.2] - 2018-12-07
 
 ### Fixed

data/lib/sensu/api/routes/clients.rb

@@ -42,7 +42,8 @@ module Sensu
               clients.each_with_index do |client_name, index|
                 @redis.get("client:#{client_name}") do |client_json|
                   unless client_json.nil?
-                    @response_content << Sensu::JSON.load(client_json)
+                    client = Sensu::JSON.load(client_json)
+                    @response_content << redact_sensitive(client, client[:redact])
                   else
                     @logger.error("client data missing from registry", :client_name => client_name)
                     @redis.srem("clients", client_name)
@@ -63,7 +64,8 @@ module Sensu
           client_name = parse_uri(CLIENT_URI).first
           @redis.get("client:#{client_name}") do |client_json|
             unless client_json.nil?
-              @response_content = Sensu::JSON.load(client_json)
+              client = Sensu::JSON.load(client_json)
+              @response_content = redact_sensitive(client, client[:redact])
               respond
             else
               not_found!

data/lib/sensu/api/routes/health.rb

@@ -10,22 +10,32 @@ module Sensu
 
         # GET /health
         def get_health
+          @response_content = []
           if @redis.connected? && @transport.connected?
-            healthy = []
             min_consumers = integer_parameter(@params[:consumers])
             max_messages = integer_parameter(@params[:messages])
             transport_info do |info|
               if min_consumers
-                healthy << (info[:keepalives][:consumers] >= min_consumers)
-                healthy << (info[:results][:consumers] >= min_consumers)
+                if info[:keepalives][:consumers] < min_consumers
+                  @response_content << "keepalive consumers (#{info[:keepalives][:consumers]}) less than min_consumers (#{min_consumers})"
+                end
+                if info[:results][:consumers] < min_consumers
+                  @response_content << "result consumers (#{info[:results][:consumers]}) less than min_consumers (#{min_consumers})"
+                end
               end
               if max_messages
-                healthy << (info[:keepalives][:messages] <= max_messages)
-                healthy << (info[:results][:messages] <= max_messages)
+                if info[:keepalives][:messages] > max_messages
+                  @response_content << "keepalive messages (#{info[:keepalives][:messages]}) greater than max_messages (#{max_messages})"
+                end
+                if info[:results][:messages] > max_messages
+                  @response_content << "result messages (#{info[:results][:messages]}) greater than max_messages (#{max_messages})"
+                end
               end
-              healthy.all? ? no_content! : precondition_failed!
+              @response_content.empty? ? no_content! : precondition_failed!
             end
           else
+            @response_content << "not connected to redis" unless @redis.connected?
+            @response_content << "not connected to transport" unless @transport.connected?
             precondition_failed!
           end
         end

data/lib/sensu/api/utilities/publish_check_request.rb

@@ -82,7 +82,7 @@ module Sensu
                         :client => client,
                         :check => check
                       })
-                      proxy_check, unmatched_tokens = object_substitute_tokens(check.dup, client)
+                      proxy_check, unmatched_tokens = object_substitute_tokens(deep_dup(check.dup), client)
                       if unmatched_tokens.empty?
                         proxy_check[:source] ||= client[:name]
                         publish_check_request(proxy_check)

data/lib/sensu/api/utilities/servers_info.rb

@@ -13,7 +13,14 @@ module Sensu
                 servers.each_with_index do |server_id, index|
                   @redis.get("server:#{server_id}") do |server_json|
                     unless server_json.nil?
-                      info << Sensu::JSON.load(server_json)
+                      server = Sensu::JSON.load(server_json)
+                      if server[:timestamp] >= (Time.now.to_i - 30)
+                        info << server
+                      else
+                        @redis.del("server:#{server_id}") do
+                          @redis.srem("servers", server_id)
+                        end
+                      end
                     else
                       @redis.srem("servers", server_id)
                     end

data/lib/sensu/constants.rb

@@ -1,7 +1,7 @@
 module Sensu
   unless defined?(Sensu::VERSION)
     # Sensu release version.
-    VERSION = "1.6.2".freeze
+    VERSION = "1.7.0".freeze
 
     # Sensu release information.
     RELEASE_INFO = {

data/lib/sensu/daemon.rb

@@ -4,9 +4,9 @@ gem "eventmachine", "1.2.7"
 
 gem "sensu-json", "2.1.1"
 gem "sensu-logger", "1.2.2"
-gem "sensu-settings", "10.14.0"
+gem "sensu-settings", "10.15.0"
 gem "sensu-extension", "1.5.2"
-gem "sensu-extensions", "1.10.0"
+gem "sensu-extensions", "1.11.0"
 gem "sensu-transport", "8.2.0"
 gem "sensu-spawn", "2.5.0"
 gem "sensu-redis", "2.4.0"
@@ -51,6 +51,9 @@ module Sensu
       unless EM::reactor_running?
         EM::epoll
         EM::set_max_timers(200000)
+        EM::error_handler do |error|
+          unexpected_error(error)
+        end
       end
       setup_logger(options)
       load_settings(options)
@@ -61,6 +64,33 @@ module Sensu
       setup_process(options)
     end
 
+    # Handle an unexpected error. This method is used for EM global
+    # catch-all error handling, accepting an error object. Error
+    # handling is opt-in via a configuration option, e.g. `"sensu":
+    # {"global_error_handler": true}`. If a user does not opt-in, the
+    # provided error will be raised (uncaught). If a user opts-in via
+    # configuration, the error will be logged and ignored :itsfine:.
+    #
+    # @param error [Object]
+    def unexpected_error(error)
+      if @settings && @settings[:sensu][:global_error_handler]
+        backtrace = error.backtrace.join("\n")
+        if @logger
+          @logger.warn("global catch-all error handling enabled")
+          @logger.fatal("unexpected error - please address this immediately", {
+            :error => error.to_s,
+            :error_class => error.class,
+            :backtrace => backtrace
+          })
+        else
+          puts "global catch-all error handling enabled"
+          puts "unexpected error - please address this immediately: #{error.to_s}\n#{error.class}\n#{backtrace}"
+        end
+      else
+        raise error
+      end
+    end
+
     # Set up the Sensu logger and its process signal traps for log
     # rotation and debug log level toggling. This method creates the
     # logger instance variable: `@logger`.

data/lib/sensu/utilities.rb

@@ -190,7 +190,7 @@ module Sensu
         :replace => ""
       })
       substituted = encoded_tokens.gsub(/:::([^:].*?):::/) do
-        token, default = $1.to_s.split("|", -1)
+        token, default = $1.to_s.split("|", 2)
         path = token.split(".").map(&:to_sym)
         matched = find_attribute_value(attributes, path, default)
         if matched.nil?

data/sensu.gemspec

@@ -14,9 +14,9 @@ Gem::Specification.new do |s|
   s.add_dependency "eventmachine", "1.2.7"
   s.add_dependency "sensu-json", "2.1.1"
   s.add_dependency "sensu-logger", "1.2.2"
-  s.add_dependency "sensu-settings", "10.14.0"
+  s.add_dependency "sensu-settings", "10.15.0"
   s.add_dependency "sensu-extension", "1.5.2"
-  s.add_dependency "sensu-extensions", "1.10.0"
+  s.add_dependency "sensu-extensions", "1.11.0"
   s.add_dependency "sensu-transport", "8.2.0"
   s.add_dependency "sensu-spawn", "2.5.0"
   s.add_dependency "sensu-redis", "2.4.0"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sensu
 version: !ruby/object:Gem::Version
-  version: 1.6.2
+  version: 1.7.0
 platform: ruby
 authors:
 - Sean Porter
@@ -31,7 +31,7 @@ cert_chain:
   jOeGyhtQa9j4FFmsEJDg59f5v/3hECXsa3Xuml3foaFHzX3Ya/YIyd2YFxvkFKIu
   GVbe7A3YdxzdkH2Es/Ym9twdxXaIDdXzj8sWhw==
   -----END CERTIFICATE-----
-date: 2018-12-07 00:00:00.000000000 Z
+date: 2019-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
@@ -81,14 +81,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 10.14.0
+        version: 10.15.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 10.14.0
+        version: 10.15.0
 - !ruby/object:Gem::Dependency
   name: sensu-extension
   requirement: !ruby/object:Gem::Requirement
@@ -109,14 +109,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.10.0
+        version: 1.11.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.10.0
+        version: 1.11.0
 - !ruby/object:Gem::Dependency
   name: sensu-transport
   requirement: !ruby/object:Gem::Requirement