riemann-babbler 0.8.5 → 0.8.6

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

@@ -3,7 +3,7 @@
 class Riemann::Babbler::Cpu < Riemann::Babbler
 
   def desc
-    "usage\n\n#{shell('ps -eo pcpu,pid,cmd --sort -pcpu | head -10').chomp}"
+    "#{shell('ps -eo pcpu,pid,cmd --sort -pcpu | head -10').chomp}"
   end
 
   def init
@@ -32,7 +32,7 @@ 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
+      array << { :service => plugin.service + " cpu#{cpu_number}", :metric => fraction, :description => "Cpu#{cpu_number} utilization\n\n#{description}" } if fraction
     end
     array
   end

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

@@ -28,10 +28,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", :description => "Disk usage #{point_stat}, %", :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_stat}, 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_stat}, B", :metric =>  point_stat.blocks_free * point_stat.block_size, :state => 'ok'}
-      disk << { :service => plugin.service + " #{human_point} abs total", :description => "Disk space #{point_stat}, B",  :metric =>  point_stat.blocks * point_stat.block_size, :state => 'ok'}
+      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'}
     end
     disk
   end

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

@@ -18,7 +18,7 @@ class Riemann::Babbler::Memory < Riemann::Babbler
     fraction = 1 - (free_bc.to_f / total)
     swap_fraction = m['SwapTotal'] == 0 ? 0 : 1 - m['SwapFree'].to_f/m['SwapTotal']
 
-    desc = "usage\n\n#{shell('ps -eo pcpu,pid,cmd --sort -pmem | head -10').chomp}"
+    desc = "#{shell('ps -eo pmem,pid,cmd --sort -pmem | head -10').chomp}"
 
     [
       { :service => plugin.service + " % free", :description => "Memory usage, %", :metric => fraction.round(2) * 100 },

data/lib/riemann/version.rb

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

metadata

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