riemann-babbler 1.0.7.9 → 1.0.8

data/bin/riemann-babbler

@@ -1,11 +1,12 @@
 #!/usr/bin/env ruby
-#encoding: utf-8
+# coding: utf-8
 
 require 'trollop'
 require 'configatron'
 
-require File.expand_path('../../lib/riemann/version', __FILE__)
-require File.expand_path('../../lib/start', __FILE__)
+$:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+require 'riemann/babbler/version'
+require 'riemann/babbler/start'
 
 opts = Trollop::options do
   version "Riemann babbler #{Riemann::Babbler::VERSION}"

data/lib/riemann/{babbler/plugin.rb → babbler.rb}

@@ -1,6 +1,6 @@
-#encoding: utf-8
+# encoding: utf-8
 
-require File.expand_path('../support/plugin_helpers', __FILE__)
+require 'riemann/babbler/support/plugin_helpers'
 require 'riemann/client'
 require 'open3'
 require 'timeout'
@@ -8,7 +8,7 @@ require 'rest_client'
 require 'socket'
 require 'net/ping'
 require 'sequel'
-require File.expand_path('../support/monkey_patches', __FILE__)
+require 'riemann/babbler/support/monkey_patches'
 
 
 # Базовое описание плагина
@@ -64,7 +64,11 @@ module Riemann
 
     def report_with_diff(event)
       current_metric = event[:metric]
-      event[:metric] = current_metric - @storage[ event[:service] ] if @storage.has_key? event[:service]
+      if @storage.has_key?(event[:service])
+        unless current_metric + @storage[event[:service]] > 2**64
+          event[:metric] = current_metric - @storage[event[:service]]
+        end unless @storage[event[:service]].nil?
+      end
       @storage[ event[:service] ] = current_metric
       event.delete(:as_diff)
       report(event)
@@ -96,7 +100,7 @@ module Riemann
       if plugin.run.nil?
         true
       else
-        plugin.run == true ? true : false
+        plugin.run ? true : false
       end
     end
 

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

@@ -1,4 +1,4 @@
-class Riemann::Babbler::Cpufan < Riemann::Babbler
+class Riemann::Babbler::CpuFan < Riemann::Babbler
 
   def init
     plugin.set_default(:service, 'cpufan')
@@ -13,7 +13,7 @@ class Riemann::Babbler::Cpufan < Riemann::Babbler
   end
 
   def collect
-    { :service => plugin.service, :metric => shell(plugin.cmd).to_i, :description => "CPU Fan Speed" }
+    { :service => plugin.service, :metric => shell(plugin.cmd).to_i, :description => 'CPU Fan Speed'}
   end
 
 end

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

@@ -1,4 +1,4 @@
-class Riemann::Babbler::Cputemp < Riemann::Babbler
+class Riemann::Babbler::CpuTemp < Riemann::Babbler
 
   def init
     plugin.set_default(:service, 'cputemp')
@@ -13,7 +13,7 @@ class Riemann::Babbler::Cputemp < Riemann::Babbler
   end
 
   def collect
-    { :service => plugin.service, :metric => shell(plugin.cmd).to_i, :description => "CPU Temperature" }
+    { :service => plugin.service, :metric => shell(plugin.cmd).to_i, :description => 'CPU Temperature'}
   end
 
 end

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

@@ -13,7 +13,7 @@ class Riemann::Babbler::Exim4 < Riemann::Babbler
   end
 
   def collect
-    { :service => plugin.service, :metric => shell(plugin.cmd).to_i, :description => "Exim4: count frozen mails" }
+    { :service => plugin.service, :metric => shell(plugin.cmd).to_i, :description => 'Exim4: count frozen mails'}
   end
 
 end

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

@@ -14,8 +14,8 @@ class Riemann::Babbler::Mdadm < Riemann::Babbler
     file = File.read('/proc/mdstat').split("\n")
     status = Array.new
     file.each_with_index do |line, index|
-      next unless line.include? "_"
-      device = file[index-1].split(":")[0].strip
+      next unless line.include? '_'
+      device = file[index-1].split(':')[0].strip
       status << { :service => plugin.service + " #{device}", :metric => 1, :description => "mdadm failed device #{device}" }
     end
     status

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

@@ -12,7 +12,7 @@ class Riemann::Babbler::MegaCli < Riemann::Babbler
   end
 
   def collect
-    {:service => plugin.service, :metric => shell(plugin.cmd).to_i, :description => "MegaCli status" }
+    {:service => plugin.service, :metric => shell(plugin.cmd).to_i, :description => 'MegaCli status'}
   end
 
 end

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

@@ -1,4 +1,4 @@
-class Riemann::Babbler::Netstat < Riemann::Babbler
+class Riemann::Babbler::NetStat < Riemann::Babbler
 
   def init
     plugin.set_default(:service, 'netstat')

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

@@ -1,16 +1,8 @@
 class Riemann::Babbler::Nginx < Riemann::Babbler
 
-    NGINX_STATUS_1 = [
-      'accepts',
-      'handled',
-      'requests'
-    ]
+    NGINX_STATUS_1 = %W(accepts handled requests)
 
-    NGINX_STATUS_2 = [
-      'reading',
-      'writing',
-      'waiting'
-    ]
+    NGINX_STATUS_2 = %W(reading writing waiting)
 
   def init
     plugin.set_default(:service, 'nginx')
@@ -30,7 +22,7 @@ class Riemann::Babbler::Nginx < Riemann::Babbler
       status << { :service => plugin.service + " #{NGINX_STATUS_1[index]}", :metric => value.to_i, :as_diff => true }
     end
     # line[0]: Active connections: XXXX
-    status << { :service => plugin.service + " active", :metric => lines[0].split(":")[1].strip.to_i }
+    status << { :service => plugin.service + ' active', :metric => lines[0].split(':')[1].strip.to_i }
     # lines[3]: Reading: 0 Writing: 1 Waiting: 0
     lines[3].scan(/\d+/).each_with_index do |value, index|
       status << { :service => plugin.service + " #{NGINX_STATUS_2[index]}", :metric => value.to_i }

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

@@ -15,11 +15,11 @@ class Riemann::Babbler::Runit < Riemann::Babbler
     status = Array.new
     Dir.glob('/etc/service/*').each do |srv|
       next if plugin.not_monit.include? srv
