Add option to merge SNMP configs (custom with embedded) #2633
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
|
💻 Deploy preview deleted. |
v-zhuravlev
changed the title
wildum
reviewed
Feb 6, 2025
docs/sources/reference/components/prometheus/prometheus.exporter.snmp.md
Outdated
Show resolved
Hide resolved
docs/sources/reference/components/prometheus/prometheus.exporter.snmp.md
Outdated
Show resolved
Hide resolved
| @@ -218,6 +220,10 @@ func (a *Arguments) UnmarshalAlloy(f func(interface{}) error) error { | |||
| return errors.New("config and config_file are mutually exclusive") | |||
| } | |||
|
|
|||
| if a.ConfigMergeStategy != "replace" && a.ConfigMergeStategy != "merge" { | |||
| return errors.New("config_merge_strategy must be `replace` or `merge`") | |||
| } | |||
There was a problem hiding this comment.
nit: I would recommend a switch instead of an if here where the case "replace", "merge" does nothing and the default case returns the error. It avoids repeating the a.ConfigMergeStategy != for every case which makes it scale better with the number of values
There was a problem hiding this comment.
you did not change it to a switch here (if you want to keep it as an if that's also ok for me, just a nit)
…er.snmp.md Co-authored-by: William Dumont <[email protected]>
…er.snmp.md Co-authored-by: William Dumont <[email protected]>
…ana/alloy into vzhuravlev/multiple-configs
wildum
approved these changes
Feb 7, 2025
internal/static/integrations/snmp_exporter/snmp_exporter_test.go
Outdated
Show resolved
Hide resolved
internal/static/integrations/snmp_exporter/snmp_exporter_test.go
Outdated
Show resolved
Hide resolved
| @@ -218,6 +220,10 @@ func (a *Arguments) UnmarshalAlloy(f func(interface{}) error) error { | |||
| return errors.New("config and config_file are mutually exclusive") | |||
| } | |||
|
|
|||
| if a.ConfigMergeStategy != "replace" && a.ConfigMergeStategy != "merge" { | |||
| return errors.New("config_merge_strategy must be `replace` or `merge`") | |||
| } | |||
There was a problem hiding this comment.
you did not change it to a switch here (if you want to keep it as an if that's also ok for me, just a nit)
|
@clayton-cornell over to you for a review of the small doc changes |
Co-authored-by: William Dumont <[email protected]>
Co-authored-by: William Dumont <[email protected]>
clayton-cornell
approved these changes
Feb 12, 2025
docs/sources/reference/components/prometheus/prometheus.exporter.snmp.md
Outdated
Show resolved
Hide resolved
…er.snmp.md Co-authored-by: Clayton Cornell <[email protected]>
clayton-cornell
added
the
type/docs
|
thanks fro the reviews! Anything else we need to merge it? |
|
sorry I thought I merged it already, merged! |
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.
PR Description
This PR adds
config_merge_strategyinprometheus.exporter.snmpto optionally merge custom snmp config with embedded config instead of replacing. Useful for providing SNMP auths.Which issue(s) this PR fixes
Fixes #2493
Notes to the Reviewer
PR Checklist