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

[Upgrade assistant] Fix the "Fix" button for ML snapshots in need of upgrade #119745

Merged
merged 3 commits into from
Nov 29, 2021

Conversation

droberts195
Copy link
Contributor

@droberts195 droberts195 commented Nov 25, 2021

The deprecations for ML snapshots that are too old and need
upgrading are supposed to have a "Fix" button next to them.
Unfortunately this disappeared when a message was reworded
in elastic/elasticsearch#79387.

This change adjusts the regex that the upgrade assistant
uses to detect which deprecations to add the "Fix" button
to so that it will match both "Model snapshot" and "model
snapshot". The test data is also updated to match the new
backend text.

This change is designed to work with elastic/elasticsearch#81060.

The deprecations for ML snapshots that are too old and need
upgrading are supposed to have a "Fix" button next to them.
Unfortunately this disappeared when a message was reworded
in elastic/elasticsearch#79387.

This change adjusts the regex that the upgrade assistant
uses to detect which deprecations to add the "Fix" button
to so that it will match both "Model snapshot" and "model
snapshot". The test data is also updated to match the new
backend text.
@droberts195 droberts195 changed the title [ML] Fix the "Fix" button for ML snapshots in need of upgrade [Upgrade assistant] Fix the "Fix" button for ML snapshots in need of upgrade Nov 25, 2021
@droberts195 droberts195 added bug Fixes for quality problems that affect the customer experience v7.16.1 v8.0.0 v8.1.0 labels Nov 25, 2021
droberts195 added a commit to droberts195/elasticsearch that referenced this pull request Nov 25, 2021
This is a followup to elastic#81039.

The same requirement to tolerate model snapshots back to 6.4.0
that applies to the job opening code also applies to the deprecation
checker. Again, we tell the user that 7.0.0 is the model snapshot
version we support, but we actually have to support versions going
back to 6.4.0 because we didn't update the constant in the C++ in
7.0.0.

Additionally, the wording of the ML deprecation messages is very
slightly updated. The messages are different in the 7.16 branch,
where they were updated by elastic#79387. This wording is copied forward
to master, but with the tiny change that "Snapshot" is changed to
"Model snapshot" in one place. This should make it clearer for
users that we're talking about ML model snapshots and not cluster
snapshots (which are completely different things). Another reason
to change the wording is that the UI is looking for the pattern
/[Mm]odel snapshot/ to decide when to display the "Fix" button for
upgrading ML model snapshots - see elastic/kibana#119745.
Copy link
Contributor

@sebelga sebelga left a comment

Choose a reason for hiding this comment

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

Change LGTM! thanks for fixing this @droberts195 !

I've created #119834 as I am not seeing API integration test for this, so this could easily break again in the future.

@droberts195
Copy link
Contributor Author

@elasticmachine merge upstream

@droberts195 droberts195 added the auto-backport Deprecated - use backport:version if exact versions are needed label Nov 29, 2021
@kibana-ci
Copy link
Collaborator

💚 Build Succeeded

Metrics [docs]

✅ unchanged

History

To update your PR or re-run it, just comment with:
@elasticmachine merge upstream

@droberts195 droberts195 merged commit 71166d2 into elastic:main Nov 29, 2021
@droberts195 droberts195 deleted the fix_fix_button_for_ml_snapshots branch November 29, 2021 14:48
droberts195 added a commit to elastic/elasticsearch that referenced this pull request Nov 29, 2021
…#81060)

This is a followup to #81039.

The same requirement to tolerate model snapshots back to 6.4.0
that applies to the job opening code also applies to the deprecation
checker. Again, we tell the user that 7.0.0 is the model snapshot
version we support, but we actually have to support versions going
back to 6.4.0 because we didn't update the constant in the C++ in
7.0.0.

