sensu 1.8.0 → 1.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 728eb3609156df3d3489872c99c1d4ef04b8a92b
-  data.tar.gz: ea6d94c2b1f3addfe260054bbf18bfe1e0954e13
+  metadata.gz: 50aff68890750e1f00216055fb07a1ce9fc42d1a
+  data.tar.gz: 9414ba01d9e17fed244df0c41643113d87c9f9a3
 SHA512:
-  metadata.gz: 6a79bb25f822ff870f9188e3e9fd474bfb29fffe03556d1361121d33cfd6f8991718452e3740f5f3272bbcb6dbd7df6eac2dd2043782a52494358970a6d9305c
-  data.tar.gz: fe0ac2b3af8f6ce01e8b61684cd93bdff4361604be2da8f003c7c5f914ba6edb293bd29ad7b989f0cfb549e6bf696372c6eff85eb7189f5f445dc2c38955ead7
+  metadata.gz: b3cd5096f3c1a88b07d3a84a95851abc37a3f6c8949dc517692dd2b7783e66fdeb2aae5b83f2a99d328bfe4fcd6f2073ff837890a0ab78ccdc4bd9078a2d88a0
+  data.tar.gz: 6fe20dfb75829f00412dd51f244e5e8955dd7d37475d70a35d6fd49cd4aea77f54156bcf0fc82cd22d3695f1f23034f370a0651278fd20986d2f1a1487582161

data/CHANGELOG.md

