IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

fix(influxdb): fixes bug when using regexps/numbers in tags

Browse Source 
closes #6488
This commit is contained in:
bergquist
2016-11-07 14:26:20 +01:00
parent 16e7bfc622
commit 56340bfdfb
2 changed files with 33 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
pkg/tsdb/influxdb/query_builder.go
View File

@@ -2,6 +2,7 @@ package influxdb
import (
"fmt"
"strconv"
"strings"
"github.com/grafana/grafana/pkg/tsdb"
@@ -42,7 +43,18 @@ func (qb *QueryBuilder) renderTags(query *Query) []string {
str += " "
}
res = append(res, fmt.Sprintf(`%s"%s" %s '%s'`, str, tag.Key, tag.Operator, tag.Value))
value := tag.Value
nValue, err := strconv.ParseFloat(tag.Value, 64)
if tag.Operator == "=~" || tag.Operator == "!~" {
value = fmt.Sprintf("%s", value)
} else if err == nil {
value = fmt.Sprintf("%v", nValue)
} else {
value = fmt.Sprintf("'%s'", value)
}
res = append(res, fmt.Sprintf(`%s"%s" %s %s`, str, tag.Key, tag.Operator, value))
}
return res

20
pkg/tsdb/influxdb/query_builder_test.go
View File

@@ -3,6 +3,8 @@ package influxdb
import (
"testing"
"strings"
"github.com/grafana/grafana/pkg/tsdb"
. "github.com/smartystreets/goconvey/convey"
)
@@ -83,5 +85,23 @@ func TestInfluxdbQueryBuilder(t *testing.T) {
So(err, ShouldBeNil)
So(rawQuery, ShouldEqual, `Raw query`)
})
Convey("can render regex tags", func() {
query := &Query{Tags: []*Tag{&Tag{Operator: "=~", Value: "value", Key: "key"}}}
So(strings.Join(builder.renderTags(query), ""), ShouldEqual, `"key" =~ value`)
})
Convey("can render number tags", func() {
query := &Query{Tags: []*Tag{&Tag{Operator: "=", Value: "1", Key: "key"}}}
So(strings.Join(builder.renderTags(query), ""), ShouldEqual, `"key" = 1`)
})
Convey("can render string tags", func() {
query := &Query{Tags: []*Tag{&Tag{Operator: "=", Value: "value", Key: "key"}}}
So(strings.Join(builder.renderTags(query), ""), ShouldEqual, `"key" = 'value'`)
})
})
}