nais-log-parser 0.17.0 → 0.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c7f9e5f82fed0f7ff8cbc8925cb4f48e42b5daec
-  data.tar.gz: cbc9b0b0a89e02cdb27e5a6aa43b9c5bcfa8cd30
+  metadata.gz: 24e0b20d8922874c5116fe064db12f6fed942853
+  data.tar.gz: 11703d20961f9b2e9a3918b7279e83e0cfcb1b68
 SHA512:
-  metadata.gz: b6e058b926be82d8df8ef0f156d80257a948e13f88b67a4b2644192edcd5b1c807f38a7442a172f3b8e283657dafe9d1ae29911b55d01949dd90e9a92cb1803d
-  data.tar.gz: 207adb3bdd8889e50aed9b81bdd389b26020f29b7ed6d587f4e07b8ca2dad5033c26491d61ac25d0cdcac380f593e1d46e1ffe69f759f22c0e7c5b3cbf151048
+  metadata.gz: ab3861b95b8b7c2b582925de31a7a832a4d2165d87d6176349bdecf7cca0a5edbe272d58d66daa09292d99a49c89ca6eb67512360e2f1efeb9edd55a31971453
+  data.tar.gz: e1ac1e52a436c823ace23589006d5cbe86996b013867188499145540579bd73f6bad70e19f9beddd154a301d31c7da8cd60a6f6d5eca566e1322e3ef7ba22488

data/lib/nais/log/parser.rb

@@ -145,7 +145,7 @@ module Nais
       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+(.*)/)
+        if m = str.match(/^([IWEF])(\d{4} \d\d:\d\d:\d\d\.\d{6})\s+(\S+)\s([^:]+):(\d+)\]\s+(.*)/)
           r = {}
           r['level'] = case m[1]
                        when 'I'
@@ -168,6 +168,35 @@ module Nais
         end
       end
 
+      # https://github.com/coreos/pkg/tree/master/capnslog
+      def Parser.parse_capnslog(str)
+        if 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['level'] = case m[2]
+                       when 'T'
+                         'Trace'
+                       when 'D'
+                         'Debug'
+                       when 'N'
+                         'Notice'
+                       when 'I'
+                         'Info'
+                       when 'W'
+                         'Warning'
+                       when 'E'
+                         'Error'
+                       when 'C'
+                         'Critical'
+                       end
+          r['component'] = m[3]
+          r['message'] = m[4]
+          return r
+        else
+          return nil
+        end
+      end
+
       def Parser.parse_influxdb(str)
         if m = str.match(/^\[([^\]]+)\] (.*)$/)
           r = {}

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

@@ -1,7 +1,7 @@
 module Nais
   module Log
     module Parser
-      VERSION = "0.17.0"
+      VERSION = "0.18.0"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nais-log-parser
 version: !ruby/object:Gem::Version
-  version: 0.17.0
+  version: 0.18.0
 platform: ruby
 authors:
 - Terje Sannum
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-11-21 00:00:00.000000000 Z
+date: 2017-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler