riemann-babbler 2.1.0 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 96578ff4302dcba373da13b23889764533e98305
-  data.tar.gz: 650d98968c0ed1b744fd1dab80f439ff44697459
+  metadata.gz: 309e98cc3923bdafb829a77216513196e66936fe
+  data.tar.gz: a243882a84cb89330c49ad95b80060113ef94d86
 SHA512:
-  metadata.gz: 218625d8f0c497512a4f8328046bc97d05fe09b0053eb99b3ef6aebda1894fa3cbcda25319aa975afd0e26b12b44f0d997b79b1ccd53c53c0a67f8d7d7a02249
-  data.tar.gz: 856654efa64b09608b6749d78dd97f79e2fdcaf88ebe379300301c966a3f01c10a53fe4a7509c68020c4fd4334d8cf9524d1f1aa9f4928a1aa8dad5d7fcaba8e
+  metadata.gz: e5d6d95cffe705d7a26d294d75ceb57be4d0f5b86558755c8225eeb96e9ff854f6597a9bf9b6e23f6d867018ed3a17eecfb08c14a376a24ac7d6cacf2982b32e
+  data.tar.gz: 6835bbb55f10335dd2f9e533c262d669ec60e4220289a6ccaa7d394797d7d5e6490a30d9f4d4e35630f73bc9686a97f4cad6b399f26853574fca0b679a587406

data/Gemfile.lock

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

data/lib/riemann/babbler/plugins/helpers/event.rb

@@ -0,0 +1,38 @@
+#encoding: utf-8
+
+module Riemann
+  module Babbler
+    module Plugins
+      module Helpers
+
+        RIEMANN_RESERVED_FIELDS = [
+          :time,
+          :state,
+          :service,
+          :host,
+          :description,
+          :metric,
+          :tags,
+          :ttl
+        ]
+
+        def event_from_hash(hash=nil)
+          if hash
+            new_hash = Hash.new
+            RIEMANN_RESERVED_FIELDS.each do |key|
+              new_hash[key] = hash[key] || hash[key.to_s]
+            end
+            new_hash
+          else
+            Hash.new
+          end
+        end
+
+        def event_from_json(str)
+          event_from_hash(JSON.parse(str))
+        end
+
+      end
+    end
+  end
+end

data/lib/riemann/babbler/plugins/helpers/init.rb

@@ -1,3 +1,4 @@
+require_relative 'event'
 require_relative 'rest'
 require_relative 'shell'
 require_relative 'unixnow'

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

@@ -1,5 +1,4 @@
 require 'socket'
-require 'json'
 
 class Riemann::Babbler::Plugin::ResponderUdp < Riemann::Babbler::Plugin
 
@@ -9,7 +8,7 @@ class Riemann::Babbler::Plugin::ResponderUdp < Riemann::Babbler::Plugin
 
   def process(data, src)
     begin
-      report(JSON.parse(data)) # symbolize event in sender
+      report event_from_json(data)
       src.reply "sended\n"
     rescue
       log :error, "Failed to send message: #{data.inspect}"

data/lib/riemann/babbler/sender.rb

@@ -58,7 +58,6 @@ module Riemann
       end
 
       def <<(event)
-        symbolize_event(event)
         set_event_hostname(event)
         set_event_tags(event)
         log :debug, "Post event: #{event}"
@@ -86,10 +85,6 @@ module Riemann
         event[:host] = @hostname unless event[:host]
       end
 
-      def symbolize_event(event)
-        event = event.inject({}){|memo,(k,v)| memo[k.to_sym] = v; memo}
-      end
-
       def hostname
         if opts.riemann.fqdn
           hostname = Socket.gethostbyname(Socket.gethostname).first

data/lib/riemann/babbler/version.rb

@@ -1,5 +1,5 @@
 module Riemann
   module Babbler
-    VERSION = '2.1.0'
+    VERSION = '2.1.1'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: riemann-babbler
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.1
 platform: ruby
 authors:
 - Vasiliev Dmitry
@@ -254,6 +254,7 @@ files:
 - lib/riemann/babbler/plugins/exim4.rb
 - lib/riemann/babbler/plugins/find_files.rb
 - lib/riemann/babbler/plugins/haproxy.rb
+- lib/riemann/babbler/plugins/helpers/event.rb
 - lib/riemann/babbler/plugins/helpers/init.rb
 - lib/riemann/babbler/plugins/helpers/rest.rb
 - lib/riemann/babbler/plugins/helpers/shell.rb