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: Update cortex version and fix resulting changes #3532

Merged
merged 7 commits into from
Mar 24, 2021

Conversation

MichelHollands
Copy link
Contributor

Signed-off-by: Michel Hollands michel.hollands@grafana.com

This updates to the latest Cortex.

  • Documentation added
  • Tests updated

Signed-off-by: Michel Hollands <michel.hollands@grafana.com>
Signed-off-by: Michel Hollands <michel.hollands@grafana.com>
Signed-off-by: Michel Hollands <michel.hollands@grafana.com>
Signed-off-by: Michel Hollands <michel.hollands@grafana.com>
Signed-off-by: Michel Hollands <michel.hollands@grafana.com>
Copy link
Member

@owen-d owen-d left a comment

Choose a reason for hiding this comment

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

one nit, lgtm

pkg/promtail/scrapeconfig/scrapeconfig_test.go Outdated Show resolved Hide resolved
MichelHollands and others added 2 commits March 24, 2021 14:24
Co-authored-by: Owen Diehl <ow.diehl@gmail.com>
Signed-off-by: Michel Hollands <michel.hollands@grafana.com>
@cyriltovena cyriltovena merged commit f49a510 into grafana:master Mar 24, 2021
@MichelHollands MichelHollands deleted the upgrade_cortex branch March 24, 2021 14:46
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.

None yet

3 participants