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.

Sign up for GitHub

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

Jump to bottom

[ML] Disabling ML if license feature is disabled #73187

Merged
merged 9 commits into from
Jul 29, 2020
Merged

[ML] Disabling ML if license feature is disabled #73187

merged 9 commits into from
Jul 29, 2020

Conversation

jgowdyelastic
Copy link
Member

@jgowdyelastic jgowdyelastic commented Jul 24, 2020 •
edited
Loading

Adds checks for whether ML has been disabled as a feature in elasticsearch.

Server side
If the ml feature is disabled, the ml capabilities are all switched to false.

Client side
If the ML feature is disabled, the main ml feature has its status set to inaccessible. Other plugin features such as our management plugin and embeddables are not registered if the license level is below platinum.

Without these changes, ML is always present in the UI, but it will ultimately fail as all calls to ML endpoints in elasticsearch are still correctly disabled.

@jgowdyelastic
Copy link
Member Author

@elasticmachine merge upstream

@jgowdyelastic jgowdyelastic self-assigned this Jul 28, 2020
@jgowdyelastic jgowdyelastic added :ml bug Fixes for quality problems that affect the customer experience release_note:fix v7.10.0 v7.9.0 v8.0.0 review labels Jul 28, 2020
@jgowdyelastic jgowdyelastic marked this pull request as ready for review July 28, 2020 12:57
@jgowdyelastic jgowdyelastic requested a review from a team as a code owner July 28, 2020 12:57
@elasticmachine
Copy link
Contributor

Pinging @elastic/ml-ui (:ml)

@jgowdyelastic jgowdyelastic requested review from qn895 and removed request for darnautov July 28, 2020 13:02
@jgowdyelastic jgowdyelastic requested a review from darnautov July 29, 2020 10:58
peteharverson
peteharverson approved these changes Jul 29, 2020
View reviewed changes
Copy link
Contributor

@peteharverson peteharverson left a comment

Choose a reason for hiding this comment

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

Tested with xpack.ml.enabled set to true and false in my elasticsearch.yml, and LGTM.

@jgowdyelastic
Copy link
Member Author

@elasticmachine merge upstream

alvarezmelissa87
alvarezmelissa87 approved these changes Jul 29, 2020
View reviewed changes
Copy link
Contributor

@alvarezmelissa87 alvarezmelissa87 left a comment

Choose a reason for hiding this comment

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

LGTM ⚡

@kibanamachine
Copy link
Contributor

💚 Build Succeeded

Build metrics

page load bundle size

id value diff baseline
ml 4.3MB +774.0B 4.3MB

History

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

