Use storage package for Prometheus remote read #9967
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
* Update Prometheus remote write to use metric name as measurement name and value as the field name. * Update Prometheus remote read to use the storage.Read method to bypass the InfluxQL query engine.
ghost
assigned 
e-dard
force-pushed
the
pd-prometheus-to-new-storage
branch
from
bccec99
to
1eca009
Compare
stuartcarnie
requested changes
Jun 13, 2018
services/httpd/handler.go
Outdated
| } | ||
| cur.Close() |
There was a problem hiding this comment.
cur.Close() should be moved outside the switch to ensure all cursor types are closed or it will result in TSM file handle leaks.
services/httpd/handler_test.go
Outdated
| "github.com/google/go-cmp/cmp" | ||
|
|
||
| "github.com/influxdata/influxdb/logger" | ||
|
|
tests/server_test.go
Outdated
| "strconv" | ||
| "strings" | ||
| "sync" | ||
| "testing" | ||
| "time" | ||
|
|
||
| "github.com/google/go-cmp/cmp" | ||
|
|
services/httpd/handler.go
Outdated
| @@ -108,6 +110,11 @@ type Handler struct { | |||
| WritePoints(database, retentionPolicy string, consistencyLevel models.ConsistencyLevel, user meta.User, points []models.Point) error | |||
| } | |||
|
|
|||
| Store interface { | |||
There was a problem hiding this comment.
Do you have a strong preference for inline interface definitions vs promoting it to a package-level type? i.e.
type Store interface {
Read(ctx context.Context, req *storage.ReadRequest) (storage.Results, error)
WithLogger(log *zap.Logger)
}My case is that some tools appear to have a harder time identifying inlined interfaces and subsequently other types which implement this interface.
e-dard
force-pushed
the
pd-prometheus-to-new-storage
branch
from
8b93cfe
to
3cb9e13
Compare
|
@stuartcarnie feedback addressed. |
10 tasks
jacobmarble
pushed a commit
that referenced
this pull request
Jun 27, 2018
Use storage package for Prometheus remote read
jacobmarble
pushed a commit
that referenced
this pull request
Jun 27, 2018
Use storage package for Prometheus remote read
jacobmarble
pushed a commit
that referenced
this pull request
Jun 27, 2018
Use storage package for Prometheus remote read
jacobmarble
pushed a commit
that referenced
this pull request
Jun 27, 2018
Use storage package for Prometheus remote read
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 PR converts the Prometheus remote read endpoint to use the
storagepackage, rather than the InfluxQL query engine.This results in a number of improvements in performance and efficiency.
The PR also fixes a bug in the
storagepackage, where regex expressions were not being properly handled for storage requests.Finally it adds some higher-level end-to-end tests in the
testspackage.