sensu 1.4.2 → 1.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 907c67f40080774064579c80c0ec8979aea2fb1b
-  data.tar.gz: 43d91b3282f863f8c865b0fe464e48d35741bf6f
+  metadata.gz: 77726a20c8e3a4cb2f549caa4f33c3c6bfcf4efb
+  data.tar.gz: c7fe0e9214ccb27c3b14bfa6aa7f89f7f5d07f1f
 SHA512:
-  metadata.gz: f0595fcf9558e827b4c40ff9e0fb53c46da2747b1774b1d112703eb5f5bf64d812b7787c4ea0581c2445b0a09cf8b3b3ea4b821c1a7e388ee29986c750bc3a28
-  data.tar.gz: 2a628deb496b12e2304391859772cce4b63e4827c1f229b53efd06629baf9f6d40909fc41201e9929fc939070abc616354be543cbbb0b793fb70498c05a58e82
+  metadata.gz: ef6330e24403cf0aa3d9b7e5ad9b918197ad3634583c053ffed676948f26737bf4aeda29e902318fa1c37864ca27b11250477900098bc6cf0f2467b6c95ab8e1
+  data.tar.gz: da78852eed102c0c250118384e976fad1c0fa64bf729b8c61459550a10a9400633f2ac093a264c56e69f9b31024e28e2260baeba6439ceceaa5ae481ab29a1e8

data/CHANGELOG.md

@@ -5,6 +5,14 @@ This CHANGELOG follows the format listed [here](https://github.com/sensu-plugins
 
 ## [Unreleased]
 
+## [1.4.3] - 2018-07-23
+
+### Fixed
+- Prevent check results from being published with an empty source attribute.
+- Use handler extension definitions when logging rather than handler extension objects.
+- Added validation for ttl attribute in results API.
+- Fixed case where proxy checks with token substitution can retain previous values.
+
 ## [1.4.2] - 2018-05-10
 
 ### Fixed

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

@@ -16,7 +16,8 @@ module Sensu
             :name => {:type => String, :nil_ok => false, :regex => /\A[\w\.-]+\z/},
             :output => {:type => String, :nil_ok => false},
             :status => {:type => Integer, :nil_ok => true},
-            :source => {:type => String, :nil_ok => true, :regex => /\A[\w\.-]+\z/}
+            :source => {:type => String, :nil_ok => true, :regex => /\A[\w\.-]+\z/},
+            :ttl => {:type => Integer, :nil_ok => true}
           }
           read_data(rules) do |data|
             publish_check_result("sensu-api", data)

data/lib/sensu/client/process.rb

@@ -84,6 +84,7 @@ module Sensu
       #
       # @param check [Hash]
       def publish_check_result(check)
+        check.delete(:source) if check[:source] == ""
         payload = {
           :client => @settings[:client][:name],
           :check => check

data/lib/sensu/constants.rb

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

data/lib/sensu/server/filter.rb

@@ -192,7 +192,11 @@ module Sensu
       #   filtered.
       # @yieldparam event [Hash]
       def filter_event(handler, event)
-        details = {:handler => handler, :event => event}
+        handler_info = case handler[:type]
+          when "extension" then handler.definition
+          else handler  
+        end
+        details = {:handler => handler_info, :event => event}
         filter_message = case
         when handling_disabled?(event)
           "event handling disabled for event"

data/lib/sensu/server/process.rb

@@ -836,7 +836,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/utilities.rb

@@ -51,6 +51,31 @@ module Sensu
       merged
     end
 
+    # Creates a deep dup of basic ruby objects with support for walking
+    # hashes and arrays.
+    #
+    # @param obj [Object]
+    # @return [obj] a dup of the original object.
+    def deep_dup(obj)
+      if obj.class == Hash
+        new_obj = obj.dup
+        new_obj.each do |key, value|
+          new_obj[deep_dup(key)] = deep_dup(value)
+        end
+        new_obj
+      elsif obj.class == Array
+        arr = []
+        obj.each do |item|
+          arr << deep_dup(item)
+        end
+        arr
+      elsif obj.class == String
+        obj.dup
+      else
+        obj
+      end
+    end
+
     # Retrieve the system hostname. If the hostname cannot be
     # determined and an error is thrown, `nil` will be returned.
     #

data/sensu.gemspec

@@ -10,7 +10,6 @@ Gem::Specification.new do |s|
   s.summary     = "A monitoring framework"
   s.description = "A monitoring framework that aims to be simple, malleable, and scalable."
   s.license     = "MIT"
-  s.has_rdoc    = false
 
   s.add_dependency "eventmachine", "1.2.5"
   s.add_dependency "sensu-json", "2.1.1"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sensu
 version: !ruby/object:Gem::Version
-  version: 1.4.2
+  version: 1.4.3
 platform: ruby
 authors:
 - Sean Porter
@@ -31,7 +31,7 @@ cert_chain:
   jOeGyhtQa9j4FFmsEJDg59f5v/3hECXsa3Xuml3foaFHzX3Ya/YIyd2YFxvkFKIu
   GVbe7A3YdxzdkH2Es/Ym9twdxXaIDdXzj8sWhw==
   -----END CERTIFICATE-----
-date: 2018-05-10 00:00:00.000000000 Z
+date: 2018-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine