nais-log-parser 0.23.0 → 0.24.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9671fa1dd5f34c22a9b6c2245f97d69684413c0b
-  data.tar.gz: deece4db89162b3ff61fc83c39ebe35a8f773eed
+  metadata.gz: 0c5fa93c1c4e32e41857dd080c21dff3cb76e120
+  data.tar.gz: 2635278eb56450ffc0febb800c75618778c01494
 SHA512:
-  metadata.gz: a7757e82e383e0b381e5c9888fee2b7c15f4b1462d611b63f169002840211ce29e99dd38e2c2733dea6da0583afcb45ef53c09ac8a0b920e4c184bdf1fe7e8cc
-  data.tar.gz: 1eec4d6c6e10452a35abdac7162245101eb03831f017ef776d54c252c2385d8564ee9837d4ff1f813fc7af80cce43fdb93f6ceb4c286c2ac96e6731080276c1b
+  metadata.gz: 40847f05cfeaad6a12e416dc271634609e3ab90ac8e219ad6ab79ae5bd6f6350262764d54f3d0d78b4b1f73180fd573ededd0867e75111e820266987d08a9e6d
+  data.tar.gz: 5b33521dffc2a73a20868995fac8155310b130b8447824d8f2b55fbb36462da9eb338c88007dda2a698c71888996b728ca2ecb010f8bb27185bbc5b733312d79

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

@@ -1,7 +1,7 @@
 module Nais
   module Log
     module Parser
-      VERSION = "0.23.0"
+      VERSION = "0.24.0"
     end
   end
 end

data/lib/nais/log/parser.rb

@@ -60,7 +60,7 @@ module Nais
       def Parser.remap_elasticsearch_fields(time, record)
         record["received_at"] = Time.new.iso8601(9)
         unless record.has_key?("@timestamp")
-          record["@timestamp"] = record.delete("timestamp") || record.delete("time") || Time.at(time).iso8601(9)
+          record["@timestamp"] = record.delete("timestamp") || record.delete("time") || record.delete("ts") || Time.at(time).iso8601(9)
         end
         unless record.has_key?("message")
           record["message"] = record.delete("msg") || record.delete("log")
@@ -180,6 +180,15 @@ module Nais
         end
       end
 
+      def Parser.parse_gokit(str)
+        r = Logfmt.parse(str)
+        if !r.nil? && r.has_key?('ts') && r.has_key?('level') && r.has_key?('msg')
+          r
+        else
+          nil
+        end
+      end
+
       def Parser.parse_glog(str)
         if m = str.match(/^([IWEF])(\d{4} \d\d:\d\d:\d\d\.\d{6})\s+(\S+)\s([^:]+):(\d+)\]\s+(.*)/)
           r = {}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nais-log-parser
 version: !ruby/object:Gem::Version
-  version: 0.23.0
+  version: 0.24.0
 platform: ruby
 authors:
 - Terje Sannum
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-05-24 00:00:00.000000000 Z
+date: 2018-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logfmt