diff --git a/docs/reference/getting-started.asciidoc b/docs/reference/getting-started.asciidoc index 99b015e4f717a..a8bd6c80564ce 100755 --- a/docs/reference/getting-started.asciidoc +++ b/docs/reference/getting-started.asciidoc @@ -17,7 +17,6 @@ The simplest way to set up {es} is to create a managed deployment with {ess} on {ecloud}. If you prefer to manage your own test environment, you can install and run {es} using Docker. -include::{es-repo-dir}/tab-widgets/code.asciidoc[] include::{es-repo-dir}/tab-widgets/quick-start-install-widget.asciidoc[] [discrete] diff --git a/docs/reference/how-to/fix-common-cluster-issues.asciidoc b/docs/reference/how-to/fix-common-cluster-issues.asciidoc index 87907cd85dc34..9750e37d3be8a 100644 --- a/docs/reference/how-to/fix-common-cluster-issues.asciidoc +++ b/docs/reference/how-to/fix-common-cluster-issues.asciidoc @@ -302,7 +302,6 @@ exceeds 85%. **Check JVM memory pressure** -include::{es-repo-dir}/tab-widgets/code.asciidoc[] include::{es-repo-dir}/tab-widgets/jvm-memory-pressure-widget.asciidoc[] **Check garbage collection logs** diff --git a/docs/reference/how-to/use-elasticsearch-for-time-series-data.asciidoc b/docs/reference/how-to/use-elasticsearch-for-time-series-data.asciidoc index 513dc64f9c7a6..3c275a21e1153 100644 --- a/docs/reference/how-to/use-elasticsearch-for-time-series-data.asciidoc +++ b/docs/reference/how-to/use-elasticsearch-for-time-series-data.asciidoc @@ -26,7 +26,6 @@ stream. The steps for setting up data tiers vary based on your deployment type: -include::{es-repo-dir}/tab-widgets/code.asciidoc[] include::{es-repo-dir}/tab-widgets/data-tiers-widget.asciidoc[] [discrete] diff --git a/docs/reference/setup/important-settings/path-settings.asciidoc b/docs/reference/setup/important-settings/path-settings.asciidoc index 5767ba7dcd52c..bec71ead466b6 100644 --- a/docs/reference/setup/important-settings/path-settings.asciidoc +++ b/docs/reference/setup/important-settings/path-settings.asciidoc @@ -19,8 +19,6 @@ default. Supported `path.data` and `path.logs` values vary by platform: -include::{es-repo-dir}/tab-widgets/code.asciidoc[] - include::{es-repo-dir}/tab-widgets/customize-data-log-path-widget.asciidoc[] include::{es-repo-dir}/modules/node.asciidoc[tag=modules-node-data-path-warning-tag] diff --git a/docs/reference/setup/logging-config.asciidoc b/docs/reference/setup/logging-config.asciidoc index f41658f637602..d744b61491c9a 100644 --- a/docs/reference/setup/logging-config.asciidoc +++ b/docs/reference/setup/logging-config.asciidoc @@ -1,8 +1,6 @@ [[logging]] === Logging -include::{es-repo-dir}/tab-widgets/code.asciidoc[] - You can use {es}'s application logs to monitor your cluster and diagnose issues. If you run {es} as a service, the default location of the logs varies based on your platform and installation method: diff --git a/docs/reference/snapshot-restore/register-repository.asciidoc b/docs/reference/snapshot-restore/register-repository.asciidoc index 156d699461b5f..18d7da2511400 100644 --- a/docs/reference/snapshot-restore/register-repository.asciidoc +++ b/docs/reference/snapshot-restore/register-repository.asciidoc @@ -145,8 +145,6 @@ configuration to account for this. Supported `path.repo` values vary by platform: -include::{es-repo-dir}/tab-widgets/code.asciidoc[] - include::{es-repo-dir}/tab-widgets/register-fs-repo-widget.asciidoc[] [discrete] diff --git a/docs/reference/tab-widgets/code.asciidoc b/docs/reference/tab-widgets/code.asciidoc deleted file mode 100644 index a6949b681edc6..0000000000000 --- a/docs/reference/tab-widgets/code.asciidoc +++ /dev/null @@ -1,163 +0,0 @@ -// Defining styles and script here for simplicity. -++++ - - -++++ \ No newline at end of file diff --git a/docs/reference/tab-widgets/quick-start-cleanup.asciidoc b/docs/reference/tab-widgets/quick-start-cleanup.asciidoc index 551b16d43b02f..a0a9ba09615c1 100644 --- a/docs/reference/tab-widgets/quick-start-cleanup.asciidoc +++ b/docs/reference/tab-widgets/quick-start-cleanup.asciidoc @@ -9,8 +9,8 @@ To stop your {es} and {kib} Docker containers, run: [source,sh] ---- -docker stop es01-test -docker stop kib01-test +docker stop es-node01 +docker stop kib-01 ---- To remove the containers and their network, run: @@ -18,7 +18,7 @@ To remove the containers and their network, run: [source,sh] ---- docker network rm elastic -docker rm es01-test -docker rm kib01-test +docker rm es-node01 +docker rm kib-01 ---- // end::self-managed[] diff --git a/docs/reference/tab-widgets/quick-start-install.asciidoc b/docs/reference/tab-widgets/quick-start-install.asciidoc index 7854adba0f29c..144c4f03a9292 100644 --- a/docs/reference/tab-widgets/quick-start-install.asciidoc +++ b/docs/reference/tab-widgets/quick-start-install.asciidoc @@ -21,9 +21,37 @@ Desktop]. ---- docker network create elastic docker pull {docker-repo}:{version} -docker run --name es01-test --net elastic -p 9200:9200 -p 9300:9300 -e "discovery.type=single-node" {docker-image} +docker run --name es-node01 --net elastic -p 9200:9200 -p 9300:9300 -it {docker-image} ---- endif::[] ++ +When you start {es} for the first time, the following security configuration +occurs automatically: ++ +-- +* <> are generated +for the transport and HTTP layers. +* The Transport Layer Security (TLS) configuration settings are written to +`elasticsearch.yml`. +* A password is generated for the `elastic` user. +* An enrollment token is generated for {kib}. + +NOTE: You might need to scroll back a bit in the terminal to view the password +and enrollment token. +-- + +. Copy the generated password and enrollment token and save them in a secure +location. These values are shown only when you start {es} for the first time. +You'll use these to enroll {kib} with your {es} cluster and log in. ++ +[NOTE] +==== +If you need to reset the password for the `elastic` user or other +built-in users, run the <> tool. +To generate new enrollment tokens for {kib} or {es} nodes, run the +<> tool. +These tools are available in the {es} `bin` directory. +==== **Install and run {kib}** @@ -40,10 +68,16 @@ ifeval::["{release-state}"!="unreleased"] ["source","txt",subs="attributes"] ---- docker pull docker.elastic.co/kibana/kibana:{version} -docker run --name kib01-test --net elastic -p 5601:5601 -e "ELASTICSEARCH_HOSTS=http://es01-test:9200" docker.elastic.co/kibana/kibana:{version} +docker run --name kib-01 --net elastic -p 5601:5601 docker.elastic.co/kibana/kibana:{version} ---- ++ +When you start {kib}, a unique link is output to your terminal. + +. To access {kib}, click the generated link in your terminal. + + .. In your browser, paste the enrollment token that you copied and click the button to connect your {kib} instance with {es}. -. To access {kib}, go to http://localhost:5601[http://localhost:5601] + .. Log in to {kib} as the `elastic` user with the password that was generated when you started {es}. endif::[] // end::self-managed[]