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

Support 'enterprise' license type #52273

Merged
merged 12 commits into from
Dec 17, 2019
Merged

Support 'enterprise' license type #52273

merged 12 commits into from
Dec 17, 2019

Conversation

mshustov
Copy link
Contributor

@mshustov mshustov commented Dec 5, 2019 •
edited
Loading

Summary

Closes: #49474
Add enterprise license type.
Enterprise license should be handled as a superset of the platinum license.
We can try to generate enterprise license in elasticsearch and use it for testing in Kibana.
Although I don't know what we want to test here, that Kibana starts and the licensing plugin recognizes the license type? @peterschretlen

How to test:

  • download & run elasticsearch image with Enterprise support:
KBN_ES_SNAPSHOT_URL=https://snapshots.elastic.co/8.0.0-5a079f34/downloads/elasticsearch/elasticsearch-8.0.0-SNAPSHOT-darwin-x86_64.tar.gz yarn es snapshot

Checklist

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

For maintainers

@mshustov mshustov added Team:Core Core services & architecture: plugins, logging, config, saved objects, http, ES client, i18n, etc v7.6.0 labels Dec 5, 2019
@elasticmachine
Copy link
Contributor

Pinging @elastic/kibana-platform (Team:Platform)

@mshustov mshustov added the release_note:plugin_api_changes Contains a Plugin API changes section for the breaking plugin API changes section. label Dec 5, 2019
mshustov
mshustov commented Dec 5, 2019
View reviewed changes
x-pack/legacy/plugins/ml/server/lib/check_license/check_license.test.ts Outdated

describe('check_license', () => {
let mockLicenseInfo: XPackInfo;
beforeEach(() => (mockLicenseInfo = {} as XPackInfo));

describe('license information is undefined', () => {
beforeEach(() => (mockLicenseInfo = {} as XPackInfo));
beforeEach(() => (mockLicenseInfo = undefined as XPackInfo));
Copy link
Contributor Author

Choose a reason for hiding this comment

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

I had to move the file to run it via jest runner. Mocha doesn't run * .ts files, so the test was ignored.

@elasticmachine
Copy link
Contributor

💔 Build Failed

@mshustov mshustov force-pushed the issue-49474-add-enterprise-license branch from 666c91f to 4815cf3 Compare December 5, 2019 16:19
@mshustov mshustov marked this pull request as ready for review December 5, 2019 16:30
@mshustov mshustov requested a review from a team December 5, 2019 16:30
@mshustov mshustov requested review from a team as code owners December 5, 2019 16:30
@elasticmachine
Copy link
Contributor

💚 Build Succeeded

peterschretlen
peterschretlen approved these changes Dec 5, 2019
View reviewed changes
Copy link
Contributor

@peterschretlen peterschretlen left a comment

Choose a reason for hiding this comment

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

👍 LGTM

joshdover
joshdover approved these changes Dec 5, 2019
View reviewed changes
Copy link
Contributor

@joshdover joshdover left a comment

Choose a reason for hiding this comment

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

We have a lot of places where we list out the different license levels. It'd be great to consolidate these in the future to have a single source of truth.

x-pack/plugins/licensing/common/types.ts
@@ -17,7 +17,8 @@ export enum LICENSE_TYPE {
standard = 20,
Copy link
Contributor

Choose a reason for hiding this comment

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

What is standard used for? Never seen that one.

Copy link
Contributor

Choose a reason for hiding this comment

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

It is a cloud only license level (adds a few things on top of basic that are needed for ESS).

Copy link
Contributor

Choose a reason for hiding this comment

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

Got it, thanks Peter.

@mshustov
Copy link
Contributor Author

mshustov commented Dec 6, 2019

We have a lot of places where we list out the different license levels. It'd be great to consolidate these in the future to have a single source of truth.

@joshdover already in work #51818 (comment)
I think isOneOf doesn't work well with the current hierarchical licensing model.

@mshustov mshustov requested a review from legrego December 9, 2019 11:16
timroes
timroes approved these changes Dec 9, 2019
View reviewed changes
Copy link
Contributor

@timroes timroes left a comment

Choose a reason for hiding this comment

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

Reviewed Kibana App code, looks good to me.

@mshustov
Copy link
Contributor Author

added an instruction how to test

@mshustov mshustov added the chore label Dec 10, 2019
@peteharverson peteharverson mentioned this pull request Dec 11, 2019
Merged
2 tasks
@mshustov
Copy link
Contributor Author

@elastic/ml-ui I merged the latest changes. Let me know if there is something I can do

jgowdyelastic
jgowdyelastic approved these changes Dec 17, 2019
View reviewed changes
Copy link
Member

@jgowdyelastic jgowdyelastic left a comment

Choose a reason for hiding this comment

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

ML changes LGTM

@elasticmachine
Copy link
Contributor

💚 Build Succeeded

History

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

@mshustov mshustov merged commit 74e1d17 into elastic:master Dec 17, 2019
@mshustov mshustov deleted the issue-49474-add-enterprise-license branch December 17, 2019 14:43
@mshustov mshustov mentioned this pull request Dec 17, 2019
Merged
mshustov added a commit to mshustov/kibana that referenced this pull request Dec 17, 2019
@mshustov
Support 'enterprise' license type (elastic#52273)
11fa273 
* add enterprise license type to licensing plugin

* add enterprise license to x-pack plugins

* update uptime license list

* improve naming in security plugin

* update reporting licensing
@elasticmachine elasticmachine mentioned this pull request Dec 17, 2019
Closed
12 tasks
mshustov added a commit that referenced this pull request Dec 17, 2019
@mshustov
Support 'enterprise' license type (#52273) (#53291)
59291cb 
* add enterprise license type to licensing plugin

* add enterprise license to x-pack plugins

* update uptime license list

* improve naming in security plugin

* update reporting licensing
@mshustov mshustov added release_note:skip Skip the PR/issue when compiling release notes and removed release_note:plugin_api_changes Contains a Plugin API changes section for the breaking plugin API changes section. labels Jan 23, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@joshdover joshdover joshdover approved these changes

@peterschretlen peterschretlen peterschretlen approved these changes

@timroes timroes timroes approved these changes

@legrego legrego legrego approved these changes

@jgowdyelastic jgowdyelastic jgowdyelastic approved these changes

Assignees
No one assigned
Labels
backported chore Feature:License release_note:skip Skip the PR/issue when compiling release notes Team:Core Core services & architecture: plugins, logging, config, saved objects, http, ES client, i18n, etc v7.6.0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Support 'enterprise' license type
7 participants
@mshustov @elasticmachine @timroes @joshdover @legrego @peterschretlen @jgowdyelastic