kurchatov 0.0.5.pre5 → 0.0.5

data/examples/status_file.rb

@@ -6,9 +6,9 @@ default[:service] = 'check state file'
 collect do
   content = File.read(plugin.file).split("\n").delete_if { |x| x.strip.empty? }
   event(
-    :service     => "#{plugin.service} #{plugin.file}",
-    :description => content.last(plugin.report_lines).join("\n"),
-    :metric      => content.count,
-    :critical    => 1
+      :service => "#{plugin.service} #{plugin.file}",
+      :description => content.last(plugin.report_lines).join("\n"),
+      :metric => content.count,
+      :critical => 1
   )
 end

data/examples/tw_cli.rb

@@ -9,9 +9,9 @@ end
 
 collect do
   event(
-    :service     => 'twcli',
-    :metric      => shell(plugin.cmd).to_i,
-    :description => 'Hardware raid tw_cli status',
-    :critical    => 1 
+      :service => 'twcli',
+      :metric => shell(plugin.cmd).to_i,
+      :description => 'Hardware raid tw_cli status',
+      :critical => 1
   )
 end

data/examples/uptime.rb

@@ -1,14 +1,14 @@
 interval 60
 always_start true
 
-collect :os => "linux" do
+collect :os => 'linux' do
   event(
-    :metric => File.read('/proc/uptime').split(' ').first.to_f
+      :metric => File.read('/proc/uptime').split(' ').first.to_f
   )
 end
 
-collect :os => "darwin" do
+collect :os => 'darwin' do
   event(
-    :metric => shell("sysctl -n kern.boottime | awk '{print $4}'").to_f
+      :metric => shell("sysctl -n kern.boottime | awk '{print $4}'").to_f
   )
 end

data/kurchatov.gemspec

@@ -4,25 +4,26 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'kurchatov/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "kurchatov"
-  spec.version       = Kurchatov::VERSION
-  spec.authors       = ["Vasiliev Dmitry"]
-  spec.email         = ["vadv.mkn@gmail.com"]
-  spec.summary       = %q{Gem for monitoring with riemann.}
-  spec.description   = %q{Gem for monitoring with riemann.}
-  spec.homepage      = "https://github.com/vadv/kurchatov"
-  spec.license       = "MIT"
+  spec.name = 'kurchatov'
+  spec.version = Kurchatov::VERSION
+  spec.authors = ['Vasiliev Dmitry']
+  spec.email = ['vadv.mkn@gmail.com']
+  spec.summary = %q{Gem for monitoring with riemann.}
+  spec.description = %q{Gem for monitoring with riemann.}
+  spec.homepage = 'https://github.com/vadv/kurchatov'
+  spec.license = 'MIT'
 
-  spec.files         = `git ls-files -z`.split("\x0")
-  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
-  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ["lib"]
+  spec.files = `git ls-files -z`.split("\x0")
+  spec.executables = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  spec.test_files = spec.files.grep(%r{^(test|spec|features)/})
+  spec.require_paths = ['lib']
 
-  spec.add_dependency "beefcake", ">= 0.3.5"
-  spec.add_dependency "ohai", ">= 6.20.0"
+  spec.add_dependency 'beefcake', '>= 0.3.5'
+  spec.add_dependency 'ohai', '>= 6.20.0'
 
-  spec.add_development_dependency "bundler", "~> 1.5"
-  spec.add_development_dependency "rake"
-  spec.add_development_dependency "pry"
-  spec.add_development_dependency "ruby-prof"
+  spec.add_development_dependency 'bundler', '~> 1.5'
+  spec.add_development_dependency 'rake'
+  spec.add_development_dependency 'rspec'
+  spec.add_development_dependency 'pry'
+  spec.add_development_dependency 'ruby-prof'
 end

data/lib/kurchatov/application.rb

@@ -1,100 +1,100 @@
 # encoding: utf-8
 
-require "ohai/system"
-require "mixlib/cli"
-require "kurchatov/version"
-require "kurchatov/config"
-require "kurchatov/log"
-require "kurchatov/mixin/init"
-require "kurchatov/plugin/config"
-require "kurchatov/responders/init"
-require "kurchatov/monitor"
+require 'ohai/system'
+require 'mixlib/cli'
+require 'kurchatov/version'
+require 'kurchatov/config'
+require 'kurchatov/log'
+require 'kurchatov/mixin/init'
+require 'kurchatov/plugin/config'
+require 'kurchatov/responders/init'
+require 'kurchatov/monitor'
 
 module Kurchatov
-  class Aplication
+  class Application
     include Mixlib::CLI
     include Kurchatov::Mixin::Ohai
 
     option :help,
-      :short        => "-h",
-      :long         => "--help",
-      :description  => "Show this message",
-      :on           => :tail,
-      :boolean      => true,
-      :show_options => true,
-      :exit         => 1
+           :short => '-h',
+           :long => '--help',
+           :description => 'Show this message',
+           :on => :tail,
+           :boolean => true,
+           :show_options => true,
+           :exit => 1
 
     option :version,
-      :short        => "-v",
-      :long         => "--version",
-      :description  => "Show version",
-      :boolean      => true,
-      :proc         => lambda {|v| puts "Kurchatov: #{Kurchatov::VERSION}"},
-      :exit         => 0
+           :short => '-v',
+           :long => '--version',
+           :description => 'Show version',
+           :boolean => true,
+           :proc => lambda { |v| puts "Kurchatov: #{Kurchatov::VERSION}" },
+           :exit => 0
 
     option :log_level,
-      :short        => "-l LEVEL",
-      :long         => "--log_level LEVEL",
-      :description  => "Set the log level (debug, info, warn, error, fatal)",
-      :proc         => lambda {|l| l.to_sym}
+           :short => '-l LEVEL',
+           :long => '--log_level LEVEL',
+           :description => 'Set the log level (debug, info, warn, error, fatal)',
+           :proc => lambda { |l| l.to_sym }
 
     option :log_location,
-      :short        => "-L LOGLOCATION",
-      :long         => "--logfile LOGLOCATION",
-      :description  => "Set the log file location"
+           :short => '-L LOGLOCATION',
+           :long => '--logfile LOGLOCATION',
+           :description => 'Set the log file location'
 
     option :test_plugin,
-      :short        => "-T FILE",
-      :long         => "--test-plugin FILE",
-      :description  => "Test plugin"
+           :short => '-T FILE',
+           :long => '--test-plugin FILE',
+           :description => 'Test plugin'
 
     option :config_file,
-      :short        => "-c FILE",
-      :long         => "--config FILE",
-      :description  => "Config file"
+           :short => '-c FILE',
+           :long => '--config FILE',
+           :description => 'Config file'
 
     option :plugin_paths,
-      :short        => "-d DIR1,DIR2",
-      :long         => "--plugins DIR1,DIR2",
-      :description  => "Plugin directories",
-      :proc         => lambda {|l| l.split(',') }
+           :short => '-d DIR1,DIR2',
+           :long => '--plugins DIR1,DIR2',
+           :description => 'Plugin directories',
+           :proc => lambda { |l| l.split(',') }
 
     option :ohai_plugins_paths,
-      :short        => "-o DIR1,DIR2",
-      :long         => "--ohai--plugins DIR1,DIR2",
-      :description  => "Plugin directories",
-      :proc         => lambda {|l| l.split(',') }
+           :short => '-o DIR1,DIR2',
+           :long => '--ohai--plugins DIR1,DIR2',
+           :description => 'Plugin directories',
+           :proc => lambda { |l| l.split(',') }
 
     option :host,
-      :long         => "--host HOSTNAME",
-      :description  => "Set hostname for events",
-      :proc         => lambda {|l| l.split(',') }
+           :long => '--host HOSTNAME',
+           :description => 'Set hostname for events',
+           :proc => lambda { |l| l.split(',') }
 
     option :tags,
-      :short        => "-t tag1,tag2,tag3",
-      :long         => "--tags tag1,tag2,tag3",
-      :description  => "Set tags for events",
-      :proc         => lambda {|l| l.split(',') }
+           :short => '-t tag1,tag2,tag3',
+           :long => '--tags tag1,tag2,tag3',
+           :description => 'Set tags for events',
+           :proc => lambda { |l| l.split(',') }
 
     option :riemann_responder,
-      :short        => "-H HOST1,HOST2:55655",
-      :long         => "--hosts HOST1,HOST2:55655",
-      :description  => "Set riemann hosts for send events",
-      :proc         => lambda {|l| l.split(',') }
+           :short => '-H HOST1,HOST2:55655',
+           :long => '--hosts HOST1,HOST2:55655',
+           :description => 'Set riemann hosts for send events',
+           :proc => lambda { |l| l.split(',') }
 
     option :http_responder,
