diff --git a/modules/logstash/manifests/web.pp b/modules/logstash/manifests/web.pp
index 23fa18597f..1e3172e094 100644
--- a/modules/logstash/manifests/web.pp
+++ b/modules/logstash/manifests/web.pp
@@ -19,6 +19,7 @@ class logstash::web (
   $serveradmin = "webmaster@${::fqdn}",
   $frontend = 'internal',
   $elasticsearch_host = 'localhost',
+  $proxy_elasticsearch = false
 ) {
   include apache
   a2mod { 'rewrite':
diff --git a/modules/logstash/templates/kibana.vhost.erb b/modules/logstash/templates/kibana.vhost.erb
index eb4093285e..63c5e2629d 100644
--- a/modules/logstash/templates/kibana.vhost.erb
+++ b/modules/logstash/templates/kibana.vhost.erb
@@ -8,6 +8,14 @@
 
              CustomLog ${APACHE_LOG_DIR}/<%= scope.lookupvar("::logstash::web::vhost_name") %>-access.log combined
 
+             <% if proxy_elasticsearch == true %>
+             # Proxy for elasticsearch _aliases, .*/_status, and .*/_search.
+             <LocationMatch "^/elasticsearch/(_aliases|.*/_status|.*/_search)$">
+               ProxyPassMatch http://<%= scope.lookupvar("::logstash::web::elasticsearch_host") %>:9200/$1
+             </LocationMatch>
+             ProxyPassReverse /elasticsearch/ http://<%= scope.lookupvar("::logstash::web::elasticsearch_host") %>:9200/
+             <% end %>
+
              ProxyPass / http://127.0.0.1:5601/ retry=0
              ProxyPassReverse / http://127.0.0.1:5601/
 </VirtualHost>
diff --git a/modules/openstack_project/manifests/logstash.pp b/modules/openstack_project/manifests/logstash.pp
index e60161766e..d19b629e0b 100644
--- a/modules/openstack_project/manifests/logstash.pp
+++ b/modules/openstack_project/manifests/logstash.pp
@@ -30,8 +30,9 @@ class openstack_project::logstash (
   }
 
   class { 'logstash::web':
-    frontend           => 'kibana',
-    elasticsearch_host => 'elasticsearch.openstack.org',
+    frontend            => 'kibana',
+    elasticsearch_host  => 'elasticsearch.openstack.org',
+    proxy_elasticsearch => true,
   }
 
   package { 'python-daemon':