malevich 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e70253bb89c1f108af088c3c442e0ef69049db6e
-  data.tar.gz: ff956877ab483fd1c4e4a0473a92a5d8a9380f12
+  metadata.gz: 325d8a8c4611108b8280d60ae54db8be295f4e18
+  data.tar.gz: c260c8bb5f244505a138a1235f5b873d85eee541
 SHA512:
-  metadata.gz: 04603ae1935fee81416cc6860c5f288facf3144f79a4d53bc6983a04ccdd7f935f5341f6ad5d65b73749e2d481b17c541c419ed9d73492385534d4511affcc22
-  data.tar.gz: ef094efa3de57927a2b9e0a641b440faea651c67ec2cbec3139a3c44053864f676bf726983f3eb3741bcad9d57635ce2a6f5b41f313e979e5b4e6bb5d46e6eb4
+  metadata.gz: 08feb43a589b177bcbf1070807987cb1050b9032f9420a4f7b3e57f022d6e5d9c48d05340192942a4087f4f364294336c792a15fb8cb4be430d552a684102ce2
+  data.tar.gz: 59c067fbd61348d2a1972fbde4e66c15cc28d8d5e0c9ee957e70d62b8f09365dfb5722dfe1fd176414bf8cdb7db67d30fda02184d8eef0b6ab8fd2fcde1523e7

data/bin/malevich

@@ -26,10 +26,11 @@ where [options] are:
   opt :'http-responder', 'Bind http api', :short => '-h', :default => '0.0.0.0:55755'
   opt :'udp-responder', 'Bind udp api', :short => '-u', :default => '127.0.0.1:55955'
   opt :'test', 'Test plugin file', :type => :string
+  opt :'profiling', 'Profiling ruby', :default => false
 end
 
+include Malevich::Mixin
 malevich.cmd.deep_merge!(cmd)
-#malevich.cmd[:pwd] = Dir.pwd
 malevich.log_level = cmd[:'log-level']
 malevich.test_plugin(cmd[:'test'])
 malevich.load_plugins(cmd[:'plugins'], cmd[:'config'])

data/example/cpu.rb

@@ -15,13 +15,13 @@ collect 'linux' do
     _, u2, n2, s2, i2 = [$1, $2, $3, $4, $5].map { |e| e.to_i }
     unless @old_cpu[cpu_number].nil?
       u1, n1, s1, i1 = @old_cpu[cpu_number]
-      used           = (u2+n2+s2) - (u1+n1+s1)
-      total          = used + i2-i1
-      fraction       = used.to_f / total
+      used = (u2+n2+s2) - (u1+n1+s1)
+      total = used + i2-i1
+      fraction = used.to_f / total
     end
     @old_cpu[cpu_number] = [u2, n2, s2, i2]
-    service              = "cpu usage cpu#{cpu_number}"
-    description          = "Cpu#{cpu_number} usage"
+    service = "cpu usage cpu#{cpu_number}"
+    description = "Cpu#{cpu_number} usage"
     if cpu_number == '_total'
       event(:service => service, :metric => fraction, :description => description)
     else

data/example/disk.rb

@@ -41,7 +41,7 @@ collect 'linux' do
   end
 
   get_monit_points_for_size.each do |point|