-      human_srv = ' ' + srv.gsub(/\/etc\/service\//,"")
+      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_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 

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

@@ -1,4 +1,4 @@
-class Riemann::Babbler::Chkfile < Riemann::Babbler
+class Riemann::Babbler::StatusFile < Riemann::Babbler
 
   def init
     plugin.set_default(:service, 'check state file')

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

@@ -1,4 +1,4 @@
-class Riemann::Babbler::Twcli < Riemann::Babbler
+class Riemann::Babbler::TwCli < Riemann::Babbler
 
   def init
     plugin.set_default(:service, 'twcli')
@@ -15,7 +15,7 @@ class Riemann::Babbler::Twcli < Riemann::Babbler
     { 
       :service => plugin.service,
       :metric => shell(plugin.cmd).to_i,
-      :description => "Hardware raid tw_cli status"
+      :description => 'Hardware raid tw_cli status'
     }
   end
 

data/lib/{start.rb → riemann/babbler/start.rb}

@@ -2,8 +2,8 @@ require 'yaml'
 require 'logger'
 require 'resolv'
 
-require File.expand_path('../riemann/babbler/support/deep_merge', __FILE__)
-require File.expand_path('../riemann/babbler/plugin', __FILE__)
+require 'riemann/babbler/support/deep_merge'
+require 'riemann/babbler'
 
 class Riemann::Babbler::Starter
 
@@ -37,7 +37,7 @@ class Riemann::Babbler::Starter
       logger.warn "Can't load config file #{opts[:config]}"
       Hash.new
     end
-    config_default = YAML.load_file( File.expand_path('../../config.yml', __FILE__) )
+    config_default = YAML.load_file( File.expand_path('../../../../config.yml', __FILE__) )
     config_from_file = config_default.deep_merge( config_file )
     config.configure_from_hash config_from_file
   end
@@ -61,7 +61,7 @@ class Riemann::Babbler::Starter
 
   def load_plugins
     plugins = Array.new
-    default_plugins_dir = File.expand_path('../riemann/babbler/plugins/', __FILE__)
+    default_plugins_dir = File.expand_path('../plugins/', __FILE__)
     Dir.glob( default_plugins_dir + '/*.rb') do |file|
       plugins <<  file
     end

data/lib/riemann/babbler/support/monkey_patches.rb

@@ -1,9 +1,9 @@
 module Beefcake
   class Buffer
     
-    def initialize(buf="")
+    def initialize(buf='')
       if buf.respond_to?(:force_encoding)
-        self.buf = buf.force_encoding("BINARY")
+        self.buf = buf.force_encoding('BINARY')
       else
         self.buf = buf
       end
@@ -12,7 +12,7 @@ module Beefcake
     def append_string(s)
       append_uint64(s.length)
       if s.respond_to?(:force_encoding)
-        self << s.force_encoding("BINARY")
+        self << s.force_encoding('BINARY')
       else
         self << s
       end

data/lib/riemann/babbler/support/plugin_helpers.rb

@@ -55,8 +55,9 @@ module Riemann
           end
         end
       rescue Timeout::Error
+        return false
       end
-      return false
+      false
     end
 
     # http rest

data/lib/riemann/{version.rb → babbler/version.rb}

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

data/riemann-babbler.gemspec

@@ -1,5 +1,5 @@
 # -*- encoding: utf-8 -*-
-require File.expand_path('../lib/riemann/version', __FILE__)
+require File.expand_path('../lib/riemann/babbler/version', __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = 'riemann-babbler'
@@ -7,8 +7,8 @@ Gem::Specification.new do |s|
   s.authors     = ['Vasiliev D.V.']
   s.email       = %w(vadv.mkn@gmail.com)
   s.homepage    = 'https://github.com/vadv/riemann-babbler'
-  s.summary     = %q{Riemann health checker.}
-  s.description = %q{Some plugins manager for riemann.}
+  s.summary     = %q{Plugin manager for riemann.}
+  s.description = %q{Plugin manager for riemann.}
   s.licenses    = %w(MIT)
   
   s.add_dependency('riemann-client')

data/spec/default.rb

@@ -1,7 +1,7 @@
 #encoding: utf-8
 
-require 'riemann/babbler/plugin'
-require 'start'
+require 'riemann/babbler'
+require 'riemann/babbler/start'
 require 'configatron'
 
 opts = Hash.new

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: riemann-babbler
 version: !ruby/object:Gem::Version
-  version: 1.0.7.9
+  version: 1.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -139,7 +139,7 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: Some plugins manager for riemann.
+description: Plugin manager for riemann.
 email:
 - vadv.mkn@gmail.com
 executables:
@@ -156,7 +156,7 @@ files:
 - Rakefile
 - bin/riemann-babbler
 - config.yml
-- lib/riemann/babbler/plugin.rb
+- lib/riemann/babbler.rb
 - lib/riemann/babbler/plugins/cpu.rb
 - lib/riemann/babbler/plugins/cpufan.rb
 - lib/riemann/babbler/plugins/cputemp.rb
@@ -174,11 +174,11 @@ files:
 - lib/riemann/babbler/plugins/runit.rb
 - lib/riemann/babbler/plugins/statusfile.rb
 - lib/riemann/babbler/plugins/twcli.rb
+- lib/riemann/babbler/start.rb
 - lib/riemann/babbler/support/deep_merge.rb
 - lib/riemann/babbler/support/monkey_patches.rb
 - lib/riemann/babbler/support/plugin_helpers.rb
-- lib/riemann/version.rb
-- lib/start.rb
+- lib/riemann/babbler/version.rb
 - riemann-babbler.gemspec
 - spec/config.yml
 - spec/default.rb
@@ -206,7 +206,7 @@ rubyforge_project:
 rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
-summary: Riemann health checker.
+summary: Plugin manager for riemann.
 test_files:
 - spec/config.yml
 - spec/default.rb