riemann-babbler 1.4.0 → 2.0.0pre1

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: riemann-babbler
 version: !ruby/object:Gem::Version
-  version: 1.4.0
-  prerelease: 
+  version: 2.0.0pre1
+  prerelease: 5
 platform: ruby
 authors:
-- Vasiliev D.V.
+- Vasiliev Dmitry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-17 00:00:00.000000000 Z
+date: 2013-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: riemann-client
@@ -28,7 +28,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: configatron
+  name: trollop
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -44,7 +44,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: logger
+  name: rest-client
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -60,7 +60,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: trollop
+  name: sys-filesystem
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -76,7 +76,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sys-filesystem
+  name: docile
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -92,7 +92,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rest-client
+  name: configatron
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -108,7 +108,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: net-ping
+  name: net-http-server
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -124,30 +124,30 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: file-tail
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
+        version: '1.3'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
-  name: sys-proctable
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
@@ -156,14 +156,14 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: net-http-server
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
@@ -171,7 +171,7 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: Plugin manager for riemann.
+description: Monitoring tool for riemann
 email:
 - vadv.mkn@gmail.com
 executables:
@@ -184,20 +184,29 @@ files:
 - .travis.yml
 - Gemfile
 - Gemfile.lock
+- LICENSE.txt
 - README.md
 - Rakefile
 - bin/riemann-babbler
-- config.yml
 - lib/riemann/babbler.rb
+- lib/riemann/babbler/errors.rb
+- lib/riemann/babbler/logging.rb
+- lib/riemann/babbler/monkey_patches.rb
+- lib/riemann/babbler/options.rb
+- lib/riemann/babbler/plugin.rb
+- lib/riemann/babbler/plugin_loader.rb
 - lib/riemann/babbler/plugins/cpu.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/diskstat.rb
-- lib/riemann/babbler/plugins/dummy.rb
+- lib/riemann/babbler/plugins/disk_stat.rb
+- lib/riemann/babbler/plugins/errors_reporter.rb
 - lib/riemann/babbler/plugins/exim4.rb
 - lib/riemann/babbler/plugins/find_files.rb
 - lib/riemann/babbler/plugins/haproxy.rb
+- lib/riemann/babbler/plugins/helpers/init.rb
+- lib/riemann/babbler/plugins/helpers/rest.rb
+- lib/riemann/babbler/plugins/helpers/shell.rb
 - lib/riemann/babbler/plugins/http.rb
 - lib/riemann/babbler/plugins/la.rb
 - lib/riemann/babbler/plugins/mdadm.rb
@@ -210,16 +219,10 @@ files:
 - lib/riemann/babbler/plugins/runit.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/errors.rb
-- lib/riemann/babbler/support/monkey_patches.rb
-- lib/riemann/babbler/support/plugin_helpers.rb
-- lib/riemann/babbler/support/responder.rb
+- lib/riemann/babbler/responder.rb
+- lib/riemann/babbler/sender.rb
 - lib/riemann/babbler/version.rb
 - riemann-babbler.gemspec
-- spec/config.yml
-- spec/default.rb
 homepage: https://github.com/vadv/riemann-babbler
 licenses:
 - MIT
@@ -236,16 +239,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
-summary: Plugin manager for riemann.
-test_files:
-- spec/config.yml
-- spec/default.rb
+summary: Monitoring tool for riemann server, aka plugin manager
+test_files: []
 has_rdoc: 

data/config.yml

@@ -1,72 +0,0 @@
-riemann:
-  host: 127.0.0.1
-  port: 5555
-  proto: auto # auto use tcp + udp(max size 16384), tcp - tcp only
-  interval: 60 # update interval for all plugins 
-  use_fqdn: true
-  test_connect_on_start: true
-  responder:
-    port: 55755
-
-logger:
-  level: DEBUG
-  date_time_format: '%Y-%m-%d %H:%M:%S'
-
-plugins:
-
-  dummy:
-    service: keep alive
-
-  la:
-    service: la
-    states:
-      warning: 4
-      critical: 10
-
-  disk:
-    service: disk
-    states:
-      warning: 70
-      critical: 85
-
-  cpu:
-    service: cpu usage
-    states:
-      warning: 0.7
-      critical: 0.85
-
-  memory:
-    service: memory
-    states:
-      warning: 70
-      critical: 85
-
-  net:
-    service: net
-
-  cpufan:
-    service: cpufan
-
-  cputemp:
-    service: cputemp
-
-  exim4:
-    service: exim4
-
-  mdadm:
-    service: mdadm
-
-  megacli:
-    service: megacli
-
-  twcli:
-    interval: 300
-
-  nginx:
-    service: nginx
-
-  runit:
-    service: runit
-
-  diskstat:
-    service: diskstat

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

