riemann-babbler 0.3.1 → 0.3.3

data/Gemfile

@@ -4,7 +4,6 @@ gem "riemann-client"
 gem "configatron"
 gem "logger"
 gem "trollop"
-gem "parallel"
 gem "sys-filesystem"
 gem "rest-client"
 

data/Gemfile.lock

@@ -7,15 +7,18 @@ GEM
     configatron (2.10.0)
       yamler (>= 0.1.0)
     diff-lcs (1.2.2)
+    ffi (1.4.0)
     logger (1.2.8)
     method_source (0.8.1)
+    mime-types (1.21)
     mtrc (0.0.4)
-    parallel (0.6.4)
     pry (0.9.12)
       coderay (~> 1.0.5)
       method_source (~> 0.8)
       slop (~> 3.4)
     rake (10.0.4)
+    rest-client (1.6.7)
+      mime-types (>= 1.16)
     riemann-client (0.2.1)
       beefcake (>= 0.3.5)
       mtrc (>= 0.0.4)
@@ -29,6 +32,8 @@ GEM
       diff-lcs (>= 1.1.3, < 2.0)
     rspec-mocks (2.13.0)
     slop (3.4.3)
+    sys-filesystem (1.1.0)
+      ffi
     trollop (2.0)
     yamler (0.1.0)
 
@@ -39,9 +44,10 @@ DEPENDENCIES
   awesome_print
   configatron
   logger
-  parallel
   pry
   rake
+  rest-client
   riemann-client
   rspec
+  sys-filesystem
   trollop

data/bin/riemann-babbler

@@ -4,7 +4,6 @@
 require 'trollop'
 require 'yaml'
 require 'configatron'
-require 'parallel'
 require 'logger'
 
 require File.expand_path('../../lib/riemann/version', __FILE__)
@@ -25,7 +24,7 @@ EOS
 end
 
 # logger
-log = Logger.new(STDOUT)
+logger = Logger.new(STDOUT)
 
 # merge configs
 config_file =  if File.exist?( opts[:config] )
