kurchatov 0.4.4 → 0.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 43c2f5fc8bf75c0af40a3919208e0a748750c91f
-  data.tar.gz: f53957777188f757c6d2041d948ef92611d4d41b
+  metadata.gz: dedbea2515abecae45c05763127b1509151bb816
+  data.tar.gz: 4744f4e3f3d895767abbc7f7109d97e1552a2ef5
 SHA512:
-  metadata.gz: 956ef5f6b0de51fb8ebab2c499c4d430e9dacdfbc55afc554ccbceb02a63feb186712d14738e887d1adac2a46c1973d29070b88079d2753d4e171a9fd6cdb7e3
-  data.tar.gz: 9a3f51a3b530c992bd5e3121637f5511ce0008ce11e4c9151e73aeee323d4a83231eac62701e60f12b9d50211dd5348e3d6b51e22c367c2d4a7ba2fdc29dae59
+  metadata.gz: 98b2b1e536a047323d3353c63b73e5f0cdb1d6fd86196a1ca9942fd388dc6ed41f4f096387e9a1068bc86166c89652336130cf70236c9350fe074c61a73842ec
+  data.tar.gz: 5a345331cdf60692fa7264ba9632623c085e94e3fb67f258785d8b0244c044d7a1bd5d07f78f943331ade28fb08772f8f5a152dfdc70f932ebd9dbeb9cd31966

data/app/Gemfile

@@ -1,6 +1,6 @@
 source "https://rubygems.org"
 
-gem "kurchatov", "= 0.4.3"
+gem "kurchatov", "= 0.4.4"
 gem "beefcake", "=0.5.0"
 gem "sys-filesystem"
 gem "sys-proctable"

data/app/Gemfile.lock

@@ -14,7 +14,7 @@ GEM
     file-tail (1.0.12)
       tins (~> 0.5)
     ipaddress (0.8.0)
-    kurchatov (0.4.3)
+    kurchatov (0.4.4)
       beefcake (>= 0.3.5)
       ohai
     libyajl2 (1.0.1)
@@ -54,7 +54,7 @@ DEPENDENCIES
   beefcake (= 0.5.0)
   ffi-rzmq
   file-tail
-  kurchatov (= 0.4.3)
+  kurchatov (= 0.4.4)
   net-ntp
   net-ping
   parallel

data/debian/changelog

@@ -1,3 +1,9 @@
+riemann-client (1:0.4.4) stable; urgency=low
+
+  * Fix set time in event.
+
+ -- Undev DevOps Team <devops@undev.ru>  Mon, 15 Dec 2014 20:08:12 +0300
+
 riemann-client (1:0.4.3) stable; urgency=low
 
   * Start without config file.

data/lib/kurchatov/responders/http_transport.rb

@@ -4,6 +4,8 @@ always_start true
 ignore_errors true
 
 default[:url] = Kurchatov::Config[:http_transport]
+default[:max_size] = 7000
+default[:retry] = 3
 
 run_if do
   !!plugin.url
@@ -11,23 +13,65 @@ 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
+  def body(events = [])
+    { :service => 'service-status',
+      :message_type => 'riemann_client_message',
+      :message => {:events => events} }.to_json
+  end
+
+  def cut_events(events = [])
+    events.map {|event| event[:description] = ""}
+  end
+
+  # отправляет сообщение с retry
+  def send(http_body = "")
+    count = 0
+    while (count < plugin.retry)
+      Log.debug("Send http_body [#{http_body.size}]: #{http_body}")
+      _, code = http_post(plugin.url, http_body)
+      # если неудачно, пробуем еще раз
+      if (code == 0 || code > 300)
+        Log.error("Response code: #{code} from #{plugin.url}")
+        count+=1
+      else
+        return
+      end
+    end
+  end
+
+  # отправляем если только размер не превышает максимального
+  def safe_send(http_body = "")
+    if http_body.size > plugin.max_size
+      return false
     end
-    @events_to_send = nil
+    send(http_body)
+    return true
+  end
+
+  # отсылем сообщения
+  def safe_send_events(events = [])
+    return if (events.nil? || events.size == 0)
+    debt_event = []
+    until safe_send(body(events))
+      if events.size > 1
+        debt_event << events.pop
+      else
+        # одно сообщение не пролазит
+        Log.error("Drop message because its too big")
+      end
+    end
+    Log.debug("Ok, #{events.size} events sended, and #{debt_event.size} events in debet")
+    safe_send_events(debt_event) if debt_event.size > 0
+  end
+
+  def flush
+    @events_queue ||= events.to_flush
+    safe_send_events(@events_queue) if !@events_queue.nil?
+    @events_queue = nil
   end
 
 end
 
 run do
   loop { flush; sleep 1 }
-end
+end

data/lib/kurchatov/version.rb

@@ -1,3 +1,3 @@
 module Kurchatov
-  VERSION = "0.4.4"
+  VERSION = "0.4.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kurchatov
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.4.5
 platform: ruby
 authors:
 - Vasiliev Dmitry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-18 00:00:00.000000000 Z
+date: 2015-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: beefcake