From 49b4c097cf3c1e13e375e642ce8ab6f16faab290 Mon Sep 17 00:00:00 2001 From: James Rodewig Date: Fri, 26 Apr 2019 10:07:06 -0400 Subject: [PATCH 1/2] [DOCS] Fix delimited blocks for Asciidoctor migration --- docs/reference/upgrade/cluster_restart.asciidoc | 2 ++ docs/reference/upgrade/upgrade-node.asciidoc | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/reference/upgrade/cluster_restart.asciidoc b/docs/reference/upgrade/cluster_restart.asciidoc index 20786857993a2..39a6a21f51ae2 100644 --- a/docs/reference/upgrade/cluster_restart.asciidoc +++ b/docs/reference/upgrade/cluster_restart.asciidoc @@ -46,6 +46,8 @@ include::remove-xpack.asciidoc[] + -- include::upgrade-node.asciidoc[] ++ +-- include::set-paths-tip.asciidoc[] -- diff --git a/docs/reference/upgrade/upgrade-node.asciidoc b/docs/reference/upgrade/upgrade-node.asciidoc index 12a2e692662b8..c445c03a38abb 100644 --- a/docs/reference/upgrade/upgrade-node.asciidoc +++ b/docs/reference/upgrade/upgrade-node.asciidoc @@ -18,12 +18,10 @@ To upgrade using a zip or compressed tarball: data directory. If you are not using an external `data` directory, copy your old data directory over to the new installation. + + --- IMPORTANT: If you use {monitor-features}, re-use the data directory when you upgrade {es}. Monitoring identifies unique {es} nodes by using the persistent UUID, which is stored in the data directory. --- .. Set `path.logs` in `config/elasticsearch.yml` to point to the location where you want to store your logs. If you do not specify this setting, From 7ebb143dc3d4e7617b452359edee718555160de1 Mon Sep 17 00:00:00 2001 From: James Rodewig Date: Fri, 26 Apr 2019 10:33:59 -0400 Subject: [PATCH 2/2] [DOCS] Add missing delimiter --- docs/reference/upgrade/cluster_restart.asciidoc | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/reference/upgrade/cluster_restart.asciidoc b/docs/reference/upgrade/cluster_restart.asciidoc index 39a6a21f51ae2..1865f005dccc8 100644 --- a/docs/reference/upgrade/cluster_restart.asciidoc +++ b/docs/reference/upgrade/cluster_restart.asciidoc @@ -46,6 +46,7 @@ include::remove-xpack.asciidoc[] + -- include::upgrade-node.asciidoc[] +-- + -- include::set-paths-tip.asciidoc[]