Additionally, the wording of the ML deprecation messages is very
slightly updated. The messages are different in the 7.16 branch,
where they were updated by #79387. This wording is copied forward
to master, but with the tiny change that "Snapshot" is changed to
"Model snapshot" in one place. This should make it clearer for
users that we're talking about ML model snapshots and not cluster
snapshots (which are completely different things). Another reason
to change the wording is that the UI is looking for the pattern
/[Mm]odel snapshot/ to decide when to display the "Fix" button for
upgrading ML model snapshots - see elastic/kibana#119745.
droberts195 added a commit to droberts195/elasticsearch that referenced this pull request Nov 29, 2021
…elastic#81060)

This is a followup to elastic#81039.

The same requirement to tolerate model snapshots back to 6.4.0
that applies to the job opening code also applies to the deprecation
checker. Again, we tell the user that 7.0.0 is the model snapshot
version we support, but we actually have to support versions going
back to 6.4.0 because we didn't update the constant in the C++ in
7.0.0.

Additionally, the wording of the ML deprecation messages is very
slightly updated. The messages are different in the 7.16 branch,
where they were updated by elastic#79387. This wording is copied forward
to master, but with the tiny change that "Snapshot" is changed to
"Model snapshot" in one place. This should make it clearer for
users that we're talking about ML model snapshots and not cluster
snapshots (which are completely different things). Another reason
to change the wording is that the UI is looking for the pattern
/[Mm]odel snapshot/ to decide when to display the "Fix" button for
upgrading ML model snapshots - see elastic/kibana#119745.
kibanamachine pushed a commit to kibanamachine/kibana that referenced this pull request Nov 29, 2021
…upgrade (elastic#119745)

The deprecations for ML snapshots that are too old and need
upgrading are supposed to have a "Fix" button next to them.
Unfortunately this disappeared when a message was reworded
in elastic/elasticsearch#79387.

This change adjusts the regex that the upgrade assistant
uses to detect which deprecations to add the "Fix" button
to so that it will match both "Model snapshot" and "model
snapshot". The test data is also updated to match the new
backend text.

This change is designed to work with elastic/elasticsearch#81060.
kibanamachine pushed a commit to kibanamachine/kibana that referenced this pull request Nov 29, 2021
…upgrade (elastic#119745)

The deprecations for ML snapshots that are too old and need
upgrading are supposed to have a "Fix" button next to them.
Unfortunately this disappeared when a message was reworded
in elastic/elasticsearch#79387.

This change adjusts the regex that the upgrade assistant
uses to detect which deprecations to add the "Fix" button
to so that it will match both "Model snapshot" and "model
snapshot". The test data is also updated to match the new
backend text.

This change is designed to work with elastic/elasticsearch#81060.
@kibanamachine
Copy link
Contributor

💚 Backport successful

Status Branch Result
8.0
7.16

The backport PRs will be merged automatically after passing CI.

@droberts195
Copy link
Contributor Author

I've created #119834 as I am not seeing API integration test for this, so this could easily break again in the future.

Thanks @sebelga. I did notice that we had independent unit testing on the Elasticsearch and Kibana sides but nothing to confirm they both worked together. Since I am not a Kibana expert it will be great if you can add an integration test.

droberts195 added a commit to droberts195/elasticsearch that referenced this pull request Nov 29, 2021
…checker

This is a followup to elastic#81039.

The same requirement to tolerate model snapshots back to 6.4.0
that applies to the job opening code also applies to the deprecation
checker. Again, we tell the user that 7.0.0 is the model snapshot
version we support, but we actually have to support versions going
back to 6.4.0 because we didn't update the constant in the C++ in
7.0.0.

Additionally, the wording of the ML deprecation messages is very
slightly updated. The messages are different in the 7.16 branch,
where they were updated by elastic#79387. This wording is copied forward
to master, but with the tiny change that "Snapshot" is changed to
"Model snapshot" in one place. This should make it clearer for
users that we're talking about ML model snapshots and not cluster
snapshots (which are completely different things). Another reason
to change the wording is that the UI is looking for the pattern
/[Mm]odel snapshot/ to decide when to display the "Fix" button for
upgrading ML model snapshots - see elastic/kibana#119745.

Backport of elastic#81060
elasticsearchmachine pushed a commit to elastic/elasticsearch that referenced this pull request Nov 29, 2021
…#81060) (#81101)

This is a followup to #81039.

The same requirement to tolerate model snapshots back to 6.4.0
that applies to the job opening code also applies to the deprecation
checker. Again, we tell the user that 7.0.0 is the model snapshot
version we support, but we actually have to support versions going
back to 6.4.0 because we didn't update the constant in the C++ in
7.0.0.

Additionally, the wording of the ML deprecation messages is very
slightly updated. The messages are different in the 7.16 branch,
where they were updated by #79387. This wording is copied forward
to master, but with the tiny change that "Snapshot" is changed to
"Model snapshot" in one place. This should make it clearer for
users that we're talking about ML model snapshots and not cluster
snapshots (which are completely different things). Another reason
to change the wording is that the UI is looking for the pattern
/[Mm]odel snapshot/ to decide when to display the "Fix" button for
upgrading ML model snapshots - see elastic/kibana#119745.
kibanamachine added a commit that referenced this pull request Nov 29, 2021
…upgrade (#119745) (#119850)

The deprecations for ML snapshots that are too old and need
upgrading are supposed to have a "Fix" button next to them.
Unfortunately this disappeared when a message was reworded
in elastic/elasticsearch#79387.

This change adjusts the regex that the upgrade assistant
uses to detect which deprecations to add the "Fix" button
to so that it will match both "Model snapshot" and "model
snapshot". The test data is also updated to match the new
backend text.

This change is designed to work with elastic/elasticsearch#81060.

Co-authored-by: David Roberts <dave.roberts@elastic.co>
kibanamachine added a commit that referenced this pull request Nov 29, 2021
…upgrade (#119745) (#119851)

The deprecations for ML snapshots that are too old and need
upgrading are supposed to have a "Fix" button next to them.
Unfortunately this disappeared when a message was reworded
in elastic/elasticsearch#79387.

This change adjusts the regex that the upgrade assistant
uses to detect which deprecations to add the "Fix" button
to so that it will match both "Model snapshot" and "model
snapshot". The test data is also updated to match the new
backend text.

This change is designed to work with elastic/elasticsearch#81060.

Co-authored-by: David Roberts <dave.roberts@elastic.co>
elasticsearchmachine pushed a commit to elastic/elasticsearch that referenced this pull request Nov 29, 2021
…checker (#81105)

This is a followup to #81039.

The same requirement to tolerate model snapshots back to 6.4.0
that applies to the job opening code also applies to the deprecation
checker. Again, we tell the user that 7.0.0 is the model snapshot
version we support, but we actually have to support versions going
back to 6.4.0 because we didn't update the constant in the C++ in
7.0.0.

Additionally, the wording of the ML deprecation messages is very
slightly updated. The messages are different in the 7.16 branch,
where they were updated by #79387. This wording is copied forward
to master, but with the tiny change that "Snapshot" is changed to
"Model snapshot" in one place. This should make it clearer for
users that we're talking about ML model snapshots and not cluster
snapshots (which are completely different things). Another reason
to change the wording is that the UI is looking for the pattern
/[Mm]odel snapshot/ to decide when to display the "Fix" button for
upgrading ML model snapshots - see elastic/kibana#119745.

Backport of #81060
TinLe pushed a commit to TinLe/kibana that referenced this pull request Dec 22, 2021
…upgrade (elastic#119745)

The deprecations for ML snapshots that are too old and need
upgrading are supposed to have a "Fix" button next to them.
Unfortunately this disappeared when a message was reworded
in elastic/elasticsearch#79387.

This change adjusts the regex that the upgrade assistant
uses to detect which deprecations to add the "Fix" button
to so that it will match both "Model snapshot" and "model
snapshot". The test data is also updated to match the new
backend text.

This change is designed to work with elastic/elasticsearch#81060.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
auto-backport Deprecated - use backport:version if exact versions are needed bug Fixes for quality problems that affect the customer experience Feature:Upgrade Assistant release_note:fix v7.16.1 v8.0.0 v8.1.0
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants