Merge remote-tracking branch 'upstream/master'

sample/apache_ldap.conf

@@ -31,15 +31,15 @@
   </Proxy>
   </Proxy>
  
  
   # Proxy for _aliases and .*/_search
   # Proxy for _aliases and .*/_search
-  <LocationMatch "^(/_aliases|.*/_search|.*/_mapping)$">
-    ProxyPassMatch http://127.0.0.1:9200
-    ProxyPassReverse http://127.0.0.1:9200
+  <LocationMatch "^/(_nodes|_aliases|_search|.*/_search|_mapping|.*/_mapping)$">
+    ProxyPassMatch http://127.0.0.1:9200/$1
+    ProxyPassReverse http://127.0.0.1:9200/$1
   </LocationMatch>
   </LocationMatch>
- 
+
   # Proxy for kibana-int/{dashboard,temp} stuff (if you don't want auth on /, then you will want these to be protected)
   # Proxy for kibana-int/{dashboard,temp} stuff (if you don't want auth on /, then you will want these to be protected)
-  <LocationMatch "^(/kibana-int/dashboard/|/kibana-int/temp).*$">
-    ProxyPassMatch http://127.0.0.1:9200
-    ProxyPassReverse http://127.0.0.1:9200 
+  <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
   </LocationMatch>
   </LocationMatch>
  
  
   # Optional disable auth for a src IP (eg: your monitoring host or subnet)
   # Optional disable auth for a src IP (eg: your monitoring host or subnet)

sample/nginx.conf

@@ -25,6 +25,10 @@ server {
     proxy_pass http://127.0.0.1:9200;
     proxy_pass http://127.0.0.1:9200;
     proxy_read_timeout 90;
     proxy_read_timeout 90;
   }
   }
+  location ~ ^/_nodes$ {
+    proxy_pass http://127.0.0.1:9200;
+    proxy_read_timeout 90;
+  }
   location ~ ^/.*/_search$ {
   location ~ ^/.*/_search$ {
     proxy_pass http://127.0.0.1:9200;
     proxy_pass http://127.0.0.1:9200;
     proxy_read_timeout 90;
     proxy_read_timeout 90;
@@ -53,4 +57,4 @@ server {
       auth_basic_user_file /etc/nginx/conf.d/kibana.myhost.org.htpasswd;
       auth_basic_user_file /etc/nginx/conf.d/kibana.myhost.org.htpasswd;
     }
     }
   }
   }
-}
+}
\ No newline at end of file