-
Notifications
You must be signed in to change notification settings - Fork 2.5k
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
[receiver/jmxreceiver] Limit parameters for JMX receiver to reduce security risk #9721
Merged
Merged
Changes from 25 commits
Commits
Show all changes
26 commits
Select commit
Hold shift + click to select a range
d5f2562
Remove options considered too permissive for security in jmx receiver
743ec80
Use config file for communicating to JMX metrics gatherer
d91b6a7
Fix small issues with jmx receiver
4c6377d
Ensure property files are generated correctly with multiline input
e7252d3
Update changelog
6dc6ddd
minor changes to receiver to support more config in properties file
2925af5
Merge branch 'main' into jmx-lockdown
13d204a
Appease linter
c013bae
Update properties file generation
c4ac57d
Merge branch 'main' into jmx-lockdown
30812c1
Address PR feedback and address environment variable attack surface
855671e
Merge branch 'main' into jmx-lockdown
7d3b8b5
Address linter
cca401d
Update receiver/jmxreceiver/config.go
dehaansa 1df1674
Merge branch 'main' into jmx-lockdown
ee7275e
Merge branch 'main' into jmx-lockdown
a12d182
Fix readme for jmx receiver to represent changes
81df184
Merge branch 'main' into jmx-lockdown
e3d6783
Merge branch 'main' into jmx-lockdown
a68ce35
Ensure consistent sorting of attributes for jmx receiver
38c86e0
Merge branch 'main' into jmx-lockdown
b47011f
Convert from zap logger level if the config does not provide a log level
bf19ada
Appease linter
5c970b6
Merge branch 'main' into jmx-lockdown
86d1c55
Move changelog message into unreleased
c7b5ec7
Merge branch 'main' into jmx-lockdown
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
Oops, something went wrong.
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.
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.
Any thoughts on whether this should re-use the log level set in the collector's
service.logging
setting instead of adding its own?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'm open to it. The only drawbacks I see are that there's no Trace equivalent in zap.Level and several levels (fatal, panic, dpanic, error) would probably all map to error (or possibly panic/dpanic to "off").
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.
@codeboten implemented it so if no user config is provided, it attempts to translate from zap logger level, otherwise it uses the user provided config. Let me know what you think!
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 to me