Skip to content

Commit

Permalink
[DOCS] Fix upgrade docs for 8.x (#84076) (#84306)
Browse files Browse the repository at this point in the history
The current upgrade docs contain some language that's only applicable to 8.0. This updates the docs so they're usable in other 8.x branches.

(cherry picked from commit 2437e7d)
  • Loading branch information
jrodewig committed Feb 23, 2022
1 parent 92a65be commit 76c8d12
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 17 deletions.
30 changes: 16 additions & 14 deletions docs/reference/upgrade.asciidoc
Original file line number Diff line number Diff line change
@@ -1,17 +1,19 @@
[[setup-upgrade]]
= Upgrade {es}

{es} clusters can usually be upgraded one node at a time so
upgrading does not interrupt service. To upgrade to 8.0 or later,
**you must first upgrade to {prev-major-last}**, even if you opt to
do a full-cluster restart instead of a rolling upgrade.

This enables you to use the **Upgrade Assistant** to identify and resolve issues,
reindex indices created before 7.0, and then perform a rolling upgrade.

You must resolve all critical issues before proceeding with the upgrade.

For upgrade instructions, see {stack-ref}/upgrading-elastic-stack.html[Upgrading to Elastic {version}].
{es} clusters can usually be upgraded one node at a time so upgrading does not
interrupt service. For upgrade instructions, refer to
{stack-ref}/upgrading-elastic-stack.html[Upgrading to Elastic {version}].

.Upgrade from 7.x
IMPORTANT: To upgrade to {version} from 7.16 or an earlier version, **you must
first upgrade to {prev-major-last}**, even if you opt to do a full-cluster
restart instead of a rolling upgrade. This enables you to use the **Upgrade
Assistant** to identify and resolve issues, reindex indices created before 7.0,
and then perform a rolling upgrade. You must resolve all critical issues before
proceeding with the upgrade. For instructions, refer to
{stack-ref}/upgrading-elastic-stack.html#prepare-to-upgrade[Prepare to upgrade
from 7.x].

[discrete]
[[upgrade-index-compatibility]]
Expand All @@ -29,9 +31,9 @@ that need to be reindexed or removed.
[[upgrade-rest-api-compatibility]]
=== REST API compatibility

REST API compatibility in a per-request opt-in feature that can help REST clients
mitigate non compatible (breaking) changes to the REST API.
See <<rest-api-compatibility>> for additional information.
<<rest-api-compatibility,REST API compatibility>> is a per-request opt-in
feature that can help REST clients mitigate non-compatible (breaking) changes to
the REST API.

[discrete]
[[upgrade-fips-java17]]
Expand Down
6 changes: 3 additions & 3 deletions x-pack/docs/en/security/fips-java17.asciidoc
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{es} 8.0 requires Java 17 or later.
{es} {version} requires Java 17 or later.
There is not yet a FIPS-certified security module for Java 17
that you can use when running {es} 8.0 in FIPS 140-2 mode.
that you can use when running {es} {version} in FIPS 140-2 mode.
If you run in FIPS 140-2 mode, you will either need to request
an exception from your security organization to upgrade to {es} 8.0,
an exception from your security organization to upgrade to {es} {version},
or remain on {es} 7.x until Java 17 is certified.
ifeval::["{release-state}"=="released"]
Alternatively, consider using {ess} in the FedRAMP-certified GovCloud region.
Expand Down

0 comments on commit 76c8d12

Please sign in to comment.