Adapt OOMKilling pattern to current kernels

Jan Heidbrink · jheidbrink · commit 659f31c0f27a · 2018-07-31T15:15:45.000+02:00
diff --git a/config/kernel-monitor-filelog.json b/config/kernel-monitor-filelog.json
@@ -20,7 +20,7 @@
 		{
 			"type": "temporary",
 			"reason": "OOMKilling",
-			"pattern": "Kill process \\d+ (.+) score \\d+ or sacrifice child\\nKilled process \\d+ (.+) total-vm:\\d+kB, anon-rss:\\d+kB, file-rss:\\d+kB"
+			"pattern": "Kill process \\d+ (.+) score \\d+ or sacrifice child\\nKilled process \\d+ (.+) total-vm:\\d+kB, anon-rss:\\d+kB, file-rss:\\d+kB.*"
 		},
 		{
 			"type": "temporary",
diff --git a/config/kernel-monitor.json b/config/kernel-monitor.json
@@ -18,7 +18,7 @@
 		{
 			"type": "temporary",
 			"reason": "OOMKilling",
-			"pattern": "Kill process \\d+ (.+) score \\d+ or sacrifice child\\nKilled process \\d+ (.+) total-vm:\\d+kB, anon-rss:\\d+kB, file-rss:\\d+kB"
+			"pattern": "Kill process \\d+ (.+) score \\d+ or sacrifice child\\nKilled process \\d+ (.+) total-vm:\\d+kB, anon-rss:\\d+kB, file-rss:\\d+kB.*"
 		},
 		{
 			"type": "temporary",
diff --git a/test/kernel_log_generator/problems/oom_kill b/test/kernel_log_generator/problems/oom_kill
@@ -1,2 +1,2 @@
 Memory cgroup out of memory: Kill process 1012 (heapster) score 1035 or sacrifice child
-Killed process 1012 (heapster) total-vm:327128kB, anon-rss:306328kB, file-rss:11132kB
+Killed process 1012 (heapster) total-vm:327128kB, anon-rss:306328kB, file-rss:11132kB, shmem-rss:12345kB

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@`
`20`	`20`	`{`
`21`	`21`	`"type": "temporary",`
`22`	`22`	`"reason": "OOMKilling",`
`23`		`- "pattern": "Kill process \\d+ (.+) score \\d+ or sacrifice child\\nKilled process \\d+ (.+) total-vm:\\d+kB, anon-rss:\\d+kB, file-rss:\\d+kB"`
	`23`	`+ "pattern": "Kill process \\d+ (.+) score \\d+ or sacrifice child\\nKilled process \\d+ (.+) total-vm:\\d+kB, anon-rss:\\d+kB, file-rss:\\d+kB.*"`
`24`	`24`	`},`
`25`	`25`	`{`
`26`	`26`	`"type": "temporary",`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@`
`18`	`18`	`{`
`19`	`19`	`"type": "temporary",`
`20`	`20`	`"reason": "OOMKilling",`
`21`		`- "pattern": "Kill process \\d+ (.+) score \\d+ or sacrifice child\\nKilled process \\d+ (.+) total-vm:\\d+kB, anon-rss:\\d+kB, file-rss:\\d+kB"`
	`21`	`+ "pattern": "Kill process \\d+ (.+) score \\d+ or sacrifice child\\nKilled process \\d+ (.+) total-vm:\\d+kB, anon-rss:\\d+kB, file-rss:\\d+kB.*"`
`22`	`22`	`},`
`23`	`23`	`{`
`24`	`24`	`"type": "temporary",`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`Memory cgroup out of memory: Kill process 1012 (heapster) score 1035 or sacrifice child`
`2`		`-Killed process 1012 (heapster) total-vm:327128kB, anon-rss:306328kB, file-rss:11132kB`
	`2`	`+Killed process 1012 (heapster) total-vm:327128kB, anon-rss:306328kB, file-rss:11132kB, shmem-rss:12345kB`