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.

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

fix: Keep the service_name label after discovery in push.ParseLokiRequest before calculating retention and passing to the usage tracker #14960

Conversation

JordanRushing
Copy link
Contributor

@JordanRushing JordanRushing commented Nov 15, 2024

What this PR does / why we need it:

Currently the label set passed to usage trackers in push.ParseLokiRequest does not include the service_name label.

This label could be useful at query time for usage metrics and shouldn't affect RetentionPeriodFor for a tenant so this PR keeps it.

Which issue(s) this PR fixes:

N/A

Special notes for your reviewer:

N/A

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

…before calculating retention and passing to the usage tracker

Signed-off-by: Jordan Rushing <[email protected]>
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.

LGTM

Copy link
Contributor

@vlad-diachenko vlad-diachenko left a comment

Choose a reason for hiding this comment

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

looks great 👍

@JordanRushing JordanRushing merged commit 71d4d6a into grafana:main Nov 15, 2024
57 checks passed
thevops pushed a commit to thevops/loki that referenced this pull request Nov 21, 2024
…uest before calculating retention and passing to the usage tracker (grafana#14960)

Signed-off-by: Jordan Rushing <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants