From b856d7e193bd627f7f7c62dbb4e2d08d155ec196 Mon Sep 17 00:00:00 2001
From: bergquist <carl.bergquist@gmail.com>
Date: Wed, 21 Sep 2016 13:55:42 +0200
Subject: [PATCH] fix(prometheus): remove timerange from context

---
 pkg/services/alerting/conditions/query.go | 8 ++++----
 pkg/services/alerting/eval_context.go     | 2 --
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/pkg/services/alerting/conditions/query.go b/pkg/services/alerting/conditions/query.go
index aea4fdebd7b..15db31838b0 100644
--- a/pkg/services/alerting/conditions/query.go
+++ b/pkg/services/alerting/conditions/query.go
@@ -34,8 +34,8 @@ type AlertQuery struct {
 }
 
 func (c *QueryCondition) Eval(context *alerting.EvalContext) {
-	context.TimeRange = tsdb.NewTimerange(c.Query.From, c.Query.To)
-	seriesList, err := c.executeQuery(context)
+	timerange := tsdb.NewTimerange(c.Query.From, c.Query.To)
+	seriesList, err := c.executeQuery(context, timerange)
 	if err != nil {
 		context.Error = err
 		return
@@ -69,7 +69,7 @@ func (c *QueryCondition) Eval(context *alerting.EvalContext) {
 	context.Firing = len(context.EvalMatches) > 0
 }
 
-func (c *QueryCondition) executeQuery(context *alerting.EvalContext) (tsdb.TimeSeriesSlice, error) {
+func (c *QueryCondition) executeQuery(context *alerting.EvalContext, timerange tsdb.TimeRange) (tsdb.TimeSeriesSlice, error) {
 	getDsInfo := &m.GetDataSourceByIdQuery{
 		Id:    c.Query.DatasourceId,
 		OrgId: context.Rule.OrgId,
@@ -79,7 +79,7 @@ func (c *QueryCondition) executeQuery(context *alerting.EvalContext) (tsdb.TimeS
 		return nil, fmt.Errorf("Could not find datasource")
 	}
 
-	req := c.getRequestForAlertRule(getDsInfo.Result, context.TimeRange)
+	req := c.getRequestForAlertRule(getDsInfo.Result, timerange)
 	result := make(tsdb.TimeSeriesSlice, 0)
 
 	resp, err := c.HandleRequest(req)
diff --git a/pkg/services/alerting/eval_context.go b/pkg/services/alerting/eval_context.go
index aa1442a0ca3..13067c25f08 100644
--- a/pkg/services/alerting/eval_context.go
+++ b/pkg/services/alerting/eval_context.go
@@ -8,7 +8,6 @@ import (
 	"github.com/grafana/grafana/pkg/log"
 	m "github.com/grafana/grafana/pkg/models"
 	"github.com/grafana/grafana/pkg/setting"
-	"github.com/grafana/grafana/pkg/tsdb"
 )
 
 type EvalContext struct {
@@ -29,7 +28,6 @@ type EvalContext struct {
 	ImageOnDiskPath string
 	NoDataFound     bool
 	RetryCount      int
-	TimeRange       tsdb.TimeRange
 }
 
 type StateDescription struct {