From c9bc847485ec3a336258851a6d149faabc0d5aad Mon Sep 17 00:00:00 2001 From: James Rodewig Date: Tue, 14 Apr 2020 13:47:15 -0400 Subject: [PATCH 1/2] [DOCS] Relocate "Remote Clusters" page --- docs/reference/modules.asciidoc | 7 ------- docs/reference/modules/remote-clusters.asciidoc | 14 +++----------- docs/reference/setup.asciidoc | 4 +++- 3 files changed, 6 insertions(+), 19 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..7fbbbc89b918f 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 uni-directional +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 7065249f0e81a..30982fb2650f1 100644 --- a/docs/reference/setup.asciidoc +++ b/docs/reference/setup.asciidoc @@ -87,6 +87,8 @@ include::setup/sysconfig.asciidoc[] include::setup/bootstrap-checks.asciidoc[] +include::setup/bootstrap-checks-xes.asciidoc[] + include::setup/starting.asciidoc[] include::setup/stopping.asciidoc[] @@ -95,6 +97,6 @@ include::setup/add-nodes.asciidoc[] include::setup/restart-cluster.asciidoc[] -include::setup/bootstrap-checks-xes.asciidoc[] +include::modules/remote-clusters.asciidoc[] include::modules/plugins.asciidoc[] From 83ffe9ee3d7e6639990415b0fb875412fc2f73ff Mon Sep 17 00:00:00 2001 From: James Rodewig Date: Tue, 14 Apr 2020 17:22:51 -0400 Subject: [PATCH 2/2] iter --- docs/reference/modules/remote-clusters.asciidoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/reference/modules/remote-clusters.asciidoc b/docs/reference/modules/remote-clusters.asciidoc index 7fbbbc89b918f..946649198c2b9 100644 --- a/docs/reference/modules/remote-clusters.asciidoc +++ b/docs/reference/modules/remote-clusters.asciidoc @@ -1,7 +1,7 @@ [[modules-remote-clusters]] == Remote clusters -The _remote clusters_ functionality enables you to establish uni-directional +The _remote clusters_ functionality enables you to establish unidirectional connections to a remote cluster. Remote clusters are required for <> and <>.