IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Influx/flux: include interpolated query with error (#25665)

Browse Source 
with execution errors, return a Frame that has Meta.ExecutedQueryString.
This commit is contained in:
Kyle Brandt 2020-06-18 07:45:55 -04:00 committed by GitHub
parent e2ba0731e2
commit 36fd746c5d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/tsdb/influxdb/flux/executor.go
View File

@ -25,6 +25,11 @@ func ExecuteQuery(ctx context.Context, query QueryModel, runner queryRunner, max
tables, err := runner.runQuery(ctx, flux) tables, err := runner.runQuery(ctx, flux)
if err != nil { if err != nil {
dr.Error = err dr.Error = err
metaFrame := data.NewFrame("meta for error")
metaFrame.Meta = &data.FrameMeta{
ExecutedQueryString: flux,
}
dr.Frames = append(dr.Frames, metaFrame)
return return
} }

3
pkg/tsdb/influxdb/flux/flux.go
View File

@ -90,10 +90,7 @@ func RunnerFromDataSource(dsInfo *models.DataSource) (*Runner, error) {
func backendDataResponseToTSDBResponse(dr *backend.DataResponse, refID string) *tsdb.QueryResult { func backendDataResponseToTSDBResponse(dr *backend.DataResponse, refID string) *tsdb.QueryResult {
qr := &tsdb.QueryResult{RefId: refID} qr := &tsdb.QueryResult{RefId: refID}
if dr.Error != nil {
qr.Error = dr.Error qr.Error = dr.Error
return qr
}
if dr.Frames != nil { if dr.Frames != nil {
qr.Dataframes = tsdb.NewDecodedDataFrames(dr.Frames) qr.Dataframes = tsdb.NewDecodedDataFrames(dr.Frames)

2
public/app/plugins/datasource/influxdb/datasource.ts
View File

@ -66,7 +66,7 @@ export default class InfluxDatasource extends DataSourceWithBackend<InfluxQuery,
} }
} }
// Proces flux queries (data frame request) // Process flux queries (data frame request)
if (hasFlux) { if (hasFlux) {
if (!this.enableFlux) { if (!this.enableFlux) {
throw 'Flux not enabled for this datasource'; throw 'Flux not enabled for this datasource';