Merge "Modernize kibana vhost template"

This commit is contained in:
Jenkins 2015-04-28 17:14:56 +00:00 committed by Gerrit Code Review
commit b825c78301
1 changed files with 9 additions and 9 deletions

View File

@ -1,12 +1,12 @@
<VirtualHost *:80>
ServerName <%= scope.lookupvar("::logstash::web::vhost_name") %>
ServerAdmin <%= scope.lookupvar("::logstash::web::serveradmin") %>
ServerName <%= @vhost_name %>
ServerAdmin <%= @serveradmin %>
ErrorLog ${APACHE_LOG_DIR}/<%= scope.lookupvar("::logstash::web::vhost_name") %>-error.log
ErrorLog ${APACHE_LOG_DIR}/<%= @vhost_name %>-error.log
LogLevel warn
CustomLog ${APACHE_LOG_DIR}/<%= scope.lookupvar("::logstash::web::vhost_name") %>-access.log combined
CustomLog ${APACHE_LOG_DIR}/<%= @vhost_name %>-access.log combined
<IfModule mod_proxy.c>
<% if @proxy_elasticsearch == true %>
@ -14,15 +14,15 @@
# .*/_mapping, .*/_mapping/field/.*, _cluster/health, and _nodes.
RewriteEngine on
RewriteCond %{REQUEST_METHOD} GET
RewriteRule ^/elasticsearch/((.*/)?_aliases|(.*/)?_status|(.*/)?_search|(.*/)?_mapping|(.*/)?_mapping/field/(.*)?|_cluster/health|_nodes)$ http://<%= scope.lookupvar("::logstash::web::discover_nodes")[0] %>/$1 [P]
RewriteRule ^/elasticsearch/((.*/)?_aliases|(.*/)?_status|(.*/)?_search|(.*/)?_mapping|(.*/)?_mapping/field/(.*)?|_cluster/health|_nodes)$ http://<%= @discover_nodes[0] %>/$1 [P]
RewriteCond %{REQUEST_METHOD} POST
RewriteRule ^/elasticsearch/(_aliases|(.*/)?_search)$ http://<%= scope.lookupvar("::logstash::web::discover_nodes")[0] %>/$1 [P]
RewriteRule ^/elasticsearch/(_aliases|(.*/)?_search)$ http://<%= @discover_nodes[0] %>/$1 [P]
RewriteCond %{REQUEST_METHOD} OPTIONS
RewriteRule ^/elasticsearch/((.*/)?_search)$ http://<%= scope.lookupvar("::logstash::web::discover_nodes")[0] %>/$1 [P]
<Proxy http://<%= scope.lookupvar("::logstash::web::discover_nodes")[0] %>/>
RewriteRule ^/elasticsearch/((.*/)?_search)$ http://<%= @discover_nodes[0] %>/$1 [P]
<Proxy http://<%= @discover_nodes[0] %>/>
ProxySet connectiontimeout=15 timeout=120
</Proxy>
ProxyPassReverse /elasticsearch/ http://<%= scope.lookupvar("::logstash::web::discover_nodes")[0] %>/
ProxyPassReverse /elasticsearch/ http://<%= @discover_nodes[0] %>/
<% end %>
ProxyPass / http://127.0.0.1:5601/ retry=0