riemann-babbler 1.1.0pre2 → 1.1.6

data/.gitignore

@@ -2,4 +2,3 @@ pkg/
 .idea
 .rvmrc
 *.swp
-Makefile

data/Gemfile

@@ -6,8 +6,9 @@ gem 'logger'
 gem 'trollop'
 gem 'sys-filesystem'
 gem 'rest-client'
-gem 'sequel'
 gem 'net-ping'
+gem 'file-tail'
+gem 'sys-proctable'
 
 gem 'rspec'
 gem 'rake'

data/Gemfile.lock

@@ -8,6 +8,8 @@ GEM
       yamler (>= 0.1.0)
     diff-lcs (1.2.2)
     ffi (1.4.0)
+    file-tail (1.0.12)
+      tins (~> 0.5)
     logger (1.2.8)
     method_source (0.8.1)
     mime-types (1.21)
@@ -33,10 +35,11 @@ GEM
     rspec-expectations (2.13.0)
       diff-lcs (>= 1.1.3, < 2.0)
     rspec-mocks (2.13.0)
-    sequel (3.46.0)
     slop (3.4.3)
     sys-filesystem (1.1.0)
       ffi
+    sys-proctable (0.9.3)
+    tins (0.8.0)
     trollop (2.0)
     yamler (0.1.0)
 
@@ -46,6 +49,7 @@ PLATFORMS
 DEPENDENCIES
   awesome_print
   configatron
+  file-tail
   logger
   net-ping
   pry
@@ -53,6 +57,6 @@ DEPENDENCIES
   rest-client
   riemann-client
   rspec
-  sequel
   sys-filesystem
+  sys-proctable
   trollop

data/README.md

