sensu-plugins-redis 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aa3bd14d4f7f74d7842cb8ca44241f6217867416
-  data.tar.gz: 5ee2a06904e3f5ccf6f01db4bf5205214b23c235
+  metadata.gz: a5514a6bf6db1a6db25ae3699836258965a0b31d
+  data.tar.gz: 23f1fe01b595342fa603ce131138216efe43a527
 SHA512:
-  metadata.gz: cbc5faa4a10e9f375998eafe17cebef06cfc39f6a4ddeed41a46e7e3b176bf0c27b27b0164536b65305a869204fff63e05b4af1a7936355f2a836e1d1fe79267
-  data.tar.gz: 5f3874b81d9e6157e457fd5461cb3a8b1b1e6996eab1718ebb0d43c65e483ae9d77bd2654c419dad8f9ad98410e77f69dacaaf8b63c6812e6b28e59728e6a82e
+  metadata.gz: 0a364aa40846435b5777a5ebe752f0fd07a7d381c14e8ba2865e91daaf7fcb7ce08d2f9b8adec6483d5fca6814cd43de12c5701b5df03e588206298dd340dfd5
+  data.tar.gz: d9279e57b50c03558f4a58eeda2a35af94f833421f67847e8abcaee24d732569db0fe57738f77a41968b51b0b65ca1c87f876147730cc06c24c13ec680031d9b

data/CHANGELOG.md

@@ -4,6 +4,13 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachangelog.com/)
 
 ## [Unreleased]
+## [1.1.0] - 2017-05-02
+### Added
+- metrics-redis-graphite: add commandstats metrics (@PhilGuay)
+### Changed
+- check-redis-memory-percentage use maxmemory property if available (@andyroyle)
+- check-redis-memory-percentage fix float conversion bug (@andyroyle)
+- check-redis-slave-status: do not throw error if server is master (@stevenviola)
 
 ## [1.0.0] - 2016-05-23
 ### Added
@@ -41,7 +48,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.0.0...HEAD
+[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-redis/compare/1.1.0...HEAD
+[1.1.0]: https://github.com/sensu-plugins/sensu-plugins-redis/compare/1.0.0...1.1.0
 [1.0.0]: https://github.com/sensu-plugins/sensu-plugins-redis/compare/0.1.0...1.0.0
 [0.1.0]: https://github.com/sensu-plugins/sensu-plugins-redis/compare/0.0.4...0.1.0
 [0.0.4]: https://github.com/sensu-plugins/sensu-plugins-redis/compare/0.0.3...0.0.4

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

@@ -70,13 +70,18 @@ class RedisChecks < Sensu::Plugin::Check::CLI
          description: 'Critical instead of warning on connection failure',
          default: false
 
+  def system_memory
+    `awk '/MemTotal/{print$2}' /proc/meminfo`.to_f * 1024
+  end
+
   def run
     options = { host: config[:host], port: config[:port] }
     options[:password] = config[:password] if config[:password]
     redis = Redis.new(options)
 
-    memory_in_use = redis.info.fetch('used_memory').to_f.div(1024) # used memory in KB (KiloBytes)
-    total_memory = `awk '/MemTotal/{print$2}' /proc/meminfo`.to_f  # total memory of system in KB
+    redis_info = redis.info
+    memory_in_use = redis_info.fetch('used_memory').to_f.div(1024).to_f             # used memory in KB (KiloBytes)
+    total_memory = redis_info.fetch('maxmemory', system_memory).to_f.div(1024).to_f # max memory (if specified) in KB
 
     used_memory = ((memory_in_use / total_memory) * 100).round(2)
     warn_memory = config[:warn_mem]

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

@@ -31,7 +31,9 @@ class RedisSlaveCheck < Sensu::Plugin::Check::CLI
     options[:password] = config[:password] if config[:password]
     redis = Redis.new(options)
 
-    if redis.info.fetch('master_link_status') == 'up'
+    if redis.info.fetch('role') == 'master'
+      ok 'This redis server is master'
+    elsif redis.info.fetch('master_link_status') == 'up'
       ok 'The redis master links status is up!'
     else
       msg = ''
@@ -41,7 +43,7 @@ class RedisSlaveCheck < Sensu::Plugin::Check::CLI
     end
 
   rescue KeyError
-    critical "Redis server on #{config[:host]}:#{config[:port]} is master"
+    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]}"

data/bin/metrics-redis-graphite.rb

@@ -86,6 +86,13 @@ class Redis2Graphite < Sensu::Plugin::Metric::CLI::Graphite
       end
     end
 
+    # Loop thru commandstats entries for perf metrics
+    redis.info('commandstats').each do |k, v|
+      %w(['calls', 'usec_per_call', 'usec']).each do |x|
+        output "#{config[:scheme]}.commandstats.#{k}.#{x}", v[x]
+      end
+    end
+
     ok
   end
 end

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

@@ -1,7 +1,7 @@
 module SensuPluginsRedis
   module Version
     MAJOR = 1
-    MINOR = 0
+    MINOR = 1
     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.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Sensu-Plugins and contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-24 00:00:00.000000000 Z
+date: 2017-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sensu-plugin
@@ -224,9 +224,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Sensu plugins for working with redis
 test_files: []
-has_rdoc: