From 3d2d1772fe65ca57a972b9b2783f68e3930b0f3b Mon Sep 17 00:00:00 2001
From: Clark Boylan <clark.boylan@gmail.com>
Date: Mon, 24 Jun 2013 13:00:55 -0700
Subject: [PATCH] Better elasticsearch proxy settings.
* modules/logstash/templates/kibana.vhost.erb: Set proxy timeouts and
allow /_status and /_search.
Change-Id: I67f6152bcda5999a27fef07c8428ac12d3a0201c
Reviewed-on: https://review.openstack.org/34252
Reviewed-by: Jeremy Stanley <fungi@yuggoth.org>
Approved: James E. Blair <corvus@inaugust.com>
Reviewed-by: James E. Blair <corvus@inaugust.com>
Tested-by: Jenkins
---
modules/logstash/templates/kibana.vhost.erb | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/modules/logstash/templates/kibana.vhost.erb b/modules/logstash/templates/kibana.vhost.erb
index 59576ee53c..419f205089 100644
--- a/modules/logstash/templates/kibana.vhost.erb
+++ b/modules/logstash/templates/kibana.vhost.erb
@@ -10,8 +10,8 @@
<% if proxy_elasticsearch == true %>
# Proxy for elasticsearch _aliases, .*/_status, and .*/_search.
- <LocationMatch "^/elasticsearch/(_aliases|.*/_status|.*/_search)$">
- ProxyPassMatch http://<%= scope.lookupvar("::logstash::web::discover_nodes")[0] %>/$1
+ <LocationMatch "^/elasticsearch/(_aliases|(.*/)?_status|(.*/)?_search)$">
+ ProxyPassMatch http://<%= scope.lookupvar("::logstash::web::discover_nodes")[0] %>/$1 connectiontimeout=5 timeout=120
</LocationMatch>
ProxyPassReverse /elasticsearch/ http://<%= scope.lookupvar("::logstash::web::discover_nodes")[0] %>/
<% end %>