kurchatov 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3491801f7a156bc9ac3b0b15f5b8ac349b5ea0c8
-  data.tar.gz: 6bb3727bce6b21b51a3a227938a6a9f14c86852c
+  metadata.gz: 54bb6b67e8ca9aca95e11895ef1cb66645f0d68d
+  data.tar.gz: bcd522202de89b8fd81167443cb6bebf6bb00696
 SHA512:
-  metadata.gz: 8e9f5becda3504f709e8f653776c410021ef99c457cbc2643ccb1d692d9cc255803dafcfbe0887eaec2e33065b76dff7b6621e3c763f013afb91cae28afa5c83
-  data.tar.gz: 4d983e2443cc8ae526719f3c9718933ae486a71cdb67dc221940fe6fdaaac611188631d1bebb0295d7440554396b52ea9a3f47db136e39a535dd014b2dfe8b2e
+  metadata.gz: ac5c7fad5c2c5540c6e321b112906d54b88b05a69316231203927b0813a6080bf057a3e301acfd26c986cbcf1675df250650d952f67b35846a80203962fdfb80
+  data.tar.gz: 8e5c5a3770b22afa25740fb470b53576ee0cdc6003dfc94ef542b2806fc98c86d51ba767c4d2e19dbfaf6f027883b7330e277c08d1fa68e07d5452a182577800

data/.travis.yml

@@ -1,9 +1,14 @@
+language: ruby
+
 os:
   - linux
   - osx
+  - windows
 
-language: 
-  - ruby
+before_install:
+ - date -u
+ - uname -a
+ - env | sort
 
 rvm: 
   - 1.9.3
@@ -12,3 +17,7 @@ rvm:
   - 1.8.7
 
 script: "./tests/run.sh"
+
+notifications:
+ email:
+  - vadv.mkn@gmail.com

data/lib/kurchatov/application.rb

@@ -90,12 +90,6 @@ module Kurchatov
            :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 }
-
     def configure_opts
       @attributes = parse_options
       @attributes = nil if @attributes.empty?

data/lib/kurchatov/config.rb

@@ -7,6 +7,5 @@ module Kurchatov
     default :config_file, '/etc/kurchatov/config.yml'
     # errors
     default :ERROR_CONFIG, 2
-    default :ERROR_PLUGIN_REQ, 3
   end
 end

data/lib/kurchatov/mixin/monitor.rb

@@ -10,7 +10,7 @@ module Kurchatov
 
       def monitor
         @instance_monitor ||= Kurchatov::Mixin::Monitor.instance_monitor ||=
-          Kurchatov::Monitor.new(Kurchatov::Config[:stop_on_error] || !!Kurchatov::Config[:test_plugin])
+          Kurchatov::Monitor.new
       end
 
     end

data/lib/kurchatov/monitor.rb

@@ -40,7 +40,7 @@ module Kurchatov
         begin
           @thread.join # call error
         rescue => e
-          desc = "Plugin '#{@plugin.name}' died. #{e.class}: #{e}\n." +
+          desc = "Plugin '#{@plugin.name}' died. #{e.class}: #{e}.\n" +
             "Trace:  #{e.backtrace.join("\n")}"
           @count_errors += 1
           @last_error_count += 1
@@ -51,7 +51,6 @@ module Kurchatov
             event(:service => "plugin #{@plugin.name} errors", :desc => desc, :state => 'critical')
           end
         end
-        start! #FIXME
         true
       end
 
@@ -64,34 +63,31 @@ module Kurchatov
     attr_accessor :tasks
     CHECK_ALIVE_TIMEOUT = 5
 
-    def initialize(stop = false)
-      @stop_on_error = stop
+    def initialize
       @tasks = Array.new
     end
 
     def <<(plugin)
       Log.debug("Add new plugin: #{plugin.inspect}")
-      @tasks << Task.new(plugin)
+      tasks << Task.new(plugin)
     end
 
     def start!
       loop do
-        @tasks.each do |task|
-          if task.died? && @stop_on_error
-            exit(Config[:ERROR_PLUGIN_REQ])
-          end
+        tasks.each do |task|
+          task.start! if task.died?
           if task.stopped?
             task.stop!
-            @tasks.delete(task)
+            tasks.delete(task)
           end
         end
-        Log.debug("Check alive plugins [#{@tasks.count}]")
+        Log.debug("Check alive plugins [#{tasks.count}]")
         sleep CHECK_ALIVE_TIMEOUT
       end
     end
 
     def inspect
