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

Added scopedVars argument in datasourceSrv.get in DataPanel

Browse Source
This commit is contained in:
Torkel Ödegaard 2019-03-11 18:36:49 +01:00
parent bf72b26c2c
commit aeb3553491
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
public/app/features/dashboard/dashgrid/DataPanel.tsx
View File

@ -116,7 +116,7 @@ export class DataPanel extends Component<Props, State> {
this.setState({ loading: LoadingState.Loading });
try {
const ds = await this.dataSourceSrv.get(datasource);
const ds = await this.dataSourceSrv.get(datasource, scopedVars);
// TODO interpolate variables
const minInterval = this.props.minInterval || ds.interval;

1
public/app/features/plugins/datasource_srv.ts
View File

@ -26,6 +26,7 @@ export class DatasourceSrv {
return this.get(config.defaultDatasource);
}
// Interpolation here is to support template variable in data source selection
name = this.templateSrv.replace(name, scopedVars, (value, variable) => {
if (Array.isArray(value)) {
return value[0];