Fix Prometheus regex parsing #9153
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
e-dard
force-pushed
the
er-prom-parsing
branch
from
7c13c8c to
d3df98e
Compare
jsternberg
approved these changes
Nov 24, 2017
prometheus/converters.go
Outdated
| @@ -93,6 +94,8 @@ func ReadRequestToInfluxQLQuery(req *remote.ReadRequest, db, rp string) (*influx | |||
| // condFromMatcher converts a Prometheus LabelMatcher into an equivalent InfluxQL BinaryExpr | |||
| func condFromMatcher(m *remote.LabelMatcher) (*influxql.BinaryExpr, error) { | |||
| var op influxql.Token | |||
| var RHS influxql.Expr | |||
There was a problem hiding this comment.
Can RHS be lowercase? Since it's a local variable, I think that's the standard for local variables.
prometheus/converters_test.go
Outdated
| "testing" | ||
|
|
||
| "github.com/influxdata/influxql" | ||
|
|
There was a problem hiding this comment.
Can you remove the space between these?
e-dard
force-pushed
the
er-prom-parsing
branch
from
d3df98e to
8e3d29e
Compare
ghost
assigned 
pauldix
approved these changes
Nov 30, 2017
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.
Required for all non-trivial PRs
Fixes #9134.
InfluxDB expects regex condition values to be
influxql.RegexLiterals, which have literals beginning and ending in forward slashes.Also adds further test coverage to
ReadRequestToInfluxQLQuery.Only thing that might be worth checking is whether the regex values originating from Prometheus format have already escaped forward slashes or not. For example, will the following condition arrive as:
region =~ foo/barwhich we would then convert intoregion =~ /foo\/bar/or, would the condition arrive as
region =~ foo\/bar, which we would then incorrectly convert toregion =~ /foo\\/bar/?No
CHANGELOGupdate as this will probably be back-ported.