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

PanelQueryRunner: add datasource name to queries (#16712)

Browse Source
This commit is contained in:
Ryan McKinley
2019-04-22 19:14:42 -07:00
committed by GitHub
parent db584b3d28
commit ff870e08b2
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
public/app/features/dashboard/state/PanelQueryRunner.ts
View File

@@ -133,6 +133,14 @@ export class PanelQueryRunner {
? (datasource as DataSourceApi) ? (datasource as DataSourceApi)
: await getDatasourceSrv().get(datasource as string, request.scopedVars); : await getDatasourceSrv().get(datasource as string, request.scopedVars);
// Attach the datasource name to each query
request.targets = request.targets.map(query => {
if (!query.datasource) {
query.datasource = ds.name;
}
return query;
});
const lowerIntervalLimit = minInterval ? templateSrv.replace(minInterval, request.scopedVars) : ds.interval; const lowerIntervalLimit = minInterval ? templateSrv.replace(minInterval, request.scopedVars) : ds.interval;
const norm = kbn.calculateInterval(timeRange, widthPixels, lowerIntervalLimit); const norm = kbn.calculateInterval(timeRange, widthPixels, lowerIntervalLimit);