-      :long         => "--http 0.0.0.0:55755",
-      :description  => "Set http responder for information"
+           :long => '--http 0.0.0.0:55755',
+           :description => 'Set http responder for information'
 
     option :udp_responder,
-      :long         => "--udp 0.0.0.0:55955",
-      :description  => "Set udp responder for information"
+           :long => '--udp 0.0.0.0:55955',
+           :description => 'Set udp responder for information'
 
     option :stop_on_error,
-      :long         => "--stop-on-error",
-      :description  => "Stop on plugin or connection problem",
-      :boolean      => true,
-      :proc         => lambda {|l| !!l }
+           :long => '--stop-on-error',
+           :description => 'Stop on plugin or connection problem',
+           :boolean => true,
+           :proc => lambda { |l| !!l }
 
     def configure_opts
       @attributes = parse_options
@@ -108,7 +108,7 @@ module Kurchatov
     end
 
     def configure_defaults
-      ::Ohai::Config[:plugin_path] = [ File.expand_path(File.join('..', 'ohai', 'plugins'), File.dirname(__FILE__)) ]
+      ::Ohai::Config[:plugin_path] = [File.expand_path(File.join('..', 'ohai', 'plugins'), File.dirname(__FILE__))]
       if Config[:ohai_plugins_paths]
         ::Ohai::Config[:plugin_path] += Config[:ohai_plugins_paths]
       end
@@ -117,26 +117,25 @@ module Kurchatov
 
     def configure_responders
       return if Config[:test_plugin]
-      Log.error("Please set riemann host") and exit Config[:ERROR_CONFIG] unless 
-        Config[:riemann_responder]
+      Log.error('Please set riemann host') and exit Config[:ERROR_CONFIG] unless Config[:riemann_responder]
       if Config[:udp_responder]
-        @monitor << Responders::Udp.new( Config[:udp_responder] )
+        @monitor << Responders::Udp.new(Config[:udp_responder])
       end
       if Config[:http_responder]
-        @monitor << Responders::Http.new( Config[:http_responder] )
+        @monitor << Responders::Http.new(Config[:http_responder])
       end
-      @monitor << Responders::Riemann.new( Config[:riemann_responder] )
-    end 
+      @monitor << Responders::Riemann.new(Config[:riemann_responder])
+    end
 
     def configure_plugins
       return if Config[:test_plugin]
-      plugins = Kurchatov::Plugins::Config.load_plugins(Config[:plugin_paths], 
+      plugins = Kurchatov::Plugins::Config.load_plugins(Config[:plugin_paths],
                                                         Config[:config_file])
-      plugins.each {|p| @monitor << p }
+      plugins.each { |p| @monitor << p }
     end
 
     def configure_test_plugin
-      return if !Config[:test_plugin]
+      return unless Config[:test_plugin]
       @monitor << Kurchatov::Plugins::DSL.load_riemann_plugin(Config[:test_plugin])
     end
 
@@ -150,6 +149,6 @@ module Kurchatov
       configure_test_plugin
       @monitor.run
     end
-    
+
   end
 end

data/lib/kurchatov/mashie.rb

@@ -5,14 +5,16 @@ class Mashie < Hash
     default ? super(default) : super(&blk)
   end
 
-  class << self; alias [] new; end
+  class << self;
+    alias [] new;
+  end
 
   def id #:nodoc:
-    self["id"]
+    self['id']
   end
 
   def type #:nodoc:
-    self["type"]
+    self['type']
   end
 
   alias_method :regular_reader, :[]
@@ -24,7 +26,7 @@ class Mashie < Hash
     value
   end
 
-  def custom_writer(key,value) #:nodoc:
+  def custom_writer(key, value) #:nodoc:
     regular_writer(convert_key(key), convert_value(value))
   end
 
@@ -63,6 +65,7 @@ class Mashie < Hash
   def key?(key)
     super(convert_key(key))
   end
+
   alias_method :has_key?, :key?
   alias_method :include?, :key?
   alias_method :member?, :key?
@@ -70,10 +73,11 @@ class Mashie < Hash
   def deep_merge(other_hash, &blk)
     dup.deep_update(other_hash, &blk)
   end
+
   alias_method :merge, :deep_merge
 
   def deep_update(other_hash, &blk)
-    other_hash.each_pair do |k,v|
+    other_hash.each_pair do |k, v|
       key = convert_key(k)
       if regular_reader(key).is_a?(Mash) and v.is_a?(::Hash)
         custom_reader(key).deep_update(v, &blk)
@@ -85,6 +89,7 @@ class Mashie < Hash
     end
     self
   end
+
   alias_method :deep_merge!, :deep_update
   alias_method :update, :deep_update
   alias_method :merge!, :update
@@ -94,7 +99,7 @@ class Mashie < Hash
   end
 
   def shallow_update(other_hash)
-    other_hash.each_pair do |k,v|
+    other_hash.each_pair do |k, v|
       regular_writer(convert_key(k), convert_value(v, true))
     end
     self
@@ -115,16 +120,16 @@ class Mashie < Hash
     return self.[](method_name, &blk) if key?(method_name)
     match = method_name.to_s.match(/(.*?)([?=!_]?)$/)
     case match[2]
-    when "="
-      self[match[1]] = args.first
-    when "?"
-      !!self[match[1]]
-    when "!"
-      initializing_reader(match[1])
-    when "_"
-      underbang_reader(match[1])
-    else
-      default(method_name, *args, &blk)
+      when '='
+        self[match[1]] = args.first
+      when '?'
+        !!self[match[1]]
+      when '!'
+        initializing_reader(match[1])
+      when '_'
+        underbang_reader(match[1])
+      else
+        default(method_name, *args, &blk)
     end
   end
 
@@ -136,17 +141,17 @@ class Mashie < Hash
 
   def convert_value(val, duping=false) #:nodoc:
     case val
-    when self.class
-      val.dup
-    when Hash
-      duping ? val.dup : val
-    when ::Hash
-      val = val.dup if duping
-      self.class.new(val)
-    when Array
-      val.collect{ |e| convert_value(e) }
-    else
-      val
+      when self.class
+        val.dup
+      when Hash
+        duping ? val.dup : val
+      when ::Hash
+        val = val.dup if duping
+        self.class.new(val)
+      when Array
+        val.collect { |e| convert_value(e) }
+      else
+        val
     end
   end
 end

data/lib/kurchatov/mixin/command.rb

@@ -19,11 +19,6 @@ module Kurchatov
         mix.stdout
       end
 
-      def print_unix_mem_info
-        pid, size = `ps ax -o pid,rss | grep -E "^[[:space:]]*#{$$}"`.strip.split.map(&:to_i)
-        puts "Pid: #{pid}, memusage: #{size}"
-      end
-
     end
   end
 end

data/lib/kurchatov/mixin/event.rb

@@ -2,20 +2,22 @@ module Kurchatov
   module Mixin
     module Event
 
+      include Kurchatov::Mixin::Queue
+
       EVENT_FIELDS = [
-        :time, :state, :service, :host,
-        :description, :tags, :ttl, :metric
+          :time, :state, :service, :host,
+          :description, :tags, :ttl, :metric
       ]
 
       def event(hash = {})
         Log.info("Mock message for test plugin: #{hash.inspect}") if Kurchatov::Config[:test_plugin]
-        return unless normilize_event(hash)
+        return unless normalize_event(hash)
         events << hash
       end
 
       protected
 
-      def normilize_event(hash = {})
+      def normalize_event(hash = {})
         hash[:description] = hash[:desc] if hash[:description].nil? && hash[:desc]
         if hash[:metric].kind_of?(Float)
           hash[:metric] = 0.0 if hash[:metric].nan?
@@ -24,7 +26,7 @@ module Kurchatov
         set_diff_metric(hash)
         set_event_state(hash)
         return false if hash[:miss]
-        hash.each {|k,_| hash.delete(k) unless EVENT_FIELDS.include?(k)}
+        hash.each { |k, _| hash.delete(k) unless EVENT_FIELDS.include?(k) }
         hash[:service] ||= name
         hash[:tags] ||= Kurchatov::Config[:tags]
         hash[:host] ||= Kurchatov::Config[:host]

data/lib/kurchatov/mixin/http.rb

@@ -1,5 +1,5 @@
-require "open-uri"
-require "yajl/json_gem"
+require 'open-uri'
+require 'yajl/json_gem'
 
 module Kurchatov
   module Mixin
@@ -16,6 +16,6 @@ module Kurchatov
         end
       end
 
-    end 
-  end 
+    end
+  end
 end

data/lib/kurchatov/mixin/init.rb

@@ -1,5 +1,5 @@
-require_relative "command"
-require_relative "http"
-require_relative "ohai"
-require_relative "queue"
-require_relative "event"
+require_relative 'command'
+require_relative 'http'
+require_relative 'ohai'
+require_relative 'queue'
+require_relative 'event'

data/lib/kurchatov/mixin/ohai.rb

@@ -3,18 +3,26 @@ module Kurchatov
   module Ohai
     def self.data
       @ohai ||= ::Ohai::System.new
-      Log.info("Load ohai plugins")
-      @ohai.all_plugins
+      @mutex ||= Mutex.new
+      @mutex.synchronize do
+        Log.info('Load ohai plugins')
+        @ohai.all_plugins
+      end
       @ohai.data
     end
   end
 
   module Mixin
     module Ohai
-      class << self; attr_accessor :ohai_instance; end
+
+      class << self;
+        attr_accessor :ohai_instance;
+      end
+
       def ohai
         @ohai_instance ||= Kurchatov::Mixin::Ohai.ohai_instance ||= Kurchatov::Ohai.data
       end
+
     end
   end
 

data/lib/kurchatov/mixin/queue.rb

@@ -1,14 +1,17 @@
-# encoding: utf-8
-
-require "kurchatov/queue"
+require 'kurchatov/queue'
 
 module Kurchatov
   module Mixin
     module Queue
-      class << self; attr_accessor :instance_queue end
+
+      class << self;
+        attr_accessor :instance_queue
+      end
+
       def events
         @instance_queue ||= Kurchatov::Mixin::Queue.instance_queue ||= Kurchatov::Queue.new
       end
+
     end
   end
 end

data/lib/kurchatov/plugin/config.rb

@@ -1,17 +1,18 @@
-require "kurchatov/plugin/riemann"
-require "kurchatov/plugin/dsl"
-require "yaml"
+require 'kurchatov/plugin/riemann'
+require 'kurchatov/plugin/dsl'
+require 'yaml'
 
 module Kurchatov
   module Plugins
     module Config
 
       def self.find_plugin(name, array)
-        array.find {|p| p.name == name }
+        array.find { |p| p.name == name }
       end
 
       def self.load_plugins(plugins_path, config_file)
-        Log.error("Config file #{config_file} not found") and exit Kurchatov::Config[:ERROR_CONFIG] unless File.exists?(config_file)
+        Log.error("Config file #{config_file} not found") and
+            exit(Kurchatov::Config[:ERROR_CONFIG]) unless File.exists?(config_file)
         @all_plugins = Kurchatov::Plugins::DSL.load_riemann_plugins(plugins_path)
         @all_names = Array.new
         @plugins_to_run = Array.new
@@ -55,12 +56,12 @@ module Kurchatov
         @all_plugins.each do |p|
           unless p.always_start || @all_names.include?(p.name)
             Log.info("Plugin '#{p.name}' not started, because it " +
-                                "not 'always_start' and not in config file")
+                         "not 'always_start' and not in config file")
             next
           end
           @plugins_to_run << p if p.runnable_by_config?
         end
-        Log.debug("Plugins to start: #{@plugins_to_run.inspect}")
+        Log.info("Start plugins: #{@plugins_to_run.inspect}")
         @plugins_to_run
       end
 

data/lib/kurchatov/plugin/dsl.rb

@@ -49,6 +49,7 @@ module Kurchatov
       def last_plugin
         last.plugin
       end
+
       alias :default :last_plugin
 
 
@@ -57,7 +58,8 @@ module Kurchatov
       def self.load_riemann_plugins(paths)
         dsl = Kurchatov::Plugins::DSL.new
         paths.map do |path|
-          Log.error("Directory #{path} not exists") and exit Kurchatov::Config[:ERROR_CONFIG] unless File.directory? path 
+          Log.error("Directory #{path} not exists") and exit Kurchatov::Config[:ERROR_CONFIG] unless
+            File.directory?(path) 
           Dir[File.join(path, "*#{PLUGIN_EXT}")].sort
         end.flatten.each do |path|
           begin