riemann-tools 0.0.7 → 0.0.8

data/bin/riemann-health

@@ -83,7 +83,7 @@ class Riemann::Tools::Health
   end
 
   def disk
-    `df`.split(/\n/).each do |r|
+    `df -P`.split(/\n/).each do |r|
       f = r.split(/\s+/)
       next unless f[0] =~ /^\//
       next if f[0] == 'Filesystem'

data/bin/riemann-net

@@ -7,10 +7,9 @@ require File.expand_path('../../lib/riemann/tools', __FILE__)
 class Riemann::Tools::Net
   include Riemann::Tools
   
-  opt :munin_host, "Munin hostname", :default => 'localhost'
-  opt :munin_port, "Munin port", :default => 4949
-  opt :services, "Munin services to translate (if not specified, all services are relayed)", :type => :strings
-  
+  opt :interfaces, "Interfaces to monitor", :type => :strings, :default => nil
+  opt :ignore_interfaces, "Interfaces to ignore", :type => :strings, :default =>['lo']
+
   def initialize
     @old_state = nil
   end
@@ -20,6 +19,7 @@ class Riemann::Tools::Net
     state = f.split("\n").inject({}) do |s, line|
       if line =~ /\s*(\w+?):\s*([\s\d]+)\s*/
         iface = $1
+
         ['rx bytes',
         'rx packets',
         'rx errs',
@@ -45,6 +45,19 @@ class Riemann::Tools::Net
       
       s
     end
+
+    # Filter interfaces
+    if is = opts[:interfaces]
+      state = state.select do |service, value|
+        is.include? service.split(' ').first
+      end
+    end
+
+    state = state.reject do |service, value|
+      opts[:ignore_interfaces].include? service.split(' ').first
+    end
+
+    state
   end
   
   def tick
@@ -72,7 +85,7 @@ class Riemann::Tools::Net
 
         report(
           :service => service,
-          :metric => (delta / opts[:interval]),
+          :metric => (delta.to_f / opts[:interval]),
           :state => svc_state
         )
       end

data/bin/riemann-riak

@@ -80,7 +80,7 @@ class Riemann::Tools::Riak
       :service => 'riak disk',
       :state => 'ok',
       :metric => gb,
-      :description => "#{gb} GB in /var/lib/riak/"
+      :description => "#{gb} GB in #{opts[:data_dir]}"
     )
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: riemann-tools
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-19 00:00:00.000000000 Z
+date: 2012-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: riemann-client