riemann-babbler 2.0.0pre11 → 2.0.0pre13

data/.travis.yml

@@ -2,4 +2,4 @@ language:
   - ruby
 rvm: 
   - 1.9.3
-script: "bundle exec rspec spec/default.rb" 
+script: "bundle exec rspec test/default_spec.rb"

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    riemann-babbler (2.0.0pre11)
+    riemann-babbler (2.0.0pre13)
       configatron
       docile
       file-tail
@@ -21,8 +21,9 @@ GEM
     coderay (1.0.9)
     configatron (2.13.0)
       yamler (>= 0.1.0)
+    diff-lcs (1.2.4)
     docile (1.1.0)
-    ffi (1.9.0)
+    ffi (1.9.3)
     file-tail (1.0.12)
       tins (~> 0.5)
     method_source (0.8.2)
@@ -45,6 +46,14 @@ GEM
       beefcake (>= 0.3.5)
       mtrc (>= 0.0.4)
       trollop (>= 1.16.2)
+    rspec (2.14.1)
+      rspec-core (~> 2.14.0)
+      rspec-expectations (~> 2.14.0)
+      rspec-mocks (~> 2.14.0)
+    rspec-core (2.14.7)
+    rspec-expectations (2.14.3)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.14.4)
     slop (3.4.6)
     sys-filesystem (1.1.1)
       ffi
@@ -61,3 +70,4 @@ DEPENDENCIES
   pry
   rake
   riemann-babbler!
+  rspec

data/bin/riemann-babbler

@@ -4,7 +4,6 @@
 require 'trollop'
 require 'yaml'
 require_relative '../lib/riemann/babbler'
-require_relative '../lib/riemann/babbler/plugin'
 
 include Riemann::Babbler::Logging
 include Riemann::Babbler::Options
@@ -42,5 +41,6 @@ opts.configure_from_hash({ :riemann => cmd_opts })
 merge_config(opts.riemann.config)
 
 # start
-Riemann::Babbler::Responder.new.run!
-Riemann::Babbler::PluginLoader.new(Riemann::Babbler::Sender.new).run!
+sender = Riemann::Babbler::Sender.new
+plugins_to_start = Riemann::Babbler::PluginLoader.new.plugin_to_start
+Riemann::Babbler::PluginManager.new(sender, plugins_to_start).run!

data/lib/riemann/babbler/options.rb

@@ -37,7 +37,7 @@ module Riemann
 
       # return string Riemann::Babbler::Plugin::TwCli_3
       def underscore_to_name(name = 'tw_cli_3', parent = 'Riemann::Babbler::Plugin')
