Gehel has uploaded a new change for review.
https://gerrit.wikimedia.org/r/315677
Change subject: kibana - configure varnish to use new LVS service as backend
......................................................................
kibana - configure varnish to use new LVS service as backend
Bug: T132458
Change-Id: Ieeea87e3fc5ab251dcda67cd15ee73995831a54d
---
M modules/role/manifests/cache/misc.pp
M modules/varnish/templates/vcl/wikimedia-common.inc.vcl.erb
2 files changed, 2 insertions(+), 14 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/77/315677/1
diff --git a/modules/role/manifests/cache/misc.pp
b/modules/role/manifests/cache/misc.pp
index 5d29d11..e821e09 100644
--- a/modules/role/manifests/cache/misc.pp
+++ b/modules/role/manifests/cache/misc.pp
@@ -260,12 +260,8 @@
'logstash_director' => {
'dynamic' => 'no',
'type' => 'random',
- 'backends' => [
- 'logstash1001.eqiad.wmnet',
- 'logstash1002.eqiad.wmnet',
- 'logstash1003.eqiad.wmnet',
- ],
- 'be_opts' => merge($app_def_be_opts, { 'probe' => 'logstash' }),
+ 'backends' => [ 'kibana.svc.eqiad.wmnet', ],
+ 'be_opts' => $app_def_be_opts,
'req_host' => 'logstash.wikimedia.org',
},
'wdqs_director' => {
diff --git a/modules/varnish/templates/vcl/wikimedia-common.inc.vcl.erb
b/modules/varnish/templates/vcl/wikimedia-common.inc.vcl.erb
index 88a6339..a05222b 100644
--- a/modules/varnish/templates/vcl/wikimedia-common.inc.vcl.erb
+++ b/modules/varnish/templates/vcl/wikimedia-common.inc.vcl.erb
@@ -91,14 +91,6 @@
.threshold = 2;
}
-probe logstash {
- .url = "/status";
- .interval = 5s;
- .timeout = 1s;
- .window = 5;
- .threshold = 3;
-}
-
<%
# Directors / Backends
--
To view, visit https://gerrit.wikimedia.org/r/315677
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ieeea87e3fc5ab251dcda67cd15ee73995831a54d
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Gehel <gleder...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
