riemann-babbler 1.4.0 → 2.0.0pre1

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

@@ -1,18 +1,17 @@
 #encoding: utf-8
 
-class Riemann::Babbler::Cpu < Riemann::Babbler
-
-  def desc
-    "#{shell('ps -eo pcpu,pid,cmd --sort -pcpu | head -3').chomp}"
-  end
+class Riemann::Babbler::Plugin::Cpu < Riemann::Babbler::Plugin
 
   def init
     @old_cpu = Hash.new
+    plugin.set_default(:service, 'cpu usage')
+    plugin.set_default(:per_processor, false)
+    plugin.states.set_default(:warning, 70)
+    plugin.states.set_default(:critical, 85)
   end
 
   def collect
     array = Array.new
-    description = desc
     File.read('/proc/stat').split("\n").each do |cpu_line|
 
       # проверяем есть строчка /cpu\d+/ или /cpu / и сграбливаем это в переменную
@@ -26,17 +25,21 @@ class Riemann::Babbler::Cpu < Riemann::Babbler
 
       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
+        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]
       # _total идет с трешхолдом, а все остальное без трешхолда
       if cpu_number == '_total'
-        array << { :service => plugin.service + " cpu#{cpu_number}", :metric => fraction, :description => "Cpu#{cpu_number} usage\n\n#{description}" } if fraction
+        array << {
+            :service => plugin.service + " cpu#{cpu_number}", :metric => fraction, :description => "Cpu#{cpu_number} usage\n"
+        } if fraction
       else
-        array << { :service => plugin.service + " cpu#{cpu_number}", :metric => fraction, :description => "Cpu#{cpu_number} usage\n\n#{description}", :state => 'ok' } if fraction
+        array << {
+            :service => plugin.service + " cpu#{cpu_number}", :metric => fraction, :description => "Cpu#{cpu_number} usage\n", :state => 'ok'
+        } if fraction && plugin.per_processor
       end
     end
     array

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

@@ -1,4 +1,4 @@
-class Riemann::Babbler::CpuFan < Riemann::Babbler
+class Riemann::Babbler::Plugin::CpuFan < Riemann::Babbler::Plugin
 
   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/cpu_temp.rb

@@ -1,4 +1,4 @@
-class Riemann::Babbler::CpuTemp < Riemann::Babbler
+class Riemann::Babbler::Plugin::CpuTemp < Riemann::Babbler::Plugin
 
   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

@@ -1,32 +1,38 @@
 #encoding: utf-8
 
-class Riemann::Babbler::Disk < Riemann::Babbler
+class Riemann::Babbler::Plugin::Disk < Riemann::Babbler::Plugin
 
   require 'sys/filesystem'
   include Sys
 
   NOT_MONITORING_FS = %w(sysfs nfs devpts squashfs proc devtmpfs)
 
+  def init
+    plugin.set_default(:service, 'disk')
+    plugin.states.set_default(:warning, 70)
+    plugin.states.set_default(:critical, 85)
+  end
+
   def collect
     # собираем только необходимые для мониторинга маунт-поинты
     # точнее выбираем из mounts только те, у которых fstype не попадает
     # в NOT_MONITORING_FS
-    monit_points = [] 
+    monit_points = []
     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] 
