Skip to content
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.

Sign up for GitHub

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

Jump to bottom

feat: Do not enforce labels vs agg metric stream #16696

Merged
merged 2 commits into from
Mar 11, 2025
Merged

feat: Do not enforce labels vs agg metric stream #16696

merged 2 commits into from
Mar 11, 2025
+27 −9

Conversation

DylanGuedes
Copy link
Contributor

What this PR does / why we need it:
Modify our push logic to not enforce labels if the current stream is the especial aggregated metric stream

Which issue(s) this PR fixes:
Fixes #

Special notes for your reviewer:

Checklist

  • Reviewed the CONTRIBUTING.md guide (required)
  • Documentation added
  • Tests updated
  • Title matches the required conventional commits format, see here
    • Note that Promtail is considered to be feature complete, and future development for logs collection will be in Grafana Alloy. As such, feat PRs are unlikely to be accepted unless a case can be made for the feature actually being a bug fix to existing behavior.
  • Changes that require user attention or interaction to upgrade are documented in docs/sources/setup/upgrade/_index.md
  • If the change is deprecating or removing a configuration option, update the deprecated-config.yaml and deleted-config.yaml files respectively in the tools/deprecated-config-checker directory. Example PR

@DylanGuedes DylanGuedes requested a review from a team as a code owner March 11, 2025 21:38
trevorwhitney
trevorwhitney approved these changes Mar 11, 2025
View reviewed changes
Copy link
Collaborator

@trevorwhitney trevorwhitney left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good!

pkg/distributor/validator.go Outdated
@@ -143,7 +143,11 @@ func (v Validator) ValidateEntry(ctx context.Context, vCtx validationContext, la
return nil
}

// Validate labels returns an error if the labels are invalid
func (v Validator) isAggregatedMetricStream(ls labels.Labels) bool {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should this be public at this point? I can see either way since this is all in the distributor package, but it feels public to me now :)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the aggregated metric itself is public already, so +1 on making this public.

@DylanGuedes DylanGuedes merged commit 25c0620 into main Mar 11, 2025
60 checks passed
@DylanGuedes DylanGuedes deleted the edge-case-aggregated-logs branch March 11, 2025 22:02
@loki-gh-app
Copy link
Contributor

loki-gh-app bot commented Mar 12, 2025

Hello @DylanGuedes!
Backport pull requests need to be either:

  • Pull requests which address bugs,
  • Urgent fixes which need product approval, in order to get merged,
  • Docs changes.

Please, if the current pull request addresses a bug fix, label it with the type/bug label.
If it already has the product approval, please add the product-approved label. For docs changes, please add the type/docs label.
If the pull request modifies CI behaviour, please add the type/ci label.
If none of the above applies, please consider removing the backport label and target the next major/minor release.
Thanks!

@DylanGuedes DylanGuedes added type/bug Somehing is not working as expected backport k245 and removed missing-labels backport k245 labels Mar 12, 2025
loki-gh-app bot pushed a commit that referenced this pull request Mar 12, 2025
@DylanGuedes @grafana-delivery-bot
feat: Do not enforce labels vs agg metric stream (#16696)
6ac5857 
**What this PR does / why we need it**:
Modify our push logic to not enforce labels if the current stream is the especial aggregated metric stream

(cherry picked from commit 25c0620)
@loki-gh-app loki-gh-app bot mentioned this pull request Mar 12, 2025
Open
6 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@trevorwhitney trevorwhitney trevorwhitney approved these changes

Assignees
No one assigned
Labels
backport k245 size/M type/bug Somehing is not working as expected
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@DylanGuedes @trevorwhitney