riemann-babbler 0.5.2 → 0.5.3

data/Gemfile

@@ -6,6 +6,7 @@ gem "logger"
 gem "trollop"
 gem "sys-filesystem"
 gem "rest-client"
+gem "sequel"
 
 gem "rspec"
 gem "rake"

data/Gemfile.lock

@@ -31,6 +31,7 @@ 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
@@ -49,5 +50,6 @@ DEPENDENCIES
   rest-client
   riemann-client
   rspec
+  sequel
   sys-filesystem
   trollop

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

@@ -28,8 +28,8 @@ class Riemann::Babbler::Disk < Riemann::Babbler
       human_point.gsub!(/^\//, "").gsub!(/\//, "_")
       disk << { :service => plugin.service + " #{human_point} % block", :metric => 1 - point_stat.blocks_available.to_f/point_stat.blocks }
       disk << { :service => plugin.service + " #{human_point} % inode", :metric => 1 - point_stat.files_available.to_f/point_stat.files }
-      disk << { :service => plugin.service + " #{human_point} total free", :metric =>  point_stat.blocks_free * point_stat.block_size, :state => 'ok'}
-      disk << { :service => plugin.service + " #{human_point} total total", :metric =>  point_stat.blocks * point_stat.block_size, :state => 'ok'}
+      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'}
     end
     disk
   end

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

@@ -6,17 +6,27 @@ class Riemann::Babbler::Memory < Riemann::Babbler
       info[x[0]] = x[1].to_i
       info
     }
-    free = m['MemFree'].to_i + m['Buffers'].to_i + m['Cached'].to_i
+    free = m['MemFree'].to_i
+    cached =m['Cached'].to_i
+    buffers =m['Buffers'].to_i
     total = m['MemTotal'].to_i
+    used = total - free
+    free_bc = free + buffers + cached
+
     fraction = 1 - (free.to_f / total)
+    swap_fraction = (m['SwapTotal'] - m['SwapFree']).to_f/m['SwapTotal']
 
     desc = "usage\n\n#{shell('ps -eo pmem,pid,cmd | sort -nrb -k1 | head -10').chomp}"
 
     [
       { :service => plugin.service + " % free", :metric => fraction },
-      { :service => plugin.service + " % swap", :metric => (m['SwapTotal'] - m['SwapFree']).to_f/m['SwapTotal'] },
-      { :service => plugin.service + " total free", :metric => free.to_i, :state => 'ok', :description => desc },
-      { :service => plugin.service + " total total", :metric => total.to_i, :state => 'ok', :description => desc }
+      { :service => plugin.service + " % swap", :metric => swap_fraction },
+      { :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 }
     ]
   end
 

data/lib/riemann/version.rb

@@ -1,5 +1,5 @@
 module Riemann
   class Babbler
-    VERSION = '0.5.2'
+    VERSION = '0.5.3'
   end
 end

data/riemann-babbler.gemspec

@@ -17,6 +17,7 @@ Gem::Specification.new do |s|
   s.add_dependency('trollop')
   s.add_dependency('sys-filesystem')
   s.add_dependency('rest-client')
+  s.add_dependency('sequel')
 
   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.5.2
+  version: 0.5.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-16 00:00:00.000000000 Z
+date: 2013-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: riemann-client
@@ -107,6 +107,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: sequel
+  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
@@ -148,7 +164,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 813837732772817729
+      hash: 1977106319644823082
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: