From 839cbd39d3a3e8412d98b905462dab1fb17db457 Mon Sep 17 00:00:00 2001 From: Elastic Jasper Date: Thu, 22 Sep 2016 19:40:23 -0400 Subject: [PATCH] Backport PR #8375 --------- **Commit 1:** Make expected server.basePath usage more clear * Original sha: 02c9030c6a85d6363cdc9bb166da5a88dd11c376 * Authored by Matthew Bargar on 2016-09-20T15:48:35Z --- config/kibana.yml | 5 +++-- docs/kibana-yml.asciidoc | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/config/kibana.yml b/config/kibana.yml index 6535dcbee6a6a..db05e0316afd9 100644 --- a/config/kibana.yml +++ b/config/kibana.yml @@ -6,8 +6,9 @@ # To allow connections from remote users, set this parameter to a non-loopback address. # server.host: "localhost" -# Enables you to specify a path to mount Kibana at if you are running behind a proxy. This setting -# cannot end in a slash. +# Enables you to specify a path to mount Kibana at if you are running behind a proxy. This only affects +# the URLs generated by Kibana, your proxy is expected to remove the basePath value before forwarding requests +# to Kibana. This setting cannot end in a slash. # server.basePath: "" # The maximum payload size in bytes for incoming server requests. diff --git a/docs/kibana-yml.asciidoc b/docs/kibana-yml.asciidoc index ecc459b501475..f569091c8ba93 100644 --- a/docs/kibana-yml.asciidoc +++ b/docs/kibana-yml.asciidoc @@ -2,8 +2,9 @@ [horizontal] `server.port:`:: *Default: 5601* Kibana is served by a back end server. This setting specifies the port to use. `server.host:`:: *Default: "localhost"* This setting specifies the host of the back end server. -`server.basePath:`:: Enables you to specify a path to mount Kibana at if you are running behind a proxy. This setting -cannot end in a slash (`/`). +`server.basePath:`:: Enables you to specify a path to mount Kibana at if you are running behind a proxy. This only affects + the URLs generated by Kibana, your proxy is expected to remove the basePath value before forwarding requests + to Kibana. This setting cannot end in a slash (`/`). `server.maxPayloadBytes:`:: *Default: 1048576* The maximum payload size in bytes for incoming server requests. `server.name:`:: *Default: "your-hostname"* A human-readable display name that identifies this Kibana instance. `elasticsearch.url:`:: *Default: "http://localhost:9200"* The URL of the Elasticsearch instance to use for all your