Merge pull request #41 from daanemanz/proxy-for-kibana-3-milestone-5

Handle proxying for the new Kibana 3 milestone 5
lusis · Jan 9, 2014 · cf87e13 · cf87e13
2 parents 99f9d73 + dcc4aed
commit cf87e13
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/templates/default/kibana-apache.conf.erb b/templates/default/kibana-apache.conf.erb
@@ -21,7 +21,7 @@
   </Proxy>
 
   # Proxy for _aliases and .*/_search
-  <LocationMatch "^(/_aliases|/_nodes|/.*/_mapping|.*/_search)$">
+  <LocationMatch "^(/_aliases|/_nodes|/.*/_mapping|/.*/_search|/.*/_aliases)$">
     ProxyPassMatch <%= @params[:es_scheme] %><%= @params[:es_server] %>:<%= @params[:es_port] %>
     ProxyPassReverse <%= @params[:es_scheme] %><%= @params[:es_server] %>:<%= @params[:es_port] %>
   </LocationMatch>

diff --git a/templates/default/kibana-nginx.conf.erb b/templates/default/kibana-nginx.conf.erb
@@ -25,6 +25,10 @@ server {
     proxy_pass <%= @es_scheme %><%= @es_server %>:<%= @es_port %>;
     proxy_read_timeout 90;
   }
+  location ~ ^/.*/_aliases$ {
+    proxy_pass <%= @es_scheme %><%= @es_server %>:<%= @es_port %>;
+    proxy_read_timeout 90;
+  }
   location ~ ^/kibana-int/dashboard/.*$ {
     proxy_pass <%= @es_scheme %><%= @es_server %>:<%= @es_port %>;
     proxy_read_timeout 90;