aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorToby McLaughlin <toby@jarpy.net>2018-06-04 10:37:26 +1000
committerGitHub <noreply@github.com>2018-06-04 10:37:26 +1000
commit92c9ad7276315b87334f7558f52cea54b05127d6 (patch)
tree8c2be6437e8baef68c1790df55955b1781dc2fc7
parenta8fc3fc94af6553c5cf10eec66a9beff51928148 (diff)
[DOCS] Update Docker config steps for open X-Pack (#19486)HEADmaster
-rw-r--r--docs/setup/docker.asciidoc9
1 files changed, 3 insertions, 6 deletions
diff --git a/docs/setup/docker.asciidoc b/docs/setup/docker.asciidoc
index 00e009761..0696e3114 100644
--- a/docs/setup/docker.asciidoc
+++ b/docs/setup/docker.asciidoc
@@ -123,14 +123,11 @@ images:
`server.name`:: `kibana`
`server.host`:: `"0"`
`elasticsearch.url`:: `http://elasticsearch:9200`
-
-In the {xpack} image, the following additional defaults are also set:
-
-[horizontal]
-`elasticsearch.username`:: `elastic`
-`elasticsearch.password`:: `changeme`
`xpack.monitoring.ui.container.elasticsearch.enabled`:: `true`
+NOTE: The setting `xpack.monitoring.ui.container.elasticsearch.enabled` is not
+defined in the `-oss` image.
+
These settings are defined in the default `kibana.yml`. They can be overridden
with a <<bind-mount-config,custom `kibana.yml`>> or via
<<environment-variable-config,environment variables>>.