riemann-tools 0.1.2 → 0.1.3

data/bin/riemann-haproxy

@@ -21,7 +21,7 @@ class Riemann::Tools::Haproxy
       row = row.to_hash
       ns  = "haproxy #{row['pxname']} #{row['svname']}"
       row.each do |property, metric|
-        unless property == 'pxname' || property == 'svname'
+        unless (property.nil? || property == 'pxname' || property == 'svname')
           report(
             :host    => @uri.host,
             :service => "#{ns} #{property}",

data/bin/riemann-health

@@ -62,7 +62,6 @@ class Riemann::Tools::Health
   end
 
   def alert(service, state, metric, description)
-    puts service
     report(
       :service => service.to_s,
       :state => state.to_s,

data/bin/riemann-resmon

@@ -10,13 +10,25 @@ class Riemann::Tools::Resmon
   opt :resmon_hostfile, 'File with hostnames running Resmon (one URI per line)', type: :string
   opt :read_timeout, 'Faraday read timeout', type: :int, default: 2
   opt :open_timeout, 'Faraday open timeout', type: :int, default: 1
+  opt :fqdn, 'Use FQDN for event host'
+
 
   def initialize
     @hosts = File.read(options[:resmon_hostfile]).split("\n")
     super
   end
 
-  def safe_get(uri)
+
+  # Work out the hostname to submit with the event
+  def get_event_host(host)
+    unless options[:fqdn]
+      return host.split('.')[0]
+    end
+    return host
+  end
+
+  # Handles HTTP connections and GET requests safely
+  def safe_get(uri, event_host)
       # Handle connection timeouts
       response = nil
       begin
@@ -26,7 +38,7 @@ class Riemann::Tools::Resmon
           req.options[:open_timeout] = options[:open_timeout]
         end
       rescue => e
-        report(:host => uri.host,
+        report(:host => event_host,
           :service => "resmon",
           :state => "critical",
           :description => "HTTP connection error: #{e.class} - #{e.message}"
@@ -37,14 +49,16 @@ class Riemann::Tools::Resmon
 
   def tick
     @hosts.each do |host|
+
       uri = URI(host)
+      event_host = get_event_host(uri.host)
 
-      response = safe_get(uri)
+      response = safe_get(uri, event_host)
       next if response.nil?
 
       # Handle non-200 responses
       if response.status != 200
-        report(:host => uri.host,
+        report(:host => event_host,
           :service => "resmon",
           :state => "critical",
           :description => "HTTP connection error: #{response.status} - #{response.body}"
@@ -58,7 +72,7 @@ class Riemann::Tools::Resmon
         timestamp = result.xpath('last_update').first.text
         result.xpath('metric').each do |metric|
           hash = {
-            host: uri.host,
+            host: event_host,
             service: "#{result.attributes['module'].value}`#{result.attributes['service'].value}`#{metric.attributes['name'].value}",
             time: timestamp.to_i
           }

data/lib/riemann/tools.rb

@@ -3,6 +3,7 @@ module Riemann
     require 'rubygems'
     require 'trollop'
     require 'riemann/client'
+    require 'timeout'
 
     def self.included(base)
       base.instance_eval do
@@ -25,40 +26,38 @@ module Riemann
             p.parse ARGV
           end
         end
-        
+
         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
+        opt :attribute, "Attribute to add to the event", :type => String, :multi => true
+        opt :timeout, "Timeout (in seconds) when waiting for acknowledgements", :default => 30
       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
+    def attributes
+      @attributes ||= Hash[options[:attribute].map do |attr|
+        k,v = attr.split(/=/)
+        if k and v
+          [k,v]
+        end
+      end]
     end
 
     def report(event)
       if options[:tag]
         event[:tags] = options[:tag]
       end
-      
+
       if options[:ttl]
         event[:ttl] = options[:ttl]
       end
@@ -67,7 +66,13 @@ module Riemann
         event[:host] = options[:event_host]
       end
 
-      riemann << event
+      begin
+        Timeout::timeout(options[:timeout]) do
+          riemann << event.merge(attributes)
+        end
+      rescue Timeout::Error
+        riemann.connect
+      end
     end
 
     def riemann
@@ -87,7 +92,7 @@ module Riemann
           $stderr.puts "#{e.class} #{e}\n#{e.backtrace.join "\n"}"
         end
 
-        # Sleep. 
+        # Sleep.
         sleep(options[:interval] - ((Time.now - t0) % options[:interval]))
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: riemann-tools
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-30 00:00:00.000000000 Z
+date: 2013-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: riemann-client
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: 0.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: 0.2.2
 - !ruby/object:Gem::Dependency
   name: trollop
   requirement: !ruby/object:Gem::Requirement
@@ -156,7 +156,6 @@ executables:
 - riemann-diskstats
 - riemann-riak-ring
 - riemann-cloudant
-- riemann-kvminstances
 - riemann-nginx-status
 - riemann-kvminstance
 - riemann-net
@@ -173,7 +172,6 @@ files:
 - bin/riemann-haproxy
 - bin/riemann-health
 - bin/riemann-kvminstance
-- bin/riemann-kvminstances
 - bin/riemann-memcached
 - bin/riemann-munin
 - bin/riemann-net

data/bin/riemann-kvminstances

@@ -1,22 +0,0 @@
-#!/usr/bin/env ruby
-
-require File.expand_path('../../lib/riemann/tools', __FILE__)
-
-class Riemann::Tools::KVM
-  include Riemann::Tools
-
-  def tick
-
-  #determine how many instances I have according to libvirt
-  kvm_instances = %x[virsh list |grep i-|wc -l]
-
-  #submit them to riemann
-  report(
-     :service => "KVM Running VMs",
-     :metric => kvm_instances.to_i,
-     :state => "info"
-       )
-  end
-end
-
-Riemann::Tools::KVM.run