Update prometheus and cortex #3804
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Mauro Stettler <mauro.stettler@gmail.com>
Signed-off-by: Mauro Stettler <mauro.stettler@gmail.com>
Signed-off-by: Mauro Stettler <mauro.stettler@gmail.com>
Signed-off-by: Mauro Stettler <mauro.stettler@gmail.com>
replay
force-pushed
the
update_prometheus_and_cortex
branch
from
44057f0 to
7a5126c
Compare
replay
force-pushed
the
update_prometheus_and_cortex
branch
3 times, most recently
from
a5c056e to
1f1f54d
Compare
replay
changed the title
replay
force-pushed
the
update_prometheus_and_cortex
branch
from
1f1f54d to
6c3a35e
Compare
yeya24
reviewed
Feb 17, 2021
pkg/query/querier.go
Outdated
| span, ctx := tracing.StartSpan(q.ctx, "querier_label_values") | ||
| defer span.Finish() | ||
|
|
||
| // TODO(bwplotka): Pass it using the SeriesRequest instead of relying on context. | ||
| ctx = context.WithValue(ctx, store.StoreMatcherKey, q.storeDebugMatchers) | ||
|
|
||
| pbMatchers, err := storepb.PromMatchersToMatchers(matchers...) | ||
| if err != nil { | ||
| return nil, nil, errors.Wrap(err, "proxy LabelValues()") |
There was a problem hiding this comment.
Let's update the msg to convert matchers to be consistent.
pkg/store/storepb/rpc.proto
Outdated
| @@ -178,6 +178,8 @@ message LabelValuesRequest { | |||
| // The content of this field and whether it's supported depends on the | |||
| // implementation of a specific store. | |||
| google.protobuf.Any hints = 6; | |||
|
|
|||
| repeated LabelMatcher label_matchers = 7 [(gogoproto.nullable) = false]; | |||
There was a problem hiding this comment.
We can just call it matchers to be consistent.
bwplotka
approved these changes
Feb 17, 2021
pkg/query/querier.go
Outdated
| span, ctx := tracing.StartSpan(q.ctx, "querier_label_values") | ||
| defer span.Finish() | ||
|
|
||
| // TODO(bwplotka): Pass it using the SeriesRequest instead of relying on context. | ||
| ctx = context.WithValue(ctx, store.StoreMatcherKey, q.storeDebugMatchers) | ||
|
|
||
| pbMatchers, err := storepb.PromMatchersToMatchers(matchers...) | ||
| if err != nil { | ||
| return nil, nil, errors.Wrap(err, "proxy LabelValues()") |
pkg/store/storepb/rpc.proto
Outdated
| @@ -178,6 +178,8 @@ message LabelValuesRequest { | |||
| // The content of this field and whether it's supported depends on the | |||
| // implementation of a specific store. | |||
| google.protobuf.Any hints = 6; | |||
|
|
|||
| repeated LabelMatcher label_matchers = 7 [(gogoproto.nullable) = false]; | |||
Great! yes I'll make the requested changes, thanks to both of you for the quick feedback. |
replay
force-pushed
the
update_prometheus_and_cortex
branch
from
db5407b to
7f9c323
Compare
Signed-off-by: Mauro Stettler <mauro.stettler@gmail.com>
replay
force-pushed
the
update_prometheus_and_cortex
branch
from
7f9c323 to
bd10173
Compare
|
I have addressed the comments, please take another look |
2 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Changes
This updates the vendored Prometheus and Cortex versions. In the latest version of Prometheus the Querier's
.LabelValues()call now takes a matchers parameter, so this also adds that parameter to thestorepb.LabelValuesRequesttype.