lib/riemann/babbler/plugins/disk.rb in riemann-babbler-0.8.7 vs lib/riemann/babbler/plugins/disk.rb in riemann-babbler-0.8.8

- old
+ new

@@ -24,16 +24,15 @@ monit_points << mtab[1] unless NOT_MONITORING_FS.include? mtab[2] end 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 #{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'} + human_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'} end disk end end