riemann-babbler 0.8.8 → 0.8.9

data/.gitignore

@@ -1 +1,2 @@
 pkg/
+.idea

data/Gemfile

@@ -1,15 +1,15 @@
 source :rubygems
 
-gem "riemann-client"
-gem "configatron"
-gem "logger"
-gem "trollop"
-gem "sys-filesystem"
-gem "rest-client"
-gem "sequel"
+gem 'riemann-client'
+gem 'configatron'
+gem 'logger'
+gem 'trollop'
+gem 'sys-filesystem'
+gem 'rest-client'
+gem 'sequel'
 
-gem "rspec"
-gem "rake"
+gem 'rspec'
+gem 'rake'
 
-gem "pry"
-gem "awesome_print"
+gem 'pry'
+gem 'awesome_print'

data/README.md

@@ -17,7 +17,7 @@ where [options] are:
 ```
 
 ### Config
-Bubbler load main config and merge custom plugins
+Babbler load main config and merge custom plugins
 ```yaml
 riemann:
   host: riemann.host 
@@ -26,7 +26,7 @@ riemann:
     - prod
     - web
   suffix: ".testing"
-  preffix: "previx"
+  preffix: "prefix"
 
 plugins:
   dirs:

data/bin/riemann-babbler

@@ -22,7 +22,7 @@ Usage:
 where [options] are:
 EOS
 
-  opt :config, "Config file", :default => "/etc/riemann-babbler/config.yml"
+  opt :config, 'Config file', :default => '/etc/riemann-babbler/config.yml'
 end
 
 # logger

data/lib/deep_merge.rb

@@ -2,12 +2,12 @@
 class Hash
 
   def deep_merge!(specialized_hash)
-    return internal_deep_merge!(self, specialized_hash)
+    internal_deep_merge!(self, specialized_hash)
   end
 
 
   def deep_merge(specialized_hash)
-    return internal_deep_merge!(Hash.new.replace(self), specialized_hash)
+    internal_deep_merge!(Hash.new.replace(self), specialized_hash)
   end
 
 
@@ -43,6 +43,6 @@ class Hash
 
     #puts "deep merge done."
 
-    return source_hash
+    source_hash
   end
 end

data/lib/riemann/babbler/plugin.rb

@@ -37,7 +37,7 @@ module Riemann
 
     # Доступ к конфигу определенного плагина
     def plugin
-      plugin_name = self.class.name.split( "::" ).last.gsub( /(\p{Lower})(\p{Upper})/, "\\1_\\2" ).downcase
+      plugin_name = self.class.name.split('::').last.gsub( /(\p{Lower})(\p{Upper})/, "\\1_\\2" ).downcase
       options.plugins.send plugin_name
     end
 
@@ -78,7 +78,7 @@ module Riemann
       if options.riemann.installation.nil?
         hostname += options.riemann.suffix unless options.riemann.suffix.nil?
       else
-        hostname += ( "." + options.riemann.installation )
+        hostname += ( '.' + options.riemann.installation )
       end
       hostname = options.riemann.prefix + hostname unless options.riemann.prefix.nil?
       hostname
@@ -102,7 +102,7 @@ module Riemann
 
     def run
       # выйти если run_plugin не равен true
-      return 0 unless run_plugin == true
+      return 0 unless run_plugin
       t0 = Time.now
       loop do
         begin
@@ -118,17 +118,17 @@ module Riemann
     # хелпер, описание статуса
     def state(my_state)
       return 'critical' if my_state.nil?
-      unless plugin.states.warning.nil?
+      if plugin.states.warning.nil?
+        my_state >= plugin.states.critical ? 'critical' : 'ok'
+      else
         case
-        when my_state.between?(plugin.states.warning, plugin.states.critical)
-          'warning'
-        when my_state > plugin.states.warning
-          'critical'
-        else
-          'ok'
+          when my_state.between?(plugin.states.warning, plugin.states.critical)
+            'warning'
+          when my_state > plugin.states.warning
+            'critical'
+          else
+            'ok'
         end
-      else
-        my_state >= plugin.states.critical ? 'critical' : 'ok'
       end
     end
 

data/lib/riemann/babbler/plugin_helpers.rb

@@ -3,7 +3,7 @@
 module Riemann
   class Babbler
 
