riemann-babbler 0.4.9 → 0.5.0

data/config.yml

@@ -7,6 +7,8 @@ logger:
 
 plugins:
 
+  interval: 60
+
   dummy:
     service: keep alive
     interval: 1
@@ -35,8 +37,6 @@ plugins:
   memory:
     service: memory
     interval: 1
-    report_free: true
-    report_total: true
     states:
       warning: 0.6
       critical: 0.8

data/lib/riemann/babbler/plugin.rb

@@ -1,5 +1,7 @@
 #encoding: utf-8
 
+require File.expand_path('../plugin_helpers', __FILE__)
+
 # Базовое описание плагина
 module Riemann
   class Babbler
@@ -126,42 +128,5 @@ module Riemann
       end
     end
 
-    # хэлпер для парса stdout+stderr и exit status
-    def shell(*cmd)
-      exit_status=nil
-      err=nil
-      out=nil
-      Timeout::timeout(5) {
-        Open3.popen3(*cmd) do |stdin, stdout, stderr, wait_thread|
-          err = stderr.gets(nil)
-          out = stdout.gets(nil)
-          [stdin, stdout, stderr].each{|stream| stream.send('close')}
-          exit_status = wait_thread.value
-        end
-      }
-      if exit_status.to_i > 0
-        err = err.chomp if err
-        raise err
-      elsif out
-        return out.chomp
-      else
-        # статус 0, вывода stdout нет
-        return ""
-      end
-    end
-
-    # http rest 
-    def rest_get(url)
-      begin
-        RestClient.get url
-      rescue
-        report({
-          :service => plugin.service,
-          :state => 'critical',
-          :description => "Response from #{url}"
-        })
-      end
-    end
-
   end
 end

data/lib/riemann/babbler/plugin_helpers.rb

@@ -0,0 +1,52 @@
+#encoding: utf-8
+
+module Riemann
+  class Babbler
+
+    def helper_error(msg = "Unknown helper error")
+      report({
+        :service => plugin.service,
+        :state => 'critical',
+        :description => msg
+      })      
+    end
+
+    # хэлпер для парса stdout+stderr и exit status
+    def shell(*cmd)
+      exit_status=nil
+      err=nil
+      out=nil
+      begin
+      Timeout::timeout(5) {
+        Open3.popen3(*cmd) do |stdin, stdout, stderr, wait_thread|
+          err = stderr.gets(nil)
+          out = stdout.gets(nil)
+          [stdin, stdout, stderr].each{|stream| stream.send('close')}
+          exit_status = wait_thread.value
+        end
+      }
+      rescue => e
+        helper_error "#{e.class} #{e}\n#{e.backtrace.join "\n"}"
+      end
+      if exit_status.to_i > 0
+        err = err.chomp if err
+        helper_error(err)
+      elsif out
+        return out.chomp
+      else
+        # статус 0, вывода stdout нет
+        return ""
+      end
+    end
+
+    # http rest 
+    def rest_get(url)
+      begin
+        RestClient.get url
+      rescue
+        helper_error("Get from url: #{url}")
+      end
+    end
+
+  end
+end

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

@@ -1,27 +1,38 @@
 class Riemann::Babbler::Cpu < Riemann::Babbler
 
+  def desc
+    "usage\n\n#{shell('ps -eo pcpu,pid,cmd | sort -nrb -k1 | head -10').chomp}"
+  end
+
+  def init
+    @old_cpu = Hash.new
+  end
+
   def collect
-    cpu = File.read('/proc/stat')
-    cpu[/cpu\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)/]
-    u2, n2, s2, i2 = [$1, $2, $3, $4].map { |e| e.to_i }
-
-    if @old_cpu
-      u1, n1, s1, i1 = @old_cpu
-      used = (u2+n2+s2) - (u1+n1+s1)
-      total = used + i2-i1
-      fraction = used.to_f / total
-    end
+    array = Array.new
+    description = desc
+    File.read('/proc/stat').split("\n").each do |cpu_line|
 
-    @old_cpu = [u2, n2, s2, i2]
+      # проверяем есть строчка /cpu\d+/ или /cpu / и сграбливаем это в переменную
+      cpu_number = cpu_line.scan(/cpu(\d+|\s)\s+/)
+      next if cpu_number.empty?
+      cpu_number = cpu_number[0][0] == " " ? "_total" : cpu_number[0][0] 
 
-    desc = "usage\n\n#{shell('ps -eo pcpu,pid,cmd | sort -nrb -k1 | head -10').chomp}"
-    
-    if fraction
-      { :service => plugin.service, :metric => fraction, :description => desc }
-    else
-      { :service => plugin.service, :state => 'ok' }
-    end
+      # работаем со строкой
+      cpu_line[/cpu(\d+|\s)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)/]
+      _, u2, n2, s2, i2 = [$1, $2, $3, $4, $5].map { |e| e.to_i }
 
+      unless @old_cpu[cpu_number].nil?
+        u1, n1, s1, i1 = @old_cpu[cpu_number]
+        used = (u2+n2+s2) - (u1+n1+s1)
+        total = used + i2-i1
+        fraction = used.to_f / total
+      end
+
+      @old_cpu[cpu_number] = [u2, n2, s2, i2]
+      array << { :service => plugin.service + " cpu#{cpu_number}", :metric => fraction, :description => description } if fraction
+    end
+    array
   end
 
 end

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

@@ -13,9 +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, :metric => fraction },
-      { :service => plugin.service + " free", :metric => free.to_f, :state => 'ok', :description => desc },
-      { :service => plugin.service + " total", :metric => total.to_f, :state => 'ok', :description => desc }
+      { :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 }
     ]
   end
 

data/lib/riemann/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: riemann-babbler
 version: !ruby/object:Gem::Version
-  version: 0.4.9
+  version: 0.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-10 00:00:00.000000000 Z
+date: 2013-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: riemann-client
@@ -124,6 +124,7 @@ files:
 - config.yml
 - lib/deep_merge.rb
 - lib/riemann/babbler/plugin.rb
+- lib/riemann/babbler/plugin_helpers.rb
 - lib/riemann/babbler/plugins/cpu.rb
 - lib/riemann/babbler/plugins/disk.rb
 - lib/riemann/babbler/plugins/dummy.rb
@@ -147,7 +148,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2705264439441515163
+      hash: -2856052346844510337
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: