fix(querier): handle single alerting queries without expression (#93497)

This commit is contained in:
Jean-Philippe Quéméner 2024-09-19 19:20:39 +02:00 committed by GitHub
parent f4c5c5c418
commit caa967b270
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -10,6 +10,7 @@ import (
"github.com/grafana/grafana-plugin-sdk-go/backend"
"github.com/grafana/grafana-plugin-sdk-go/experimental/apis/data/v0alpha1"
"github.com/grafana/grafana/pkg/services/ngalert/models"
"go.opentelemetry.io/otel/attribute"
"go.opentelemetry.io/otel/codes"
"golang.org/x/sync/errgroup"
@ -157,6 +158,9 @@ func (b *QueryAPIBuilder) execute(ctx context.Context, req parsedRequestInfo) (q
qdr = &backend.QueryDataResponse{}
case 1:
qdr, err = b.handleQuerySingleDatasource(ctx, req.Requests[0])
if alertQueryWithoutExpression(req) {
qdr, err = b.convertQueryWithoutExpression(ctx, req.Requests[0], qdr)
}
default:
qdr, err = b.executeConcurrentQueries(ctx, req.Requests)
}
@ -371,6 +375,35 @@ func (b *QueryAPIBuilder) handleExpressions(ctx context.Context, req parsedReque
return qdr, nil
}
func (b *QueryAPIBuilder) convertQueryWithoutExpression(ctx context.Context, req datasourceRequest,
qdr *backend.QueryDataResponse) (*backend.QueryDataResponse, error) {
if len(req.Request.Queries) == 0 {
return nil, errors.New("no queries to convert")
}
if qdr == nil {
return nil, errors.New("queryDataResponse is nil")
}
allowLongFrames := false
refID := req.Request.Queries[0].RefID
if _, exist := qdr.Responses[refID]; !exist {
return nil, fmt.Errorf("refID '%s' does not exist", refID)
}
frames := qdr.Responses[refID].Frames
_, results, err := b.converter.Convert(ctx, req.PluginId, frames, allowLongFrames)
if err != nil {
results.Error = err
}
qdr = &backend.QueryDataResponse{
Responses: map[string]backend.DataResponse{
refID: {
Frames: results.Values.AsDataFrames(refID),
Error: results.Error,
},
},
}
return qdr, err
}
type responderWrapper struct {
wrapped rest.Responder
onObjectFn func(statusCode int, obj runtime.Object)
@ -400,3 +433,16 @@ func (r responderWrapper) Error(err error) {
r.wrapped.Error(err)
}
// Checks if the request only contains a single query and not expression.
func alertQueryWithoutExpression(req parsedRequestInfo) bool {
if len(req.Requests) != 1 {
return false
}
headers := req.Requests[0].Headers
_, exist := headers[models.FromAlertHeaderName]
if exist && len(req.Requests[0].Request.Queries) == 1 && len(req.Expressions) == 0 {
return true
}
return false
}