@@ -1,12 +0,0 @@
-class Riemann::Babbler::Dummy < Riemann::Babbler
-
-  def collect
-    if tcp_port_aviable?(riemann.host, riemann.port)
-      logger.unknown "Riemann state 'ok' host: #{configatron.riemann.host}, port #{configatron.riemann.port}, proto tcp"
-    else
-      logger.fatal "Can't access to riemann host: #{configatron.riemann.host}, port #{configatron.riemann.port}, proto tcp" 
-    end
-    { :service => plugin.service, :state => 'ok' }
-  end
-
-end

data/lib/riemann/babbler/start.rb

@@ -1,159 +0,0 @@
-require 'yaml'
-require 'logger'
-require 'resolv'
-
-require 'riemann/babbler/support/deep_merge'
-require 'riemann/babbler'
-require 'riemann/babbler/support/responder'
-
-class Riemann::Babbler::Starter
-
-  attr_reader :logger
-  attr_reader :opts
-  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_config
-    load_plugins
-    $riemann = get_riemann
-    Riemann::Responder.new(@config.riemann.responder.port, logger).start
-    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_config
-    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
-    logger.datetime_format = @config.logger.date_time_format.to_s
-  end
-
-  def load_plugins
-    plugins = Array.new
-    default_plugins_dir = File.expand_path('../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 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
-      riemann.connect if config.test_connect_on_start
-    rescue
-      logger.fatal "Can't resolv or connect to 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 {
-        logger.unknown "Start plugin #{plugin}"
-        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/lib/riemann/babbler/support/errors.rb

@@ -1,3 +0,0 @@
-class Riemann::Babbler::PluginHelperError < StandardError
-
-end

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

@@ -1,42 +0,0 @@
-module Beefcake
-  class Buffer
-    
-    def initialize(buf='')
-      if buf.respond_to?(:force_encoding)
-        self.buf = buf.force_encoding('BINARY')
-      else
-        self.buf = buf
-      end
-    end
-
-    def append_string(s)
-      append_uint64(s.length)
-      if s.respond_to?(:force_encoding)
-        self << s.force_encoding('BINARY')
-      else
-        self << s
-      end
-    end
-    alias :append_bytes :append_string
-    
-  end
-end
-
-class File
-  def tail(n)
-    buffer = 1024
-    idx = (size - buffer).abs
-    chunks = []
-    lines = 0
-    begin
-      seek(idx)
-      chunk = read(buffer)
-      lines += chunk.count("\n")
-      chunks.unshift chunk
-      idx -= buffer
-    end while lines < ( n + 1 ) && pos != 0
-    tail_of_file = chunks.join('')
-    ary = tail_of_file.split(/\n/)
-    lines_to_return = ary[ ary.size - n, ary.size - 1 ]
-  end
-end

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

@@ -1,104 +0,0 @@
-#encoding: utf-8
-
-module Riemann
-  class Babbler
-
-    def helper_error(msg = 'Unknown helper error')
-      report({
-        :service => plugin.service,
-        :state => 'critical',
-        :description => msg
-      })
-      raise Riemann::Babbler::PluginHelperError
-    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("Error while running shell: " + err.to_s)
-      elsif out
-        return out.strip
-      else
-        # статус 0, вывода stdout нет
-        ''
-      end
-    end
-
-    def file_grep(filename, regexp, max_lines=100)
-      readed_lines = 0
-      lines = Array.new
-      begin
-        Timeout::timeout(plugin_timeout) do
-          File::Tail::Logfile.open(file, :backward => 0) do |log|
-            log.tail do |line|
-              readed_lines += 1
-              lines << line if line.match?(regexp)
-              return lines if readed_lines >= max_lines
-            end
-          end
-        end
-      rescue => e
-        helper_error("#{e.class} #{e}\n#{e.backtrace.join "\n"}")
-      end
-      return lines
-    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
-        return false
-      end
-      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
-
-    # unix timestamp
-    def unixnow
-      Time.now.to_i
-    end
-
-  end
-end

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

@@ -1,29 +0,0 @@
-require 'net/http/server'
-require 'json'
-
-class Riemann::Responder
-
-  def initialize(port = 55755, logger)
-    @port = port
-    @logger = logger
-    @started_at = Time.now.to_i
-  end
-
-  def info
-    {
-      :version => Riemann::Babbler::VERSION,
-      :ruby => "#{RUBY_VERSION}-#{RUBY_PATCHLEVEL}",
-      :uptime => Time.now.to_i - @started_at
-    }
-  end
-
-  def start
-    Thread.new {
-      @logger.unknown "Start responder 0.0.0.0:#{@port}"
-      Net::HTTP::Server.run(:port => @port) do |request, stream|
-        @logger.unknown "Responder request: #{request}"
-        [200, {'Content-Type' => 'application/json'}, [info.to_json]]
-      end
-    }
-  end
-end

data/spec/config.yml

@@ -1,15 +0,0 @@
-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