Ottomata has submitted this change and it was merged. Change subject: Use udp2log::rsyncd class to set up rsyncd on fluorine ......................................................................
Use udp2log::rsyncd class to set up rsyncd on fluorine This gives default ferm rules to allow rsyncing of files Bug: T99245 Change-Id: I564b3b77b07035b15965dcf869a035630a1e2f2e --- M manifests/role/logging.pp M modules/statistics/manifests/rsync/mediawiki.pp 2 files changed, 7 insertions(+), 13 deletions(-) Approvals: Ottomata: Looks good to me, approved jenkins-bot: Verified diff --git a/manifests/role/logging.pp b/manifests/role/logging.pp index 47d9ad0..a2b87fd 100644 --- a/manifests/role/logging.pp +++ b/manifests/role/logging.pp @@ -75,6 +75,12 @@ }, } + # Allow rsyncing of udp2log generated files to + # analysis hosts. + class { 'misc::udp2log::rsyncd': + path => $log_directory, + } + cron { 'mw-log-cleanup': command => '/usr/local/bin/mw-log-cleanup', user => 'root', @@ -101,18 +107,6 @@ group => 'root', mode => '0555', source => 'puppet:///files/misc/scripts/fatalmonitor', - } - - include rsync::server - # Allow rsyncing of mw-log files to other places for analysis. - rsync::server::module { 'mw-log': - path => $log_directory, - read_only => 'yes', - list => 'yes', - # There is some private data in mw-log files, so - # only allow rsyncing to stat1002.eqiad.wmnet, - # the stat server with other private data. - hosts_allow => ['stat1002.eqiad.wmnet'], } $cirrussearch_slow_log_check_interval = 5 diff --git a/modules/statistics/manifests/rsync/mediawiki.pp b/modules/statistics/manifests/rsync/mediawiki.pp index 0dee4a5..bf3ea2f 100644 --- a/modules/statistics/manifests/rsync/mediawiki.pp +++ b/modules/statistics/manifests/rsync/mediawiki.pp @@ -20,7 +20,7 @@ # Search request logs from fluorine statistics::rsync_job { 'CirrusSearchRequests': - source => 'fluorine.eqiad.wmnet::mw-log/archive/CirrusSearchRequests.*.gz', + source => 'fluorine.eqiad.wmnet::udp2log/archive/CirrusSearchRequests.*.gz', destination => "${working_path}/mw-log/archive", retention_days => $retention_days, } -- To view, visit https://gerrit.wikimedia.org/r/211721 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I564b3b77b07035b15965dcf869a035630a1e2f2e Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Ottomata <o...@wikimedia.org> Gerrit-Reviewer: Ottomata <o...@wikimedia.org> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits