nais-log-parser 0.30.0 → 0.31.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 70827632cc20c20a8640b1259db4a25eec82c340
-  data.tar.gz: 7ce3ecf32c17f4f77c63c40a456d92fbd461b65f
+  metadata.gz: 12cfc920764b7b32c84a562d40a8fe211b030572
+  data.tar.gz: 0f5e35936209c2e0cab9a0fdeb36cdd6f8ce59b3
 SHA512:
-  metadata.gz: e40e7891cf35a6b310ab3d342725473607fe4a346a401796675221542d16772128885a37c93a65f0c521981c87f5058c389442c0bea2cc5397802de44383725a
-  data.tar.gz: a22880467191f6639d21fe4204ed7df4f1d4057e3048752f03fd40160466188b9d746488a311b0047f5087296625470403c6c67738f634482116533542da932e
+  metadata.gz: db0208084b26c804efcc70788d9b571a4ab1ff384ea832df7b8b0ff590f4e27b736ac845c9b4210368ab05c4b5a6d4a19aa0b8e12e334ab8a2e614ffe75167d3
+  data.tar.gz: 45b424e787f9e861d1355db680b8eef5ff5667bd31102715890b66a482b772b97ac68ccc579f5713da273e4238a79a9ebd7740065bad109e9892de3913e7dbe8

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

@@ -1,7 +1,7 @@
 module Nais
   module Log
     module Parser
-      VERSION = "0.30.0"
+      VERSION = "0.31.0"
     end
   end
 end

data/lib/nais/log/parser.rb

@@ -32,22 +32,6 @@ module Nais
         end
       end
 
-      def Parser.remap_kubernetes_fields(record)
-        record["category"] = record.delete("stream") if record.has_key?("stream")
-        if record["docker"].is_a?(Hash)
-          record["container"] = record["docker"]["container_id"]
-          record.delete("docker")
-        end
-        if record["kubernetes"].is_a?(Hash)
-          record["host"] = record["kubernetes"]["host"]
-          record["namespace"] = record["kubernetes"]["namespace_name"]
-          record["application"] = record["kubernetes"]["container_name"]
-          record["pod"] = record["kubernetes"]["pod_name"]
-          record.delete("kubernetes")
-        end
-        record
-      end
-
       def Parser.merge_json_field(record, field)
         if record.has_key?(field)
           value = record[field].strip
@@ -201,7 +185,7 @@ module Nais
                                'master'
                              end
           end
-          r['timestamp'] = Time.strptime(m[4]+'Z', "%d %b %H:%M:%S.%L%Z").gmtime.iso8601(3)
+          r['timestamp'] = Time.strptime(m[4]+'Z', "%d %b %H:%M:%S.%L%Z").utc.iso8601(3)
           r['level'] = case m[5]
                        when '.'
                          'Debug'
@@ -284,7 +268,7 @@ module Nais
                        when 'F'
                          'Critical'
                        end
-          r['timestamp'] = Time.strptime(m[2], "%m%d %H:%M:%S.%N").iso8601(9)
+          r['timestamp'] = Time.strptime(m[2], "%m%d %H:%M:%S.%N").utc.iso8601(9)
           r['thread'] = m[3]
           r['file'] = m[4]
           r['line'] = m[5]
@@ -298,7 +282,7 @@ module Nais
       def Parser.parse_simple(str)
         if !str.nil? && m = str.match(/^(\d{4}-\d{2}-\d{2}[T ]\d{2}:\d{2}:\d{2}(?:[,.]\d{3,9})?) ([a-zA-Z]+) (?:\[([^\]]+)\] )?(\S+) (.*)/)
           r = {}
-          r['timestamp'] = Time.parse(m[1]).gmtime.iso8601(9)
+          r['timestamp'] = Time.parse(m[1]).utc.iso8601(9)
           r['level'] = m[2]
           r['thread'] = m[3] if !m[3].nil?
           r['component'] = m[4]
@@ -313,7 +297,7 @@ module Nais
       def Parser.parse_capnslog(str)
         if !str.nil? && m = str.match(/^(\d{4}-\d\d-\d\d \d\d:\d\d:\d\d\.\d{6}) ([TDNIWEC]) \| ([^:]+):\s*(.*)/)
           r = {}
-          r['timestamp'] = Time.strptime(m[1], "%Y-%m-%d %H:%M:%S.%N").iso8601(9)
+          r['timestamp'] = Time.strptime(m[1], "%Y-%m-%d %H:%M:%S.%N").utc.iso8601(9)
           r['level'] = case m[2]
                        when 'T'
                          'Trace'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nais-log-parser
 version: !ruby/object:Gem::Version
-  version: 0.30.0
+  version: 0.31.0
 platform: ruby
 authors:
 - Terje Sannum
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-08-10 00:00:00.000000000 Z
+date: 2018-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logfmt