Skip to content

Commit

Permalink
Adds discrete attributes to installation and upgrade guide
Browse files Browse the repository at this point in the history
  • Loading branch information
lcawl committed Apr 2, 2019
1 parent 898c62c commit e196031
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 2 deletions.
2 changes: 2 additions & 0 deletions docs/en/install-upgrade/installing-stack.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ Kibana {version}, and Logstash {version}.

If you're upgrading an existing installation, see <<upgrading-elastic-stack, Upgrading the Elastic Stack>> for information about how to ensure compatibility with {version}.

[discrete]
[[install-order-elastic-stack]]
=== Installation Order

Expand All @@ -22,6 +23,7 @@ Install the Elastic Stack products you want to use in the following order:
Installing in this order ensures that the components each product depends
on are in place.

[discrete]
[[install-elastic-stack-for-elastic-cloud]]
=== Installing on Elastic Cloud

Expand Down
10 changes: 8 additions & 2 deletions docs/en/install-upgrade/upgrading-stack.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ to be updated to work with {version}.
===============================


[discrete]
=== Preparing to upgrade

Before upgrading the Elastic Stack to {version}:
Expand Down Expand Up @@ -104,6 +105,7 @@ upgrade process. See
IMPORTANT: Test upgrades in a dev environment before upgrading your
production cluster.

[discrete]
[[upgrade-order-elastic-stack]]
=== Upgrade order

Expand All @@ -121,6 +123,7 @@ for your Logstash instances and Beats agents. We recommend upgrading Logstash
and Beats as soon as possible to take advantage of performance improvements
and other enhancements.

[discrete]
=== Upgrading to 6.3
Starting in 6.3, the default distributions of Elasticsearch, Logstash, and Kibana
include {xpack} and a free Basic license that never expires.
Expand Down Expand Up @@ -158,9 +161,9 @@ POST _xpack/license/start_trial
The 30-day trial enables you to try out the full set of platinum features,
including security, machine learning, alerting, graph capabilities, and more.

[role="xpack"]
[discrete]
[[xpack-stack-upgrade]]
=== Upgrading from 5.6
=== [xpack]#Upgrading from 5.6#

{xpack} 5.6 provides migration and upgrade APIs for Elasticsearch and a
Upgrade Assistant UI for Kibana. These tools are included with the trial
Expand Down Expand Up @@ -217,6 +220,7 @@ single-type format compatible with Elasticsearch 6.x.
. Once you've resolved all of the migration issues, perform
a {ref}/rolling-upgrades.html[rolling upgrade] from Elasticsearch 5.6 to {version}.

[discrete]
[[oss-stack-upgrade]]
=== Upgrading from a pre-5.6 installation

Expand All @@ -238,6 +242,7 @@ modifications to the document data and metadata during reindexing.
. Use the {ref}/indices-aliases.html[_aliases] API to add the name of the 2.x
index as alias for the new index and delete the 2.x index.

[discrete]
[[upgrade-internal-indices]]
==== Upgrading internal indices for {major-version}

Expand Down Expand Up @@ -279,6 +284,7 @@ internal indices using the `_xpack/migration/upgrade` API.
TIP: Once you upgrade the `.kibana` index, you can run Kibana and use the
{xpack} Reindex Helper UI to upgrade the other indices.

[discrete]
[[upgrade-elastic-stack-for-elastic-cloud]]
=== Upgrading on Elastic Cloud

Expand Down

0 comments on commit e196031

Please sign in to comment.