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

[BeatsCM] check for security after license, add support for standard license #24210

Merged
merged 1 commit into from
Oct 18, 2018

Conversation

mattapperson
Copy link
Contributor

@mattapperson mattapperson commented Oct 18, 2018

This PR does 2 things.

  1. Fixes a bug where an OSS or basic license kibana, with xpack.security.enabled=false set in settings would throw an error bar in kibana due to checking for security before a license.

  2. Adds a cloud standard license support https://github.com/elastic/dev/issues/1034#issuecomment-430720588

Copy link
Member

@ruflin ruflin left a comment

Choose a reason for hiding this comment

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

Code LGTM. Is there an good way to add a simple test for this to prevent this from happening again?

@mattapperson
Copy link
Contributor Author

There is not a way (that I know of) to check this in an integration test. I have been working on unit tests for this entire file, but they are not yet ready.

@elasticmachine
Copy link
Contributor

💚 Build Succeeded

@mattapperson mattapperson merged commit 612bd74 into elastic:master Oct 18, 2018
mattapperson added a commit that referenced this pull request Oct 18, 2018
* merge RPM and DEB as they are the same command (#24209)

* [BeatsCM] check for security after license, add support for standard license (#24210)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants