kurchatov 0.0.6.pre.2 → 0.0.6.pre.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 116f2470062649b8e151d15fe01322b6d8a585b2
-  data.tar.gz: acd0e139de670b6f5d4d420340907bffbfc6d8a0
+  metadata.gz: d3567df8dc93294bfc5cb0980d6ba82ebcf22f52
+  data.tar.gz: 9fcd2f6f8c17dbefea266452f832f9d368db34ad
 SHA512:
-  metadata.gz: 9dc4133170af3e71c14ccb5210d6e9ea58a4b1015a63597ad947a6afb8cfc54151370852f26705d77ed61ae5daccc75343568dff212813dff0b56ad71a218fe1
-  data.tar.gz: 3c5568f8e757a9eacbf1e2a598ec3705c7908b281eb1a4a8a45774ecc7ed1ee0942358f3b7ac97e032eb74c9634827692395460eab78f3d06ed645e32c84d076
+  metadata.gz: ea845863682c7b511035e7dbabfebae21f5d8d9e9c4a2e11b1081790a2afef3f09231d1787099b192e6e2258c6149bd79148974e95611e78aae7581d3620974f
+  data.tar.gz: 6ad670d192fddfecb12d62fd5ed5a6b90547e438a3158d7f52c288fd2f233387af1fa3756350a2465e896af805df98cb1acd82fbef16f6bd094a22a0ef37197e

data/examples/la.rb

@@ -14,6 +14,7 @@ collect :os => 'linux' do
 end
 
 collect :os => 'darwin' do
+  interval = 2
   event(
       :metric => shell('uptime | cut -d":" -f4- | sed s/,//g').to_f,
       :desc => 'LA averaged over 1 minute',

data/lib/kurchatov/mixin/event.rb

@@ -10,8 +10,9 @@ module Kurchatov
       ]
 
       def event(hash = {})
+        @normilize = normalize_event(hash)
         Log.info("Mock message for test plugin: #{hash.inspect}") if Kurchatov::Config[:test_plugin]
-        return unless normalize_event(hash)
+        return unless @normilize
         events << hash
       end
 
@@ -19,10 +20,13 @@ module Kurchatov
 
       def normalize_event(hash = {})
         hash[:description] = hash[:desc] if hash[:description].nil? && hash[:desc]
+
+        hash[:metric] = hash[:metric].to_f if hash[:metric].kind_of?(String)
         if hash[:metric].kind_of?(Float)
           hash[:metric] = 0.0 if hash[:metric].nan?
           hash[:metric] = hash[:metric].round(2)
         end
+
         set_diff_metric(hash)
         set_event_state(hash)
         return false if hash[:miss]

data/lib/kurchatov/monitor.rb

@@ -17,7 +17,7 @@ module Kurchatov
           @thread.join # call error
         rescue => e
           desc = "Plugin '#{@plugin.name}' died. #{e.class}: #{e}\n." +
-            "Plugin: #{@plugin.inspect}. Trace:  #{e.backtrace.join("\n")}"
+            "Trace:  #{e.backtrace.join("\n")}"
           Log.error(desc)
           unless @plugin.ignore_errors 
             event(:service => 'riemann client errors', :desc => desc, :state => 'critical')

data/lib/kurchatov/plugin/config.rb

@@ -61,7 +61,7 @@ module Kurchatov
           end
           @plugins_to_run << p if p.runnable_by_config?
         end
-        Log.info("Start plugins: #{@plugins_to_run.inspect}")
+        Log.info("Start plugins: #{@plugins_to_run}")
         @plugins_to_run
       end
 

data/lib/kurchatov/plugin.rb

@@ -1,10 +1,12 @@
 module Kurchatov
   class Plugin
 
-    attr_accessor :name
+    attr_accessor :name, :ignore_errors, :always_start
 
     def initialize(name)
       @name = name
+      @ignore_errors = false
+      @always_start = false
     end
 
     def run

data/lib/kurchatov/queue.rb

@@ -3,6 +3,7 @@
 module Kurchatov
   class Queue
     QUEUE_MAX_SIZE = 1_000
+    QUEUE_MAX_FLUSH = 200
 
     def initialize
       @events = ::Queue.new
@@ -10,16 +11,21 @@ module Kurchatov
 
     def <<(event)
       if @events.size >= QUEUE_MAX_SIZE
+        # GC start if QUEUE_MAX_SIZE
+        ObjectSpace.garbage_collect
         drop = @events.shift
         Log.error("Drop event: #{drop.inspect}. See Kurchatov::Queue::QUEUE_MAX_SIZE")
       end
       @events << event
     end
 
