kurchatov 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9094918f08537775203d52e22d3669276a8e3cee
-  data.tar.gz: d775c33d9a51f5e5fa5e87a0fef7a874218e5657
+  metadata.gz: dbbbae27bc63fa4d288964473a0c40f7c5d287de
+  data.tar.gz: b7b563070302caaef9fccfd31b418327c32c13c5
 SHA512:
-  metadata.gz: 7bdf806068549afe1a9f2519ef954effe5561b1ecda9acde8179c7aa210484168de07bb21a503690fc97b4eea2ad46f40ed6fda8c692585b29ff21ac6c7d0857
-  data.tar.gz: d6f752f13bc30d1c65707462e078566fe527f3661128551286b0c1ea2bec911c65e288f15dbb509bbd3317bc9329f39b3ed697df653a109433a26078b7b39a68
+  metadata.gz: bf3a30e95ed5120216b5eca71954d66ddd4d66e2c8ba894d3fdb4b04530030fdd8143848a0351cc50694737450b08f2f6a69f8d62f76bd002afa706960baccc3
+  data.tar.gz: ec916fe27d1cdbd386e2854f1bcc2d620f265eaf4cb57a072cdc5383b97fb67eebb305d50007f7d595f0eb65a116714104bf1e57c6b49567551d39896c490422

data/CHANGELOG

@@ -5,3 +5,5 @@
 * Version 0.0.6.pre.5: Improve http responder, add monitor
 * Version 0.0.6: ruby 1.8.7 support
 * Version 0.0.7: add FreeBSD support, responders as plugins
+* Version 0.2.1: count avg metric
+* Version 0.2.3: ignore_errors as count errors

data/lib/kurchatov/monitor.rb

@@ -12,6 +12,7 @@ module Kurchatov
         @count_errors = 0
         @last_error = nil
         @last_error_at = nil
+        @last_error_count = 0
       end
 
       def name
@@ -34,15 +35,17 @@ module Kurchatov
         return false if @thread.alive?
         # thread died, join and extract error
         begin
+          @last_error_count = 0
           @thread.join # call error
         rescue => e
           desc = "Plugin '#{@plugin.name}' died. #{e.class}: #{e}\n." +
             "Trace:  #{e.backtrace.join("\n")}"
           @count_errors += 1
+          @last_error_count += 1
           @last_error = desc
           @last_error_at = Time.now
           Log.error(desc)
-          unless @plugin.ignore_errors
+          if @plugin.ignore_errors == false || (@plugin.ignore_errors.class == 'Fixnum' && @plugin.ignore_errors > @plugin.last_error_count)
             event(:service => "plugin #{@plugin.name} errors", :desc => desc, :state => 'critical')
           end
         end

data/lib/kurchatov/version.rb

@@ -1,3 +1,3 @@
 module Kurchatov
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
 end

data/tests/data/plugin_dont_start.rb

@@ -0,0 +1,5 @@
+name "dont start plugin"
+
+collect do
+  raise "Don't start me!!"
+end

data/tests/data/plugin_with_errors.rb

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

data/tests/data/plugin_with_errors_with_count.rb

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

data/tests/server.rb

@@ -2,7 +2,7 @@ require 'socket'
 require 'timeout'
 require 'kurchatov/riemann/client'
 require 'yaml'
-require_relative 'testreceived'
+require File.expand_path('../testreceived', __FILE__)
 
 PORT = 5555
 HOST = '127.0.0.1'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kurchatov
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Vasiliev Dmitry
@@ -193,8 +193,11 @@ files:
 - lib/ohai/plugins/windows/platform.rb
 - tests/data/config.yml
 - tests/data/event.yml
-- tests/data/required.rb
-- tests/data/sample.rb
+- 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/run.sh
 - tests/server.rb
 - tests/testreceived.rb