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

Update dskit to add functionality for using multiple runtimeconfig files #2583

Merged
merged 15 commits into from
Aug 8, 2022

Conversation

treid314
Copy link
Contributor

What this PR does

In dskit we added the ability to specify multiple runtime config files that will be merged together from left to right. Those merged files are then processed in Mimir for the runtime config. This PR enables that functionality inside of Mimir.

Which issue(s) this PR fixes or relates to

Fixes #1798

Checklist

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

@treid314 treid314 added the type/docs Improvements or additions to documentation label Jul 28, 2022
@treid314 treid314 requested a review from replay July 28, 2022 20:37
Copy link
Collaborator

@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.

LGTM!

CHANGELOG.md Outdated Show resolved Hide resolved
@treid314
Copy link
Contributor Author

Held up by grafana/dskit#206 causing integration failures.

@@ -1639,10 +1639,10 @@ Usage of ./cmd/mimir/mimir:
Enable running rule groups against multiple tenants. The tenant IDs involved need to be in the rule group's 'source_tenants' field. If this flag is set to 'false' when there are already created federated rule groups, then these rules groups will be skipped during evaluations.
-ruler.tenant-shard-size int
The tenant's shard size when sharding is used by ruler. Value of 0 disables shuffle sharding for the tenant, and tenant rules will be sharded across all ruler replicas.
-runtime-config.file string
File with the configuration that can be updated in runtime.
-runtime-config.file value
Copy link
Contributor

Choose a reason for hiding this comment

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

Actually this is still a string, but I'm guessing that it puts value there because of the flagext.StringSliceCSV type, right?
If it's easy then it would be nice if we could fix that, but otherwise it's not a blocker.

Copy link
Contributor

@replay replay left a comment

Choose a reason for hiding this comment

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

Thanks for working on this!
LGTM

@pracucci pracucci enabled auto-merge (squash) August 8, 2022 16:54
@pracucci pracucci merged commit 750d18f into main Aug 8, 2022
@pracucci pracucci deleted the update-dskit branch August 8, 2022 17:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
type/docs Improvements or additions to documentation
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Add the ability to load overrides from multiple runtime config files and merge them
4 participants