riemann-babbler 0.6.2 → 0.6.3

data/bin/riemann-babbler

@@ -10,6 +10,7 @@ require 'sequel'
 
 require File.expand_path('../../lib/riemann/version', __FILE__)
 require File.expand_path('../../lib/deep_merge', __FILE__)
+require File.expand_path('../../lib/start_helpers', __FILE__)
 require File.expand_path('../../lib/riemann/babbler/plugin', __FILE__)
 
 opts = Trollop::options do
@@ -28,77 +29,8 @@ end
 # logger
 logger = Logger.new(STDOUT)
 
-# merge configs
-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
-
-# set logger lvl
-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
-
-
-# get plugins
-plugins = []
-default_plugins_dir = File.expand_path('../../lib/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
-
-# set riemann client
-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
-
-# start plugins
-plugins.each { |plugin| require plugin }
-
-plugin_threads = Riemann::Babbler.registered_plugins.map do |plugin|
-  Thread.new {
-    plugin.new( configatron, logger, riemann ).run
-  }
-end
-
-Signal.trap "TERM" do # перехватываем сообщение (на будущее)
-  plugin_threads.each( &:kill )
-end
-
-plugin_threads.each( &:join )
+merge_config(logger, opts, configatron)
+set_logger_lvl(logger, configatron)
+load_plugins(configatron)
+riemann = get_riemann(configatron)
+start_plugins( Riemann::Babbler.registered_plugins, riemann, logger, configatron )

data/config.yml

@@ -8,6 +8,9 @@ logger:
 
 plugins:
 
+  run_only:
+  #  - cpu
+
   interval: 60
 
   dummy:

data/lib/riemann/version.rb

@@ -1,5 +1,5 @@
 module Riemann
   class Babbler
-    VERSION = '0.6.2'
+    VERSION = '0.6.3'
   end
 end

data/lib/start_helpers.rb

@@ -0,0 +1,87 @@
+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 = []
+  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 get_riemann(configatron)
+  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
+  riemann
+end
+
+# логика стартования плагинов
+def start_plugins(registered_plugins, riemann, logger, configatron)
+  plugins_for_run = registered_plugins
+  if run_only = configatron.plugins.run_only
+    plugins_for_run.delete_if {|plugin| ! run_only.include? plugin.to_s.split("::").last.downcase }
+  end unless ( configatron.plugins.run_only.nil? || configatron.plugins.run_only.empty? )
+
+  plugin_threads = plugins_for_run.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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: riemann-babbler
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.6.3
   prerelease: 
 platform: ruby
 authors:
@@ -148,6 +148,7 @@ files:
 - lib/riemann/babbler/plugins/memory.rb
 - lib/riemann/babbler/plugins/net.rb
 - lib/riemann/version.rb
+- lib/start_helpers.rb
 - riemann-babbler.gemspec
 homepage: https://github.com/vadv/riemann-babbler
 licenses:
@@ -164,7 +165,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3834453135357588375
+      hash: 204431131547743034
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: