kurchatov 0.0.6.pre.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 870ee3524e61a543f0239a9bc5d5e635b228e964
-  data.tar.gz: 29c5ea749c45fea4391af9845ac57e112cb59bfa
+  metadata.gz: 5f75c8dca0ef451afb605c85dc75cb15e7669a3c
+  data.tar.gz: a2573401456215589913a562bf8a0b889f710fd9
 SHA512:
-  metadata.gz: 1ae6eb277c085226329af0d2014042e0eae58447c1c0da53bb518236c19092a5d25a2368ee2d2a24bec892ff3cc67d485c1f106ee06076a23d119a25ef07caab
-  data.tar.gz: 42af4c91a332ed6f1d99c1673578ff031b714e19b56f77fd13e35205d47240d6d7dfc784044bcbf7e2179f5834ce54fcad0526747b7eeb3b6849cf2ef3b618d4
+  metadata.gz: 64c933fb2783d2cddea9d370c82ac7e5044749c64a1e3441ab1c14bb91c0fc98fa174745d76562dc0c2e46a02e575329d5a084c75fbc8a4f0b4c0b068f9eb7a6
+  data.tar.gz: 554337927ac11c606708306d47e2ac5a78458dab25d10970b577e71799042abbccfe002fe0f3f43fa83ac03d8b374b002e497aef8c6924acf8fe84289d2983b1

data/.travis.yml

@@ -4,4 +4,7 @@ language:
   - 'ruby'
 rvm: 
   - '1.9.3'
+  - '1.8.7'
+  - '2.0.0'
+  - '2.1.0'
 script: "./tests/run.sh"

data/CHANGELOG

@@ -3,3 +3,4 @@
 * Version 0.0.6.pre.2: :metric => boolean return integer
 * Version 0.0.6.pre.4: Required block for plugin
 * Version 0.0.6.pre.5: Improve http responder, add monitor
+* Version 0.0.6: ruby 1.8.7 support

data/kurchatov.gemspec

@@ -25,5 +25,4 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec'
   spec.add_development_dependency 'pry'
-  spec.add_development_dependency 'ruby-prof'
 end

data/lib/kurchatov/mixin/event.rb

@@ -24,7 +24,7 @@ module Kurchatov
         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)
+          hash[:metric] = ((hash[:metric] * 100).round/100.to_f) # 1.8.7 round
         end
 
         set_diff_metric(hash)

data/lib/kurchatov/mixin/init.rb

@@ -1,6 +1,6 @@
-require_relative 'command'
-require_relative 'http'
-require_relative 'ohai'
-require_relative 'queue'
-require_relative 'event'
-require_relative 'monitor'
+require 'kurchatov/mixin/command'
+require 'kurchatov/mixin/http'
+require 'kurchatov/mixin/ohai'
+require 'kurchatov/mixin/queue'
+require 'kurchatov/mixin/event'
+require 'kurchatov/mixin/monitor'

data/lib/kurchatov/monitor.rb

@@ -4,14 +4,14 @@ module Kurchatov
     class Task
       include Kurchatov::Mixin::Event
       attr_accessor :thread, :instance
+      attr_reader :count_errors, :last_error, :last_error_at
 
       def initialize(plugin)
         @plugin = plugin
         @thread = Thread.new { @plugin.run }
-      end
-
-      def status
-        !!@thread.alive?
+        @count_errors = 0
+        @last_error = nil
+        @last_error_at = nil
       end
 
       def name
@@ -22,8 +22,8 @@ module Kurchatov
         @plugin.class.to_s
       end
 
-      def uptime
-        @plugin.uptime
+      def config
+        @plugin.plugin_config
       end
 
       def died?
@@ -34,6 +34,9 @@ module Kurchatov
         rescue => e
           desc = "Plugin '#{@plugin.name}' died. #{e.class}: #{e}\n." +
             "Trace:  #{e.backtrace.join("\n")}"
+          @count_errors += 1
+          @last_error = desc
+          @last_error_at = Time.now
           Log.error(desc)
           unless @plugin.ignore_errors
             event(:service => 'riemann client errors', :desc => desc, :state => 'critical')
@@ -67,7 +70,14 @@ module Kurchatov
     end
 
     def inspect
-      @tasks.map {|t| {name: t.name, alive: t.status, type: t.type, uptime: t.uptime}  }
+      @tasks.map do |t|
+        {
+          "name" => t.name,
+          "type" => t.type,
+          "config" => t.config,
+          "errors" => {"count" => t.count_errors, "last" => t.last_error, "time" => t.last_error_at}
+        }
+      end
     end
 
   end

data/lib/kurchatov/plugin/riemann.rb

@@ -25,6 +25,10 @@ module Kurchatov
         @interval = 60.0
       end
 
+      def plugin_config
+        plugin
+      end
+
       def run
         super
         loop do

data/lib/kurchatov/plugin.rb

@@ -10,12 +10,9 @@ module Kurchatov
     end
 
     def run
-      @t_start = Time.now
+      #
     end
 
-    def uptime
-      Time.now.to_i - @t_start.to_i
-    end
 
   end
 end

data/lib/kurchatov/responders/http.rb

@@ -10,6 +10,10 @@ module Kurchatov
         @s_time = Time.now
       end
 
+      def plugin_config
+        {:host => @host, :port => @port}
+      end
+
       def run
         super
         @server ||= TCPServer.new(@host, @port)

data/lib/kurchatov/responders/init.rb

@@ -1,3 +1,3 @@
-require_relative 'http'
-require_relative 'riemann'
-require_relative 'udp'
+require 'kurchatov/responders/http'
+require 'kurchatov/responders/riemann'
+require 'kurchatov/responders/udp'

data/lib/kurchatov/responders/riemann.rb

@@ -9,10 +9,15 @@ module Kurchatov
       FLUSH_INTERVAL = 0.5
 
       def initialize(conn)
+        @ignore_errors = true
         @hosts = conn
         @riemanns = Array.new
       end
 
+      def plugin_config
+        {:hosts => @hosts}
+      end
+
       def run
         super
         make_clients

data/lib/kurchatov/responders/udp.rb

@@ -9,6 +9,9 @@ module Kurchatov
         @name = "udp responder #{@host}:#{@port}"
       end
 
+      def plugin_config
+        {:host => @host, :port => @port}
+      end
 
       def run
         super

data/lib/kurchatov/version.rb

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

data/tests/data/event.yml

@@ -41,3 +41,14 @@ events:
     :critical: 10
     :result: critical
     :service: Http get test
+
+  - :eval: 'rest_get("http://127.0.0.1:55755").size'
+    :critical: 1
+    :result: critical
+    :service: Http responder
+
+  - :metric: 0.98
+    :critical: 2
+    :warning: 1
+    :result: ok
+    :service: round float

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 --stop-on-error
+bundle exec kurchatov -c ./tests/data/config.yml -d ./tests/data -H 127.0.0.1 --stop-on-error --http 127.0.0.1:55755

data/tests/server.rb

@@ -5,7 +5,7 @@ require 'yaml'
 
 PORT = 5555
 HOST = '127.0.0.1'
-RECEIVE_INTERVAL = 20
+RECEIVE_INTERVAL = 60
 
 server = TCPServer.new(HOST, PORT)
 events = []
@@ -15,7 +15,7 @@ Timeout::timeout(RECEIVE_INTERVAL) {
   client = server.accept
   loop do
     line = client.read(4)
-    break if line.nil? || line.size != 4 
+    break if line.nil? || line.size != 4
     length = line.unpack('N').first
     str = client.read(length)
     message = Kurchatov::Riemann::Message.decode(str)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kurchatov
 version: !ruby/object:Gem::Version
-  version: 0.0.6.pre.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Vasiliev Dmitry
@@ -94,20 +94,6 @@ 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: Gem for monitoring with riemann.
 email:
 - vadv.mkn@gmail.com
@@ -222,9 +208,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>'
+  - - '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.0.3