riemann-babbler 2.0.7 → 2.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aa32e47b01f2def306dcb975beebf70a2909b7d6
-  data.tar.gz: 799f46518441a10f1b5e5accf59446e2b3d5633b
+  metadata.gz: ca261d40d9f35e4b7aa41926a12aa57f8dc1e606
+  data.tar.gz: d27586426e66ab9485fbeafdf77f4c1bd4528421
 SHA512:
-  metadata.gz: 8ae1a082b8c5f44b084772dd61a1cab4bf4a3d1a665e624e803b913abb2a978d38481f32266f23459110ccc78100541634bf3296505a0d7a503ce92803799389
-  data.tar.gz: 2e256a5a1f0ad80e5c08af978f09258ab6f82a3469f2718d9d4aaa9d0bd192c6c444e478a831bbf55be8ce2b5d7f8f3c48e7a9478192492f9c9d6eb30e1e555e
+  metadata.gz: 8c47fbb89d8ea9c8a81fdc4778622d99b31c0ef1f46bd5aa659dcd073008bb423d76b57ac04022dfaae6bd74a21913056e001fce28ada069a9f2f9f069f3c36c
+  data.tar.gz: d15b7fd46e1f67319af9aafa7a8be67fa156573926149a27aebb79d0b2244b96c5c21d1d4239102b51e2bbf47990a44f351a1ae7cb6e9ba0344add6cde7899bd

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    riemann-babbler (2.0.7)
+    riemann-babbler (2.0.8)
       configatron
       docile
       file-tail

data/bin/riemann-babbler

@@ -32,7 +32,8 @@ where [options] are:
   opt :plugins_directory, 'Directory for plugins', :default => '/usr/share/riemann-babbler/plugins'
   opt :tcp, 'Use TCP transport instead of UDP (improves reliability, slight overhead.', :default => true
   opt :minimize_event_count, 'Minimize count of sent messages', :default => true
-  opt :responder_port, 'Port to bind responder', :default => 55755
+  opt :responder_http_port, 'Port to bind http responder', :default => 55755
+  opt :responder_udp_port, 'Port to bind tcp responder', :default => 55955
 end
 
 # load current settings

data/lib/riemann/babbler/plugin_loader.rb

@@ -24,7 +24,8 @@ module Riemann
           'tw_cli',
           'iptables',
           'errors_reporter',
-          'responder'
+          'responder_http',
+          'responder_udp',
       ].freeze
 
       attr_accessor :load_plugin_names_from_config, :delete_from_autostart

data/lib/riemann/babbler/plugins/ntp.rb

@@ -15,9 +15,9 @@ class Riemann::Babbler::Plugin::Ntp < Riemann::Babbler::Plugin
 
   def collect
     {
-        :service     => plugin.service + " #{plugin.host}",
-        :description => "Ntp lag with host #{plugin.host}",
-        :metric      => (::Net::NTP.get(plugin.host, 'ntp', 5).time.to_i - unixnow).abs
+      :service     => plugin.service + " #{plugin.host}",
+      :description => "Ntp lag with host #{plugin.host}",
+      :metric      => (::Net::NTP.get(plugin.host, 'ntp', 5).time.to_i - unixnow).abs
     }
   end
 

data/lib/riemann/babbler/plugins/{responder.rb → responder_http.rb}

@@ -1,10 +1,10 @@
 require 'net/http/server'
 require 'json'
 
-class Riemann::Babbler::Plugin::Responder < Riemann::Babbler::Plugin
+class Riemann::Babbler::Plugin::ResponderHttp < Riemann::Babbler::Plugin
 
   def init
-    plugin.set_default(:port, opts.riemann.responder_port)
+    plugin.set_default(:port, opts.riemann.responder_http_port)
     plugin.set_default(:started_at, Time.now.to_i)
   end
 
@@ -36,4 +36,4 @@ class Riemann::Babbler::Plugin::Responder < Riemann::Babbler::Plugin
     end
   end
 
-end
+end

data/lib/riemann/babbler/plugins/responder_udp.rb

@@ -0,0 +1,29 @@
+require 'socket'
+require 'json'
+
+class Riemann::Babbler::Plugin::ResponderUdp < Riemann::Babbler::Plugin
+
+  def init
+    plugin.set_default(:port, opts.riemann.responder_udp_port)
+  end
+
+  def process(data, src)
+    begin
+      report(JSON.parse(data))
+      puts "src:#{src.inspect}" 
+      src.reply "ok\n"
+    rescue
+      log :error, "Failed to send message: #{data.inspect}"
+      src.reply "failed to send: #{data.inspect}\n"
+    end    
+  end
+
+  def run!
+    log :unknown, "Start udp server at #{plugin.port}"
+    Socket.udp_server_loop(plugin.port) do |data, src|
+      log :debug, "recived data: #{data.inspect}, from client: #{src.inspect}"
+      process(data, src) 
+    end
+  end
+
+end

data/lib/riemann/babbler/version.rb

@@ -1,5 +1,5 @@
 module Riemann
   module Babbler
-    VERSION = '2.0.7'
+    VERSION = '2.0.8'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: riemann-babbler
 version: !ruby/object:Gem::Version
-  version: 2.0.7
+  version: 2.0.8
 platform: ruby
 authors:
 - Vasiliev Dmitry
@@ -269,7 +269,8 @@ files:
 - lib/riemann/babbler/plugins/nginx.rb
 - lib/riemann/babbler/plugins/ntp.rb
 - lib/riemann/babbler/plugins/pgsql.rb
-- lib/riemann/babbler/plugins/responder.rb
+- lib/riemann/babbler/plugins/responder_http.rb
+- lib/riemann/babbler/plugins/responder_udp.rb
 - lib/riemann/babbler/plugins/runit.rb
 - lib/riemann/babbler/plugins/status_file.rb
 - lib/riemann/babbler/plugins/tw_cli.rb