-    point_stat  = Sys::Filesystem.stat(point)
+    point_stat = Sys::Filesystem.stat(point)
     human_point = point == '/' ? '/root' : point
     human_point = human_point.gsub(/^\//, '').gsub(/\//, '_')
     event(:service => "disk #{human_point} % block", :description => "Disk usage #{point}, %", :metric => (1- point_stat.blocks_available.to_f/point_stat.blocks).round(2) * 100) unless point_stat.blocks == 0

data/example/disk_stat.rb

@@ -1,11 +1,11 @@
 always_start true
 interval 60
 
-settings :words, [ 'reads reqs', 'reads merged', 'reads sector', 'reads time',
-                     'writes reqs', 'writes merged', 'writes sector', 'writes time',
-                     'io reqs', 'io time', 'io weighted' ]
+settings :words, ['reads reqs', 'reads merged', 'reads sector', 'reads time',
+                  'writes reqs', 'writes merged', 'writes sector', 'writes time',
+                  'io reqs', 'io time', 'io weighted']
 
-settings :filter, [ 'reads reqs', 'writes reqs' ] 
+settings :filter, ['reads reqs', 'writes reqs']
 
 run_if 'linux' do
   File.exists? '/proc/diskstats'
@@ -15,7 +15,7 @@ collect 'linux' do
   f = File.read('/proc/diskstats')
   f.split("\n").reject { |d| d =~ /(ram|loop)/ }.inject({}) do |_, line|
     if line =~ /^(?:\s+\d+){2}\s+([\w\d]+) (.*)$/
-      dev    = $1
+      dev = $1
       values = $2.split(/\s+/).map { |str| str.to_i }
       next if !!(dev.match /\d+$/ || !(dev.match =~ /^xvd/))
       settings.filter.each do |filter|

data/example/dns_check.rb

@@ -2,6 +2,6 @@ interval 60
 
 collect 'linux', 'mac_os_x' do
   event(
-    :state => Resolv::DNS.new.getresources(ohai[:fqdn], Resolv::DNS::Resource::IN::A).count == 1, 
-    :description => 'Check resolv self FQDN')
+      :state => Resolv::DNS.new.getresources(ohai[:fqdn], Resolv::DNS::Resource::IN::A).count == 1,
+      :description => 'Check resolv self FQDN')
 end

data/example/exim.rb

@@ -10,6 +10,6 @@ run_if do
 end
 
 collect do
