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

loki: use new runtimeconfig package from Cortex #1484

Merged
merged 10 commits into from
Jan 24, 2020
Merged

loki: use new runtimeconfig package from Cortex #1484

merged 10 commits into from
Jan 24, 2020

Conversation

pstibrany
Copy link
Member

@pstibrany pstibrany commented Jan 8, 2020

Update Loki to use latest Cortex master, and specifically new runtimeconfig package. runtimeconfig is a generalization of previous "overrides" mechanism, and can be used not for per-tenant limits, but other parts of Loki too (only one additional usage for now is "multi" KV client).

Documentation needs to be updated based on changes in Cortex documentation (TODO item)

Checklist

  • Documentation added
  • Tests updated

Copy link
Contributor

@sandeepsukhani sandeepsukhani left a comment

Choose a reason for hiding this comment

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

Small nit and a question to address, otherwise it LGTM.

pkg/loki/loki.go Outdated Show resolved Hide resolved
pkg/loki/modules.go Outdated Show resolved Hide resolved
Copy link
Contributor

@sandeepsukhani sandeepsukhani left a comment

Choose a reason for hiding this comment

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

LGTM

@cyriltovena
Copy link
Contributor

couple of conflicts, and if you can create an issue for the doc that would be great.

@pstibrany
Copy link
Member Author

couple of conflicts, and if you can create an issue for the doc that would be great.

I’ve updated the docs in this PR.

runtimeconfig is a generalization of previous "overrides" mechanism,
and can be used not for per-tenant limits, but other parts of Loki
too (only one additional usage for now is "multi" KV client).

Signed-off-by: Peter Štibraný <peter.stibrany@grafana.com>
Signed-off-by: Peter Štibraný <peter.stibrany@grafana.com>
Ingester already depends on RuntimeConfig via Store and Overrides mechanism.

Signed-off-by: Peter Štibraný <peter.stibrany@grafana.com>
Signed-off-by: Peter Štibraný <peter.stibrany@grafana.com>
Signed-off-by: Peter Štibraný <peter.stibrany@grafana.com>
Removed incorrect comment.

Signed-off-by: Peter Štibraný <peter.stibrany@grafana.com>
…from Cortex.

Signed-off-by: Peter Štibraný <peter.stibrany@grafana.com>
Signed-off-by: Peter Štibraný <peter.stibrany@grafana.com>
Signed-off-by: Peter Štibraný <peter.stibrany@grafana.com>
Signed-off-by: Peter Štibraný <peter.stibrany@grafana.com>
@pstibrany pstibrany assigned pstibrany and cyriltovena and unassigned pstibrany Jan 24, 2020
@slim-bean slim-bean merged commit d4cae66 into grafana:master Jan 24, 2020
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

4 participants