sensu-settings 4.1.1 → 5.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ec4eeffddb4f928ca7f35e4db5d455aa883d7569
-  data.tar.gz: 3dfcc2c5db1020a95919534e3fae558ae9a557a0
+  metadata.gz: 945f0d180df7cf835f3fd0e94a998c7112a9f9f8
+  data.tar.gz: 51f3037a8a53f66dc1e1f91a2d25cabd15aacd15
 SHA512:
-  metadata.gz: 01aca6eb9d8281cfa44433f6a468ecf7a206fec2bf922171210016884e1fb47a039d7e2a84cff9d4d48fb6dfa29ac118387e326a7e6ae7e9d31b8943fee75081
-  data.tar.gz: b9ec4ea24e44e6079f7c2e99574fbe225b06a5054b853272012b5e80ef25933be5b247f0080dc9585851c816881771868631d5e3f4a5cb75f9f3e49e8b2d279e
+  metadata.gz: 7b4bf57d1d696f63120641a88f26691491648fccab35dffe7f88cc558e7dd61ff97c6ebdcb2586ae25944e4fbe23f3eb8c6c40c5e0b112214e0d089c2d21b9ff
+  data.tar.gz: 742dc56ea7fcd14fc57a6389bd2f9f09aa88af495aa4f38084d0244bc9be7498aaf6728a7f300cd593bcbbe11a46f409fa32714a77f2c7049b9a27363cb635eb

data/lib/sensu/settings/loader.rb

@@ -34,6 +34,11 @@ module Sensu
       # @return [Hash] settings.
       def default_settings
         default = {
+          :sensu => {
+            :spawn => {
+              :limit => 12
+            }
+          },
           :transport => {
             :name => "rabbitmq",
             :reconnect_on_error => true

data/lib/sensu/settings/validator.rb

@@ -22,8 +22,9 @@ module Sensu
       # @param service [String] sensu service to validate for.
       # @return [Array] validation failures.
       def run(settings, service=nil)
-        validate_categories(settings)
+        validate_sensu(settings[:sensu])
         validate_transport(settings[:transport])
+        validate_categories(settings)
         case service
         when "client"
           validate_client(settings[:client])

data/lib/sensu/settings/validators.rb

@@ -1,3 +1,5 @@
+require "sensu/settings/validators/sensu"
+require "sensu/settings/validators/transport"
 require "sensu/settings/validators/subdue"
 require "sensu/settings/validators/check"
 require "sensu/settings/validators/filter"
@@ -5,11 +7,12 @@ require "sensu/settings/validators/mutator"
 require "sensu/settings/validators/handler"
 require "sensu/settings/validators/client"
 require "sensu/settings/validators/api"
-require "sensu/settings/validators/transport"
 
 module Sensu
   module Settings
     module Validators
+      include Sensu
+      include Transport
       include Subdue
       include Check
       include Filter
@@ -17,7 +20,6 @@ module Sensu
       include Handler
       include Client
       include API
-      include Transport
     end
   end
 end

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

@@ -0,0 +1,37 @@
+module Sensu
+  module Settings
+    module Validators
+      module Sensu
+        # Validate Sensu spawn.
+        # Validates: limit
+        #
+        # @param sensu [Hash] sensu definition.
+        def validate_sensu_spawn(sensu)
+          spawn = sensu[:spawn]
+          if is_a_hash?(spawn)
+            if is_an_integer?(spawn[:limit])
+              spawn[:limit] > 0 ||
+                invalid(sensu, "sensu spawn limit must be greater than 0")
+            else
+              invalid(sensu, "sensu spawn limit must be an integer")
+            end
+          else
+            invalid(sensu, "sensu spawn must be a hash")
+          end
+        end
+
+        # Validate a Sensu definition.
+        # Validates: spawn
+        #
+        # @param sensu [Hash] sensu definition.
+        def validate_sensu(sensu)
+          if is_a_hash?(sensu)
+            validate_sensu_spawn(sensu)
+          else
+            invalid(sensu, "sensu must be a hash")
+          end
+        end
+      end
+    end
+  end
+end

data/sensu-settings.gemspec

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

data/spec/validator_spec.rb

@@ -21,7 +21,46 @@ describe "Sensu::Settings::Validator" do
     expect(reasons).to include("filters must be a hash")
     expect(reasons).to include("mutators must be a hash")
     expect(reasons).to include("handlers must be a hash")
-    expect(reasons.size).to eq(5)
+    expect(reasons.size).to eq(6)
+  end
+
+  it "can validate a sensu definition" do
+    sensu = nil
+    @validator.validate_sensu(sensu)
+    expect(@validator.reset).to eq(1)
+    sensu = 1
+    @validator.validate_sensu(sensu)
+    expect(@validator.reset).to eq(1)
+    sensu = {}
+    @validator.validate_sensu(sensu)
+    expect(@validator.reset).to eq(1)
+    sensu[:spawn] = 1
+    @validator.validate_sensu(sensu)
+    expect(@validator.reset).to eq(1)
+    sensu[:spawn] = {}
+    @validator.validate_sensu(sensu)
+    expect(@validator.reset).to eq(1)
+    sensu[:spawn][:limit] = "1"
+    @validator.validate_sensu(sensu)
+    expect(@validator.reset).to eq(1)
+    sensu[:spawn][:limit] = 20
+    @validator.validate_sensu(sensu)
+    expect(@validator.reset).to eq(0)
+  end
+
+  it "can run, validating sensu" do
+    settings = {
+      :sensu => {
+        :spawn => {
+          :limit => "20"
+        }
+      }
+    }
+    @validator.run(settings)
+    expect(@validator.reset).to eq(6)
+    settings[:sensu][:spawn][:limit] = 20
+    @validator.run(settings)
+    expect(@validator.reset).to eq(5)
   end
 
   it "can validate a transport definition" do
@@ -52,10 +91,10 @@ describe "Sensu::Settings::Validator" do
       }
     }
     @validator.run(settings)
