Skip to content

Commit b56cef8

Browse files
committed
[DOCS] Added 6.3 info & updated the upgrade table. (#30940)
1 parent 518bbf9 commit b56cef8

File tree

1 file changed

+51
-11
lines changed

1 file changed

+51
-11
lines changed

docs/reference/upgrade.asciidoc

Lines changed: 51 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -40,32 +40,72 @@ required.
4040
[cols="1<m,1<m,3",options="header",]
4141
|=======================================================================
4242
|Upgrade From |Upgrade To |Supported Upgrade Type
43-
|5.x |5.y |<<rolling-upgrades,Rolling upgrade>> (where `y > x`)
44-
|5.6 |6.x |<<rolling-upgrades,Rolling upgrade>> footnoteref:[reindexfn, You must delete or reindex any indices created in 2.x before upgrading.]
45-
|5.0-5.5 |6.x |<<restart-upgrade,Full cluster restart>> footnoteref:[reindexfn]
46-
|<5.x |6.x |<<reindex-upgrade,Reindex to upgrade>>
47-
|6.x |6.y |<<rolling-upgrades,Rolling upgrade>> (where `y > x`)
43+
|6.0-6.2 |{version} |<<rolling-upgrades,Rolling upgrade>>
44+
|5.6 |{version} |<<rolling-upgrades,Rolling upgrade>> footnoteref:[reindexfn, You must delete or reindex any indices created in 2.x before upgrading.]
45+
|5.0-5.5 |{version} |<<restart-upgrade,Full cluster restart>> footnoteref:[reindexfn]
46+
|Pre-5.0 |{version} |<<reindex-upgrade,Reindex to upgrade>>
4847
|=======================================================================
4948

5049
[IMPORTANT]
5150
===============================================
5251
5352
Elasticsearch can read indices created in the *previous major version*.
54-
Older indices must be reindexed or deleted. Elasticsearch 6.x
55-
can use indices created in Elasticsearch 5.x, but not those created in
56-
Elasticsearch 2.x or before. Elasticsearch 5.x can use indices created in
57-
Elasticsearch 2.x, but not those created in 1.x or before.
53+
Older indices must be reindexed or deleted. Elasticsearch 6.n
54+
can use indices created in Elasticsearch 5.n, but not those created in
55+
Elasticsearch 2.n or before. Elasticsearch 5.n can use indices created in
56+
Elasticsearch 2.n, but not those created in 1.n or before.
5857
5958
This also applies to indices backed up with <<modules-snapshots,snapshot
60-
and restore>>. If an index was originally created in 2.x, it cannot be
61-
restored to a 6.x cluster even if the snapshot was created by a 5.x cluster.
59+
and restore>>. If an index was originally created in 2.n, it cannot be
60+
restored to a 6.n cluster even if the snapshot was created by a 5.n cluster.
6261
6362
Elasticsearch nodes will fail to start if incompatible indices are present.
6463
6564
For information about how to upgrade old indices, see <<reindex-upgrade,
6665
Reindex to upgrade>>.
6766
6867
===============================================
68+
69+
[float]
70+
[[elasticsearch-upgrade-6.3]]
71+
=== Upgrading to 6.3
72+
Starting in 6.3, the default distribution includes {xpack} with a free
73+
Basic license. If you already have a Basic license, once you upgrade to 6.3
74+
it will never expire or need to be renewed. If you have a license subscription,
75+
your license and settings are preserved when you upgrade.
76+
77+
You can perform rolling upgrades to 6.3 from OSS-only clusters running 5.6
78+
or 6.0-6.2. {xpack} Basic features will be operational once the cluster is fully
79+
upgraded.
80+
81+
If you are using {xpack} for the first time, you must explicitly enable data
82+
collection after the upgrade to use monitoring. Set
83+
`xpack.monitoring.collection.enabled` to `true` with the `_cluster/settings`
84+
API:
85+
86+
[source,json]
87+
----------------------------------------------------------
88+
PUT /_cluster/settings
89+
{
90+
"persistent" : {
91+
"xpack.monitoring.collection.enabled" : "true"
92+
}
93+
}
94+
----------------------------------------------------------
95+
// CONSOLE
96+
97+
To take all of the {xpack} features for a spin, you can start a 30-day trial
98+
from Kibana, or with the Start Trial API:
99+
100+
[source,json]
101+
----------------------------------------------------------
102+
POST _xpack/license/start_trial
103+
----------------------------------------------------------
104+
// CONSOLE
105+
106+
The 30-day trial enables you to try out the full set of Platinum features,
107+
including security, machine learning, alerting, graph capabilities, and more.
108+
69109
--
70110

71111
include::upgrade/rolling_upgrade.asciidoc[]

0 commit comments

Comments
 (0)