riemann-babbler 0.5.9 → 0.6.0

data/bin/riemann-babbler

@@ -79,12 +79,20 @@ unless configatron.plugins.files.nil?
   end
 end
 
+# set riemann client
+riemann_ip =  Resolv.new.getaddress(configatron.riemann.host)
+riemann = Riemann::Client.new(
+  :host => riemann_ip, 
+  :port => configatron.riemann.port
+)
+riemann = ( configatron.riemann.proto == 'tcp' ) ? riemann.tcp : riemann
+
 # start plugins
 plugins.each { |plugin| require plugin }
 
 plugin_threads = Riemann::Babbler.registered_plugins.map do |plugin|
   Thread.new {
-    plugin.new( configatron, logger ).run
+    plugin.new( configatron, logger, riemann ).run
   }
 end
 

data/config.yml

@@ -1,10 +1,10 @@
 riemann:
-  host: localhost
+  host: 127.0.0.1
   port: 5555
-  dns_ttl: 120
+  proto: auto # auto use tcp + udp(max size 16384), tcp - tcp only
 
 logger:
-  level: WARN
+  level: DEBUG
 
 plugins:
 

data/lib/riemann/babbler/plugin.rb

@@ -20,15 +20,16 @@ module Riemann
     require 'rest_client'
 
     attr_reader :logger
+    attr_reader :riemann
+    alias :r :riemann
     attr_reader :hostname
 
-    def initialize( configatron, logger )
+    def initialize( configatron, logger, riemann )
       @configatron = configatron
       @logger = logger
+      @riemann = riemann
       @storage = Hash.new
-      @configatron.riemann.cache_host = Configatron::Dynamic.new{ riemann_ip }
-      @configatron.riemann.last_cache_time = Time.now
-      @riemann_ip = riemann_random_ip
+      @hostname = get_hostname
       init
       run
     end
@@ -44,27 +45,6 @@ module Riemann
     end
     alias :opts :options
 
-    def riemann_ip
-      if Time.now - options.riemann.last_cache_time > options.riemann.dns_ttl
-        options.riemann.last_cache_time = Time.now  
-        @riemann_ip = riemann_random_ip
-      end
-      @riemann_ip
-    end
-
-    def riemann_random_ip
-      ipaddress = Resolv.new.getaddresses(configatron.riemann.host)
-      ipaddress[rand(ipaddress.length)]
-    end
-
-    def riemann
-      @riemann ||= Riemann::Client.new(
-        :host => options.riemann.cache_host,
-        :port => options.riemann.port
-      )
-    end
-    alias :r :riemann
-
     def report(event)
       report_with_diff(event) and return if event[:as_diff]
       # если нет event[:state] то попробовать его добавить
@@ -72,8 +52,9 @@ module Riemann
         event[:state] = state(event[:metric]) unless plugin.states.critical.nil?
       end
       event[:tags] = options.riemann.tags unless options.riemann.tags.nil?
-      event[:host] =  host
+      event[:host] =  hostname
       logger.debug "Report status: #{event.inspect}"
+      logger.error "Riemann: #{riemann.inspect}"
       riemann << event
     end
 
@@ -85,10 +66,6 @@ module Riemann
       report(event)
     end
 
-    def host
-      @hostname ||= get_hostname
-    end
-
     def get_hostname
       hostname = File.read('/proc/sys/kernel/hostname').strip.downcase
       hostname += options.riemann.suffix unless options.riemann.suffix.nil?

data/lib/riemann/version.rb

@@ -1,5 +1,5 @@
 module Riemann
   class Babbler
-    VERSION = '0.5.9'
+    VERSION = '0.6.0'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: riemann-babbler
 version: !ruby/object:Gem::Version
-  version: 0.5.9
+  version: 0.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -164,7 +164,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 692322419942521535
+      hash: 1081513647507709696
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: