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

Merge branch 'multiselect-repeatby-datasource' of https://github.com/jdoupe/grafana into jdoupe-multiselect-repeatby-datasource

Browse Source
This commit is contained in:
Torkel Ödegaard
2019-03-11 14:14:26 +01:00
parent 5f6838abca 3f27d3ea23
commit a8486806aa
3 changed files with 39 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
public/app/features/panel/metrics_panel_ctrl.ts
View File

@@ -79,9 +79,28 @@ class MetricsPanelCtrl extends PanelCtrl {
delete this.error;
this.loading = true;
// set "mydatasource" to whatever the panel has defined
let mydatasource = this.panel.datasource;
let datasourceVarName = '';
// look for data source variables
for (let i = 0; i < this.templateSrv.variables.length; i++) {
const variable = this.templateSrv.variables[i];
if (variable.type !== 'datasource') {
continue;
}
datasourceVarName = variable.name;
}
// if a data source variable was found, use its value
if (datasourceVarName !== '' && this.panel.scopedVars && this.panel.scopedVars[datasourceVarName]) {
mydatasource = this.panel.scopedVars[datasourceVarName].value;
}
// load datasource service
this.datasourceSrv
.get(this.panel.datasource)
.get(mydatasource)
.then(this.updateTimeRange.bind(this))
.then(this.issueQueries.bind(this))
.then(this.handleQueryResult.bind(this))