kurchatov 0.0.6.pre.4 → 0.0.6.pre.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c2c33704a13c283abff889703ea874cdbf649063
-  data.tar.gz: d072ed418b07f26a742aba939ffc78f38f9630cf
+  metadata.gz: 870ee3524e61a543f0239a9bc5d5e635b228e964
+  data.tar.gz: 29c5ea749c45fea4391af9845ac57e112cb59bfa
 SHA512:
-  metadata.gz: 0a94cec105593e4e8422f02aaaef444c0d9cf1adc40fe65b599b3f6a6f52dcbe68242f50026bcbccedbde3915ee8ef1830e1244b56e364e1056c4a97f0f80f37
-  data.tar.gz: 63b221f779d9184ce083e80b457cb30e260ba2003014899b2c50a634c562d4dd8dbaf05df9e7a8bce1acf84c927bf01acb51525568deb113f3109a28111a6f08
+  metadata.gz: 1ae6eb277c085226329af0d2014042e0eae58447c1c0da53bb518236c19092a5d25a2368ee2d2a24bec892ff3cc67d485c1f106ee06076a23d119a25ef07caab
+  data.tar.gz: 42af4c91a332ed6f1d99c1673578ff031b714e19b56f77fd13e35205d47240d6d7dfc784044bcbf7e2179f5834ce54fcad0526747b7eeb3b6849cf2ef3b618d4

data/CHANGELOG

@@ -2,3 +2,4 @@
 * Version 0.0.6.pre.1: Add ignore errors
 * 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

data/lib/kurchatov/application.rb

@@ -14,6 +14,7 @@ module Kurchatov
   class Application
     include Mixlib::CLI
     include Kurchatov::Mixin::Ohai
+    include Kurchatov::Mixin::Monitor
 
     option :help,
            :short => '-h',
@@ -119,24 +120,24 @@ module Kurchatov
       return if Config[:test_plugin]
       Log.error('Please set riemann host') and exit Config[:ERROR_CONFIG] unless Config[:riemann_responder]
       if Config[:udp_responder]
-        @monitor << Responders::Udp.new(Config[:udp_responder])
+        monitor << Responders::Udp.new(Config[:udp_responder])
       end
       if Config[:http_responder]
-        @monitor << Responders::Http.new(Config[:http_responder])
+        monitor << Responders::Http.new(Config[:http_responder])
       end
-      @monitor << Responders::Riemann.new(Config[:riemann_responder])
+      monitor << Responders::Riemann.new(Config[:riemann_responder])
     end
 
     def configure_plugins
       return if Config[:test_plugin]
       plugins = Kurchatov::Plugins::Config.load_plugins(Config[:plugin_paths],
                                                         Config[:config_file])
-      plugins.each { |p| @monitor << p }
+      plugins.each { |p| monitor << p }
     end
 
     def configure_test_plugin
       return unless Config[:test_plugin]
-      @monitor << Kurchatov::Plugins::DSL.load_riemann_plugin(Config[:test_plugin])
+      monitor << Kurchatov::Plugins::DSL.load_riemann_plugin(Config[:test_plugin])
     end
 
     def run
@@ -147,7 +148,7 @@ module Kurchatov
       configure_responders
       configure_plugins
       configure_test_plugin
-      @monitor.run
+      monitor.run
     end
 
   end

data/lib/kurchatov/mixin/init.rb

@@ -3,3 +3,4 @@ require_relative 'http'
 require_relative 'ohai'
 require_relative 'queue'
 require_relative 'event'
+require_relative 'monitor'

data/lib/kurchatov/mixin/monitor.rb

@@ -0,0 +1,18 @@
+require 'kurchatov/monitor'
+
+module Kurchatov
+  module Mixin
+    module Monitor
+
+      class << self
+        attr_accessor :instance_monitor
+      end
+
+      def monitor
+        @instance_monitor ||= Kurchatov::Mixin::Monitor.instance_monitor ||=
+          Kurchatov::Monitor.new(Kurchatov::Config[:stop_on_error] || !!Kurchatov::Config[:test_plugin])
+      end
+
+    end
+  end
+end

