IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2024-11-28 19:54:10 -06:00
Code Issues Packages Projects Releases Wiki Activity

InfluxDB: Don't interpolate bucket keyword in flux language if it is part of a join query (#89298)

Browse Source 
don't interpolate bucket keyword if it is part of a join query
This commit is contained in:
ismail simsek 2024-06-19 08:22:16 +02:00 committed by GitHub
parent 76047d9365
commit dfcda2b14a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 26 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -25,27 +25,40 @@ func interpolateInterval(flux string, interval time.Duration) string {
var fluxVariableFilterExp = regexp.MustCompile(`(?m)([a-zA-Z]+)\.([a-zA-Z]+)`)
func interpolateFluxSpecificVariables(query queryModel) string {
rawQuery := query.RawQuery
flux := query.RawQuery
matches := fluxVariableFilterExp.FindAllStringSubmatch(flux, -1)
matches := fluxVariableFilterExp.FindAllStringSubmatchIndex(rawQuery, -1)
if matches != nil {
timeRange := query.TimeRange
from := timeRange.From.UTC().Format(time.RFC3339Nano)
to := timeRange.To.UTC().Format(time.RFC3339Nano)
for _, match := range matches {
switch match[2] {
// For query "range(start: v.timeRangeStart, stop: v.timeRangeStop)"
// rawQuery[match[0]:match[1]] will be v.timeRangeStart
// rawQuery[match[2]:match[3]] will be v
// rawQuery[match[4]:match[5]] will be timeRangeStart
fullMatch := rawQuery[match[0]:match[1]]
key := rawQuery[match[4]:match[5]]
switch key {
case "timeRangeStart":
flux = strings.ReplaceAll(flux, match[0], from)
flux = strings.ReplaceAll(flux, fullMatch, from)
case "timeRangeStop":
flux = strings.ReplaceAll(flux, match[0], to)
flux = strings.ReplaceAll(flux, fullMatch, to)
case "windowPeriod":
flux = strings.ReplaceAll(flux, match[0], query.Interval.String())
flux = strings.ReplaceAll(flux, fullMatch, query.Interval.String())
case "bucket":
flux = strings.ReplaceAll(flux, match[0], "\""+query.Options.Bucket+"\"")
// Check if 'bucket' is part of a join query
beforeMatch := rawQuery[:match[0]]
if strings.Contains(beforeMatch, "join.") {
continue
}
flux = strings.ReplaceAll(flux, fullMatch, "\""+query.Options.Bucket+"\"")
case "defaultBucket":
flux = strings.ReplaceAll(flux, match[0], "\""+query.Options.DefaultBucket+"\"")
flux = strings.ReplaceAll(flux, fullMatch, "\""+query.Options.DefaultBucket+"\"")
case "organization":
flux = strings.ReplaceAll(flux, match[0], "\""+query.Options.Organization+"\"")
flux = strings.ReplaceAll(flux, fullMatch, "\""+query.Options.Organization+"\"")
}
}
}

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

@ -31,6 +31,11 @@ func TestInterpolate(t *testing.T) {
before: `v.timeRangeStart, something.timeRangeStop, XYZ.bucket, uuUUu.defaultBucket, aBcDefG.organization, window.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})))`,
},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {