Paladox has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/398661 )
Change subject: Fix accessing kibana from webui
......................................................................
Fix accessing kibana from webui
/srv/kibana/ no longer exists.
config.js was removed.
Change-Id: Ia05b827617e6942d56cef084c129c8db9b7c2701
(cherry picked from commit 1ac20a6c1bceb759c5f563947ef61d9c364a6211)
---
M puppet/hieradata/common.yaml
M puppet/modules/role/templates/elk/apache.conf.erb
2 files changed, 12 insertions(+), 24 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant
refs/changes/61/398661/1
diff --git a/puppet/hieradata/common.yaml b/puppet/hieradata/common.yaml
index 3eb1b97..476bbea 100644
--- a/puppet/hieradata/common.yaml
+++ b/puppet/hieradata/common.yaml
@@ -154,7 +154,7 @@
hhvm::logroot: /vagrant/logs
hhvm::admin_site_name: "hhvm-admin%{hiera('mwv::tld')}"
-kibana::deploy_dir: "%{hiera('mwv::vendor_dir')}/kibana"
+kibana::deploy_dir: /usr/share/kibana
kibana::default_route: /dashboard/elasticsearch/default
logstash::heap_memory_mb: 192
diff --git a/puppet/modules/role/templates/elk/apache.conf.erb
b/puppet/modules/role/templates/elk/apache.conf.erb
index f437372..86943ac 100644
--- a/puppet/modules/role/templates/elk/apache.conf.erb
+++ b/puppet/modules/role/templates/elk/apache.conf.erb
@@ -16,33 +16,21 @@
Require all granted
</Directory>
-alias /config.js /etc/kibana/config.js
+<Location />
+ ProxyPass "http://localhost:5601/";
+</Location>
ProxyRequests Off
-<Proxy http://127.0.0.1:9200>
+
+<Proxy http://localhost:5601>
ProxySet connectiontimeout=5 timeout=90 retry=0
</Proxy>
Header set Cache-Control "public, must-revalidate, max-age=3600"
-# Elasticsearch searches
-<LocationMatch "^/(_search|.*/_search)$">
- ProxyPassMatch http://127.0.0.1:9200/$1
- ProxyPassReverse http://127.0.0.1:9200/$1
- Header set Cache-Control "private, must-revalidate, max-age=0"
- Header set Expires "Thu, 01 Jan 1970 00:00:00 GMT"
-</LocationMatch>
-
-# Elasticsearch meta-data requests
-<LocationMatch "^/(_nodes|_aliases|.*/_aliases|_mapping|.*/_mapping)$">
- ProxyPassMatch http://127.0.0.1:9200/$1
- ProxyPassReverse http://127.0.0.1:9200/$1
- Header set Cache-Control "public, must-revalidate, max-age=900"
-</LocationMatch>
-
-# Storage/retrieval of saved dashboards via elasticsearch
-<LocationMatch "^/(kibana-int/dashboard/|kibana-int/temp)(.*)$">
- ProxyPassMatch http://127.0.0.1:9200/$1$2
- ProxyPassReverse http://127.0.0.1:9200/$1$2
- Header set Cache-Control "public, must-revalidate, max-age=900"
-</LocationMatch>
+# Expose the status api without authenticating
+# Due to varnish frontend, all requests are seen by Apache as being internal
+# so using IP ranges is not any more restrictive than "all"
+<Location /api/status>
+ Require all granted
+</Location>
--
To view, visit https://gerrit.wikimedia.org/r/398661
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia05b827617e6942d56cef084c129c8db9b7c2701
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: stretch-migration
Gerrit-Owner: Paladox <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
