BryanDavis has uploaded a new change for review.
https://gerrit.wikimedia.org/r/106170
Change subject: Proxy kibana.wikimedia.org via misc varnish cluster
......................................................................
Proxy kibana.wikimedia.org via misc varnish cluster
Use the misc Varnish cluster to provide SSL termination and load
balancing for kibana.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, 33 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/70/106170/1
diff --git a/manifests/role/cache.pp b/manifests/role/cache.pp
index e86a440..2344e33 100644
--- a/manifests/role/cache.pp
+++ b/manifests/role/cache.pp
@@ -1182,11 +1182,23 @@
'ssl_proxies' => $wikimedia_networks,
'default_backend' => 'antimony', # FIXME
},
- backends => [ 'antimony.wikimedia.org', 'ytterbium.wikimedia.org',
'tungsten.eqiad.wmnet', 'zirconium.wikimedia.org' ],
+ backends => [
+ 'antimony.wikimedia.org',
+ 'ytterbium.wikimedia.org',
+ 'tungsten.eqiad.wmnet',
+ 'zirconium.wikimedia.org',
+ 'logstash1001.equad.wmnet',
+ 'logstash1002.equad.wmnet',
+ 'logstash1003.equad.wmnet',
+ ],
backend_options => [
{
'backend_match' => '^(antimony|ytterbium)',
'port' => 8080,
+ },
+ {
+ 'backend_match' => '^logstash100[1-3]',
+ 'probe' => 'logstash',
},
{
'port' => 80,
@@ -1194,7 +1206,11 @@
'first_byte_timeout' => '35s',
'between_bytes_timeout' => '4s',
'max_connections' => 100,
- }]
+ }],
+ directors => {
+ 'kibana' => [ 'logstash1001', 'logstash1002', 'logstash1003' ]
+ },
+ director_type => 'round-robin',
}
}
}
diff --git a/modules/varnish/templates/vcl/wikimedia.vcl.erb
b/modules/varnish/templates/vcl/wikimedia.vcl.erb
index 25621e1..93100fd 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 9aa9a1f..b706226 100644
--- a/templates/varnish/misc.inc.vcl.erb
+++ b/templates/varnish/misc.inc.vcl.erb
@@ -10,6 +10,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 == "kibana.wikimedia.org"){
+ set req.backend = kibana;
} elsif (req.http.Host == "scholarships.wikimedia.org") {
set req.backend = zirconium;
} else {
@@ -21,6 +23,11 @@
return (pass);
}
+ if (req.http.Authorization) {
+ /* Don't cache authorized content */
+ return (pass);
+ }
+
return (lookup);
}
--
To view, visit https://gerrit.wikimedia.org/r/106170
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If10eb3a99916df7172c869efd248f45f6d081b7f
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BryanDavis <bda...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
