IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2024-11-26 10:50:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'alerting' into alerting_notifications

Browse Source
This commit is contained in:
bergquist 2016-06-17 09:55:58 +02:00
commit 90e3d8afda
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/services/alerting/alert_rule.go
View File

@ -61,6 +61,7 @@ func NewAlertRuleFromDBModel(ruleDef *m.Alert) (*AlertRule, error) {
model.Name = ruleDef.Name
model.Description = ruleDef.Description
model.State = ruleDef.State
model.Frequency = ruleDef.Frequency
critical := ruleDef.Settings.Get("critical")
model.Critical = Level{