-    expect(@validator.reset).to eq(5)
+    expect(@validator.reset).to eq(6)
     settings[:transport][:name] = "rabbitmq"
     @validator.run(settings)
-    expect(@validator.reset).to eq(4)
+    expect(@validator.reset).to eq(5)
   end
 
   it "can validate an empty check definition" do
@@ -258,10 +297,10 @@ describe "Sensu::Settings::Validator" do
       }
     }
     @validator.run(settings)
-    expect(@validator.reset).to eq(5)
+    expect(@validator.reset).to eq(6)
     settings[:checks][:foo][:interval] = 1
     @validator.run(settings)
-    expect(@validator.reset).to eq(4)
+    expect(@validator.reset).to eq(5)
   end
 
   it "can validate a filter definition" do
@@ -671,10 +710,10 @@ describe "Sensu::Settings::Validator" do
       }
     }
     @validator.run(settings, "client")
-    expect(@validator.reset).to eq(6)
+    expect(@validator.reset).to eq(7)
     settings[:client][:subscriptions] = ["bar"]
     @validator.run(settings, "client")
-    expect(@validator.reset).to eq(5)
+    expect(@validator.reset).to eq(6)
   end
 
   it "can validate an api definition" do
@@ -720,9 +759,9 @@ describe "Sensu::Settings::Validator" do
       }
     }
     @validator.run(settings, "api")
-    expect(@validator.reset).to eq(6)
+    expect(@validator.reset).to eq(7)
     settings[:api][:port] = 4567
     @validator.run(settings, "api")
-    expect(@validator.reset).to eq(5)
+    expect(@validator.reset).to eq(6)
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sensu-settings
 version: !ruby/object:Gem::Version
-  version: 4.1.1
+  version: 5.0.0
 platform: ruby
 authors:
 - Sean Porter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-04 00:00:00.000000000 Z
+date: 2016-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sensu-json
@@ -105,6 +105,7 @@ files:
 - lib/sensu/settings/validators/filter.rb
 - lib/sensu/settings/validators/handler.rb
 - lib/sensu/settings/validators/mutator.rb
+- lib/sensu/settings/validators/sensu.rb
 - lib/sensu/settings/validators/subdue.rb
 - lib/sensu/settings/validators/transport.rb
 - sensu-settings.gemspec