riemann-babbler 1.3.4 → 1.3.5

data/config.yml

@@ -67,3 +67,6 @@ plugins:
 
   runit:
     service: runit
+
+  diskstat:
+    service: diskstat

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

@@ -0,0 +1,44 @@
+class Riemann::Babbler::Diskstat < Riemann::Babbler
+
+  WORDS = [
+    'reads reqs',
+    'reads merged',
+    'reads sector',
+    'reads time',
+    'writes reqs',
+    'writes merged',
+    'writes sector',
+    'writes time',
+    'io reqs',
+    'io time',
+    'io weighted'
+  ]
+
+  def init
+    plugin.set_default(:service, 'diskstat')
+    plugin.set_default(:interval, 60)
+    plugin.set_default(:filter, ['reads reqs', 'writes reqs'])
+  end
+
+  def collect
+    status = Array.new
+    f = File.read('/proc/diskstats')
+    state = f.split("\n").reject { |d| d =~ /(ram|loop| md| dm| sr)/ }.inject({}) do |s, line|
+      if line =~ /^(?:\s+\d+){2}\s+([\w\d]+) (.*)$/
+        dev = $1
+
+        WORDS.map do |service|
+          next unless plugin.filter.include?(service) #TODO hardcode
+          "#{plugin.service} #{dev} #{service}"
+        end.zip(
+          $2.split(/\s+/).map { |str| str.to_i }
+        ).each do |service, value|
+          next if service.nil? #TODO hardcode
+          status << { :service => service, :metric => value, :as_diff => true}
+        end
+      end 
+    end
+    status
+  end
+
+end

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

@@ -0,0 +1,32 @@
+require 'net/http'
+require 'csv'
+
+class Riemann::Babbler::Haproxy < Riemann::Babbler
+  
+  def init
+    plugin.set_default(:service, 'haproxy')
+    plugin.set_default(:interval, 60)
+    plugin.set_default(:url, 'http://user:password@localhost/stats;csv')
+  end
+
+  def collect
+    status = Array.new
+    content = rest_get(plugin.url)
+    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')
+          }
+        end
+      end
+    end
+    status
+  end
+
+end

data/lib/riemann/babbler/version.rb

@@ -1,5 +1,5 @@
 module Riemann
   class Babbler
-    VERSION = '1.3.4'
+    VERSION = '1.3.5'
   end
 end

data/lib/riemann/babbler.rb

@@ -62,14 +62,13 @@ module Riemann
 
     def report_with_diff(event)
       current_metric = event[:metric]
-      if @storage.has_key?(event[:service])
-        unless current_metric + @storage[event[:service]] > 2**64
-          event[:metric] = current_metric - @storage[event[:service]]
-        end unless @storage[event[:service]].nil?
+      old_metric = @storage[event[:service]]
+      if old_metric && current_metric + old_metric < 2**64
+        event[:metric] = current_metric - old_metric
+        event.delete(:as_diff)
+        report(event)
       end
-      @storage[ event[:service] ] = current_metric
-      event.delete(:as_diff)
-      report(event)
+      @storage[event[:service]] = current_metric
     end
 
     def get_hostname

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: riemann-babbler
 version: !ruby/object:Gem::Version
-  version: 1.3.4
+  version: 1.3.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-10 00:00:00.000000000 Z
+date: 2013-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: riemann-client
@@ -193,9 +193,11 @@ files:
 - lib/riemann/babbler/plugins/cpu_fan.rb
 - lib/riemann/babbler/plugins/cpu_temp.rb
 - lib/riemann/babbler/plugins/disk.rb
+- lib/riemann/babbler/plugins/diskstat.rb
 - lib/riemann/babbler/plugins/dummy.rb
 - lib/riemann/babbler/plugins/exim4.rb
 - lib/riemann/babbler/plugins/find_files.rb
+- lib/riemann/babbler/plugins/haproxy.rb
 - lib/riemann/babbler/plugins/http.rb
 - lib/riemann/babbler/plugins/la.rb
 - lib/riemann/babbler/plugins/mdadm.rb