|
|
@ -24,12 +24,14 @@ export class GrafanaDatasource extends DataSourceApi<GrafanaQuery> { |
|
|
|
|
|
|
|
|
|
|
|
query(request: DataQueryRequest<GrafanaQuery>): Observable<DataQueryResponse> { |
|
|
|
query(request: DataQueryRequest<GrafanaQuery>): Observable<DataQueryResponse> { |
|
|
|
const queries: Array<Observable<DataQueryResponse>> = []; |
|
|
|
const queries: Array<Observable<DataQueryResponse>> = []; |
|
|
|
|
|
|
|
const templateSrv = getTemplateSrv(); |
|
|
|
for (const target of request.targets) { |
|
|
|
for (const target of request.targets) { |
|
|
|
if (target.hide) { |
|
|
|
if (target.hide) { |
|
|
|
continue; |
|
|
|
continue; |
|
|
|
} |
|
|
|
} |
|
|
|
if (target.queryType === GrafanaQueryType.LiveMeasurements) { |
|
|
|
if (target.queryType === GrafanaQueryType.LiveMeasurements) { |
|
|
|
let { channel, filter } = target; |
|
|
|
let channel = templateSrv.replace(target.channel, request.scopedVars); |
|
|
|
|
|
|
|
const { filter } = target; |
|
|
|
|
|
|
|
|
|
|
|
// Help migrate pre-release channel paths saved in dashboards
|
|
|
|
// Help migrate pre-release channel paths saved in dashboards
|
|
|
|
// NOTE: this should be removed before V8 is released
|
|
|
|
// NOTE: this should be removed before V8 is released
|
|
|
|