riemann-tools 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0ce8422ca7b04d401460ff2850f94c32626e796a
-  data.tar.gz: a65e55e277a680dbef2860716fc2c36eb2545e93
+  metadata.gz: 5b58978e25c07331c031e4575ffb46b7a04c3db5
+  data.tar.gz: 50649c44cd74a42dd1b7d9b82e27cbdfdb16341d
 SHA512:
-  metadata.gz: 090cd5f4c835323168fe37b660238646c56d678d05e89b4484b201ba13e2620144c31b9ab27b49a91a230f49d612d44512fcca02aeaf254c0b47202adece4592
-  data.tar.gz: cc2bef99a2932aa9ee3ce3a8c20022d0814b6f185df81e6ed4596341c46ef35000f79037d99f0a1e2bf21f30231b5d749e57e0b8404199334717058566fcedf8
+  metadata.gz: 2d2a3f364ed87b7d79252eafc11fb5d05c5ef000cc029460c08b1b1bd4457800329e3cf69dda990458e2fb91900b02413ebcb28c677ab696bb88a46790f14ef1
+  data.tar.gz: 491e357bbf23baac6fbee6172a6f8ecb81fb004280c4135bfe67d00945785bbc190531b97a93ff06fbcd248bb5e178243a2effc92ddb5f31ad198c342fc4d39a

data/bin/riemann-aws-billing

@@ -14,7 +14,7 @@ class Riemann::Tools::AWSBilling
 
   opt :access_key, "AWS access key", :type => String
   opt :secret_key, "Secret access key", :type => String
-  opt :services, "AWS services: AmazonEC2  AmazonS3  AWSDataTransfer", :type => strings, :multi => true, :default => ["AmazonEC2", "AmazonS3", "AWSDataTransfer"]
+  opt :services, "AWS services: AmazonEC2  AmazonS3  AWSDataTransfer", :type => :strings, :multi => true, :default => ["AmazonEC2", "AmazonS3", "AWSDataTransfer"]
 
   opt :time_start, "Start time in seconds of the metrics period (2hrs ago default)", :type => Integer, :default => 7200
   opt :time_end, "End time in seconds of the metrics period ", :type => Integer, :default => 60

data/bin/riemann-elasticsearch

@@ -7,6 +7,7 @@ class Riemann::Tools::Elasticsearch
 
   require 'faraday'
   require 'json'
+  require 'uri'
 
   opt :read_timeout, 'Faraday read timeout', type: :int, default: 2
   opt :open_timeout, 'Faraday open timeout', type: :int, default: 1

data/bin/riemann-health

@@ -237,8 +237,10 @@ class Riemann::Tools::Health
   def disk
     `df -P`.split(/\n/).each do |r|
       f = r.split(/\s+/)
-      next unless f[0] =~ /^\//
-        next if f[0] == 'Filesystem'
+      next if f[0] == 'Filesystem'
+      next unless f[0] =~ /\// # Needs at least one slash in the mount path
+
+      # Calculate capacity
       x = f[4].to_f/100
 
       if x > @limits[:disk][:critical]

data/bin/riemann-proc

@@ -32,7 +32,7 @@ class Riemann::Tools::Proc
 
   def linux_proc
     process = opts[:proc_regex]
-    running = Integer(`ps axo args | grep #{process} | grep -v grep | grep -v riemann-proc | wc -l`)
+    running = Integer(`ps axo args | grep '#{process}' | grep -v grep | grep -v riemann-proc | wc -l`)
     if running > @limits[:critical][:max] or running < @limits[:critical][:min]
       alert "proc #{process}", :critical, running, "process #{process} is running #{running} instances"
     else

data/lib/riemann/tools.rb

@@ -1,9 +1,7 @@
 module Riemann
   module Tools
-    require 'rubygems'
     require 'trollop'
     require 'riemann/client'
-    require 'timeout'
 
     def self.included(base)
       base.instance_eval do
@@ -68,19 +66,14 @@ module Riemann
       
       event = event.merge(attributes)
 
-      begin
-        Timeout::timeout(options[:timeout]) do
-          riemann << event
-        end
-      rescue Timeout::Error
-        riemann.connect
-      end
+      riemann << event
     end
 
     def new_riemann_client
       r = Riemann::Client.new(
-        :host => options[:host],
-        :port => options[:port]
+        :host    => options[:host],
+        :port    => options[:port],
+        :timeout => options[:timeout]
       )
       if options[:tcp]
         r.tcp

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: riemann-tools
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Kyle Kingsbury
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-26 00:00:00.000000000 Z
+date: 2014-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: riemann-client
@@ -66,20 +66,6 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: 1.1.0
-- !ruby/object:Gem::Dependency
-  name: redis
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 3.0.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 3.0.2
 - !ruby/object:Gem::Dependency
   name: fog
   requirement: !ruby/object:Gem::Requirement
