diff --git a/docs/reference/index.asciidoc b/docs/reference/index.asciidoc index 11006d38976b5..482891255848a 100644 --- a/docs/reference/index.asciidoc +++ b/docs/reference/index.asciidoc @@ -14,17 +14,17 @@ include::getting-started.asciidoc[] include::setup.asciidoc[] -include::{xes-repo-dir}/setup/setup-xes.asciidoc[] +include::setup/setup-xes.asciidoc[] include::{xes-repo-dir}/monitoring/configuring-monitoring.asciidoc[] include::{xes-repo-dir}/security/configuring-es.asciidoc[] -include::{xes-repo-dir}/setup/setup-xclient.asciidoc[] +include::setup/setup-xclient.asciidoc[] include::{xes-repo-dir}/settings/configuring-xes.asciidoc[] -include::{xes-repo-dir}/setup/bootstrap-checks-xes.asciidoc[] +include::setup/bootstrap-checks-xes.asciidoc[] :edit_url: include::upgrade.asciidoc[] diff --git a/x-pack/docs/en/setup/bootstrap-checks-xes.asciidoc b/docs/reference/setup/bootstrap-checks-xes.asciidoc similarity index 100% rename from x-pack/docs/en/setup/bootstrap-checks-xes.asciidoc rename to docs/reference/setup/bootstrap-checks-xes.asciidoc diff --git a/docs/reference/setup/install.asciidoc b/docs/reference/setup/install.asciidoc index 7668d45ee3536..783cb804e7af1 100644 --- a/docs/reference/setup/install.asciidoc +++ b/docs/reference/setup/install.asciidoc @@ -65,6 +65,5 @@ include::install/rpm.asciidoc[] include::install/windows.asciidoc[] -ifdef::include-xpack[] -include::{xes-repo-dir}/setup/docker.asciidoc[] -endif::include-xpack[] +include::install/docker.asciidoc[] + diff --git a/docs/reference/setup/install/deb.asciidoc b/docs/reference/setup/install/deb.asciidoc index af9d35f3f169d..2abacf947c7bc 100644 --- a/docs/reference/setup/install/deb.asciidoc +++ b/docs/reference/setup/install/deb.asciidoc @@ -139,7 +139,7 @@ ifdef::include-xpack[] ==== Enable automatic creation of {xpack} indices {xpack} will try to automatically create a number of indices within Elasticsearch. -include::{xes-repo-dir}/setup/xpack-indices.asciidoc[] +include::xpack-indices.asciidoc[] endif::include-xpack[] diff --git a/x-pack/docs/en/setup/docker.asciidoc b/docs/reference/setup/install/docker.asciidoc similarity index 99% rename from x-pack/docs/en/setup/docker.asciidoc rename to docs/reference/setup/install/docker.asciidoc index 6ad6ef0fe6c10..0e62fa207f6eb 100644 --- a/x-pack/docs/en/setup/docker.asciidoc +++ b/docs/reference/setup/install/docker.asciidoc @@ -1,4 +1,3 @@ -[role="xpack"] [[docker]] === Install {es} with Docker diff --git a/docs/reference/setup/install/next-steps.asciidoc b/docs/reference/setup/install/next-steps.asciidoc index 1e004eeee6bf1..e52cdfee077ed 100644 --- a/docs/reference/setup/install/next-steps.asciidoc +++ b/docs/reference/setup/install/next-steps.asciidoc @@ -1,11 +1,10 @@ [role="exclude"] ==== Next steps -You now have a test Elasticsearch environment set up. Before you start -serious development or go into production with Elasticsearch, you will need to -do some additional setup: +You now have a test {es} environment set up. Before you start +serious development or go into production with {es}, you must do some additional +setup: * Learn how to <>. * Configure <>. * Configure <>. - diff --git a/docs/reference/setup/install/rpm.asciidoc b/docs/reference/setup/install/rpm.asciidoc index a44b0b37d31ec..aad7cf5bf3b73 100644 --- a/docs/reference/setup/install/rpm.asciidoc +++ b/docs/reference/setup/install/rpm.asciidoc @@ -126,7 +126,7 @@ ifdef::include-xpack[] ==== Enable automatic creation of {xpack} indices {xpack} will try to automatically create a number of indices within {es}. -include::{xes-repo-dir}/setup/xpack-indices.asciidoc[] +include::xpack-indices.asciidoc[] endif::include-xpack[] diff --git a/docs/reference/setup/install/windows.asciidoc b/docs/reference/setup/install/windows.asciidoc index 861daa160e7b5..56bb953c18ebb 100644 --- a/docs/reference/setup/install/windows.asciidoc +++ b/docs/reference/setup/install/windows.asciidoc @@ -337,7 +337,7 @@ ifdef::include-xpack[] ==== Enable automatic creation of {xpack} indices {xpack} will try to automatically create a number of indices within {es}. -include::{xes-repo-dir}/setup/xpack-indices.asciidoc[] +include::xpack-indices.asciidoc[] endif::include-xpack[] diff --git a/x-pack/docs/en/setup/xpack-indices.asciidoc b/docs/reference/setup/install/xpack-indices.asciidoc similarity index 100% rename from x-pack/docs/en/setup/xpack-indices.asciidoc rename to docs/reference/setup/install/xpack-indices.asciidoc diff --git a/docs/reference/setup/install/zip-targz.asciidoc b/docs/reference/setup/install/zip-targz.asciidoc index 94de390656b1e..f44742c648e8e 100644 --- a/docs/reference/setup/install/zip-targz.asciidoc +++ b/docs/reference/setup/install/zip-targz.asciidoc @@ -85,7 +85,7 @@ ifdef::include-xpack[] ==== Enable automatic creation of {xpack} indices {xpack} will try to automatically create a number of indices within {es}. -include::{xes-repo-dir}/setup/xpack-indices.asciidoc[] +include::xpack-indices.asciidoc[] endif::include-xpack[] diff --git a/docs/reference/setup/install/zip-windows.asciidoc b/docs/reference/setup/install/zip-windows.asciidoc index 18c1272d25db5..cd86a6268911c 100644 --- a/docs/reference/setup/install/zip-windows.asciidoc +++ b/docs/reference/setup/install/zip-windows.asciidoc @@ -53,7 +53,7 @@ ifdef::include-xpack[] ==== Enable automatic creation of {xpack} indices {xpack} will try to automatically create a number of indices within {es}. -include::{xes-repo-dir}/setup/xpack-indices.asciidoc[] +include::xpack-indices.asciidoc[] endif::include-xpack[] diff --git a/x-pack/docs/en/setup/setup-xclient.asciidoc b/docs/reference/setup/setup-xclient.asciidoc similarity index 99% rename from x-pack/docs/en/setup/setup-xclient.asciidoc rename to docs/reference/setup/setup-xclient.asciidoc index b94d4fe9c10a6..4282264e39524 100644 --- a/x-pack/docs/en/setup/setup-xclient.asciidoc +++ b/docs/reference/setup/setup-xclient.asciidoc @@ -1,4 +1,5 @@ [role="xpack"] +[testenv="basic"] [[setup-xpack-client]] == Configuring {xpack} Java Clients diff --git a/x-pack/docs/en/setup/setup-xes.asciidoc b/docs/reference/setup/setup-xes.asciidoc similarity index 100% rename from x-pack/docs/en/setup/setup-xes.asciidoc rename to docs/reference/setup/setup-xes.asciidoc diff --git a/x-pack/docs/en/setup/images/ElasticsearchFlow.jpg b/x-pack/docs/en/setup/images/ElasticsearchFlow.jpg deleted file mode 100644 index 41fd8508c7ad4..0000000000000 Binary files a/x-pack/docs/en/setup/images/ElasticsearchFlow.jpg and /dev/null differ diff --git a/x-pack/docs/en/setup/next-steps.asciidoc b/x-pack/docs/en/setup/next-steps.asciidoc deleted file mode 100644 index e52cdfee077ed..0000000000000 --- a/x-pack/docs/en/setup/next-steps.asciidoc +++ /dev/null @@ -1,10 +0,0 @@ -[role="exclude"] -==== Next steps - -You now have a test {es} environment set up. Before you start -serious development or go into production with {es}, you must do some additional -setup: - -* Learn how to <>. -* Configure <>. -* Configure <>. diff --git a/x-pack/docs/en/setup/xpack-passwords.asciidoc b/x-pack/docs/en/setup/xpack-passwords.asciidoc deleted file mode 100644 index 0d9dc22f3b3f9..0000000000000 --- a/x-pack/docs/en/setup/xpack-passwords.asciidoc +++ /dev/null @@ -1,27 +0,0 @@ - -. Set the passwords for all built-in users. -+ --- -If you have enabled {security}, it provides built-in user credentials to help you -get up and running. The +elasticsearch-setup-passwords+ command is the simplest -method to set the built-in users' passwords for the first time. - -For example, you can run the command in an "interactive" mode, which prompts you -to enter new passwords for the `elastic`, `kibana`, and `logstash_system` users: - -[source,shell] --------------------------------------------------- -bin/elasticsearch-setup-passwords interactive --------------------------------------------------- - -For more information about the command options, see <>. - -IMPORTANT: The `elasticsearch-setup-passwords` command uses a transient -bootstrap password that is no longer valid after the command runs successfully. -You cannot run the `elasticsearch-setup-passwords` command a second time. -Instead, you can update passwords from the **Management > Users** UI in {kib} or -use the security user API. - -For more information, see -{xpack-ref}/setting-up-authentication.html#set-built-in-user-passwords[Setting Built-in User Passwords]. --- diff --git a/x-pack/docs/en/setup/xpack-tls.asciidoc b/x-pack/docs/en/setup/xpack-tls.asciidoc deleted file mode 100644 index 033339b3610a8..0000000000000 --- a/x-pack/docs/en/setup/xpack-tls.asciidoc +++ /dev/null @@ -1,16 +0,0 @@ - -. Configure Transport Layer Security (TLS/SSL). -+ --- -If have enabled {security}, you must configure TLS for internode-communication. - -NOTE: This requirement applies to clusters with more than one node and to -clusters with a single node that listens on an external interface. Single-node -clusters that use a loopback interface do not have this requirement. For more -information, see -{xpack-ref}/encrypting-communications.html[Encrypting Communications]. - --- -.. <>. - -.. <>.