opensource/grafana
1
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-07-30 03:12:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

InfluxDB: Update macro regexp (#93040)

Browse Source 
Update macro and tests
This commit is contained in:
Andreas Christou
2024-09-11 14:26:09 +01:00
committed by GitHub
parent 9d5f8e2998
commit f5926af99a
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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

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

@ -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 {