sensu-settings 7.0.0 → 8.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e8c362827e20c190a2ddd55390d79cdde36f6718
-  data.tar.gz: 2352416fa30ab53d50d7732b6d627705e2c693a9
+  metadata.gz: ecff7fd492c9359b7cd7acd1a5d96cbd58dbb4ba
+  data.tar.gz: c28ea05aada28e40f753142d7028a62106926ae2
 SHA512:
-  metadata.gz: 244ed09a606bca423b6a34436e91ae46213bec523286e1ac64c6976f1f293417a9df433f0b35c14d3f7a9e1551154d5c39a4d51b5250852556efc583e6bf869d
-  data.tar.gz: 8f293750efc58b389685bd767e736bc472a258506a9a53bd9f1fdb1c22417ea5508e917ab7935dd00b52076561e3c9581b416cc32aeb6db2a383cb11220541eb
+  metadata.gz: dd1cb0e18dfa49dd1eddc80ec674d63306b1ec546ea346ff68fdec00e5938d114cd6fb2f89838c80fac442e39f610df8a5efa0a7ad8388b32f244c0684b3450f
+  data.tar.gz: f27ce319271b20543fa332d1945ca064965f6ea27a2658461df5e6e452339925933c898c46178d4a3a1c31def07f6d3e4de536916daec878b18c1042c0b21ec1

data/lib/sensu/settings.rb

@@ -27,6 +27,7 @@ module Sensu
         if @loader.validate.empty?
           @loader.set_env!
         end
+        @loader.load_overrides!
         @loader
       rescue Loader::Error
         @loader

data/lib/sensu/settings/loader.rb

@@ -168,6 +168,24 @@ module Sensu
         end
       end
 
+      # Load Sensu client settings overrides. This method adds any overrides to
+      # the client definition. Overrides include:
+      #
+      # * Ensuring client subscriptions include a single subscription based on the
+      # client name, e.g "client:i-424242".
+      def load_client_overrides
+        @settings[:client][:subscriptions] ||= []
+        @settings[:client][:subscriptions] << "client:#{@settings[:client][:name]}"
+        @settings[:client][:subscriptions].uniq!
+        warning("applied sensu client overrides", :client => @settings[:client])
+      end
+
+      # Load overrides, i.e. settings which should always be present.
+      # Examples include client settings overrides which ensure a per-client subscription.
+      def load_overrides!
+        load_client_overrides
+      end
+
       # Set Sensu settings related environment variables. This method
       # sets `SENSU_LOADED_TEMPFILE` to a new temporary file path,
       # a file containing the colon delimited list of loaded
@@ -260,12 +278,24 @@ module Sensu
         end
       end
 
-      # Load Sensu Redis settings from the environment. This method
-      # sets the Redis settings to `REDIS_URL` if set. The Sensu Redis
-      # library accepts a URL string for options, this applies to data
-      # storage and the transport.
+      # Load Sensu Redis settings from the environment.
+      #
+      # This method evaluates the REDIS_SENTINEL_URLS and REDIS_URL environment variables
+      # and configures the Redis settings accordingly.
+      #
+      # When REDIS_SENTINEL_URLS is provided as a list of one or more
+      # comma-separated URLs, e.g.
+      # "redis://10.0.0.1:26379,redis://10.0.0.2:26379" these URLs will take
+      # precedence over the value provided by REDIS_URL, if any.
+      #
+      # As the redis library accepts a URL string for options. This
+      # configuration applies to data storage and the redis transport, if used.
       def load_redis_env
-        if ENV["REDIS_URL"]
+        if ENV["REDIS_SENTINEL_URLS"]
+          @settings[:redis] = {:sentinels => ENV["REDIS_SENTINEL_URLS"]}
+          warning("using redis sentinel url environment variable", :sentinels => @settings[:redis][:sentinels])
+          @indifferent_access = false
+        elsif ENV["REDIS_URL"]
           @settings[:redis] = ENV["REDIS_URL"]
           warning("using redis url environment variable", :redis => @settings[:redis])
           @indifferent_access = false
@@ -276,8 +306,6 @@ module Sensu
       # loads client settings from several variables:
       # `SENSU_CLIENT_NAME`, `SENSU_CLIENT_ADDRESS`, and
       # `SENSU_CLIENT_SUBSCRIPTIONS`.
-      #
-      # The client subscriptions defaults to an empty array.
       def load_client_env
         @settings[:client][:name] = ENV["SENSU_CLIENT_NAME"] if ENV["SENSU_CLIENT_NAME"]
         @settings[:client][:address] = ENV["SENSU_CLIENT_ADDRESS"] if ENV["SENSU_CLIENT_ADDRESS"]

data/sensu-settings.gemspec

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

data/spec/loader_spec.rb

@@ -60,6 +60,15 @@ describe "Sensu::Settings::Loader" do
     ENV["REDIS_URL"] = nil
   end
 
+  it "can load Redis Sentinel settings from the environment" do
+    ENV["REDIS_SENTINEL_URLS"] = "redis://10.0.0.1:26379,redis://:password@10.0.0.2:26379"
+    @loader.load_env
+    expect(@loader.warnings.size).to eq(1)
+    warning = @loader.warnings.shift
+    expect(warning[:sentinels]).to eq("redis://10.0.0.1:26379,redis://:password@10.0.0.2:26379")
+    ENV["REDIS_SENTINEL_URLS"] = nil
+  end
+
   it "can load Sensu client settings with defaults from the environment" do
     ENV["SENSU_CLIENT_NAME"] = "i-424242"
     @loader.load_env
@@ -222,4 +231,13 @@ describe "Sensu::Settings::Loader" do
     end
     expect(handler[:type]).to eq("set")
   end
+
+  it "can load settings overrides" do
+    @loader.load_file(@config_file)
+    @loader.load_overrides!
+    expect(@loader.warnings.size).to eq(2)
+    warning = @loader.warnings[1]
+    client = warning[:client]
+    expect(client[:subscriptions]).to include("client:i-424242")
+  end
 end

data/spec/settings_spec.rb

@@ -60,8 +60,8 @@ describe "Sensu::Settings" do
   it "can handle a nonexistent config.json" do
     settings = Sensu::Settings.load(:config_file => "/tmp/bananaphone")
     expect(settings.errors.length).to eq(0)
-    expect(settings.warnings.length).to eq(2)
-    warning = settings.warnings.last
+    expect(settings.warnings.length).to eq(3)
+    warning = settings.warnings[1]
     expect(warning[:message]).to include("ignoring config file")
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sensu-settings
 version: !ruby/object:Gem::Version
-  version: 7.0.0
+  version: 8.0.0
 platform: ruby
 authors:
 - Sean Porter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-01 00:00:00.000000000 Z
+date: 2016-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sensu-json