From 2cf72715fb6e98be18a7b4fef293aa34ed93de85 Mon Sep 17 00:00:00 2001 From: bergquist Date: Mon, 13 Jun 2016 09:33:14 +0200 Subject: [PATCH] test(alerting): fixes broken unit tests --- pkg/services/alerting/alert_rule.go | 4 ++-- pkg/services/alerting/executor_test.go | 17 +++++++++-------- .../alerting/transformers/aggregation.go | 2 +- .../alerting/transformers/transformer.go | 2 +- pkg/services/sqlstore/alert_rule_changes.go | 18 +++++++++--------- 5 files changed, 22 insertions(+), 21 deletions(-) diff --git a/pkg/services/alerting/alert_rule.go b/pkg/services/alerting/alert_rule.go index 26d8fab092a..ab00fe2ecdb 100644 --- a/pkg/services/alerting/alert_rule.go +++ b/pkg/services/alerting/alert_rule.go @@ -23,7 +23,7 @@ type AlertRule struct { Query AlertQuery Transform string TransformParams simplejson.Json - Transformer transformer.Transformer + Transformer transformers.Transformer } func getTimeDurationStringToSeconds(str string) int64 { @@ -56,7 +56,7 @@ func NewAlertRuleFromDBModel(ruleDef *m.Alert) (*AlertRule, error) { if model.Transform == "aggregation" { method := ruleDef.Expression.Get("transform").Get("method").MustString() - model.Transformer = transformer.NewAggregationTransformer(method) + model.Transformer = transformers.NewAggregationTransformer(method) } query := ruleDef.Expression.Get("query") diff --git a/pkg/services/alerting/executor_test.go b/pkg/services/alerting/executor_test.go index 753f5dd244c..fbee38aab53 100644 --- a/pkg/services/alerting/executor_test.go +++ b/pkg/services/alerting/executor_test.go @@ -4,6 +4,7 @@ import ( "testing" "github.com/grafana/grafana/pkg/services/alerting/alertstates" + "github.com/grafana/grafana/pkg/services/alerting/transformers" "github.com/grafana/grafana/pkg/tsdb" . "github.com/smartystreets/goconvey/convey" ) @@ -16,7 +17,7 @@ func TestAlertingExecutor(t *testing.T) { Convey("Show return ok since avg is above 2", func() { rule := &AlertRule{ Critical: Level{Level: 10, Operator: ">"}, - Transformer: &AggregationTransformer{Method: "avg"}, + Transformer: transformers.NewAggregationTransformer("avg"), } timeSeries := []*tsdb.TimeSeries{ @@ -30,7 +31,7 @@ func TestAlertingExecutor(t *testing.T) { Convey("Show return critical since below 2", func() { rule := &AlertRule{ Critical: Level{Level: 10, Operator: "<"}, - Transformer: &AggregationTransformer{Method: "avg"}, + Transformer: transformers.NewAggregationTransformer("avg"), } timeSeries := []*tsdb.TimeSeries{ @@ -44,7 +45,7 @@ func TestAlertingExecutor(t *testing.T) { Convey("Show return critical since sum is above 10", func() { rule := &AlertRule{ Critical: Level{Level: 10, Operator: ">"}, - Transformer: &AggregationTransformer{Method: "sum"}, + Transformer: transformers.NewAggregationTransformer("sum"), } timeSeries := []*tsdb.TimeSeries{ @@ -58,7 +59,7 @@ func TestAlertingExecutor(t *testing.T) { Convey("Show return ok since avg is below 10", func() { rule := &AlertRule{ Critical: Level{Level: 10, Operator: ">"}, - Transformer: &AggregationTransformer{Method: "avg"}, + Transformer: transformers.NewAggregationTransformer("avg"), } timeSeries := []*tsdb.TimeSeries{ @@ -72,7 +73,7 @@ func TestAlertingExecutor(t *testing.T) { Convey("Show return ok since min is below 10", func() { rule := &AlertRule{ Critical: Level{Level: 10, Operator: ">"}, - Transformer: &AggregationTransformer{Method: "avg"}, + Transformer: transformers.NewAggregationTransformer("avg"), } timeSeries := []*tsdb.TimeSeries{ @@ -86,7 +87,7 @@ func TestAlertingExecutor(t *testing.T) { Convey("Show return ok since max is above 10", func() { rule := &AlertRule{ Critical: Level{Level: 10, Operator: ">"}, - Transformer: &AggregationTransformer{Method: "max"}, + Transformer: transformers.NewAggregationTransformer("max"), } timeSeries := []*tsdb.TimeSeries{ @@ -103,7 +104,7 @@ func TestAlertingExecutor(t *testing.T) { Convey("both are ok", func() { rule := &AlertRule{ Critical: Level{Level: 10, Operator: ">"}, - Transformer: &AggregationTransformer{Method: "avg"}, + Transformer: transformers.NewAggregationTransformer("avg"), } timeSeries := []*tsdb.TimeSeries{ @@ -118,7 +119,7 @@ func TestAlertingExecutor(t *testing.T) { Convey("first serie is good, second is critical", func() { rule := &AlertRule{ Critical: Level{Level: 10, Operator: ">"}, - Transformer: &AggregationTransformer{Method: "avg"}, + Transformer: transformers.NewAggregationTransformer("avg"), } timeSeries := []*tsdb.TimeSeries{ diff --git a/pkg/services/alerting/transformers/aggregation.go b/pkg/services/alerting/transformers/aggregation.go index 25d9c5c73f4..b9f77a3ee96 100644 --- a/pkg/services/alerting/transformers/aggregation.go +++ b/pkg/services/alerting/transformers/aggregation.go @@ -1,4 +1,4 @@ -package transformer +package transformers import ( "fmt" diff --git a/pkg/services/alerting/transformers/transformer.go b/pkg/services/alerting/transformers/transformer.go index d5fa9df45c9..bf2af42aeb8 100644 --- a/pkg/services/alerting/transformers/transformer.go +++ b/pkg/services/alerting/transformers/transformer.go @@ -1,4 +1,4 @@ -package transformer +package transformers import "github.com/grafana/grafana/pkg/tsdb" diff --git a/pkg/services/sqlstore/alert_rule_changes.go b/pkg/services/sqlstore/alert_rule_changes.go index cb5fe83cab0..367df796597 100644 --- a/pkg/services/sqlstore/alert_rule_changes.go +++ b/pkg/services/sqlstore/alert_rule_changes.go @@ -18,24 +18,24 @@ func GetAlertRuleChanges(query *m.GetAlertChangesQuery) error { params := make([]interface{}, 0) sql.WriteString(`SELECT - alert_rule_change.id, - alert_rule_change.org_id, - alert_rule_change.alert_id, - alert_rule_change.type, - alert_rule_change.created - FROM alert_rule_change + alert_change.id, + alert_change.org_id, + alert_change.alert_id, + alert_change.type, + alert_change.created + FROM alert_change `) - sql.WriteString(`WHERE alert_rule_change.org_id = ?`) + sql.WriteString(`WHERE alert_change.org_id = ?`) params = append(params, query.OrgId) if query.SinceId != 0 { - sql.WriteString(`AND alert_rule_change.id >= ?`) + sql.WriteString(`AND alert_change.id >= ?`) params = append(params, query.SinceId) } if query.Limit != 0 { - sql.WriteString(` ORDER BY alert_rule_change.id DESC LIMIT ?`) + sql.WriteString(` ORDER BY alert_change.id DESC LIMIT ?`) params = append(params, query.Limit) }