From 13293ef6df55d0a7a827104fe6f58d63d33430ca Mon Sep 17 00:00:00 2001
From: lcawl <lcawley@elastic.co>
Date: Wed, 13 Mar 2019 17:51:20 -0700
Subject: [PATCH 1/2] [DOCS] Add reindex steps for internal indices

---
 .../upgrade/reindex_upgrade.asciidoc          | 42 +++++++++++++++++++
 1 file changed, 42 insertions(+)

diff --git a/docs/reference/upgrade/reindex_upgrade.asciidoc b/docs/reference/upgrade/reindex_upgrade.asciidoc
index 2fec1fb2ef8fb..65555744dd0db 100644
--- a/docs/reference/upgrade/reindex_upgrade.asciidoc
+++ b/docs/reference/upgrade/reindex_upgrade.asciidoc
@@ -7,6 +7,11 @@ before upgrading to {version}. {es} nodes will fail to start if
 incompatible indices are present. Snapshots of 5.x or earlier indices cannot be
 restored to a 7.x cluster even if they were created by a 6.x cluster.
 
+This restriction also applies to the internal indices that are used by
+{kib} and the {xpack} features. Therefore, before you can use {kib} and
+{xpack} features in {version}, you must ensure the internal indices have a
+compatible index structure.
+
 You have two options for reindexing old indices:
 
 * <<reindex-upgrade-inplace, Reindex in place>> on your 6.x cluster before upgrading.
@@ -50,6 +55,43 @@ modifications to the document data and metadata during reindexing.
 .. Add an alias with the old index name to the new index.
 .. Add any aliases that existed on the old index to the new index.
 
+ifdef::include-xpack[]
+[TIP]
+====
+If you use {es} {security-features}, before you reindex `.security*` internal
+indices it is a good idea to create a temporary superuser account in the `file`
+realm.
+
+. On a single node, add a temporary superuser account to the `file` realm. For
+example, run the <<users-command,elasticsearch-users useradd>> command:
++
+--
+[source,sh]
+----------------------------------------------------------
+bin/elasticsearch-users useradd <user_name> \
+-p <password> -r superuser
+----------------------------------------------------------
+--
+
+. Use these credentials when you reindex the `.security*` index. That is to say,
+use them to log into {kib} and run the Upgrade Assistant or to call the
+reindex API. You can use your regular administration credentials to
+reindex the other internal indices.
+
+. Delete the temporary superuser account from the file realm. For
+example, run the {ref}/users-command.html[elasticsearch-users userdel] command:
++
+--
+[source,sh]
+----------------------------------------------------------
+bin/elasticsearch-users userdel <user_name>
+----------------------------------------------------------
+--
+
+For more information, see <<configuring-file-realm>>.
+====
+endif::include-xpack[]
+
 [[reindex-upgrade-remote]]
 === Reindex from a remote cluster
 

From c04cf2f52810913ca30fddeaa47442a45574ccfd Mon Sep 17 00:00:00 2001
From: lcawl <lcawley@elastic.co>
Date: Wed, 13 Mar 2019 18:43:36 -0700
Subject: [PATCH 2/2] [DOCS] Adds tip for reindexing ML indices

---
 docs/reference/upgrade/reindex_upgrade.asciidoc | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/docs/reference/upgrade/reindex_upgrade.asciidoc b/docs/reference/upgrade/reindex_upgrade.asciidoc
index 65555744dd0db..1dc20ec6e709f 100644
--- a/docs/reference/upgrade/reindex_upgrade.asciidoc
+++ b/docs/reference/upgrade/reindex_upgrade.asciidoc
@@ -58,6 +58,11 @@ modifications to the document data and metadata during reindexing.
 ifdef::include-xpack[]
 [TIP]
 ====
+If you use {ml-features} and your {ml} indices were created before
+{prev-major-version}, you must
+{stack-ov}/stopping-ml.html[stop all {dfeeds} and close all {ml} jobs] before
+you reindex the indices.
+
 If you use {es} {security-features}, before you reindex `.security*` internal
 indices it is a good idea to create a temporary superuser account in the `file`
 realm.