[MediaWiki-commits] [Gerrit] operations/puppet[production]: capture dumps cron job output in log and add log rotation

[ArielGlenn (Code Review)]

ArielGlenn has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/302827

Change subject: capture dumps cron job output in log and add log rotation
......................................................................

capture dumps cron job output in log and add log rotation

Change-Id: If90a3237ecb46a83bc7ce56e153334b8ea76f384
---
A modules/snapshot/files/dumps/logrotate.xmldumps
M modules/snapshot/manifests/dumps/cron.pp
2 files changed, 30 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/27/302827/1

diff --git a/modules/snapshot/files/dumps/logrotate.xmldumps 
b/modules/snapshot/files/dumps/logrotate.xmldumps
new file mode 100644
index 0000000..7928b69
--- /dev/null
+++ b/modules/snapshot/files/dumps/logrotate.xmldumps
@@ -0,0 +1,12 @@
+# This file is managed by puppet
+# puppet:///modules/snapshot/cron/logrotate.xmldumps
+#
+/var/log/dumps/xmldumps*.log {
+    weekly
+    copytruncate
+    compress
+    notifempty
+    dateext
+    missingok
+    maxage 90
+}
diff --git a/modules/snapshot/manifests/dumps/cron.pp 
b/modules/snapshot/manifests/dumps/cron.pp
index 44bd2a3..3258e3c 100644
--- a/modules/snapshot/manifests/dumps/cron.pp
+++ b/modules/snapshot/manifests/dumps/cron.pp
@@ -21,22 +21,35 @@
         content => template('snapshot/dumps/fulldumps.sh.erb'),
     }
 
-    file { '/var/log/dumps':
+    $logdir = '/var/log/dumps'
+    file { $logdir:
       ensure => 'directory',
       path   => '/var/log/dumps',
       mode   => '0755',
       owner  => $user,
     }
 
+    file { '/etc/logrotate.d/xmldumps':
+        mode   => '0444',
+        owner  => 'root',
+        group  => 'root',
+        source => 'puppet:///modules/snapshot/dumps/logrotate.xmldumps',
+    }
+
+    $runtype = hiera('snapshot::dumps::runtype', 'regular')
+
+    $fullcommand = "/usr/local/bin/fulldumps.sh 01 14 ${runtype}"
+    $partialcommand = "/usr/local/bin/fulldumps.sh 20 25 ${runtype}"
+    $output = "${logdir}/xmldumps_\$(date -u +\%s).log"
+
     # fixme there is an implicit dependency on
     # wikidump.conf.* plus some stage files, make explicit
-    $runtype = hiera('snapshot::dumps::runtype', 'regular')
 
     cron { 'fulldumps_rest':
         ensure      => 'present',
         environment => 'MAILTO=ops-du...@wikimedia.org',
         user        => $user,
-        command     => "/usr/local/bin/fulldumps.sh 01 14 ${runtype} full > 
/dev/null",
+        command     => "${fullcommand} full > ${output}",
         minute      => '05',
         hour        => [8, 20],
         monthday    => '01-14',
@@ -46,10 +59,11 @@
         ensure      => 'present',
         environment => 'MAILTO=ops-du...@wikimedia.org',
         user        => $user,
-        command     => "/usr/local/bin/fulldumps.sh 20 25 ${runtype} partial > 
/dev/null",
+        command     => "${partialcommand} full > ${output}",
         minute      => '05',
         hour        => [8, 20],
         monthday    => '20-25',
     }
 
+
 }

-- 
To view, visit https://gerrit.wikimedia.org/r/302827
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: If90a3237ecb46a83bc7ce56e153334b8ea76f384
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: ArielGlenn <ar...@wikimedia.org>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits