riemann-tools 0.0.9 → 0.1.0

data/bin/riemann-memcached

@@ -0,0 +1,37 @@
+#!/usr/bin/env ruby
+
+# Gathers memcached STATS and submits them to Riemann.
+
+require File.expand_path('../../lib/riemann/tools', __FILE__)
+
+class Riemann::Tools::Memcached
+  include Riemann::Tools
+  require 'socket'
+
+  opt :memcached_host, "Memcached hostname", :default => 'localhost'
+  opt :memcached_port, "Memcached port", :default => 11211
+
+  def tick
+    sock = TCPSocket.new(opts[:memcached_host], opts[:memcached_port])
+    sock.print("stats\r\n")
+    sock.flush
+    stats = sock.gets
+
+    data = {}
+    while true
+      stats = sock.gets
+      break if stats.strip == 'END'
+      m = stats.match /STAT (\w+) (\S+)/
+      report(
+             :host => opts[:memcached_host],
+             :service => "memcached #{m[1]}",
+             :metric => m[2].to_f,
+             :state => 'ok',
+             :tags => ['memcached']
+             )
+    end
+    sock.close
+  end
+end
+
+Riemann::Tools::Memcached.run

data/bin/riemann-riak

@@ -15,7 +15,7 @@ class Riemann::Tools::Riak
   opt :stats_port, "Riak HTTP port for stats", :default => 8098
   opt :stats_path, "Riak HTTP stats path", :default => '/stats'
   opt :node_name, "Riak erlang node name", :default => "riak@#{Socket.gethostname}"
-  
+
   opt :get_50_warning, "FSM 50% get time warning threshold (ms)", :default => 1000
   opt :put_50_warning, "FSM 50% put time warning threshold (ms)", :default => 1000
   opt :get_95_warning, "FSM 95% get time warning threshold (ms)", :default => 2000
@@ -24,16 +24,36 @@ class Riemann::Tools::Riak
   opt :put_99_warning, "FSM 99% put time warning threshold (ms)", :default => 10000
 
   def initialize
+    @escript = true
+    @riakadmin = true
+    @httpstats = true
+
     if `which escript` =~ /^\s*$/
-      puts "No escript; disabling ring/key checks."
-      @no_escript = true
+      @escript = false
+    end
+
+    if `which riak-admin` =~ /^\s*$/
+      @riakadmin = false
+    end
+
+    if
+      begin
+        Net::HTTP.start(opts[:riak_host], opts[:stats_port]) do |http|
+          http.get opts[:stats_path]
+      end
+      rescue => e
+        @httpstatus = false
+      end
     end
   end
 
   def check_ring
-    return if @no_escript
+    if @escript
+      str = `#{File.expand_path(File.dirname(__FILE__))}/riemann-riak-ring #{opts[:node_name]}`.chomp
+    elsif @riakadmin
+      str = `riak-admin ringready`
+    end
 
-    str = `#{File.expand_path(File.dirname(__FILE__))}/riemann-riak-ring #{opts[:node_name]}`.chomp
     if str =~ /^TRUE/
       report(
         :host => opts[:riak_host],
@@ -52,8 +72,6 @@ class Riemann::Tools::Riak
   end
 
   def check_keys
-    return if @no_escript
-    
     keys = `#{File.expand_path(File.dirname(__FILE__))}/riemann-riak-keys #{opts[:node_name]}`.chomp
     if keys =~ /^\d+$/
       report(
@@ -66,7 +84,7 @@ class Riemann::Tools::Riak
     else
       report(
         :host => opts[:riak_host],
-        :servie => 'riak keys',
+        :service => 'riak keys',
         :state => 'unknown',
         :description => keys
       )
@@ -103,30 +121,42 @@ class Riemann::Tools::Riak
   end
 
   def check_stats
-    begin
-      res = Net::HTTP.start(opts[:riak_host], opts[:stats_port]) do |http|
-        http.get opts[:stats_path]
+    if @httpstatus
+      begin
+        res = Net::HTTP.start(opts[:riak_host], opts[:stats_port]) do |http|
+          http.get opts[:stats_path]
+        end
+      rescue => e
+        report(
+          :host => opts[:riak_host],
+          :service => 'riak',
+          :state => 'critical',
+          :description => "error fetching #{opts[:riak_host]}:#{opts[:stats_port]} #{e.class}, #{e.message}"
+        )
+        return
       end
-    rescue => e
-      report(
-        :host => opts[:riak_host],
-        :service => 'riak',
-        :state => 'critical',
-        :description => "error fetching #{opts[:riak_host]}:#{opts[:stats_port]} #{e.class}, #{e.message}"
-      )
-      return
-    end
 
-    if res.code.to_i == 200
-      stats = JSON.parse(res.body)
+      if res.code.to_i == 200
+        stats = JSON.parse(res.body)
+      else
+        report(
+          :host => opts[:riak_host],
+          :service => 'riak',
+          :state => 'critical',
+          :description => "stats returned HTTP #{res.code}:\n\n#{res.body}"
+        )
+        return
+      end
+    elsif @riakadmin
+      stats = Hash[`riak-admin status`.split(/\n/).map{|i| i.split(/ : /)}]
     else
-      report(
-        :host => opts[:riak_host],
-        :service => 'riak',
-        :state => 'critical',
-        :description => "stats returned HTTP #{res.code}:\n\n#{res.body}"
-      )
-      return
+        report(
+          :host => opts[:riak_host],
+          :service => 'riak',
+          :state => 'critical',
+          :description => "error fetching Riak stats"
+        )
+        return
     end
 
     report(
@@ -137,25 +167,25 @@ class Riemann::Tools::Riak
 
     # Gets/puts/rr
     [
-      'vnode_gets', 
-      'vnode_puts', 
-      'node_gets', 
-      'node_puts', 
-      'read_repairs' 
+      'vnode_gets',
+      'vnode_puts',
+      'node_gets',
+      'node_puts',
+      'read_repairs'
     ].each do |s|
       report(
         :host => opts[:riak_host],
         :service => "riak #{s}",
         :state => 'ok',
-        :metric => stats[s]/60.0,
-        :description => "#{stats[s]/60.0}/sec"
+        :metric => stats[s].to_i/60.0,
+        :description => "#{stats[s].to_i/60.0}/sec"
       )
     end
 
     # FSMs
     ['get', 'put'].each do |type|
       [50, 95, 99].each do |percentile|
-        val = stats[fsm_stat(type, percentile)] || 0
+        val = stats[fsm_stat(type, percentile)].to_i || 0
         val = 0 if val == 'undefined'
         val /= 1000.0 # Convert us to ms
         state = fsm_state(type, percentile, val)

data/lib/riemann/tools.rb

@@ -28,6 +28,7 @@ module Riemann
         
         opt :host, "Riemann host", :default => '127.0.0.1'
         opt :port, "Riemann port", :default => 5555
+        opt :event_host, "Event hostname", :type => String
         opt :interval, "Seconds between updates", :default => 5
         opt :tag, "Tag to add to events", :type => String, :multi => true
         opt :ttl, "TTL for events", :type => Integer
@@ -62,6 +63,8 @@ module Riemann
         event[:ttl] = options[:ttl]
       end
 
+      event[:host] ||= options[:event_host]
+
       riemann << event
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: riemann-tools
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-08 00:00:00.000000000 Z
+date: 2013-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: riemann-client
-  requirement: &10179640 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: 0.0.8
   type: :runtime
   prerelease: false
-  version_requirements: *10179640
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.0.8
 - !ruby/object:Gem::Dependency
   name: trollop
-  requirement: &10178820 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +37,15 @@ dependencies:
         version: 1.16.2
   type: :runtime
   prerelease: false
-  version_requirements: *10178820
+  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: &10177620 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +53,15 @@ dependencies:
         version: 0.2.1
   type: :runtime
   prerelease: false
-  version_requirements: *10177620
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.2.1
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
-  requirement: &10176660 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +69,15 @@ dependencies:
         version: 1.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *10176660
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: redis
-  requirement: &10606920 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +85,12 @@ dependencies:
         version: 3.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *10606920
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.0.2
 description: 
 email: aphyr@aphyr.com
 executables:
@@ -73,6 +98,7 @@ executables:
 - riemann-bench
 - riemann-riak
 - riemann-health
+- riemann-memcached
 - riemann-haproxy
 - riemann-riak-keys
 - riemann-diskstats
@@ -86,19 +112,20 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/riemann/tools.rb
-- bin/riemann-munin
 - bin/riemann-bench
-- bin/riemann-riak
-- bin/riemann-health
-- bin/riemann-haproxy
-- bin/riemann-riak-keys
-- bin/riemann-diskstats
-- bin/riemann-riak-ring
 - bin/riemann-cloudant
-- bin/riemann-kvminstances
+- bin/riemann-diskstats
+- bin/riemann-haproxy
+- bin/riemann-health
 - bin/riemann-kvminstance
+- bin/riemann-kvminstances
+- bin/riemann-memcached
+- bin/riemann-munin
 - bin/riemann-net
 - bin/riemann-redis
+- bin/riemann-riak
+- bin/riemann-riak-keys
+- bin/riemann-riak-ring
 - LICENSE
 - README.markdown
 homepage: https://github.com/aphyr/riemann-tools
@@ -121,7 +148,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: riemann-tools
-rubygems_version: 1.8.10
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Utilities which submit events to Riemann.