data/lib/kurchatov/mixin/queue.rb

@@ -4,7 +4,7 @@ module Kurchatov
   module Mixin
     module Queue
 
-      class << self;
+      class << self
         attr_accessor :instance_queue
       end
 

data/lib/kurchatov/monitor.rb

@@ -10,6 +10,22 @@ module Kurchatov
         @thread = Thread.new { @plugin.run }
       end
 
+      def status
+        !!@thread.alive?
+      end
+
+      def name
+        @plugin.name
+      end
+
+      def type
+        @plugin.class.to_s
+      end
+
+      def uptime
+        @plugin.uptime
+      end
+
       def died?
         return false if @thread.alive?
         # thread died, join and extract error
@@ -19,7 +35,7 @@ module Kurchatov
           desc = "Plugin '#{@plugin.name}' died. #{e.class}: #{e}\n." +
             "Trace:  #{e.backtrace.join("\n")}"
           Log.error(desc)
-          unless @plugin.ignore_errors 
+          unless @plugin.ignore_errors
             event(:service => 'riemann client errors', :desc => desc, :state => 'critical')
           end
         end
@@ -50,8 +66,8 @@ module Kurchatov
       end
     end
 
-    def tasks_status
-      @tasks.map { |t| t.status }
+    def inspect
+      @tasks.map {|t| {name: t.name, alive: t.status, type: t.type, uptime: t.uptime}  }
     end
 
   end

data/lib/kurchatov/plugin/riemann.rb

@@ -26,6 +26,7 @@ module Kurchatov
       end
 
       def run
+        super
         loop do
           t_start = Time.now
           Timeout::timeout(interval * 2.to_f/3) do

data/lib/kurchatov/plugin.rb

@@ -10,7 +10,11 @@ module Kurchatov
     end
 
     def run
-      raise
+      @t_start = Time.now
+    end
+
+    def uptime
+      Time.now.to_i - @t_start.to_i
     end
 
   end

data/lib/kurchatov/responders/http.rb

@@ -2,6 +2,8 @@ module Kurchatov
   module Responders
     class Http < Kurchatov::Plugin
 
+      include Kurchatov::Mixin::Monitor
+
       def initialize(conn)
         @host, @port = conn.split(':')
         @name = "http server #{@host}:#{@port}"
@@ -9,6 +11,7 @@ module Kurchatov
       end
 
       def run
+        super
         @server ||= TCPServer.new(@host, @port)
         loop do
           client = @server.accept
@@ -28,7 +31,7 @@ module Kurchatov
         {
             :version => Kurchatov::VERSION,
             :uptime => (Time.now - @s_time).to_i,
-            :config => Kurchatov::Config.to_hash,
+            :monitor => monitor.inspect,
         }.to_json + "\n"
       end
 

data/lib/kurchatov/responders/riemann.rb

@@ -14,6 +14,7 @@ module Kurchatov
       end
 
       def run
+        super
         make_clients
         loop { flush; sleep FLUSH_INTERVAL }
       end

data/lib/kurchatov/responders/udp.rb

@@ -11,6 +11,7 @@ module Kurchatov
 
 
       def run
+        super
         Socket.udp_server_loop(@host, @port) do |data, src|
           process(data, src)
         end

data/lib/kurchatov/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kurchatov
 version: !ruby/object:Gem::Version
-  version: 0.0.6.pre.4
+  version: 0.0.6.pre.5
 platform: ruby
 authors:
 - Vasiliev Dmitry
@@ -170,6 +170,7 @@ files:
 - lib/kurchatov/mixin/event.rb
 - lib/kurchatov/mixin/http.rb
 - lib/kurchatov/mixin/init.rb
+- lib/kurchatov/mixin/monitor.rb
 - lib/kurchatov/mixin/ohai.rb
 - lib/kurchatov/mixin/queue.rb
 - lib/kurchatov/monitor.rb