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

Align step with interval passed to Prometheus query using rate() (#5839)

Browse Source
This commit is contained in:
Roman Vynar
2016-08-18 09:19:32 +03:00
committed by Torkel Ödegaard
parent 6fae5a3b4e
commit d086f5d398
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
public/app/plugins/datasource/prometheus/datasource.ts
View File

@@ -79,7 +79,7 @@ export function PrometheusDatasource(instanceSettings, $q, backendSrv, templateS
query.expr = templateSrv.replace(target.expr, options.scopedVars, self.interpolateQueryExpr);
query.requestId = options.panelId + target.refId;
var interval = target.interval || options.interval;
var interval = templateSrv.replace(target.interval, options.scopedVars) || options.interval;
var intervalFactor = target.intervalFactor || 1;
target.step = query.step = this.calculateInterval(interval, intervalFactor);
var range = Math.ceil(end - start);

2
public/app/plugins/datasource/prometheus/query_ctrl.ts
View File

@@ -68,7 +68,7 @@ class PrometheusQueryCtrl extends QueryCtrl {
expr: this.templateSrv.replace(this.target.expr, this.panelCtrl.panel.scopedVars, this.datasource.interpolateQueryExpr),
range_input: rangeDiff + 's',
end_input: endTime,
step_input: '',
step_input: this.target.step,
stacked: this.panelCtrl.panel.stack,
tab: 0
};