@@ -40,10 +39,6 @@ config_default = YAML.load_file( File.expand_path('../../config.yml', __FILE__)
 config = config_default.deep_merge( config_file )
 configatron.configure_from_hash config
 
-# отправляем к плагинам
-$configatron = configatron
-$logger = log
-
 # get plugins
 plugins = []
 default_plugins_dir = File.expand_path('../../lib/riemann/babbler/plugins/', __FILE__)
@@ -67,6 +62,16 @@ unless configatron.plugins.files.nil?
 end
 
 # start plugins
-Parallel.each( plugins, :in_threads => plugins.count ) do |plugin|
-  require plugin
+plugins.each { |plugin| require plugin }
+
+plugin_threads = Riemann::Babbler.registered_plugins.map do |plugin|
+  Thread.new {
+    plugin.new( configatron, logger ).run
+  }
 end
+
+Signal.trap "USR1" do
+  plugin_threads.each( &:kill )
+end
+
+plugin_threads.each( &:join )

data/lib/riemann/babbler/plugin.rb

@@ -2,32 +2,31 @@
 
 # Базовое описание плагина
 module Riemann
-  module Babbler
+  class Babbler
+
+    def self.registered_plugins
+      @plugins ||= []
+    end
+
+    def self.inherited( klass )
+      registered_plugins << klass
+    end
 
     require 'riemann/client'
     require 'open3'
     require 'timeout'
     require 'rest_client'
 
-    def self.included(base)
-      base.instance_eval do
-        def run
-          new.run
-        end
-      end
-    end
+    attr_reader :logger
 
-    def initialize
-      @configatron = $configatron
+    def initialize( configatron, logger )
+      @configatron = configatron
+      @logger = logger
       @storage = Hash.new
       init
       run
     end
 
-    def log
-      @logger ||= $logger
-    end
-
     def options
       @configatron
     end
@@ -40,7 +39,7 @@ module Riemann
       end
       event[:tags] = options.riemann.tags unless options.riemann.tags.nil?
       event[:host] =  host
-      log.debug "Report status: #{event.inspect}"
+      logger.debug "Report status: #{event.inspect}"
       riemann << event
     end
 
@@ -106,19 +105,10 @@ module Riemann
     def tick
       posted_hash = collect
       posted_hash.each_key do |service|
-        case service
-        when Hash
-          report({
-            :service => plugin.service + " " + service,
-            :metric => posted_hash[service],
-            :is_diff => posted_hash[:is_diff]
-          })
-        else
-          report({
-            :service => plugin.service + " " + service,
-            :metric => posted_hash[service]           
-            })
-        end
+        report({
+          :service => service,
+          :metric => posted_hash[service][:metric]
+        })
       end
     end
 

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

@@ -1,5 +1,4 @@
-class Riemann::Babbler::Cpu
-  include Riemann::Babbler
+class Riemann::Babbler::Cpu < Riemann::Babbler
 
   def collect
     cpu = File.read('/proc/stat')

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

@@ -1,5 +1,4 @@
-class Riemann::Babbler::Disk
-  include Riemann::Babbler
+class Riemann::Babbler::Disk < Riemann::Babbler
 
   require 'sys/filesystem'
   include Sys
@@ -49,5 +48,3 @@ class Riemann::Babbler::Disk
   end
 
 end
-
-Riemann::Babbler::Disk.run

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

@@ -1,8 +1,8 @@
-class Riemann::Babbler::Dummy
-  include Riemann::Babbler
+class Riemann::Babbler::Dummy < Riemann::Babbler
 
   def collect
     {
+      :service => plugin.service,
       :state => 'ok'
     }
   end

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

@@ -1,5 +1,4 @@
-class Riemann::Babbler::La
-  include Riemann::Babbler
+class Riemann::Babbler::La < Riemann::Babbler
 
   def collect
   { 

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

@@ -1,5 +1,4 @@
-class Riemann::Babbler::Memory
-  include Riemann::Babbler
+class Riemann::Babbler::Memory < Riemann::Babbler
 
   def memory
     m = File.read('/proc/meminfo').split(/\n/).inject({}) { |info, line|

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

@@ -1,23 +1,30 @@
-class Riemann::Babbler::Net
-  include Riemann::Babbler
+class Riemann::Babbler::Net < Riemann::Babbler
 
   WORDS = ['rx bytes',
-    'rx packets',
-    'rx errs',
-    'rx drop',
-    'rx fifo',
-    'rx frame',
-    'rx compressed',
-    'rx multicast',
-    'tx bytes',
-    'tx packets',
-    'tx drops',
-    'tx fifo',
-    'tx colls',
-    'tx carrier',
-    'tx compressed']
+           'rx packets',
+           'rx errs',
+           'rx drop',
+           'rx fifo',
+           'rx frame',
+           'rx compressed',
+           'rx multicast',
+           'tx bytes',
+           'tx packets',
+           'tx drops',
+           'tx fifo',
+           'tx colls',
+           'tx carrier',
+           'tx compressed']
 
-  def collect
+  def plugin
+    options.plugins.net
+  end
+
+  def init
+    @old_status = Hash.new
+  end
+
+  def net
     f = File.read('/proc/net/dev')
     status = Hash.new
     f.split("\n").each do |line|
@@ -35,5 +42,16 @@ class Riemann::Babbler::Net
     status
   end
 
-end
+  def tick
+    status = net
+    status.each_key do |service|
+      #next if status[service] == 0
+      report({
+        :service => service,
+        :metric => status[service],
+        :is_diff => true
+      })
+    end
+  end
 
+end

data/lib/riemann/version.rb

@@ -1,5 +1,5 @@
 module Riemann
-  module Babbler
-    VERSION = '0.3.1'
+  class Babbler
+    VERSION = '0.3.3'
   end
 end

data/riemann-babbler.gemspec

@@ -15,7 +15,6 @@ Gem::Specification.new do |s|
   s.add_dependency('configatron')
   s.add_dependency('logger')
   s.add_dependency('trollop')
-  s.add_dependency('parallel') 
   s.add_dependency('sys-filesystem')
   s.add_dependency('rest-client')
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: riemann-babbler
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.3
   prerelease: 
 platform: ruby
 authors:
@@ -75,22 +75,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: parallel
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: sys-filesystem
   requirement: !ruby/object:Gem::Requirement
@@ -161,6 +145,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 1972461691726905926
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -174,4 +161,3 @@ signing_key:
 specification_version: 3
 summary: Riemann health cheker.
 test_files: []
-has_rdoc: