IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-11 08:05:43 -06:00
Code Issues Packages Projects Releases Wiki Activity

influxdb: escape backslashes in tag values (for alerting)

Browse Source 
Closes #10957. Backslash escaping was already implemented on the
frontend but does not work for queries executed on the backend.
This commit is contained in:
Daniel Lee 2018-02-19 10:00:09 +01:00
parent 710bb70746
commit f959ba9bcf
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/tsdb/influxdb/query.go
View File

@ -70,7 +70,7 @@ func (query *Query) renderTags() []string {
} else if tag.Operator == "<" || tag.Operator == ">" { } else if tag.Operator == "<" || tag.Operator == ">" {
textValue = tag.Value textValue = tag.Value
} else { } else {
textValue = fmt.Sprintf("'%s'", tag.Value) textValue = fmt.Sprintf("'%s'", strings.Replace(tag.Value, `\`, `\\`, -1))
} }
res = append(res, fmt.Sprintf(`%s"%s" %s %s`, str, tag.Key, tag.Operator, textValue)) res = append(res, fmt.Sprintf(`%s"%s" %s %s`, str, tag.Key, tag.Operator, textValue))

6
pkg/tsdb/influxdb/query_test.go
View File

@ -170,6 +170,12 @@ func TestInfluxdbQueryBuilder(t *testing.T) {
So(strings.Join(query.renderTags(), ""), ShouldEqual, `"key" = 'value'`) So(strings.Join(query.renderTags(), ""), ShouldEqual, `"key" = 'value'`)
}) })
Convey("can escape backslashes when rendering string tags", func() {
query := &Query{Tags: []*Tag{{Operator: "=", Value: `C:\test\`, Key: "key"}}}
So(strings.Join(query.renderTags(), ""), ShouldEqual, `"key" = 'C:\\test\\'`)
})
Convey("can render regular measurement", func() { Convey("can render regular measurement", func() {
query := &Query{Measurement: `apa`, Policy: "policy"} query := &Query{Measurement: `apa`, Policy: "policy"}