ivelum-fluent-plugin-oomkiller 0.0.3 → 0.0.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/fluent-plugin-oomkiller.gemspec +1 -1
- data/lib/fluent/plugin/out_oomkiller.rb +24 -17
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: cf0637e01a6323959887674557b6cb1bff81accd
|
|
4
|
+
data.tar.gz: 10b86d17a1828494edcf1f104b829fbcbea51322
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 957b0ee481bf1624baf384c7732716829184322cb107307095e711d85f67c25734761da4aa516d4d0baa3dd7c3c4c83ec9987ae4f6af1b83055ed8702daaf9df
|
|
7
|
+
data.tar.gz: d21085e56a37a1e110484756e0e37326bc2c0738d1d8b6ef273e6eef79423c829f80dd7ce947680eec4b6f7e1718a78319c6533bce9c944cf36fe1cd81631713
|
|
@@ -22,44 +22,51 @@ class Fluent::OomKillerOutput < Fluent::Output
|
|
|
22
22
|
@logs[:"#{tag}"] = []
|
|
23
23
|
end
|
|
24
24
|
chain.next
|
|
25
|
-
es.each {|time,record|
|
|
25
|
+
es.each {|time, record|
|
|
26
26
|
make_record_block(tag, time, record)
|
|
27
27
|
}
|
|
28
28
|
end
|
|
29
29
|
|
|
30
30
|
def make_record_block(tag, time, record)
|
|
31
|
-
record.
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
31
|
+
if !record.has_key?('message')
|
|
32
|
+
return
|
|
33
|
+
end
|
|
34
|
+
|
|
35
|
+
value = record['message']
|
|
36
|
+
|
|
37
|
+
if @is_oomlog then
|
|
38
|
+
@logs[:"#{tag}"] << value
|
|
39
|
+
end
|
|
40
|
+
|
|
41
|
+
if /invoked oom-killer:/ =~ value then
|
|
42
|
+
@is_oomlog = true
|
|
43
|
+
@logs[:"#{tag}"] << value
|
|
44
|
+
elsif /Killed process/ =~ value then
|
|
45
|
+
@is_oomlog = false
|
|
46
|
+
parse_record_block(record, tag, time)
|
|
42
47
|
end
|
|
43
48
|
end
|
|
44
49
|
|
|
45
50
|
REGEX1 = /^(\S+\s+\d+\s\d+:\d+:\d+)\s.+/
|
|
46
51
|
REGEX2 = /Killed process (\d+)\s+\((\S+)\)\s+total-vm:(\d+)kB,\s+anon-rss:(\d+)kB,\s+file-rss:(\d+)kB/
|
|
47
52
|
|
|
48
|
-
def parse_record_block(tag, time)
|
|
53
|
+
def parse_record_block(syslog_record, tag, time)
|
|
49
54
|
record = {}
|
|
50
55
|
|
|
51
|
-
if
|
|
52
|
-
|
|
53
|
-
time = datetime.to_i if datetime
|
|
56
|
+
if syslog_record.has_key?('time') and syslog_record['time'] then
|
|
57
|
+
time = syslog_record['time']
|
|
54
58
|
else
|
|
55
59
|
@logs[:"#{tag}"][0] =~ REGEX1
|
|
56
|
-
if $1
|
|
60
|
+
if $1 then
|
|
57
61
|
datetime = Time.parse($1)
|
|
58
62
|
time = datetime.to_i if datetime
|
|
59
63
|
end
|
|
60
64
|
end
|
|
61
65
|
|
|
62
66
|
@logs[:"#{tag}"][-1] =~ REGEX2
|
|
67
|
+
record['time'] = time
|
|
68
|
+
record['host'] = syslog_record['host']
|
|
69
|
+
record['ident'] = syslog_record['ident']
|
|
63
70
|
record['pid'] = $1.to_i
|
|
64
71
|
record['name'] = $2
|
|
65
72
|
record['total_vm_kb'] = $3.to_i
|