@@ -5,6 +5,17 @@ This CHANGELOG follows the format listed [here](https://github.com/sensu-plugins
 
 ## [Unreleased]
 
+## [1.9.0] - 2019-12-18
+
+### Fixed
+- Fixed check subdue times resolution, now including nanoseconds.
+- API 204 no content responses now return a nil body.
+- Fixed Travis CI testing (RabbitMQ was missing on Xenial).
+
+### Added
+- Added support for discarding oversized transport messages to protect
+Sensu, e.g. {"sensu":{"server": {"max_message_size": 2097152}}}.
+
 ## [1.8.0] - 2019-07-09
 
 ### Added

data/README.md

@@ -5,13 +5,14 @@
 [![MIT Licensed](https://img.shields.io/github/license/sensu/sensu.svg)](https://raw.githubusercontent.com/sensu/sensu/master/MIT-LICENSE.txt)
 [![Join the chat at https://slack.sensu.io/](https://slack.sensu.io/badge.svg)](https://slack.sensu.io/)
 
-** ANNOUNCEMENT - Sensu 1.x End-Of-Life on December 31st, 2019 **
+:warning: **ANNOUNCEMENT - Sensu 1.x End-Of-Life on December 31st, 2019**
 
 Sensu 1.x is currently in maintenance mode (critical bugs and security
 patch releases only) with no new feature enhancements or additions
 being planned at this time. The project will be end-of-life on
-December 31st, 2019. Please see our Discourse post for more details:
-https://discourse.sensu.io/t/the-eol-schedule-for-sensu-core-1-x-and-sensu-enterprise-3-x/1222
+December 31st, 2019 and existing package repositories will become 
+unreachable on January 6th, 2020. Please see our blog post for more details:
+https://blog.sensu.io/announcing-the-sensu-archives
 
 Sensu 1.x has been superseded by [Sensu Go](https://github.com/sensu/sensu-go).
 

data/lib/sensu/api/http_handler.rb

@@ -281,6 +281,7 @@ module Sensu
       def no_content!
         @response_status = 204
         @response_status_string = "No Content"
+        @response_content = nil
         respond
       end
 

data/lib/sensu/constants.rb

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

data/lib/sensu/daemon.rb

@@ -4,7 +4,7 @@ gem "eventmachine", "1.2.7"
 
 gem "sensu-json", "2.1.1"
 gem "sensu-logger", "1.2.2"
-gem "sensu-settings", "10.16.0"
+gem "sensu-settings", "10.17.0"
 gem "sensu-extension", "1.5.2"
 gem "sensu-extensions", "1.11.0"
 gem "sensu-transport", "8.3.0"

data/lib/sensu/server/process.rb

@@ -175,6 +175,33 @@ module Sensu
         end
       end
 
+      # Determine if a transport message is under the optional
+      # configured max message size. This method helps prevent
+      # oversized messages from consuming memory and being persisted
+      # to the datastore.
+      #
+      # @param message [String]
+      # @return [TrueClass,FalseClass]
+      def message_size_ok?(message)
+        if @settings[:sensu][:server] &&
+           @settings[:sensu][:server][:max_message_size]
+          message_size = message.bytesize
+          max_message_size = @settings[:sensu][:server][:max_message_size]
+          if message_size <= max_message_size
+            true
+          else
+            @logger.error("message exceeds the configured max message size", {
+              :max_message_size => max_message_size,
+              :message_size => message_size,
+              :message => message
+            })
+            false
+          end
+        else
+          true
+        end
+      end
+
       # Set up the client keepalive consumer, keeping the Sensu client
       # registry updated. The consumer receives JSON serialized client
       # keepalives from the transport, parses them, and calls
@@ -190,14 +217,16 @@ module Sensu
         @logger.debug("subscribing to keepalives", :pipe => keepalives_pipe)
         @transport.subscribe(:direct, keepalives_pipe, "keepalives", :ack => true) do |message_info, message|
           @logger.debug("received keepalive", :message => message)
-          begin
-            client = Sensu::JSON.load(message)
-            update_client_registry(client)
-          rescue Sensu::JSON::ParseError => error
-            @logger.error("failed to parse keepalive payload", {
-              :message => message,
-              :error => error.to_s
-            })
+          if message_size_ok?(message)
+            begin
+              client = Sensu::JSON.load(message)
+              update_client_registry(client)
+            rescue Sensu::JSON::ParseError => error
+              @logger.error("failed to parse keepalive payload", {
+                :message => message,
+                :error => error.to_s
+              })
+            end
           end
           EM::next_tick do
             @transport.ack(message_info)
@@ -742,15 +771,17 @@ module Sensu
         end
         @logger.debug("subscribing to results", :pipe => results_pipe)
         @transport.subscribe(:direct, results_pipe, "results", :ack => true) do |message_info, message|
-          begin
-            result = Sensu::JSON.load(message)
-            @logger.debug("received result", :result => result)
-            process_check_result(result)
-          rescue Sensu::JSON::ParseError => error
-            @logger.error("failed to parse result payload", {
-              :message => message,
-              :error => error.to_s
-            })
+          if message_size_ok?(message)
+            begin
+              result = Sensu::JSON.load(message)
+              @logger.debug("received result", :result => result)
+              process_check_result(result)
+            rescue Sensu::JSON::ParseError => error
+              @logger.error("failed to parse result payload", {
+                :message => message,
+                :error => error.to_s
+              })
+            end
           end
           EM::next_tick do
             @transport.ack(message_info)

data/lib/sensu/utilities.rb

@@ -8,6 +8,7 @@ require "socket"
 module Sensu
   module Utilities
     EVAL_PREFIX = "eval:".freeze
+    NANOSECOND_RESOLUTION = 9.freeze
 
     # Determine if Sensu is being tested, using the process name.
     # Sensu is being test if the process name is "rspec",
@@ -334,9 +335,9 @@ module Sensu
         end_time = Time.parse(condition[:end])
         if end_time < begin_time
           if Time.now < end_time
-            begin_time = Time.new(*begin_time.strftime("%Y %m %d 00 00 00 %:z").split("\s"))
+            begin_time = Time.parse(*begin_time.strftime("%Y-%m-%d 00:00:00.#{Array.new(NANOSECOND_RESOLUTION, 0).join} %:z"))
           else
-            end_time = Time.new(*end_time.strftime("%Y %m %d 23 59 59 %:z").split("\s"))
+            end_time = Time.parse(*end_time.strftime("%Y-%m-%d 23:59:59.#{Array.new(NANOSECOND_RESOLUTION, 9).join} %:z"))
           end
         end
         Time.now >= begin_time && Time.now <= end_time

data/sensu.gemspec

@@ -14,7 +14,7 @@ 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.16.0"
+  s.add_dependency "sensu-settings", "10.17.0"
   s.add_dependency "sensu-extension", "1.5.2"
   s.add_dependency "sensu-extensions", "1.11.0"
   s.add_dependency "sensu-transport", "8.3.0"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sensu
 version: !ruby/object:Gem::Version
-  version: 1.8.0
+  version: 1.9.0
 platform: ruby
 authors:
 - Sean Porter
@@ -30,7 +30,7 @@ cert_chain:
   X5jpMGFeJITiueL7BQsPY5HHiTjshkT/ltr+YQnQd3g3jR8+AoCIUylCFdJNy2CZ
   oPVvM0H5TyjtwccVj04b6tZoRho=
   -----END CERTIFICATE-----
-date: 2019-07-09 00:00:00.000000000 Z
+date: 2019-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
@@ -80,14 +80,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 10.16.0
+        version: 10.17.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 10.16.0
+        version: 10.17.0
 - !ruby/object:Gem::Dependency
   name: sensu-extension
   requirement: !ruby/object:Gem::Requirement