sensu-plugins-redis 1.2.2 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1dabba3da868ee6fd5dfed084268102cf36a1446
-  data.tar.gz: f6c7b92239a2ad94453c9b8757cc3f9b6fd1e144
+  metadata.gz: 6d5a2e7ad15cec51e30e8b1d89902aec3cca0c3e
+  data.tar.gz: 4e389ecc0f27b5f52bf5e6a2a4d2c844415df5b8
 SHA512:
-  metadata.gz: 4b4bc213e3363acc1dfe6d0f2414e9bfa93607ea7271198133ae7e7b88531817fed243e8fa415db6740fc3c88116f96bf1239c6ffb94627648410be564f8eea2
-  data.tar.gz: 752ba0c5aecdebe4248ea41309e474f1df904a715f1f02908bdca82fbffdd8643efb44966e03598d53e0aa40c37194f31f9252366950ac0d856ceccdf19cedd5
+  metadata.gz: 88aa138e23e8ffb72089d7fe39e3a0cf5625a064d8178b891e52904688190ae01d528ac6011eb90074a0669249c5d60be130393e6ac5ec3cdf99a8827afe4a23
+  data.tar.gz: e5f5d5099413025154c92553ccef950d7ab6cdca0212599227cbe699206e49cf1f2000c62ee2489fe18bad0779af541a7dbebdd95690e1966ea710df011dd7ab

data/CHANGELOG.md

@@ -1,18 +1,23 @@
-#Change Log
+# Change Log
 This project adheres to [Semantic Versioning](http://semver.org/).
 
 This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachangelog.com/)
 
 ## [Unreleased]
+
+## [1.3.0] - 2017-05-31
+### Added
+- Added option to connect to Redis via Unix sockets. (@mbyczkowski)
+
 ## [1.2.2] - 2017-05-31
-## Fixed
+### Fixed
 - metrics-redis-graphite: fix skipkeys option not accepting any argument (@boutetnico)
 
 ## [1.2.1] - 2017-05-14
-## Fixed
+### Fixed
 - Updated list of SKIP_KEYS_REGEX in metrics-redis-graphite.rb per #22 and added an option to override the list of keys to allow users to deal with changes without the need of a release (@majormoses)
 
-## Added
+### Added
 - Added option to override SKIP_KEYS_REGEX via option. (@majormoses)
 ## [1.2.0] - 2017-05-09
 ### Changed
@@ -66,7 +71,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.2.2...HEAD
+[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-redis/compare/1.3.0...HEAD
+[1.3.0]: https://github.com/sensu-plugins/sensu-plugins-redis/compare/1.2.2...1.3.0
 [1.2.2]: https://github.com/sensu-plugins/sensu-plugins-redis/compare/1.2.1...1.2.2
 [1.2.1]: https://github.com/sensu-plugins/sensu-plugins-redis/compare/1.2.0...1.2.1
 [1.2.0]: https://github.com/sensu-plugins/sensu-plugins-redis/compare/1.1.0...1.2.0

data/bin/check-redis-info.rb

@@ -20,6 +20,12 @@ require 'sensu-plugin/check/cli'
 require 'redis'
 
 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',
@@ -55,7 +61,12 @@ class RedisSlaveCheck < Sensu::Plugin::Check::CLI
          default: 'master'
 
   def run
-    options = { host: config[:host], port: config[:port] }
+    options = if config[:socket]
+                { path: socket }
+              else
+                { host: config[:host], port: config[:port] }
+              end
+
     options[:password] = config[:password] if config[:password]
     redis = Redis.new(options)
 
@@ -64,7 +75,6 @@ class RedisSlaveCheck < Sensu::Plugin::Check::CLI
     else
       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

data/bin/check-redis-keys.rb

@@ -14,6 +14,12 @@ require 'sensu-plugin/check/cli'
 require 'redis'
 
 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',
@@ -63,7 +69,13 @@ class RedisKeysCheck < Sensu::Plugin::Check::CLI
          default: '*'
 
   def run
-    options = { host: config[:host], port: config[:port], db: config[:database] }
+    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)
 

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