-        parent + '::'  + name.to_s.split('_').map { |part|
+        parent + '::' + name.to_s.split('_').map { |part|
           if part.to_i != 0
             "_#{part}"
           else

data/lib/riemann/babbler/plugin_loader.rb

@@ -1,3 +1,5 @@
+require_relative 'plugin'
+
 module Riemann
   module Babbler
     class PluginLoader
@@ -19,15 +21,15 @@ module Riemann
           'net',
           'runit',
           'tw_cli',
-          'errors_reporter'
+          'errors_reporter',
+          'responder'
       ].freeze
 
-      attr_accessor :sender, :load_plugin_names_from_config, :delete_from_autostart
+      attr_accessor :load_plugin_names_from_config, :delete_from_autostart
 
-      def initialize(riemann)
-        @sender = riemann
+      def initialize
         @load_plugin_names_from_config = Array.new
-        @delete_from_autostart = Array.new
+        @delete_from_autostart         = Array.new
       end
 
       def all_available_plugins
@@ -91,7 +93,7 @@ module Riemann
         require_from_config
       end
 
-      def run!
+      def plugin_to_start
 
         started_plugins = []
 
@@ -101,7 +103,7 @@ module Riemann
         require_all_plugins!
 
         plugin_names_to_run = plugin_names_to_run +
-          load_plugin_names_from_config.map {|name| name.to_s}
+            load_plugin_names_from_config.map { |name| name.to_s }
 
         plugin_names_to_run = (plugin_names_to_run - delete_from_autostart).uniq
 
@@ -111,16 +113,8 @@ module Riemann
           end
         end
 
-        plugin_threads = started_plugins.map do |plugin|
-          Thread.new {
-            log :unknown, "Start plugin #{plugin}"
-            plugin.new(sender).run!
-          }
-        end
-        Signal.trap 'TERM' do
-          plugin_threads.each(&:kill)
-        end
-        plugin_threads.each(&:join)
+        log :debug, "Return plugin to start: #{started_plugins}"
+        started_plugins
       end
 
     end

data/lib/riemann/babbler/plugin_manager.rb

@@ -0,0 +1,53 @@
+module Riemann
+  module Babbler
+    class PluginManager
+
+      include Riemann::Babbler::Logging
+
+      attr_accessor :sender
+
+      def initialize(sender, array_of_klasses)
+        @plugins = array_of_klasses
+        @sender  = sender
+      end
+
+      def run!
+        hash_of_plugins_and_threads = Hash.new
+        @plugins.map do |plugin|
+
+          unless plugin.new(@sender).send(:run_plugin)
+            log :unknown, "Disable plugin: #{plugin}, because it not started by condition: run_plugin"
+            next
+          end
+
+          hash_of_plugins_and_threads[plugin] = Thread.new {
+            log :unknown, "Start plugin #{plugin}"
+            plugin.new(@sender).run!
+          }
+
+        end
+
+        Signal.trap 'TERM' do
+          hash_of_plugins_and_threads.values.each(&:kill)
+        end
+
+        loop {
+          check_alive(hash_of_plugins_and_threads)
+          sleep 10
+        }
+      end
+
+      def check_alive(hash_of_plugins_and_threads)
+        log :debug, "Check alive of threads [#{hash_of_plugins_and_threads.count}]"
+        hash_of_plugins_and_threads.each do |plugin, thread|
+          next if thread.alive?
+          log :error, "Plugin: #{plugin} is #{thread.inspect}, run it..."
+          hash_of_plugins_and_threads[plugin] = Thread.new {
+            plugin.new(@sender).run!
+          }
+        end
+      end
+
+    end
+  end
+end

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

@@ -6,7 +6,7 @@ class Riemann::Babbler::Plugin::ErrorsReporter < Riemann::Babbler::Plugin
   end
 
   def collect
-    status = Array.new
+    status   = Array.new
     messages = Array.new
 
     opts.errors.to_hash.each do |plugin_name, plugin_status|
@@ -22,9 +22,9 @@ class Riemann::Babbler::Plugin::ErrorsReporter < Riemann::Babbler::Plugin
     else
       @report_ok = false
       status << {
-          :service => plugin.service,
-          :state => 'critical',
-          :metric => messages.count,
+          :service     => plugin.service,
+          :state       => 'critical',
+          :metric      => messages.count,
           :description => "Problem with plugins:\n #{messages.join("\n")}"
       }
     end

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

@@ -0,0 +1,29 @@
+require 'net/http/server'
+require 'json'
+
+class Riemann::Babbler::Plugin::Responder < Riemann::Babbler::Plugin
+
+  def init
+    plugin.set_default(:port, opts.riemann.responder_port)
+    plugin.set_default(:started_at, Time.now.to_i)
+  end
+
+  def info
+    {
+        :version => Riemann::Babbler::VERSION,
+        :ruby    => "#{RUBY_VERSION}-#{RUBY_PATCHLEVEL}",
+        :uptime  => Time.now.to_i - plugin.started_at,
+        :errors  => opts.errors.to_hash,
+        :config  => opts.riemann.to_hash
+    }
+  end
+
+  def run!
+    log :unknown, "Start responder 0.0.0.0:#{plugin.port}"
+    ::Net::HTTP::Server.run(:port => plugin.port) do |request, _|
+      log :debug, "Responder request: #{request}"
+      [200, { 'Content-Type' => 'application/json' }, [info.to_json]]
+    end
+  end
+
+end

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

@@ -44,7 +44,7 @@ class Riemann::Babbler::Plugin::Runit < Riemann::Babbler::Plugin
       # сервис запущен и работает дольше чем мы приходили к нему в прошлый раз
       if srv_runned && srv_uptime > plugin.interval
         @status_history.delete(srv_name)
-        status << { :service => plugin.service + ' ' + srv_name, :state => 'ok', :description => "runit service #{srv_name} running", :metric => srv_uptime }
+        status << { :service => plugin.service + ' ' + srv_name, :state => 'ok', :description => "runit service #{srv_name} running" }
       else
         # сервис запущен но работает подозрительно мало, но последний раз замечен не был
         if srv_uptime < plugin.interval && srv_runned && !@status_history.include?(srv_name)

data/lib/riemann/babbler/version.rb

@@ -1,5 +1,5 @@
 module Riemann
   module Babbler
-    VERSION = '2.0.0pre11'
+    VERSION = '2.0.0pre13'
   end
 end

data/lib/riemann/babbler.rb

@@ -4,5 +4,5 @@ require 'riemann/babbler/logging'
 require 'riemann/babbler/errors'
 require 'riemann/babbler/monkey_patches'
 require 'riemann/babbler/sender'
-require 'riemann/babbler/responder'
-require 'riemann/babbler/plugin_loader'
+require 'riemann/babbler/plugin_loader'
+require 'riemann/babbler/plugin_manager'

data/riemann-babbler.gemspec

@@ -32,5 +32,6 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency 'bundler', '~> 1.3'
   spec.add_development_dependency 'rake'
+  spec.add_development_dependency 'rspec'
   spec.add_development_dependency 'pry'
 end

data/test/default_spec.rb

@@ -0,0 +1,25 @@
+require_relative '../lib/riemann/babbler'
+
+include Riemann::Babbler::Options
+
+describe 'Riemann Babbler Loader' do
+
+  before(:each) do
+    merge_config(File.expand_path('../my_config.yml', __FILE__))
+    @plugins = Riemann::Babbler::PluginLoader.new.plugin_to_start
+    @plugins = @plugins.map {|plugin| plugin.to_s}
+  end
+
+  it "load from file" do
+    opts.riemann.host.should == 'host_from_yaml'
+  end
+
+  it "load parent plugins" do
+    @plugins.should include('Riemann::Babbler::Plugin::Disk_1')
+  end
+
+  it "load parent from array" do
+    @plugins.should include('Riemann::Babbler::Plugin::Cpu_1')
+  end
+  
+end

data/test/my_config.yml

@@ -0,0 +1,10 @@
+riemann:
+  host: host_from_yaml
+  plugins_directory: /tmp
+
+plugins:
+  disk_1:
+    parent: disk
+  cpu:
+    - service: cpu 1
+    - service: cpu 2

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: riemann-babbler
 version: !ruby/object:Gem::Version
-  version: 2.0.0pre11
+  version: 2.0.0pre13
   prerelease: 5
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-31 00:00:00.000000000 Z
+date: 2013-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: riemann-client
@@ -203,6 +203,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -243,6 +259,7 @@ files:
 - lib/riemann/babbler/options.rb
 - lib/riemann/babbler/plugin.rb
 - lib/riemann/babbler/plugin_loader.rb
+- lib/riemann/babbler/plugin_manager.rb
 - lib/riemann/babbler/plugins/cpu.rb
 - lib/riemann/babbler/plugins/cpu_fan.rb
 - lib/riemann/babbler/plugins/cpu_temp.rb
@@ -265,13 +282,15 @@ files:
 - lib/riemann/babbler/plugins/net_stat.rb
 - lib/riemann/babbler/plugins/nginx.rb
 - lib/riemann/babbler/plugins/pgsql.rb
+- lib/riemann/babbler/plugins/responder.rb
 - lib/riemann/babbler/plugins/runit.rb
 - lib/riemann/babbler/plugins/status_file.rb
 - lib/riemann/babbler/plugins/tw_cli.rb
-- lib/riemann/babbler/responder.rb
 - lib/riemann/babbler/sender.rb
 - lib/riemann/babbler/version.rb
 - riemann-babbler.gemspec
+- test/default_spec.rb
+- test/my_config.yml
 homepage: https://github.com/vadv/riemann-babbler
 licenses:
 - MIT
@@ -287,7 +306,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1211602378390530689
+      hash: -4537148055138242403
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -300,4 +319,6 @@ rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Monitoring tool for riemann server, aka plugin manager
-test_files: []
+test_files:
+- test/default_spec.rb
+- test/my_config.yml

data/lib/riemann/babbler/responder.rb

@@ -1,43 +0,0 @@
-require 'net/http/server'
-require 'json'
-
-module Riemann
-  module Babbler
-
-    class Responder
-
-
-      include Riemann::Babbler::Logging
-      include Riemann::Babbler::Options
-
-      attr_accessor :port, :started_at
-
-      def initialize
-        @port       = opts.riemann.responder_port
-        @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,
-            :errors  => opts.errors.to_hash,
-            :config  => opts.riemann.to_hash
-        }
-      end
-
-      def run!
-        Thread.new {
-          log :unknown, "Start responder 0.0.0.0:#{port}"
-          Net::HTTP::Server.run(:port => port) do |request, _|
-            log :debug, "Responder request: #{request}"
-            [200, { 'Content-Type' => 'application/json' }, [info.to_json]]
-          end
-        }
-      end
-    end
-
-  end
-end
-