kurchatov 0.3.8 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8915eb813afd2686812de217ca53345353a3868c
-  data.tar.gz: 2f12e836dbae2921c909a1fad528b5f6e884164c
+  metadata.gz: 882843085745f7e2cbe6d86c71579c2bbd94fd71
+  data.tar.gz: 7d87f910409e109272296cec7a99a994b4075909
 SHA512:
-  metadata.gz: b766a829a18a9084fb9841db191b9ef67ee6945615aaed7b70f0e3717aaaa6df6a43e73fa1771f1d4a75de17e5fbd7528c9ff82a098abb69e309255f65bd3a0c
-  data.tar.gz: d7c1133be70f2526a56f175d9c72dfd6fc84de70c078b03199ef1886f6c941c1ff29b6a82a9d995ac6a4354a0f28ca53d0277d8e49840c742e518644322198ca
+  metadata.gz: d2eb1257a80ecb9ebf4e8c779e5bbe07bd32f2517929445feebd9bb7f17f04cc9af2baf16a81581962a48d96241862895ae5068c3fb36c5b192090f7b46cc042
+  data.tar.gz: 4080fa6689cb734639670dc8f11073955e17ca8acefa3f99f8ca563edd60ddde979c7ba0701f9440ce8ae0cb2133d3a752512680e10b5ebbadb6e10e9f3b5504

data/app/Gemfile

@@ -1,6 +1,6 @@
 source "https://rubygems.org"
 
-gem "kurchatov", "= 0.3.6"
+gem "kurchatov", "= 0.3.8"
 gem "beefcake", "=0.5.0"
 gem "sys-filesystem"
 gem "sys-proctable"
@@ -11,3 +11,4 @@ gem "ffi-rzmq", :require => false
 gem "addressable", :require => false
 gem "parallel", :require => false
 gem "useragent", :require => false
+gem "yajl-ruby", "=1.2.1"

data/app/Gemfile.lock

@@ -6,36 +6,44 @@ GEM
     ffi (1.9.3)
     ffi-rzmq (2.0.1)
       ffi-rzmq-core (>= 1.0.1)
-    ffi-rzmq-core (1.0.2)
+    ffi-rzmq-core (1.0.3)
       ffi (~> 1.9)
+    ffi-yajl (1.1.0)
+      ffi (~> 1.5)
+      libyajl2 (~> 1.0)
     file-tail (1.0.12)
       tins (~> 0.5)
     ipaddress (0.8.0)
-    kurchatov (0.3.6)
+    kurchatov (0.3.8)
       beefcake (>= 0.3.5)
-      ohai (~> 6.20.0)
+      ohai
+    libyajl2 (1.0.1)
+    mime-types (1.25.1)
     mixlib-cli (1.5.0)
     mixlib-config (2.1.0)
     mixlib-log (1.6.0)
     mixlib-shellout (1.4.0)
-    net-ntp (2.1.1)
-    net-ping (1.7.1)
-      ffi (>= 1.0.0)
-    ohai (6.20.0)
+    net-ntp (2.1.2)
+    net-ping (1.7.4)
+    ohai (7.4.0)
+      ffi (~> 1.9)
+      ffi-yajl (~> 1.0)
       ipaddress
+      mime-types (~> 1.16)
       mixlib-cli
-      mixlib-config
+      mixlib-config (~> 2.0)
       mixlib-log
-      mixlib-shellout
-      systemu (~> 2.5.2)
-      yajl-ruby
-    parallel (1.0.0)
-    sys-filesystem (1.1.1)
+      mixlib-shellout (~> 1.2)
+      systemu (~> 2.6.4)
+      wmi-lite (~> 1.0)
+    parallel (1.3.2)
+    sys-filesystem (1.1.2)
       ffi
-    sys-proctable (0.9.3)
-    systemu (2.5.2)
-    tins (0.13.1)
+    sys-proctable (0.9.4)
+    systemu (2.6.4)
+    tins (0.13.2)
     useragent (0.10.0)
+    wmi-lite (1.0.0)
     yajl-ruby (1.2.1)
 
 PLATFORMS
@@ -46,10 +54,11 @@ DEPENDENCIES
   beefcake (= 0.5.0)
   ffi-rzmq
   file-tail
-  kurchatov (= 0.3.6)
+  kurchatov (= 0.3.8)
   net-ntp
   net-ping
   parallel
   sys-filesystem
   sys-proctable
   useragent
+  yajl-ruby (= 1.2.1)

data/debian/changelog

@@ -1,32 +1,50 @@
+riemann-client (1:0.4.0) stable; urgency=low
+
+  * Http transport.
+
+ -- Undev DevOps Team <devops@undev.ru>  Sat, 06 Dec 2014 19:52:18 +0300
+
+riemann-client (1:0.3.9) stable; urgency=low
+
+  * Add yajl.
+
+ -- Undev DevOps Team <devops@undev.ru>  Tue, 16 Sep 2014 14:47:15 +0000
+
+riemann-client (1:0.3.8) stable; urgency=low
+
+  * Max queue size.
+
+ -- Undev DevOps Team <devops@undev.ru>  Tue, 16 Sep 2014 12:59:46 +0000
+
 riemann-client (1:0.3.6) stable; urgency=low
 
   * Max queue size.
 
- -- Undev DevOps Team <devops@undev.ru>  Sun, 14 Aug 2014 05:13:45 +0000
+ -- Undev DevOps Team <devops@undev.ru>  Sun, 14 Sep 2014 05:13:45 +0000
 
 riemann-client (1:0.3.5) stable; urgency=low
 
   * Full ohai support.
 
- -- Undev DevOps Team <devops@undev.ru>  Fri, 12 Aug 2014 11:20:08 +0000
+ -- Undev DevOps Team <devops@undev.ru>  Fri, 12 Sep 2014 11:20:08 +0000
 
 riemann-client (1:0.3.4) stable; urgency=low
 
   * Less log.
 
- -- Undev DevOps Team <devops@undev.ru>  Sat, 8 Aug 2014 15:54:41 +0000
+ -- Undev DevOps Team <devops@undev.ru>  Sat, 8 Sep 2014 15:54:41 +0000
 
 riemann-client (1:0.3.3) stable; urgency=low
 
   * Add gem useragent.
 
- -- Undev DevOps Team <devops@undev.ru>  Sat, 8 Aug 2014 14:22:13 +0000
+ -- Undev DevOps Team <devops@undev.ru>  Sat, 8 Sep 2014 14:22:13 +0000
 
 riemann-client (1:0.3.3) stable; urgency=low
 
   * Fixes in tags.
 
- -- Undev DevOps Team <devops@undev.ru>  Sat, 6 Aug 2014 08:19:58 +0000
+ -- Undev DevOps Team <devops@undev.ru>  Sat, 6 Sep 2014 08:19:58 +0000
 
 riemann-client (1:0.3.2) stable; urgency=low
 

data/lib/kurchatov/application.rb

@@ -88,6 +88,10 @@ module Kurchatov
            :description => 'Set riemann hosts for send events',
            :proc => lambda { |l| l.split(',') }
 
+    option :http_transport,
+           :long => '--http-transport http://server:port/api',
+           :description => 'Set http server for send events'
+
     option :http_responder,
            :long => '--http 0.0.0.0:55755',
            :description => 'Set http responder for information'

data/lib/kurchatov/mixin/http.rb

@@ -35,6 +35,21 @@ module Kurchatov
         return res.body, res.code.to_i
       end
 
+      # return: body, http_code
+      def http_post(url, body)
+        uri = URI(url)
+        http = Net::HTTP.new(uri.host, uri.port)
+        path = uri.path == '' ? '/' : uri.path
+        request = Net::HTTP::Post.new(path)
+        request.body = body
+        begin
+          response = http.request(request)
+        rescue SocketError, Errno::ECONNREFUSED
+          return nil, 0
+        end
+        return response.body, response.code.to_i
+      end
+
     end
   end
 end

data/lib/kurchatov/responders/{http.rb → http_server.rb}

@@ -1,4 +1,4 @@
-name 'http responder'
+name 'http server'
 always_start true
 
 default[:host], default[:port] = Kurchatov::Config[:http_responder].to_s.split(":")

data/lib/kurchatov/responders/http_transport.rb

@@ -0,0 +1,33 @@
+name 'http transport'
+
+always_start true
+ignore_errors true
+
+default[:url] = Kurchatov::Config[:http_transport]
+
+run_if do
+  !!plugin.url
+end
+
+helpers do
+
+  def flush
+    @events_to_send ||= events.to_flush
+    if !@events_to_send.empty?
+      @body = {
+          :service => 'service-status',
+          :message_type => 'riemann_client_message',
+          :message => {:events => @events_to_send}
+      }.to_json
+      Log.debug("Send body: #{@body}")
+      _, code = http_post(plugin.url, @body)
+      Log.error("Response code: #{code} from #{plugin.url}") if code == 0 || code > 300
+    end
+    @events_to_send = nil
+  end
+
+end
+
+run do
+  loop { flush; sleep 1 }
+end

data/lib/kurchatov/responders/{riemann.rb → riemann_transport.rb}

@@ -1,12 +1,17 @@
 require 'kurchatov/riemann/client'
 
-name 'riemann responder'
+name 'riemann transport'
 always_start true
 ignore_errors true
 
 default[:hosts] = Kurchatov::Config[:riemann_responder]
 
+run_if do
+  plugin.hosts.to_a.length > 0
+end
+
 helpers do
+
   def flush
     @events_to_send ||= events.to_flush
     unless @events_to_send.empty?
@@ -15,6 +20,7 @@ helpers do
     end
     @events_to_send = nil
   end
+
 end
 
 run do

data/lib/kurchatov/responders/{udp.rb → udp_server.rb}

@@ -1,7 +1,7 @@
-name 'udp responder'
+name 'udp transport'
 always_start true
 
-default[:host], default[:port] = Kurchatov::Config[:udp_responder].to_s.split(":")
+default[:host], default[:port] = Kurchatov::Config[:udp_responder].to_s.split(':')
 
 run_if do
   !!Kurchatov::Config[:udp_responder]

data/lib/kurchatov/version.rb

@@ -1,3 +1,3 @@
 module Kurchatov
-  VERSION = "0.3.8"
+  VERSION = "0.4.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kurchatov
 version: !ruby/object:Gem::Version
-  version: 0.3.8
+  version: 0.4.1
 platform: ruby
 authors:
 - Vasiliev Dmitry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-16 00:00:00.000000000 Z
+date: 2014-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: beefcake
@@ -175,9 +175,10 @@ files:
 - lib/kurchatov/plugin/dsl.rb
 - lib/kurchatov/plugin/riemann.rb
 - lib/kurchatov/queue.rb
-- lib/kurchatov/responders/http.rb
-- lib/kurchatov/responders/riemann.rb
-- lib/kurchatov/responders/udp.rb
+- lib/kurchatov/responders/http_server.rb
+- lib/kurchatov/responders/http_transport.rb
+- lib/kurchatov/responders/riemann_transport.rb
+- lib/kurchatov/responders/udp_server.rb
 - lib/kurchatov/riemann/client.rb
 - lib/kurchatov/riemann/event.rb
 - lib/kurchatov/riemann/message.rb