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

Ensure missing runtime ingester settings are nil #4246

Merged
merged 2 commits into from Jun 3, 2021
Merged

Ensure missing runtime ingester settings are nil #4246

merged 2 commits into from Jun 3, 2021

Conversation

56quarters
Copy link
Contributor

Signed-off-by: Nick Pillitteri nick.pillitteri@grafana.com

What this PR does:

Make sure that omitted or missing ingester configuration that is
part of runtime configuration is treated as nil instead of an
empty object. This fixes an issue where the settings in the empty
object were overriding global default ingester limits.

Which issue(s) this PR fixes:

Fixes #4228

Checklist

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

Make sure that omitted or missing ingester configuration that is
part of runtime configuration is treated as `nil` instead of an
empty object. This fixes an issue where the settings in the empty
object were overriding global default ingester limits.

Fixes #4228

Signed-off-by: Nick Pillitteri <nick.pillitteri@grafana.com>
Copy link
Contributor

@pstibrany pstibrany left a comment

Choose a reason for hiding this comment

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

Thank you.

Copy link
Contributor

@pracucci pracucci left a comment

Choose a reason for hiding this comment

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

Thanks! LGTM (modulo a nit I'm going to auto-commit)

CHANGELOG.md Outdated Show resolved Hide resolved
Signed-off-by: Marco Pracucci <marco@pracucci.com>
@pracucci pracucci enabled auto-merge (squash) June 3, 2021 10:47
@pracucci pracucci merged commit 3fb0d4d into cortexproject:master Jun 3, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Ingester static per-instance limits not respected if runtime configuration file used
3 participants