riemann-babbler 1.0.8 → 1.0.8.1

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

@@ -24,9 +24,9 @@ class Riemann::Babbler::Http < Riemann::Babbler
     command += " --max-time #{plugin.max_time} --fail"
     command += " #{plugin.url} -o /dev/null"
 
-    out = shell(command)
+    out = shell(command).to_i
 
-    if out.to_i != plugin.http_code
+    if out != plugin.http_code
       metric = 1
     else
       metric = 0

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

@@ -1,8 +1,7 @@
 class Riemann::Babbler::Nginx < Riemann::Babbler
 
-    NGINX_STATUS_1 = %W(accepts handled requests)
-
-    NGINX_STATUS_2 = %W(reading writing waiting)
+  NGINX_STATUS_1 = %W(accepts handled requests)
+  NGINX_STATUS_2 = %W(reading writing waiting)
 
   def init
     plugin.set_default(:service, 'nginx')

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

@@ -19,10 +19,12 @@ class Riemann::Babbler::Runit < Riemann::Babbler
       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_history.delete human_srv
         status << {:service => plugin.service + human_srv , :state => 'ok', :description => "runit service #{human_srv} running"}
       else
-        status << {:service => plugin.service + human_srv , :state => 'critical', :description => "runit service #{human_srv} not running"} if @status_history.include? human_srv 
+        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
       end
     end

data/lib/riemann/babbler/version.rb

@@ -1,5 +1,5 @@
 module Riemann
   class Babbler
-    VERSION = '1.0.8'
+    VERSION = '1.0.8.1'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: riemann-babbler
 version: !ruby/object:Gem::Version
-  version: 1.0.8
+  version: 1.0.8.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-01 00:00:00.000000000 Z
+date: 2013-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: riemann-client
@@ -158,22 +158,22 @@ files:
 - config.yml
 - lib/riemann/babbler.rb
 - lib/riemann/babbler/plugins/cpu.rb
-- lib/riemann/babbler/plugins/cpufan.rb
-- lib/riemann/babbler/plugins/cputemp.rb
+- lib/riemann/babbler/plugins/cpu_fan.rb
+- lib/riemann/babbler/plugins/cpu_temp.rb
 - lib/riemann/babbler/plugins/disk.rb
 - lib/riemann/babbler/plugins/dummy.rb
 - lib/riemann/babbler/plugins/exim4.rb
 - lib/riemann/babbler/plugins/http.rb
 - lib/riemann/babbler/plugins/la.rb
 - lib/riemann/babbler/plugins/mdadm.rb
-- lib/riemann/babbler/plugins/megacli.rb
+- lib/riemann/babbler/plugins/mega_cli.rb
 - lib/riemann/babbler/plugins/memory.rb
 - lib/riemann/babbler/plugins/net.rb
-- lib/riemann/babbler/plugins/netstat.rb
+- lib/riemann/babbler/plugins/net_stat.rb
 - lib/riemann/babbler/plugins/nginx.rb
 - lib/riemann/babbler/plugins/runit.rb
-- lib/riemann/babbler/plugins/statusfile.rb
-- lib/riemann/babbler/plugins/twcli.rb
+- lib/riemann/babbler/plugins/status_file.rb
+- lib/riemann/babbler/plugins/tw_cli.rb
 - lib/riemann/babbler/start.rb
 - lib/riemann/babbler/support/deep_merge.rb
 - lib/riemann/babbler/support/monkey_patches.rb