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

ds-querier: account for -100 meaning __expr__ (#96565)

Browse Source 
* ds-querier: account for -100 meaning __expr__

* temp debug log error parsing query

* var confusion

* log error
This commit is contained in:
Adam Simpson
2024-11-20 10:28:31 -05:00
committed by GitHub
parent 51dec6317f
commit c010bf2dc7
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/registry/apis/query/parser.go
+1 -1
View File
@@ -208,7 +208,7 @@ func (p *queryParser) getValidDataSourceRef(ctx context.Context, ds *data.DataSo
if ds.UID == "" { if ds.UID == "" {
return nil, fmt.Errorf("missing name/uid in data source reference") return nil, fmt.Errorf("missing name/uid in data source reference")
} }
if ds.UID == expr.DatasourceType { if expr.IsDataSource(ds.UID) {
return ds, nil return ds, nil
} }
if p.legacy == nil { if p.legacy == nil {
pkg/registry/apis/query/query.go
+2
View File
@@ -147,6 +147,8 @@ func (r *queryREST) Connect(connectCtx context.Context, name string, _ runtime.O
}, },
} }
b.log.Error("Error parsing query", "refId", refID, "message", message)
responder.Object(statusCode, qdr) responder.Object(statusCode, qdr)
return return
} }