sensu-settings 9.8.0 → 9.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 417045b32942806ce02f52f28dcab9ee41c3c8d9
-  data.tar.gz: f6ae85f63436e637984525ebfa974d67c146e614
+  metadata.gz: ad6aa38a2670cc323faf4d9c9e44cf378808181c
+  data.tar.gz: b1329ce300073a6efee7bc5f2a9eed8a495db24b
 SHA512:
-  metadata.gz: 9b043f5ea045abdc56a4aec630f19d95d6212ed32b6973d898dcc49e354303e6dd245d53263faaecd5ea64304910ba54b9e54cd14b3cf1989960f4d780936307
-  data.tar.gz: 3e6d844a34c4fb67ba6beccda5117ef08481cb5ac02540a223cc8f049794533b7cce7632ea57d08f51b3307798bfe9c095bfe8842ca50b2ff31c7c7423ed1d75
+  metadata.gz: 4933d28d1f7319626868f186e3d796cebb3e6b3510154ddb717ddfada7c188bf26124d8c8541a9482876c15703f7a280869996aa82b2616010163b490ac933e9
+  data.tar.gz: 2122cf394f8eb98b23376586c801e4b0248a636c7a0bd2e2b17f2983c780a960fd6a72ac650992a03aef81cefb438a73931ff3ed3baee4c7a8f6149ea83a6c57

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

@@ -1,3 +1,5 @@
+require "parse-cron"
+
 module Sensu
   module Settings
     module Validators
@@ -41,16 +43,35 @@ module Sensu
           end
         end
 
+        # Validate check cron.
+        # Validates: cron
+        #
+        # @param check [Hash] sensu check definition.
+        def validate_check_cron(check)
+          must_be_a_string(check[:cron]) ||
+            invalid(check, "check cron must be a string")
+          begin
+            cron_parser = CronParser.new(check[:cron])
+            cron_parser.next(Time.now)
+          rescue ArgumentError
+            invalid(check, "check cron string must use the cron syntax")
+          end
+        end
+
         # Validate check scheduling.
-        # Validates: interval, standalone, subscribers
+        # Validates: publish, interval, standalone, subscribers
         #
         # @param check [Hash] sensu check definition.
         def validate_check_scheduling(check)
           must_be_boolean_if_set(check[:publish]) ||
             invalid(check, "check publish must be boolean")
           unless check[:publish] == false
-            (must_be_an_integer(check[:interval]) && check[:interval] > 0) ||
-              invalid(check, "check interval must be an integer greater than 0")
+            if check[:cron]
+              validate_check_cron(check)
+            else
+              (must_be_an_integer(check[:interval]) && check[:interval] > 0) ||
+                invalid(check, "check interval must be an integer greater than 0")
+            end
           end
           must_be_boolean_if_set(check[:standalone]) ||
             invalid(check, "check standalone must be boolean")

data/sensu-settings.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name          = "sensu-settings"
-  spec.version       = "9.8.0"
+  spec.version       = "9.9.0"
   spec.authors       = ["Sean Porter"]
   spec.email         = ["portertech@gmail.com"]
   spec.summary       = "The Sensu settings library, loader and validator"
@@ -16,6 +16,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "sensu-json", ">= 1.1.0"
+  spec.add_dependency "parse-cron"
 
   spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency "rake"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sensu-settings
 version: !ruby/object:Gem::Version
-  version: 9.8.0
+  version: 9.9.0
 platform: ruby
 authors:
 - Sean Porter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-16 00:00:00.000000000 Z
+date: 2017-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sensu-json
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.1.0
+- !ruby/object:Gem::Dependency
+  name: parse-cron
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement