Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updates X-Pack and Upgrade Assistant details #278

Merged
merged 3 commits into from
Apr 9, 2019
Merged

Conversation

lcawl
Copy link
Contributor

@lcawl lcawl commented Apr 8, 2019

This PR clarifies the upgrade process with respect to installing X-Pack and using the Upgrade Assistant.

@lcawl lcawl added the v6.7.0 label Apr 8, 2019
Copy link
Contributor

@debadair debadair left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think the context here got a bit confused. The 6.7 docs are talking about upgrading to 6.7. The information about how to get from 2.x and 5.x to 6.7 still apply, including the part about installing the X-Pack plugin on 5.6.


Rolling upgrades are supported when upgrading from Elasticsearch 5.6 and
Elasticsearch 6.0-6.2 to {version}. Upgrading from any
version prior to 5.6 requires a full cluster restart.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think it's correct to remove this wholesale. This version covers upgrading to 6.7. If you're upgrading from a pre-6.3 version, the information about installing X-Pack still applies, as does using the upgrade guide (which I'm upgrading to mention 6.7). Perhaps we need to split off that last sentence in the second paragraph to make it more obvious? "In
6.3 and later, {xpack} is automatically installed when you install {es}, {kib},
and Logstash. "

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I moved it down into the body of the upgrade steps to match what you'd done in 7.0, but if you want it repeated still at the top, that's okay by me.

upgrade the internal indices. If you're performing a full cluster restart upgrade
from an earlier version, you can also <<upgrade-internal-indices,use the
`_xpack/migration/upgrade` API>> directly to upgrade the
internal indices after you install Elasticsearch {version}.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This still applies to folks getting to 6.7.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If you look at the preview, you'll see that's covered in the Upgrade Assistant step. If it's still not clear, however, let me know.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I removed the part about full cluster restarting from an earlier version, since this section assumed you were 5.6 or later, but will see if it's appropriate to add to lower sections.

******

. Use the Upgrade Assistant to identify any changes you need to make to your
cluster configuration.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

References to 6.3 here don't seem quite right. (And we probably need to tweak the section titled "Upgrading to 6.3" as well, since this is the 6.7 version.

@debadair
Copy link
Contributor

debadair commented Apr 8, 2019

For the "Upgrading to 6.3" section, this might work:

=== Upgrading from versions 5.6-6.2
Starting in 6.3, the default distributions of Elasticsearch, Logstash, and Kibana
include {xpack} and a free Basic license that never expires.
You can perform rolling upgrades to {version} from OSS-only clusters running 5.6
or 6.0-6.2. Basic features are operational once the cluster is fully
upgraded. If you are already using {xpack}, your settings are preserved when
you upgrade.

******
The Upgrade Assistant and migration APIs are enabled with both the Basic and
Trial licenses. You can install the default distribution of 6.3 to use the
Upgrade Assistant to prepare to upgrade even if you are upgrading to the OSS
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This reference to 6.3 is incorrect. You don't need to install 6.3 to get to 6.7. :-)

Copy link
Contributor Author

@lcawl lcawl Apr 8, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Right, but the default distribution doesn't contain X-Pack until 6.3. Let's see if I can make that clearer.

@@ -116,7 +117,8 @@ and Beats as soon as possible to take advantage of performance improvements
and other enhancements.

[discrete]
=== Upgrading to 6.3
=== Upgrading from 5.6 - 6.2

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The following reference to "rolling upgrades to 6.3" should be "rolling upgrades to {version}"

Copy link
Contributor

@debadair debadair left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

With the version tweak and the heading change, LGTM.

@lcawl lcawl marked this pull request as ready for review April 8, 2019 23:07
@lcawl
Copy link
Contributor Author

lcawl commented Apr 8, 2019

Thanks for the quick feedback @debadair !

@lcawl lcawl merged commit 0bd5f24 into elastic:6.7 Apr 9, 2019
@lcawl lcawl deleted the xpack-upgrade branch April 9, 2019 16:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants