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 to LabelNames with matchers #4380

Merged

Conversation

colega
Copy link
Contributor

@colega colega commented Jul 26, 2021

What this PR does:
Since prometheus/prometheus#9083 prometheus now provides matchers to the LabelNames method on the LabelQuerier interface, so in order to upgrade Prometheus we need to support that.

This partially solves #3658 as now the block store queryable uses the LabelNames method with matchers.

However, we're still using the ingesters' MetricsForLabelMatchers method to perform the LabelNames w/matchers call on the distributor. That change will be tackled separately as it breaks ingester's contracts and needs to be released with a feature flag to perform a backwards compatible release.

Which issue(s) this PR fixes:
Ref #3658 but does not fully fix it.

Checklist

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

Since prometheus/prometheus#9083 prometheus now
provides matchers to the LabelNames method on the LabelQuerier
interface, so in order to upgrade Prometheus we need to support that.

This partially solves
cortexproject#3658 as now the block
store queryable uses the LabelNames method with matchers.

However, we're still using the ingesters' MetricsForLabelMatchers method
to perform the LabelNames w/matchers call on the distributor. That
change will be tackled separately as it breaks ingester's contracts and
needs to be released with a feature flag to perform a backwards
compatible release.

Signed-off-by: Oleg Zaytsev <mail@olegzaytsev.com>
Signed-off-by: Oleg Zaytsev <mail@olegzaytsev.com>
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.

LGTM!

@pracucci pracucci merged commit a4bf103 into cortexproject:master Jul 26, 2021
@colega colega deleted the upgrade-prom-to-labels-with-matchers branch July 26, 2021 15:56
colega added a commit to grafana/loki that referenced this pull request Jul 27, 2021
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>
cyriltovena pushed a commit to grafana/loki that referenced this pull request Jul 27, 2021
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>
alvinlin123 pushed a commit to ac1214/cortex that referenced this pull request Jan 14, 2022
* Upgrade Prometheus to LabelNames with matchers

Since prometheus/prometheus#9083 prometheus now
provides matchers to the LabelNames method on the LabelQuerier
interface, so in order to upgrade Prometheus we need to support that.

This partially solves
cortexproject#3658 as now the block
store queryable uses the LabelNames method with matchers.

However, we're still using the ingesters' MetricsForLabelMatchers method
to perform the LabelNames w/matchers call on the distributor. That
change will be tackled separately as it breaks ingester's contracts and
needs to be released with a feature flag to perform a backwards
compatible release.

Signed-off-by: Oleg Zaytsev <mail@olegzaytsev.com>

* Updated CHANGELOG.md

Signed-off-by: Oleg Zaytsev <mail@olegzaytsev.com>
Signed-off-by: Alvin Lin <alvinlin@amazon.com>
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.

2 participants