riemann-babbler 2.6.0 → 2.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6e0ecc11857794e573afa18885de1e5f2c5ab311
-  data.tar.gz: c2aa26cf376bb34ace8dda00660b3d3ae4d959e6
+  metadata.gz: b143063f41beb4c9b327111f13891f54f06191c9
+  data.tar.gz: d2aace2daf7fa06e8220a672702e30e732fe58cf
 SHA512:
-  metadata.gz: c7ef74e2db40a7666911c5498c7fdc40a98bf6cee45dc84617a90033311a7e142843f74909e37c5d302e59236fa69ebff9da67cfb8cc3fe408ce255ea7b11e98
-  data.tar.gz: d883df8c7604020fa6f73a6fd0d9219747ab1c83560178de0f3a6ec5b2fca9f8e003ef79779fb965299d5c197ec18012b387f67ee3aeec42374974c76069b3cf
+  metadata.gz: 1b754dcde7563b03eba8aaf01e1915163cce48ed71ed938f42f48e5c3deb3b55f9e4b91e6cff8677794213d7288af1a63c69b489fcab05e6f0deea29d0222a3d
+  data.tar.gz: 6384087ddff384f9b21c37daf739e141033b673a7557497f818d0cf0fbdbae659a4e365f8838b5d1ce3207b8374f853b91d4dca6e3f9aad0a09fbb36fde5720f

data/.gitignore

@@ -4,3 +4,4 @@ pkg/
 *.swp
 .bundle
 vendor
+.vendor

data/Gemfile.lock

@@ -1,7 +1,8 @@
 PATH
   remote: .
   specs:
-    riemann-babbler (2.6.0)
+    riemann-babbler (2.8.0)
+      beefcake
       configatron
       docile
       file-tail
@@ -9,7 +10,6 @@ PATH
       net-ntp
       net-ping
       rest-client
-      riemann-client
       sys-filesystem
       sys-proctable
       trollop
@@ -17,19 +17,18 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    beefcake (0.4.0)
+    beefcake (0.5.0)
     blankslate (2.1.2.4)
     coderay (1.0.9)
     configatron (2.13.0)
       yamler (>= 0.1.0)
     diff-lcs (1.2.4)
-    docile (1.1.0)
+    docile (1.1.2)
     ffi (1.9.3)
     file-tail (1.0.12)
       tins (~> 0.5)
     method_source (0.8.2)
     mime-types (2.0)
-    mtrc (0.0.4)
     net-http-server (0.2.2)
       parslet (~> 1.0)
     net-ntp (2.1.1)
@@ -44,10 +43,6 @@ GEM
     rake (10.1.0)
     rest-client (1.6.7)
       mime-types (>= 1.16)
-    riemann-client (0.2.2)
-      beefcake (>= 0.3.5)
-      mtrc (>= 0.0.4)
-      trollop (>= 1.16.2)
     rspec (2.14.1)
       rspec-core (~> 2.14.0)
       rspec-expectations (~> 2.14.0)

data/lib/riemann/babbler/client.rb

@@ -0,0 +1,50 @@
+require "timeout"
+require "socket"
+require "beefcake"
+require "riemann/babbler/event"
+require "riemann/babbler/message"
+
+module Riemann
+  module Babbler
+    class Client
+
+      attr_accessor :host, :port
+
+      CONNECT_TIMEOUT = 5
+      SEND_TIMEOUT = 5
+      RIEMANN_PORT = 5555
+
+      def initialize(opts = {})
+        @host = opts[:host]
+        @port = opts[:port] || RIEMANN_PORT
+        @mutex = Mutex.new
+      end
+
+      def <<(events)
+       events = [events] if events.kind_of?(Hash) 
+       events = events.map {|e| Riemann::Babbler::Event.new(e) }
+       message = Riemann::Babbler::Message.new(:events => events)
+       with_connection do |socket|
+        x = message.encode_with_length
+        Timeout::timeout(SEND_TIMEOUT) {
+          socket.write(x)
+          socket.flush
+        }
+       end
+      end
+
+      def with_connection
+        @mutex.synchronize do
+          yield(@socket || connect)
+        end
+      end
+
+      def connect
+        Timeout::timeout(CONNECT_TIMEOUT) {
+          @socket = TCPSocket.new(@host, @port)
+        }
+      end
+
+    end
+  end
+end

data/lib/riemann/babbler/event.rb

@@ -0,0 +1,42 @@
+module Riemann
+  module Babbler
+    class Event
+      include Beefcake::Message
+      optional :time, :int64, 1
+      optional :state, :string,  2
+      optional :service, :string, 3
+      optional :host, :string, 4
+      optional :description, :string, 5
+      repeated :tags, :string, 7
+      optional :ttl, :float, 8
+      optional :metric_sint64, :sint64, 13
+      optional :metric_d, :double, 14
+      optional :metric_f, :float, 15
+
+      def initialize(hash = nil)
+        if hash
+          super(hash)
+          self.metric = hash[:metric] if hash[:metric]
+        else
+          super
+        end
+        @time ||= Time.now.to_i
+      end
+
+      def metric
+        metric_d || metric_sint64 || metric_f
+      end
+
+      def metric=(m)
+        if Integer === m and (-(2**63)...2**63) === m
+          self.metric_sint64 = m
+          self.metric_f = m.to_f
+        else
+          self.metric_d = m.to_f
+          self.metric_f = m.to_f
+        end
+      end
+
+    end
+  end
+end

data/lib/riemann/babbler/message.rb

@@ -0,0 +1,18 @@
+module Riemann
+  module Repin
+    class Message
+      include Beefcake::Message
+
+      optional :ok, :bool, 2
+      optional :error, :string, 3
+      repeated :events, Riemann::Babbler::Event, 6
+
+      def encode_with_length
+        buffer = ''
+        encoded = encode buffer
+        "#{[encoded.length].pack('N')}#{encoded}"
+      end
+
+    end
+  end
+end

data/lib/riemann/babbler/sender_client.rb

@@ -1,4 +1,4 @@
-require 'riemann/client'
+require 'riemann/babbler/client'
 require 'resolv'
 require 'socket'
 
@@ -52,26 +52,18 @@ module Riemann
 
         # flush events
         def flush
-          return nil if @events.empty?
-          while @events.size > 0
-            event = @events[0]
-            Timeout::timeout(opts.riemann.timeout) {
-              @riemann << event
-            }
-            @events.shift
-            log :debug, "Posted event (#{@host}:#{@port}): #{event.inspect}"
-          end
+          @riemann << @events
+          log :debug, "Posted event (#{@host}:#{@port}): #{events.inspect}"
+          @events.clear
         end
 
         # riemann client
         def build_client
           @riemann = nil 
-          @riemann = Riemann::Client.new({
+          @riemann = Riemann::Babbler::Client.new({
             :host => Resolv.new.getaddress(@host), 
-            :port => @port, 
-            :timeout => opts.riemann.timeout
+            :port => @port
           })
-          @riemann = @riemann.tcp if opts.riemann.tcp
           @riemann
         end
 

data/lib/riemann/babbler/version.rb

@@ -1,5 +1,5 @@
 module Riemann
   module Babbler
-    VERSION = '2.6.0'
+    VERSION = '2.8.0'
   end
 end

data/riemann-babbler.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = %w(lib)
 
-  spec.add_dependency 'riemann-client'
+  spec.add_dependency 'beefcake'
   spec.add_dependency 'trollop'
   spec.add_dependency 'rest-client'
   spec.add_dependency 'sys-filesystem'

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: riemann-babbler
 version: !ruby/object:Gem::Version
-  version: 2.6.0
+  version: 2.8.0
 platform: ruby
 authors:
 - Vasiliev Dmitry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-30 00:00:00.000000000 Z
+date: 2014-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: riemann-client
+  name: beefcake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -238,8 +238,11 @@ files:
 - Rakefile
 - bin/riemann-babbler
 - lib/riemann/babbler.rb
+- lib/riemann/babbler/client.rb
 - lib/riemann/babbler/errors.rb
+- lib/riemann/babbler/event.rb
 - lib/riemann/babbler/logging.rb
+- lib/riemann/babbler/message.rb
 - lib/riemann/babbler/monkey_patches.rb
 - lib/riemann/babbler/options.rb
 - lib/riemann/babbler/plugin.rb