+        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
+      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 => (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'}
+      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/{diskstat.rb → disk_stat.rb}

@@ -1,17 +1,17 @@
-class Riemann::Babbler::Diskstat < Riemann::Babbler
+class Riemann::Babbler::Plugin::DiskStat < Riemann::Babbler::Plugin
 
   WORDS = [
-    'reads reqs',
-    'reads merged',
-    'reads sector',
-    'reads time',
-    'writes reqs',
-    'writes merged',
-    'writes sector',
-    'writes time',
-    'io reqs',
-    'io time',
-    'io weighted'
+      'reads reqs',
+      'reads merged',
+      'reads sector',
+      'reads time',
+      'writes reqs',
+      'writes merged',
+      'writes sector',
+      'writes time',
+      'io reqs',
+      'io time',
+      'io weighted'
   ]
 
   def init
@@ -26,22 +26,22 @@ class Riemann::Babbler::Diskstat < Riemann::Babbler
 
   def collect
     status = Array.new
-    f = File.read('/proc/diskstats')
-    f.split("\n").reject { |d| d =~ /(ram|loop)/ }.inject({}) do |s, line|
+    f      = File.read('/proc/diskstats')
+    f.split("\n").reject { |d| d =~ /(ram|loop)/ }.inject({}) do |_, line|
       if line =~ /^(?:\s+\d+){2}\s+([\w\d]+) (.*)$/
-        dev = $1
+        dev    = $1
         values = $2.split(/\s+/).map { |str| str.to_i }
         # пропускаем неинтересные девайсы
         # которые закнчиваются на число, но при этом не пропускаем xvd
         next if !!(dev.match /\d+$/ || !(dev.match =~ /^xvd/))
         # читаем все фильтры
         plugin.filter.each do |filter|
-          status << { :service => "#{plugin.service} #{dev} #{filter}", :metric => values[WORDS.index(filter)], :as_diff => true}
+          status << { :service => "#{plugin.service} #{dev} #{filter}", :metric => values[WORDS.index(filter)], :as_diff => true }
         end
         # добавляем iops
         iops = values[WORDS.index('reads reqs')].to_i + values[WORDS.index('writes reqs')].to_i
-        status << { :service => "#{plugin.service} #{dev} iops", :metric => iops, :as_diff => true}
-      end 
+        status << { :service => "#{plugin.service} #{dev} iops", :metric => iops, :as_diff => true }
+      end
     end
     status
   end

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

@@ -0,0 +1,34 @@
+class Riemann::Babbler::Plugin::ErrorsReporter < Riemann::Babbler::Plugin
+
+  def init
+    plugin.set_default(:service, 'riemann client')
+    @report_ok = false
+  end
+
+  def collect
+    status = Array.new
+    messages = Array.new
+
+    opts.errors.to_hash.each do |plugin_name, plugin_status|
+      next if plugin_status[:reported]
+      messages << "#{plugin_name} count_errors: #{plugin_status[:count]}, \
+        last: #{plugin_status[:last_error_at]}"
+      opts.errors.send(plugin_name).reported = true
+    end
+
+    if messages.empty?
+      status << { :service => plugin.service, :state => 'ok', :description => "All plugins ok" } unless @report_ok
+      @report_ok = true
+    else
+      @report_ok = false
+      status << {
+          :service => plugin.service,
+          :state => 'critical',
+          :metric => messages.count,
+          :description => "Problem with plugins:\n #{messages.join("\n")}"
+      }
+    end
+    status
+  end
+
+end

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

@@ -1,4 +1,4 @@
-class Riemann::Babbler::Exim4 < Riemann::Babbler
+class Riemann::Babbler::Plugin::Exim4 < Riemann::Babbler::Plugin
 
   def init
     plugin.set_default(:service, 'exim4')
@@ -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

@@ -1,27 +1,27 @@
 require 'find'
 
-class Riemann::Babbler::Findfiles < Riemann::Babbler
+class Riemann::Babbler::Plugin::FindFiles < Riemann::Babbler::Plugin
 
   def init
     plugin.set_default(:service, 'find files')
     plugin.set_default(:interval, 60)
-    plugin.set_default(:file_mask, '.*') # file search mask
+    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.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)
+    count_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
+      count_files += 1
     end
-    { :service => plugin.service, :metric => files, :description => "Count files in #{plugin.dir}"}
+    { :service => plugin.service, :metric => count_files, :description => "Count files in #{plugin.dir}" }
   end
 
 end

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

@@ -1,8 +1,8 @@
 require 'net/http'
 require 'csv'
 
-class Riemann::Babbler::Haproxy < Riemann::Babbler
-  
+class Riemann::Babbler::Plugin::Haproxy < Riemann::Babbler::Plugin
+
   def init
     plugin.set_default(:service, 'haproxy')
     plugin.set_default(:interval, 60)
@@ -10,18 +10,18 @@ class Riemann::Babbler::Haproxy < Riemann::Babbler
   end
 
   def collect
-    status = Array.new
+    status  = Array.new
     content = rest_get(plugin.url)
-    csv = CSV.parse(content.split("# ")[1], { :headers => true })
+    csv     = CSV.parse(content.split('# ')[1], { :headers => true })
     csv.each do |row|
       row = row.to_hash
       ns  = "haproxy #{row['pxname']} #{row['svname']}"
       row.each do |property, metric|
         unless (property.nil? || property == 'pxname' || property == 'svname')
           status << {
-            :service => "#{ns} #{property}",
-            :metric  => metric.to_f,
-            :state   =>  (['UP', 'OPEN'].include?(row['status']) ? 'ok' : 'critical')
+              :service => "#{ns} #{property}",
+              :metric  => metric.to_f,
+              :state   => (%w(UP OPEN).include?(row['status']) ? 'ok' : 'critical')
           }
         end
       end

data/lib/riemann/babbler/plugins/helpers/init.rb

@@ -0,0 +1,2 @@
+require_relative 'rest'
+require_relative 'shell'

data/lib/riemann/babbler/plugins/helpers/rest.rb

@@ -0,0 +1,28 @@
+#encoding: utf-8
+
+require 'rest_client'
+
+module Riemann
+  module Babbler
+    module Plugins
+      module Helpers
+
+        # http rest
+        def rest_get(url)
+          begin
+            Timeout::timeout(plugin.timeout) do
+              begin
+                RestClient.get url
+              rescue
+                raise "Get from url: #{url} failed"
+              end
+            end
+          rescue Timeout::Error
+            raise "Get from url: #{url}, timeout error"
+          end
+        end
+
+      end
+    end
+  end
+end

