sensu-settings 10.3.0 → 10.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: df9c1ef226d6f1b790459970331430e6fc740b07
-  data.tar.gz: 58f9d03a7de2bff8d766a7e4109c2bb2ecbd11c3
+  metadata.gz: 6c5b2454c21bd8dac94282bf6ab6daf6a2c7589d
+  data.tar.gz: f0f516937a784b9c2b644b02d4a8616d0c89ba87
 SHA512:
-  metadata.gz: e5b87f47d462f87fdd37bf35d80d868f19d015dd6f222c41cb78e7aba31120d822362d17d6887809b61b25c9dba78ef687d21a9259a91cc50312d33fe59da63b
-  data.tar.gz: 63f704d725f0903a215716fb5867794d76a423b91a6fc6946badb8fa352638e1d7f716e4610cf09a8a38d0d26e6e20940badb2521d42238190f25d4fbe919967
+  metadata.gz: 68fcba68d86d49c144a284742f908e2011fb3064ef7a7606928dff8366b20e47f126732da568120d8f9753a8c4233fb9ddd88bb969db52ed23c15a1dcbdd4cc8
+  data.tar.gz: a2ead53a65aab124f700daf30f2db13424f908f1cff983f41cb369c5f0f0449ca568f87da1225d383e4740f62b624d3a003b59c4db43274131fa31216e958b9b

data/README.md

@@ -20,6 +20,7 @@ Documentation can be found [here](http://rubydoc.info/github/sensu/sensu-setting
 
 ## Contributing
 
+0. By contributing to this project you agree to abide by the [code of conduct](https://sensuapp.org/conduct).
 1. [Fork it](https://github.com/sensu/sensu-settings/fork)
 2. Create your feature branch (`git checkout -b my-new-feature`)
 3. Commit your changes (`git commit -am 'Add some feature'`)

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

@@ -165,6 +165,36 @@ module Sensu
           end
         end
 
+        # Validate check hook execution.
+        # Validates: command, timeout
+        #
+        # @param check [Hash] sensu check definition.
+        # @param hook [Hash] sensu check hook definition.
+        def validate_check_hook_execution(check, hook)
+          must_be_a_string(hook[:command]) ||
+            invalid(check, "check hook command must be a string")
+          must_be_a_numeric_if_set(hook[:timeout]) ||
+            invalid(check, "check hook timeout must be numeric")
+        end
+
+        # Validate check hooks.
+        # Validates: hooks
+        #
+        # @param check [Hash] sensu check definition.
+        def validate_check_hooks(check)
+          if check[:hooks].is_a?(Hash)
+            check[:hooks].each do |key, hook|
+              must_be_either(%w[ok warning critical unknown], key.to_s) ||
+                (0..255).map {|i| i.to_s}.include?(key.to_s) ||
+                key.to_s == "non-zero" ||
+                invalid(check, "check hook key must be a severity, status, or 'non-zero'")
+              validate_check_hook_execution(check, hook)
+            end
+          else
+            invalid(check, "check hooks must be a hash")
+          end
+        end
+
         # Validate check subdue.
         # Validates: subdue
         #
@@ -186,6 +216,7 @@ module Sensu
           validate_check_ttl(check) if check[:ttl]
           validate_check_aggregate(check)
           validate_check_flap_detection(check)
+          validate_check_hooks(check) if check[:hooks]
           validate_check_subdue(check) if check[:subdue]
         end
       end

data/sensu-settings.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name          = "sensu-settings"
-  spec.version       = "10.3.0"
+  spec.version       = "10.4.0"
   spec.authors       = ["Sean Porter"]
   spec.email         = ["portertech@gmail.com"]
   spec.summary       = "The Sensu settings library, loader and validator"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sensu-settings
 version: !ruby/object:Gem::Version
-  version: 10.3.0
+  version: 10.4.0
 platform: ruby
 authors:
 - Sean Porter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-24 00:00:00.000000000 Z
+date: 2017-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sensu-json