public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Expressions: Move GEL into core as expressions (#29072)

Browse Source 
* comes from grafana/gel-app
* remove transform plugin code
* move __expr__ and -100 constants to expr pkg
* set OrgID on request plugin context
* use gtime for resample duration
* in resample, rename "rule" to "window", use gtime for duration, parse duration before exec
* remove gel entry from plugins-bundled/external.json
which creates an empty array for plugins
This commit is contained in:
Kyle Brandt
2020-11-19 07:17:00 -05:00
committed by GitHub
parent f01c3f35e1
commit 0cb29d337a
44 changed files with 5770 additions and 401 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/expr/mathexp/resample_test.go
+260
View File
@@ -0,0 +1,260 @@
package mathexp
import (
"testing"
"time"
"github.com/grafana/grafana-plugin-sdk-go/backend"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)
func TestResampleSeries(t *testing.T) {
var tests = []struct {
name string
interval time.Duration
downsampler string
upsampler string
timeRange backend.TimeRange
seriesToResample Series
series Series
}{
{
name: "resample series: time range shorter than the rule interval",
interval: time.Second * 5,
downsampler: "mean",
upsampler: "fillna",
timeRange: backend.TimeRange{
From: time.Unix(0, 0),
To: time.Unix(4, 0),
},
seriesToResample: makeSeriesNullableTime("", nil, nullTimeTP{
unixTimePointer(2, 0), float64Pointer(2),
}, nullTimeTP{
unixTimePointer(7, 0), float64Pointer(1),
}),
},
{
name: "resample series: invalid time range",
interval: time.Second * 5,
downsampler: "mean",
upsampler: "fillna",
timeRange: backend.TimeRange{
From: time.Unix(11, 0),
To: time.Unix(0, 0),
},
seriesToResample: makeSeriesNullableTime("", nil, nullTimeTP{
unixTimePointer(2, 0), float64Pointer(2),
}, nullTimeTP{
unixTimePointer(7, 0), float64Pointer(1),
}),
},
{
name: "resample series: downsampling (mean / pad)",
interval: time.Second * 5,
downsampler: "mean",
upsampler: "pad",
timeRange: backend.TimeRange{
From: time.Unix(0, 0),
To: time.Unix(16, 0),
},
seriesToResample: makeSeriesNullableTime("", nil, nullTimeTP{
unixTimePointer(2, 0), float64Pointer(2),
}, nullTimeTP{
unixTimePointer(4, 0), float64Pointer(3),
}, nullTimeTP{
unixTimePointer(7, 0), float64Pointer(1),
}, nullTimeTP{
unixTimePointer(9, 0), float64Pointer(2),
}),
series: makeSeriesNullableTime("", nil, nullTimeTP{
unixTimePointer(0, 0), nil,
}, nullTimeTP{
unixTimePointer(5, 0), float64Pointer(2.5),
}, nullTimeTP{
unixTimePointer(10, 0), float64Pointer(1.5),
}, nullTimeTP{
unixTimePointer(15, 0), float64Pointer(2),
}),
},
{
name: "resample series: downsampling (max / fillna)",
interval: time.Second * 5,
downsampler: "max",
upsampler: "fillna",
timeRange: backend.TimeRange{
From: time.Unix(0, 0),
To: time.Unix(16, 0),
},
seriesToResample: makeSeriesNullableTime("", nil, nullTimeTP{
unixTimePointer(2, 0), float64Pointer(2),
}, nullTimeTP{
unixTimePointer(4, 0), float64Pointer(3),
}, nullTimeTP{
unixTimePointer(7, 0), float64Pointer(1),
}, nullTimeTP{
unixTimePointer(9, 0), float64Pointer(2),
}),
series: makeSeriesNullableTime("", nil, nullTimeTP{
unixTimePointer(0, 0), nil,
}, nullTimeTP{
unixTimePointer(5, 0), float64Pointer(3),
}, nullTimeTP{
unixTimePointer(10, 0), float64Pointer(2),
}, nullTimeTP{
unixTimePointer(15, 0), nil,
}),
},
{
name: "resample series: downsampling (min / fillna)",
interval: time.Second * 5,
downsampler: "min",
upsampler: "fillna",
timeRange: backend.TimeRange{
From: time.Unix(0, 0),
To: time.Unix(16, 0),
},
seriesToResample: makeSeriesNullableTime("", nil, nullTimeTP{
unixTimePointer(2, 0), float64Pointer(2),
}, nullTimeTP{
unixTimePointer(4, 0), float64Pointer(3),
}, nullTimeTP{
unixTimePointer(7, 0), float64Pointer(1),
}, nullTimeTP{
unixTimePointer(9, 0), float64Pointer(2),
}),
series: makeSeriesNullableTime("", nil, nullTimeTP{
unixTimePointer(0, 0), nil,
}, nullTimeTP{
unixTimePointer(5, 0), float64Pointer(2),
}, nullTimeTP{
unixTimePointer(10, 0), float64Pointer(1),
}, nullTimeTP{
unixTimePointer(15, 0), nil,
}),
},
{
name: "resample series: downsampling (sum / fillna)",
interval: time.Second * 5,
downsampler: "sum",
upsampler: "fillna",
timeRange: backend.TimeRange{
From: time.Unix(0, 0),
To: time.Unix(16, 0),
},
seriesToResample: makeSeriesNullableTime("", nil, nullTimeTP{
unixTimePointer(2, 0), float64Pointer(2),
}, nullTimeTP{
unixTimePointer(4, 0), float64Pointer(3),
}, nullTimeTP{
unixTimePointer(7, 0), float64Pointer(1),
}, nullTimeTP{
unixTimePointer(9, 0), float64Pointer(2),
}),
series: makeSeriesNullableTime("", nil, nullTimeTP{
unixTimePointer(0, 0), nil,
}, nullTimeTP{
unixTimePointer(5, 0), float64Pointer(5),
}, nullTimeTP{
unixTimePointer(10, 0), float64Pointer(3),
}, nullTimeTP{
unixTimePointer(15, 0), nil,
}),
},
{
name: "resample series: downsampling (mean / fillna)",
interval: time.Second * 5,
downsampler: "mean",
upsampler: "fillna",
timeRange: backend.TimeRange{
From: time.Unix(0, 0),
To: time.Unix(16, 0),
},
seriesToResample: makeSeriesNullableTime("", nil, nullTimeTP{
unixTimePointer(2, 0), float64Pointer(2),
}, nullTimeTP{
unixTimePointer(4, 0), float64Pointer(3),
}, nullTimeTP{
unixTimePointer(7, 0), float64Pointer(1),
}, nullTimeTP{
unixTimePointer(9, 0), float64Pointer(2),
}),
series: makeSeriesNullableTime("", nil, nullTimeTP{
unixTimePointer(0, 0), nil,
}, nullTimeTP{
unixTimePointer(5, 0), float64Pointer(2.5),
}, nullTimeTP{
unixTimePointer(10, 0), float64Pointer(1.5),
}, nullTimeTP{
unixTimePointer(15, 0), nil,
}),
},
{
name: "resample series: upsampling (mean / pad )",
interval: time.Second * 2,
downsampler: "mean",
upsampler: "pad",
timeRange: backend.TimeRange{
From: time.Unix(0, 0),
To: time.Unix(11, 0),
},
seriesToResample: makeSeriesNullableTime("", nil, nullTimeTP{
unixTimePointer(2, 0), float64Pointer(2),
}, nullTimeTP{
unixTimePointer(7, 0), float64Pointer(1),
}),
series: makeSeriesNullableTime("", nil, nullTimeTP{
unixTimePointer(0, 0), nil,
}, nullTimeTP{
unixTimePointer(2, 0), float64Pointer(2),
}, nullTimeTP{
unixTimePointer(4, 0), float64Pointer(2),
}, nullTimeTP{
unixTimePointer(6, 0), float64Pointer(2),
}, nullTimeTP{
unixTimePointer(8, 0), float64Pointer(1),
}, nullTimeTP{
unixTimePointer(10, 0), float64Pointer(1),
}),
},
{
name: "resample series: upsampling (mean / backfilling )",
interval: time.Second * 2,
downsampler: "mean",
upsampler: "backfilling",
timeRange: backend.TimeRange{
From: time.Unix(0, 0),
To: time.Unix(11, 0),
},
seriesToResample: makeSeriesNullableTime("", nil, nullTimeTP{
unixTimePointer(2, 0), float64Pointer(2),
}, nullTimeTP{
unixTimePointer(7, 0), float64Pointer(1),
}),
series: makeSeriesNullableTime("", nil, nullTimeTP{
unixTimePointer(0, 0), float64Pointer(2),
}, nullTimeTP{
unixTimePointer(2, 0), float64Pointer(2),
}, nullTimeTP{
unixTimePointer(4, 0), float64Pointer(1),
}, nullTimeTP{
unixTimePointer(6, 0), float64Pointer(1),
}, nullTimeTP{
unixTimePointer(8, 0), float64Pointer(1),
}, nullTimeTP{
unixTimePointer(10, 0), nil,
}),
},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
series, err := tt.seriesToResample.Resample(tt.interval, tt.downsampler, tt.upsampler, tt.timeRange)
if tt.series.Frame == nil {
require.Error(t, err)
} else {
require.NoError(t, err)
assert.Equal(t, tt.series, series)
}
})
}
}