sensu-plugins-redis 2.3.0 → 2.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 510e91ccc0d8e58148396b4e61037abcb7389ab0ac2af0302eafded20f772c99
-  data.tar.gz: c421f28a6621afd01f2cec99afea1ca2eec2b66861201461a7e3e71d58f87f2c
+SHA1:
+  metadata.gz: fcd104e903b24d8ccf311894925121ac6a79f3e2
+  data.tar.gz: ccd8600530603998ac4bb97e8566d34ca51bd29a
 SHA512:
-  metadata.gz: e6db91c546252b6876ef148d1ff429bd64f50fa860287ffd13a70a49e19b7e7c4cdef2340104548210e332b916051ceebf8c5743b1cee76670b6bd006f0d66cb
-  data.tar.gz: 8d3677f37dedf02c904b7d07eed376660aa812f51d8b040f3ca0953632d3c821569388b873e0a61467e0abad1dde66e5c946344243264f6435a2a356123d6441
+  metadata.gz: 5d0d86a5c2f2de6d5ed2a3aa523a2b9edbf4b7f6be84d450fdcad135dd91ceb4c105e649a4c5e58b10c1018612f2db6cbf08b629c35a1aabd1cf370c97cdddda
+  data.tar.gz: 002af62281c3d9f956fa44afaad55d0636460f0f6ab415867bb41bf521e52b676744111ea38d451db484e6576b36930b141ce0cd2f34446a219172bc9eaa1a23

data/CHANGELOG.md

@@ -6,6 +6,10 @@ Which is based on [Keep A Changelog](http://keepachangelog.com/)
 
 ## [Unreleased]
 
+## [2.3.1] - 2017-12-08
+### Fixed
+- ensure that `--socket` option is properly parsed and takes precedence over `--host`/`--port` (@mbyczkowski)
+
 ## [2.3.0] - 2017-11-12
 ### Added
 - metrics-redis-llen.rb - Support passing multiple comma separated keys (@Evesy)
@@ -123,7 +127,8 @@ Which is based on [Keep A Changelog](http://keepachangelog.com/)
 ### Added
 - initial release
 
-[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-redis/compare/2.3.0...HEAD
+[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-redis/compare/2.3.1...HEAD
+[2.3.1]: https://github.com/sensu-plugins/sensu-plugins-redis/compare/2.3.0...2.3.1
 [2.3.0]: https://github.com/sensu-plugins/sensu-plugins-redis/compare/2.2.2...2.3.0
 [2.2.2]: https://github.com/sensu-plugins/sensu-plugins-redis/compare/2.2.1...2.2.2
 [2.2.1]: https://github.com/sensu-plugins/sensu-plugins-redis/compare/2.2.0...2.2.1

data/README.md

@@ -10,6 +10,7 @@
 
 ## Files
  * bin/check-redis-info.rb
+ * bin/check-redis-keys.rb
  * bin/check-redis-list-length.rb
  * bin/check-redis-memory.rb
  * bin/check-redis-memory-percentage.rb
@@ -25,3 +26,6 @@
 [Installation and Setup](http://sensu-plugins.io/docs/installation_instructions.html)
 
 ## Notes
+
+[Developer Guidelines](http://sensu-plugins.io/docs/developer_guidelines.html)
+[Testing](http://sensu-plugins.io/docs/testing.html)

data/bin/check-redis-info.rb

@@ -18,33 +18,10 @@
 
 require 'sensu-plugin/check/cli'
 require 'redis'
+require_relative '../lib/redis_client_options'
 
 class RedisSlaveCheck < Sensu::Plugin::Check::CLI
-  option :socket,
-         short: '-s SOCKET',
-         long: '--socket SOCKET',
-         description: 'Redis socket to connect to (overrides Host and Port)',
-         required: false
-
-  option :host,
-         short: '-h HOST',
-         long: '--host HOST',
-         description: 'Redis Host to connect to',
-         required: false,
-         default: '127.0.0.1'
-
-  option :port,
-         short: '-p PORT',
-         long: '--port PORT',
-         description: 'Redis Port to connect to',
-         proc: proc(&:to_i),
-         required: false,
-         default: 6379
-
-  option :password,
-         short: '-P PASSWORD',
-         long: '--password PASSWORD',
-         description: 'Redis Password to connect with'
+  include RedisClientOptions
 
   option :redis_info_key,
          short: '-K VALUE',
@@ -60,29 +37,8 @@ class RedisSlaveCheck < Sensu::Plugin::Check::CLI
          required: false,
          default: 'master'
 
-  option :conn_failure_status,
-         long: '--conn-failure-status EXIT_STATUS',
-         description: 'Returns the following exit status for Redis connection failures',
-         default: 'unknown',
-         in: %w(unknown warning critical)
-
-  option :timeout,
-         short: '-t TIMEOUT',
-         long: '--timeout TIMEOUT',
-         description: 'Redis connection timeout',
-         proc: proc(&:to_i),
-         required: false,
-         default: 5
-
   def run
-    options = if config[:socket]
-                { path: socket }
-              else
-                { host: config[:host], port: config[:port], timeout: config[:timeout] }
-              end
-
-    options[:password] = config[:password] if config[:password]
-    redis = Redis.new(options)
+    redis = Redis.new(default_redis_options)
 
     if redis.info.fetch(config[:redis_info_key].to_s) == config[:redis_info_value].to_s
       ok "Redis #{config[:redis_info_key]} is #{config[:redis_info_value]}"
@@ -90,6 +46,6 @@ class RedisSlaveCheck < Sensu::Plugin::Check::CLI
       critical "Redis #{config[:redis_info_key]} is #{redis.info.fetch(config[:redis_info_key].to_s)}!"
     end
   rescue
-    send(config[:conn_failure_status], "Could not connect to Redis server on #{config[:host]}:#{config[:port]}")
+    send(config[:conn_failure_status], "Could not connect to Redis server on #{redis_endpoint}")
   end
 end

data/bin/check-redis-keys.rb

@@ -12,41 +12,10 @@
 
 require 'sensu-plugin/check/cli'
 require 'redis'
+require_relative '../lib/redis_client_options'
 
 class RedisKeysCheck < Sensu::Plugin::Check::CLI
-  option :socket,
-         short: '-s SOCKET',
-         long: '--socket SOCKET',
-         description: 'Redis socket to connect to (overrides Host and Port)',
-         required: false
-
-  option :host,
-         short: '-h HOST',
-         long: '--host HOST',
-         description: 'Redis Host to connect to',
-         required: false,
-         default: '127.0.0.1'
-
-  option :port,
-         short: '-p PORT',
-         long: '--port PORT',
-         description: 'Redis Port to connect to',
-         proc: proc(&:to_i),
-         required: false,
-         default: 6379
-
-  option :database,
-         short: '-n DATABASE',
-         long: '--dbnumber DATABASE',
-         description: 'Redis database number to connect to',
-         proc: proc(&:to_i),
-         required: false,
-         default: 0
-
-  option :password,
-         short: '-P PASSWORD',
-         long: '--password PASSWORD',
-         description: 'Redis Password to connect with'
+  include RedisClientOptions
 
   option :warn,
          short: '-w COUNT',
@@ -68,30 +37,8 @@ class RedisKeysCheck < Sensu::Plugin::Check::CLI
          required: false,
          default: '*'
 
-  option :conn_failure_status,
-         long: '--conn-failure-status EXIT_STATUS',
-         description: 'Returns the following exit status for Redis connection failures',
-         default: 'unknown',
-         in: %w(unknown warning critical)
-
-  option :timeout,
-         short: '-t TIMEOUT',
-         long: '--timeout TIMEOUT',
-         description: 'Redis connection timeout',
-         proc: proc(&:to_i),
-         required: false,
-         default: 5
-
   def run
-    options = if config[:socket]
-                { path: socket }
-              else
-                { host: config[:host], port: config[:port], timeout: config[:timeout] }
-              end
-
-    options[:db] = config[:database]
-    options[:password] = config[:password] if config[:password]
-    redis = Redis.new(options)
+    redis = Redis.new(default_redis_options)
 
     length = redis.keys(config[:pattern]).size
 
@@ -103,6 +50,6 @@ class RedisKeysCheck < Sensu::Plugin::Check::CLI
       ok "Redis list #{config[:pattern]} length is above thresholds"
     end
   rescue
-    send(config[:conn_failure_status], "Could not connect to Redis server on #{config[:host]}:#{config[:port]}")
+    send(config[:conn_failure_status], "Could not connect to Redis server on #{redis_endpoint}")
   end
 end

data/bin/check-redis-list-length.rb

@@ -13,41 +13,10 @@
 
 require 'sensu-plugin/check/cli'
 require 'redis'
+require_relative '../lib/redis_client_options'
 
 class RedisListLengthCheck < Sensu::Plugin::Check::CLI
-  option :socket,
-         short: '-s SOCKET',
-         long: '--socket SOCKET',
-         description: 'Redis socket to connect to (overrides Host and Port)',
-         required: false
-
-  option :host,
-         short: '-h HOST',
-         long: '--host HOST',
-         description: 'Redis Host to connect to',
-         required: false,
-         default: '127.0.0.1'
-
-  option :port,
-         short: '-p PORT',
-         long: '--port PORT',
-         description: 'Redis Port to connect to',
-         proc: proc(&:to_i),
-         required: false,
-         default: 6379
-
-  option :database,
-         short: '-n DATABASE',
-         long: '--dbnumber DATABASE',
-         description: 'Redis database number to connect to',
-         proc: proc(&:to_i),
-         required: false,
-         default: 0
-
-  option :password,
-         short: '-P PASSWORD',
-         long: '--password PASSWORD',
-         description: 'Redis Password to connect with'
+  include RedisClientOptions
 
   option :warn,
          short: '-w COUNT',
@@ -69,30 +38,8 @@ class RedisListLengthCheck < Sensu::Plugin::Check::CLI
          description: 'Redis list KEY to check',
          required: true
 
-  option :conn_failure_status,
-         long: '--conn-failure-status EXIT_STATUS',
-         description: 'Returns the following exit status for Redis connection failures',
-         default: 'unknown',
-         in: %w(unknown warning critical)
-
-  option :timeout,
-         short: '-t TIMEOUT',
-         long: '--timeout TIMEOUT',
-         description: 'Redis connection timeout',
-         proc: proc(&:to_i),
-         required: false,
-         default: 5
-
   def run
-    options = if config[:socket]
-                { path: config[:socket] }
-              else
-                { host: config[:host], port: config[:port], timeout: config[:timeout] }
-              end
-
-    options[:db] = config[:database]
-    options[:password] = config[:password] if config[:password]
-    redis = Redis.new(options)
+    redis = Redis.new(default_redis_options)
 
     length =  case redis.type(config[:key])
               when 'hash'
@@ -111,6 +58,6 @@ class RedisListLengthCheck < Sensu::Plugin::Check::CLI
       ok "Redis list #{config[:key]} length (#{length}) is below thresholds"
     end
   rescue
-    send(config[:conn_failure_status], "Could not connect to Redis server on #{config[:host]}:#{config[:port]}")
+    send(config[:conn_failure_status], "Could not connect to Redis server on #{redis_endpoint}")
   end
 end

data/bin/check-redis-memory-percentage.rb

@@ -29,32 +29,10 @@
 
 require 'sensu-plugin/check/cli'
 require 'redis'
-class RedisChecks < Sensu::Plugin::Check::CLI
-  option :socket,
-         short: '-s SOCKET',
-         long: '--socket SOCKET',
-         description: 'Redis socket to connect to (overrides Host and Port)',
-         required: false
-
-  option :host,
-         short: '-h HOST',
-         long: '--host HOST',
-         description: 'Redis Host to connect to',
-         required: false,
-         default: '127.0.0.1'
+require_relative '../lib/redis_client_options'
 
-  option :port,
-         short: '-p PORT',
-         long: '--port PORT',
-         description: 'Redis Port to connect to',
-         proc: proc(&:to_i),
-         required: false,
-         default: 6379
-
-  option :password,
-         short: '-P PASSWORD',
-         long: '--password PASSWORD',
-         description: 'Redis Password to connect with'
+class RedisChecks < Sensu::Plugin::Check::CLI
+  include RedisClientOptions
 
   option :warn_mem,
          short: '-w percentage',
@@ -70,33 +48,12 @@ class RedisChecks < Sensu::Plugin::Check::CLI
          proc: proc(&:to_i),
          required: true
 
-  option :conn_failure_status,
-         long: '--conn-failure-status EXIT_STATUS',
-         description: 'Returns the following exit status for Redis connection failures',
-         default: 'unknown',
-         in: %w(unknown warning critical)
-
-  option :timeout,
-         short: '-t TIMEOUT',
-         long: '--timeout TIMEOUT',
-         description: 'Redis connection timeout',
-         proc: proc(&:to_i),
-         required: false,
-         default: 5
-
   def system_memory
     `awk '/MemTotal/{print$2}' /proc/meminfo`.to_f * 1024
   end
 
   def run
-    options = if config[:socket]
-                { path: socket }
-              else
-                { host: config[:host], port: config[:port], timeout: config[:timeout] }
-              end
-
-    options[:password] = config[:password] if config[:password]
-    redis = Redis.new(options)
+    redis = Redis.new(default_redis_options)
 
     redis_info = redis.info
     max_memory = redis_info.fetch('maxmemory', 0).to_i
@@ -117,6 +74,6 @@ class RedisChecks < Sensu::Plugin::Check::CLI
       ok "Redis memory usage: #{used_memory}% is below defined limits"
     end
   rescue
-    send(config[:conn_failure_status], "Could not connect to Redis server on #{config[:host]}:#{config[:port]}")
+    send(config[:conn_failure_status], "Could not connect to Redis server on #{redis_endpoint}")
   end
 end

data/bin/check-redis-memory.rb

@@ -10,33 +10,10 @@
 
 require 'sensu-plugin/check/cli'
 require 'redis'
+require_relative '../lib/redis_client_options'
 
 class RedisChecks < Sensu::Plugin::Check::CLI
-  option :socket,
-         short: '-s SOCKET',
-         long: '--socket SOCKET',
-         description: 'Redis socket to connect to (overrides Host and Port)',
-         required: false
-
-  option :host,
-         short: '-h HOST',
-         long: '--host HOST',
-         description: 'Redis Host to connect to',
-         required: false,
-         default: '127.0.0.1'
-
-  option :port,
-         short: '-p PORT',
-         long: '--port PORT',
-         description: 'Redis Port to connect to',
-         proc: proc(&:to_i),
-         required: false,
-         default: 6379
-
-  option :password,
-         short: '-P PASSWORD',
-         long: '--password PASSWORD',
-         description: 'Redis Password to connect with'
+  include RedisClientOptions
 
   option :warn_mem,
          short: '-w KB',
@@ -52,29 +29,8 @@ class RedisChecks < Sensu::Plugin::Check::CLI
          proc: proc(&:to_i),
          required: true
 
-  option :conn_failure_status,
-         long: '--conn-failure-status EXIT_STATUS',
-         description: 'Returns the following exit status for Redis connection failures',
-         default: 'unknown',
-         in: %w(unknown warning critical)
-
-  option :timeout,
-         short: '-t TIMEOUT',
-         long: '--timeout TIMEOUT',
-         description: 'Redis connection timeout',
-         proc: proc(&:to_i),
-         required: false,
-         default: 5
-
   def run
-    options = if config[:socket]
-                { path: socket }
-              else
-                { host: config[:host], port: config[:port], timeout: config[:timeout] }
-              end
-
-    options[:password] = config[:password] if config[:password]
-    redis = Redis.new(options)
+    redis = Redis.new(default_redis_options)
 
     used_memory = redis.info.fetch('used_memory').to_i.div(1024)
     warn_memory = config[:warn_mem]
@@ -87,6 +43,6 @@ class RedisChecks < Sensu::Plugin::Check::CLI
       ok "Redis memory usage: #{used_memory}KB is below defined limits"
     end
   rescue
-    send(config[:conn_failure_status], "Could not connect to Redis server on #{config[:host]}:#{config[:port]}")
+    send(config[:conn_failure_status], "Could not connect to Redis server on #{redis_endpoint}")
   end
 end

data/bin/check-redis-ping.rb

@@ -29,71 +29,18 @@
 
 require 'sensu-plugin/check/cli'
 require 'redis'
+require_relative '../lib/redis_client_options'
 
 class RedisPing < Sensu::Plugin::Check::CLI
-  option :socket,
-         short: '-s SOCKET',
-         long: '--socket SOCKET',
-         description: 'Redis socket to connect to (overrides Host and Port)',
-         required: false
-
-  option :host,
-         short: '-h HOST',
-         long: '--host HOST',
-         description: 'Redis Host to connect to',
-         required: false,
-         default: '127.0.0.1'
-
-  option :port,
-         short: '-p PORT',
-         long: '--port PORT',
-         description: 'Redis Port to connect to',
-         proc: proc(&:to_i),
-         required: false,
-         default: 6379
-
-  option :password,
-         short: '-P PASSWORD',
-         long: '--password PASSWORD',
-         description: 'Redis Password to connect with'
-
-  option :conn_failure_status,
-         long: '--conn-failure-status EXIT_STATUS',
-         description: 'Returns the following exit status for Redis connection failures',
-         default: 'critical',
-         in: %w(unknown warning critical)
-
-  option :timeout,
-         short: '-t TIMEOUT',
-         long: '--timeout TIMEOUT',
-         description: 'Redis connection timeout',
-         proc: proc(&:to_i),
-         required: false,
-         default: 5
-
-  def redis_options
-    if config[:socket]
-      {
-        path:     config[:socket],
-        password: config[:password]
-      }
-    else
-      {
-        host:     config[:host],
-        port:     config[:port],
-        password: config[:password],
-        timeout:  config[:timeout]
-      }
-    end
-  end
+  include RedisClientOptions
 
   def run
-    if Redis.new(redis_options).ping == 'PONG'
+    if Redis.new(default_redis_options).ping == 'PONG'
       ok 'Redis is alive'
     else
       critical 'Redis did not respond to the ping command'
     end
   rescue
-    send(config[:conn_failure_status], "Could not connect to Redis server on #{config[:host]}:#{config[:port]}")
+    send(config[:conn_failure_status], "Could not connect to Redis server on #{redis_endpoint}")
   end
 end

data/bin/check-redis-slave-status.rb

@@ -4,57 +4,13 @@
 
 require 'sensu-plugin/check/cli'
 require 'redis'
+require_relative '../lib/redis_client_options'
 
 class RedisSlaveCheck < Sensu::Plugin::Check::CLI
-  option :socket,
-         short: '-s SOCKET',
-         long: '--socket SOCKET',
-         description: 'Redis socket to connect to (overrides Host and Port)',
-         required: false
-
-  option :host,
-         short: '-h HOST',
-         long: '--host HOST',
-         description: 'Redis Host to connect to',
-         required: false,
-         default: '127.0.0.1'
-
-  option :port,
-         short: '-p PORT',
-         long: '--port PORT',
-         description: 'Redis Port to connect to',
-         proc: proc(&:to_i),
-         required: false,
-         default: 6379
-
-  option :password,
-         short: '-P PASSWORD',
-         long: '--password PASSWORD',
-         description: 'Redis Password to connect with'
-
-  option :conn_failure_status,
-         long: '--conn-failure-status EXIT_STATUS',
-         description: 'Returns the following exit status for Redis connection failures',
-         default: 'unknown',
-         in: %w(unknown warning critical)
-
-  option :timeout,
-         short: '-t TIMEOUT',
-         long: '--timeout TIMEOUT',
-         description: 'Redis connection timeout',
-         required: false,
-         proc: proc(&:to_i),
-         default: 5
+  include RedisClientOptions
 
   def run
-    options = if config[:socket]
-                { path: socket }
-              else
-                { host: config[:host], port: config[:port], timeout: config[:timeout] }
-              end
-
-    options[:password] = config[:password] if config[:password]
-    redis = Redis.new(options)
+    redis = Redis.new(default_redis_options)
 
     if redis.info.fetch('role') == 'master'
       ok 'This redis server is master'
@@ -67,8 +23,8 @@ class RedisSlaveCheck < Sensu::Plugin::Check::CLI
       critical msg
     end
   rescue KeyError
-    critical "Redis server on #{config[:host]}:#{config[:port]} is not master and does not have master_link_status"
+    critical "Redis server on #{redis_endpoint} is not master and does not have master_link_status"
   rescue
-    send(config[:conn_failure_status], "Could not connect to Redis server on #{config[:host]}:#{config[:port]}")
+    send(config[:conn_failure_status], "Could not connect to Redis server on #{redis_endpoint}")
   end
 end

data/bin/metrics-redis-graphite.rb

@@ -11,8 +11,11 @@
 
 require 'sensu-plugin/metric/cli'
 require 'redis'
+require_relative '../lib/redis_client_options'
 
 class Redis2Graphite < Sensu::Plugin::Metric::CLI::Graphite
+  include RedisClientOptions
+
   # redis.c - sds genRedisInfoString(char *section)
   SKIP_KEYS_REGEX = [
     '^role',
@@ -47,77 +50,20 @@ class Redis2Graphite < Sensu::Plugin::Metric::CLI::Graphite
     'used_memory_rss_human'
   ].freeze
 
-  option :socket,
-         short: '-s SOCKET',
-         long: '--socket SOCKET',
-         description: 'Redis socket to connect to (overrides Host and Port)',
-         required: false
-
-  option :host,
-         short: '-h HOST',
-         long: '--host HOST',
-         description: 'Redis Host to connect to',
-         default: '127.0.0.1'
-
-  option :port,
-         short: '-p PORT',
-         long: '--port PORT',
-         description: 'Redis Port to connect to',
-         proc: proc(&:to_i),
-         default: 6379
-
-  option :password,
-         short: '-P PASSWORD',
-         long: '--password PASSWORD',
-         description: 'Redis Password to connect with'
-
   option :scheme,
          description: 'Metric naming scheme, text to prepend to metric',
          short: '-S SCHEME',
          long: '--scheme SCHEME',
          default: "#{Socket.gethostname}.redis"
 
-  option :timeout,
-         description: 'Timeout to connect to redis host',
-         short: '-t TIMEOUT',
-         long: '--timeout TIMEOUT',
-         proc: proc(&:to_i),
-         default: Redis::Client::DEFAULTS[:timeout]
-
-  option :reconnect_attempts,
-         description: 'Reconnect attempts to redis host',
-         short: '-r ATTEMPTS',
-         long: '--reconnect ATTEMPTS',
-         proc: proc(&:to_i),
-         default: Redis::Client::DEFAULTS[:reconnect_attempts]
-
   option :skip_keys_regex,
          description: 'a comma seperated list of keys to be skipped',
          short: '-k KEYS',
          long: '--skipkeys KEYS',
          default: nil
 
-  option :conn_failure_status,
-         long: '--conn-failure-status EXIT_STATUS',
-         description: 'Returns the following exit status for Redis connection failures',
-         default: 'unknown',
-         in: %w(unknown warning critical)
-
   def run
-    options = {
-      timeout: config[:timeout],
-      reconnect_attempts: config[:reconnect_attempts]
-    }
-
-    if config[:socket]
-      options[:path] = config[:socket]
-    else
-      options[:host] = config[:host]
-      options[:port] = config[:port]
-    end
-
-    options[:password] = config[:password] if config[:password]
-    redis = Redis.new(options)
+    redis = Redis.new(default_redis_options)
     skip_keys = if !config[:skip_keys_regex].nil?
                   config[:skip_keys_regex].split(',')
                 else
@@ -149,6 +95,6 @@ class Redis2Graphite < Sensu::Plugin::Metric::CLI::Graphite
 
     ok
   rescue
-    send(config[:conn_failure_status], "Could not connect to Redis server on #{config[:host]}:#{config[:port]}")
+    send(config[:conn_failure_status], "Could not connect to Redis server on #{redis_endpoint}")
   end
 end

data/bin/metrics-redis-llen.rb

@@ -9,39 +9,10 @@
 
 require 'sensu-plugin/metric/cli'
 require 'redis'
+require_relative '../lib/redis_client_options'
 
 class RedisListLengthMetric < Sensu::Plugin::Metric::CLI::Graphite
-  option :socket,
-         short: '-s SOCKET',
-         long: '--socket SOCKET',
-         description: 'Redis socket to connect to (overrides Host and Port)',
-         required: false
-
-  option :host,
-         short: '-h HOST',
-         long: '--host HOST',
-         description: 'Redis Host to connect to',
-         default: '127.0.0.1'
-
-  option :port,
-         short: '-p PORT',
-         long: '--port PORT',
-         description: 'Redis Port to connect to',
-         proc: proc(&:to_i),
-         default: 6379
-
-  option :database,
-         short: '-n DATABASE',
-         long: '--dbnumber DATABASE',
-         description: 'Redis database number to connect to',
-         proc: proc(&:to_i),
-         required: false,
-         default: 0
-
-  option :password,
-         short: '-P PASSWORD',
-         long: '--password PASSWORD',
-         description: 'Redis Password to connect with'
+  include RedisClientOptions
 
   option :scheme,
          description: 'Metric naming scheme, text to prepend to metric',
@@ -55,29 +26,15 @@ class RedisListLengthMetric < Sensu::Plugin::Metric::CLI::Graphite
          description: 'Comma separated list of keys to check',
          required: true
 
-  option :conn_failure_status,
-         long: '--conn-failure-status EXIT_STATUS',
-         description: 'Returns the following exit status for Redis connection failures',
-         default: 'unknown',
-         in: %w(unknown warning critical)
-
   def run
-    redis_keys = config[:key].split(',')
-    options = if config[:socket]
-                { path: socket }
-              else
-                { host: config[:host], port: config[:port] }
-              end
-
-    options[:db] = config[:database]
-    options[:password] = config[:password] if config[:password]
-    redis = Redis.new(options)
+    redis = Redis.new(default_redis_options)
 
+    redis_keys = config[:key].split(',')
     redis_keys.each do |key|
       output "#{config[:scheme]}.#{key}.items", redis.llen(key)
     end
     ok
   rescue
-    send(config[:conn_failure_status], "Could not connect to Redis server on #{config[:host]}:#{config[:port]}")
+    send(config[:conn_failure_status], "Could not connect to Redis server on #{redis_endpoint}")
   end
 end

data/lib/redis_client_options.rb

@@ -0,0 +1,93 @@
+require 'redis'
+require 'sensu-plugin/metric/cli'
+
+module RedisClientOptions
+  def self.included(base)
+    base.extend(ClassMethods)
+    base.class_eval do
+      _configure_options
+    end
+  end
+
+  def default_redis_options
+    opts = {}
+    opts[:password] = config[:password] if config[:password]
+    opts[:timeout]  = config[:timeout]  if config[:timeout]
+    opts[:db]       = config[:database] if config[:database]
+
+    if config[:socket]
+      opts[:path] = config[:socket]
+    else
+      opts[:host] = config[:host]
+      opts[:port] = config[:port]
+    end
+    opts
+  end
+
+  def redis_endpoint
+    if config[:socket]
+      "unix://#{config[:socket]}"
+    else
+      "#{config[:host]}:#{config[:port]}"
+    end
+  end
+
+  module ClassMethods
+    def _configure_options
+      option :socket,
+             short: '-s SOCKET',
+             long: '--socket SOCKET',
+             description: 'Redis socket to connect to (overrides Host and Port)',
+             required: false
+
+      option :host,
+             short: '-h HOST',
+             long: '--host HOST',
+             description: 'Redis Host to connect to',
+             required: false,
+             default: Redis::Client::DEFAULTS[:host]
+
+      option :port,
+             short: '-p PORT',
+             long: '--port PORT',
+             description: 'Redis Port to connect to',
+             proc: proc(&:to_i),
+             required: false,
+             default: Redis::Client::DEFAULTS[:port]
+
+      option :database,
+             short: '-n DATABASE',
+             long: '--dbnumber DATABASE',
+             description: 'Redis database number to connect to',
+             proc: proc(&:to_i),
+             required: false,
+             default: Redis::Client::DEFAULTS[:db]
+
+      option :password,
+             short: '-P PASSWORD',
+             long: '--password PASSWORD',
+             description: 'Redis Password to connect with'
+
+      option :conn_failure_status,
+             long: '--conn-failure-status EXIT_STATUS',
+             description: 'Returns the following exit status for Redis connection failures',
+             default: 'critical',
+             in: %w(unknown warning critical)
+
+      option :timeout,
+             short: '-t TIMEOUT',
+             long: '--timeout TIMEOUT',
+             description: 'Redis connection timeout',
+             proc: proc(&:to_f),
+             required: false,
+             default: Redis::Client::DEFAULTS[:timeout]
+
+      option :reconnect_attempts,
+             description: 'Reconnect attempts to Redis host',
+             short: '-r ATTEMPTS',
+             long: '--reconnect ATTEMPTS',
+             proc: proc(&:to_i),
+             default: Redis::Client::DEFAULTS[:reconnect_attempts]
+    end
+  end
+end

data/lib/sensu-plugins-redis/version.rb

@@ -2,7 +2,7 @@ module SensuPluginsRedis
   module Version
     MAJOR = 2
     MINOR = 3
-    PATCH = 0
+    PATCH = 1
 
     VER_STRING = [MAJOR, MINOR, PATCH].compact.join('.')
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sensu-plugins-redis
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.3.1
 platform: ruby
 authors:
 - Sensu-Plugins and contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-12 00:00:00.000000000 Z
+date: 2017-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sensu-plugin
@@ -229,14 +229,14 @@ description: |-
 email: "<sensu-users@googlegroups.com>"
 executables:
 - check-redis-memory.rb
+- metrics-redis-llen.rb
+- check-redis-ping.rb
+- check-redis-memory-percentage.rb
 - check-redis-info.rb
-- check-redis-list-length.rb
+- check-redis-slave-status.rb
 - check-redis-keys.rb
-- check-redis-memory-percentage.rb
-- check-redis-ping.rb
-- metrics-redis-llen.rb
 - metrics-redis-graphite.rb
-- check-redis-slave-status.rb
+- check-redis-list-length.rb
 extensions: []
 extra_rdoc_files: []
 files:
@@ -252,6 +252,7 @@ files:
 - bin/check-redis-slave-status.rb
 - bin/metrics-redis-graphite.rb
 - bin/metrics-redis-llen.rb
+- lib/redis_client_options.rb
 - lib/sensu-plugins-redis.rb
 - lib/sensu-plugins-redis/version.rb
 homepage: https://github.com/sensu-plugins/sensu-plugins-redis
@@ -280,7 +281,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.2
+rubygems_version: 2.5.2.1
 signing_key: 
 specification_version: 4
 summary: Sensu plugins for working with redis