nephelae 0.0.6 → 0.0.7

data/lib/nephelae/plugins/mem_usage.rb

@@ -15,7 +15,9 @@ module Nephelae
 
       if $?.success?
         stats = parse_status(output)
-        metrics.append_metric('MemoryTotal', stats[:mem_total], {unit: 'Kilobytes'})
+
+        mem_total = stats[:mem_total]
+        metrics.append_metric('MemoryTotal', mem_total, {unit: 'Kilobytes'})
 
         mem_free = stats[:mem_free] + stats[:buffers] + stats[:cached]
         metrics.append_metric('MemoryFree', mem_free, {unit: 'Kilobytes'})

data/lib/nephelae/plugins/redis.rb

@@ -16,8 +16,8 @@ module Nephelae
       if $?.success?
         stats = parse_status(output)
         metrics.append_metric('Up', 1)
-        metrics.append_metric('MasterLinkStatus', (stats[:master] == 'up' ? 1 : 0))
-        metrics.append_metric('MasterIOSecondsAgo', stats[:master_last_io_seconds_ago], {unit: 'Seconds'})
+        metrics.append_metric('MasterLinkStatus', (stats[:master] == 'up' ? 1 : 0)) unless stats[:master].nil?
+        metrics.append_metric('MasterIOSecondsAgo', stats[:master_last_io_seconds_ago], {unit: 'Seconds'}) unless stats[:master_last_io_seconds_ago].nil?
         metrics.append_metric('ChangesSinceLastSave', stats[:changes_since_last_save], {unit: 'Count'})
         metrics.append_metric('UsedMemory', stats[:used_memory], {unit: 'Bytes'})
         metrics.append_metric('ConnectedSlaves', stats[:connected_slaves], {unit: 'Count'})
@@ -32,8 +32,14 @@ module Nephelae
 
     private
       def parse_status(body)
-        { :master_link_status => body.match(/master_link_status:(\w+)/)[1],
-          :master_last_io_seconds_ago => body.match(/master_last_io_seconds_ago:(\d+)/)[1],
+        ret = {}
+        mls = body.match(/master_link_status:(\w+)/)
+        ret[:master_link_status] = mls.nil? ? "down" : mls[1]
+
+        mlio = body.match(/master_last_io_seconds_ago:(\d+)/)
+        ret[:master_last_io_seconds_ago] = mlio[1] unless mlio.nil?
+
+        ret.merge {
           :changes_since_last_save => body.match(/changes_since_last_save:(\d+)/)[1],
           :used_memory => body.match(/used_memory:(\d+)/)[1],
           :connected_slaves => body.match(/connected_slaves:(\d+)/)[1],

data/lib/nephelae/version.rb

@@ -1,3 +1,3 @@
 module Nephelae
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nephelae
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors: