riemann-tools 0.2.5 → 0.2.6

data/bin/riemann-aws-rds-status

@@ -0,0 +1,48 @@
+#!/usr/bin/env ruby
+require 'rubygems'
+require 'fog'
+require 'date'
+require 'time'
+require 'json'
+
+require File.expand_path('../../lib/riemann/tools', __FILE__)
+
+$0 = __FILE__ # Let's not expose our AWS keys in the process list
+
+class Riemann::Tools::AWS
+  include Riemann::Tools
+
+  opt :access_key, "AWS access key", :type => String
+  opt :secret_key, "Secret access key", :type => String
+  opt :region, "AWS region", :type => String, :default => 'eu-west-1'
+  opt :dbinstance_identifier, "DBInstanceIdentifier", :type => String
+  def initialize
+    abort "FATAL: specify a DB instance name, see --help for usage" unless opts[:dbinstance_identifier]
+    @cloudwatch = Fog::AWS::CloudWatch.new(:aws_access_key_id => opts[:access_key],
+                                           :aws_secret_access_key => opts[:secret_key],
+                                           :region => opts[:region])
+  end
+
+  def tick
+    time = Time.new
+    ['DatabaseConnections', 'FreeableMemory', 'FreeStorageSpace', 'NetworkReceiveThroughput', 'NetworkTransmitThroughput', 'ReadThroughput', 'CPUUtilization'].each do |metric|
+      result = @cloudwatch.get_metric_statistics({"Namespace" => 'AWS/RDS', "MetricName" => "#{metric}", "Statistics" => 'Average', "Dimensions" => [{"Name" => "DBInstanceIdentifier", "Value" => "#{opts[:dbinstance_identifier]}"}], "StartTime" => (time-120).to_time.iso8601, "EndTime" => time.to_time.iso8601, "Period" => 60})
+      metricsResult = result.data[:body]['GetMetricStatisticsResult']
+      puts JSON.dump(metricsResult)
+      if (metricsResult['Datapoints'].length>0)
+        datapoint = metricsResult['Datapoints'][0]
+        ev = {:metric => datapoint['Average'],
+              :service => "#{opts[:dbinstance_identifier]}.#{metric} (#{datapoint['Unit']})",
+              :description => JSON.dump(metricsResult),
+              :state => "ok",
+              :ttl => 300}
+
+
+        report ev
+      end
+
+    end
+  end
+end
+
+Riemann::Tools::AWS.run

data/bin/riemann-dir-files-count

@@ -9,8 +9,8 @@ class Riemann::Tools::DirFilesCount
 
   opt :directory, "", :default => '/var/log'
   opt :service_prefix, "The first part of the service name, before the directory path", :default => "dir-files-count"
-  opt :warning, "Dir files number warning threshold"
-  opt :critical, "Dir files number critical threshold"
+  opt :warning, "Dir files number warning threshold", :type => Integer
+  opt :critical, "Dir files number critical threshold", :type => Integer
   opt :alert_on_missing, "Send a critical metric if the directory is missing?", :default => true
 
   def initialize

data/bin/riemann-dir-space

@@ -9,8 +9,8 @@ class Riemann::Tools::DirSpace
 
   opt :directory, "", :default => '/var/log'
   opt :service_prefix, "The first part of the service name, before the directory path", :default => "dir-space"
-  opt :warning, "Dir space warning threshold (in bytes)"
-  opt :critical, "Dir space critical threshold (in bytes)"
+  opt :warning, "Dir space warning threshold (in bytes)", :type => Integer
+  opt :critical, "Dir space critical threshold (in bytes)", :type => Integer
   opt :alert_on_missing, "Send a critical metric if the directory is missing?", :default => true
 
   def initialize

data/bin/riemann-net

@@ -67,7 +67,15 @@ class Riemann::Tools::Net
     state = self.state
 
     if @old_state
+      # Report services from `@old_state` that don't exist in `state` as expired
+      @old_state.reject { |k| state.has_key?(k) }.each do |service, metric|
+        report(:service => service.dup, :state => 'expired')
+      end
+
+      # Report delta for services that have values in both `@old_state` and `state`
       state.each do |service, metric|
+        next unless @old_state.has_key?(service)
+
         delta = metric - @old_state[service]
         svc_state = case service
           when /drop$/

data/bin/riemann-ntp

@@ -0,0 +1,38 @@
+#!/usr/bin/env ruby
+
+# Reports NTP stats to Riemann.
+
+require File.expand_path('../../lib/riemann/tools', __FILE__)
+
+class Riemann::Tools::Ntp
+  include Riemann::Tools
+
+  def initialize
+    @hostname = `hostname`.chomp
+  end
+
+  def tick
+    stats = `ntpq -p -n`
+    stats.each_line do |stat|
+      m = stat.split()
+      next if m.grep(/^===/).any? || m.grep(/^remote/).any?
+      @ntp_host = m[0].gsub("*","").gsub("-","").gsub("+","")
+      send("delay",m[7])
+      send("offset",m[8])
+      send("jitter",m[9])
+    end
+  end
+
+  def send(type,metric)
+      report(
+        :host => @hostname,
+        :service => "ntp peer #{@ntp_host} #{type}",
+        :metric => metric.to_f,
+        :state => "ok",
+        :description => "ntp peer #{@ntp_host} #{type}",
+        :tags => ["ntp"]
+      )
+  end
+end
+
+Riemann::Tools::Ntp.run

