Gehel has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/388426 )
Change subject: udp2log: use LVS endpoint for logstash
..
udp2log: use LVS endpoint for logstash
* externalized variables used for configuration
* moved to hiera parameters given directly in site.pp
Bug: T175242
Change-Id: I9001dfdb82d336d9325c569d5562921a16553484
---
M hieradata/hosts/mwlog1001.yaml
M hieradata/hosts/mwlog2001.yaml
M hieradata/labs.yaml
A hieradata/role/common/logging/mediawiki/udp2log.yaml
M manifests/site.pp
M modules/role/manifests/logging/mediawiki/udp2log.pp
6 files changed, 8 insertions(+), 17 deletions(-)
Approvals:
jenkins-bot: Verified
Filippo Giunchedi: Looks good to me, but someone else must approve
Gehel: Looks good to me, approved
diff --git a/hieradata/hosts/mwlog1001.yaml b/hieradata/hosts/mwlog1001.yaml
index a8474a6..2c5d68a 100644
--- a/hieradata/hosts/mwlog1001.yaml
+++ b/hieradata/hosts/mwlog1001.yaml
@@ -4,3 +4,4 @@
- mw-log-readers
role::logging::mediawiki::udp2log::rsync_slow_parse: true
role::logging::mediawiki::udp2log::forward_messages: true
+role::logging::mediawiki::udp2log::monitor: false
diff --git a/hieradata/hosts/mwlog2001.yaml b/hieradata/hosts/mwlog2001.yaml
index 19e695d..c899747 100644
--- a/hieradata/hosts/mwlog2001.yaml
+++ b/hieradata/hosts/mwlog2001.yaml
@@ -4,3 +4,4 @@
- mw-log-readers
role::logging::mediawiki::udp2log::rsync_slow_parse: false
role::logging::mediawiki::udp2log::forward_messages: false
+role::logging::mediawiki::udp2log::monitor: false
diff --git a/hieradata/labs.yaml b/hieradata/labs.yaml
index 9cbccbf..ce53a17 100644
--- a/hieradata/labs.yaml
+++ b/hieradata/labs.yaml
@@ -133,3 +133,5 @@
# User for jenkins master-slave connections
jenkins_agent_username: 'jenkins-deploy'
+
+role::logging::mediawiki::udp2log::logstash_host:
'deployment-logstash2.deployment-prep.eqiad.wmflabs'
diff --git a/hieradata/role/common/logging/mediawiki/udp2log.yaml
b/hieradata/role/common/logging/mediawiki/udp2log.yaml
new file mode 100644
index 000..fd7a401
--- /dev/null
+++ b/hieradata/role/common/logging/mediawiki/udp2log.yaml
@@ -0,0 +1 @@
+role::logging::mediawiki::udp2log::logstash_host: 'logstash.svc.eqiad.wmnet'
diff --git a/manifests/site.pp b/manifests/site.pp
index 120e30a..2558865 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1817,26 +1817,18 @@
# mw logging host codfw
node 'mwlog2001.codfw.wmnet' {
-role(xenon)
+role(xenon, logging::mediawiki::udp2log)
include ::base::firewall
include ::standard
-
-class { 'role::logging::mediawiki::udp2log':
-monitor => false,
-}
}
# mw logging host eqiad
node 'mwlog1001.eqiad.wmnet' {
-role(xenon)
+role(xenon, logging::mediawiki::udp2log)
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 3176b42..69ad73d 100644
--- a/modules/role/manifests/logging/mediawiki/udp2log.pp
+++ b/modules/role/manifests/logging/mediawiki/udp2log.pp
@@ -2,6 +2,7 @@
#
# filtertags: labs-project-deployment-prep
class role::logging::mediawiki::udp2log(
+$logstash_host,
$monitor = true,
$log_directory = '/srv/mw-log',
$rotate = 1000,
@@ -55,13 +56,6 @@
owner => 'root',
group => 'root',
source => 'puppet:///modules/udp2log/udpmirror.py',
-}
-
-$logstash_host = $::realm ? {
-# TODO: Find a way to use multicast that doesn't cause duplicate
-# messages to be stored in logstash. This is a SPOF.
-production => 'logstash1001.eqiad.wmnet',
-labs => 'deployment-logstash2.deployment-prep.eqiad.wmflabs',
}
$logstash_port = 8324
--
To view, visit https://gerrit.wikimedia.org/r/388426
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9001dfdb82d336d9325c569d5562921a16553484
Gerrit-PatchSet: 6
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Gehel
Gerrit-Reviewer: Filippo Giunchedi
Gerrit-Reviewer: Gehel
Gerrit-Reviewer: Giuseppe Lavagetto
Gerrit-Reviewer: Volans
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