@@ -1,13 +1,5 @@
 [![Build Status](https://travis-ci.org/vadv/riemann-babbler.png)](https://travis-ci.org/vadv/riemann-babbler)
 
-### Beware!
-Currently I'm working on c-ext from zabbix. 
-It's not all fully working :)
-Use stable gem please!
-```
-gem "riemann-babbler", "~> 1.0.7.3"
-```
-
 ### Install
 ```
 gem install riemann-babbler

data/Rakefile

@@ -1,14 +1 @@
-require 'rspec/core/rake_task'
 require 'bundler/gem_tasks'
-
-RSpec::Core::RakeTask.new('spec')
-task :build do
-  Dir.chdir('ext/sysinfo') do
-    output = `ruby extconf.rb`
-    raise output unless $? == 0
-    output = `make`
-    raise output unless $? == 0
-  end
-end
-
-task :spec => :build

data/bin/riemann-babbler

@@ -1,11 +1,12 @@
 #!/usr/bin/env ruby
-#encoding: utf-8
+# coding: utf-8
 
 require 'trollop'
 require 'configatron'
 
-require File.expand_path('../../lib/riemann/version', __FILE__)
-require File.expand_path('../../lib/start', __FILE__)
+$:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+require 'riemann/babbler/version'
+require 'riemann/babbler/start'
 
 opts = Trollop::options do
   version "Riemann babbler #{Riemann::Babbler::VERSION}"

data/config.yml

@@ -40,7 +40,6 @@ plugins:
 
   net:
     service: net
-    interval: 60
 
   cpufan:
     service: cpufan
@@ -57,6 +56,9 @@ plugins:
   megacli:
     service: megacli
 
+  twcli:
+    interval: 300
+
   nginx:
     service: nginx
 

data/lib/riemann/{babbler/plugin.rb → babbler.rb}

@@ -1,15 +1,14 @@
-#encoding: utf-8
+# encoding: utf-8
 
-require File.expand_path('../support/plugin_helpers', __FILE__)
+require 'riemann/babbler/support/plugin_helpers'
 require 'riemann/client'
 require 'open3'
 require 'timeout'
 require 'rest_client'
 require 'socket'
 require 'net/ping'
-require 'sequel'
-require 'riemann/babbler/sysinfo'
-require File.expand_path('../support/monkey_patches', __FILE__)
+require 'file/tail'
+require 'riemann/babbler/support/monkey_patches'
 
 
 # Базовое описание плагина
@@ -66,9 +65,9 @@ module Riemann
     def report_with_diff(event)
       current_metric = event[:metric]
       if @storage.has_key?(event[:service])
-        next if @storage[ event[:service] ].nil?
-        next if current_metric + @storage[ event[:service] ] > 2**64
-        event[:metric] = current_metric - @storage[ event[:service] ]
+        unless current_metric + @storage[event[:service]] > 2**64
+          event[:metric] = current_metric - @storage[event[:service]]
+        end unless @storage[event[:service]].nil?
       end
       @storage[ event[:service] ] = current_metric
       event.delete(:as_diff)
@@ -101,7 +100,7 @@ module Riemann
       if plugin.run.nil?
         true
       else
-        plugin.run == true ? true : false
+        plugin.run ? true : false
       end
     end
 
@@ -122,7 +121,10 @@ module Riemann
       t0 = Time.now
       loop do
         begin
-          tick
+          Timeout::timeout( plugin.interval ) { tick }
+        rescue TimeoutError
+          report({:state => 'critical', :service => plugin.service, :description => 'Broken plugin: deadlock'})
+          logger.error "Plugin #{self.class.name} timed out!"
         rescue => e
           logger.error "Plugin #{self.class.name} : #{e.class} #{e}\n#{e.backtrace.join "\n"}"
         end
@@ -136,6 +138,8 @@ module Riemann
       return 'critical' if my_state.nil?
       if plugin.states.warning.nil?
         my_state >= plugin.states.critical ? 'critical' : 'ok'
+      elsif plugin.states.critical.nil?
+        my_state >= plugin.states.warning ? 'warning' : 'ok'
       else
         case
           when my_state.between?(plugin.states.warning, plugin.states.critical)

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

@@ -2,13 +2,17 @@
 
 class Riemann::Babbler::Cpu < Riemann::Babbler
 
+  def desc
+    "#{shell('ps -eo pcpu,pid,cmd --sort -pcpu | head -3').chomp}"
+  end
+
   def init
     @old_cpu = Hash.new
   end
 
   def collect
     array = Array.new
-    description = 'Cpu usage'
+    description = desc
     File.read('/proc/stat').split("\n").each do |cpu_line|
 
       # проверяем есть строчка /cpu\d+/ или /cpu / и сграбливаем это в переменную

data/lib/riemann/babbler/plugins/{cpufan.rb → cpu_fan.rb}

@@ -1,4 +1,4 @@
-class Riemann::Babbler::Cpufan < Riemann::Babbler
+class Riemann::Babbler::CpuFan < Riemann::Babbler
 
   def init
     plugin.set_default(:service, 'cpufan')
@@ -13,7 +13,7 @@ class Riemann::Babbler::Cpufan < Riemann::Babbler
   end
 
   def collect
-    { :service => plugin.service, :metric => shell(plugin.cmd).to_i, :description => "CPU Fan Speed" }
+    { :service => plugin.service, :metric => shell(plugin.cmd).to_i, :description => 'CPU Fan Speed'}
   end
 
 end

data/lib/riemann/babbler/plugins/{cputemp.rb → cpu_temp.rb}

@@ -1,4 +1,4 @@
-class Riemann::Babbler::Cputemp < Riemann::Babbler
+class Riemann::Babbler::CpuTemp < Riemann::Babbler
 
   def init
     plugin.set_default(:service, 'cputemp')
@@ -13,7 +13,7 @@ class Riemann::Babbler::Cputemp < Riemann::Babbler
   end
 
   def collect
-    { :service => plugin.service, :metric => shell(plugin.cmd).to_i, :description => "CPU Temperature" }
+    { :service => plugin.service, :metric => shell(plugin.cmd).to_i, :description => 'CPU Temperature'}
   end
 
 end

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

@@ -2,6 +2,9 @@
 
 class Riemann::Babbler::Disk < Riemann::Babbler
 
+  require 'sys/filesystem'
+  include Sys
+
   NOT_MONITORING_FS = %w(sysfs nfs devpts squashfs proc devtmpfs)
 
   def collect
@@ -9,18 +12,21 @@ class Riemann::Babbler::Disk < Riemann::Babbler
     # точнее выбираем из mounts только те, у которых fstype не попадает
     # в NOT_MONITORING_FS
     monit_points = [] 
-    File.read('/proc/mounts').split("\n").each do |line|
-      mtab = line.split(/\s+/)
-      monit_points << mtab[1] unless NOT_MONITORING_FS.include? mtab[2] 
+    File.open('/proc/mounts', 'r') do |file|
+      while (line = file.gets)
+        mtab = line.split(/\s+/)
+        monit_points << mtab[1] unless NOT_MONITORING_FS.include? mtab[2] 
+      end
     end
     disk = Array.new
     monit_points.each do |point|
+      point_stat = Filesystem.stat point
       human_point = point == '/' ? '/root' : point
       human_point = human_point.gsub(/^\//, '').gsub(/\//, '_')
-      disk << { :service => plugin.service + " #{human_point} % block", :description => "Disk usage #{point}, %", :metric => SysInfo::FS::Block.pused(point) }
-      disk << { :service => plugin.service + " #{human_point} % inode", :description => "Disk usage #{point}, inodes %", :metric => SysInfo::FS::Inode.pused(point)}
-      disk << { :service => plugin.service + " #{human_point} abs free", :description => "Disk free #{point}, B", :metric =>  SysInfo::FS::Block.total(point), :state => 'ok'}
-      disk << { :service => plugin.service + " #{human_point} abs total", :description => "Disk space #{point}, B",  :metric =>  SysInfo::FS::Inode.total(point), :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 } unless point_stat.blocks == 0
+      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 } unless point_stat.files == 0
+      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/exim4.rb

@@ -13,7 +13,7 @@ class Riemann::Babbler::Exim4 < Riemann::Babbler
   end
 
   def collect
-    { :service => plugin.service, :metric => shell(plugin.cmd).to_i, :description => "Exim4: count frozen mails" }
+    { :service => plugin.service, :metric => shell(plugin.cmd).to_i, :description => 'Exim4: count frozen mails'}
   end
 
 end

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

@@ -0,0 +1,27 @@
+require 'find'
+
+class Riemann::Babbler::Findfiles < Riemann::Babbler
+
+  def init
+    plugin.set_default(:service, 'find files')
+    plugin.set_default(:interval, 60)
+    plugin.set_default(:file_mask, '.*') # file search mask
+    plugin.set_default(:dir, '/tmp/directory') # search in dir
+    plugin.set_default(:age, 1440) # in minute
+    plugin.states.set_default(:warning, 5)
+  end
+
+  def collect
+    return [] unless File.directory?(plugin.dir)
+    files = 0
+    file_mask = Regexp.new(plugin.file_mask)
+    Find.find(plugin.dir).each do |file|
+      next unless File.file? file
+      next unless file_mask.match file
+      next unless Time.now.to_i - (plugin.age * 60) > File.new(file).mtime.to_i
+      files += 1
+    end
+    { :service => plugin.service, :metric => files, :description => "Count files in #{plugin.dir}"}
+  end
+
+end

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

@@ -24,9 +24,9 @@ class Riemann::Babbler::Http < Riemann::Babbler
     command += " --max-time #{plugin.max_time} --fail"
     command += " #{plugin.url} -o /dev/null"
 
-    out = shell(command)
+    out = shell(command).to_i
 
-    if out.to_i != plugin.http_code
+    if out != plugin.http_code
       metric = 1
     else
       metric = 0

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

@@ -3,7 +3,7 @@
 class Riemann::Babbler::La < Riemann::Babbler
 
   def collect
-    { :service => plugin.service + ' la_1', :description => 'LA averaged over 1 minute', :metric => File.read('/proc/loadavg').split(/\s+/)[2].to_f }
+    { :service => plugin.service + ' la_1', :description => 'LA averaged over 1 minute', :metric => File.read('/proc/loadavg').scan(/[\d\.]+/).first.to_f }
   end
 
 end

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

@@ -14,12 +14,26 @@ class Riemann::Babbler::Mdadm < Riemann::Babbler
     file = File.read('/proc/mdstat').split("\n")
     status = Array.new
     file.each_with_index do |line, index|
-      next unless line.include? "_"
-      device = file[index-1].split(":")[0].strip
-      status << { :service => plugin.service + " #{device}", :metric => 1, :description => "mdadm failed device #{device}" }
+      next unless line.include? '_'
+      device = file[index-1].split(':')[0].strip
+      status << { :service => plugin.service + " #{device}", :metric => 1, :description => "mdadm failed device #{device}: #{get_failed_parts(device)}" }
     end
     status
   end
 
-end
+  def get_failed_parts (device)
+    begin
+      failed_parts = []
+      Dir["/sys/block/#{device}/md/dev-*"].each do |p|
+        state = File.read("#{p}/state").strip
+        next unless state != "in_sync"
+        p.gsub!(/.+\/dev-/,"")
+        failed_parts << "#{p} (#{state})"
+      end
+      failed_parts.join(", ")
+    rescue
+      nil
+    end
+  end
 
+end

data/lib/riemann/babbler/plugins/{megacli.rb → mega_cli.rb}

@@ -12,7 +12,7 @@ class Riemann::Babbler::MegaCli < Riemann::Babbler
   end
 
   def collect
-    {:service => plugin.service, :metric => shell(plugin.cmd).to_i, :description => "MegaCli status" }
+    {:service => plugin.service, :metric => shell(plugin.cmd).to_i, :description => 'MegaCli status'}
   end
 
 end

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

@@ -3,17 +3,31 @@
 class Riemann::Babbler::Memory < Riemann::Babbler
 
   def collect
-    total = SysInfo::Memory.total
-    free_bc = SysInfo::Memory.free + SysInfo::Memory.buffers + SysInfo::Memory.cached
+    m = File.read('/proc/meminfo').split(/\n/).inject({}) { |info, line|
+      x = line.split(/:?\s+/)
+      info[x[0]] = x[1].to_i
+      info
+    }
+    free = m['MemFree'].to_i * 1024
+    cached =m['Cached'].to_i * 1024
+    buffers =m['Buffers'].to_i * 1024
+    total = m['MemTotal'].to_i * 1024
+    used = total - free
+    free_bc = free + buffers + cached
+
     fraction = 1 - (free_bc.to_f / total)
+    swap_fraction = m['SwapTotal'] == 0 ? 0 : 1 - m['SwapFree'].to_f/m['SwapTotal']
+
+    desc = "#{shell('ps -eo pmem,pid,cmd --sort -pmem | head -3').chomp}"
     [
       { :service => plugin.service + ' % free', :description => 'Memory usage, %', :metric => fraction.round(2) * 100 },
-      { :service => plugin.service + ' abs free', :description => "Memory free (Bytes)", :metric => SysInfo::Memory.free, :state => 'ok' },
-      { :service => plugin.service + ' abs total', :description => "Memory total (Bytes)", :metric => total, :state => 'ok' },
-      { :service => plugin.service + ' abs cached', :description => "Memory usage, cached (Bytes)",  :metric => SysInfo::Memory.cached, :state => 'ok' },
-      { :service => plugin.service + ' abs buffers', :description => "Memory usage, buffers (Bytes)", :metric => SysInfo::Memory.buffers, :state => 'ok' },
-      { :service => plugin.service + ' abs used', :description => "Memory usage, used (Bytes)", :metric => SysInfo::Memory.total - SysInfo::Memory.free , :state => 'ok' },
-      { :service => plugin.service + ' abs free_bc', :description => "Memory usage with cache и buffers (Bytes)", :metric => free_bc , :state => 'ok' }
+      { :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' }
     ]
   end
 

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

@@ -1,5 +1,21 @@
 class Riemann::Babbler::Net < Riemann::Babbler
 
+  WORDS = ['rx bytes',
+           'rx packets',
+           'rx errs',
+           'rx drop',
+           'rx fifo',
+           'rx frame',
+           'rx compressed',
+           'rx multicast',
+           'tx bytes',
+           'tx packets',
+           'tx drops',
+           'tx fifo',
+           'tx colls',
+           'tx carrier',
+           'tx compressed']
+
   def collect
     f = File.read('/proc/net/dev')
     status = Array.new
@@ -7,9 +23,13 @@ class Riemann::Babbler::Net < Riemann::Babbler
       iface = line.split(':')[0].strip
       iface.gsub!(/\./, '_')
       next unless line =~ /(\w*)\:\s*([\s\d]+)\s*/
-      status << { :service => "#{plugin.service} #{iface} bytes out", :metric => SysInfo::Net.out(iface, 'bytes'), :as_diff => true }
-      status << { :service => "#{plugin.service} #{iface} bytes in", :metric => SysInfo::Net.in(iface, 'bytes'), :as_diff => true }
-      status << { :service => "#{plugin.service} #{iface} bytes errors", :metric => SysInfo::Net.total(iface, 'errors'), :state => 'ok' }
+      WORDS.map do |service|
+        "#{plugin.service} #{iface} #{service}"
+      end.zip(
+        $2.split(/\s+/).map { |str| str.to_i }
+      ).each do |service, value|
+        status << { :service => service, :metric => value, :as_diff => true}
+      end
     end
     status
   end