From d086f5d398442c1740ddd91e31fc0da70c9fff2c Mon Sep 17 00:00:00 2001
From: Roman Vynar <roman.vynar@percona.com>
Date: Thu, 18 Aug 2016 09:19:32 +0300
Subject: [PATCH] Align step with interval passed to Prometheus query using
 rate() (#5839)

---
 public/app/plugins/datasource/prometheus/datasource.ts | 2 +-
 public/app/plugins/datasource/prometheus/query_ctrl.ts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/public/app/plugins/datasource/prometheus/datasource.ts b/public/app/plugins/datasource/prometheus/datasource.ts
index cbde594b6b1..89828d14d33 100644
--- a/public/app/plugins/datasource/prometheus/datasource.ts
+++ b/public/app/plugins/datasource/prometheus/datasource.ts
@@ -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);
diff --git a/public/app/plugins/datasource/prometheus/query_ctrl.ts b/public/app/plugins/datasource/prometheus/query_ctrl.ts
index 92cec328d87..c6bbe03a8d7 100644
--- a/public/app/plugins/datasource/prometheus/query_ctrl.ts
+++ b/public/app/plugins/datasource/prometheus/query_ctrl.ts
@@ -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
     };