Skip to content

[DOCS] Add maintenance releases to upgrade table#55012

Merged
jrodewig merged 2 commits intoelastic:7.6from
jrodewig:docs__maint-rel-upgrade-76
Apr 14, 2020
Merged

[DOCS] Add maintenance releases to upgrade table#55012
jrodewig merged 2 commits intoelastic:7.6from
jrodewig:docs__maint-rel-upgrade-76

Conversation

@jrodewig
Copy link
Copy Markdown
Contributor

@jrodewig jrodewig commented Apr 9, 2020

Updates the supported upgrade path table in Upgrade Elasticsearch
to include maintenance releases. For example, this covers upgrading
from 7.6.0 to 7.6.2.

The new table row only displays for releases greater than n.x.0. For
example, the new row will display for the 7.7.1 release but not the
7.7.0 release.

This PR targets 7.6 as that's the latest branch that will display the new row.
However, I plan to port to 7.7, 7.x, and master.

Preview: http://docs__maint-rel-upgrade-76.docs-preview.app.elstc.co/guide/en/elasticsearch/reference/current/setup-upgrade.html

Closes #53787

Updates the supported upgrade path table in [Upgrade Elasticsearch][0]
to include a new row for maintenance releases. For example, this row
covers upgrading from 7.6.0 to 7.6.2.

The new table row only displays for releases greater than n.x.0. For
example, the new row will display for the 7.7.1 release but not the
7.7.0 release.

[0]: https://www.elastic.co/guide/en/elasticsearch/reference/master/setup-upgrade.html
@jrodewig jrodewig added >docs General docs changes :Delivery/Packaging RPM and deb packaging, tar and zip archives, shell and batch scripts v8.0.0 v7.6.3 v7.8.0 v7.7.1 labels Apr 9, 2020
@jrodewig jrodewig requested a review from DaveCTurner April 9, 2020 13:18
@elasticmachine
Copy link
Copy Markdown
Collaborator

Pinging @elastic/es-docs (>docs)

@elasticmachine
Copy link
Copy Markdown
Collaborator

Pinging @elastic/es-core-infra (:Core/Infra/Packaging)

Copy link
Copy Markdown
Member

@DaveCTurner DaveCTurner left a comment

Choose a reason for hiding this comment

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

I suggested some small changes, assuming that there's a macro for the number of the previous patch/minor version. If that's not available then this still looks like a good improvement.

|Recommended upgrade path to {version}

ifeval::[ "{version}" != "{minor-version}.0" ]
|A previous {minor-version} version (e.g., {minor-version}.0)
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

This seems a bit awkward since this column otherwise contains only minor version number ranges. Is there a macro for the previous patch version? If so, could we say {minor-version}.0 if the current version is {minor-version}.1 and {minor-version}.0-{previous-patch-version} otherwise?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

I agree that the wording is a bit awkward. A range would be preferable.

Unfortunately, there is no attribute/macro for the previous patch version. We could add a {prev-patch-version} attribute to the appropriate Stack version attribute list, but we'd need to include it in for every version to avoid breaks. That would include n.x.0 versions, which could create issues.

If you'd prefer a range here, it would probably be simpler for us to hard code the maintenance releases and add an item to our release prep process.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Ok, let's leave it like this.

|<<rolling-upgrades,Rolling upgrade>> to {version}
endif::[]

|7.0–7.5
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Similarly, instead of 7.5 is there a macro for the previous minor version?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

* Between minor versions
* From 5.6 to 6.8
* From 6.8 to {version}
* Between {minor-version} versions
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

I wonder if "between" might be read as implying you can change version in both directions within the 7.6.x series. How about "from any version since {major-version}.0 to {version}" and drop the "Between minor versions" line?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Good suggestion. Updated with 4d2cc90.

@jrodewig
Copy link
Copy Markdown
Contributor Author

jrodewig commented Apr 9, 2020

Thanks for your review @DaveCTurner. There is no macro for the previous patch release. Adding such a macro could cause issues for n.x.0 versions.

Let me know if you have any suggestions or thoughts!

@jrodewig jrodewig requested a review from DaveCTurner April 14, 2020 13:36
Copy link
Copy Markdown
Member

@DaveCTurner DaveCTurner left a comment

Choose a reason for hiding this comment

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

LGTM

|Recommended upgrade path to {version}

ifeval::[ "{version}" != "{minor-version}.0" ]
|A previous {minor-version} version (e.g., {minor-version}.0)
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Ok, let's leave it like this.

@jrodewig
Copy link
Copy Markdown
Contributor Author

Thanks @DaveCTurner.

@jrodewig jrodewig merged commit d79e04d into elastic:7.6 Apr 14, 2020
@jrodewig jrodewig deleted the docs__maint-rel-upgrade-76 branch April 14, 2020 15:02
jrodewig added a commit that referenced this pull request Apr 14, 2020
Updates the supported upgrade path table in [Upgrade Elasticsearch][0]
to include a new row for maintenance releases. For example, this row
covers upgrading from 7.6.0 to 7.6.2.

The new table row only displays for releases greater than n.x.0. For
example, the new row will display for the 7.7.1 release but not the
7.7.0 release.

[0]: https://www.elastic.co/guide/en/elasticsearch/reference/master/setup-upgrade.html
jrodewig added a commit that referenced this pull request Apr 14, 2020
Updates the supported upgrade path table in [Upgrade Elasticsearch][0]
to include a new row for maintenance releases. For example, this row
covers upgrading from 7.6.0 to 7.6.2.

The new table row only displays for releases greater than n.x.0. For
example, the new row will display for the 7.7.1 release but not the
7.7.0 release.

[0]: https://www.elastic.co/guide/en/elasticsearch/reference/master/setup-upgrade.html
jrodewig added a commit that referenced this pull request Apr 14, 2020
Updates the supported upgrade path table in [Upgrade Elasticsearch][0]
to include a new row for maintenance releases. For example, this row
covers upgrading from 7.6.0 to 7.6.2.

The new table row only displays for releases greater than n.x.0. For
example, the new row will display for the 7.7.1 release but not the
7.7.0 release.

[0]: https://www.elastic.co/guide/en/elasticsearch/reference/master/setup-upgrade.html
@jrodewig
Copy link
Copy Markdown
Contributor Author

Backport commits

master 0adf082
7.x 1213084
7.7 83b8603
7.6 d79e04d

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

:Delivery/Packaging RPM and deb packaging, tar and zip archives, shell and batch scripts >docs General docs changes Team:Delivery Meta label for Delivery team v7.6.3 v7.7.1 v7.8.0 v8.0.0-alpha1

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants