riemann-tools 0.0.1 → 0.0.2

data/bin/riemann-health

@@ -2,31 +2,36 @@
 
 # Reports current CPU, disk, load average, and memory use to riemann.
 
-require 'trollop'
-require 'riemann/client'
-
-class Riemann::Health
-  def initialize(opts)
-    @host = opts[:host]
-    @port = opts[:port]
-    @interval = opts[:interval]
+require File.expand_path('../../lib/riemann/tools', __FILE__)
+
+class Riemann::Tools::Health
+  include Riemann::Tools
+  
+  opt :cpu_warning, "CPU warning threshold (fraction of total jiffies)", :default => 0.9
+  opt :cpu_critical, "CPU critical threshold (fraction of total jiffies)", :default => 0.95
+  opt :disk_warning, "Disk warning threshold (fraction of space used)", :default => 0.9
+  opt :disk_critical, "Disk critical threshold (fraction of space used)", :default => 0.95
+  opt :load_warning, "Load warning threshold (load average / core)", :default => 3
+  opt :load_critical, "Load critical threshold (load average / core)", :default => 8
+  opt :memory_warning, "Memory warning threshold (fraction of RAM)", :default => 0.85
+  opt :memory_critical, "Memory critical threshold (fraction of RAM)", :default => 0.95
+
+  def initialize
     @limits = {
-      cpu: {critical: opts[:cpu_critical], warning: opts[:cpu_warning]},
-      disk: {critical: opts[:disk_critical], warning: opts[:disk_warning]},
-      :load => {critical: opts[:load_critical], warning: opts[:load_warning]},
-      memory: {critical: opts[:memory_critical], warning: opts[:memory_warning]}
+      :cpu => {:critical => opts[:cpu_critical], :warning => opts[:cpu_warning]},
+      :disk => {:critical => opts[:disk_critical], :warning => opts[:disk_warning]},
+      :load => {:critical => opts[:load_critical], :warning => opts[:load_warning]},
+      :memory => {:critical => opts[:memory_critical], :warning => opts[:memory_warning]}
     }
-
-    @client = Riemann::Client.new(:host => @host, :port => @port)
   end
 
   def alert(service, state, metric, description)
-    @client << {
-      service: service,
-      state: state.to_s,
-      metric: metric.to_f,
-      description: description
-    }
+    report(
+      :service => service,
+      :state => state.to_s,
+      :metric => metric.to_f,
+      :description => description
+    )
   end
 
   def cores
@@ -131,35 +136,11 @@ class Riemann::Health
   end
 
   def tick
-    begin
-      cpu
-      memory
-      load
-      disk
-    rescue => e
-      $stderr.puts "#{e.class} #{e}\n#{e.backtrace.join "\n"}"
-      sleep 10
-    end
-  end
-
-  def run
-    loop do
-      tick
-      sleep @interval
-    end
+    cpu
+    memory
+    load
+    disk
   end
 end
   
-Riemann::Health.new(Trollop.options do
-  opt :host, "Host", :default => '127.0.0.1'
-  opt :port, "Port", :default => 5555
-  opt :interval, "Seconds between updates", :default => 5
-  opt :cpu_warning, "CPU warning threshold (fraction of total jiffies)", :default => 0.9
-  opt :cpu_critical, "CPU critical threshold (fraction of total jiffies)", :default => 0.95
-  opt :disk_warning, "Disk warning threshold (fraction of space used)", :default => 0.9
-  opt :disk_critical, "Disk critical threshold (fraction of space used)", :default => 0.95
-  opt :load_warning, "Load warning threshold (load average / core)", :default => 3
-  opt :load_critical, "Load critical threshold (load average / core)", :default => 8
-  opt :memory_warning, "Memory warning threshold (fraction of RAM)", :default => 0.85
-  opt :memory_critical, "Memory critical threshold (fraction of RAM)", :default => 0.95
-end).run
+Riemann::Tools::Health.run

data/bin/riemann-munin

@@ -0,0 +1,36 @@
+#!/usr/bin/env ruby
+
+# Gathers munin statistics and submits them to Riemann.
+
+require File.expand_path('../../lib/riemann/tools', __FILE__)
+
+class Riemann::Tools::Munin
+  include Riemann::Tools
+  require 'munin-ruby'
+
+  def initialize
+    @munin = ::Munin::Node.new
+  end
+
+  def tick
+    services = opts[:services] || @munin.list
+    services.each do |service|
+      @munin.fetch(service).each do |service, parts|
+        parts.each do |part, metric|
+          report(
+            :service => "#{service} #{part}",
+            :metric => metric.to_f,
+            :state => 'ok',
+            :tags => ['munin']
+          )
+        end
+      end
+    end
+  end
+  
+  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
+end
+  
+Riemann::Tools::Munin.run

data/bin/riemann-net

@@ -0,0 +1,85 @@
+#!/usr/bin/env ruby
+
+# Gathers munin statistics and submits them to Riemann.
+
+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
+  
+  def initialize
+    @old_state = nil
+  end
+
+  def state
+    f = File.read('/proc/net/dev')
+    state = f.split("\n").inject({}) do |s, line|
+      if line =~ /\s*(\w+?):\s*([\s\d]+)\s*/
+        iface = $1
+        ['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'].map do |service|
+          "#{iface} #{service}"
+        end.zip(
+          $2.split(/\s+/).map { |str| str.to_i }
+        ).each do |service, value|
+          s[service] = value
+        end
+      end
+      
+      s
+    end
+  end
+  
+  def tick
+    state = self.state
+
+    if @old_state
+      state.each do |service, metric|
+        delta = metric - @old_state[service]
+        svc_state = case service
+          when /drop$/
+            if metric > 0
+              'warning'
+            else
+              'ok'
+            end
+          when /errs$/
+            if metric > 0
+              'warning'
+            else
+              'ok'
+            end
+          else
+            'ok'
+          end
+
+        report(
+          :service => service,
+          :metric => (delta / opts[:interval]),
+          :state => svc_state
+        )
+      end
+    end
+
+    @old_state = state
+  end
+end
+  
+Riemann::Tools::Net.run

data/lib/riemann/tools.rb

@@ -1,4 +1,83 @@
 module Riemann
   module Tools
+    require 'rubygems'
+    require 'trollop'
+    require 'riemann/client'
+
+    def self.included(base)
+      base.instance_eval do
+        def run
+          new.run
+        end
+
+        def opt(*a)
+          a.unshift :opt
+          @opts ||= []
+          @opts << a
+        end
+
+        def options
+          p = Trollop::Parser.new
+          @opts.each do |o|
+            p.send *o
+          end
+          Trollop::with_standard_exception_handling(p) do
+            p.parse ARGV
+          end
+        end
+        
+        opt :host, "Riemann host", :default => '127.0.0.1'
+        opt :port, "Riemann port", :default => 5555
+        opt :interval, "Seconds between updates", :default => 5
+      end
+    end
+
+    def initialize
+      super
+    end
+
+    def tool_options
+      {}
+    end
+
+    # Returns parsed options (cached) from command line.
+    def options
+      @options ||= self.class.options
+    end
+    alias :opts :options
+
+    # Add a new command line option
+    def opt(*a)
+      @option_parser.opt *a
+    end
+
+    def report(event)
+      riemann << event
+    end
+
+    def riemann
+      @riemann ||= Riemann::Client.new(
+        :host => options[:host],
+        :port => options[:port]
+      )
+    end
+    alias :r :riemann
+
+    def run
+      t0 = Time.now
+      loop do
+        begin
+          tick
+        rescue => e
+          $stderr.puts "#{e.class} #{e}\n#{e.backtrace.join "\n"}"
+        end
+
+        # Sleep. 
+        sleep(options[:interval] - ((Time.now - t0) % options[:interval]))
+      end
+    end
+
+    def tick
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: riemann-tools
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-24 00:00:00.000000000 Z
+date: 2012-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: riemann-client
-  requirement: &8635900 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: 0.0.4
   type: :runtime
   prerelease: false
-  version_requirements: *8635900
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.0.4
 - !ruby/object:Gem::Dependency
   name: trollop
-  requirement: &8635300 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,16 +37,41 @@ dependencies:
         version: 1.16.2
   type: :runtime
   prerelease: false
-  version_requirements: *8635300
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.16.2
+- !ruby/object:Gem::Dependency
+  name: munin-ruby
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.2.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.2.1
 description: 
 email: aphyr@aphyr.com
 executables:
+- riemann-net
+- riemann-munin
 - riemann-bench
 - riemann-health
 extensions: []
 extra_rdoc_files: []
 files:
 - lib/riemann/tools.rb
+- bin/riemann-net
+- bin/riemann-munin
 - bin/riemann-bench
 - bin/riemann-health
 - LICENSE
@@ -66,7 +96,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: riemann-tools
-rubygems_version: 1.8.10
+rubygems_version: 1.8.22
 signing_key: 
 specification_version: 3
 summary: HTTP dashboard for the distributed event system Riemann.