kurchatov 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a1f64e9798136370628438b5bd0ce96ceedf0074
-  data.tar.gz: db50e1d9d66072ea30df9d4f9cf8135e885aa988
+  metadata.gz: bd2e6e3677c928cc410c260fb87f0f71f70f631a
+  data.tar.gz: bf7a5e34fc99a0c11a857dafaf036fd4447603a0
 SHA512:
-  metadata.gz: dc5c295bbbb4c1e5deac6e71dd0b8a3777cdcba0d8b5bda4651a1add31ba6ed7829c3465d495da5d90279ceedeacd0d6ee13eec7e52b46418f3641d32820de07
-  data.tar.gz: 2ca60f45c84b4cc7df5cf764ad800c0853d0cddf30673fee455afc57d532a704861bfbf68af2d86a44197d980b4f1412ef23b2755771ebe47a0dd937c6fa345a
+  metadata.gz: 3272999af5bde01836ac4caf53c9465cf2e72693337ce12615277eff918e9b3735d7c0ea2dcdabb3b9f45aa66873946f078c844375bd85e9d35007c68218e6b2
+  data.tar.gz: 1875f26d830d8f0576331560617f627f5d580eaaa95637a1348e4803b226205f5f12f55cfc40d7c091410a3247035326d6471607dea14c24e1d8f842394da2a1

data/lib/kurchatov/mixin/http.rb

@@ -1,3 +1,4 @@
+require 'net/http'
 require 'open-uri'
 require 'yajl/json_gem'
 
@@ -5,15 +6,32 @@ module Kurchatov
   module Mixin
     module Http
 
+      USER_AGENT = "Kurchatov (Riemann client v#{Kurchatov::Version})".freeze
+
       # /path/to/file, https://ya.ru, http://a:a@yandex.ru
       def rest_get(url)
         uri = URI(url)
         if uri.userinfo
           open("#{uri.scheme}://#{uri.hostname}:#{uri.port}#{uri.request_uri}",
-               :http_basic_authentication => [uri.user, uri.password]).read
+               :http_basic_authentication => [uri.user, uri.password],
+               'User-Agent' => USER_AGENT).read
         else
-          open(url).read
+          open(url, 'User-Agent' => USER_AGENT).read
+        end
+      end
+
+      # return: body, http_code
+      def http_get(url)
+        uri = URI(url)
+        req = Net::HTTP::Get.new(uri)
+        req['User-Agent'] = USER_AGENT
+        res = nil
+        begin
+          Net::HTTP.start(uri.hostname, uri.port) {|http| res = http.request(req)}
+        rescue SocketError, Errno::ECONNREFUSED
+          return nil, 0
         end
+        return res.body, res.code.to_i
       end
 
     end

data/lib/kurchatov/mixin/runit_service.rb

@@ -0,0 +1,12 @@
+module Kurchatov
+  module Mixin
+    module RunitService
+
+      def runit_service_stat(service)
+        return "unknown" unless File.exitst?("/etc/sv/#{service}/supervise/stat")
+        File.read("/etc/sv/#{service}/supervise/stat")
+      end
+
+    end
+  end
+end

data/lib/kurchatov/monitor.rb

@@ -46,7 +46,7 @@ module Kurchatov
             event(:service => "plugin #{@plugin.name} errors", :desc => desc, :state => 'critical')
           end
         end
-        @thread = Thread.new { @plugin.start }
+        @thread = Thread.new { @plugin.start! }
         true
       end
 

data/lib/kurchatov/plugin/riemann.rb

@@ -12,6 +12,7 @@ module Kurchatov
       include Kurchatov::Mixin::Event
       include Kurchatov::Mixin::Command
       include Kurchatov::Mixin::Http
+      include Kurchatov::Mixin::RunitService
       include Kurchatov::Mixin::Queue
       include Kurchatov::Mixin::Monitor
 

data/lib/kurchatov/version.rb

@@ -1,3 +1,3 @@
 module Kurchatov
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kurchatov
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Vasiliev Dmitry
@@ -159,6 +159,7 @@ files:
 - lib/kurchatov/mixin/monitor.rb
 - lib/kurchatov/mixin/ohai.rb
 - lib/kurchatov/mixin/queue.rb
+- lib/kurchatov/mixin/runit_service.rb
 - lib/kurchatov/monitor.rb
 - lib/kurchatov/plugin.rb
 - lib/kurchatov/plugin/config.rb