riemann-babbler 0.9.7 → 0.9.8

data/.rspec

@@ -0,0 +1 @@
+--color --format nested --fail-fast

data/.travis.yml

@@ -0,0 +1,5 @@
+language: 
+  - ruby
+rvm: 
+  - 1.9.3
+script: "bundle exec rspec spec/default.rb" 

data/Gemfile

@@ -1,4 +1,4 @@
-source :rubygems
+source 'https://rubygems.org'
 
 gem 'riemann-client'
 gem 'configatron'

data/Gemfile.lock

@@ -1,5 +1,5 @@
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
     awesome_print (1.1.0)
     beefcake (0.3.7)

data/README.md

@@ -1,3 +1,5 @@
+[![Build Status](https://travis-ci.org/vadv/riemann-babbler.png)](https://travis-ci.org/vadv/riemann-babbler)
+
 ### Install
 ```
 gem install riemann-babbler

data/bin/riemann-babbler

@@ -2,15 +2,10 @@
 #encoding: utf-8
 
 require 'trollop'
-require 'yaml'
 require 'configatron'
-require 'logger'
-require 'resolv'
-require 'sequel'
-require 'socket'
 
 require File.expand_path('../../lib/riemann/version', __FILE__)
-require File.expand_path('../../lib/start_helpers', __FILE__)
+require File.expand_path('../../lib/start', __FILE__)
 
 opts = Trollop::options do
   version "Riemann babbler #{Riemann::Babbler::VERSION}"
@@ -25,14 +20,5 @@ EOS
   opt :config, 'Config file', :default => '/etc/riemann-babbler/config.yml'
 end
 
-# logger
-logger = Logger.new(STDOUT)
-
-# start_helpers
-merge_config( logger, opts, configatron )
-set_logger_lvl( logger, configatron )
-load_plugins( configatron )
-load_gems_plugins( configatron )
-riemann = get_riemann( configatron, logger )
-load_parent( configatron )
-start_plugins( Riemann::Babbler.registered_plugins, riemann, logger, configatron )
+babbler = Riemann::Babbler::Starter.new(opts, configatron)
+babbler.start!

data/lib/riemann/babbler/plugin.rb

@@ -1,11 +1,14 @@
 #encoding: utf-8
 
-require File.expand_path('../plugin_helpers', __FILE__)
+require File.expand_path('../support/plugin_helpers', __FILE__)
 require 'riemann/client'
 require 'open3'
 require 'timeout'
 require 'rest_client'
-require File.expand_path('../monkey_patches', __FILE__)
+require 'socket'
+require 'net/ping'
+require 'sequel'
+require File.expand_path('../support/monkey_patches', __FILE__)
 
 
 # Базовое описание плагина
@@ -33,7 +36,6 @@ module Riemann
       @hostname = get_hostname
       init
       plugin.set_default(:interval, configatron.riemann.interval)
-      run
     end
 
     # Доступ к конфигу определенного плагина

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

@@ -1,7 +1,13 @@
 class Riemann::Babbler::Dummy < Riemann::Babbler
 
   def collect
-    { :service => plugin.service , :state => 'ok' }
+    if tcp_port_aviable?(configatron.riemann.host, configatron.riemann.port)
+      logger.error "Riemann state 'ok' host: #{configatron.riemann.host}, port #{configatron.riemann.port}, proto tcp"
+      []
+    else
+      logger.error "Can't access to riemann host: #{configatron.riemann.host}, port #{configatron.riemann.port}, proto tcp" 
+    end
+    Array.new
   end
 
 end

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

@@ -4,8 +4,8 @@ class Riemann::Babbler::Netstat < Riemann::Babbler
     plugin.set_default(:service, 'netstat')
     plugin.set_default(:interval, 60)
     plugin.set_default(:port, 80)
-    #plugin.states.set_default(:warning, 300)
-    #plugin.states.set_default(:critical, 400)
+    plugin.states.set_default(:warning, 300)
+    plugin.states.set_default(:critical, 400)
   end
 
   def collect

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

@@ -0,0 +1,78 @@
+#encoding: utf-8
+
+module Riemann
+  class Babbler
+
+    def helper_error(msg = 'Unknown helper error')
+      report({
+               :service => plugin.service,
+               :state => 'critical',
+               :description => msg
+      })
+    end
+
+    def plugin_timeout
+      ( plugin.interval * 2 ).to_f/3
+    end
+
+    # хэлпер для парса stdout+stderr и exit status
+    def shell(*cmd)
+      exit_status=nil
+      err=nil
+      out=nil
+      begin
+        Timeout::timeout(plugin_timeout) {
+          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
+        helper_error "#{e.class} #{e}\n#{e.backtrace.join "\n"}"
+      end
+      if exit_status.to_i > 0
+        err = err.chomp if err
+        helper_error(err)
+      elsif out
+        return out.strip
+      else
+        # статус 0, вывода stdout нет
+        ''
+      end
+    end
+
+    def tcp_port_aviable?(ip, port)
+      begin
+        Timeout::timeout(plugin_timeout) do
+          begin
+            s = TCPSocket.new(ip, port)
+            s.close
+            return true
+          rescue Errno::ECONNREFUSED, Errno::EHOSTUNREACH
+            return false
+          end
+        end
+      rescue Timeout::Error
+      end
+      return false
+    end
+
+    # http rest
+    def rest_get(url)
+      begin
+        Timeout::timeout(plugin_timeout) do
+          begin
+            RestClient.get url
+          rescue
+            helper_error("Get from url: #{url} failed")
+          end
+        end
+      rescue Timeout::Error
+        helper_error("Get from url: #{url}, timeout error")
+      end
+    end
+
+  end
+end

data/lib/riemann/version.rb

@@ -1,5 +1,5 @@
 module Riemann
   class Babbler
-    VERSION = '0.9.7'
+    VERSION = '0.9.8'
   end
 end

data/lib/start.rb

@@ -0,0 +1,158 @@
+require 'yaml'
+require 'logger'
+require 'resolv'
+
+require File.expand_path('../riemann/babbler/support/deep_merge', __FILE__)
+require File.expand_path('../riemann/babbler/plugin', __FILE__)
+
+class Riemann::Babbler::Starter
+
+  attr_reader :logger
+  attr_reader :opts
+  attr_reader :riemann
+  attr_reader :config
+
+  def initialize(opts, configatron)
+    @opts = opts
+    @config = configatron
+    Configatron.log.level = Logger::FATAL
+    Gem::Deprecate.skip = true
+  end
+
+  def logger
+    @logger ||= Logger.new(STDOUT)
+  end
+
+  def start!
+    merge_config
+    set_logger_lvl
+    load_plugins
+    start_plugins!
+  end
+
+  def merge_config
+    config_file =  if File.exist?( opts[:config] )
+      YAML.load_file( opts[:config] ).to_hash
+    else
+      logger.warn "Can't load config file #{opts[:config]}"
+      Hash.new
+    end
+    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
+
+  def set_logger_lvl
+    case config.logger.level
+    when 'INFO'
+      logger.level = Logger::INFO
+    when 'WARN'
+      logger.level = Logger::WARN
+    when 'ERROR'
+      logger.level = Logger::ERROR
+    when 'FATAL'
+      logger.level = Logger::FATAL
+    when 'UNKNOWN'
+      logger.level = Logger::UNKNOWN
+    else
+      logger.level = Logger::DEBUG
+    end
+  end
+
+  def load_plugins
+    plugins = Array.new
+    default_plugins_dir = File.expand_path('../riemann/babbler/plugins/', __FILE__)
+    Dir.glob( default_plugins_dir + '/*.rb') do |file|
+      plugins <<  file
+    end
+
+    unless config.plugins.dirs.nil?
+      config.plugins.dirs.each do |dir|
+        next unless Dir.exist? dir
+        Dir.glob( dir + '/*.rb') do |file|
+          plugins << file
+        end
+      end
+    end
+
+    unless config.plugins.files.nil?
+      config.plugins.files.each do |file|
+        plugins << file
+      end
+    end
+    plugins.each { |plugin| require plugin }
+    load_gems_plugins
+    load_parent
+  end
+
+  def load_gems_plugins
+    plugins = Array.new
+    begin
+      Gem.source_index.each do |gem|
+        plugin_name = gem[1].to_s.scan(/\s+name=(.+)\s+/)[0][0]
+        plugins << plugin_name.gsub('-','/') if plugin_name.include? 'riemann-babbler-plugin-'
+      end
+    rescue
+      logger.error "Can't find gems riemann-babbler-plugin-"
+    end
+    plugins.each { |plugin| require plugin }
+  end
+
+  def load_parent
+    config.to_hash[:plugins].each do |plugin, plugin_opts|
+      next if plugin_opts.nil?
+      next unless plugin_opts.kind_of? Hash
+      create_class(plugin.capitalize, plugin_opts[:parent].capitalize) if plugin_opts.has_key? :parent
+    end
+  end
+
+  def create_class(new_class, parent_class)
+    cmd = "class Riemann::Babbler::#{new_class} < Riemann::Babbler::#{parent_class}; end;"
+    cmd += "Riemann::Babbler.registered_plugins << Riemann::Babbler::#{new_class}"
+    eval(cmd)
+  end
+
+  def riemann
+    @riemann ||= get_riemann
+  end
+
+  def get_riemann
+    begin
+      riemann_ip =  Resolv.new.getaddress(config.riemann.host)
+      riemann = Riemann::Client.new(
+        :host => riemann_ip,
+        :port => config.riemann.port
+      )
+      riemann = ( config.riemann.proto == 'tcp' ) ? riemann.tcp : riemann
+    rescue
+      logger.fatal "Can't resolv riemann host: #{config.riemann.host}"
+      sleep 5
+      retry
+    end
+    riemann
+  end
+
+  def started_plugins
+    registered_plugins = Riemann::Babbler.registered_plugins.dup
+    run_only = Array.new
+    config.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
+  end
+
+  def start_plugins!
+    plugin_threads = started_plugins.map do |plugin|
+      Thread.new {
+        plugin.new( config, logger, riemann ).run
+      }
+    end
+
+    # plugin control
+    Signal.trap 'TERM' do
+      plugin_threads.each( &:kill )
+    end
+
+    plugin_threads.each( &:join )
+  end
+
+end

data/spec/config.yml

@@ -0,0 +1,15 @@
+riemann:
+  host: hostname_does_not_exists
+  port: 5555
+  proto: auto # auto use tcp + udp(max size 16384), tcp - tcp only
+  interval: 60 # update interval for all plugins 
+  use_fqdn: true
+
+logger:
+  level: FATAL
+
+plugins:
+  dummy2:
+    parent: dummy
+    run: false
+    interval: 2000

data/spec/default.rb

@@ -0,0 +1,60 @@
+#encoding: utf-8
+
+require 'riemann/babbler/plugin'
+require 'start'
+require 'configatron'
+
+opts = Hash.new
+opts[:config] = File.expand_path('../config.yml', __FILE__)
+
+babbler = Riemann::Babbler::Starter.new(opts, configatron)
+
+describe Riemann::Babbler do
+
+  it 'Merge config' do
+    babbler.merge_config
+    configatron.riemann.host.should eq 'hostname_does_not_exists'
+  end
+
+  it 'Set logger lvl' do
+    babbler.set_logger_lvl
+    babbler.logger.level.should eq 4
+  end
+
+  it 'Load plugins' do
+    babbler.load_plugins
+    Riemann::Babbler.registered_plugins.should include( Riemann::Babbler::Dummy )
+  end
+
+  it 'Started plugins' do
+    babbler.started_plugins.should include( Riemann::Babbler::Dummy )
+  end
+
+  it 'Parent plugins' do
+    babbler.started_plugins.should include( Riemann::Babbler::Dummy2 )
+  end
+
+  it 'Custom parent plugin start' do
+    dummyplugin = Riemann::Babbler::Dummy2.new(configatron, nil, nil)
+    configatron.plugins.dummy2.to_hash.should include(:run => false)
+    dummyplugin.plugin.run.should eq false
+    dummyplugin.plugin.interval.should eq 2000 
+    dummyplugin.run.should eq 0
+  end
+
+  it 'Shell helper' do
+    dummyplugin = Riemann::Babbler::Dummy2.new(configatron, nil, nil)
+    dummyplugin.shell("echo 'a' | wc -l").to_i.should eq 1
+  end
+
+  it 'RestGet helper' do
+    dummyplugin = Riemann::Babbler::Dummy2.new(configatron, nil, nil)
+    dummyplugin.rest_get('http://ya.ru').should include 'yandex.ru'
+  end
+
+  it 'TcpPortAviable helper' do
+    dummyplugin = Riemann::Babbler::Dummy2.new(configatron, nil, nil)
+    dummyplugin.tcp_port_aviable?('www.ya.ru', 80).should eq true
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: riemann-babbler
 version: !ruby/object:Gem::Version
-  version: 0.9.7
+  version: 0.9.8
   prerelease: 
 platform: ruby
 authors:
@@ -148,16 +148,15 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .rspec
+- .travis.yml
 - Gemfile
 - Gemfile.lock
 - README.md
 - Rakefile
 - bin/riemann-babbler
 - config.yml
-- lib/deep_merge.rb
-- lib/riemann/babbler/monkey_patches.rb
 - lib/riemann/babbler/plugin.rb
-- lib/riemann/babbler/plugin_helpers.rb
 - lib/riemann/babbler/plugins/cpu.rb
 - lib/riemann/babbler/plugins/cpufan.rb
 - lib/riemann/babbler/plugins/cputemp.rb
@@ -172,9 +171,14 @@ files:
 - lib/riemann/babbler/plugins/netstat.rb
 - lib/riemann/babbler/plugins/nginx.rb
 - lib/riemann/babbler/plugins/runit.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_helpers.rb
+- lib/start.rb
 - riemann-babbler.gemspec
+- spec/config.yml
+- spec/default.rb
 homepage: https://github.com/vadv/riemann-babbler
 licenses:
 - MIT
@@ -190,7 +194,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1337242013675877660
+      hash: -440020618523197346
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -203,4 +207,6 @@ rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Riemann health checker.
-test_files: []
+test_files:
+- spec/config.yml
+- spec/default.rb

data/lib/riemann/babbler/plugin_helpers.rb

@@ -1,53 +0,0 @@
-#encoding: utf-8
-
-module Riemann
-  class Babbler
-
-    def helper_error(msg = 'Unknown helper error')
-      report({
-        :service => plugin.service,
-        :state => 'critical',
-        :description => msg
-      })      
-    end
-
-    # хэлпер для парса stdout+stderr и exit status
-    def shell(*cmd)
-      exit_status=nil
-      err=nil
-      out=nil
-      begin
-      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
-        helper_error "#{e.class} #{e}\n#{e.backtrace.join "\n"}"
-      end
-      if exit_status.to_i > 0
-        err = err.chomp if err
-        helper_error(err)
-      elsif out
-        return out.strip
-      else
-        # статус 0, вывода stdout нет
-        ''
-      end
-    end
-
-    # http rest 
-    def rest_get(url)
-      begin
-        RestClient.get url
-      rescue
-        helper_error("Get from url: #{url}")
-      end
-    end
-
-  end
-end

data/lib/start_helpers.rb

@@ -1,121 +0,0 @@
-require File.expand_path('../deep_merge', __FILE__)
-require File.expand_path('../riemann/babbler/plugin', __FILE__)
-
-def set_logger_lvl(logger, configatron)
-  case configatron.logger.level
-  when 'INFO'
-    logger.level = Logger::INFO
-  when 'WARN'
-    logger.level = Logger::WARN
-  when 'ERROR'
-    logger.level = Logger::ERROR
-  when 'FATAL'
-    logger.level = Logger::FATAL
-  when 'UNKNOWN'
-    logger.level = Logger::UNKNOWN
-  else
-    logger.level = Logger::DEBUG
-  end
-end
-
-# merge configs
-def merge_config(logger, opts, configatron)
-  config_file =  if File.exist?( opts[:config] )
-    YAML.load_file( opts[:config] ).to_hash
-  else
-    logger.error "Can't load config file #{opts[:config]}"
-    Hash.new
-  end
-
-  config_default = YAML.load_file( File.expand_path('../../config.yml', __FILE__) )
-
-  config = config_default.deep_merge( config_file )
-  configatron.configure_from_hash config
-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|
-    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|
-        plugins << file
-      end
-    end
-  end
-
-  unless configatron.plugins.files.nil?
-    configatron.plugins.files.each do |file|
-      plugins << file
-    end
-  end
-  plugins.each { |plugin| require plugin }
-end
-
-def load_gems_plugins(configatron)
-  plugins = Array.new
-  Gem.source_index.each do |gem|  
-    plugin_name = gem[1].to_s.scan(/\s+name=(.+)\s+/)[0][0]
-    plugins << plugin_name.gsub('-','/') if plugin_name.include? 'riemann-babbler-plugin-'
-  end
-  plugins.each { |plugin| require plugin }
-end
-
-def get_riemann(configatron, logger)
-  begin
-    riemann_ip =  Resolv.new.getaddress(configatron.riemann.host)
-    riemann = Riemann::Client.new(
-      :host => riemann_ip,
-      :port => configatron.riemann.port
-    )
-    riemann = ( configatron.riemann.proto == 'tcp' ) ? riemann.tcp : riemann
-  rescue
-    logger.error "Can't resolv riemann host: #{configatron.riemann.host}"
-    sleep 5
-    retry
-  end
-    riemann
-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 }
-
-  plugin_threads = registered_plugins.map do |plugin|
-    Thread.new {
-      plugin.new( configatron, logger, riemann ).run
-    }
-  end
-
-  # plugin control
-  Signal.trap 'TERM' do
-    plugin_threads.each( &:kill )
-  end
-
-  plugin_threads.each( &:join )
-end
-
-def load_parent(configatron)
-  configatron.to_hash[:plugins].each do |plugin, opts|
-    next if opts.nil?
-    next unless opts.kind_of? Hash
-    create_class(plugin.capitalize, opts[:parent].capitalize) if opts.has_key? :parent
-  end
-end
-
-# plugin load parent
-def create_class(new_class, parent_class)
-  cmd = "class Riemann::Babbler::#{new_class} < Riemann::Babbler::#{parent_class}; end;"
-  cmd += "Riemann::Babbler.registered_plugins << Riemann::Babbler::#{new_class}"
-  eval(cmd)
-end
-
-