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

pkg/expr/transform.go

@@ -36,11 +36,9 @@ func init() {
 
 // WrapTransformData creates and executes transform requests
 func (s *Service) WrapTransformData(ctx context.Context, query plugins.DataQuery) (*backend.QueryDataResponse, error) {
-	sdkReq := &backend.QueryDataRequest{
-		PluginContext: backend.PluginContext{
-			OrgID: query.User.OrgId,
-		},
-		Queries: []backend.DataQuery{},
+	req := Request{
+		OrgId:   query.User.OrgId,
+		Queries: []Query{},
 	}
 
 	for _, q := range query.Queries {
@@ -48,24 +46,50 @@ func (s *Service) WrapTransformData(ctx context.Context, query plugins.DataQuery
 		if err != nil {
 			return nil, err
 		}
-		sdkReq.Queries = append(sdkReq.Queries, backend.DataQuery{
+		req.Queries = append(req.Queries, Query{
 			JSON:          modelJSON,
 			Interval:      time.Duration(q.IntervalMS) * time.Millisecond,
 			RefID:         q.RefID,
 			MaxDataPoints: q.MaxDataPoints,
 			QueryType:     q.QueryType,
-			TimeRange: backend.TimeRange{
+			TimeRange: TimeRange{
 				From: query.TimeRange.GetFromAsTimeUTC(),
 				To:   query.TimeRange.GetToAsTimeUTC(),
 			},
 		})
 	}
-	return s.TransformData(ctx, sdkReq)
+	return s.TransformData(ctx, &req)
+}
+
+// Request is similar to plugins.DataQuery but with the Time Ranges is per Query.
+type Request struct {
+	Headers map[string]string
+	Debug   bool
+	OrgId   int64
+	Queries []Query
+}
+
+// Query is like plugins.DataSubQuery, but with a a time range, and only the UID
+// for the data source. Also interval is a time.Duration.
+type Query struct {
+	RefID         string
+	TimeRange     TimeRange
+	DatasourceUID string
+	JSON          json.RawMessage
+	Interval      time.Duration
+	QueryType     string
+	MaxDataPoints int64
+}
+
+// TimeRange is a time.Time based TimeRange.
+type TimeRange struct {
+	From time.Time
+	To   time.Time
 }
 
 // TransformData takes Queries which are either expressions nodes
 // or are datasource requests.
-func (s *Service) TransformData(ctx context.Context, req *backend.QueryDataRequest) (r *backend.QueryDataResponse, err error) {
+func (s *Service) TransformData(ctx context.Context, req *Request) (r *backend.QueryDataResponse, err error) {
 	if s.isDisabled() {
 		return nil, status.Error(codes.PermissionDenied, "Expressions are disabled")
 	}
@@ -116,7 +140,7 @@ func (s *Service) TransformData(ctx context.Context, req *backend.QueryDataReque
 	return responses, nil
 }
 
-func hiddenRefIDs(queries []backend.DataQuery) (map[string]struct{}, error) {
+func hiddenRefIDs(queries []Query) (map[string]struct{}, error) {
 	hidden := make(map[string]struct{})
 
 	for _, query := range queries {