-    def all
+    def to_flush
       cur_events = Array.new
+      count = 0
       until @events.empty?
         cur_events << @events.shift
+        count += 1
+        break if count > QUEUE_MAX_FLUSH
       end
       cur_events
     end

data/lib/kurchatov/responders/riemann.rb

@@ -30,7 +30,7 @@ module Kurchatov
       end
 
       def flush
-        @events_to_send ||= events.all
+        @events_to_send ||= events.to_flush
         unless @events_to_send.empty?
           @riemanns.each { |riemann| riemann << @events_to_send }
           Log.debug("Sended events via #{@name.inspect}: #{@events_to_send}")

data/lib/kurchatov/riemann/event.rb

@@ -4,8 +4,8 @@ module Kurchatov
       include Beefcake::Message
       optional :time, :int64, 1
       optional :state, :string, 2
-      optional :service, :string, 3
-      optional :host, :string, 4
+      required :service, :string, 3
+      required :host, :string, 4
       optional :description, :string, 5
       repeated :tags, :string, 7
       optional :ttl, :float, 8
@@ -26,7 +26,7 @@ module Kurchatov
       def metric
         metric_d || metric_sint64 || metric_f
       end
-
+      
       def metric=(m)
         if Integer === m and (-(2**63)...2**63) === m
           self.metric_sint64 = m

data/lib/kurchatov/riemann/message.rb

@@ -1,6 +1,16 @@
 require 'beefcake'
 require 'kurchatov/riemann/event'
 
+# monkey patch
+module Beefcake::Message
+  def initialize(attrs={})
+    attrs ||= {}
+    fields.values.each do |fld|
+      self[fld.name] = attrs[fld.name]
+    end
+  end
+end
+
 module Kurchatov
   module Riemann
     class Message

data/lib/kurchatov/version.rb

@@ -1,3 +1,3 @@
 module Kurchatov
-  VERSION = "0.0.6.pre.2"
+  VERSION = "0.0.6.pre.3"
 end

data/tests/data/config.yml

@@ -0,0 +1,16 @@
+not_exists:
+  - not error please
+
+# create sample_plugin from sample
+sample_plugin:
+  cmd: 'ls'
+  url: 'http://example.com'
+  parent: sample
+  sleep: 2
+
+# cteate sample_0 and sample_1
+sample:
+  - url: 'http://google.com'
+    cmd: 'test -f ./tests/run.sh'
+  - url: 'https://www.kernel.org'
+    cmd: 'ps'

data/tests/data/event.yml

@@ -0,0 +1,43 @@
+events:
+
+  - :metric: 3
+    :critical: 2
+    :warning: 1
+    :result: critical
+    :service: metric > critical
+
+  - :metric: 2
+    :critical: 2
+    :warning: 1
+    :result: critical
+    :service: metric == critical
+
+  - :metric: 1
+    :critical: 2
+    :warning: 1
+    :result: warning
+    :service: metric == warning
+
+  - :metric: 0
+    :critical: 2
+    :warning: 1
+    :result: ok
+    :service: metric < warning
+
+  - :state: true
+    :result: ok
+    :service: state TrueClass
+
+  - :state: false
+    :result: critical
+    :service: state FalseClass
+
+  - :eval: 'shell("ls /| wc -l | wc -l")'
+    :warning: 0
+    :result: warning
+    :service: Shell test
+
+  - :eval: 'rest_get("http://ya.ru").size'
+    :critical: 10
+    :result: critical
+    :service: Http get test

data/tests/data/sample.rb

@@ -0,0 +1,12 @@
+name "sample"
+always_start true
+
+collect do
+  data = YAML.load_file('./tests/data/event.yml')
+  data["events"].each do |e| 
+    e[:metric] = eval(e[:eval]) if e.has_key? :eval
+    event(e)
+  end
+  sleep(plugin.sleep.to_f || 0)
+  exit 0 if plugin.sleep
+end

data/tests/run.sh

@@ -1,59 +1,3 @@
 #!/bin/sh -e
-
-
 bundle exec ruby ./tests/server.rb &
