-
Notifications
You must be signed in to change notification settings - Fork 4.9k
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
Add Enterprise license type #14249
Add Enterprise license type #14249
Conversation
Add the Enterprise license type and regenerate the types files. Fixes: elastic#14246
need to be backported to 7.5, 7.x |
func _() { | ||
// An "invalid array index" compiler error signifies that the constant values have changed. | ||
// Re-run the stringer command to generate them again. | ||
var x [1]struct{} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Oh they changed their method.
@urso After looking at the code, I see that we are not sending an appropriate We should send one unique per beats something like The query string options seems less problematic for us. |
@ph A beat can customize its name and even version. You need access to beat.Info in order to create the UA. Maybe we can add the user agent as paramter to elasticsearch.NewClient or its configure structure. We should do this in a separate PR. |
sound good, we already have what we need to do it. https://github.com/elastic/beats/blob/fleet/agent/kibana/round_trippers.go#L33-L51 |
* Add Enterprise license type Add the Enterprise license type and regenerate the types files. Fixes: elastic#14246 (cherry picked from commit 5f06f19)
* Add Enterprise license type Add the Enterprise license type and regenerate the types files. Fixes: elastic#14246 (cherry picked from commit 5f06f19)
testing license-related check is not a simple task when its not "trial" or "basic", in the linked private issues there are test servers that @bytebilly has created with credentials to be able to tested with a real server. The other way is to use the generated license in the private repository with dev artifact to run a local server. cc @Fae |
Initial test pass succeeded (beats work fine with an enterprise cluster), but turned up some logging issues that @ph is fixing in #15834: we don't currently log the detected license anywhere (beats only report whether the license check was successful, not which license is in use), and some log messages during the license check were being dropped. Will do another test pass once the fix gets in to confirm that enterprise clusters report the correct license. |
The logging changes above made it into today's build candidate, and another testing pass confirmed that everything looks good |
Thanks @faec 🎉 |
* Add Enterprise license type Add the Enterprise license type and regenerate the types files. Fixes: elastic#14246
* Add Enterprise license type Add the Enterprise license type and regenerate the types files. Fixes: elastic#14246 (cherry picked from commit fbc83dc)
Add the Enterprise license type and regenerate the types files.
Fixes: #14246