franz 1.5.6 → 1.5.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 55da641aa1d850bea403f1fa8d16284d4c9e0744
-  data.tar.gz: de8c946eb160ef42df9db22a446757cc7932d011
+  metadata.gz: 69a2881f66a92b5501837234d774f3fc0e830417
+  data.tar.gz: 71488ffdeca0f212b3d0fbd0e11ac3e24d243c04
 SHA512:
-  metadata.gz: 2ed1d31db5af9431789c77ec990d3d12513906124879375645a146c73be7dce6f79c49390d805901bd341bfdef7a7951fa2b03a8de2e704f49822aa653cf2c13
-  data.tar.gz: 7651fc05d96b7a831b9c526895ec7692bf48f52f4eb09e5d00f5672fec252f1a00cc33054341ce5d52372c6d9c9ee7dc735a384dcca58e711a6b1083df18560f
+  metadata.gz: c1cd50b81aeef2e010b0e8f0c4659dcfca3c13feee1453c2a7a994d2411bad826a4049f5cc8104641599aa06e33b162a8db8b1f41c0506c9cf35cfeaada59477
+  data.tar.gz: 694c4f49f17f0d769bc75215a1b1afe29765c00458d43ea35963f5079e495d394a72ca57e77b7fd11131360ea79fc91a9ab6b6f2a7a3c992fa1bae958e7735e8

data/VERSION

@@ -1 +1 @@
-1.5.6
+1.5.7

data/lib/franz/agg.rb

@@ -108,7 +108,15 @@ module Franz
         message: message
       s = seq path
       m = message.encode 'UTF-8', invalid: :replace, undef: :replace, replace: '?'
-      agg_events.push path: path, message: m, type: t, host: @@host, '@seq' => s
+
+      event = { path: path, type: t, host: @@host, '@seq' => s }
+      if @ic.json? path
+        return if m =~ /^#/
+        event.merge! JSON::parse(m)
+      else
+        event.merge! message: m
+      end
+      agg_events.push event
     end
 
     def capture

data/lib/franz/input_config.rb

@@ -12,6 +12,14 @@ module Franz
       configs.select { |c| c[:type] == t }.shift
     end
 
+    def json? path
+      begin
+        return config(path)[:json?]
+      rescue
+        return false
+      end
+    end
+
     def drop? path, message
       begin
         drop = config(path)[:drop]

data/lib/franz/logger.rb

@@ -53,7 +53,6 @@ module Franz
         message = { message: message } unless message.is_a? Hash
 
         event = {
-          type: :franz,
           level: severity,
           '@timestamp' => datetime.iso8601(3),
           marker: File::basename(caller[4]),

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: franz
 version: !ruby/object:Gem::Version
-  version: 1.5.6
+  version: 1.5.7
 platform: ruby
 authors:
 - Sean Clemmer