Enable keystore for autodiscover static configuration #16306
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: chrismark <chrismarkou92@gmail.com>
ChrsMark
added
containers
exekias
reviewed
Feb 14, 2020
libbeat/keystore/keystore.go
Outdated
| @@ -34,6 +34,8 @@ var ( | |||
| ErrKeyDoesntExists = errors.New("cannot retrieve the key") | |||
| ) | |||
|
|
|||
| var CentralKeystore Keystore | |||
There was a problem hiding this comment.
this is a hack. We should avoid global variables as they can cause issues when reusing code, among many other problems (I'm ok with this for testing the approach, but we need to find another solution before merging).
I think the Beat object is exposing the keystore through beat.Keystore() method. Probably you can get it somewhere and pass it to autodiscover.
Signed-off-by: chrismark <chrismarkou92@gmail.com>
Signed-off-by: chrismark <chrismarkou92@gmail.com>
ChrsMark
force-pushed
the
k8s-sercets
branch
from
27f4d01
to
73e0a5c
Compare
|
@exekias tried to pass the Not sure if this is better than the previous one but not sure if there is other obvious way so far. Feel free to comment/propose on it 🙂 . |
Signed-off-by: chrismark <chrismarkou92@gmail.com>
exekias
reviewed
Apr 24, 2020
exekias
reviewed
Apr 24, 2020
exekias
suggested changes
Apr 24, 2020
There was a problem hiding this comment.
Thank you for looking into this, the change is looking really clean IMO!
Would it make sense to update docs to explicitly explaining the relation between autodiscover and keystore? Probably we want to explain that keystore can be used from local settings but not from hints.
Will need a changelog
|
@exekias thanks for the suggestions! So far I changed the code so as to pass ps: I'm adding the docs section in a following commit. |
|
@exekias tests and docs added, however CI is still failing at https://travis-ci.org/github/elastic/beats/jobs/680132395#L1166 but not sure if this is related to these changes. I was able to reproduce the failure locally with |
ChrsMark
added
test-plan
exekias
reviewed
Apr 28, 2020
Signed-off-by: chrismark <chrismarkou92@gmail.com>
Signed-off-by: chrismark <chrismarkou92@gmail.com>
exekias
approved these changes
Apr 28, 2020
ChrsMark
added
v7.8.0
needs_backport
exekias
reviewed
Apr 28, 2020
|
jenkins, test this again please |
💔 Build Failed
Expand to view the summary
Build stats
Test stats 🧪
Test errorsExpand to view the tests failures
--------------------- >> end captured stdout << ---------------------- Steps errorsExpand to view the steps failures
Log outputExpand to view the last 100 lines of log output
|
|
I will go on and merge this, since Travis succeeded except for the Generator's tests. |
ChrsMark
added a commit
to ChrsMark/beats
that referenced
this pull request
Apr 29, 2020
(cherry picked from commit c1160e3)
ChrsMark
removed
the
needs_backport
Merged
ChrsMark
added a commit
that referenced
this pull request
May 4, 2020
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Close #12597.
What this PR does
This PR makes use of keystore for containers/pods that are autodiscovered with static configurations only. Hint based configuration should not have access to the keystore for security reasons.
How to test it manually
autodiscoverwith static template:Check that REDIS metrics are successfully collected.
Try to start REDIS with a different password so as to make Metricbeat fail.
Now check that hints based autodiscovered containers have not access to the keystore:
You should see Metribeat failing to access REDIS since the password is not retrievable.
cc: @exekias