-
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
Look for keystore under the correct path #13332
Conversation
4810e26
to
b393f3d
Compare
func (k *FileKeystore) ConfiguredPath() string { | ||
return k.Path | ||
} | ||
|
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.
@kvch I think we should probably force a specific location of the keystore in the zip when we created it. Because, correct me if I am wrong: let's say that the keystore path is /home/ph/info/beats.keystore
when AWS tries to unzip the artifact it will try to create it in the same place?
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.
Yes. We can force it. But I think we need to add a warning about the config overwrites in Functionbeat. It might be confusing for users when they are looking for their keystore in the configured path and they cannot find it.
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.
I've seen it's already printed to the logs, so I haven't added anything. Just a new overwrite for keystore path.
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.
I was just curious if having a deeply nested path on the keystore when we created the archive would be a problem on the remote system.
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.
looks good!
b393f3d
to
9d18198
Compare
9d18198
to
379e05c
Compare
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.
LGTM lets merge the overrides PR and rebase this one.
0aa8976
to
11d6f1f
Compare
11d6f1f
to
31f62ce
Compare
Failing tests are unrelated. |
Previously, Functionbeat put the keystore file under
/tmp
due to the overrides of the function. But when loading the keystore file before packaging the Beat, data path was not yet initialized, so it looked for the file under the incorrect folder. Furthermore, the file in the compressed package was hardcoded todata/functionbeat.keystore
. So there was no way for functionbeat to find the keystore when loaded to the cloud provider.Closes #13079
Depends on #13345