Filippo Giunchedi has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/332527 )
Change subject: site: add fluorine's roles to mwlog2001
......................................................................
site: add fluorine's roles to mwlog2001
Introduce conditional rsyncing of slow-parse to dumps and enable it only
for fluorine.
Xenon role is "standalone" in the sense that when applied it will be
dormant by default.
Bug: T123728
Change-Id: I1af42e50857e44b3cfa2f3bea80d580e4a751201
---
M hieradata/hosts/fluorine.yaml
A hieradata/hosts/mwlog2001.yaml
M manifests/site.pp
M modules/role/manifests/logging/mediawiki/udp2log.pp
4 files changed, 22 insertions(+), 7 deletions(-)
Approvals:
jenkins-bot: Verified
Filippo Giunchedi: Looks good to me, approved
diff --git a/hieradata/hosts/fluorine.yaml b/hieradata/hosts/fluorine.yaml
index f1ac4e6..f93c910 100644
--- a/hieradata/hosts/fluorine.yaml
+++ b/hieradata/hosts/fluorine.yaml
@@ -2,3 +2,4 @@
- deployment
- restricted
- mw-log-readers
+role::logging::mediawiki::udp2log::rsync_slow_parse: true
diff --git a/hieradata/hosts/mwlog2001.yaml b/hieradata/hosts/mwlog2001.yaml
new file mode 100644
index 0000000..6e537b3
--- /dev/null
+++ b/hieradata/hosts/mwlog2001.yaml
@@ -0,0 +1,5 @@
+admin::groups:
+ - deployment
+ - restricted
+ - mw-log-readers
+role::logging::mediawiki::udp2log::rsync_slow_parse: false
diff --git a/manifests/site.pp b/manifests/site.pp
index 3c3aa50..948a58f 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2198,11 +2198,17 @@
include ::base::firewall
}
-# mw logging host codfw - setup pending
+# mw logging host codfw
node 'mwlog2001.codfw.wmnet' {
+ role(xenon)
+ $cluster = 'misc'
include ::base::firewall
include ::standard
+
+ class { 'role::logging::mediawiki::udp2log':
+ monitor => false,
+ }
}
node 'mx1001.wikimedia.org' {
diff --git a/modules/role/manifests/logging/mediawiki/udp2log.pp
b/modules/role/manifests/logging/mediawiki/udp2log.pp
index a0bfbd6..66bfe7c 100644
--- a/modules/role/manifests/logging/mediawiki/udp2log.pp
+++ b/modules/role/manifests/logging/mediawiki/udp2log.pp
@@ -3,6 +3,7 @@
$monitor = true,
$log_directory = '/srv/mw-log',
$rotate = 1000,
+ $rsync_slow_parse = false,
) {
system::role { 'role::logging:mediawiki::udp2log':
description => 'MediaWiki log collector',
@@ -13,12 +14,14 @@
# Rsync archived slow-parse logs to dumps.wikimedia.org.
# These are available for download at
http://dumps.wikimedia.org/other/slow-parse/
include ::dataset::user
- cron { 'rsync_slow_parse':
- command => "/usr/bin/rsync -rt
${log_directory}/archive/slow-parse.log*.gz dumps.wikimedia.org::slow-parse/",
- hour => 23,
- minute => 15,
- environment => '[email protected]',
- user => 'datasets',
+ if ($rsync_slow_parse) {
+ cron { 'rsync_slow_parse':
+ command => "/usr/bin/rsync -rt
${log_directory}/archive/slow-parse.log*.gz dumps.wikimedia.org::slow-parse/",
+ hour => 23,
+ minute => 15,
+ environment => '[email protected]',
+ user => 'datasets',
+ }
}
class { '::udp2log':
--
To view, visit https://gerrit.wikimedia.org/r/332527
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I1af42e50857e44b3cfa2f3bea80d580e4a751201
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi <[email protected]>
Gerrit-Reviewer: Alex Monk <[email protected]>
Gerrit-Reviewer: Dzahn <[email protected]>
Gerrit-Reviewer: Filippo Giunchedi <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
