IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-01-09 07:33:42 -06:00
Code Issues Packages Projects Releases Wiki Activity

DataPanel: Added built-in interval variables to scopedVars (#16556)

Browse Source 
For react panels the scopedVars did not contain the built in __interval and __interval_ms
variables.

Fixes #16546
This commit is contained in:
Torkel Ödegaard 2019-04-12 18:07:00 +02:00 committed by GitHub
parent 514f68ea19
commit 6a315bd09d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -132,10 +132,16 @@ export class DataPanel extends Component<Props, State> {
try {
const ds = await this.dataSourceSrv.get(datasource, scopedVars);
// TODO interpolate variables
const minInterval = this.props.minInterval || ds.interval;
const intervalRes = kbn.calculateInterval(timeRange, widthPixels, minInterval);
// make shallow copy of scoped vars,
// and add built in variables interval and interval_ms
const scopedVarsWithInterval = Object.assign({}, scopedVars, {
__interval: { text: intervalRes.interval, value: intervalRes.interval },
__interval_ms: { text: intervalRes.intervalMs.toString(), value: intervalRes.intervalMs },
});
const queryOptions: DataQueryOptions = {
timezone: 'browser',
panelId: panelId,
@ -146,7 +152,7 @@ export class DataPanel extends Component<Props, State> {
intervalMs: intervalRes.intervalMs,
targets: queries,
maxDataPoints: maxDataPoints || widthPixels,
scopedVars: scopedVars || {},
scopedVars: scopedVarsWithInterval,
cacheTimeout: null,
};