-      @tasks.map do |t|
+      tasks.map do |t|
         {
           "name" => t.name,
           "config" => t.config,

data/lib/kurchatov/version.rb

@@ -1,3 +1,3 @@
 module Kurchatov
-  VERSION = "0.2.4"
+  VERSION = "0.2.5"
 end

data/tests/data/config.yml

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

data/tests/data/event.yml

@@ -1,5 +1,17 @@
 events:
 
+  - :service: new_multi_start
+    :result: ok
+    :miss_send_from_plugin_data: true
+
+  - :service: multi_start_0
+    :result: ok
+    :miss_send_from_plugin_data: true
+
+  - :service: multi_start_1
+    :result: ok
+    :miss_send_from_plugin_data: true
+
   - :metric: 3
     :critical: 2
     :warning: 1
@@ -37,11 +49,6 @@ events:
     :result: warning
     :service: Shell test
 
-  - :eval_metric: 'rest_get("http://ya.ru").size'
-    :critical: 10
-    :result: critical
-    :service: Http get test
-
   - :eval_metric: 'rest_get("http://127.0.0.1:55755").size'
     :critical: 1
     :result: critical

data/tests/data/{plugin_sample.rb → plugins/plugin_data.rb}

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

data/tests/data/plugins/plugin_ignore_errors_with_count.rb_

@@ -0,0 +1,14 @@
+name "ignore errors with count"
+
+# CHECK_ALIVE_TIMEOUT = 5 second
+# sleep_plugin 20
+# raise errors 
+
+always_start true
+ignore_errors 3
+
+collect do
+  @errors ||= 1
+  raise "error" if @errors < 3
+  @error += 1
+end

data/tests/data/{plugin_with_errors.rb → plugins/plugin_ingore_errors.rb}

@@ -1,7 +1,8 @@
-name "with error plugin"
+name "ignore errors"
 
-ignore_errors true
 always_start true
+ignore_errors true
+interval 1
 
 collect do
   raise "error"

data/tests/data/plugins/plugin_multi_start.rb

@@ -0,0 +1,11 @@
+name "multi_start"
+always_start true
+
+default[:event_sended] = false
+
+collect do
+  if !plugin.event_sended
+    event(:service => "#{name}", :state => 'ok')
+  end
+  plugin.event_sended = true
+end

data/tests/data/plugins/plugin_not_ignore_errors.rb_

@@ -0,0 +1,9 @@
+name "not ignore errors"
+
+always_start true
+ignore_errors false
+
+collect do
+  raise "error" if (@first_start ||= true)
+  @first_start = false
+end

data/tests/data/plugins/plugin_sleep.rb

@@ -0,0 +1,8 @@
+name "plugin sleep"
+
+always_start true
+
+collect do
+  20.times {|x| puts "Sleep from 'plugin sleep', count: #{x}"; sleep 1; }
+  exit 0
+end

data/tests/run.sh

@@ -1,3 +1,3 @@
 #!/bin/sh -e
 bundle exec ruby ./tests/server.rb &
-bundle exec kurchatov -c ./tests/data/config.yml -d ./tests/data -H 127.0.0.1 --http 127.0.0.1:55755
+bundle exec kurchatov -c ./tests/data/config.yml -d ./tests/data/plugins -H 127.0.0.1 --http 127.0.0.1:55755 -l debug

data/tests/testreceived.rb

@@ -23,7 +23,7 @@ class TestReceived
     from_data = data["events"].select {|x| x[:miss_count] != true }.count
     from_events = @events.count
 
-    raise "Not all events recieved: from data: #{from_data} and from server: #{from_events}" unless 3 * from_data == from_events # see config.yml (3 copy of sample plugin run)
+    raise "Not all events recieved: from data: #{from_data} and from server: #{from_events}" unless from_data == from_events
 
     puts "Recieved events:"
     puts "#{@events.inspect}"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kurchatov
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors:
 - Vasiliev Dmitry
@@ -193,11 +193,14 @@ files:
 - lib/ohai/plugins/windows/platform.rb
 - tests/data/config.yml
 - tests/data/event.yml
-- tests/data/plugin_dont_start.rb
-- tests/data/plugin_sample.rb
-- tests/data/plugin_with_errors.rb
-- tests/data/plugin_with_errors_with_count.rb
-- tests/data/plugin_with_no_required.rb
+- tests/data/plugins/plugin_data.rb
+- tests/data/plugins/plugin_dont_start.rb
+- tests/data/plugins/plugin_ignore_errors_with_count.rb_
+- tests/data/plugins/plugin_ingore_errors.rb
+- tests/data/plugins/plugin_multi_start.rb
+- tests/data/plugins/plugin_not_ignore_errors.rb_
+- tests/data/plugins/plugin_sleep.rb
+- tests/data/plugins/plugin_with_no_required.rb
 - tests/run.sh
 - tests/server.rb
 - tests/testreceived.rb

data/tests/data/plugin_with_errors_with_count.rb

@@ -1,8 +0,0 @@
-name "plugin with error count"
-
-ignore_errors 4
-always_start true
-
-collect do
-  raise "error"
-end