feat: Add a new enforced_labels limit
#15704
Merged
+110
−4
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
github-actions
bot
added
the
type/docs
salvacorts
reviewed
Jan 13, 2025
salvacorts
reviewed
Jan 13, 2025
pkg/distributor/distributor.go
Outdated
| @@ -510,6 +510,16 @@ func (d *Distributor) Push(ctx context.Context, req *logproto.PushRequest) (*log | |||
| continue | |||
| } | |||
|
|
|||
| if missing, lbMissing := d.missingEnforcedLabels(stream, tenantID, validationContext); missing { | |||
There was a problem hiding this comment.
I think we should do this after
lbs, stream.Labels, stream.Hash, err = d.parseStreamLabels(validationContext, stream.Labels, stream)
So we can reuse the lbs instead of implementing fetchLbs
There was a problem hiding this comment.
good catch. pushed a commit addressing it, wdyt?
JStickler
reviewed
Jan 13, 2025
salvacorts
approved these changes
Jan 14, 2025
pkg/distributor/distributor_test.go
Outdated
| @@ -427,32 +427,59 @@ func Test_IncrementTimestamp(t *testing.T) { | |||
| } | |||
|
|
|||
| func Test_MissingEnforcedLabels(t *testing.T) { | |||
| limits := &validation.Limits{} | |||
| flagext.DefaultValues(limits) | |||
| t.Run("missingEnforcedLabels when isolated does what we expect", func(t *testing.T) { | |||
There was a problem hiding this comment.
nit: what do you mean by isolated here?
There was a problem hiding this comment.
the function missingEnforcedLabels being invoked in isolation to the rest of the code 😄
There was a problem hiding this comment.
Ah ok. Maybe there's a better wording for that but not a big deal
|
💻 Deploy preview deleted. |
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.
What this PR does / why we need it:
Introduce the new experimental
enforced_labelslimit.By default it is empty but when configured, it configures Loki to only accept push requests which streams have all enforced labels.
Which issue(s) this PR fixes:
Fixes #
Special notes for your reviewer:
Checklist
CONTRIBUTING.mdguide (required)featPRs are unlikely to be accepted unless a case can be made for the feature actually being a bug fix to existing behavior.docs/sources/setup/upgrade/_index.mddeprecated-config.yamlanddeleted-config.yamlfiles respectively in thetools/deprecated-config-checkerdirectory. Example PR