From f5926af99a01a3ae3470568b3378bfd577c7824b Mon Sep 17 00:00:00 2001 From: Andreas Christou Date: Wed, 11 Sep 2024 14:26:09 +0100 Subject: [PATCH] InfluxDB: Update macro regexp (#93040) Update macro and tests --- pkg/tsdb/influxdb/flux/macros.go | 2 +- pkg/tsdb/influxdb/flux/macros_test.go | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkg/tsdb/influxdb/flux/macros.go b/pkg/tsdb/influxdb/flux/macros.go index fbec2b4d1fe..fa55d65161d 100644 --- a/pkg/tsdb/influxdb/flux/macros.go +++ b/pkg/tsdb/influxdb/flux/macros.go @@ -22,7 +22,7 @@ func interpolateInterval(flux string, interval time.Duration) string { return flux } -var fluxVariableFilterExp = regexp.MustCompile(`(?m)([a-zA-Z]+)\.([a-zA-Z]+)`) +var fluxVariableFilterExp = regexp.MustCompile(`(?m)(v)\.([a-zA-Z]+)`) func interpolateFluxSpecificVariables(query queryModel) string { rawQuery := query.RawQuery diff --git a/pkg/tsdb/influxdb/flux/macros_test.go b/pkg/tsdb/influxdb/flux/macros_test.go index 283835ab24e..bfe1bdfacd2 100644 --- a/pkg/tsdb/influxdb/flux/macros_test.go +++ b/pkg/tsdb/influxdb/flux/macros_test.go @@ -28,13 +28,13 @@ func TestInterpolate(t *testing.T) { }{ { name: "interpolate flux variables", - before: `v.timeRangeStart, something.timeRangeStop, XYZ.bucket, uuUUu.defaultBucket, aBcDefG.organization, window.windowPeriod, a91{}.bucket, $__interval, $__interval_ms`, + before: `v.timeRangeStart, v.timeRangeStop, v.bucket, v.defaultBucket, v.organization, v.windowPeriod, a91{}.bucket, $__interval, $__interval_ms`, after: `2021-09-22T10:12:51.310985041Z, 2021-09-22T11:12:51.310985042Z, "grafana2", "grafana3", "grafana1", 1m1.258s, a91{}.bucket, 1m, 61258`, }, { name: "don't interpolate bucket variable in join query", - before: `range(start: v.timeRangeStart, stop: v.timeRangeStop) join.left(left: left |> group(), right: right,on:((l,r) => l.bucket == r.id), as: ((l, r) => ({l with name: r.name})))`, - after: `range(start: 2021-09-22T10:12:51.310985041Z, stop: 2021-09-22T11:12:51.310985042Z) join.left(left: left |> group(), right: right,on:((l,r) => l.bucket == r.id), as: ((l, r) => ({l with name: r.name})))`, + before: `range(start: v.timeRangeStart, stop: v.timeRangeStop) join.left(left: left |> group(), right: right,on:((l,r) => v.bucket == r.id), as: ((l, r) => ({l with name: r.name})))`, + after: `range(start: 2021-09-22T10:12:51.310985041Z, stop: 2021-09-22T11:12:51.310985042Z) join.left(left: left |> group(), right: right,on:((l,r) => v.bucket == r.id), as: ((l, r) => ({l with name: r.name})))`, }, } for _, tt := range tests {