sensu-settings 1.8.0 → 1.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1a4f1a3ec54f01cdcbc1695ae3ea50bd3f729e45
-  data.tar.gz: 38ab52e28a371d5466c4275e24b9027dd9b35eb3
+  metadata.gz: c40db4538a2eb9d126977fc84d1c1a7276517986
+  data.tar.gz: 5f13e4dac37f2b7abda31f79c6580244c50ff6ab
 SHA512:
-  metadata.gz: ccf5e6b166eb86f7e505c49838fd537468ead0a1573d0725490fa93e84aa265b4d124a167b057148dbed4e0ef027abe47f24e146b14b7c153d1d29b40e249d09
-  data.tar.gz: 9c8bcdbc0271df0ba12684bc7323c082030398eef0e6a2cb15297cb8b2f22dcda87b879edd29862575d29e6c9729bf7fe3c21d5d55955bd233ce9cb8e3e174ed
+  metadata.gz: 694e9e8e2590d42fc060e938226aa9c2460c79fdec5dedec4d83946a1b19370b6bb22a2da5697bd583070573a1e0d1813d76167ca6b7300966e32569838aed79
+  data.tar.gz: 456f4622d3e33dc8bdb00f7703655541edda5939d3f5cb1fd69c089232f124d7fd1c350e592722c6a26b0037f88cfa59211984315bd94580a4be4974ceb12d1b

data/lib/sensu/settings/rules.rb

@@ -59,6 +59,7 @@ module Sensu
       def must_be_an_integer(value)
         value.is_a?(Integer)
       end
+      alias_method :is_an_integer?, :must_be_an_integer
 
       # Check that a value is an integer, if set (not nil).
       #

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

@@ -2,6 +2,32 @@ module Sensu
   module Settings
     module Validators
       module Check
+        # Validate check name.
+        # Validates: name
+        #
+        # @param check [Hash] sensu check definition.
+        def validate_check_name(check)
+          must_be_a_string(check[:name]) ||
+            invalid(check, "check name must be a string")
+          must_match_regex(/^[\w\.-]+$/, check[:name]) ||
+            invalid(check, "check name cannot contain spaces or special characters")
+        end
+
+        # Validate check execution.
+        # Validates: command, extension, timeout
+        #
+        # @param check [Hash] sensu check definition.
+        def validate_check_execution(check)
+          must_be_a_string_if_set(check[:command]) ||
+            invalid(check, "check command must be a string")
+          must_be_a_string_if_set(check[:extension]) ||
+            invalid(check, "check extension must be a string")
+          (!check[:command].nil? ^ !check[:extension].nil?) ||
+            invalid(check, "either check command or extension must be set")
+          must_be_a_numeric_if_set(check[:timeout]) ||
+            invalid(check, "check timeout must be numeric")
+        end
+
         # Validate check source.
         # Validates: source
         #
@@ -53,6 +79,19 @@ module Sensu
           end
         end
 
+        # Validate check ttl.
+        # Validates: ttl
+        #
+        # @param check [Hash] sensu check definition.
+        def validate_check_ttl(check)
+          if is_an_integer?(check[:ttl])
+            check[:ttl] > 0 ||
+              invalid(check, "check ttl must be greater than 0")
+          else
+            invalid(check, "check ttl must be an integer")
+          end
+        end
+
         # Validate check flap detection.
         # Validates: low_flap_threshold, high_flap_threshold
         #
@@ -70,21 +109,12 @@ module Sensu
         #
         # @param check [Hash] sensu check definition.
         def validate_check(check)
-          must_be_a_string(check[:name]) ||
-            invalid(check, "check name must be a string")
-          must_match_regex(/^[\w\.-]+$/, check[:name]) ||
-            invalid(check, "check name cannot contain spaces or special characters")
-          must_be_a_string_if_set(check[:command]) ||
-            invalid(check, "check command must be a string")
-          must_be_a_string_if_set(check[:extension]) ||
-            invalid(check, "check extension must be a string")
-          (!check[:command].nil? ^ !check[:extension].nil?) ||
-            invalid(check, "either check command or extension must be set")
-          must_be_a_numeric_if_set(check[:timeout]) ||
-            invalid(check, "check timeout must be numeric")
+          validate_check_name(check)
+          validate_check_execution(check)
           validate_check_source(check) if check[:source]
           validate_check_scheduling(check)
           validate_check_handling(check)
+          validate_check_ttl(check) if check[:ttl]
           validate_check_flap_detection(check)
           validate_subdue(check) if check[:subdue]
         end

data/sensu-settings.gemspec

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

data/spec/validator_spec.rb

@@ -134,6 +134,18 @@ describe "Sensu::Settings::Validator" do
     check[:handlers] = ["cat"]
     @validator.validate_check(check)
     expect(@validator.reset).to eq(0)
+    check[:ttl] = true
+    @validator.validate_check(check)
+    expect(@validator.reset).to eq(1)
+    check[:ttl] = -1
+    @validator.validate_check(check)
+    expect(@validator.reset).to eq(1)
+    check[:ttl] = 0
+    @validator.validate_check(check)
+    expect(@validator.reset).to eq(1)
+    check[:ttl] = 1
+    @validator.validate_check(check)
+    expect(@validator.reset).to eq(0)
     check[:low_flap_threshold] = "25"
     @validator.validate_check(check)
     expect(@validator.reset).to eq(2)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sensu-settings
 version: !ruby/object:Gem::Version
-  version: 1.8.0
+  version: 1.9.0
 platform: ruby
 authors:
 - Sean Porter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-06 00:00:00.000000000 Z
+date: 2015-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json