Skip to content

Commit 7f22b9e

Browse files
bergquistbergquist
committed
tech(alerting): expression -> settings
1 parent bb68888 commit 7f22b9e

File tree

6 files changed

+20
-20
lines changed

6 files changed

+20
-20
lines changed

‎pkg/models/alert.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ type Alert struct {
2020
Created time.Time
2121
Updated time.Time
2222

23-
Expression *simplejson.Json
23+
Settings *simplejson.Json
2424
}
2525

2626
func (alert *Alert) ValidToSave() bool {
@@ -32,9 +32,9 @@ func (this *Alert) ContainsUpdates(other *Alert) bool {
3232
result = result || this.Name != other.Name
3333
result = result || this.Description != other.Description
3434

35-
if this.Expression != nil && other.Expression != nil {
36-
json1, err1 := this.Expression.Encode()
37-
json2, err2 := other.Expression.Encode()
35+
if this.Settings != nil && other.Settings != nil {
36+
json1, err1 := this.Settings.Encode()
37+
json2, err2 := other.Settings.Encode()
3838

3939
if err1 != nil || err2 != nil {
4040
return false

‎pkg/models/alert_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@ func TestAlertingModelTest(t *testing.T) {
1414
json2, _ := simplejson.NewJson([]byte(`{ "field": "value" }`))
1515

1616
rule1 := &Alert{
17-
Expression: json1,
17+
Settings: json1,
1818
Name: "Namn",
1919
Description: "Description",
2020
}
2121

2222
rule2 := &Alert{
23-
Expression: json2,
23+
Settings: json2,
2424
Name: "Namn",
2525
Description: "Description",
2626
}
@@ -32,7 +32,7 @@ func TestAlertingModelTest(t *testing.T) {
3232

3333
Convey("Changing the expression should contain update", func() {
3434
json2, _ := simplejson.NewJson([]byte(`{ "field": "newValue" }`))
35-
rule1.Expression = json2
35+
rule1.Settings = json2
3636
So(rule1.ContainsUpdates(rule2), ShouldBeTrue)
3737
})
3838
})

‎pkg/services/alerting/alert_rule.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -60,28 +60,28 @@ func NewAlertRuleFromDBModel(ruleDef *m.Alert) (*AlertRule, error) {
6060
model.Description = ruleDef.Description
6161
model.State = ruleDef.State
6262

63-
critical := ruleDef.Expression.Get("critical")
63+
critical := ruleDef.Settings.Get("critical")
6464
model.Critical = Level{
6565
Operator: critical.Get("op").MustString(),
6666
Level: critical.Get("level").MustFloat64(),
6767
}
6868

69-
warning := ruleDef.Expression.Get("warn")
69+
warning := ruleDef.Settings.Get("warn")
7070
model.Warning = Level{
7171
Operator: warning.Get("op").MustString(),
7272
Level: warning.Get("level").MustFloat64(),
7373
}
7474

75-
model.Frequency = getTimeDurationStringToSeconds(ruleDef.Expression.Get("frequency").MustString())
76-
model.Transform = ruleDef.Expression.Get("transform").Get("type").MustString()
77-
model.TransformParams = *ruleDef.Expression.Get("transform")
75+
model.Frequency = getTimeDurationStringToSeconds(ruleDef.Settings.Get("frequency").MustString())
76+
model.Transform = ruleDef.Settings.Get("transform").Get("type").MustString()
77+
model.TransformParams = *ruleDef.Settings.Get("transform")
7878

7979
if model.Transform == "aggregation" {
80-
method := ruleDef.Expression.Get("transform").Get("method").MustString()
80+
method := ruleDef.Settings.Get("transform").Get("method").MustString()
8181
model.Transformer = transformers.NewAggregationTransformer(method)
8282
}
8383

84-
query := ruleDef.Expression.Get("query")
84+
query := ruleDef.Settings.Get("query")
8585
model.Query = AlertQuery{
8686
Query: query.Get("query").MustString(),
8787
DatasourceId: query.Get("datasourceId").MustInt64(),

‎pkg/services/alerting/extractor.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ func (e *DashAlertExtractor) GetAlerts() ([]*m.Alert, error) {
100100
}
101101
}
102102

103-
alert.Expression = jsonAlert
103+
alert.Settings = jsonAlert
104104

105105
// validate
106106
_, err := NewAlertRuleFromDBModel(alert)

‎pkg/services/sqlstore/alert_rule_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ func TestAlertingDataAccess(t *testing.T) {
2121
OrgId: testDash.OrgId,
2222
Name: "Alerting title",
2323
Description: "Alerting description",
24-
Expression: simplejson.New(),
24+
Settings: simplejson.New(),
2525
},
2626
}
2727

@@ -102,21 +102,21 @@ func TestAlertingDataAccess(t *testing.T) {
102102
PanelId: 1,
103103
Name: "1",
104104
OrgId: 1,
105-
Expression: simplejson.New(),
105+
Settings: simplejson.New(),
106106
},
107107
{
108108
DashboardId: testDash.Id,
109109
PanelId: 2,
110110
Name: "2",
111111
OrgId: 1,
112-
Expression: simplejson.New(),
112+
Settings: simplejson.New(),
113113
},
114114
{
115115
DashboardId: testDash.Id,
116116
PanelId: 3,
117117
Name: "3",
118118
OrgId: 1,
119-
Expression: simplejson.New(),
119+
Settings: simplejson.New(),
120120
},
121121
}
122122

‎pkg/services/sqlstore/migrations/alert_mig.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ func addAlertMigrations(mg *Migrator) {
1616
{Name: "name", Type: DB_NVarchar, Length: 255, Nullable: false},
1717
{Name: "description", Type: DB_NVarchar, Length: 255, Nullable: false},
1818
{Name: "state", Type: DB_NVarchar, Length: 255, Nullable: false},
19-
{Name: "expression", Type: DB_Text, Nullable: false},
19+
{Name: "settings", Type: DB_Text, Nullable: false},
2020
{Name: "scheduler", Type: DB_BigInt, Nullable: false},
2121
{Name: "enabled", Type: DB_Bool, Nullable: false},
2222
{Name: "created", Type: DB_DateTime, Nullable: false},

0 commit comments

Comments
 (0)