Faidon Liambotis has submitted this change and it was merged.
Change subject: Proxy logstash.wikimedia.org via misc varnish cluster
......................................................................
Proxy logstash.wikimedia.org via misc varnish cluster
Use the misc Varnish cluster to provide SSL termination and load
balancing for logstash.wikimedia.org.
Depends on: I504c4c1
Change-Id: If10eb3a99916df7172c869efd248f45f6d081b7f
---
M manifests/role/cache.pp
M modules/varnish/templates/vcl/wikimedia.vcl.erb
M templates/varnish/misc.inc.vcl.erb
3 files changed, 25 insertions(+), 1 deletion(-)
Approvals:
Faidon Liambotis: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/cache.pp b/manifests/role/cache.pp
index 0657734..1f6a204 100644
--- a/manifests/role/cache.pp
+++ b/manifests/role/cache.pp
@@ -1183,6 +1183,9 @@
'ytterbium.wikimedia.org',
'tungsten.eqiad.wmnet',
'zirconium.wikimedia.org',
+ 'logstash1001.eqiad.wmnet',
+ 'logstash1002.eqiad.wmnet',
+ 'logstash1003.eqiad.wmnet',
],
backend_options => [
{
@@ -1190,12 +1193,23 @@
'port' => 8080,
},
{
+ 'backend_match' => '^logstash',
+ 'probe' => 'logstash',
+ },
+ {
'port' => 80,
'connect_timeout' => '5s',
'first_byte_timeout' => '35s',
'between_bytes_timeout' => '4s',
'max_connections' => 100,
- }]
+ }],
+ directors => {
+ 'logstash' => [
+ 'logstash1001.eqiad.wmnet',
+ 'logstash1002.eqiad.wmnet',
+ 'logstash1003.eqiad.wmnet',
+ ]
+ },
}
}
}
diff --git a/modules/varnish/templates/vcl/wikimedia.vcl.erb
b/modules/varnish/templates/vcl/wikimedia.vcl.erb
index c509f2a..7787f1a 100644
--- a/modules/varnish/templates/vcl/wikimedia.vcl.erb
+++ b/modules/varnish/templates/vcl/wikimedia.vcl.erb
@@ -103,6 +103,14 @@
.timeout = 2s;
}
+probe logstash {
+ .url = "/status";
+ .interval = 5s;
+ .timeout = 1s;
+ .window = 5;
+ .threshold = 3;
+}
+
# Backends
# List of Puppet generated backends
diff --git a/templates/varnish/misc.inc.vcl.erb
b/templates/varnish/misc.inc.vcl.erb
index d650371..0974402 100644
--- a/templates/varnish/misc.inc.vcl.erb
+++ b/templates/varnish/misc.inc.vcl.erb
@@ -12,6 +12,8 @@
set req.backend = ytterbium;
} elsif (req.http.Host == "gdash.wikimedia.org" || req.http.Host ==
"graphite.wikimedia.org") {
set req.backend = tungsten;
+ } elsif (req.http.Host == "logstash.wikimedia.org"){
+ set req.backend = logstash;
} elsif (req.http.Host == "scholarships.wikimedia.org") {
set req.backend = zirconium;
} else {
--
To view, visit https://gerrit.wikimedia.org/r/106170
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If10eb3a99916df7172c869efd248f45f6d081b7f
Gerrit-PatchSet: 8
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BryanDavis <bda...@wikimedia.org>
Gerrit-Reviewer: Aaron Schulz <asch...@wikimedia.org>
Gerrit-Reviewer: BryanDavis <bda...@wikimedia.org>
Gerrit-Reviewer: Faidon Liambotis <fai...@wikimedia.org>
Gerrit-Reviewer: Mark Bergsma <m...@wikimedia.org>
Gerrit-Reviewer: Ori.livneh <o...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
