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

influxdb: flux: use more precise start and end timestamps (#39415)

Browse Source 
* influxdb: flux: use more precise start and end timestamps

* added unit test
This commit is contained in:
Gábor Farkas
2021-09-22 15:26:36 +02:00
committed by GitHub
parent 1d56c32ab0
commit bf0dc3ef62
2 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/tsdb/influxdb/flux/macros.go
View File

@@ -16,8 +16,8 @@ func interpolate(query queryModel) (string, error) {
matches := variableFilterExp.FindAllStringSubmatch(flux, -1) matches := variableFilterExp.FindAllStringSubmatch(flux, -1)
if matches != nil { if matches != nil {
timeRange := query.TimeRange timeRange := query.TimeRange
from := timeRange.From.UTC().Format(time.RFC3339) from := timeRange.From.UTC().Format(time.RFC3339Nano)
to := timeRange.To.UTC().Format(time.RFC3339) to := timeRange.To.UTC().Format(time.RFC3339Nano)
for _, match := range matches { for _, match := range matches {
switch match[2] { switch match[2] {
case "timeRangeStart": case "timeRangeStart":

9
pkg/tsdb/influxdb/flux/macros_test.go
View File

@@ -11,12 +11,9 @@ import (
) )
func TestInterpolate(t *testing.T) { func TestInterpolate(t *testing.T) {
// Unix sec: 1500376552
// Unix ms: 1500376552001
timeRange := backend.TimeRange{ timeRange := backend.TimeRange{
From: time.Unix(0, 0), From: time.Unix(1632305571, 310985041),
To: time.Unix(0, 0), To: time.Unix(1632309171, 310985042),
} }
options := queryOptions{ options := queryOptions{
@@ -33,7 +30,7 @@ func TestInterpolate(t *testing.T) {
{ {
name: "interpolate flux variables", name: "interpolate flux variables",
before: `v.timeRangeStart, something.timeRangeStop, XYZ.bucket, uuUUu.defaultBucket, aBcDefG.organization, window.windowPeriod, a91{}.bucket`, before: `v.timeRangeStart, something.timeRangeStop, XYZ.bucket, uuUUu.defaultBucket, aBcDefG.organization, window.windowPeriod, a91{}.bucket`,
after: `1970-01-01T00:00:00Z, 1970-01-01T00:00:00Z, "grafana2", "grafana3", "grafana1", 1s, a91{}.bucket`, after: `2021-09-22T10:12:51.310985041Z, 2021-09-22T11:12:51.310985042Z, "grafana2", "grafana3", "grafana1", 1s, a91{}.bucket`,
}, },
} }
for _, tt := range tests { for _, tt := range tests {