riemann-babbler 0.8.2 → 0.8.3

data/lib/riemann/babbler/plugin.rb

@@ -68,11 +68,13 @@ module Riemann
     end
 
     def get_hostname
+      # разбор fqdn
       if options.riemann.use_fqdn.nil? || options.riemann.use_fqdn == false
         hostname = File.read('/proc/sys/kernel/hostname').strip.downcase
       else
         hostname = Socket.gethostbyname(Socket.gethostname).first
       end
+      # разбор инсталяции
       if options.riemann.installation.nil?
         hostname += options.riemann.suffix unless options.riemann.suffix.nil?
       else

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

@@ -1,7 +1,9 @@
+#encoding: utf-8
+
 class Riemann::Babbler::Cpu < Riemann::Babbler
 
   def desc
-    "usage\n\n#{shell('ps -eo pcpu,pid,cmd | sort -nrb -k1 | head -10').chomp}"
+    "usage\n\n#{shell('ps -eo pcpu,pid,cmd --sort -pcpu | head -10').chomp}"
   end
 
   def init
@@ -30,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 => description } if fraction
+      array << { :service => plugin.service + " cpu#{cpu_number}", :metric => fraction, :description => "Утилизация cpu#{cpu_number} \n\n" + description } if fraction
     end
     array
   end

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

@@ -1,3 +1,5 @@
+#encoding: utf-8
+
 class Riemann::Babbler::Disk < Riemann::Babbler
 
   require 'sys/filesystem'
@@ -26,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", :metric => (1- point_stat.blocks_available.to_f/point_stat.blocks).round(2) * 100 }
-      disk << { :service => plugin.service + " #{human_point} % inode", :metric => (1 - point_stat.files_available.to_f/point_stat.files).round(2) * 100 }
-      disk << { :service => plugin.service + " #{human_point} abs free", :metric =>  point_stat.blocks_free * point_stat.block_size, :state => 'ok'}
-      disk << { :service => plugin.service + " #{human_point} abs total", :metric =>  point_stat.blocks * point_stat.block_size, :state => 'ok'}
+      disk << { :service => plugin.service + " #{human_point} % block", :description => "Процент утилизации: #{point_stat}", :metric => (1- point_stat.blocks_available.to_f/point_stat.blocks).round(2) * 100 }
+      disk << { :service => plugin.service + " #{human_point} % inode", :description => "Процент утилизации inode: #{point_stat}", :metric => (1 - point_stat.files_available.to_f/point_stat.files).round(2) * 100 }
+      disk << { :service => plugin.service + " #{human_point} abs free", :description => "Всего диск (b): #{point_stat}", :metric =>  point_stat.blocks_free * point_stat.block_size, :state => 'ok'}
+      disk << { :service => plugin.service + " #{human_point} abs total", :description => "Утилизация диск (b): #{point_stat}",  :metric =>  point_stat.blocks * point_stat.block_size, :state => 'ok'}
     end
     disk
   end

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

@@ -1,7 +1,9 @@
+#encoding: utf-8
+
 class Riemann::Babbler::La < Riemann::Babbler
 
   def collect
-    { :service => plugin.service + " la_1", :metric => File.read('/proc/loadavg').split(/\s+/)[2].to_f }
+    { :service => plugin.service + " la_1", :description => "LA усредненный по минуте", :metric => File.read('/proc/loadavg').split(/\s+/)[2].to_f }
   end
 
 end

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

@@ -1,3 +1,5 @@
+#encoding: utf-8
+
 class Riemann::Babbler::Memory < Riemann::Babbler
 
   def collect
@@ -16,17 +18,17 @@ 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 pmem,pid,cmd | sort -nrb -k1 | head -10').chomp}"
+    desc = "usage\n\n#{shell('ps -eo pcpu,pid,cmd --sort -pmem | head -10').chomp}"
 
     [
-      { :service => plugin.service + " % free", :metric => fraction.round(2) * 100 },
-      { :service => plugin.service + " % swap", :metric => swap_fraction.round(2) * 100 },
-      { :service => plugin.service + " abs free", :metric => free, :state => 'ok', :description => desc },
-      { :service => plugin.service + " abs total", :metric => total, :state => 'ok', :description => desc },
-      { :service => plugin.service + " abs cached", :metric => cached, :state => 'ok', :description => desc },
-      { :service => plugin.service + " abs buffers", :metric => buffers, :state => 'ok', :description => desc },
-      { :service => plugin.service + " abs used", :metric => used , :state => 'ok', :description => desc },
-      { :service => plugin.service + " abs free_bc", :metric => free_bc , :state => 'ok', :description => desc }
+      { :service => plugin.service + " % free", :description => "Процент утилизации памяти", :metric => fraction.round(2) * 100 },
+      { :service => plugin.service + " % swap", :description => "Процент утилизации своп", :metric => swap_fraction.round(2) * 100 },
+      { :service => plugin.service + " abs free", :description => "Утилизация памяти (kB)", :metric => free, :state => 'ok', :description => desc },
+      { :service => plugin.service + " abs total", :description => "Памяти всего (kB)", :metric => total, :state => 'ok', :description => desc },
+      { :service => plugin.service + " abs cached", :description => "Утилизация памяти cached (kB)",  :metric => cached, :state => 'ok', :description => desc },
+      { :service => plugin.service + " abs buffers", :description => "Утилизация памяти buffers (kB)", :metric => buffers, :state => 'ok', :description => desc },
+      { :service => plugin.service + " abs used", :description => "Утилизация памяти used (kB)", :metric => used , :state => 'ok', :description => desc },
+      { :service => plugin.service + " abs free_bc", :description => "Утилизация памяти с cache и buffers (kB)", :metric => free_bc , :state => 'ok', :description => desc }
     ]
   end
 

data/lib/riemann/version.rb

@@ -1,5 +1,5 @@
 module Riemann
   class Babbler
-    VERSION = '0.8.2'
+    VERSION = '0.8.3'
   end
 end

metadata

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