Alerting/Expr: New SSE Request/QueryType, alerting move data source UID (#33282)

pkg/expr/mathexp/resample.go

@@ -4,13 +4,12 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/grafana/grafana-plugin-sdk-go/backend"
 	"github.com/grafana/grafana-plugin-sdk-go/data"
 )
 
 // Resample turns the Series into a Number based on the given reduction function
-func (s Series) Resample(refID string, interval time.Duration, downsampler string, upsampler string, tr backend.TimeRange) (Series, error) {
-	newSeriesLength := int(float64(tr.To.Sub(tr.From).Nanoseconds()) / float64(interval.Nanoseconds()))
+func (s Series) Resample(refID string, interval time.Duration, downsampler string, upsampler string, from, to time.Time) (Series, error) {
+	newSeriesLength := int(float64(to.Sub(from).Nanoseconds()) / float64(interval.Nanoseconds()))
 	if newSeriesLength <= 0 {
 		return s, fmt.Errorf("the series cannot be sampled further; the time range is shorter than the interval")
 	}
@@ -18,8 +17,8 @@ func (s Series) Resample(refID string, interval time.Duration, downsampler strin
 	bookmark := 0
 	var lastSeen *float64
 	idx := 0
-	t := tr.From
-	for !t.After(tr.To) && idx <= newSeriesLength {
+	t := from
+	for !t.After(to) && idx <= newSeriesLength {
 		vals := make([]*float64, 0)
 		sIdx := bookmark
 		for {

pkg/expr/mathexp/resample_test.go

@@ -276,7 +276,7 @@ func TestResampleSeries(t *testing.T) {
 	}
 	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)
+			series, err := tt.seriesToResample.Resample("", tt.interval, tt.downsampler, tt.upsampler, tt.timeRange.From, tt.timeRange.To)
 			if tt.series.Frame == nil {
 				require.Error(t, err)
 			} else {