sensu 0.25.5 → 0.25.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 02d86ad1519a656086b16c960bbca484bb92a4ca
-  data.tar.gz: da7868c4ce10e396a97630a2888aaad5ce45014d
+  metadata.gz: 39c2b42d1f03fb1e40498fdf10de1d9fc5480653
+  data.tar.gz: f50b00c57e67d023930a959c8fedf4bc6d9b533b
 SHA512:
-  metadata.gz: 217e47e5de21cba8aba1aba6da58a56b87172f55f1ef254529cf29b17faffcff187fefc31ebd822cc92ed2fd5cdd2bf1c5b5cff565ffd39a1e0482b2d0885770
-  data.tar.gz: 8af3432ae93ab3d5282b4ab717252dbac9bd352cb1663a5f167f026671caf378df03ce2edb2506c64ae5924cd3e13ba76748f6da728d8aa94822ec266419db03
+  metadata.gz: 162656e3a8f636a7a7a5c36caea15687e6d0e6181711208c24cb3deafe7cf16ade1fef1e198e392ac73b7f30bf6e34b0da908e5f18c508e5b5a3d4c4cf3cb739
+  data.tar.gz: 9adb69483efc57025f13ae328890291ae2b17805a2fbd3c72bec78bd6b60e24f01797f2cd64789b713b9fecd5bec40e770e669a608c7bc18d2eb2b9abd8afa13

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+## 0.25.6 - 2016-07-28
+
+### Fixes
+
+Check results for unmatched tokens now include an executed timestamp.
+
+API aggregates max_age now guards against check results with a `nil`
+executed timestamp.
+
 ## 0.25.5 - 2016-07-12
 
 ### Fixes

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

@@ -58,7 +58,7 @@ module Sensu
                       result_count = results.length
                       timestamp = Time.now.to_i - max_age
                       results.reject! do |result|
-                        result[:executed] < timestamp
+                        result[:executed] && result[:executed] < timestamp
                       end
                       @response_content[:results][:stale] = result_count - results.length
                     end
@@ -160,7 +160,7 @@ module Sensu
                     unless result_json.nil?
                       result = Sensu::JSON.load(result_json)
                       if SEVERITIES[result[:status]] == severity &&
-                          (max_age.nil? || result[:executed] >= (current_timestamp - max_age))
+                          (max_age.nil? || result[:executed].nil? || result[:executed] >= (current_timestamp - max_age))
                         summaries[check_name] ||= {}
                         summaries[check_name][result[:output]] ||= {:total => 0, :clients => []}
                         summaries[check_name][result[:output]][:total] += 1

data/lib/sensu/client/process.rb

@@ -145,9 +145,9 @@ module Sensu
           @checks_in_progress << check[:name]
           substituted, unmatched_tokens = object_substitute_tokens(check.dup)
           check = substituted.merge(:command => check[:command])
+          started = Time.now.to_f
+          check[:executed] = started.to_i
           if unmatched_tokens.empty?
-            started = Time.now.to_f
-            check[:executed] = started.to_i
             Spawn.process(substituted[:command], :timeout => check[:timeout]) do |output, status|
               check[:duration] = ("%.3f" % (Time.now.to_f - started)).to_f
               check[:output] = output

data/lib/sensu/constants.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sensu
 version: !ruby/object:Gem::Version
-  version: 0.25.5
+  version: 0.25.6
 platform: ruby
 authors:
 - Sean Porter
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-07-12 00:00:00.000000000 Z
+date: 2016-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine