feat(lambda-promtail): Improve relabel configuration parsing and testing #16100
Conversation
This file contains hidden or 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 is required because original relabeling config only support yaml but the lambda promtail config is in json This change introduces a more robust way of parsing and handling relabel configurations in the lambda-promtail tool. Key improvements include: - Added a new `relabel.go` with custom JSON-friendly RelabelConfig - Implemented conversion to Prometheus relabel configs - Added comprehensive test suite for relabel config parsing - Simplified environment variable handling in main.go
chaudum
reviewed
Feb 5, 2025
Comment on lines
32
to
33
| // UnmarshalYAML implements the yaml.Unmarshaler interface. | ||
| func (rc *RelabelConfig) UnmarshalJSON(data []byte) error { |
There was a problem hiding this comment.
docstring does not match the function name
Suggested change
| // UnmarshalYAML implements the yaml.Unmarshaler interface. | |
| func (rc *RelabelConfig) UnmarshalJSON(data []byte) error { | |
| // UnmarshalJSON implements the json.Unmarshaler interface. | |
| func (rc *RelabelConfig) UnmarshalJSON(data []byte) error { |
| type RelabelConfig struct { | ||
| // A list of labels from which values are taken and concatenated | ||
| // with the configured separator in order. | ||
| SourceLabels []string `yaml:"source_labels,flow,omitempty" json:"source_labels,omitempty"` |
There was a problem hiding this comment.
Should we omit the yaml: tag, since it is not supported?
|
Confirmed this fixes the issue. |
chaudum
approved these changes
Feb 5, 2025
salvacorts
pushed a commit
that referenced
this pull request
Feb 12, 2025
This was referenced Mar 20, 2025
This was referenced Mar 31, 2025
This was referenced Apr 14, 2025
This was referenced Apr 23, 2025
This was referenced May 5, 2025
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.
This is required because original relabeling config only support yaml but the lambda promtail config is in json
This change introduces a more robust way of parsing and handling relabel configurations in the lambda-promtail tool. Key improvements include:
relabel.gowith custom JSON-friendly RelabelConfig