IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

feat(alerting): reduce states. Make exeuction result configurable.

Browse Source 
ref #6444
This commit is contained in:
bergquist
2016-11-07 12:42:39 +01:00
parent f0b591b89b
commit 489f087fbd
10 changed files with 181 additions and 158 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/services/alerting/rule.go
View File

@@ -19,7 +19,7 @@ type Rule struct {
Name string
Message string
NoDataState m.NoDataOption
ExecutionErrorState m.NoDataOption
ExecutionErrorState m.ExecutionErrorOption
State m.AlertStateType
Conditions []Condition
Notifications []int64
@@ -78,6 +78,7 @@ func NewRuleFromDBAlert(ruleDef *m.Alert) (*Rule, error) {
model.Frequency = ruleDef.Frequency
model.State = ruleDef.State
model.NoDataState = m.NoDataOption(ruleDef.Settings.Get("noDataState").MustString("no_data"))
model.ExecutionErrorState = m.ExecutionErrorOption(ruleDef.Settings.Get("executionErrorState").MustString("alerting"))
for _, v := range ruleDef.Settings.Get("notifications").MustArray() {
jsonModel := simplejson.NewFromAny(v)