Gilles has uploaded a new change for review.
https://gerrit.wikimedia.org/r/315272
Change subject: Add mtail program to track thumbor OOM kills
......................................................................
Add mtail program to track thumbor OOM kills
Refs T145623
Change-Id: I47b0175943157efc441cf7f24b96fa97f7b56ee1
---
A modules/thumbor/files/thumbor.mtail
M modules/thumbor/manifests/init.pp
2 files changed, 15 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/72/315272/1
diff --git a/modules/thumbor/files/thumbor.mtail
b/modules/thumbor/files/thumbor.mtail
new file mode 100644
index 0000000..e9a5f8e
--- /dev/null
+++ b/modules/thumbor/files/thumbor.mtail
@@ -0,0 +1,5 @@
+counter oom_killed
+
+/Out of memory: Kill process/ {
+ oom_killed++
+}
diff --git a/modules/thumbor/manifests/init.pp
b/modules/thumbor/manifests/init.pp
index 14b2fc2..ec0133c 100644
--- a/modules/thumbor/manifests/init.pp
+++ b/modules/thumbor/manifests/init.pp
@@ -31,6 +31,7 @@
require_package('python-thumbor-wikimedia')
require_package('firejail')
+ require_package('mtail')
file { '/usr/local/lib/thumbor/':
ensure => directory,
@@ -68,6 +69,15 @@
before => Base::Service_Unit['thumbor@'],
}
+ file { '/etc/mtail/thumbor.mtail':
+ ensure => present,
+ owner => 'root',
+ group => 'root',
+ mode => '0444',
+ source => 'puppet:///modules/thumbor/thumbor.mtail',
+ before => Base::Service_Unit['thumbor@'],
+ }
+
# XXX using a literal integer as the first argument results in
# Error 400 on SERVER: undefined method `match' for 8801:Fixnum at
# /etc/puppet/modules/thumbor/manifests/init.pp:62
--
To view, visit https://gerrit.wikimedia.org/r/315272
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I47b0175943157efc441cf7f24b96fa97f7b56ee1
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Gilles <gdu...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