@@ -143,13 +129,11 @@ executables:
 - riemann-munin
 - riemann-aws-billing
 - riemann-riak
-- riemann-redis-slowlog
 - riemann-varnish
 - riemann-haproxy
 - riemann-freeswitch
 - riemann-aws-status
 - riemann-nginx-status
-- riemann-redis
 - riemann-diskstats
 - riemann-health
 extensions: []
@@ -175,8 +159,6 @@ files:
 - bin/riemann-nginx-status
 - bin/riemann-proc
 - bin/riemann-rabbitmq
-- bin/riemann-redis
-- bin/riemann-redis-slowlog
 - bin/riemann-resmon
 - bin/riemann-riak
 - bin/riemann-riak-keys

data/bin/riemann-redis

@@ -1,71 +0,0 @@
-#!/usr/bin/env ruby
-
-# Gathers redis INFO statistics and submits them to Riemann.
-
-require File.expand_path('../../lib/riemann/tools', __FILE__)
-
-class Riemann::Tools::Redis
-  include Riemann::Tools
-  require 'redis'
-
-  opt :redis_host, "Redis hostname", :default => 'localhost'
-  opt :redis_port, "Redis port", :default => 6379
-  opt :redis_password, "Redis password", :default => ''
-  opt :redis_url, "Redis URL", :default => ''
-  opt :redis_socket, "Redis socket", :default => ''
-  opt :redis_section, "Redis INFO section", :default => 'default'
-
-  STRING_VALUES = %w{ redis_version redis_git_sha1 redis_mode os
-                      multiplexing_api gcc_version run_id used_memory_human
-                      used_memory_peak_human mem_allocator
-                      rdb_last_bgsave_status aof_last_bgrewrite_status role }
-
-  def initialize
-    options = if opts[:redis_url] != ''
-                { :url => opts[:redis_url] }
-              elsif opts[:redis_socket] != ''
-                { :path => opts[:redis_socket] }
-              else
-                { :host => opts[:redis_host], :port => opts[:redis_port] }
-              end
-    @redis = ::Redis.new(options)
-    @redis.auth(opts[:redis_password]) unless opts[:redis_password] == ''
-    @section = opts[:redis_section]
-  end
-
-  def tick
-    begin
-      @redis.info(@section).each do |property, value|
-        data = {
-          :host    => opts[:redis_host].dup,
-          :service => "redis #{property}",
-          :metric  => value.to_f,
-          :state   => value.to_s,
-          :tags    => ['redis']
-        }
-
-        if STRING_VALUES.include?(property) || property.match(/^db\d+/)
-          if %w{ rdb_last_bgsave_status aof_last_bgrewrite_status }.include?(property)
-            data[:state] = value
-          else
-            data[:description] = value
-          end
-        end
-
-        if property == "run_id"
-          data[:metric] = 0
-        end
-
-        report(data)
-      end
-    rescue ::Redis::CommandError => e
-      if e.message == "ERR operation not permitted"
-        @redis.auth(opts[:redis_password]) unless opts[:redis_password] == ''
-      end
-    end
-
-  end
-
-end
-
-Riemann::Tools::Redis.run

data/bin/riemann-redis-slowlog

@@ -1,44 +0,0 @@
-#!/usr/bin/env ruby
-
-# Gathers Redis SLOWLOG statistics and submits them to Riemann.
-
-require File.expand_path('../../lib/riemann/tools', __FILE__)
-
-class Riemann::Tools::RedisSlowlog
-  include Riemann::Tools
-  require 'redis'
-
-  opt :redis_url,      "Redis URL",                        :default => 'redis://127.0.0.1:6379/'
-  opt :redis_password, "Redis password",                   :default => ''
-  opt :slowlog_len,    "Number of SLOWLOG entries to get", :default => 10
-  opt :slowlog_reset,  "Reset SLOWLOG after querying it",  :default => false
-
-  def initialize
-    @redis = ::Redis.new(url: opts[:redis_url])
-
-    @slowlog_len   = opts[:slowlog_len]
-    @slowlog_reset = opts[:slowlog_reset]
-
-    @redis.auth(opts[:redis_password]) unless opts[:redis_password] == ''
-  end
-
-  def tick
-    @redis.slowlog("GET", @slowlog_len).each do |id, timestamp, us, cmd|
-      data = {
-        :host        => @redis.client.host,
-        :service     => "redis",
-        :time        => timestamp,
-        :metric      => us.to_f,
-        :state       => 'warning',
-        :tags        => ['redis', 'slowlog'],
-        :description => cmd.inspect
-      }
-      report(data)
-    end
-
-    @redis.slowlog("RESET") if @slowlog_reset
-  end
-
-end
-
-Riemann::Tools::RedisSlowlog.run