-  event(:service     => 'exim', :metric => shell(settings.exim, ' -bpc').to_i,
+  event(:service => 'exim', :metric => shell(settings.exim, ' -bpc').to_i,
         :description => 'Exim: count frozen mails')
 end

data/example/find_files.rb

@@ -9,7 +9,7 @@ settings :age, 24 * 60 * 60
 collect do
   if File.directory?(settings.dir)
     count_files = 0
-    file_mask   = Regexp.new(settings.file_mask)
+    file_mask = Regexp.new(settings.file_mask)
     Find.find(settings.dir).each do |file|
       next unless File.file? file
       next unless file_mask.match file

data/example/http.rb

@@ -14,9 +14,9 @@ collect 'linux', 'mac_os_x' do
 
   @cmd ||= begin
     "curl -X#{settings.http_method} -s --connect-timeout #{settings.connect_timeout}" +
-      " #{'--insecure' if settings.insecure} " +
-      " -w '%{http_code}\\n' --retry #{settings.retry} --retry-delay #{settings.retry_delay}" +
-      " --max-time #{settings.max_time} --fail #{settings.url} -o /dev/null"
+        " #{'--insecure' if settings.insecure} " +
+        " -w '%{http_code}\\n' --retry #{settings.retry} --retry-delay #{settings.retry_delay}" +
+        " --max-time #{settings.max_time} --fail #{settings.url} -o /dev/null"
   end
 
   out = shell_out(@cmd).stdout.to_i

data/example/iptables.rb

@@ -20,8 +20,8 @@ collect 'linux' do
   end.compact.join("\n")
 
   event(
-    :service     => "iptables #{settings.rule_file}",
-    :state       => current_rules == saved_rules,
-    :description => "iptables rules different between file: #{settings.rule_file} and iptables-save"
+      :service => "iptables #{settings.rule_file}",
+      :state => current_rules == saved_rules,
+      :description => "iptables rules different between file: #{settings.rule_file} and iptables-save"
   )
 end

data/example/la.rb

@@ -6,16 +6,16 @@ state :critical, 50
 
 collect 'mac_os_x' do
   event(
-    :metric      => shell("sysctl -n vm.loadavg | awk '{print $2}'").to_f,
-    :description => 'LA averaged over 1 minute',
-    :service     => 'la la_1'
+      :metric => shell("sysctl -n vm.loadavg | awk '{print $2}'").to_f,
+      :description => 'LA averaged over 1 minute',
+      :service => 'la la_1'
   )
 end
 
 collect 'linux' do
   event(
-    :metric      => File.read('/proc/loadavg').scan(/[\d\.]+/)[0].to_f,
-    :description => 'LA averaged over 1 minute',
-    :service     => 'la la_1'
+      :metric => File.read('/proc/loadavg').scan(/[\d\.]+/)[0].to_f,
+      :description => 'LA averaged over 1 minute',
+      :service => 'la la_1'
   )
 end

data/example/mdadm.rb

@@ -34,7 +34,7 @@ collect 'linux' do
   mdstat = File.read('/proc/mdstat').split("\n")
   mdstat.each_with_index do |line, index|
     next unless line.include?('blocks')
-    device   = file[index-1].split(':')[0].strip
+    device = file[index-1].split(':')[0].strip
     mdstatus = rm_bracket(line.split(' ').last) # UUU
     next if status_well?(mdstatus) # пропускаем все збс
     next if mdstatus == settings.states.send(device).to_s # disabled in config

data/example/memory.rb

@@ -6,18 +6,18 @@ warning 85
 
 collect 'linux' do
   m = File.read('/proc/meminfo').split(/\n/).inject({}) do |info, line|
-    x          = line.split(/:?\s+/)
+    x = line.split(/:?\s+/)
     info[x[0]] = x[1].to_i
     info
   end
 
-  free          = m['MemFree'].to_i * 1024
-  cached        = m['Cached'].to_i * 1024
-  buffers       = m['Buffers'].to_i * 1024
-  total         = m['MemTotal'].to_i * 1024
-  used          = total - free
-  free_bc       = free + buffers + cached
-  fraction      = 1 - (free_bc.to_f / total)
+  free = m['MemFree'].to_i * 1024
+  cached = m['Cached'].to_i * 1024
+  buffers = m['Buffers'].to_i * 1024
+  total = m['MemTotal'].to_i * 1024
+  used = total - free
+  free_bc = free + buffers + cached
+  fraction = 1 - (free_bc.to_f / total)
   swap_fraction = m['SwapTotal'] == 0 ? 0 : 1 - m['SwapFree'].to_f/m['SwapTotal']
 
   event(:service => 'memory % free', :description => 'Memory usage, %', :metric => fraction.round(2) * 100)

data/example/net.rb

@@ -2,10 +2,10 @@ interval 60
 always_start true
 
 settings :include_alias, false
-settings :filter, [ 'rx bytes', 'rx errs', 'rx drop', 'tx bytes', 'tx errs', 'tx drop' ]
-settings :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' ] 
+settings :filter, ['rx bytes', 'rx errs', 'rx drop', 'tx bytes', 'tx errs', 'tx drop']
+settings :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']
 
 collect 'linux' do
   File.read('/proc/net/dev').each_line do |line|
@@ -16,7 +16,7 @@ collect 'linux' do
     settings.words.map do |service|
       service
     end.zip(
-      $2.split(/\s+/).map { |str| str.to_i }
+        $2.split(/\s+/).map { |str| str.to_i }
     ).each do |service, value|
       next unless settings.filter.include? service
       event(:service => "net #{iface} #{service}", :metric => value.to_f/interval, :diff => true)

data/example/net_stat.rb

@@ -12,14 +12,14 @@ collect 'linux' do
     end
   end
   filter += " \\) and not dst 127.0.0.1:*"
-  cmd    = 'ss -t -4 -n state established ' + filter + ' | wc -l'
+  cmd = 'ss -t -4 -n state established ' + filter + ' | wc -l'
 
   count = shell!(cmd).to_i - 1
 
   event(
-    :service     => "netstat tcp #{settings.ports.join(', ')}",
-    :metric      => count,
-    :description => "count established connects: #{count} to ports #{settings.ports.join(', ')}"
+      :service => "netstat tcp #{settings.ports.join(', ')}",
+      :metric => count,
+      :description => "count established connects: #{count} to ports #{settings.ports.join(', ')}"
   )
 
 end

data/example/ntp.rb

@@ -8,8 +8,8 @@ settings :timeout, 30
 
 collect 'linux', 'mac_os_x' do
   event(
-    :service     => "ntp #{settings.host}",
-    :description => "Ntp lag with host #{settings.host}",
-    :metric      => (::Net::NTP.get(plugin.host, 'ntp', settings.timeout).time.to_f - Time.now.to_f).abs
+      :service => "ntp #{settings.host}",
+      :description => "Ntp lag with host #{settings.host}",
+      :metric => (::Net::NTP.get(plugin.host, 'ntp', settings.timeout).time.to_f - Time.now.to_f).abs
   )
 end

data/example/pgsql.rb

@@ -31,10 +31,10 @@ collect 'linux' do
   def run_master_sql
     run_sql("create database #{settings.db4monit}") unless db4monit_exists?
     run_sql(
-      "drop table if exists timestamp; \
+        "drop table if exists timestamp; \
       create table timestamp ( id int primary key, value timestamp default now() ); \
       insert into timestamp (id) values (1); \
-          ", settings.db4monit)
+        ", settings.db4monit)
   end
 
   def repl_lag

data/example/runit.rb

@@ -28,7 +28,7 @@ collect 'linux' do
   Dir.glob('/etc/service/*').each do |srv|
     srv_uptime = uptime(srv)
     srv_runned = runned?(srv)
-    srv_name   = human_srv(srv)
+    srv_name = human_srv(srv)
 
     # сервис запущен и работает дольше чем мы приходили к нему в прошлый раз
     if srv_runned && srv_uptime > interval

data/example/status_file.rb

@@ -10,8 +10,8 @@ critical 1
 collect 'linux' do
   content = File.read(settings.file).split("\n").delete_if { |x| x.strip.empty? }
   event(
-    :service     => "#{settings.service} #{settings.file}",
-    :description => content.last(settings.report_lines).join("\n"),
-    :metric      => content.count
+      :service => "#{settings.service} #{settings.file}",
+      :description => content.last(settings.report_lines).join("\n"),
+      :metric => content.count
   )
 end

data/example/tw_cli.rb

@@ -10,8 +10,8 @@ end
 
 collect 'linux' do
   event(
-    :service     => 'twcli',
-    :metric      => shell!(settings.cmd).to_i,
-    :description => 'Hardware raid tw_cli status'
+      :service => 'twcli',
+      :metric => shell!(settings.cmd).to_i,
+      :description => 'Hardware raid tw_cli status'
   )
 end

data/lib/malevich/dsl.rb

@@ -16,6 +16,7 @@ module Malevich
     def always_start(val)
       plugins.last.always_start = !!val
     end
+
     alias :auto :always_start
     alias :auto_start :always_start
 
@@ -27,21 +28,25 @@ module Malevich
     def state(attr, val)
       plugins.last.settings[attr] = val
     end
+
     alias :states :state
 
     def critical(val)
       plugins.last.settings[:critical] = val
     end
+
     alias :critical= :critical
 
     def warning(val)
       plugins.last.settings[:warning] = val
     end
+
     alias :warning= :warning
 
     def settings(attr, val)
       plugins.last.settings[attr] = val
     end
+
     alias :config :settings
     alias :defaults :settings
     alias :plugin :settings

data/lib/malevich/init.rb

@@ -14,4 +14,3 @@ require 'malevich/plugin'
 require 'malevich/monitor'
 require 'malevich/loader'
 require 'malevich/responders/init'
-

data/lib/malevich/loader.rb

@@ -2,7 +2,7 @@ module Malevich
   module Loader
 
     def load_responders
-      Malevich::Responder.constants.select  do |c|
+      Malevich::Responder.constants.select do |c|
         next unless Class === Malevich::Responder.const_get(c)
         monitor << Malevich::Responder.const_get(c).new
       end
@@ -11,7 +11,7 @@ module Malevich
     def load_plugins(plugin_path, config_file)
 
       def find_plugin(name)
-        @all_plugins.find {|p| p.name == name}
+        @all_plugins.find { |p| p.name == name }
       end
 
       @all_plugins = Malevich::DSL.load(plugin_path)
@@ -29,7 +29,7 @@ module Malevich
             Kernel::log :error, "Unable to find parent plugin for #{name}"
             next
           end
-          val.each_with_index do |p_settings, i| 
+          val.each_with_index do |p_settings, i|
             child = parent.dup
             child.name = "#{name}_#{i}"
             child.settings.deep_merge!(parent.settings.dup)
@@ -39,7 +39,7 @@ module Malevich
           end
           # delete parent plugin
           @all_plugins.delete(parent)
-          next 
+          next
         end
 
         # dup plugin with parent
@@ -59,7 +59,7 @@ module Malevich
           next
         end
         # over plugins merge
-        @all_plugins.each {|p| p.settings.deep_merge!(val) if name == p.name }
+        @all_plugins.each { |p| p.settings.deep_merge!(val) if name == p.name }
       end
       # add plugin if it always_start or get settings and runnable
       @all_plugins.each do |p|
@@ -67,12 +67,12 @@ module Malevich
           Kernel::log(:info, "Plugin '#{p.name}' not started, because it not 'always_start' and not in config")
           next
         end
-        @plugins_to_run << p if p.runnable?  
+        @plugins_to_run << p if p.runnable?
       end
       @all_plugins = nil
       @all_names = nil
       # start plugins! 
-      @plugins_to_run.each {|p| monitor << p }
+      @plugins_to_run.each { |p| monitor << p }
       @plugins_to_run = nil
     end
 

data/lib/malevich/monitor.rb

@@ -10,7 +10,7 @@ module Malevich
     end
 
     def plugins
-      @tasks.select {|t| t[1].is_a?(Malevich::Plugin) }.map {|x| {x[1].name => x[1].settings.to_hash} }
+      @tasks.select { |t| t[1].is_a?(Malevich::Plugin) }.map { |x| {x[1].name => x[1].settings.to_hash} }
     end
 
     def <<(obj)
@@ -32,6 +32,7 @@ module Malevich
           self << task[1]
         end
         log :debug, "Check alive #{@tasks.count} threads"
+        ObjectSpace.garbage_collect
         sleep CHECK_ALIVE
       end
     end

data/lib/malevich/plugin/error.rb

@@ -2,10 +2,13 @@ module Malevich
   module PluginHelpers
 
     def error(e)
-      errors.last_at  = Time.now
-      errors.msg      = "#{e.class}: #{e}\n #{e.backtrace.join("\n")}"
-      errors.reported = false
-      log :error, "Plugin '#{name}' has a error: #{e.class}: #{e}\n #{e.backtrace.join("\n")}"
+      msg = "Plugin '#{name}' has errors\n\n #{e.class}: #{e}\n #{e.backtrace.join("\n")}"
+      # for http api
+      errors.last_at = Time.now
+      errors.msg = msg
+      # send message todo: state error?
+      event(:service => 'plugin errors', :state => 'critical', :description => msg)
+      log :error, msg
     end
 
   end

data/lib/malevich/plugin/event.rb

@@ -61,7 +61,7 @@ module Malevich
       return if hash[:state] == 'ok' && hash[:metric].nil? && histories[hash[:service]] &&
           histories[hash[:service]][:state] == 'ok'
       histories[hash[:service]] = hash
-      malevich.events << hash
+      malevich.riemann_events << hash
     end
 
   end

data/lib/malevich/plugin/http.rb

@@ -1,6 +1,5 @@
 require 'rest_client'
 require 'uri'
-require 'open-uri'
 
 module Malevich
   module PluginHelpers
@@ -8,6 +7,7 @@ module Malevich
     def http_get(url)
       RestClient.get(url)
     end
+
     alias :rest_get :http_get
 
     def body_get(url)

data/lib/malevich/plugin/shell_out.rb

@@ -4,7 +4,7 @@ module Malevich
   module PluginHelpers
 
     def shell_out(*command_args)
-      cmd             = Mixlib::ShellOut.new(*command_args)
+      cmd = Mixlib::ShellOut.new(*command_args)
       #cmd.live_stream = STDOUT if STDOUT.tty?
       cmd.run_command
       cmd

data/lib/malevich/plugin.rb

@@ -4,6 +4,7 @@ module Malevich
   class Plugin
 
     include Malevich::PluginHelpers
+    include Malevich::Mixin
 
     attr_accessor :name, :always_start, :interval,
                   :run_if, :collect, :settings, :histories, :errors
@@ -11,9 +12,9 @@ module Malevich
     alias :plugin :settings
 
     def initialize(name)
-      @name         = name
-      @interval     = 60
-      @run_if       = Proc.new { true }
+      @name = name
+      @interval = 60
+      @run_if = Proc.new { true }
       @always_start = false
     end
 
@@ -27,6 +28,7 @@ module Malevich
         log level, msg
         false
       end
+
       return log_and_false("'#{name}' not started, because have not 'collect'") if collect.nil?
       return log_and_false("'#{name}' disabled in config") if settings.disable? && settings.disable
       return log_and_false("'#{name} disabled by run_if statement") unless !!self.instance_eval(&run_if)
@@ -55,7 +57,7 @@ module Malevich
 
     def self.make_container(container)
       define_method(container) do |&block|
-        malevich.plugins[container]            ||= {}
+        malevich.plugins[container] ||= {}
         malevich.plugins[container][self.name] ||= Hashie::Mash.new
         malevich.plugins[container][self.name]
       end

data/lib/malevich/responders/http.rb

@@ -2,6 +2,8 @@ module Malevich
   module Responder
     class Http
 
+      include Malevich::Mixin
+
       attr_reader :name
 
       def initialize
@@ -30,16 +32,16 @@ module Malevich
 
       def info
         {
-          :cmd => malevich.cmd,
-          :config => malevich.config,
-          :plugins => malevich.monitor.plugins,
-          :monitor => malevich.monitor.tasks.map {|x| { x[1].name => x[0].alive? } },
-          :errors => (malevich.plugins.errors rescue {}),
-          :histories => (malevich.plugins.histories rescue {}),
-          :version => Malevich::VERSION,
-          :ruby => "#{RUBY_VERSION}-p#{RUBY_PATCHLEVEL}",
-          :uptime => Time.now.to_i - @started_at,
-          :queue_size => malevich.events.size
+            :cmd => malevich.cmd,
+            :config => malevich.config,
+            :plugins => malevich.monitor.plugins,
+            :monitor => malevich.monitor.tasks.map { |x| {x[1].name => x[0].alive?} },
+            :errors => (malevich.plugins.errors rescue {}),
+            :histories => (malevich.plugins.histories rescue {}),
+            :version => Malevich::VERSION,
+            :ruby => "#{RUBY_VERSION}-p#{RUBY_PATCHLEVEL}",
+            :uptime => Time.now.to_i - @started_at,
+            :queue_size => malevich.riemann_events.size
         }.to_json + "\n"
       end
 

data/lib/malevich/responders/init.rb

@@ -1,4 +1,3 @@
 require_relative 'riemann'
 require_relative 'http'
 require_relative 'udp'
-require_relative 'error'

data/lib/malevich/responders/riemann.rb

@@ -5,6 +5,8 @@ module Malevich
   module Responder
     class Riemann
 
+      include Malevich::Mixin
+
       INTERVAL_FLUSH = 0.5
 
       attr_reader :name
@@ -30,28 +32,28 @@ module Malevich
           riemann, port = host.split(':')
           port ||= 5555
           client = ::Riemann::Client.new({
-                                           :host => Resolv.new.getaddress(riemann),
-                                           :port => port,
-                                           :timeout => 10
-                                       })
+                                             :host => Resolv.new.getaddress(riemann),
+                                             :port => port,
+                                             :timeout => 10
+                                         })
           client = client.tcp if malevich.cmd['riemann-tcp']
           log :debug, "Add new riemann client: #{client.host}:#{client.port}"
           @riemanns << client
-          @name = @riemanns.map {|c| "riemann client [#{c.host}:#{c.port}]" }.join(' , ')
+          @name = @riemanns.map { |c| "riemann client [#{c.host}:#{c.port}]" }.join(' , ')
         end
         @riemanns
       end
 
       def flush
-        until malevich.events.empty?
-          event = malevich.events.pop
+        until malevich.riemann_events.empty?
+          event = malevich.riemann_events.pop
           @riemanns.each do |riemann|
             Timeout::timeout(10) {
               log :debug, "Sent message #{event} for #{riemann.host}:#{riemann.port}"
               riemann << event
             }
           end
-        end
+        end 
       end
 
     end

data/lib/malevich/responders/udp.rb

@@ -4,6 +4,8 @@ module Malevich
   module Responder
     class Udp
 
+      include Malevich::Mixin
+
       RIEMANN_RESERVED_FIELDS = [
           :time,
           :state,
@@ -24,7 +26,7 @@ module Malevich
 
       def process(data, src)
         begin
-          malevich.events << event_from_json(data)
+          malevich.riemann_events << event_from_json(data)
           src.reply "sended\n\n"
         rescue
           log :error, "Failed to send message: #{data.inspect}"

data/lib/malevich/version.rb

@@ -1,3 +1,3 @@
 module Malevich
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 end

data/lib/malevich.rb

@@ -1,19 +1,19 @@
-require 'malevich/init'
+require 'malevich/loader'
 
 module Malevich
   class Kernel
 
     include Malevich::Loader
 
-    attr_reader :config, :cmd, :plugins, :ohai, :monitor, :events, :dsl
+    attr_reader :config, :cmd, :plugins, :ohai, :monitor, :riemann_events, :dsl
 
     def initialize
-      @config  = Hashie::Mash.new # for config from file
-      @cmd     = Hashie::Mash.new
+      @config = Hashie::Mash.new # for config from file
+      @cmd = Hashie::Mash.new
       @plugins = Hashie::Mash.new # for plugin containers (errors, settings)
-      @logger  = Logger.new(STDOUT)
+      @logger = Logger.new(STDOUT)
       @monitor = Malevich::Monitor.new
-      @events  = ::Queue.new
+      @riemann_events = ::Queue.new
     end
 
     def test_plugin(file)
@@ -31,29 +31,33 @@ module Malevich
     end
 
     def ohai
-      if (Time.now.to_i - @ohai_timestamp.to_i > 60 * 60) && !$lock_ohai
-        $lock_ohai = true
+      unless @ohai
         Kernel::log :info, 'Load ohai data'
-        @real_ohai ||= Ohai::System.new
-        @real_ohai.all_plugins
+        real_ohai = Ohai::System.new
+        real_ohai.all_plugins
         @ohai_timestamp = Time.now
-        $lock_ohai = false
+        @ohai = real_ohai.data.dup
+        real_ohai = nil
       end
-      @real_ohai.data
+      @ohai
     end
-
   end
-end
 
-module Kernel
+  module Mixin
 
-  def malevich
-    $__malevich_utils ||= Malevich::Kernel.new
-  end
+    class << self; attr_accessor :instance; end
+
+    def malevich
+      @instance ||= Malevich::Mixin.instance ||= Malevich::Kernel.new
+    end
+
+    def log(level = :info, message)
+      speaker = self.class == Class ? "C: #{self.to_s}" : "I: #{self.class.to_s}"
+      malevich.log(level, "[#{speaker}] #{message}")
+    end
 
-  def log(level = :info, message)
-    speaker = self.class == Class ? "C: #{self.to_s}" : "I: #{self.class.to_s}"
-    malevich.log(level, "[#{speaker}] #{message}")
   end
 
 end
+
+require 'malevich/init'

data/malevich.gemspec

@@ -4,18 +4,18 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'malevich/version'
 
 Gem::Specification.new do |spec|
-  spec.name        = 'malevich'
-  spec.version     = Malevich::VERSION
-  spec.authors     = ['Vasiliev Dmitry']
-  spec.email       = ['vadv.mkn@gmail.com']
+  spec.name = 'malevich'
+  spec.version = Malevich::VERSION
+  spec.authors = ['Vasiliev Dmitry']
+  spec.email = ['vadv.mkn@gmail.com']
   spec.description = %q{Monitoring tool}
-  spec.summary     = %q{Monitoring tool}
-  spec.homepage    = ''
-  spec.license     = 'MIT'
+  spec.summary = %q{Monitoring tool}
+  spec.homepage = ''
+  spec.license = 'MIT'
 
-  spec.files         = `git ls-files`.split($/)
-  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
-  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+  spec.files = `git ls-files`.split($/)
+  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 'riemann-client', '~> 0.2.2'
@@ -29,4 +29,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'bundler', '~> 1.3'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'pry'
+  spec.add_development_dependency 'ruby-prof'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: malevich
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Vasiliev Dmitry
@@ -136,6 +136,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: ruby-prof
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Monitoring tool
 email:
 - vadv.mkn@gmail.com
@@ -182,7 +196,6 @@ files:
 - lib/malevich/plugin/init.rb
 - lib/malevich/plugin/shell_out.rb
 - lib/malevich/plugin/time.rb
-- lib/malevich/responders/error.rb
 - lib/malevich/responders/http.rb
 - lib/malevich/responders/init.rb
 - lib/malevich/responders/riemann.rb

data/lib/malevich/responders/error.rb

@@ -1,30 +0,0 @@
-module Malevich
-  module Responder
-    class Error
-
-      attr_reader :name
-
-      def initialize
-        @name = 'plugin error responder'
-      end
-
-      def run!
-        loop do
-          if malevich.plugins.errors
-            errors = 0
-            malevich.plugins.errors.each { |_, val| errors += 1 unless val.reported? }
-            if errors == 0
-              malevich.events << {:service => 'plugins errors', :state => 'ok'}
-            else
-              malevich.events << {:service => 'plugin errors', :metric => errors,
-                                  :description => "Plugins has errors \n #{malevich.plugins.errors}"}
-              malevich.plugins.errors.each { |_, val| val.reported = true unless val.reported? }
-            end
-          end
-          sleep 60
-        end
-      end
-
-    end
-  end
-end