riemann-babbler 1.2.0 → 1.2.1

data/lib/riemann/babbler/plugins/runit.rb

@@ -2,13 +2,20 @@ class Riemann::Babbler::Runit < Riemann::Babbler
 
   def init
     plugin.set_default(:service, 'runit')
-    plugin.set_default(:not_monit, [])
+    plugin.set_default(:not_monit, ['riemann-client'])
+    plugin.set_default(:warning_uptime, 10)
     plugin.set_default(:interval, 60)
   end
 
   def run_plugin
     Dir.exists? '/etc/service'
-    @status_history = Array.new
+  end
+
+  # service uptime
+  def uptime(service)
+    pid_file = File.join(service, 'supervise', 'pid')
+    return 0 unless File.exist?(pid_file)
+    Time.now.to_i - File.mtime(pid_file).to_i
   end
 
   def read_run_status
@@ -18,14 +25,13 @@ class Riemann::Babbler::Runit < Riemann::Babbler
       human_srv = ' ' + srv.gsub(/\/etc\/service\//, '')
       stat_file = File.join(srv, 'supervise', 'stat')
       next unless File.exists? stat_file
-      if File.read( stat_file ).strip == 'run'
-        @status_history.delete human_srv
-        status << {:service => plugin.service + human_srv , :state => 'ok', :description => "runit service #{human_srv} running"}
+      srv_uptime = uptime(srv)
+      if (File.read( stat_file ).strip == 'run') && (srv_uptime > plugin.interval)
+        status << {:service => plugin.service + human_srv , :state => 'ok', :description => "runit service #{human_srv} running", :metric => srv_uptime}
+      elsif (File.read( stat_file ).strip == 'run') && (srv_uptime < plugin.warning_uptime)
+        status << {:service => plugin.service + human_srv , :state => 'warning', :description => "runit service #{human_srv} small uptime", :metric => srv_uptime}
       else
-        if @status_history.include? human_srv 
-          status << {:service => plugin.service + human_srv , :state => 'critical', :description => "runit service #{human_srv} not running"}
-        end
-        @status_history << human_srv unless @status_history.include? human_srv
+        status << {:service => plugin.service + human_srv , :state => 'critical', :description => "runit service #{human_srv} not running", :metric => srv_uptime}
       end
     end
     status

data/lib/riemann/babbler/start.rb

@@ -4,7 +4,7 @@ require 'resolv'
 
 require 'riemann/babbler/support/deep_merge'
 require 'riemann/babbler'
-require 'riemann/babbler/support/responder'
+require 'riemann/babbler/support/pinger'
 
 class Riemann::Babbler::Starter
 

data/lib/riemann/babbler/support/{responder.rb → pinger.rb}

@@ -3,24 +3,20 @@ require 'json'
 
 class Riemann::Responder
 
-  def info
-    {
+  INFO = {
       :version => Riemann::Babbler::VERSION,
-      :ruby => "#{RUBY_VERSION}-#{RUBY_PATCHLEVEL}",
-      :uptime => (Time.now.to_i - @started_at)
-    }.to_json
-  end
+      :ruby => "#{RUBY_VERSION}-#{RUBY_PATCHLEVEL}"
+  }.freeze
 
   def initialize( port = 55755 )
     @port = port
-    @started_at = Time.now.to_i
   end
 
   def start
     @worker_thread = Thread.new {
       Socket.tcp_server_loop(@port) do |sock, _|
         begin
-          sock.puts info
+          sock.puts INFO.to_json
         ensure
           sock.close
         end
@@ -34,5 +30,4 @@ class Riemann::Responder
       @worker_thread = nil
     end
   end
-
 end

data/lib/riemann/babbler/version.rb

@@ -1,5 +1,5 @@
 module Riemann
   class Babbler
-    VERSION = '1.2.0'
+    VERSION = '1.2.1'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: riemann-babbler
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-19 00:00:00.000000000 Z
+date: 2013-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: riemann-client
@@ -194,8 +194,8 @@ files:
 - lib/riemann/babbler/start.rb
 - lib/riemann/babbler/support/deep_merge.rb
 - lib/riemann/babbler/support/monkey_patches.rb
+- lib/riemann/babbler/support/pinger.rb
 - lib/riemann/babbler/support/plugin_helpers.rb
-- lib/riemann/babbler/support/responder.rb
 - lib/riemann/babbler/version.rb
 - riemann-babbler.gemspec
 - spec/config.yml