sensu-plugins-redis 1.4.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bd85ed962f2d4ad9b17984f5b347567b501323f8
-  data.tar.gz: fc2352c0eeea0effc4af1c8701206372e5655202
+  metadata.gz: d84e480941378fc37dc6238221103244e6927953
+  data.tar.gz: 8dac21557a6056203718cf360a52f7f6e662ca0d
 SHA512:
-  metadata.gz: d69a0960c67f8bb9e168d1c737d53bb3be169fdd83e641a8b4cf7a4b36d2f22a4286c9d47073da2090edf2640deee823d4856b3cd0863e1684b4e60ff3c11441
-  data.tar.gz: 43226f41e13daa2b72f6d9c9e2c34740e707cd56530e41688d60afa21888bd953674b786d1234cebdd4f273ad28dff38b7ba9865b3a60af411087824ff0cdf54
+  metadata.gz: 8978a9254a29e9d3b035a0269a4452048ff20c6ea6c7b3406c647a33c3069636906402b94cfc6290b3ce433647c14e9c769c15038568782217117c0f9f9b95d9
+  data.tar.gz: 97a0e270d28c6f0b319e213e6e63843a4c9fb2a15527aecc954867b86ef84e64137c05a6bc6f154f51189e4d0c281481335809ab0a6f2369b226b76810d7433e

data/CHANGELOG.md

@@ -5,6 +5,17 @@ This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachang
 
 ## [Unreleased]
 
+## [2.0.0] - 2017-07-23
+### Breaking Changes
+- Standardised exit status for Redis connection failures/timeouts to Unknown, with the exception of 'check-redis-ping' which will exit Critical (@Evesy)
+- check-redis-memory-percentage.rb, check-redis-memory.rb: removed redundant `crit_conn` (@Evesy)
+
+### Added
+- Config option to override the default exit status on Redis connection failures/timeouts
+
+### Added
+- ruby 2.4 testing on travis (@majormoses)
+
 ## [1.4.0] - 2017-06-24
 ### Added
 - check-redis-list-length.rb support more datatypes to check (@nevins-b)
@@ -79,7 +90,8 @@ This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachang
 ### Added
 - initial release
 
-[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-redis/compare/1.4.0...HEAD
+[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-redis/compare/2.0.0...HEAD
+[2.0.0]: https://github.com/sensu-plugins/sensu-plugins-redis/compare/1.4.0...2.0.0
 [1.4.0]: https://github.com/sensu-plugins/sensu-plugins-redis/compare/1.3.1...1.4.0
 [1.3.1]: https://github.com/sensu-plugins/sensu-plugins-redis/compare/1.3.0...1.3.1
 [1.3.0]: https://github.com/sensu-plugins/sensu-plugins-redis/compare/1.2.2...1.3.0

data/bin/check-redis-info.rb

@@ -60,6 +60,12 @@ 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)
+
   def run
     options = if config[:socket]
                 { path: socket }
@@ -76,7 +82,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
-    message "Could not connect to Redis server on #{config[:host]}:#{config[:port]}"
-    exit 1
+    send(config[:conn_failure_status], "Could not connect to Redis server on #{config[:host]}:#{config[:port]}")
   end
 end

data/bin/check-redis-keys.rb

@@ -68,6 +68,12 @@ 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)
+
   def run
     options = if config[:socket]
                 { path: socket }
@@ -89,6 +95,6 @@ class RedisKeysCheck < Sensu::Plugin::Check::CLI
       ok "Redis list #{config[:pattern]} length is above thresholds"
     end
   rescue
-    unknown "Could not connect to Redis server on #{config[:host]}:#{config[:port]}"
+    send(config[:conn_failure_status], "Could not connect to Redis server on #{config[:host]}:#{config[:port]}")
   end
 end

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

@@ -69,6 +69,12 @@ 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)
+
   def run
     options = if config[:socket]
                 { path: socket }
@@ -97,6 +103,6 @@ class RedisListLengthCheck < Sensu::Plugin::Check::CLI
       ok "Redis list #{config[:key]} length (#{length}) is below thresholds"
     end
   rescue
-    unknown "Could not connect to Redis server on #{config[:host]}:#{config[:port]}"
+    send(config[:conn_failure_status], "Could not connect to Redis server on #{config[:host]}:#{config[:port]}")
   end
 end

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

@@ -70,11 +70,11 @@ class RedisChecks < Sensu::Plugin::Check::CLI
          proc: proc(&:to_i),
          required: true
 
-  option :crit_conn,
-         long: '--crit-conn-failure',
-         boolean: true,
-         description: 'Critical instead of warning on connection failure',
-         default: false
+  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 system_memory
     `awk '/MemTotal/{print$2}' /proc/meminfo`.to_f * 1024
@@ -109,11 +109,6 @@ class RedisChecks < Sensu::Plugin::Check::CLI
       ok "Redis memory usage: #{used_memory}% is below defined limits"
     end
   rescue
-    message = "Could not connect to Redis server on #{config[:host]}:#{config[:port]}"
-    if config[:crit_conn]
-      critical message
-    else
-      warning message
-    end
+    send(config[:conn_failure_status], "Could not connect to Redis server on #{config[:host]}:#{config[:port]}")
   end
 end

data/bin/check-redis-memory.rb

@@ -52,11 +52,11 @@ class RedisChecks < Sensu::Plugin::Check::CLI
          proc: proc(&:to_i),
          required: true
 
-  option :crit_conn,
-         long: '--crit-conn-failure',
-         boolean: true,
-         description: 'Critical instead of warning on connection failure',
-         default: false
+  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 = if config[:socket]
@@ -79,11 +79,6 @@ class RedisChecks < Sensu::Plugin::Check::CLI
       ok "Redis memory usage: #{used_memory}KB is below defined limits"
     end
   rescue
-    message = "Could not connect to Redis server on #{config[:host]}:#{config[:port]}"
-    if config[:crit_conn]
-      critical message
-    else
-      warning message
-    end
+    send(config[:conn_failure_status], "Could not connect to Redis server on #{config[:host]}:#{config[:port]}")
   end
 end

data/bin/check-redis-ping.rb

@@ -57,6 +57,12 @@ class RedisPing < Sensu::Plugin::Check::CLI
          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)
+
   def redis_options
     if config[:socket]
       {
@@ -78,9 +84,7 @@ class RedisPing < Sensu::Plugin::Check::CLI
     else
       critical 'Redis did not respond to the ping command'
     end
-
   rescue
-    message "Could not connect to Redis server on #{config[:host]}:#{config[:port]}"
-    exit 1
+    send(config[:conn_failure_status], "Could not connect to Redis server on #{config[:host]}:#{config[:port]}")
   end
 end

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

@@ -32,6 +32,12 @@ class RedisSlaveCheck < Sensu::Plugin::Check::CLI
          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)
+
   def run
     options = if config[:socket]
                 { path: socket }
@@ -52,11 +58,9 @@ class RedisSlaveCheck < Sensu::Plugin::Check::CLI
       msg += " It has been down for #{redis.info.fetch('master_link_down_since_seconds')}."
       critical msg
     end
-
   rescue KeyError
     critical "Redis server on #{config[:host]}:#{config[:port]} is not master and does not have master_link_status"
-
   rescue
-    critical "Could not connect to Redis server on #{config[:host]}:#{config[:port]}"
+    send(config[:conn_failure_status], "Could not connect to Redis server on #{config[:host]}:#{config[:port]}")
   end
 end

data/bin/metrics-redis-graphite.rb

@@ -97,6 +97,12 @@ class Redis2Graphite < Sensu::Plugin::Metric::CLI::Graphite
          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],
@@ -142,5 +148,7 @@ class Redis2Graphite < Sensu::Plugin::Metric::CLI::Graphite
     end
 
     ok
+  rescue
+    send(config[:conn_failure_status], "Could not connect to Redis server on #{config[:host]}:#{config[:port]}")
   end
 end

data/bin/metrics-redis-llen.rb

@@ -47,6 +47,12 @@ class RedisListLengthMetric < Sensu::Plugin::Metric::CLI::Graphite
          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)
+
   def run
     options = if config[:socket]
                 { path: socket }
@@ -59,5 +65,7 @@ class RedisListLengthMetric < Sensu::Plugin::Metric::CLI::Graphite
 
     output "#{config[:scheme]}.#{config[:key]}.items", redis.llen(config[:key])
     ok
+  rescue
+    send(config[:conn_failure_status], "Could not connect to Redis server on #{config[:host]}:#{config[:port]}")
   end
 end

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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sensu-plugins-redis
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Sensu-Plugins and contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-24 00:00:00.000000000 Z
+date: 2017-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sensu-plugin