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

Report max ERUs in the licensing info configmap #2371

Merged

Conversation

thbkrkr
Copy link
Contributor

@thbkrkr thbkrkr commented Jan 8, 2020

This commit includes the max_enterprise_resource_units in the licensing info config map to make it easier for users to see whether they are in compliance with their license.

For old style enterprise orchestration licenses which only have max_instances, the max_enterprise_resource_units by dividing max_instances by 2.

For trial enterprise licenses, the field is omitted.

@thbkrkr thbkrkr added the >enhancement Enhancement of existing functionality label Jan 8, 2020
Includes the max_enterprise_resource_units in the licensing
info config map to make it easier for users to see whether they are in
compliance with their license.

For old style enterprise orchestration licenses which only have
max_instances, the max_enterprise_resource_units by dividing
max_instances by 2.

For trial enterprise licenses, the field is omitted.
@thbkrkr thbkrkr force-pushed the report-max_enterprise_resource_units branch from fb11155 to 24d0709 Compare January 8, 2020 12:31
pebrc
pebrc previously approved these changes Jan 8, 2020
Copy link
Collaborator

@pebrc pebrc left a comment

Choose a reason for hiding this comment

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

LGTM

@pebrc pebrc added the v1.0.0 label Jan 8, 2020
@pebrc pebrc dismissed their stale review January 8, 2020 13:26

Looks like there is a nil pointer issue

pkg/license/license.go Outdated Show resolved Hide resolved
@thbkrkr thbkrkr merged commit 6c3d96c into elastic:master Jan 8, 2020
barkbay pushed a commit to barkbay/cloud-on-k8s that referenced this pull request Jan 8, 2020
* Report max ERUs in the licensing info configmap

Includes the max_enterprise_resource_units in the licensing
info config map to make it easier for users to see whether they are in
compliance with their license.

For old style enterprise orchestration licenses which only have
max_instances, the max_enterprise_resource_units by dividing
max_instances by 2.

For trial enterprise licenses, the field is omitted.
barkbay added a commit that referenced this pull request Jan 8, 2020
* Report max ERUs in the licensing info configmap

Includes the max_enterprise_resource_units in the licensing
info config map to make it easier for users to see whether they are in
compliance with their license.

For old style enterprise orchestration licenses which only have
max_instances, the max_enterprise_resource_units by dividing
max_instances by 2.

For trial enterprise licenses, the field is omitted.

Co-authored-by: Thibault Richard <thbkrkr@users.noreply.github.com>
@anyasabo
Copy link
Contributor

anyasabo commented Jan 8, 2020

Do we want to update the example in the docs/licensing.asciidoc with the extra data as well?

@thbkrkr thbkrkr deleted the report-max_enterprise_resource_units branch January 8, 2020 16:23
mjmbischoff pushed a commit to mjmbischoff/cloud-on-k8s that referenced this pull request Jan 13, 2020
* Report max ERUs in the licensing info configmap

Includes the max_enterprise_resource_units in the licensing
info config map to make it easier for users to see whether they are in
compliance with their license.

For old style enterprise orchestration licenses which only have
max_instances, the max_enterprise_resource_units by dividing
max_instances by 2.

For trial enterprise licenses, the field is omitted.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
>enhancement Enhancement of existing functionality v1.0.0
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants