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

Upgrade Prometheus and Cortex to LabelNames() with matchers versions #4049

Merged
merged 1 commit into from
Jul 27, 2021

Conversation

colega
Copy link
Contributor

@colega colega commented Jul 26, 2021

What this PR does / why we need it:
This bumps prometheus up to the changes from prometheus/prometheus#9083 and Cortex to cortexproject/cortex#4380

Those changes made a breaking change in the LabelQuerier's LabelNames interface adding a slice of matchers, just like LabelValues already did. This isn't yet needed in Loki, but it's preventing us from smoothly upgrading further.

Which issue(s) this PR fixes:
None, AFAIK.

Special notes for your reviewer:

Checklist

  • Documentation added
  • Tests updated

@colega colega requested a review from a team as a code owner July 26, 2021 16:10
@CLAassistant
Copy link

CLAassistant commented Jul 26, 2021

CLA assistant check
All committers have signed the CLA.

Copy link
Collaborator

@trevorwhitney trevorwhitney left a comment

Choose a reason for hiding this comment

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

LGTM

This bumps prometheus up to the changes from
prometheus/prometheus#9083 and Cortex to
cortexproject/cortex#4380

Signed-off-by: Oleg Zaytsev <mail@olegzaytsev.com>
@colega colega force-pushed the upgrade-prometheus-and-cortex branch from 100b6cd to 25b0a42 Compare July 27, 2021 06:52
@colega
Copy link
Contributor Author

colega commented Jul 27, 2021

Rebased on latest main

Copy link
Contributor

@dannykopping dannykopping left a comment

Choose a reason for hiding this comment

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

LGTM, thanks for this @colega 👍

Copy link
Contributor

@cyriltovena cyriltovena 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 cyriltovena merged commit b4086df into main Jul 27, 2021
@cyriltovena cyriltovena deleted the upgrade-prometheus-and-cortex branch July 27, 2021 07:18
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.

5 participants