data/bin/riemann-proc

@@ -32,11 +32,12 @@ 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`)
+    found = `ps axo args | grep '#{process}' | grep -v grep | grep -v riemann-proc`
+    running = found.count("\n")
     if running > @limits[:critical][:max] or running < @limits[:critical][:min]
-      alert "proc #{process}", :critical, running, "process #{process} is running #{running} instances"
+      alert "proc #{process}", :critical, running, "process #{process} is running #{running} instances:\n" + found
     else
-      alert "proc #{process}", :ok, running, "process #{process} is running #{running} instances"
+      alert "proc #{process}", :ok, running, "process #{process} is running #{running} instances:\n" + found
     end
   end
 

data/bin/riemann-rabbitmq

@@ -107,11 +107,11 @@ class Riemann::Tools::Rabbitmq
         svc = "rabbitmq.queue.#{queue['vhost']}.#{queue['name']}"
         errs = []
 
-        if queue['messages_ready'] > 0 and queue['consumers'] == 0
+        if queue['messages_ready']!=nil and queue['messages_ready'] > 0 and queue['consumers'] == 0
           errs << "Queue has jobs but no consumers"
         end
 
-        if (max_size_check_filter.nil? or queue['name'] !~ max_size_check_filter) and queue['messages_ready'] > options[:max_queue_size]
+        if (max_size_check_filter.nil? or queue['name'] !~ max_size_check_filter) and queue['messages_ready']!=nil and queue['messages_ready'] > options[:max_queue_size]
           errs << "Queue has #{queue['messages_ready']} jobs"
         end
 
@@ -142,7 +142,7 @@ class Riemann::Tools::Rabbitmq
 
         stats.each_pair do |k,v|
           service = "#{svc}.#{k}"
-          if k =~ /details$/
+          if k =~ /details$/ and v!=nil
             metric = v['rate']
           else
             metric = v

data/bin/riemann-varnish

@@ -2,6 +2,7 @@
 
 # Reports varnish stats to Riemann.
 
+require 'open3'
 require File.expand_path('../../lib/riemann/tools', __FILE__)
 
 class Riemann::Tools::Varnish
@@ -10,15 +11,32 @@ class Riemann::Tools::Varnish
   opt :varnish_host, "Varnish hostname", :default => `hostname`.chomp
 
   def initialize
-    @vstats = [ "client_conn", 
+    cmd = 'varnishstat -V'
+    Open3.popen3(cmd) do |stdin, stdout, stderr, wait_thr|
+      @ver = /varnishstat \(varnish-(\d+)/.match(stderr.read)[1].to_i
+    end
+
+    if @ver >= 4
+      @vstats = [ "MAIN.sess_conn",
+                "MAIN.sess_drop ",
+                "MAIN.client_req",
+                "MAIN.cache_hit",
+                "MAIN.cache_miss" ]
+    else
+      @vstats = [ "client_conn",
                 "client_drop",
                 "client_req",
                 "cache_hit",
                 "cache_miss" ]
+    end
   end
 
   def tick
-    stats = `varnishstat -1 -f #{@vstats.join(",")}`
+    if @ver >= 4
+      stats = `varnishstat -1 -f #{@vstats.join(" -f ")}`
+    else
+      stats = `varnishstat -1 -f #{@vstats.join(",")}`
+    end
     stats.each_line do |stat|
       m = stat.split()
       report(

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: riemann-tools
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-26 00:00:00.000000000 Z
+date: 2015-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: riemann-client
@@ -132,6 +132,7 @@ executables:
 - riemann-zookeeper
 - riemann-resmon
 - riemann-bench
+- riemann-aws-rds-status
 - riemann-proc
 - riemann-freeswitch
 - riemann-aws-billing
@@ -150,6 +151,7 @@ executables:
 - riemann-cloudant
 - riemann-nginx-status
 - riemann-rabbitmq
+- riemann-ntp
 - riemann-kvminstance
 - riemann-net
 - riemann-apache-status
@@ -159,6 +161,7 @@ files:
 - lib/riemann/tools.rb
 - bin/riemann-apache-status
 - bin/riemann-aws-billing
+- bin/riemann-aws-rds-status
 - bin/riemann-aws-status
 - bin/riemann-bench
 - bin/riemann-cloudant
@@ -176,6 +179,7 @@ files:
 - bin/riemann-munin
 - bin/riemann-net
 - bin/riemann-nginx-status
+- bin/riemann-ntp
 - bin/riemann-proc
 - bin/riemann-rabbitmq
 - bin/riemann-resmon