Merge branch 'v4.0.x'

bergquist · bergquist · commit 4e306590f897 · 2016-12-21T10:02:28.000+01:00
diff --git a/pkg/tsdb/influxdb/query_part.go b/pkg/tsdb/influxdb/query_part.go
@@ -111,7 +111,7 @@ func getDefinedInterval(query *Query, queryContext *tsdb.QueryContext) string {
 
 func functionRenderer(query *Query, queryContext *tsdb.QueryContext, part *QueryPart, innerExpr string) string {
 	for i, param := range part.Params {
-		if param == "$interval" {
+		if param == "$interval" || param == "auto" {
 			if query.Interval != "" {
 				part.Params[i] = getDefinedInterval(query, queryContext)
 			} else {
diff --git a/pkg/tsdb/influxdb/query_part_test.go b/pkg/tsdb/influxdb/query_part_test.go
@@ -37,14 +37,22 @@ func TestInfluxdbQueryPart(t *testing.T) {
 			So(res, ShouldEqual, "bottom(value, 3)")
 		})
 
-		Convey("render time", func() {
+		Convey("render time with $interval", func() {
 			part, err := NewQueryPart("time", []string{"$interval"})
 			So(err, ShouldBeNil)
 
 			res := part.Render(query, queryContext, "")
 			So(res, ShouldEqual, "time(200ms)")
 		})
 
+		Convey("render time with auto", func() {
+			part, err := NewQueryPart("time", []string{"auto"})
+			So(err, ShouldBeNil)
+
+			res := part.Render(query, queryContext, "")
+			So(res, ShouldEqual, "time(200ms)")
+		})
+
 		Convey("render time interval >10s", func() {
 			part, err := NewQueryPart("time", []string{"$interval"})
 			So(err, ShouldBeNil)
