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): make sure saved alerts are valid

Browse Source
This commit is contained in:
bergquist 2016-06-09 10:27:23 +02:00
parent a1f97e0b77
commit 544073b7e1
3 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/models/alerts.go
View File

@ -27,6 +27,10 @@ type AlertRule struct {
Updated time.Time `json:"updated"` Updated time.Time `json:"updated"`
} }
func (alertRule *AlertRule) ValidToSave() bool {
return alertRule.Query != "" && alertRule.Frequency != 0 && alertRule.QueryRange != 0 && alertRule.Name != ""
}
func (this *AlertRule) Equals(other *AlertRule) bool { func (this *AlertRule) Equals(other *AlertRule) bool {
result := false result := false

2
pkg/services/alerting/dashboard_parser.go
View File

@ -65,7 +65,7 @@ func ParseAlertsFromDashboard(cmd *m.SaveDashboardCommand) []*m.AlertRule {
alert.DatasourceId = query.Result.Id alert.DatasourceId = query.Result.Id
} }
if alert.Query != "" { if alert.ValidToSave() {
alerts = append(alerts, alert) alerts = append(alerts, alert)
} }
} }

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

@ -64,6 +64,7 @@ func (arr *AlertRuleReader) Fetch() []*AlertRule {
model.Description = ruleDef.Description model.Description = ruleDef.Description
model.Aggregator = ruleDef.Aggregator model.Aggregator = ruleDef.Aggregator
model.State = ruleDef.State model.State = ruleDef.State
model.QueryRange = ruleDef.QueryRange
res[i] = model res[i] = model
} }