Yuvipanda has submitted this change and it was merged.
Change subject: tools: store verbose logrotate logs
......................................................................
tools: store verbose logrotate logs
This will hopefully help solve the logrotate error mails we receive
every other day. The logrotate log file is overwritten daily.
Bug: T96007
Change-Id: Ia0174696349e48cb030f74b1664a94464eb760d6
---
A modules/toollabs/files/logrotate.crondaily
M modules/toollabs/manifests/init.pp
2 files changed, 26 insertions(+), 0 deletions(-)
Approvals:
Yuvipanda: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/toollabs/files/logrotate.crondaily
b/modules/toollabs/files/logrotate.crondaily
new file mode 100644
index 0000000..964b2b2
--- /dev/null
+++ b/modules/toollabs/files/logrotate.crondaily
@@ -0,0 +1,17 @@
+#!/bin/sh
+# This file is managed by Puppet.
+# Based on logrotate-bundled cron file, Version: 3.8.7-1ubuntu1
+# Clean non existent log file entries from status file
+cd /var/lib/logrotate
+test -e status || touch status
+head -1 status > status.clean
+sed 's/"//g' status | while read logfile date
+do
+ [ -e "$logfile" ] && echo "\"$logfile\" $date"
+done >> status.clean
+mv status.clean status
+
+test -x /usr/sbin/logrotate || exit 0
+# > instead of >> to clear logrotate.log daily
+# copy output to stderr on non-zero exit code to trigger a cron email
+/usr/sbin/logrotate -v /etc/logrotate.conf > /var/log/logrotate.log 2>&1 ||
cat /var/log/logrotate.log >&2
diff --git a/modules/toollabs/manifests/init.pp
b/modules/toollabs/manifests/init.pp
index 19979fe..27ec24a 100644
--- a/modules/toollabs/manifests/init.pp
+++ b/modules/toollabs/manifests/init.pp
@@ -207,5 +207,14 @@
source => 'puppet:///modules/toollabs/40-tools-sudoers-no-warning',
}
+ file { '/etc/cron.daily/logrotate':
+ ensure => file,
+ mode => '0664',
+ owner => 'root',
+ group => 'root',
+ source => 'puppet:///modules/toollabs/logrotate.crondaily',
+ require => Package['logrotate']
+ }
+
diamond::collector::localcrontab { 'localcrontabcollector': }
}
--
To view, visit https://gerrit.wikimedia.org/r/211891
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia0174696349e48cb030f74b1664a94464eb760d6
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Merlijn van Deen <valhall...@arctus.nl>
Gerrit-Reviewer: Yuvipanda <yuvipa...@gmail.com>
Gerrit-Reviewer: coren <mpellet...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
