Update prometheus #802
Merged
Update prometheus #802
Conversation
This file contains hidden or 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
bboreham
force-pushed
the
762-update-prometheus
branch
from
e276615 to
e184829
Compare
Move from one brittle assumption about Prometheus to another.
bboreham
force-pushed
the
762-update-prometheus
branch
from
e184829 to
9e41258
Compare
juliusv
reviewed
Apr 20, 2018
Gopkg.toml
Outdated
| @@ -19,6 +19,10 @@ | |||
| name = "github.com/prometheus/prometheus" | |||
| branch = "master" | |||
|
|
|||
| [[constraint]] | |||
There was a problem hiding this comment.
Didn't we want to have comments for newly added constraints?
juliusv
reviewed
Apr 22, 2018
pkg/querier/querier.go
Outdated
| func NewEngine(distributor Querier, chunkStore ChunkStore) *promql.Engine { | ||
| queryable := NewQueryable(distributor, chunkStore, false) | ||
| return promql.NewEngine(queryable, nil) | ||
| func NewEngine(distributor Querier, chunkStore ChunkStore, reg prometheus.Registerer, maxConcurrent int, timeout time.Duration) (*promql.Engine, storage.Queryable) { |
There was a problem hiding this comment.
Having NewEngine() return both an engine and a queryable seems messy, or at least not appropriate naming anymore. Maybe just get rid of this tiny wrapper and have the caller call both NewQueryable() and promql.NewEngine?
There was a problem hiding this comment.
Agreed; I've done this.
We don't need more specific parameters as ruler already knows the number of workers and has a timeout.
|
I've also re-applied the change described at #763 (comment) which I hadn't noticed before #763 was merged. |
awh
approved these changes
Apr 25, 2018
3 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.
This is a re-run of #763, updated to address the broken assumption about which queriers are used where.