sensu 1.4.3 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 77726a20c8e3a4cb2f549caa4f33c3c6bfcf4efb
-  data.tar.gz: c7fe0e9214ccb27c3b14bfa6aa7f89f7f5d07f1f
+  metadata.gz: cd7b102ebf9542da1c8e67721efb465c978f3978
+  data.tar.gz: '0950ca2940859b00064f57c3aea3ec52d37df446'
 SHA512:
-  metadata.gz: ef6330e24403cf0aa3d9b7e5ad9b918197ad3634583c053ffed676948f26737bf4aeda29e902318fa1c37864ca27b11250477900098bc6cf0f2467b6c95ab8e1
-  data.tar.gz: da78852eed102c0c250118384e976fad1c0fa64bf729b8c61459550a10a9400633f2ac093a264c56e69f9b31024e28e2260baeba6439ceceaa5ae481ab29a1e8
+  metadata.gz: 0c702e3136fa2c612b8f1b8d297de375ea0f3487f029485364915ea1fb43685ead29bc06114e3e3571d0b5781764b0ae89d42df49ecf86d448aa37996eae5364
+  data.tar.gz: 0451e6005668651a87f14eed8b7baa22300f7dd14d1ad37ad77c73fa5648b158044bd6c5b1e24cd3398728e1d8123d2fcbcb88e79670f9f27e16a78c66d9971c

data/CHANGELOG.md

@@ -5,6 +5,12 @@ This CHANGELOG follows the format listed [here](https://github.com/sensu-plugins
 
 ## [Unreleased]
 
+## [1.5.0] - 2018-09-04
+
+### Fixed
+- Bumped sensu-extensions to version 1.10.0 to include subscription support in the check dependencies filter.
+- Improved check result validation by applying existing validation rules from sensu-settings to check results created using the API and the client socket.
+
 ## [1.4.3] - 2018-07-23
 
 ### Fixed

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

@@ -142,6 +142,7 @@ module Sensu
                             result_key = "#{client_name}:#{check_name}"
                             @redis.del("result:#{result_key}")
                             @redis.del("history:#{result_key}")
+                            @redis.del("history:#{result_key}:last_ok")
                           end
                           @redis.del("result:#{client_name}")
                         end

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

@@ -1,3 +1,4 @@
+require "sensu/api/validators/check"
 require "sensu/api/utilities/publish_check_result"
 
 module Sensu
@@ -12,17 +13,17 @@ module Sensu
 
         # POST /results
         def post_results
-          rules = {
-            :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/},
-            :ttl => {:type => Integer, :nil_ok => true}
-          }
-          read_data(rules) do |data|
-            publish_check_result("sensu-api", data)
-            @response_content = {:issued => Time.now.to_i}
-            accepted!
+          read_data do |check|
+            check[:status] ||= 0
+            check[:executed] ||= Time.now.to_i
+            validator = Validators::Check.new
+            if validator.valid?(check)
+              publish_check_result("sensu-api", check)
+              @response_content = {:issued => Time.now.to_i}
+              accepted!
+            else
+              bad_request!
+            end
           end
         end
 

data/lib/sensu/api/validators/check.rb

@@ -0,0 +1,55 @@
+require "sensu/api/validators/invalid"
+require "sensu/settings/rules"
+require "sensu/settings/validators/check"
+
+module Sensu
+  module API
+    module Validators
+      class Check
+        # Include Sensu Settings rules and check validator.
+        include Sensu::Settings::Rules
+        include Sensu::Settings::Validators::Check
+
+        # Validate a check result, selectively using check definition
+        # validation methods.
+        #
+        # @param check [Hash]
+        def validate_check_result(check)
+          must_be_a_string(check[:output]) ||
+            invalid(check, "check output must be a string")
+          must_be_an_integer(check[:status]) ||
+            invalid(check, "check status must be an integer")
+          must_be_an_integer(check[:executed]) ||
+            invalid(check, "check executed timestamp must be an integer")
+          validate_check_name(check)
+          validate_check_handling(check)
+          validate_check_aggregate(check)
+          validate_check_flap_detection(check)
+          validate_check_truncate_output(check)
+          validate_check_source(check) if check[:source]
+          validate_check_ttl(check) if check[:ttl]
+        end
+
+        # Determine if a check definition is valid.
+        #
+        # @param check [Hash]
+        # @return [TrueClass, FalseClass]
+        def valid?(check)
+          validate_check_result(check)
+          true
+        rescue Invalid
+          false
+        end
+
+        private
+
+        # This method is called when validation methods encounter an
+        # invalid definition object. This method raises an exception
+        # to be caught by `valid?()`.
+        def invalid(*arguments)
+          raise Invalid
+        end
+      end
+    end
+  end
+end

data/lib/sensu/client/utils.rb

@@ -14,15 +14,6 @@ module Sensu
         unless validator.valid?(check)
           raise DataError, validator.failures.first[:message]
         end
-        unless check[:output].is_a?(String)
-          raise DataError, "check output must be a string"
-        end
-        unless check[:status].is_a?(Integer)
-          raise DataError, "check status must be an integer"
-        end
-        unless check[:executed].is_a?(Integer)
-          raise DataError, "check executed timestamp must be an integer"
-        end
       end
 
       # Process a check result. Set check result attribute defaults,

data/lib/sensu/client/validators/check.rb

@@ -20,12 +20,19 @@ module Sensu
         # @param client [Hash]
         # @return [TrueClass, FalseClass]
         def valid?(check)
+          must_be_a_string(check[:output]) ||
+            invalid(check, "check output must be a string")
+          must_be_an_integer(check[:status]) ||
+            invalid(check, "check status must be an integer")
+          must_be_an_integer(check[:executed]) ||
+            invalid(check, "check executed timestamp must be an integer")
           validate_check_name(check)
-          validate_check_source(check) if check[:source]
           validate_check_handling(check)
-          validate_check_ttl(check) if check[:ttl]
           validate_check_aggregate(check)
           validate_check_flap_detection(check)
+          validate_check_truncate_output(check)
+          validate_check_source(check) if check[:source]
+          validate_check_ttl(check) if check[:ttl]
           @failures.empty?
         end
 

data/lib/sensu/constants.rb

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

data/lib/sensu/daemon.rb

@@ -6,7 +6,7 @@ gem "sensu-json", "2.1.1"
 gem "sensu-logger", "1.2.2"
 gem "sensu-settings", "10.14.0"
 gem "sensu-extension", "1.5.2"
-gem "sensu-extensions", "1.9.1"
+gem "sensu-extensions", "1.10.0"
 gem "sensu-transport", "7.1.0"
 gem "sensu-spawn", "2.5.0"
 gem "sensu-redis", "2.3.0"

data/sensu.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
   s.add_dependency "sensu-logger", "1.2.2"
   s.add_dependency "sensu-settings", "10.14.0"
   s.add_dependency "sensu-extension", "1.5.2"
-  s.add_dependency "sensu-extensions", "1.9.1"
+  s.add_dependency "sensu-extensions", "1.10.0"
   s.add_dependency "sensu-transport", "7.1.0"
   s.add_dependency "sensu-spawn", "2.5.0"
   s.add_dependency "sensu-redis", "2.3.0"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sensu
 version: !ruby/object:Gem::Version
-  version: 1.4.3
+  version: 1.5.0
 platform: ruby
 authors:
 - Sean Porter
@@ -31,7 +31,7 @@ cert_chain:
   jOeGyhtQa9j4FFmsEJDg59f5v/3hECXsa3Xuml3foaFHzX3Ya/YIyd2YFxvkFKIu
   GVbe7A3YdxzdkH2Es/Ym9twdxXaIDdXzj8sWhw==
   -----END CERTIFICATE-----
-date: 2018-07-23 00:00:00.000000000 Z
+date: 2018-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
@@ -109,14 +109,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.9.1
+        version: 1.10.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.9.1
+        version: 1.10.0
 - !ruby/object:Gem::Dependency
   name: sensu-transport
   requirement: !ruby/object:Gem::Requirement
@@ -299,6 +299,7 @@ files:
 - lib/sensu/api/utilities/resolve_event.rb
 - lib/sensu/api/utilities/servers_info.rb
 - lib/sensu/api/utilities/transport_info.rb
+- lib/sensu/api/validators/check.rb
 - lib/sensu/api/validators/client.rb
 - lib/sensu/api/validators/invalid.rb
 - lib/sensu/cli.rb