From de5de4bf58ea4bfc106774e6af6205824f7a4bcc Mon Sep 17 00:00:00 2001 From: James Rodewig Date: Mon, 1 Jun 2020 10:28:34 -0400 Subject: [PATCH] [DOCS] Relocate "Remote Clusters" page (#55172) (#57422) Relocates the "Remote Clusters" documentation from the "Modules" section to the "Set up Elasticsearch" section. Supporting changes: * Reorders the "Bootstrap checks for X-Pack" section to immediately follow the "Bootstrap checks"chapter. * Removes an outdated X-Pack `idef` from the "Remote Clusters" intro. --- docs/reference/modules.asciidoc | 7 ------- docs/reference/modules/remote-clusters.asciidoc | 14 +++----------- docs/reference/setup.asciidoc | 6 ++++-- 3 files changed, 7 insertions(+), 20 deletions(-) diff --git a/docs/reference/modules.asciidoc b/docs/reference/modules.asciidoc index a0dec3cfdbbd2..480401ac39d3b 100644 --- a/docs/reference/modules.asciidoc +++ b/docs/reference/modules.asciidoc @@ -55,11 +55,6 @@ The modules in this section are: Configure the transport networking layer, used internally by Elasticsearch to communicate between nodes. -<>:: - - Remote clusters are used in features that work by connecting across clusters - on the transport layer. - <>:: {ccs-cap} enables executing search requests across more than one cluster @@ -82,5 +77,3 @@ include::modules/node.asciidoc[] include::modules/threadpool.asciidoc[] include::modules/transport.asciidoc[] - -include::modules/remote-clusters.asciidoc[] diff --git a/docs/reference/modules/remote-clusters.asciidoc b/docs/reference/modules/remote-clusters.asciidoc index 426f79f0f4f65..946649198c2b9 100644 --- a/docs/reference/modules/remote-clusters.asciidoc +++ b/docs/reference/modules/remote-clusters.asciidoc @@ -1,17 +1,9 @@ [[modules-remote-clusters]] == Remote clusters -ifndef::include-xpack[] -The _remote clusters_ module enables you to establish uni-directional -connections to a remote cluster. This functionality is used in -<>. -endif::[] -ifdef::include-xpack[] -The _remote clusters_ module enables you to establish uni-directional -connections to a remote cluster. This functionality is used in -<> and -<>. -endif::[] +The _remote clusters_ functionality enables you to establish unidirectional +connections to a remote cluster. Remote clusters are required for +<> and <>. Remote cluster connections work by configuring a remote cluster and connecting to a limited number of nodes in that remote cluster. There are two modes for diff --git a/docs/reference/setup.asciidoc b/docs/reference/setup.asciidoc index 3b8b650c0a21f..88a0ec0659491 100644 --- a/docs/reference/setup.asciidoc +++ b/docs/reference/setup.asciidoc @@ -89,6 +89,8 @@ include::setup/sysconfig.asciidoc[] include::setup/bootstrap-checks.asciidoc[] +include::setup/bootstrap-checks-xes.asciidoc[] + include::setup/starting.asciidoc[] include::setup/stopping.asciidoc[] @@ -97,10 +99,10 @@ include::setup/add-nodes.asciidoc[] include::setup/restart-cluster.asciidoc[] +include::modules/remote-clusters.asciidoc[] + include::setup/setup-xes.asciidoc[] include::setup/setup-xclient.asciidoc[] -include::setup/bootstrap-checks-xes.asciidoc[] - include::modules/plugins.asciidoc[]