riemann-babbler 0.8.6 → 0.8.7

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

@@ -32,7 +32,8 @@ class Riemann::Babbler::Cpu < Riemann::Babbler
       end
 
       @old_cpu[cpu_number] = [u2, n2, s2, i2]
-      array << { :service => plugin.service + " cpu#{cpu_number}", :metric => fraction, :description => "Cpu#{cpu_number} utilization\n\n#{description}" } if fraction
+      spaces = "                                "
+      array << { :service => plugin.service + " cpu#{cpu_number}", :metric => fraction, :description => "Cpu#{cpu_number} usage#{spaces}\n\n#{description}" } if fraction
     end
     array
   end

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

@@ -26,12 +26,13 @@ class Riemann::Babbler::Disk < Riemann::Babbler
     disk = Array.new
     monit_points.each do |point|
       point_stat = Filesystem.stat point
+      desc_point = point
       human_point = point == "/" ? "/root" : point
       human_point.gsub!(/^\//, "").gsub!(/\//, "_")
-      disk << { :service => plugin.service + " #{human_point} % block", :description => "Disk usage #{point}, %", :metric => (1- point_stat.blocks_available.to_f/point_stat.blocks).round(2) * 100 }
-      disk << { :service => plugin.service + " #{human_point} % inode", :description => "Disk usage #{point}, inodes %", :metric => (1 - point_stat.files_available.to_f/point_stat.files).round(2) * 100 }
-      disk << { :service => plugin.service + " #{human_point} abs free", :description => "Disk free #{point}, B", :metric =>  point_stat.blocks_free * point_stat.block_size, :state => 'ok'}
-      disk << { :service => plugin.service + " #{human_point} abs total", :description => "Disk space #{point}, B",  :metric =>  point_stat.blocks * point_stat.block_size, :state => 'ok'}
+      disk << { :service => plugin.service + " #{human_point} % block", :description => "Disk usage #{desc_point}, %", :metric => (1- point_stat.blocks_available.to_f/point_stat.blocks).round(2) * 100 }
+      disk << { :service => plugin.service + " #{human_point} % inode", :description => "Disk usage #{desc_point}, inodes %", :metric => (1 - point_stat.files_available.to_f/point_stat.files).round(2) * 100 }
+      disk << { :service => plugin.service + " #{human_point} abs free", :description => "Disk free #{desc_point}, B", :metric =>  point_stat.blocks_free * point_stat.block_size, :state => 'ok'}
+      disk << { :service => plugin.service + " #{human_point} abs total", :description => "Disk space #{desc_point}, B",  :metric =>  point_stat.blocks * point_stat.block_size, :state => 'ok'}
     end
     disk
   end

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

@@ -19,16 +19,17 @@ class Riemann::Babbler::Memory < Riemann::Babbler
     swap_fraction = m['SwapTotal'] == 0 ? 0 : 1 - m['SwapFree'].to_f/m['SwapTotal']
 
     desc = "#{shell('ps -eo pmem,pid,cmd --sort -pmem | head -10').chomp}"
+    spaces = "                                "
 
     [
       { :service => plugin.service + " % free", :description => "Memory usage, %", :metric => fraction.round(2) * 100 },
       { :service => plugin.service + " % swap", :description => "Swap usage, %", :metric => swap_fraction.round(2) * 100 },
-      { :service => plugin.service + " abs free", :description => "Memory free (kB)\n\n #{desc}", :metric => free, :state => 'ok' },
-      { :service => plugin.service + " abs total", :description => "Memory total (kB)\n\n #{desc}", :metric => total, :state => 'ok' },
-      { :service => plugin.service + " abs cached", :description => "Memory usage, cached (kB)\n\n #{desc}",  :metric => cached, :state => 'ok' },
-      { :service => plugin.service + " abs buffers", :description => "Memory usage, buffers (kB)\n\n #{desc}", :metric => buffers, :state => 'ok' },
-      { :service => plugin.service + " abs used", :description => "Memory usage, used (kB)\n\n #{desc}", :metric => used , :state => 'ok' },
-      { :service => plugin.service + " abs free_bc", :description => "Memory usage with cache и buffers (kB)\n\n #{desc}", :metric => free_bc , :state => 'ok' }
+      { :service => plugin.service + " abs free", :description => "Memory free (kB)#{spaces}\n\n #{desc}", :metric => free, :state => 'ok' },
+      { :service => plugin.service + " abs total", :description => "Memory total (kB)#{spaces}\n\n #{desc}", :metric => total, :state => 'ok' },
+      { :service => plugin.service + " abs cached", :description => "Memory usage, cached (kB)#{spaces}\n\n #{desc}",  :metric => cached, :state => 'ok' },
+      { :service => plugin.service + " abs buffers", :description => "Memory usage, buffers (kB)#{spaces}\n\n #{desc}", :metric => buffers, :state => 'ok' },
+      { :service => plugin.service + " abs used", :description => "Memory usage, used (kB)#{spaces}\n\n #{desc}", :metric => used , :state => 'ok' },
+      { :service => plugin.service + " abs free_bc", :description => "Memory usage with cache и buffers (kB)#{spaces}\n\n #{desc}", :metric => free_bc , :state => 'ok' }
     ]
   end
 

data/lib/riemann/version.rb

@@ -1,5 +1,5 @@
 module Riemann
   class Babbler
-    VERSION = '0.8.6'
+    VERSION = '0.8.7'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: riemann-babbler
 version: !ruby/object:Gem::Version
-  version: 0.8.6
+  version: 0.8.7
   prerelease: 
 platform: ruby
 authors:
@@ -165,7 +165,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3464785679114137672
+      hash: -2571784357499796652
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: