Filippo Giunchedi has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/335623 )
Change subject: Allow mwlog[12]001 on datasets/dumps/eventlog/logstash
......................................................................
Allow mwlog[12]001 on datasets/dumps/eventlog/logstash
Bug: T123728
Change-Id: I6378cf9dc747c9d3a8e32b62dfcb1ab47cd41605
---
M hieradata/role/common/dumps/server.yaml
M modules/dataset/files/rsync/rsyncd.conf.datasets_to_peers
M modules/role/manifests/logging/mediawiki/errors.pp
3 files changed, 4 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/23/335623/1
diff --git a/hieradata/role/common/dumps/server.yaml
b/hieradata/role/common/dumps/server.yaml
index 5a31121..07140d8 100644
--- a/hieradata/role/common/dumps/server.yaml
+++ b/hieradata/role/common/dumps/server.yaml
@@ -1,6 +1,8 @@
dumps::rsync_clients:
- dataset1001.wikimedia.org
- fluorine.eqiad.wmnet
+ - mwlog1001.eqiad.wmnet
+ - mwlog2001.codfw.wmnet
- iridium.eqiad.wmnet
- ms1001.wikimedia.org
- stat1002.eqiad.wmnet
diff --git a/modules/dataset/files/rsync/rsyncd.conf.datasets_to_peers
b/modules/dataset/files/rsync/rsyncd.conf.datasets_to_peers
index cf778f3..6e64263 100644
--- a/modules/dataset/files/rsync/rsyncd.conf.datasets_to_peers
+++ b/modules/dataset/files/rsync/rsyncd.conf.datasets_to_peers
@@ -18,4 +18,4 @@
gid = datasets
read only = false
path = /data/xmldatadumps/public/other/slow-parse
-hosts allow = fluorine.eqiad.wmnet, 2620:0:861:101:7a2b:cbff:fe08:baa9
+hosts allow = fluorine.eqiad.wmnet, 2620:0:861:101:7a2b:cbff:fe08:baa9,
mwlog1001.eqiad.wmnet, 2620:0:861:103:1618:77ff:fe33:4ac0,
mwlog2001.codfw.wmnet, 2620:0:860:103:1618:77ff:fe4e:3159
diff --git a/modules/role/manifests/logging/mediawiki/errors.pp
b/modules/role/manifests/logging/mediawiki/errors.pp
index 70ef6e0..e3f9929 100644
--- a/modules/role/manifests/logging/mediawiki/errors.pp
+++ b/modules/role/manifests/logging/mediawiki/errors.pp
@@ -13,6 +13,6 @@
ferm::service { 'mediawiki-exceptions-logging':
proto => 'udp',
port => '8423',
- srange => '@resolve(fluorine.eqiad.wmnet)',
+ srange => '@resolve((fluorine.eqiad.wmnet mwlog1001.eqiad.wmnet
mwlog2001.codfw.wmnet))',
}
}
--
To view, visit https://gerrit.wikimedia.org/r/335623
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6378cf9dc747c9d3a8e32b62dfcb1ab47cd41605
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