data/lib/riemann/babbler/plugins/helpers/shell.rb

@@ -0,0 +1,37 @@
+#encoding: utf-8
+
+require 'open3'
+
+module Riemann
+  module Babbler
+    module Plugins
+      module Helpers
+
+        # helper: stdout+stderr и exit status
+        def shell(*cmd)
+          exit_status=nil
+          err        =nil
+          out        =nil
+          Timeout::timeout(plugin.timeout) {
+            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 'Error while running shell: ' + err.to_s
+          elsif out
+            return out.strip
+          else
+            # exit status 0, no stdout
+            ''
+          end
+        end
+
+      end
+    end
+  end
+end

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

@@ -1,11 +1,9 @@
-class Riemann::Babbler::Http < Riemann::Babbler
+class Riemann::Babbler::Plugin::Http < Riemann::Babbler::Plugin
 
   def init
     plugin.set_default(:service, 'http check')
     plugin.set_default(:interval, 60)
-
     plugin.states.set_default(:critical, 1)
-
     plugin.set_default(:http_code, 200)
     plugin.set_default(:http_method, 'GET')
     plugin.set_default(:connect_timeout, 5)
@@ -13,14 +11,14 @@ class Riemann::Babbler::Http < Riemann::Babbler
     plugin.set_default(:retry_delay, 0)
     plugin.set_default(:max_time, 10)
     plugin.set_default(:insecure, false)
-   
+
     plugin.set_default(:url, 'http://127.0.0.1:80')
   end
 
   def collect
     command = "curl -X#{plugin.http_method} -s"
     command += " --connect-timeout #{plugin.connect_timeout}"
-    command += " --insecure " if plugin.insecure
+    command += ' --insecure ' if plugin.insecure
     command += " -w '%{http_code}\\n'"
     command += " --retry #{plugin.retry} --retry-delay #{plugin.retry_delay}"
     command += " --max-time #{plugin.max_time} --fail"
@@ -34,6 +32,6 @@ class Riemann::Babbler::Http < Riemann::Babbler
       metric = 0
     end
 
-    {:service => plugin.service, :metric => metric, :description => "http_code: #{out}"}
+    { :service => plugin.service, :metric => metric, :description => "http_code: #{out}" }
   end
 end

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

@@ -1,9 +1,17 @@
-#encoding: utf-8
+class Riemann::Babbler::Plugin::La < Riemann::Babbler::Plugin
 
-class Riemann::Babbler::La < Riemann::Babbler
+  def init
+    plugin.set_default(:service, 'la')
+    plugin.states.set_default(:warning, 4)
+    plugin.states.set_default(:critical, 10)
+  end
 
   def collect
-    { :service => plugin.service + ' la_1', :description => 'LA averaged over 1 minute', :metric => File.read('/proc/loadavg').scan(/[\d\.]+/).first.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

@@ -1,4 +1,4 @@
-class Riemann::Babbler::Mdadm < Riemann::Babbler
+class Riemann::Babbler::Plugin::Mdadm < Riemann::Babbler::Plugin
 
   def init
     plugin.set_default(:service, 'mdadm')
@@ -11,23 +11,23 @@ class Riemann::Babbler::Mdadm < Riemann::Babbler
   end
 
   def rm_bracket(text)
-    text.gsub('[','').gsub(']','')
+    text.gsub('[', '').gsub(']', '')
   end
 
   def mdadm_status_well?(text)
-    text.gsub(/U/,'').empty?
+    text.gsub(/U/, '').empty?
   end
 
-  def collect 
-    file = File.read('/proc/mdstat').split("\n")
+  def collect
+    file   = File.read('/proc/mdstat').split("\n")
     status = Array.new
     file.each_with_index do |line, index|
       next unless line.include?('blocks')
 
       device = file[index-1].split(':')[0].strip
 
-      mdstatus = rm_bracket(line.split(" ").last) # UUU
-      next if mdadm_status_well?(mdstatus) # пропускаем все збс
+      mdstatus = rm_bracket(line.split(' ').last) # UUU
+      next if mdadm_status_well?(mdstatus)        # пропускаем все збс
       if mdstatus == plugin.states.send(device).to_s # пропускаем если стейт зафикисирован в конфиге
         status << { :service => plugin.service + " #{device}", :metric => 1, :state => 'ok', :description => "mdadm failed device #{device}, but disabled in config" }
         next
@@ -43,11 +43,11 @@ class Riemann::Babbler::Mdadm < Riemann::Babbler
       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-/,"")
+        next unless state != 'in_sync'
+        p.gsub!(/.+\/dev-/, '')
         failed_parts << "#{p} (#{state})"
       end
-      failed_parts.join(", ")
+      failed_parts.join(', ')
     rescue
       nil
     end

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

@@ -1,4 +1,4 @@
-class Riemann::Babbler::MegaCli < Riemann::Babbler
+class Riemann::Babbler::Plugin::MegaCli < Riemann::Babbler::Plugin
 
   def init
     plugin.set_default(:service, 'megacli')
@@ -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

@@ -1,33 +1,37 @@
-#encoding: utf-8
+class Riemann::Babbler::Plugin::Memory < Riemann::Babbler::Plugin
 
-class Riemann::Babbler::Memory < Riemann::Babbler
+  def init
+    plugin.set_default(:service, 'memory')
+    plugin.states.set_default(:warning, 70)
+    plugin.states.set_default(:critical, 85)
+  end
 
   def collect
-    m = File.read('/proc/meminfo').split(/\n/).inject({}) { |info, line|
-      x = line.split(/:?\s+/)
+    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
+    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
+    total   = m['MemTotal'].to_i * 1024
+    used    = total - free
     free_bc = free + buffers + cached
 
-    fraction = 1 - (free_bc.to_f / total)
+    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 + ' % 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' }
+        { :service => plugin.service + ' % free', :description => 'Memory usage, %', :metric => fraction.round(2) * 100 },
+        { :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 and buffers (kB)\n\n #{desc}", :metric => free_bc, :state => 'ok' }
     ]
   end
 

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

@@ -1,4 +1,4 @@
-class Riemann::Babbler::Net < Riemann::Babbler
+class Riemann::Babbler::Plugin::Net < Riemann::Babbler::Plugin
 
   WORDS = ['rx bytes',
            'rx packets',
@@ -17,22 +17,24 @@ class Riemann::Babbler::Net < Riemann::Babbler
            'tx compressed']
 
   def init
+    plugin.set_default(:service, 'net')
     plugin.set_default(:filter, ['rx bytes', 'rx errs', 'rx drop', 'tx bytes', 'tx errs', 'tx drop'])
   end
 
   def collect
-    f = File.read('/proc/net/dev')
+    f      = File.read('/proc/net/dev')
     status = Array.new
     f.split("\n").each do |line|
       iface = line.split(':')[0].strip
       iface.gsub!(/\./, '_')
       next unless line =~ /(\w*)\:\s*([\s\d]+)\s*/
       WORDS.map do |service|
-        "#{plugin.service} #{iface} #{service}"
+        service
       end.zip(
-        $2.split(/\s+/).map { |str| str.to_i }
+          $2.split(/\s+/).map { |str| str.to_i }
       ).each do |service, value|
-        status << { :service => service, :metric => value, :as_diff => true}
+        next unless plugin.filter.include? service
+        status << { :service => "#{plugin.service} #{service} #{iface}", :metric => value, :as_diff => true }
       end
     end
     status

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

@@ -1,4 +1,4 @@
-class Riemann::Babbler::NetStat < Riemann::Babbler
+class Riemann::Babbler::Plugin::NetStat < Riemann::Babbler::Plugin
 
   def init
     plugin.set_default(:service, 'netstat')
@@ -18,16 +18,16 @@ class Riemann::Babbler::NetStat < Riemann::Babbler
       end
     end
     filter += " \\) and not dst 127.0.0.1:*"
-    cmd = "ss -t -4 -n state established " + filter + " | wc -l"
+    cmd    = 'ss -t -4 -n state established ' + filter + ' | wc -l'
     shell(cmd).to_i - 1
   end
 
   def collect
     count = get_conn_count()
     {
-      :service => "#{plugin.service} tcp #{plugin.ports.join(', ')}",
-      :metric => count, 
-      :description => "count established connects: #{count} to ports #{plugin.ports.join(', ')}"
+        :service     => "#{plugin.service} tcp #{plugin.ports.join(', ')}",
+        :metric      => count,
+        :description => "count established connects: #{count} to ports #{plugin.ports.join(', ')}"
     }
   end
 end

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

@@ -1,4 +1,4 @@
-class Riemann::Babbler::Nginx < Riemann::Babbler
+class Riemann::Babbler::Plugin::Nginx < Riemann::Babbler::Plugin
 
   NGINX_STATUS_1 = %W(accepts handled requests)
   NGINX_STATUS_2 = %W(reading writing waiting)
@@ -16,7 +16,7 @@ class Riemann::Babbler::Nginx < Riemann::Babbler
 
   def collect
     status = Array.new
-    lines = rest_get(plugin.status_url).split("\n")
+    lines  = rest_get(plugin.status_url).split("\n")
     lines[2].scan(/\d+/).each_with_index do |value, index|
       status << { :service => plugin.service + " #{NGINX_STATUS_1[index]}", :metric => value.to_i, :as_diff => true }
     end