sensu 0.20.3-java → 0.20.4-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6bdb850d6c7b07c8ec7f1744ea6e21bf202f490b
-  data.tar.gz: fc06b4b6d5667b3d68a0144753ab0f73c14a5516
+  metadata.gz: 34732700241b68d848504a8292bd3b75f6348fdd
+  data.tar.gz: 4541192775dd95f090a1dfe208e1833862cf475d
 SHA512:
-  metadata.gz: f9fed6d86d7190e082dcd6e6be9f7b10334cb19265922cf9cbdc7711dd8ef398c3c4f93af973d5f34081eb3bee5e78ac769ec41a00b499f82a140b1644f53177
-  data.tar.gz: ad0d75574b48a0600773643b1ef01b54d03746efe6cd2b03716e1b6679e8132cd4ce313a2df18379b932a8da36e7d8799e03d5b126e47561f8ea07605f235b92
+  metadata.gz: 654731652717fe1a940ca0e7f24caae822525f0c7923675107fb6c2431016f63a3a91dc3c3293f0fd71064be081e2c39072f50bfbab4685649c3921d7888cd5c
+  data.tar.gz: eae20f46c3de25fc7559226fa8920b1c31b7393e6584b6dd6859c3d9fddfb345e9d5d822ac36d654c593af60649ef4ce606be4835c2dae7d648174e955a37920

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: java
 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,12 +129,12 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 3.2.1
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 3.2.1
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency