nais-log-parser 0.20.0 → 0.21.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c70036e94ea76014e3f533b8e895532713a2152e
-  data.tar.gz: e100343a68a89a2ec0f8195f2e6cabe8ee8f6702
+  metadata.gz: 7c89f60358db63121180d36c7770540954593028
+  data.tar.gz: 639ab93c330d7fd227916be8addc79507fc71b7f
 SHA512:
-  metadata.gz: 3c14a916eb7be34754c2981363265fd797d09f8aa5fd5a20040ee5b4338f955c887fab4c44027921abd2eed155f900c40a8fac780af2b94ef1345be4b3a429e0
-  data.tar.gz: fae6c0273f8091a2ae306007c48ea6c4910ff67c1d54744c5761df5db1020d8a95c7f419f4a27a950dd3b2b4e7502deacd4f77bae368a089d651448ae029506a
+  metadata.gz: 362d35ffc43854faf52eb0e7d5aaea7632038dc38093ae786dec9f0e0ee81f05d2983f13aa6564c607d17d0e035cd627ab5a9245186f5b7c3e6c29d600296587
+  data.tar.gz: 9f4f21f72fa6e84170ae77c7c5f07bbd5f8b775a4b5ebd1c107556f6fdd4053caaf71adb5ca76c6e93d11302effd3517a3146cac384b02c2039127a94e30c32d

data/lib/nais/log/parser/version.rb

@@ -1,7 +1,7 @@
 module Nais
   module Log
     module Parser
-      VERSION = "0.20.0"
+      VERSION = "0.21.0"
     end
   end
 end

data/lib/nais/log/parser.rb

@@ -1,6 +1,7 @@
 # coding: utf-8
 require "nais/log/parser/version"
 require "time"
+require "json"
 
 module Nais
   module Log
@@ -41,6 +42,23 @@ module Nais
         record
       end
 
+      def Parser.merge_json_field(record, field)
+        if record.has_key?(field)
+          value = record[field].strip
+          if value[0].eql?('{') && value[-1].eql?('}')
+            begin
+              record = JSON.parse(value).merge(record)
+              record.delete(field)
+              record
+            rescue JSON::ParserError=>e
+              nil
+            end
+          end
+        else
+          nil
+        end
+      end
+
       def Parser.remap_elasticsearch_fields(time, record)
         record["received_at"] = Time.new.iso8601(9)
         unless record.has_key?("@timestamp")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nais-log-parser
 version: !ruby/object:Gem::Version
-  version: 0.20.0
+  version: 0.21.0
 platform: ruby
 authors:
 - Terje Sannum
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-11-30 00:00:00.000000000 Z
+date: 2018-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler