riemann-babbler 0.1.2 → 0.1.3

data/Gemfile

@@ -5,6 +5,7 @@ gem "configatron"
 gem "logger"
 gem "trollop"
 gem "parallel"
+gem "sys-filesystem"
 
 gem "rspec"
 gem "rake"

data/README.md

@@ -11,13 +11,13 @@ Riemann-babbler is plugin manager for riemann-tools.
 Usage:
        riemann-babbler [options]
 where [options] are:
-  --config, -c <s>:   Config file (default: /etc/riemann-babbler/config.yml)
+  --config, -c:   Config file (default: /etc/riemann-babbler/config.yml)
   --version, -v:   Print version and exit
   --help, -h:   Show this message
 ```
 
 ### Описание конфига
-Bubbler имеет собственные конифиги, значения полученные через --config будут смерджены 
+Bubbler имеет собственные конфиг, значения полученные через --config будут смерджены 
 ```yaml
 riemann:
   host: riemann.host # хост riemann куда слать сообщения
@@ -25,7 +25,7 @@ riemann:
   tags: # таги которые будут сообшатся
     - prod
     - web
-  suffix: ".testing" # окончание `hostname` в граффите как начало
+  suffix: ".testing" # окончание `hostname` в графите как начало
 
 plugins:
   dirs:

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

@@ -1,19 +1,35 @@
 class Riemann::Babbler::Disk
   include Riemann::Babbler
 
+  require 'sys/filesystem'
+  include Sys
+
+  NOT_MONITORING_FS = [
+    'sysfs',
+    'nfs',
+    'devpts',
+    'squashfs',
+    'proc'
+  ]
+
   def plugin
     options.plugins.disk
   end
 
   def disk
-    disk = {}
-    `df -P`.split(/\n/).each do |r|
-      f = r.split(/\s+/)
-      next unless f[0] =~ /^\//
-      next if f[0] == 'Filesystem'
-      x = f[4].to_f/100
-      point = (f[5] == '/' ?  "/root" : f[5] )
-      disk.merge!({point => x})
+    # собираем только необходимые для мониторинга маунт-поинты
+    # точнее выбираем из 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] 
+    end
+    disk = Hash.new
+    monit_points.each do |point|
+      point_stat = Filesystem.stat point
+      disk.merge!({point + " storage" => (point_stat.blocks_free/point_stat.blocks_available)})
+      disk.merge!({point + " inode" => (point_stat.files_free/point_stat.files_available)})
     end
     disk
   end

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

@@ -2,25 +2,30 @@ class Riemann::Babbler::Net
   include 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']
+           '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 plugin
     options.plugins.net
   end
 
+  def init
+    @diff = Hash.new
+    @old_status = Hash.new
+  end
+
   def net
     f = File.read('/proc/net/dev')
     status = Hash.new
@@ -36,16 +41,18 @@ class Riemann::Babbler::Net
         end
       end
     end
-    return status
+    status.each_key { |key| @diff[key] = status[key] - @old_status[key] } if @old_status
+    @old_status = status
+    @diff
   end
 
   def tick
     net.each do |service, value|
-    report({
-      :service => service,
-      :metric => value
-    })
-    end
+      report({
+        :service => service,
+        :metric => value
+      })
+    end unless net.nil?
   end
 
 end

data/lib/riemann/version.rb

@@ -1,5 +1,5 @@
 module Riemann
   module Babbler
-    VERSION = '0.1.2'
+    VERSION = '0.1.3'
   end
 end

data/riemann-babbler.gemspec

@@ -15,7 +15,8 @@ Gem::Specification.new do |s|
   s.add_dependency('configatron')
   s.add_dependency('logger')
   s.add_dependency('trollop')
-  s.add_dependency('parallel')
+  s.add_dependency('parallel') 
+  s.add_dependency('sys-filesystem')
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: riemann-babbler
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-05 00:00:00.000000000 Z
+date: 2013-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: riemann-client
@@ -91,6 +91,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: sys-filesystem
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Some plugins mannager for riemann.
 email:
 - vadv.mkn@gmail.com
@@ -129,9 +145,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 879882508046739386
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -145,3 +158,4 @@ signing_key:
 specification_version: 3
 summary: Riemann health cheker.
 test_files: []
+has_rdoc: