Merge remote-tracking branch 'upstream/master'

sample/lighttpd_basic.conf

+$HTTP["host"] =~ "kibana" {
+
+    server.document-root = "/var/ww/kibana/src"
+    auth.backend = "plain"
+    auth.backend.plain.userfile = "/etc/lighttpd/kibanapassword"
+
+    index-file.names            = ( "index.html", "index.htm" )
+
+    auth.require = ( "/" => (
+            "method"    => "basic",
+            "realm"     => "Password Protected",
+            "require"   => "valid-user"
+            )
+        )
+
+    $HTTP["url"] =~ "^/kibana-int/(dashboard/|temp).*$" {
+        proxy.balance = "hash"
+        proxy.server = ( "" => ( ( "host" => "127.0.0.1", "port" => "9200" ) ) )
+    }
+    $HTTP["url"] =~ "^.*/_(mapping|search|nodes|aliases)$" {
+        proxy.balance = "hash"
+        proxy.server = ( "" => ( ( "host" => "127.0.0.1", "port" => "9200" ) ) )
+    }
+}