sensu 0.20.3 → 0.20.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b4b99ec27fad9dd917c0a15b4aee2effdd105cce
-  data.tar.gz: 6599a21f33b14289af3b2d4bc7ecbf983853f16c
+  metadata.gz: 5469b19ac21f6339e4d64ae5c8437e58f2f19b50
+  data.tar.gz: ea3e79ea6588dfd3579b0dca1b39282b988cceaa
 SHA512:
-  metadata.gz: 495461ab13fbeb0c93e838e66f357cb7a109fabd7467ec8fff47a78c565a1964563af35b580058a2f79bbaf0bff6c193939532744119c16a39fc83a72fc24620
-  data.tar.gz: 2d9b0a49eb9c887b9061020cf10ec42fe2c73e9e70d936def991a0f30243c8526536a8e4d069dafeaef7e31e0a3e304b3f283044a0fa892fb1bb1edc1c677882
+  metadata.gz: 0c0d2fcb925f79554e5c5a7e39852ad2db7c0db1fef889c4c9be68432a742c747a96266d77c99915aa9ee65b9cdf99a744feedcd4c5830750fe94222ec3d2f49
+  data.tar.gz: ab20c73aaca110365baafde283548bca34a7863ae65dd523ffc98bc3d1945f8abbd30aca06e452d5700d56e5ef110025b9642d72268a62e4c0011cd8c520ff30

data/CHANGELOG.md

@@ -1,3 +1,17 @@
+## 0.20.4 - 2015-08-28
+
+### Other
+
+Improved check output truncation. Metric check output is truncated to a
+single line and 256 characters. Standard check output is not modified.
+
+Fixed API /results endpoint, now including all results in a single
+response (unless pagination is used).
+
+Locked amq-protocol to 1.9.2, as 2.x.x does not work on older Rubies.
+
+Fixed pipe handler output logging on JRuby.
+
 ## 0.20.3 - 2015-08-11
 
 ### Other

data/lib/sensu/api/process.rb

@@ -740,7 +740,7 @@ module Sensu
           unless clients.empty?
             clients.each_with_index do |client_name, client_index|
               settings.redis.smembers("result:#{client_name}") do |checks|
-                unless checks.empty?
+                if !checks.empty?
                   checks.each_with_index do |check_name, check_index|
                     result_key = "result:#{client_name}:#{check_name}"
                     settings.redis.get(result_key) do |result_json|
@@ -751,7 +751,7 @@ module Sensu
                       end
                     end
                   end
-                else
+                elsif client_index == clients.size - 1
                   body MultiJson.dump(response)
                 end
               end

data/lib/sensu/constants.rb

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

data/lib/sensu/daemon.rb

@@ -7,7 +7,7 @@ gem "sensu-logger", "1.0.0"
 gem "sensu-settings", "3.1.0"
 gem "sensu-extension", "1.1.2"
 gem "sensu-extensions", "1.2.0"
-gem "sensu-transport", "3.2.0"
+gem "sensu-transport", "3.2.1"
 gem "sensu-spawn", "1.3.0"
 
 require "time"

data/lib/sensu/server/handle.rb

@@ -34,7 +34,7 @@ module Sensu
         Spawn.process(handler[:command], options) do |output, status|
           @logger.info("handler output", {
             :handler => handler,
-            :output => output.lines
+            :output => output.split("\n+")
           })
           @handling_event_count -= 1 if @handling_event_count
         end

data/lib/sensu/server/process.rb

@@ -199,11 +199,33 @@ module Sensu
         end
       end
 
+      # Truncate check output. For metric checks, (`"type":
+      # "metric"`), check output is truncated to a single line and a
+      # maximum of 255 characters. Check output is currently left
+      # unmodified for standard checks.
+      #
+      # @param check [Hash]
+      # @return [Hash] check with truncated output.
+      def truncate_check_output(check)
+        case check[:type]
+        when "metric"
+          output_lines = check[:output].split("\n")
+          output = output_lines.first
+          if output_lines.size > 1 || output.length > 255
+            output = output[0..255] + "\n..."
+          end
+          check.merge(:output => output)
+        else
+          check
+        end
+      end
+
       # Store check result data. This method stores check result data
       # and the 21 most recent check result statuses for a client/check
       # pair, this history is used for event context and flap detection.
       # The check execution timestamp is also stored, to provide an
-      # indication of how recent the data is.
+      # indication of how recent the data is. Check output is
+      # truncated by `truncate_check_output()` before it is stored.
       #
       # @param client [Hash]
       # @param check [Hash]
@@ -213,7 +235,7 @@ module Sensu
         @logger.debug("storing check result", :check => check)
         @redis.sadd("result:#{client[:name]}", check[:name])
         result_key = "#{client[:name]}:#{check[:name]}"
-        check_truncated = check.merge(:output => check[:output][0..256])
+        check_truncated = truncate_check_output(check)
         @redis.set("result:#{result_key}", MultiJson.dump(check_truncated)) do
           history_key = "history:#{result_key}"
           @redis.rpush(history_key, check[:status]) do

data/sensu.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |s|
   s.add_dependency "sensu-settings", "3.1.0"
   s.add_dependency "sensu-extension", "1.1.2"
   s.add_dependency "sensu-extensions", "1.2.0"
-  s.add_dependency "sensu-transport", "3.2.0"
+  s.add_dependency "sensu-transport", "3.2.1"
   s.add_dependency "sensu-spawn", "1.3.0"
   s.add_dependency "em-redis-unified", "1.0.0"
   s.add_dependency "sinatra", "1.4.6"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sensu
 version: !ruby/object:Gem::Version
-  version: 0.20.3
+  version: 0.20.4
 platform: ruby
 authors:
 - Sean Porter
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-11 00:00:00.000000000 Z
+date: 2015-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -129,14 +129,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 3.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 3.2.1
 - !ruby/object:Gem::Dependency
   name: sensu-spawn
   requirement: !ruby/object:Gem::Requirement