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

Merge the processors overrides set through runtime overrides and user-configurable overrides #3125

Merged
merged 2 commits into from Nov 9, 2023

Conversation

kvrhdn
Copy link
Member

@kvrhdn kvrhdn commented Nov 9, 2023

What this PR does:

By default overrides set through user-configurable overrides take precedence over runtime overrides. For processors however it makes more sense to merge both layers with an OR logic.

This makes it possible to enable processors for all tenants through the runtime overrides, regardless of the setting the user-configurable overrides.
As a downside it will not be possible to disable processors set in the runtime overrides.

Which issue(s) this PR fixes:
Fixes #

Checklist

  • Tests updated
  • Documentation added
  • CHANGELOG.md updated - the order of entries should be [CHANGE], [FEATURE], [ENHANCEMENT], [BUGFIX]

@kvrhdn kvrhdn merged commit 168e91c into grafana:main Nov 9, 2023
14 checks passed
@kvrhdn kvrhdn deleted the kvrhdn/merge-processors-override branch November 9, 2023 17:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants