Skip to content

chore: backport ingest-limits fixes to k250 - #17237

Merged
chaudum merged 4 commits into
k250from
grobinson/backport-k250
Apr 15, 2025
Merged

chore: backport ingest-limits fixes to k250#17237
chaudum merged 4 commits into
k250from
grobinson/backport-k250

Conversation

@grobinson-grafana

@grobinson-grafana grobinson-grafana commented Apr 15, 2025

Copy link
Copy Markdown
Contributor

What this PR does / why we need it:

This pull request backports a number of PRs to k250:

2cde9b12e fix: skip streams over limits in dry-run mode (#17114)
805125c70 fix: fix a bug where limits were incorrect after grafana/loki#16937 (#17224)
d106042f0 fix: fix bug where expectedStreamUsageRequest was not used (#17223)
69aeda1bb feat: add tests for enforcing limits in distributors (#17124)

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
@grobinson-grafana
grobinson-grafana requested a review from a team as a code owner April 15, 2025 13:58
@grobinson-grafana grobinson-grafana changed the title Backport k250 Apr 15, 2025
@grobinson-grafana grobinson-grafana changed the title Backport ingest-limits fixes to k250 Apr 15, 2025
@chaudum
chaudum merged commit 05edd28 into k250 Apr 15, 2025
@chaudum
chaudum deleted the grobinson/backport-k250 branch April 15, 2025 14:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

2 participants