-    def helper_error(msg = "Unknown helper error")
+    def helper_error(msg = 'Unknown helper error')
       report({
         :service => plugin.service,
         :state => 'critical',
@@ -20,10 +20,10 @@ module Riemann
       timeout_shell = ( plugin.interval * 2 ).to_f/3
       Timeout::timeout(timeout_shell) {
         Open3.popen3(*cmd) do |stdin, stdout, stderr, wait_thread|
-          err = stderr.gets(nil)
-          out = stdout.gets(nil)
+
+
           [stdin, stdout, stderr].each{|stream| stream.send('close')}
-          exit_status = wait_thread.value
+
         end
       }
       rescue => e
@@ -36,19 +36,7 @@ module Riemann
         return out.chomp
       else
         # статус 0, вывода stdout нет
-        return ""
-      end
-    end
-
-    # db get
-    # http://sequel.rubyforge.org/rdoc/files/doc/opening_databases_rdoc.html
-    # 
-    def sql(connection_string, query)
-      begin
-        db = Sequel.connect connection_string
-        db.fetch(query)
-      rescue => e
-        helper_error "#{e.class} #{e}\n#{e.backtrace.join "\n"}"
+        ''
       end
     end
 

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

@@ -18,7 +18,7 @@ class Riemann::Babbler::Cpu < Riemann::Babbler
       # проверяем есть строчка /cpu\d+/ или /cpu / и сграбливаем это в переменную
       cpu_number = cpu_line.scan(/cpu(\d+|\s)\s+/)
       next if cpu_number.empty?
-      cpu_number = cpu_number[0][0] == " " ? "_total" : cpu_number[0][0] 
+      cpu_number = cpu_number[0][0] == ' ' ? '_total' : cpu_number[0][0]
 
       # работаем со строкой
       cpu_line[/cpu(\d+|\s)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)/]

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

@@ -5,14 +5,7 @@ class Riemann::Babbler::Disk < Riemann::Babbler
   require 'sys/filesystem'
   include Sys
 
-  NOT_MONITORING_FS = [
-    'sysfs',
-    'nfs',
-    'devpts',
-    'squashfs',
-    'proc',
-    'devtmpfs'
-  ]
+  NOT_MONITORING_FS = %w(sysfs nfs devpts squashfs proc devtmpfs)
 
   def collect
     # собираем только необходимые для мониторинга маунт-поинты
@@ -26,8 +19,8 @@ class Riemann::Babbler::Disk < Riemann::Babbler
     disk = Array.new
     monit_points.each do |point|
       point_stat = Filesystem.stat point
-      human_point = point == "/" ? "/root" : point
-      human_point = human_point.gsub(/^\//, "").gsub(/\//, "_")
+      human_point = point == '/' ? '/root' : point
+      human_point = human_point.gsub(/^\//, '').gsub(/\//, '_')
       disk << { :service => plugin.service + " #{human_point} % block", :description => "Disk usage #{point}, %", :metric => (1- point_stat.blocks_available.to_f/point_stat.blocks).round(2) * 100 }
       disk << { :service => plugin.service + " #{human_point} % inode", :description => "Disk usage #{point}, inodes %", :metric => (1 - point_stat.files_available.to_f/point_stat.files).round(2) * 100 }
       disk << { :service => plugin.service + " #{human_point} abs free", :description => "Disk free #{point}, B", :metric =>  point_stat.blocks_free * point_stat.block_size, :state => 'ok'}

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

@@ -3,7 +3,7 @@
 class Riemann::Babbler::La < Riemann::Babbler
 
   def collect
-    { :service => plugin.service + " la_1", :description => "LA averaged over 1 minute", :metric => File.read('/proc/loadavg').split(/\s+/)[2].to_f }
+    { :service => plugin.service + ' la_1', :description => 'LA averaged over 1 minute', :metric => File.read('/proc/loadavg').split(/\s+/)[2].to_f }
   end
 
 end

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

@@ -20,14 +20,14 @@ class Riemann::Babbler::Memory < Riemann::Babbler
 
     desc = "#{shell('ps -eo pmem,pid,cmd --sort -pmem | head -10').chomp}"
     [
-      { :service => plugin.service + " % free", :description => "Memory usage, %", :metric => fraction.round(2) * 100 },
-      { :service => plugin.service + " % swap", :description => "Swap usage, %", :metric => swap_fraction.round(2) * 100 },
-      { :service => plugin.service + " abs free", :description => "Memory free (kB)\n\n #{desc}", :metric => free, :state => 'ok' },
-      { :service => plugin.service + " abs total", :description => "Memory total (kB)\n\n #{desc}", :metric => total, :state => 'ok' },
-      { :service => plugin.service + " abs cached", :description => "Memory usage, cached (kB)\n\n #{desc}",  :metric => cached, :state => 'ok' },
-      { :service => plugin.service + " abs buffers", :description => "Memory usage, buffers (kB)\n\n #{desc}", :metric => buffers, :state => 'ok' },
-      { :service => plugin.service + " abs used", :description => "Memory usage, used (kB)\n\n #{desc}", :metric => used , :state => 'ok' },
-      { :service => plugin.service + " abs free_bc", :description => "Memory usage with cache и buffers (kB)\n\n #{desc}", :metric => free_bc , :state => 'ok' }
+      { :service => plugin.service + ' % free', :description => 'Memory usage, %', :metric => fraction.round(2) * 100 },
+      { :service => plugin.service + ' % swap', :description => 'Swap usage, %', :metric => swap_fraction.round(2) * 100 },
+      { :service => plugin.service + ' abs free', :description => "Memory free (kB)\n\n #{desc}", :metric => free, :state => 'ok' },
+      { :service => plugin.service + ' abs total', :description => "Memory total (kB)\n\n #{desc}", :metric => total, :state => 'ok' },
+      { :service => plugin.service + ' abs cached', :description => "Memory usage, cached (kB)\n\n #{desc}",  :metric => cached, :state => 'ok' },
+      { :service => plugin.service + ' abs buffers', :description => "Memory usage, buffers (kB)\n\n #{desc}", :metric => buffers, :state => 'ok' },
+      { :service => plugin.service + ' abs used', :description => "Memory usage, used (kB)\n\n #{desc}", :metric => used , :state => 'ok' },
+      { :service => plugin.service + ' abs free_bc', :description => "Memory usage with cache и buffers (kB)\n\n #{desc}", :metric => free_bc , :state => 'ok' }
     ]
   end
 

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

@@ -20,8 +20,8 @@ class Riemann::Babbler::Net < Riemann::Babbler
     f = File.read('/proc/net/dev')
     status = Array.new
     f.split("\n").each do |line|
-      iface = line.split(":")[0].strip
-      iface.gsub!(/\./,"_")
+      iface = line.split(':')[0].strip
+      iface.gsub!(/\./, '_')
       next unless line =~ /(\w*)\:\s*([\s\d]+)\s*/
       WORDS.map do |service|
         "#{plugin.service} #{iface} #{service}"

data/lib/riemann/version.rb

@@ -1,5 +1,5 @@
 module Riemann
   class Babbler
-    VERSION = '0.8.8'
+    VERSION = '0.8.9'
   end
 end

data/lib/start_helpers.rb

@@ -3,15 +3,15 @@ require File.expand_path('../riemann/babbler/plugin', __FILE__)
 
 def set_logger_lvl(logger, configatron)
   case configatron.logger.level
-  when "INFO"
+  when 'INFO'
     logger.level = Logger::INFO
-  when "WARN"
+  when 'WARN'
     logger.level = Logger::WARN
-  when "ERROR"
+  when 'ERROR'
     logger.level = Logger::ERROR
-  when "FATAL"
+  when 'FATAL'
     logger.level = Logger::FATAL
-  when "UNKNOWN"
+  when 'UNKNOWN'
     logger.level = Logger::UNKNOWN
   else
     logger.level = Logger::DEBUG
@@ -37,14 +37,14 @@ end
 def load_plugins(configatron)
   plugins = Array.new
   default_plugins_dir = File.expand_path('../riemann/babbler/plugins/', __FILE__)
-  Dir.glob( default_plugins_dir + "/*.rb" ) do |file|
+  Dir.glob( default_plugins_dir + '/*.rb') do |file|
     plugins <<  file
   end
 
   unless configatron.plugins.dirs.nil?
     configatron.plugins.dirs.each do |dir|
       next unless Dir.exist? dir
-      Dir.glob( dir + "/*.rb" ) do |file|
+      Dir.glob( dir + '/*.rb') do |file|
         plugins << file
       end
     end
@@ -87,7 +87,7 @@ end
 def start_plugins(registered_plugins, riemann, logger, configatron)
   run_only = Array.new
   configatron.plugins.to_hash.keys.each { |key| run_only << key.to_s }
-  registered_plugins.delete_if {|plugin| ! run_only.include? plugin.to_s.split("::").last.downcase }
+  registered_plugins.delete_if {|plugin| ! run_only.include? plugin.to_s.split('::').last.downcase }
 
   plugin_threads = registered_plugins.map do |plugin|
     Thread.new {
@@ -96,7 +96,7 @@ def start_plugins(registered_plugins, riemann, logger, configatron)
   end
 
   # plugin control
-  Signal.trap "TERM" do
+  Signal.trap 'TERM' do
     plugin_threads.each( &:kill )
   end
 

data/riemann-babbler.gemspec

@@ -2,13 +2,13 @@
 require File.expand_path('../lib/riemann/version', __FILE__)
 
 Gem::Specification.new do |s|
-  s.name        = "riemann-babbler"
+  s.name        = 'riemann-babbler'
   s.version     = Riemann::Babbler::VERSION
-  s.authors     = ["Vasiliev D.V."]
+  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 cheker.}
-  s.description = %q{Some plugins mannager for riemann.}
+  s.homepage    = 'https://github.com/vadv/riemann-babbler'
+  s.summary     = %q{Riemann health checker.}
+  s.description = %q{Some plugins manager for riemann.}
   s.licenses    = %w(MIT)
   
   s.add_dependency('riemann-client')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: riemann-babbler
 version: !ruby/object:Gem::Version
-  version: 0.8.8
+  version: 0.8.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-24 00:00:00.000000000 Z
+date: 2013-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: riemann-client
@@ -123,7 +123,7 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: Some plugins mannager for riemann.
+description: Some plugins manager for riemann.
 email:
 - vadv.mkn@gmail.com
 executables:
@@ -165,7 +165,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1309778898422144430
+      hash: -3301891544373648721
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -177,5 +177,5 @@ rubyforge_project:
 rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
-summary: Riemann health cheker.
+summary: Riemann health checker.
 test_files: []