riemann-babbler 0.5.0 → 0.5.1

data/lib/riemann/babbler/plugins/disk.rb

@@ -26,8 +26,10 @@ class Riemann::Babbler::Disk < Riemann::Babbler
       point_stat = Filesystem.stat point
       human_point = point == "/" ? "/root" : point
       human_point.gsub!(/^\//, "").gsub!(/\//, "_")
-      disk << { :service => plugin.service + " #{human_point} block", :metric => 1 - point_stat.blocks_available.to_f/point_stat.blocks }
-      disk << { :service => plugin.service + " #{human_point} inode", :metric => 1 - point_stat.files_available.to_f/point_stat.files }
+      disk << { :service => plugin.service + " #{human_point} % block", :metric => 1 - point_stat.blocks_available.to_f/point_stat.blocks }
+      disk << { :service => plugin.service + " #{human_point} % inode", :metric => 1 - point_stat.files_available.to_f/point_stat.files }
+      disk << { :service => plugin.service + " #{human_point} free", :metric =>  point_stat.blocks_free * point_stat.block_size, :state => 'ok'}
+      disk << { :service => plugin.service + " #{human_point} total", :metric =>  point_stat.blocks * point_stat.block_size, :state => 'ok'}
     end
     disk
   end

data/lib/riemann/babbler/plugins/memory.rb

@@ -13,10 +13,10 @@ class Riemann::Babbler::Memory < Riemann::Babbler
     desc = "usage\n\n#{shell('ps -eo pmem,pid,cmd | sort -nrb -k1 | head -10').chomp}"
 
     [
-      { :service => plugin.service + " free_%+Buffers+Cached", :metric => fraction },
-      { :service => plugin.service + " swap_%", :metric => (m['SwapTotal'] - m['SwapFree']).to_f/m['SwapTotal'] },
-      { :service => plugin.service + " free", :metric => free.to_i, :state => 'ok', :description => desc },
-      { :service => plugin.service + " total", :metric => total.to_i, :state => 'ok', :description => desc }
+      { :service => plugin.service + " % free", :metric => fraction },
+      { :service => plugin.service + " % swap", :metric => (m['SwapTotal'] - m['SwapFree']).to_f/m['SwapTotal'] },
+      { :service => plugin.service + " total free", :metric => free.to_i, :state => 'ok', :description => desc },
+      { :service => plugin.service + " total total", :metric => total.to_i, :state => 'ok', :description => desc }
     ]
   end
 

data/lib/riemann/version.rb

@@ -1,5 +1,5 @@
 module Riemann
   class Babbler
-    VERSION = '0.5.0'
+    VERSION = '0.5.1'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: riemann-babbler
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
   prerelease: 
 platform: ruby
 authors:
@@ -148,7 +148,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2856052346844510337
+      hash: 4038679803083046382
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: