malevich 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f1b68e4d209f800c0c2a08ce6166a01fe4c3f9dd
-  data.tar.gz: 0a28fab3e6992d1a6f29b2cc88c4bb3d020fd566
+  metadata.gz: e70253bb89c1f108af088c3c442e0ef69049db6e
+  data.tar.gz: ff956877ab483fd1c4e4a0473a92a5d8a9380f12
 SHA512:
-  metadata.gz: d724ea316def8f81ea864a15a240dce95eb0adc2bcf3498317d8eab48b0cdafc7b0ac0da99500a0754875e37e4e07c452924ef8296bb05f155812fc09c7eb696
-  data.tar.gz: 04f3e20dcc6334742a56494c9618c331d0c2b91337dece4ddf29af2d0981d3987888abb63c4146c3c53d67660f7f8e03736691350fbe5894e765f8f53cd1a838
+  metadata.gz: 04603ae1935fee81416cc6860c5f288facf3144f79a4d53bc6983a04ccdd7f935f5341f6ad5d65b73749e2d481b17c541c419ed9d73492385534d4511affcc22
+  data.tar.gz: ef094efa3de57927a2b9e0a641b440faea651c67ec2cbec3139a3c44053864f676bf726983f3eb3741bcad9d57635ce2a6f5b41f313e979e5b4e6bb5d46e6eb4

data/example/cpu.rb

@@ -5,7 +5,7 @@ critical 85
 
 settings :per_process, false
 
-collect "linux" do
+collect 'linux' do
   @old_cpu ||= {}
   File.read('/proc/stat').each_line do |cpu_line|
     cpu_number = cpu_line.scan(/cpu(\d+|\s)\s+/)

data/example/disk.rb

@@ -12,7 +12,7 @@ settings :not_monit_device_4_fstab, %w(none)
 settings :not_monit_point_4_fstab, %w(/lib/init/rw /dev/shm /dev)
 settings :check_fstab, true
 
-collect "linux" do
+collect 'linux' do
 
   def get_monit_points_for_size
     monit_points = []

data/example/disk_stat.rb

@@ -1,17 +1,17 @@
 always_start true
 interval 60
 
-settings :words, %w( 'reads reqs', 'reads merged', 'reads sector', 'reads time',
+settings :words, [ 'reads reqs', 'reads merged', 'reads sector', 'reads time',
                      'writes reqs', 'writes merged', 'writes sector', 'writes time',
-                     'io reqs', 'io time', 'io weighted' )
+                     'io reqs', 'io time', 'io weighted' ]
 
-settings :filter, %w('reads reqs', 'writes reqs')
+settings :filter, [ 'reads reqs', 'writes reqs' ] 
 
-run_if "linux" do
+run_if 'linux' do
   File.exists? '/proc/diskstats'
 end
 
-collect "linux" do
+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]+) (.*)$/

data/example/dns_check.rb

@@ -1,7 +1,7 @@
 interval 60
 
-collect "linux", "mac_os_x" do
+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")
+    :description => 'Check resolv self FQDN')
 end

data/example/http.rb

@@ -10,7 +10,7 @@ settings :insecure, false
 settings :url, 'http://127.0.0.1:80'
 settings :service, 'http check'
 
-collect "linux", "mac_os_x" do
+collect 'linux', 'mac_os_x' do
 
   @cmd ||= begin
     "curl -X#{settings.http_method} -s --connect-timeout #{settings.connect_timeout}" +

data/example/iptables.rb

@@ -2,11 +2,11 @@ interval 60
 settings :rule_file, '/etc/network/iptables'
 always_start true
 
-run_if "linux" do
+run_if 'linux' do
   File.exists? settings.rule_file
 end
 
-collect "linux" do
+collect 'linux' do
 
   def delete_counters(str)
     str.gsub(/\[\d+\:\d+\]/, '').strip

data/example/la.rb

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

data/example/mdadm.rb

@@ -1,11 +1,11 @@
 interval 60
 critical 1
 
-run_if "linux" do
+run_if 'linux' do
   File.exists? '/proc/mdstat'
 end
 
-collect "linux" do
+collect 'linux' do
 
   def rm_bracket(text)
     text.gsub('[', '').gsub(']', '')

data/example/megacli.rb

@@ -4,10 +4,10 @@ always_start true
 critical 1
 settings :cmd, 'megacli -AdpAllInfo -aAll -NoLog | awk -F": " \'/Virtual Drives/ { getline; print $2; }\''
 
-run_if "linux" do
+run_if 'linux' do
   File.exists? '/usr/bin/megacli'
 end
 
-collect "linux" do
+collect 'linux' do
   event(:metric => shell!(settings.cmd).to_i, :description => 'MegaCli status')
 end

data/example/memory.rb

