From c50ac220228c637359505b0d5287c56ce0f1d3d7 Mon Sep 17 00:00:00 2001 From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com> Date: Fri, 8 Jul 2022 16:21:40 +0200 Subject: [PATCH] Plugins: InfluxDB update time range query (#51833) (#51927) (cherry picked from commit 8deb17fdc443102305d41df20904e8ca6e8deaf7) Co-authored-by: ismail simsek --- pkg/tsdb/influxdb/query.go | 2 +- pkg/tsdb/influxdb/query_test.go | 25 ++++++++++++++++--------- 2 files changed, 17 insertions(+), 10 deletions(-) diff --git a/pkg/tsdb/influxdb/query.go b/pkg/tsdb/influxdb/query.go index 6169085ee7c..7193198a9f8 100644 --- a/pkg/tsdb/influxdb/query.go +++ b/pkg/tsdb/influxdb/query.go @@ -85,7 +85,7 @@ func (query *Query) renderTags() []string { func (query *Query) renderTimeFilter(queryContext *backend.QueryDataRequest) string { from, to := epochMStoInfluxTime(&queryContext.Queries[0].TimeRange) - return fmt.Sprintf("time > %s and time < %s", from, to) + return fmt.Sprintf("time >= %s and time <= %s", from, to) } func (query *Query) renderSelectors(queryContext *backend.QueryDataRequest) string { diff --git a/pkg/tsdb/influxdb/query_test.go b/pkg/tsdb/influxdb/query_test.go index d35d9b05024..e767748bff4 100644 --- a/pkg/tsdb/influxdb/query_test.go +++ b/pkg/tsdb/influxdb/query_test.go @@ -49,7 +49,7 @@ func TestInfluxdbQueryBuilder(t *testing.T) { rawQuery, err := query.Build(queryContext) require.NoError(t, err) - require.Equal(t, rawQuery, `SELECT mean("value") FROM "policy"."cpu" WHERE time > 1596240000000ms and time < 1596240300000ms GROUP BY time(10s) fill(null)`) + require.Equal(t, rawQuery, `SELECT mean("value") FROM "policy"."cpu" WHERE time >= 1596240000000ms and time <= 1596240300000ms GROUP BY time(10s) fill(null)`) }) t.Run("can build query with tz", func(t *testing.T) { @@ -63,7 +63,8 @@ func TestInfluxdbQueryBuilder(t *testing.T) { rawQuery, err := query.Build(queryContext) require.NoError(t, err) - require.Equal(t, rawQuery, `SELECT mean("value") FROM "cpu" WHERE time > 1596240000000ms and time < 1596240300000ms GROUP BY time(5s) tz('Europe/Paris')`) + require.Equal(t, rawQuery, + `SELECT mean("value") FROM "cpu" WHERE time >= 1596240000000ms and time <= 1596240300000ms GROUP BY time(5s) tz('Europe/Paris')`) }) t.Run("can build query with tz, limit, slimit, orderByTime and puts them in the correct order", func(t *testing.T) { @@ -80,7 +81,8 @@ func TestInfluxdbQueryBuilder(t *testing.T) { rawQuery, err := query.Build(queryContext) require.NoError(t, err) - require.Equal(t, rawQuery, `SELECT mean("value") FROM "cpu" WHERE time > 1596240000000ms and time < 1596240300000ms GROUP BY time(5s) ORDER BY time ASC limit 1 slimit 1 tz('Europe/Paris')`) + require.Equal(t, rawQuery, + `SELECT mean("value") FROM "cpu" WHERE time >= 1596240000000ms and time <= 1596240300000ms GROUP BY time(5s) ORDER BY time ASC limit 1 slimit 1 tz('Europe/Paris')`) }) t.Run("can build query with group bys", func(t *testing.T) { @@ -94,7 +96,7 @@ func TestInfluxdbQueryBuilder(t *testing.T) { rawQuery, err := query.Build(queryContext) require.NoError(t, err) - require.Equal(t, rawQuery, `SELECT mean("value") FROM "cpu" WHERE ("hostname" = 'server1' OR "hostname" = 'server2') AND time > 1596240000000ms and time < 1596240300000ms GROUP BY time(5s), "datacenter" fill(null)`) + require.Equal(t, rawQuery, `SELECT mean("value") FROM "cpu" WHERE ("hostname" = 'server1' OR "hostname" = 'server2') AND time >= 1596240000000ms and time <= 1596240300000ms GROUP BY time(5s), "datacenter" fill(null)`) }) t.Run("can build query with math part", func(t *testing.T) { @@ -106,7 +108,8 @@ func TestInfluxdbQueryBuilder(t *testing.T) { rawQuery, err := query.Build(queryContext) require.NoError(t, err) - require.Equal(t, rawQuery, `SELECT mean("value") / 100 FROM "cpu" WHERE time > 1596240000000ms and time < 1596240300000ms`) + require.Equal(t, rawQuery, + `SELECT mean("value") / 100 FROM "cpu" WHERE time >= 1596240000000ms and time <= 1596240300000ms`) }) t.Run("can build query with math part using $__interval_ms variable", func(t *testing.T) { @@ -118,7 +121,8 @@ func TestInfluxdbQueryBuilder(t *testing.T) { rawQuery, err := query.Build(queryContext) require.NoError(t, err) - require.Equal(t, rawQuery, `SELECT mean("value") / 5000 FROM "cpu" WHERE time > 1596240000000ms and time < 1596240300000ms`) + require.Equal(t, rawQuery, + `SELECT mean("value") / 5000 FROM "cpu" WHERE time >= 1596240000000ms and time <= 1596240300000ms`) }) t.Run("can build query with old $interval variable", func(t *testing.T) { @@ -132,7 +136,8 @@ func TestInfluxdbQueryBuilder(t *testing.T) { rawQuery, err := query.Build(queryContext) require.NoError(t, err) - require.Equal(t, rawQuery, `SELECT mean("value") FROM "cpu" WHERE time > 1596240000000ms and time < 1596240300000ms GROUP BY time(200ms)`) + require.Equal(t, rawQuery, + `SELECT mean("value") FROM "cpu" WHERE time >= 1596240000000ms and time <= 1596240300000ms GROUP BY time(200ms)`) }) t.Run("can render time range", func(t *testing.T) { @@ -150,7 +155,8 @@ func TestInfluxdbQueryBuilder(t *testing.T) { }, }, } - require.Equal(t, query.renderTimeFilter(queryContext), "time > 1596240000000ms and time < 1596243600000ms") + require.Equal(t, query.renderTimeFilter(queryContext), + "time >= 1596240000000ms and time <= 1596243600000ms") }) t.Run("render from: 10m", func(t *testing.T) { @@ -165,7 +171,8 @@ func TestInfluxdbQueryBuilder(t *testing.T) { }, }, } - require.Equal(t, query.renderTimeFilter(queryContext), "time > 1596240000000ms and time < 1596240600000ms") + require.Equal(t, query.renderTimeFilter(queryContext), + "time >= 1596240000000ms and time <= 1596240600000ms") }) })