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): add support for regex measurments

Browse Source 
closes #6560
This commit is contained in:
bergquist
2016-11-14 08:47:45 +01:00
parent a87fd11f26
commit 4fdfee739a
2 changed files with 22 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -11,7 +11,8 @@ import (
) )
var ( var (
regexpOperatorPattern *regexp.Regexp = regexp.MustCompile(`^\/.*\/$`) regexpOperatorPattern *regexp.Regexp = regexp.MustCompile(`^\/.*\/$`)
regexpMeasurementPattern *regexp.Regexp = regexp.MustCompile(`^\/.*\/$`)
) )
func (query *Query) Build(queryContext *tsdb.QueryContext) (string, error) { func (query *Query) Build(queryContext *tsdb.QueryContext) (string, error) {
@@ -108,7 +109,14 @@ func (query *Query) renderMeasurement() string {
} else { } else {
policy = `"` + query.Policy + `".` policy = `"` + query.Policy + `".`
} }
return fmt.Sprintf(` FROM %s"%s"`, policy, query.Measurement)
measurement := query.Measurement
if !regexpMeasurementPattern.Match([]byte(measurement)) {
measurement = fmt.Sprintf(`"%s"`, measurement)
}
return fmt.Sprintf(` FROM %s%s`, policy, measurement)
} }
func (query *Query) renderWhereClause() string { func (query *Query) renderWhereClause() string {

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

@@ -120,5 +120,17 @@ func TestInfluxdbQueryBuilder(t *testing.T) {
So(strings.Join(query.renderTags(), ""), ShouldEqual, `"key" = 'value'`) So(strings.Join(query.renderTags(), ""), ShouldEqual, `"key" = 'value'`)
}) })
Convey("can render regular measurement", func() {
query := &Query{Measurement: `apa`, Policy: "policy"}
So(query.renderMeasurement(), ShouldEqual, ` FROM "policy"."apa"`)
})
Convey("can render regexp measurement", func() {
query := &Query{Measurement: `/apa/`, Policy: "policy"}
So(query.renderMeasurement(), ShouldEqual, ` FROM "policy"./apa/`)
})
}) })
} }