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 Follow-ups #29663

Merged
merged 12 commits into from Feb 4, 2019

Conversation

Projects
None yet
3 participants
@joshdover
Copy link
Member

joshdover commented Jan 30, 2019

Summary

  • Adds a privilege check to the beginning of the reindex process to ensure that the user has all required privileges needed for the reindex to complete successfully.
  • Adds a boolean readyForUpgrade to the /api/upgrade_assistant/status endpoint. This is for Cloud to use to know whether or not the cluster is ready to upgrade to 7.0.
  • Appends the ml_settings list of deprecation warnings to the warnings shown in the Cluster tab.
  • Adds the stopping/starting of Watcher to the .triggered-watches indices as well as the .watches indices. The Upgrade Assistant will also now ensure that no reindexes on watcher indices are in-progress before resuming Watcher.
  • Adds steps to the UI that show when ML or Watcher is being stopped or started as part of the reindexing steps.

image

Checklist

Use strikethroughs to remove checklist items you don't feel are applicable to this PR.

For maintainers

@elasticmachine

This comment has been minimized.

Copy link

elasticmachine commented Jan 30, 2019

@elasticmachine

This comment has been minimized.

Copy link

elasticmachine commented Jan 30, 2019

@joshdover joshdover force-pushed the joshdover:reindex-priv branch from 8eee7df to 2135b84 Jan 31, 2019

@joshdover joshdover changed the title [WIP] Upgrade Assistant Follow-ups Upgrade Assistant Follow-ups Jan 31, 2019

@elasticmachine

This comment has been minimized.

Copy link

elasticmachine commented Jan 31, 2019

@joshdover joshdover removed the WIP label Jan 31, 2019

@joshdover joshdover force-pushed the joshdover:reindex-priv branch from 2135b84 to 68f97e9 Jan 31, 2019

@joshdover

This comment has been minimized.

Copy link
Member Author

joshdover commented Jan 31, 2019

The functional tests are currently failing due to the ES snapshot being behind. They are currently passing when running locally against ES source. Once the new snapshot is created, I'll rekick this build.

@elasticmachine

This comment has been minimized.

Copy link

elasticmachine commented Jan 31, 2019

@joshdover joshdover requested a review from tylersmalley Jan 31, 2019

@elasticmachine

This comment has been minimized.

Copy link

elasticmachine commented Jan 31, 2019

@joshdover joshdover force-pushed the joshdover:reindex-priv branch from 68f97e9 to 1b13ba1 Feb 1, 2019

@elasticmachine

This comment has been minimized.

Copy link

elasticmachine commented Feb 1, 2019

@tylersmalley

This comment has been minimized.

Copy link
Member

tylersmalley commented Feb 2, 2019

Looks like this failure might be valid:

10:54:52            └-> allows user to toggle deprecation logging
10:54:52              └-> "before each" hook: global before each
10:54:52              │ proc [kibana]  error  [18:54:51.994]  TypeError: Cannot read property 'level' of undefined
10:54:52              │ proc [kibana]     at cluster.concat.filter.d (/var/lib/jenkins/workspace/elastic+kibana+pull-request/JOB/x-pack-ciGroup4/node/imm
@elasticmachine

This comment has been minimized.

Copy link

elasticmachine commented Feb 2, 2019

@joshdover

This comment has been minimized.

Copy link
Member Author

joshdover commented Feb 2, 2019

@tylersmalley This still appears to be running an old snapshot. That error happens because the ml_settings is not present on the Deprecation Info API, a change that was merged several days ago. When running locally I'm getting the same build I was a few days ago, but running from source everything works fine.

ES build hash in the snapshot is from this commit which was made 6 days ago.

@joshdover

This comment has been minimized.

Copy link
Member Author

joshdover commented Feb 2, 2019

Looks like #29673 didn't get merged in earlier. Pulled in master again.

@elasticmachine

This comment has been minimized.

Copy link

elasticmachine commented Feb 2, 2019

@elasticmachine

This comment has been minimized.

Copy link

elasticmachine commented Feb 2, 2019

@joshdover

This comment has been minimized.

Copy link
Member Author

joshdover commented Feb 2, 2019

retest

@elasticmachine

This comment has been minimized.

Copy link

elasticmachine commented Feb 2, 2019

@elasticmachine

This comment has been minimized.

Copy link

elasticmachine commented Feb 3, 2019

@elasticmachine

This comment has been minimized.

Copy link

elasticmachine commented Feb 3, 2019

@tylersmalley
Copy link
Member

tylersmalley left a comment

LGTM!

@joshdover joshdover merged commit 888217d into elastic:master Feb 4, 2019

2 checks passed

CLA Commit author is a member of Elasticsearch
Details
kibana-ci Build finished.
Details

@joshdover joshdover deleted the joshdover:reindex-priv branch Feb 4, 2019

joshdover added a commit to joshdover/kibana that referenced this pull request Feb 4, 2019

Upgrade Assistant Follow-ups (elastic#29663)
* Check security privileges before allowing reindexing

* Add global readyForUpgrade flag for Cloud

* Add ml_settings to cluster_settings

* Generalize locking mechanism for stop/starting watcher

* Display ML/Watcher stopping/resuming steps in UI

* Fix type issues

* Handle security being disabled for privilege check

* Use xpack_main.info + add types

* Fix x-pack builds

joshdover added a commit to joshdover/kibana that referenced this pull request Feb 4, 2019

Upgrade Assistant Follow-ups (elastic#29663)
* Check security privileges before allowing reindexing

* Add global readyForUpgrade flag for Cloud

* Add ml_settings to cluster_settings

* Generalize locking mechanism for stop/starting watcher

* Display ML/Watcher stopping/resuming steps in UI

* Fix type issues

* Handle security being disabled for privilege check

* Use xpack_main.info + add types

* Fix x-pack builds

joshdover added a commit to joshdover/kibana that referenced this pull request Feb 4, 2019

Upgrade Assistant Follow-ups (elastic#29663)
* Check security privileges before allowing reindexing

* Add global readyForUpgrade flag for Cloud

* Add ml_settings to cluster_settings

* Generalize locking mechanism for stop/starting watcher

* Display ML/Watcher stopping/resuming steps in UI

* Fix type issues

* Handle security being disabled for privilege check

* Use xpack_main.info + add types

* Fix x-pack builds

joshdover added a commit that referenced this pull request Feb 4, 2019

Upgrade Assistant Follow-ups (#29663) (#29989)
* Check security privileges before allowing reindexing

* Add global readyForUpgrade flag for Cloud

* Add ml_settings to cluster_settings

* Generalize locking mechanism for stop/starting watcher

* Display ML/Watcher stopping/resuming steps in UI

* Fix type issues

* Handle security being disabled for privilege check

* Use xpack_main.info + add types

* Fix x-pack builds
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment