common/relabel: update validation rules from Prometheus #5566
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: Paschalis Tsilias <[email protected]>
tpaschalis
commented
Oct 23, 2023
| @@ -146,16 +146,13 @@ func (rc *Config) Validate() error { | |||
| if rc.Modulus == 0 && rc.Action == HashMod { | |||
| return fmt.Errorf("relabel configuration for hashmod requires non-zero modulus") | |||
| } | |||
| if (rc.Action == Replace || rc.Action == KeepEqual || rc.Action == DropEqual || rc.Action == HashMod || rc.Action == Lowercase || rc.Action == Uppercase) && rc.TargetLabel == "" { | |||
| if (rc.Action == Replace || rc.Action == HashMod || rc.Action == Lowercase || rc.Action == Uppercase || rc.Action == KeepEqual || rc.Action == DropEqual) && rc.TargetLabel == "" { | |||
There was a problem hiding this comment.
Re-ordering so it's easier to scan if the Prometheus code has changed something.
tpaschalis
commented
Oct 23, 2023
Comment on lines
-152
to
-154
| if (rc.Action == KeepEqual || rc.Action == DropEqual) && rc.SourceLabels == nil { | ||
| return fmt.Errorf("relabel configuration for %s action requires 'source_labels' value", rc.Action) | ||
| } |
There was a problem hiding this comment.
This never existed upstream, not sure why I'd added it tbh.
tpaschalis
commented
Oct 23, 2023
| return fmt.Errorf("%q is invalid 'target_label' for %s action", rc.TargetLabel, rc.Action) | ||
| } | ||
| if (rc.Action == Lowercase || rc.Action == Uppercase) && rc.Replacement != DefaultRelabelConfig.Replacement { | ||
| if (rc.Action == Lowercase || rc.Action == Uppercase || rc.Action == KeepEqual || rc.Action == DropEqual) && rc.Replacement != DefaultRelabelConfig.Replacement { |
There was a problem hiding this comment.
We were missing these two for this validation.
Signed-off-by: Paschalis Tsilias <[email protected]>
github-actions
bot
added
the
frozen-due-to-age
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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 updates the validation rules for all
*.relabelblocks to be aligned with the validations in upstream Prometheus's UnmarshalYAML method.Which issue(s) this PR fixes
Fixes #4837
Notes to the Reviewer
I don't think there's something else to sync for loki.relabel since it's not really using much of Promtail code
PR Checklist