-
-rm -rf ./tmp
-mkdir -p ./tmp
-cat > tmp/config.yml <<EOF
-not_exists:
-  - not error please
-test2:
-  url: './tests/run.sh'
-  cmd: 'ls'
-  parent: 'test'
-  counter: 2
-test:
-  - url: 'http://google.com'
-    cmd: 'test -f ./tests/run.sh'
-  - url: 'https://www.kernel.org'
-    cmd: 'ps'
-EOF
-
-cat > tmp/test1.rb <<EOF
-interval 10
-name "test"
-
-default[:url] = 'http://notexists'
-default[:cmd] = 'ls /notexists'
-
-collect do
-  @counter ||= 0
-  Log.info "file command #{plugin.cmd} return: #{shell(plugin.cmd)}"
-  Log.info "get size from #{plugin.url}: #{rest_get(plugin.url).size}"
-  @counter += 1
-  exit 0 if plugin.counter && @counter > plugin.counter.to_i
-  event(:metric => 3, :critical => 2, :warning => 1)
-  event(:metric => 2, :critical => 2, :warning => 1)
-  event(:metric => 1, :critical => 2, :warning => 1)
-  event(:metric => 0, :critical => 2, :warning => 1)
-end
-EOF
-
-# --test-plugin
-bundle exec ./bin/kurchatov --test-plugin ./tmp/test1.rb --logfile ./tmp/testplugin.log -l debug || echo "Mock error in 'ls /notexists'" 
-echo "Stdout --test-plugin:"
-cat ./tmp/testplugin.log
-grep -q 'STDERR: ls: cannot access /notexists' ./tmp/testplugin.log
-
-# load config and helpers 
-bundle exec ./bin/kurchatov -d ./tmp/ -c ./tmp/config.yml --hosts 127.0.0.1 -l debug --stop-on-error --logfile ./tmp/loadplugins.log
-echo "Stdout loader"
-cat ./tmp/loadplugins.log
-grep  'Start plugins' ./tmp/loadplugins.log | grep -q '@name="test_0"'
-grep  'Start plugins' ./tmp/loadplugins.log | grep -q '@name="test_1"'
-grep  'Start plugins' ./tmp/loadplugins.log | grep -q '@name="test2"'
-grep 'file command ls return: CHANGELOG' ./tmp/loadplugins.log
-grep 'get size from http://google.com:' ./tmp/loadplugins.log
-grep 'get size from https://www.kernel.org' ./tmp/loadplugins.log
-grep 'get size from ./tests/run.sh' ./tmp/loadplugins.log
+bundle exec kurchatov -c ./tests/data/config.yml -d ./tests/data -H 127.0.0.1 --stop-on-error

data/tests/server.rb

@@ -1,11 +1,38 @@
 require 'socket'
 require 'timeout'
+require 'kurchatov/riemann/client'
+require 'yaml'
 
-server = TCPServer.new('127.0.0.1', 5555)
-Timeout::timeout(60) {
-  loop {
-    client = server.accept
-    line = client.gets
-    puts line
-  }
-} rescue exit 0
+PORT = 5555
+HOST = '127.0.0.1'
+RECEIVE_INTERVAL = 20
+
+server = TCPServer.new(HOST, PORT)
+events = []
+puts "Run riemann server at #{HOST}:#{PORT}"
+
+Timeout::timeout(RECEIVE_INTERVAL) {
+  client = server.accept
+  loop do
+    line = client.read(4)
+    break if line.nil? || line.size != 4 
+    length = line.unpack('N').first
+    str = client.read(length)
+    message = Kurchatov::Riemann::Message.decode(str)
+    message.events.each do |event|
+      events << event
+    end
+  end
+}
+
+data = YAML.load_file('./tests/data/event.yml')
+events.each do |e|
+  data["events"].each do |d|
+    next unless d[:service] == e[:service]
+    next if d[:result] == e[:state]
+    raise "Recieved state: #{e[:state]}, data state: #{d[:result]}. \n Data: #{d.inspect} \n Event: #{e.inspect}"
+  end
+end
+
+raise "Not all events recieved" unless 3 * data["events"].count == events.count
+puts "All done!"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kurchatov
 version: !ruby/object:Gem::Version
-  version: 0.0.6.pre.2
+  version: 0.0.6.pre.3
 platform: ruby
 authors:
 - Vasiliev Dmitry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-28 00:00:00.000000000 Z
+date: 2014-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: beefcake
@@ -200,6 +200,9 @@ files:
 - lib/ohai/plugins/windows/cpu.rb
 - lib/ohai/plugins/windows/hostname.rb
 - lib/ohai/plugins/windows/platform.rb
+- tests/data/config.yml
+- tests/data/event.yml
+- tests/data/sample.rb
 - tests/run.sh
 - tests/server.rb
 homepage: https://github.com/vadv/kurchatov