nais-log-parser 0.37.0 → 0.38.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e0154c14d56b0fa3c4b9fcdbf91ae2e632fd29e6
-  data.tar.gz: 15fc18a9526c870e80c4e27e6358d04aa9dd71ea
+  metadata.gz: 0e55514e500be8a8e0d0dd35ba101be13c716f1b
+  data.tar.gz: 4439135cd75f73c9c3c8c12247638274615c2007
 SHA512:
-  metadata.gz: bc7114ce318e2429cf8a9f6f2c104189496798dcdb39c51b5ad7041890407331bc6038c533823809e87dcbd04d527fef941f8fc04a3998708bf95cbe2bd43118
-  data.tar.gz: 5c72f3a64e0ea9b3f9813fcddce3fa436f2c9b9ce94bfdba10d6458b81444cf841c6dda80ae47aa3838f9aca3f86c3e33be3c5b3af1645cfd6841ea04603f585
+  metadata.gz: 8de91fbb4a6f722d68038c45e87d740377aed723441bbff8048c19908257025f10746138e9251c2f1ab485ae626f3a7759732d893de3ba13969d9032a2abc1fd
+  data.tar.gz: 8c9474fba5d1b52a23060ad65a83fa6fb42ae515c9c506c01eb06953f90be480215decbd9b73cc3ac9923de79091bdc8e46fd972c85a7ddece12b937045d758d

data/lib/nais/log/parser.rb

@@ -169,8 +169,14 @@ 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") || record.delete("ts") || Time.at(time).iso8601(9)
+          record["@timestamp"] = record.delete("timestamp") || record.delete("time") || record.delete("ts")
         end
+        begin
+          record["@timestamp"] = Time.parse(record["@timestamp"]).iso8601(9) if record.has_key?("@timestamp") && !record["@timestamp"].nil?
+        rescue ArgumentError
+          record["unparsed_timestamp"] = record.delete("@timestamp") unless record["@timestamp"].nil?
+        end
+        record["@timestamp"] = Time.at(time).iso8601(9) if !record.has_key?("@timestamp") || record["@timestamp"].nil?
         unless record.has_key?("message")
           record["message"] = record.delete("msg") || record.delete("log")
         end

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

@@ -1,7 +1,7 @@
 module Nais
   module Log
     module Parser
-      VERSION = "0.37.0"
+      VERSION = "0.38.0"
     end
   end
 end

metadata

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