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

feat(influxdb): add support for policies

Browse Source
This commit is contained in:
bergquist 2016-10-05 20:57:28 +02:00
parent 4387d20222
commit 887ca40455
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -41,7 +41,11 @@ func (*QueryBuild) Build(query *Query) (string, error) {
} }
res += strings.Join(selectors, ", ") res += strings.Join(selectors, ", ")
res += fmt.Sprintf(` FROM "%s"`, query.Measurement) policy := ""
if query.Policy != "" {
policy = `"` + query.Policy + `".`
}
res += fmt.Sprintf(` FROM %s"%s"`, policy, query.Measurement)
res += " WHERE " res += " WHERE "
conditions := renderTags(query) conditions := renderTags(query)

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

@ -23,12 +23,13 @@ func TestInfluxdbQueryBuilder(t *testing.T) {
query := &Query{ query := &Query{
Selects: []*Select{{*qp1, *qp2}}, Selects: []*Select{{*qp1, *qp2}},
Measurement: "cpu", Measurement: "cpu",
Policy: "policy",
GroupBy: []*QueryPart{groupBy1, groupBy2}, GroupBy: []*QueryPart{groupBy1, groupBy2},
} }
rawQuery, err := builder.Build(query) rawQuery, err := builder.Build(query)
So(err, ShouldBeNil) So(err, ShouldBeNil)
So(rawQuery, ShouldEqual, `SELECT mean("value") FROM "cpu" WHERE $timeFilter GROUP BY time($interval) fill(null)`) So(rawQuery, ShouldEqual, `SELECT mean("value") FROM "policy"."cpu" WHERE $timeFilter GROUP BY time($interval) fill(null)`)
}) })
Convey("can asd query", func() { Convey("can asd query", func() {