@jgowdyelastic jgowdyelastic merged commit 10cbaf5 into elastic:master Jul 29, 2020
@jgowdyelastic jgowdyelastic deleted the disabling-ml-if-license-feature-is-disabled branch July 29, 2020 15:45
jgowdyelastic added a commit to jgowdyelastic/kibana that referenced this pull request Jul 29, 2020
@jgowdyelastic @elasticmachine
[ML] Disabling ML if license feature is disabled (elastic#73187)
3941ef8 
* [ML] Disabling ML if license feature is disabled

* disabling UI feature

* removing unused import

* small refactor

* disabling ml using plugin updater

* function rename

* update comment

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
@jgowdyelastic jgowdyelastic mentioned this pull request Jul 29, 2020
Merged
jgowdyelastic added a commit to jgowdyelastic/kibana that referenced this pull request Jul 29, 2020
@jgowdyelastic @elasticmachine
[ML] Disabling ML if license feature is disabled (elastic#73187)
7d8f478 
* [ML] Disabling ML if license feature is disabled

* disabling UI feature

* removing unused import

* small refactor

* disabling ml using plugin updater

* function rename

* update comment

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
@jgowdyelastic jgowdyelastic mentioned this pull request Jul 29, 2020
Merged
gmmorris added a commit to gmmorris/kibana that referenced this pull request Jul 29, 2020
@gmmorris
Merge branch 'master' into task-manager/fix-flaky-test
8764243 
* master: (126 commits)
  [ML] Disabling ML if license feature is disabled (elastic#73187)
  [ML] Fixing old _xpack style es endpoint paths (elastic#73667)
  [DOCS] [Lens] 7.9 docs refresh (elastic#72301)
  [ML] DF Analytics results: ensure `View` link is only enabled when job has successfully completed (elastic#73539)
  Set timeRange to default to trigger the error message (elastic#73629)
  [ML] Functional tests - stabilize DFA navigation and index pattern handling (elastic#73660)
  [ILM] Add links to "Snapshot and Restore" from ILM "wait for snapshot policy" (elastic#72473)
  [kbn-storybook] Update Storybook to 5.3.19 (elastic#73320)
  [Metrics UI] Fix hasData call to ensure it has data not just indices (elastic#72969)
  [Uptime] Use `service.name` to link from Uptime -> APM where available (elastic#73618)
  allow others to update `URL.revokeObjectURL` property if needed (elastic#73639)
  regen docs (elastic#73650)
  [Visualize] Fix inspector download filename issue when saving in-place (elastic#72605)
  [Data] Query Input String manager (elastic#72093)
  [Security Solutions] Add tooltips (elastic#73436)
  Do not render descriptionless actions within an EuiCard (elastic#73611)
  [Security Solution][Detections] Value Lists Modal supports multiple exports (elastic#73532)
  [Security Solution][Resolver] Handle disabled process collection (elastic#73592)
  [Security_Solution][Bug] Fix user name/domain to ECS structure (elastic#73530)
  [Security Solution][Exceptions] - Update rule.exceptions_list to include exception list list_id (elastic#73349)
  ...
jgowdyelastic added a commit that referenced this pull request Jul 29, 2020
@jgowdyelastic @elasticmachine
[ML] Disabling ML if license feature is disabled (#73187) (#73695)
288034d 
* [ML] Disabling ML if license feature is disabled

* disabling UI feature

* removing unused import

* small refactor

* disabling ml using plugin updater

* function rename

* update comment

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
jgowdyelastic added a commit that referenced this pull request Jul 29, 2020
@jgowdyelastic @elasticmachine
[ML] Disabling ML if license feature is disabled (#73187) (#73696)
857039e 
* [ML] Disabling ML if license feature is disabled

* disabling UI feature

* removing unused import

* small refactor

* disabling ml using plugin updater

* function rename

* update comment

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
gmmorris added a commit to gmmorris/kibana that referenced this pull request Jul 30, 2020
@gmmorris
Merge branch 'actions/webhook-remove-header' of github.com:gmmorris/k…
031e0d8 
…ibana into actions/webhook-remove-header

* 'actions/webhook-remove-header' of github.com:gmmorris/kibana: (86 commits)
  [maps] rename GisMap to MapContainer and convert to TS (elastic#73690)
  [APM] docs: remove watcher documentation  (elastic#73485)
  [Maps] fix fit to data for Point to Point layer (elastic#73563)
  [Metrics UI] Fix No Data in Inventory alerts/Snapshot API (elastic#72513)
  [ML] Disabling ML if license feature is disabled (elastic#73187)
  [ML] Fixing old _xpack style es endpoint paths (elastic#73667)
  [DOCS] [Lens] 7.9 docs refresh (elastic#72301)
  [ML] DF Analytics results: ensure `View` link is only enabled when job has successfully completed (elastic#73539)
  Set timeRange to default to trigger the error message (elastic#73629)
  [ML] Functional tests - stabilize DFA navigation and index pattern handling (elastic#73660)
  [ILM] Add links to "Snapshot and Restore" from ILM "wait for snapshot policy" (elastic#72473)
  [kbn-storybook] Update Storybook to 5.3.19 (elastic#73320)
  [Metrics UI] Fix hasData call to ensure it has data not just indices (elastic#72969)
  [Uptime] Use `service.name` to link from Uptime -> APM where available (elastic#73618)
  allow others to update `URL.revokeObjectURL` property if needed (elastic#73639)
  regen docs (elastic#73650)
  [Visualize] Fix inspector download filename issue when saving in-place (elastic#72605)
  [Data] Query Input String manager (elastic#72093)
  [Security Solutions] Add tooltips (elastic#73436)
  Do not render descriptionless actions within an EuiCard (elastic#73611)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@peteharverson peteharverson peteharverson approved these changes

@alvarezmelissa87 alvarezmelissa87 alvarezmelissa87 approved these changes

@walterra walterra Awaiting requested review from walterra

@qn895 qn895 Awaiting requested review from qn895

@darnautov darnautov Awaiting requested review from darnautov

Assignees

@jgowdyelastic jgowdyelastic

Labels
bug Fixes for quality problems that affect the customer experience :ml release_note:fix review v7.9.0 v7.10.0 v8.0.0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@jgowdyelastic @elasticmachine @kibanamachine @alvarezmelissa87 @peteharverson