@@ -4,7 +4,7 @@ always_start true
 critical 70
 warning 85
 
-collect "linux" do
+collect 'linux' do
   m = File.read('/proc/meminfo').split(/\n/).inject({}) do |info, line|
     x          = line.split(/:?\s+/)
     info[x[0]] = x[1].to_i

data/example/net.rb

@@ -2,12 +2,12 @@ interval 60
 always_start true
 
 settings :include_alias, false
-settings :filter, %W('rx bytes', 'rx errs', 'rx drop', 'tx bytes', 'tx errs', 'tx drop')
-settings :words, %W('rx bytes', 'rx packets', 'rx errs', 'rx drop', 'rx fifo', 'rx frame',
+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')
+                    'tx fifo', 'tx colls', 'tx carrier', 'tx compressed' ] 
 
-collect "linux" do
+collect 'linux' do
   File.read('/proc/net/dev').each_line do |line|
     iface = line.split(':')[0].strip
     iface.gsub!(/\./, '_')

data/example/net_stat.rb

@@ -1,7 +1,7 @@
 interval 5
 settings :ports, [80, 3994]
 
-collect "linux" do
+collect 'linux' do
 
   filter = nil
   settings.ports.each do |port|

data/example/nginx.rb

@@ -6,17 +6,17 @@ settings :url, 'http://127.0.0.1:11311/status'
 settings :nginx_status_1, %W(accepts handled requests)
 settings :nginx_status_2, %W(reading writing waiting)
 
-run_if "linux", "mac_os_x" do
+run_if 'linux', 'mac_os_x' do
   File.exists? settings.file
 end
 
-collect "linux", "mac_os_x" do
+collect 'linux', 'mac_os_x' do
   lines = http_get(settings.url).split("\n")
   lines[2].scan(/\d+/).each_with_index do |value, index|
     event(:service => "nginx #{settings.nginx_status_1[index]}", :metric => value.to_f/interval, :diff => true)
   end
   event(:service => 'nginx active', :metric => lines[0].split(':')[1].strip.to_i)
   lines[3].scan(/\d+/).each_with_index do |value, index|
-    event(:service => plugin.service + " #{settings.nginx_status_2[index]}", :metric => value.to_i)
+    event(:service => "nginx #{settings.nginx_status_2[index]}", :metric => value.to_i)
   end
 end

data/example/ntp.rb

@@ -6,7 +6,7 @@ critical 10
 settings :host, 'pool.ntp.org'
 settings :timeout, 30
 
-collect "linux", "mac_os_x" do
+collect 'linux', 'mac_os_x' do
   event(
     :service     => "ntp #{settings.host}",
     :description => "Ntp lag with host #{settings.host}",

data/example/pgsql.rb

@@ -9,11 +9,11 @@ settings :db4monit, 'riemann_monit'
 settings :conn_warn, 5 # reserved pool connections
 settings :conn_crit, 3 # reserved pool connections
 
-run_if "linux" do
+run_if 'linux' do
   File.exists? settings.pgsql
 end
 
-collect "linux" do
+collect 'linux' do
 
   # helpers
   def run_sql(sql, db='postgres')
@@ -38,7 +38,7 @@ collect "linux" do
   end
 
   def repl_lag
-    unixnow - run_sql("select extract(epoch from value::timestamp) from timestamp where id = 1;", settings.db4monit).to_i
+    unixnow - run_sql('select extract(epoch from value::timestamp) from timestamp where id = 1;', settings.db4monit).to_i
   end
 
   def connections

data/example/runit.rb

@@ -1,11 +1,11 @@
 interval 60
 always_start true
 
-run_if "linux" do
+run_if 'linux' do
   Dir.exists? '/etc/service'
 end
 
-collect "linux" do
+collect 'linux' do
 
   @status_history ||= Array.new
 

data/example/status_file.rb

@@ -7,7 +7,7 @@ settings :service, 'check state file'
 
 critical 1
 
-collect "linux" do
+collect 'linux' do
   content = File.read(settings.file).split("\n").delete_if { |x| x.strip.empty? }
   event(
     :service     => "#{settings.service} #{settings.file}",

data/example/tw_cli.rb

@@ -4,11 +4,11 @@ always_start true
 settings :cmd, "/usr/sbin/tw_cli show | awk '/^c/{print $1}' | xargs -rI{} /usr/sbin/tw_cli /{} show | awk '/^[upb]/&&!/[ \t](OK|VERIFYING|VERIFY-PAUSED)/' |wc -l"
 critical 1
 
-run_if "linux" do
+run_if 'linux' do
   File.exists? '/usr/sbin/tw_cli'
 end
 
-collect "linux" do
+collect 'linux' do
   event(
     :service     => 'twcli',
     :metric      => shell!(settings.cmd).to_i,

data/lib/malevich/dsl.rb

@@ -70,6 +70,7 @@ module Malevich
 
     def self.test(file)
       dsl = Malevich::DSL.new
+      dsl.plugins << Malevich::Plugin.new(File.basename(file, PLUGIN_EXT))
       dsl.instance_eval(File.read(file), file)
       dsl.plugins[0]
     end

data/lib/malevich/plugin/event.rb

@@ -4,7 +4,7 @@ module Malevich
     def event(hash)
       event_normalize(hash)
       hash[:metric] = metric_diff(hash) if hash[:diff]
-      hash[:state]  = state_check(hash)
+      hash[:state] = state_check(hash)
       if malevich.cmd[:test_given]
         log :unknown, "Event message from test plugin: #{hash.inspect}"
       else
@@ -14,8 +14,8 @@ module Malevich
 
     def metric_diff(hash)
       return unless hash[:metric]
-      current_metric          = hash[:metric]
-      old_metric              = histories[hash[:service]]
+      current_metric = hash[:metric]
+      old_metric = histories[hash[:service]] ? histories[hash[:service]][:metric] : nil
       histories[hash[:service]] = current_metric
       hash.delete(:diff)
       old_metric ? current_metric - old_metric : nil
@@ -25,7 +25,7 @@ module Malevich
       return hash[:state] if hash[:state]
       return hash[:state] if hash[:metric].nil?
       return hash[:state] if hash[:metric].kind_of?(Float) && hash[:metric].nan?
-      warning  = settings.respond_to?(:warning) ? settings.warning : nil
+      warning = settings.respond_to?(:warning) ? settings.warning : nil
       critical = settings.respond_to?(:critical) ? settings.critical : nil
       return 'ok' if (warning || critical).nil?
       metric = hash[:metric].to_f
@@ -49,12 +49,12 @@ module Malevich
     end
 
     def event_normalize(hash)
-      hash[:metric]  = hash[:metric].round(2) if hash[:metric].kind_of?(Float)
-      hash[:state]   = 'ok' if hash[:state].kind_of?(TrueClass)
-      hash[:state]   = 'critical' if hash[:state].kind_of?(FalseClass)
+      hash[:metric] = hash[:metric].round(2) if hash[:metric].kind_of?(Float)
+      hash[:state] = 'ok' if hash[:state].kind_of?(TrueClass)
+      hash[:state] = 'critical' if hash[:state].kind_of?(FalseClass)
       hash[:service] ||= name
-      hash[:host]    ||= ohai[:fqdn]
-      hash[:tags]    ||= malevich.cmd.tags
+      hash[:host] ||= ohai[:fqdn]
+      hash[:tags] ||= malevich.cmd.tags
     end
 
     def event_minimizer(hash)

data/lib/malevich/plugin.rb

@@ -18,8 +18,8 @@ module Malevich
     end
 
     def suitable_platform?(name)
-      platforms = name.nil? || name.empty? ? ['linux'] : name
-      platforms.include?(ohai[:platform]) || platforms.include?(ohai[:os])
+      request_platform = name.nil? || name.empty? ? ['linux'] : name
+      request_platform.include?(ohai[:platform]) || request_platform.include?(ohai[:os])
     end
 
     def runnable?
@@ -29,7 +29,7 @@ module Malevich
       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)
+      return log_and_false("'#{name} disabled by run_if statement") unless !!self.instance_eval(&run_if)
       log :unknown, "'#{name}' started"
     end
 

data/lib/malevich/responders/http.rb

@@ -16,6 +16,7 @@ module Malevich
         loop do
           client = server.accept
           log :unknown, "Accepted client: #{client.inspect}"
+
           response = info
           headers = "HTTP/1.1 200 OK\r\n" +
               "Server: Malevich Ruby\r\n" +
@@ -34,6 +35,7 @@ module Malevich
           :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,

data/lib/malevich/responders/riemann.rb

@@ -11,7 +11,7 @@ module Malevich
 
       def initialize
         @riemanns = Array.new
-        @name = "riemann client"
+        @name = 'riemann client'
       end
 
       def run!
@@ -37,7 +37,7 @@ module Malevich
           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

data/lib/malevich/version.rb

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

data/lib/malevich.rb

@@ -31,15 +31,15 @@ module Malevich
     end
 
     def ohai
-      if Time.now.to_i - @ohai_timestamp.to_i > 60 * 60
+      if (Time.now.to_i - @ohai_timestamp.to_i > 60 * 60) && !$lock_ohai
+        $lock_ohai = true
         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
-        @ohai           = real_ohai.data
-      else
-        @ohai
+        $lock_ohai = false
       end
+      @real_ohai.data
     end
 
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: malevich
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Vasiliev Dmitry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-12 00:00:00.000000000 Z
+date: 2014-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: riemann-client