From: Peter Palfrader <peter@palfrader.org>
Date: Sat, 26 Nov 2016 13:23:43 +0000 (+0100)
Subject: kill munin-update jobs older than 2 hours
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=a03ae6b216dc18483650e64d452ad2c1d8038f0b;p=mirror%2Fdsa-puppet.git

kill munin-update jobs older than 2 hours
---

diff --git a/modules/munin/files/master-cleanup-cron b/modules/munin/files/master-cleanup-cron
index 7092b4b7c..a55cc2622 100644
--- a/modules/munin/files/master-cleanup-cron
+++ b/modules/munin/files/master-cleanup-cron
@@ -6,3 +6,6 @@ MAILTO=root
 @daily munin    find /var/lib/munin  -maxdepth 1 -type f -name 'state-*' -mtime +90 -delete
 @daily munin    find /var/lib/munin/debian.org -maxdepth 1 -type f -mtime +90 -delete
 @daily www-data find /var/lib/munin/cgi-tmp -type f -mtime +10 -delete ; find /var/lib/munin/cgi-tmp -mindepth 2 -type d -empty -delete
+
+# kill munin-update jobs older than 2 hours
+@hourly munin   ps h -eo pid,etimes,user,args | perl -a -e '($pid,$age,$user,@cmd) = @F; $cmd = join(" ", @cmd); next if ($user ne "munin" or $cmd !~ "munin-update" or $age <= 2*3600); kill("TERM", $pid)'