adds tests for extracting for property

pkg/services/alerting/extractor.go

@@ -2,9 +2,8 @@ package alerting
 
 
 import (
 import (
 	"errors"
 	"errors"
-	"time"
-
 	"fmt"
 	"fmt"
+	"time"
 
 
 	"github.com/grafana/grafana/pkg/bus"
 	"github.com/grafana/grafana/pkg/bus"
 	"github.com/grafana/grafana/pkg/components/simplejson"
 	"github.com/grafana/grafana/pkg/components/simplejson"
@@ -114,10 +113,10 @@ func (e *DashAlertExtractor) getAlertFromPanels(jsonWithPanels *simplejson.Json,
 			return nil, ValidationError{Reason: "Could not parse frequency"}
 			return nil, ValidationError{Reason: "Could not parse frequency"}
 		}
 		}
 
 
-		rawFow := jsonAlert.Get("for").MustString()
+		rawFor := jsonAlert.Get("for").MustString()
 		var forValue time.Duration
 		var forValue time.Duration
-		if rawFow != "" {
-			forValue, err = time.ParseDuration(rawFow)
+		if rawFor != "" {
+			forValue, err = time.ParseDuration(rawFor)
 			if err != nil {
 			if err != nil {
 				return nil, ValidationError{Reason: "Could not parse for"}
 				return nil, ValidationError{Reason: "Could not parse for"}
 			}
 			}

pkg/services/alerting/extractor_test.go

@@ -3,6 +3,7 @@ package alerting
 import (
 import (
 	"io/ioutil"
 	"io/ioutil"
 	"testing"
 	"testing"
+	"time"
 
 
 	"github.com/grafana/grafana/pkg/bus"
 	"github.com/grafana/grafana/pkg/bus"
 	"github.com/grafana/grafana/pkg/components/simplejson"
 	"github.com/grafana/grafana/pkg/components/simplejson"
@@ -46,7 +47,7 @@ func TestAlertRuleExtraction(t *testing.T) {
 			return nil
 			return nil
 		})
 		})
 
 
-		json, err := ioutil.ReadFile("./test-data/graphite-alert.json")
+		json, err := ioutil.ReadFile("./testdata/graphite-alert.json")
 		So(err, ShouldBeNil)
 		So(err, ShouldBeNil)
 
 
 		Convey("Extractor should not modify the original json", func() {
 		Convey("Extractor should not modify the original json", func() {
@@ -118,6 +119,11 @@ func TestAlertRuleExtraction(t *testing.T) {
 					So(alerts[1].PanelId, ShouldEqual, 4)
 					So(alerts[1].PanelId, ShouldEqual, 4)
 				})
 				})
 
 
+				Convey("should extract for param", func() {
+					So(alerts[0].For, ShouldEqual, time.Minute*2)
+					So(alerts[1].For, ShouldEqual, time.Duration(0))
+				})
+
 				Convey("should extract name and desc", func() {
 				Convey("should extract name and desc", func() {
 					So(alerts[0].Name, ShouldEqual, "name1")
 					So(alerts[0].Name, ShouldEqual, "name1")
 					So(alerts[0].Message, ShouldEqual, "desc1")
 					So(alerts[0].Message, ShouldEqual, "desc1")
@@ -140,7 +146,7 @@ func TestAlertRuleExtraction(t *testing.T) {
 		})
 		})
 
 
 		Convey("Panels missing id should return error", func() {
 		Convey("Panels missing id should return error", func() {
-			panelWithoutId, err := ioutil.ReadFile("./test-data/panels-missing-id.json")
+			panelWithoutId, err := ioutil.ReadFile("./testdata/panels-missing-id.json")
 			So(err, ShouldBeNil)
 			So(err, ShouldBeNil)
 
 
 			dashJson, err := simplejson.NewJson(panelWithoutId)
 			dashJson, err := simplejson.NewJson(panelWithoutId)
@@ -156,7 +162,7 @@ func TestAlertRuleExtraction(t *testing.T) {
 		})
 		})
 
 
 		Convey("Panel with id set to zero should return error", func() {
 		Convey("Panel with id set to zero should return error", func() {
-			panelWithIdZero, err := ioutil.ReadFile("./test-data/panel-with-id-0.json")
+			panelWithIdZero, err := ioutil.ReadFile("./testdata/panel-with-id-0.json")
 			So(err, ShouldBeNil)
 			So(err, ShouldBeNil)
 
 
 			dashJson, err := simplejson.NewJson(panelWithIdZero)
 			dashJson, err := simplejson.NewJson(panelWithIdZero)
@@ -172,7 +178,7 @@ func TestAlertRuleExtraction(t *testing.T) {
 		})
 		})
 
 
 		Convey("Parse alerts from dashboard without rows", func() {
 		Convey("Parse alerts from dashboard without rows", func() {
-			json, err := ioutil.ReadFile("./test-data/v5-dashboard.json")
+			json, err := ioutil.ReadFile("./testdata/v5-dashboard.json")
 			So(err, ShouldBeNil)
 			So(err, ShouldBeNil)
 
 
 			dashJson, err := simplejson.NewJson(json)
 			dashJson, err := simplejson.NewJson(json)
@@ -192,7 +198,7 @@ func TestAlertRuleExtraction(t *testing.T) {
 		})
 		})
 
 
 		Convey("Parse and validate dashboard containing influxdb alert", func() {
 		Convey("Parse and validate dashboard containing influxdb alert", func() {
-			json, err := ioutil.ReadFile("./test-data/influxdb-alert.json")
+			json, err := ioutil.ReadFile("./testdata/influxdb-alert.json")
 			So(err, ShouldBeNil)
 			So(err, ShouldBeNil)
 
 
 			dashJson, err := simplejson.NewJson(json)
 			dashJson, err := simplejson.NewJson(json)
@@ -221,7 +227,7 @@ func TestAlertRuleExtraction(t *testing.T) {
 		})
 		})
 
 
 		Convey("Should be able to extract collapsed panels", func() {
 		Convey("Should be able to extract collapsed panels", func() {
-			json, err := ioutil.ReadFile("./test-data/collapsed-panels.json")
+			json, err := ioutil.ReadFile("./testdata/collapsed-panels.json")
 			So(err, ShouldBeNil)
 			So(err, ShouldBeNil)
 
 
 			dashJson, err := simplejson.NewJson(json)
 			dashJson, err := simplejson.NewJson(json)
@@ -242,7 +248,7 @@ func TestAlertRuleExtraction(t *testing.T) {
 		})
 		})
 
 
 		Convey("Parse and validate dashboard without id and containing an alert", func() {
 		Convey("Parse and validate dashboard without id and containing an alert", func() {
-			json, err := ioutil.ReadFile("./test-data/dash-without-id.json")
+			json, err := ioutil.ReadFile("./testdata/dash-without-id.json")
 			So(err, ShouldBeNil)
 			So(err, ShouldBeNil)
 
 
 			dashJSON, err := simplejson.NewJson(json)
 			dashJSON, err := simplejson.NewJson(json)

pkg/services/alerting/test-data/graphite-alert.json → pkg/services/alerting/testdata/graphite-alert.json

@@ -23,6 +23,7 @@
           "message": "desc1",
           "message": "desc1",
           "handler": 1,
           "handler": 1,
           "frequency": "60s",
           "frequency": "60s",
+          "for": "2m",
           "conditions": [
           "conditions": [
           {
           {
             "type": "query",
             "type": "query",