sensu-settings 5.0.1 → 5.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 365f93ccdb13c600eb978fd62feae6253b2b4647
-  data.tar.gz: bbaba4c2380b990a7d36eac82b0f8f5d4f7b18e0
+  metadata.gz: b105b89c40f34934a546ccf394ae680e3c576ecb
+  data.tar.gz: 7761ac36a88894957b99509e3db28285dbe70d27
 SHA512:
-  metadata.gz: ed41c6a0c689f47259cd2d446225f913b2302c56a3a6f077880c978cb0983deca7b22a45edae2119d2cb9662b7dcd67050d38ae499eaa3ef745cb3ce01dcecc3
-  data.tar.gz: a79fd4c4779b0ec8bba923d41b6049f93c28205d4eba8ddf9bf3ab523d6ff1d74e52802f7903e6fe00edbc09abc4c6d4f58e7634af24fe8ac16c55daeb676bf7
+  metadata.gz: 11439eb54a3e92cc7cbc6c38afad9daec1027c6df2738e0709e3ef4ad0da9097bfc55bfc47927eebe9d399569f26e2b14231209900c167083aca1abe1333a189
+  data.tar.gz: 6c2b3dd3773e45e87ad0669cf216a0cd5e5953dd339a71abe11d815e5f770860908ddb09b04f771ac3239db3b9e7f291f1bb0f89cee91848fdf36c3234bb4022

data/lib/sensu/settings/rules.rb

@@ -94,12 +94,20 @@ module Sensu
         (value =~ regex) == 0
       end
 
+      # Check if a value is boolean.
+      #
+      # @param value [Object] to check.
+      # @return [TrueClass, FalseClass]
+      def must_be_boolean(value)
+        !!value == value
+      end
+
       # Check if a value is boolean, if set (no nil).
       #
       # @param value [Object] to check.
       # @return [TrueClass, FalseClass]
       def must_be_boolean_if_set(value)
-        value.nil? ? true : (!!value == value)
+        value.nil? ? true : must_be_boolean(value)
       end
 
       # Check that value items are all strings and not empty.

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

@@ -92,6 +92,20 @@ module Sensu
           end
         end
 
+        # Validate check aggregate.
+        # Validates: aggregate
+        #
+        # @param check [Hash] sensu check definition.
+        def validate_check_aggregate(check)
+          if is_a_string?(check[:aggregate])
+            must_match_regex(/\A[\w\.-]+\z/, check[:aggregate]) ||
+              invalid(check, "check aggregate cannot contain spaces or special characters")
+          else
+            must_be_boolean(check[:aggregate]) ||
+              invalid(check, "check aggregate must be a string (name) or boolean")
+          end
+        end
+
         # Validate check flap detection.
         # Validates: low_flap_threshold, high_flap_threshold
         #
@@ -115,6 +129,7 @@ module Sensu
           validate_check_scheduling(check)
           validate_check_handling(check)
           validate_check_ttl(check) if check[:ttl]
+          validate_check_aggregate(check) if check[:aggregate]
           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       = "5.0.1"
+  spec.version       = "5.1.0"
   spec.authors       = ["Sean Porter"]
   spec.email         = ["portertech@gmail.com"]
   spec.summary       = "The Sensu settings library, loader and validator"

data/spec/validator_spec.rb

@@ -188,6 +188,18 @@ describe "Sensu::Settings::Validator" do
     check[:ttl] = 1
     @validator.validate_check(check)
     expect(@validator.reset).to eq(0)
+    check[:aggregate] = 1
+    @validator.validate_check(check)
+    expect(@validator.reset).to eq(1)
+    check[:aggregate] = true
+    @validator.validate_check(check)
+    expect(@validator.reset).to eq(0)
+    check[:aggregate] = "$test"
+    @validator.validate_check(check)
+    expect(@validator.reset).to eq(1)
+    check[:aggregate] = "test"
+    @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: 5.0.1
+  version: 5.1.0
 platform: ruby
 authors:
 - Sean Porter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-30 00:00:00.000000000 Z
+date: 2016-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sensu-json