nais-log-parser 0.30.0 → 0.31.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/nais/log/parser/version.rb +1 -1
- data/lib/nais/log/parser.rb +4 -20
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 12cfc920764b7b32c84a562d40a8fe211b030572
|
4
|
+
data.tar.gz: 0f5e35936209c2e0cab9a0fdeb36cdd6f8ce59b3
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: db0208084b26c804efcc70788d9b571a4ab1ff384ea832df7b8b0ff590f4e27b736ac845c9b4210368ab05c4b5a6d4a19aa0b8e12e334ab8a2e614ffe75167d3
|
7
|
+
data.tar.gz: 45b424e787f9e861d1355db680b8eef5ff5667bd31102715890b66a482b772b97ac68ccc579f5713da273e4238a79a9ebd7740065bad109e9892de3913e7dbe8
|
data/lib/nais/log/parser.rb
CHANGED
@@ -32,22 +32,6 @@ module Nais
|
|
32
32
|
end
|
33
33
|
end
|
34
34
|
|
35
|
-
def Parser.remap_kubernetes_fields(record)
|
36
|
-
record["category"] = record.delete("stream") if record.has_key?("stream")
|
37
|
-
if record["docker"].is_a?(Hash)
|
38
|
-
record["container"] = record["docker"]["container_id"]
|
39
|
-
record.delete("docker")
|
40
|
-
end
|
41
|
-
if record["kubernetes"].is_a?(Hash)
|
42
|
-
record["host"] = record["kubernetes"]["host"]
|
43
|
-
record["namespace"] = record["kubernetes"]["namespace_name"]
|
44
|
-
record["application"] = record["kubernetes"]["container_name"]
|
45
|
-
record["pod"] = record["kubernetes"]["pod_name"]
|
46
|
-
record.delete("kubernetes")
|
47
|
-
end
|
48
|
-
record
|
49
|
-
end
|
50
|
-
|
51
35
|
def Parser.merge_json_field(record, field)
|
52
36
|
if record.has_key?(field)
|
53
37
|
value = record[field].strip
|
@@ -201,7 +185,7 @@ module Nais
|
|
201
185
|
'master'
|
202
186
|
end
|
203
187
|
end
|
204
|
-
r['timestamp'] = Time.strptime(m[4]+'Z', "%d %b %H:%M:%S.%L%Z").
|
188
|
+
r['timestamp'] = Time.strptime(m[4]+'Z', "%d %b %H:%M:%S.%L%Z").utc.iso8601(3)
|
205
189
|
r['level'] = case m[5]
|
206
190
|
when '.'
|
207
191
|
'Debug'
|
@@ -284,7 +268,7 @@ module Nais
|
|
284
268
|
when 'F'
|
285
269
|
'Critical'
|
286
270
|
end
|
287
|
-
r['timestamp'] = Time.strptime(m[2], "%m%d %H:%M:%S.%N").iso8601(9)
|
271
|
+
r['timestamp'] = Time.strptime(m[2], "%m%d %H:%M:%S.%N").utc.iso8601(9)
|
288
272
|
r['thread'] = m[3]
|
289
273
|
r['file'] = m[4]
|
290
274
|
r['line'] = m[5]
|
@@ -298,7 +282,7 @@ module Nais
|
|
298
282
|
def Parser.parse_simple(str)
|
299
283
|
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+) (.*)/)
|
300
284
|
r = {}
|
301
|
-
r['timestamp'] = Time.parse(m[1]).
|
285
|
+
r['timestamp'] = Time.parse(m[1]).utc.iso8601(9)
|
302
286
|
r['level'] = m[2]
|
303
287
|
r['thread'] = m[3] if !m[3].nil?
|
304
288
|
r['component'] = m[4]
|
@@ -313,7 +297,7 @@ module Nais
|
|
313
297
|
def Parser.parse_capnslog(str)
|
314
298
|
if !str.nil? && m = str.match(/^(\d{4}-\d\d-\d\d \d\d:\d\d:\d\d\.\d{6}) ([TDNIWEC]) \| ([^:]+):\s*(.*)/)
|
315
299
|
r = {}
|
316
|
-
r['timestamp'] = Time.strptime(m[1], "%Y-%m-%d %H:%M:%S.%N").iso8601(9)
|
300
|
+
r['timestamp'] = Time.strptime(m[1], "%Y-%m-%d %H:%M:%S.%N").utc.iso8601(9)
|
317
301
|
r['level'] = case m[2]
|
318
302
|
when 'T'
|
319
303
|
'Trace'
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: nais-log-parser
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.
|
4
|
+
version: 0.31.0
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Terje Sannum
|
8
8
|
autorequire:
|
9
9
|
bindir: exe
|
10
10
|
cert_chain: []
|
11
|
-
date: 2018-
|
11
|
+
date: 2018-10-03 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: logfmt
|