Skip to content

Commit 2cf7271

Browse files
bergquistbergquist
committed
test(alerting): fixes broken unit tests
1 parent d52fc8d commit 2cf7271

File tree

5 files changed

+22
-21
lines changed

5 files changed

+22
-21
lines changed

‎pkg/services/alerting/alert_rule.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ type AlertRule struct {
2323
Query AlertQuery
2424
Transform string
2525
TransformParams simplejson.Json
26-
Transformer transformer.Transformer
26+
Transformer transformers.Transformer
2727
}
2828

2929
func getTimeDurationStringToSeconds(str string) int64 {
@@ -56,7 +56,7 @@ func NewAlertRuleFromDBModel(ruleDef *m.Alert) (*AlertRule, error) {
5656

5757
if model.Transform == "aggregation" {
5858
method := ruleDef.Expression.Get("transform").Get("method").MustString()
59-
model.Transformer = transformer.NewAggregationTransformer(method)
59+
model.Transformer = transformers.NewAggregationTransformer(method)
6060
}
6161

6262
query := ruleDef.Expression.Get("query")

‎pkg/services/alerting/executor_test.go

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import (
44
"testing"
55

66
"github.com/grafana/grafana/pkg/services/alerting/alertstates"
7+
"github.com/grafana/grafana/pkg/services/alerting/transformers"
78
"github.com/grafana/grafana/pkg/tsdb"
89
. "github.com/smartystreets/goconvey/convey"
910
)
@@ -16,7 +17,7 @@ func TestAlertingExecutor(t *testing.T) {
1617
Convey("Show return ok since avg is above 2", func() {
1718
rule := &AlertRule{
1819
Critical: Level{Level: 10, Operator: ">"},
19-
Transformer: &AggregationTransformer{Method: "avg"},
20+
Transformer: transformers.NewAggregationTransformer("avg"),
2021
}
2122

2223
timeSeries := []*tsdb.TimeSeries{
@@ -30,7 +31,7 @@ func TestAlertingExecutor(t *testing.T) {
3031
Convey("Show return critical since below 2", func() {
3132
rule := &AlertRule{
3233
Critical: Level{Level: 10, Operator: "<"},
33-
Transformer: &AggregationTransformer{Method: "avg"},
34+
Transformer: transformers.NewAggregationTransformer("avg"),
3435
}
3536

3637
timeSeries := []*tsdb.TimeSeries{
@@ -44,7 +45,7 @@ func TestAlertingExecutor(t *testing.T) {
4445
Convey("Show return critical since sum is above 10", func() {
4546
rule := &AlertRule{
4647
Critical: Level{Level: 10, Operator: ">"},
47-
Transformer: &AggregationTransformer{Method: "sum"},
48+
Transformer: transformers.NewAggregationTransformer("sum"),
4849
}
4950

5051
timeSeries := []*tsdb.TimeSeries{
@@ -58,7 +59,7 @@ func TestAlertingExecutor(t *testing.T) {
5859
Convey("Show return ok since avg is below 10", func() {
5960
rule := &AlertRule{
6061
Critical: Level{Level: 10, Operator: ">"},
61-
Transformer: &AggregationTransformer{Method: "avg"},
62+
Transformer: transformers.NewAggregationTransformer("avg"),
6263
}
6364

6465
timeSeries := []*tsdb.TimeSeries{
@@ -72,7 +73,7 @@ func TestAlertingExecutor(t *testing.T) {
7273
Convey("Show return ok since min is below 10", func() {
7374
rule := &AlertRule{
7475
Critical: Level{Level: 10, Operator: ">"},
75-
Transformer: &AggregationTransformer{Method: "avg"},
76+
Transformer: transformers.NewAggregationTransformer("avg"),
7677
}
7778

7879
timeSeries := []*tsdb.TimeSeries{
@@ -86,7 +87,7 @@ func TestAlertingExecutor(t *testing.T) {
8687
Convey("Show return ok since max is above 10", func() {
8788
rule := &AlertRule{
8889
Critical: Level{Level: 10, Operator: ">"},
89-
Transformer: &AggregationTransformer{Method: "max"},
90+
Transformer: transformers.NewAggregationTransformer("max"),
9091
}
9192

9293
timeSeries := []*tsdb.TimeSeries{
@@ -103,7 +104,7 @@ func TestAlertingExecutor(t *testing.T) {
103104
Convey("both are ok", func() {
104105
rule := &AlertRule{
105106
Critical: Level{Level: 10, Operator: ">"},
106-
Transformer: &AggregationTransformer{Method: "avg"},
107+
Transformer: transformers.NewAggregationTransformer("avg"),
107108
}
108109

109110
timeSeries := []*tsdb.TimeSeries{
@@ -118,7 +119,7 @@ func TestAlertingExecutor(t *testing.T) {
118119
Convey("first serie is good, second is critical", func() {
119120
rule := &AlertRule{
120121
Critical: Level{Level: 10, Operator: ">"},
121-
Transformer: &AggregationTransformer{Method: "avg"},
122+
Transformer: transformers.NewAggregationTransformer("avg"),
122123
}
123124

124125
timeSeries := []*tsdb.TimeSeries{

‎pkg/services/alerting/transformers/aggregation.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package transformer
1+
package transformers
22

33
import (
44
"fmt"

‎pkg/services/alerting/transformers/transformer.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package transformer
1+
package transformers
22

33
import "github.com/grafana/grafana/pkg/tsdb"
44

‎pkg/services/sqlstore/alert_rule_changes.go

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,24 +18,24 @@ func GetAlertRuleChanges(query *m.GetAlertChangesQuery) error {
1818
params := make([]interface{}, 0)
1919

2020
sql.WriteString(`SELECT
21-
alert_rule_change.id,
22-
alert_rule_change.org_id,
23-
alert_rule_change.alert_id,
24-
alert_rule_change.type,
25-
alert_rule_change.created
26-
FROM alert_rule_change
21+
alert_change.id,
22+
alert_change.org_id,
23+
alert_change.alert_id,
24+
alert_change.type,
25+
alert_change.created
26+
FROM alert_change
2727
`)
2828

29-
sql.WriteString(`WHERE alert_rule_change.org_id = ?`)
29+
sql.WriteString(`WHERE alert_change.org_id = ?`)
3030
params = append(params, query.OrgId)
3131

3232
if query.SinceId != 0 {
33-
sql.WriteString(`AND alert_rule_change.id >= ?`)
33+
sql.WriteString(`AND alert_change.id >= ?`)
3434
params = append(params, query.SinceId)
3535
}
3636

3737
if query.Limit != 0 {
38-
sql.WriteString(` ORDER BY alert_rule_change.id DESC LIMIT ?`)
38+
sql.WriteString(` ORDER BY alert_change.id DESC LIMIT ?`)
3939
params = append(params, query.Limit)
4040
}
4141

0 commit comments

Comments
 (0)