feat: Default ingestion policy mappings merged with per-tenant mappings - #18926
Merged
salvacorts merged 2 commits intoAug 21, 2025
Conversation
Contributor
|
💻 Deploy preview deleted. |
salvacorts
marked this pull request as ready for review
August 21, 2025 10:17
sandeepsukhani
approved these changes
Aug 21, 2025
salvacorts
deleted the
salvacorts/ingestion-limits-per-policy-overrides/merge-policy-mappings-with-defaults
branch
August 21, 2025 11:12
felix0102
pushed a commit
to felix0102/loki
that referenced
this pull request
Aug 2, 2026
This file contains hidden or 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
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:
This PR adds support for default policy stream mappings that are automatically merged with per-tenant overrides, following the same pattern used for GlobalOTLPConfig. This allows operators to define common policy stream mappings at the distributor level that are automatically applied to all tenants, while still allowing per-tenant customizations.
With this change, operators can define default mappings once and have them automatically applied to all tenants.
How does it work?
Example
Default mappings in distributor config:
Per-tenant overrides in runtime config:
Result after merging (i.e. tenant1's effective policy_stream_mapping):
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