@@ -15,6 +15,12 @@ require 'sensu-plugin/check/cli'
 require 'redis'
 
 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',
@@ -64,7 +70,13 @@ class RedisListLengthCheck < Sensu::Plugin::Check::CLI
          required: true
 
   def run
-    options = { host: config[:host], port: config[:port], db: config[:database] }
+    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)
 

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

@@ -30,6 +30,12 @@
 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',
@@ -75,7 +81,12 @@ class RedisChecks < Sensu::Plugin::Check::CLI
   end
 
   def run
-    options = { host: config[:host], port: config[:port] }
+    options = if config[:socket]
+                { path: socket }
+              else
+                { host: config[:host], port: config[:port] }
+              end
+
     options[:password] = config[:password] if config[:password]
     redis = Redis.new(options)
 

data/bin/check-redis-memory.rb

@@ -12,6 +12,12 @@ 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',
@@ -53,7 +59,12 @@ class RedisChecks < Sensu::Plugin::Check::CLI
          default: false
 
   def run
-    options = { host: config[:host], port: config[:port] }
+    options = if config[:socket]
+                { path: socket }
+              else
+                { host: config[:host], port: config[:port] }
+              end
+
     options[:password] = config[:password] if config[:password]
     redis = Redis.new(options)
 

data/bin/check-redis-ping.rb

@@ -31,6 +31,12 @@ require 'sensu-plugin/check/cli'
 require 'redis'
 
 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',
@@ -52,11 +58,18 @@ class RedisPing < Sensu::Plugin::Check::CLI
          description: 'Redis Password to connect with'
 
   def redis_options
-    {
-      host:     config[:host],
-      port:     config[:port],
-      password: config[:password]
-    }
+    if config[:socket]
+      {
+        path:     config[:socket],
+        password: config[:password]
+      }
+    else
+      {
+        host:     config[:host],
+        port:     config[:port],
+        password: config[:password]
+      }
+    end
   end
 
   def run

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

@@ -6,6 +6,12 @@ require 'sensu-plugin/check/cli'
 require 'redis'
 
 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',
@@ -27,7 +33,12 @@ class RedisSlaveCheck < Sensu::Plugin::Check::CLI
          description: 'Redis Password to connect with'
 
   def run
-    options = { host: config[:host], port: config[:port] }
+    options = if config[:socket]
+                { path: socket }
+              else
+                { host: config[:host], port: config[:port] }
+              end
+
     options[:password] = config[:password] if config[:password]
     redis = Redis.new(options)
 

data/bin/metrics-redis-graphite.rb

@@ -47,6 +47,12 @@ 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',
@@ -93,11 +99,17 @@ class Redis2Graphite < Sensu::Plugin::Metric::CLI::Graphite
 
   def run
     options = {
-      host: config[:host],
-      port: config[:port],
       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)
     skip_keys = if !config[:skip_keys_regex].nil?

data/bin/metrics-redis-llen.rb

@@ -11,6 +11,12 @@ require 'sensu-plugin/metric/cli'
 require 'redis'
 
 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',
@@ -42,7 +48,12 @@ class RedisListLengthMetric < Sensu::Plugin::Metric::CLI::Graphite
          required: true
 
   def run
-    options = { host: config[:host], port: config[:port] }
+    options = if config[:socket]
+                { path: socket }
+              else
+                { host: config[:host], port: config[:port] }
+              end
+
     options[:password] = config[:password] if config[:password]
     redis = Redis.new(options)
 

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

@@ -1,8 +1,8 @@
 module SensuPluginsRedis
   module Version
     MAJOR = 1
-    MINOR = 2
-    PATCH = 2
+    MINOR = 3
+    PATCH = 0
 
     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: 1.2.2
+  version: 1.3.0
 platform: ruby
 authors:
 - Sensu-Plugins and contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-31 00:00:00.000000000 Z
+date: 2017-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sensu-plugin