Dzahn has submitted this change and it was merged.
Change subject: beta: vary logstash instance per $::site
......................................................................
beta: vary logstash instance per $::site
The logstash instances in beta have different name in pmtpa/eqiad, and
we need the eqiad udp2log to send its log to the proper instance.
Change-Id: I388b1635c662a45b0539f4434b8fbfbbc9d3903d
---
M manifests/role/logging.pp
1 file changed, 6 insertions(+), 1 deletion(-)
Approvals:
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/manifests/role/logging.pp b/manifests/role/logging.pp
index 75fd91c..3381221 100644
--- a/manifests/role/logging.pp
+++ b/manifests/role/logging.pp
@@ -50,11 +50,16 @@
labs => 'deployment-fluoride.pmtpa.wmflabs',
}
+ # TODO remove once beta cluster is migrated to eqiad
+ $logtash_host_beta = $::site ? {
+ eqiad => 'deployment-logstash1.eqiad.wmflabs',
+ pmtpa => 'logstash.pmtpa.wmflabs',
+ }
$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 => 'logstash.pmtpa.wmflabs',
+ labs => $logtash_host_beta,
}
$logstash_port = 8324
--
To view, visit https://gerrit.wikimedia.org/r/119493
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I388b1635c662a45b0539f4434b8fbfbbc9d3903d
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar <[email protected]>
Gerrit-Reviewer: BryanDavis <[email protected]>
Gerrit-Reviewer: Dzahn <[email protected]>
Gerrit-Reviewer: Hashar <[email protected]>
Gerrit-Reviewer: Ori.livneh <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
