public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'alert_handles' into alert_ui_take2

Browse Source 
Conflicts:
	pkg/services/alerting/commands.go
This commit is contained in:
Torkel Ödegaard
2016-06-13 07:53:13 +02:00
parent 77746f277d e3b281dbac
commit 9216492d55
16 changed files with 434 additions and 269 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/services/alerting/alert_rule.go
+6 -2
View File
@@ -26,6 +26,10 @@ type AlertRule struct {
Transformer transformer.Transformer
}
func getTimeDurationStringToSeconds(str string) int64 {
return 60
}
func NewAlertRuleFromDBModel(ruleDef *m.Alert) (*AlertRule, error) {
model := &AlertRule{}
model.Id = ruleDef.Id
@@ -40,13 +44,13 @@ func NewAlertRuleFromDBModel(ruleDef *m.Alert) (*AlertRule, error) {
Level: critical.Get("level").MustFloat64(),
}
warning := ruleDef.Expression.Get("warning")
warning := ruleDef.Expression.Get("warn")
model.Warning = Level{
Operator: warning.Get("op").MustString(),
Level: warning.Get("level").MustFloat64(),
}
model.Frequency = ruleDef.Expression.Get("frequency").MustInt64()
model.Frequency = getTimeDurationStringToSeconds(ruleDef.Expression.Get("frequency").MustString())
model.Transform = ruleDef.Expression.Get("transform").Get("type").MustString()
model.TransformParams = *ruleDef.Expression.Get("transform")
pkg/services/alerting/commands.go
-56
View File
@@ -1,11 +1,8 @@
package alerting
import (
"fmt"
"github.com/grafana/grafana/pkg/bus"
m "github.com/grafana/grafana/pkg/models"
"github.com/grafana/grafana/pkg/services/alerting/transformers"
)
type UpdateDashboardAlertsCommand struct {
@@ -39,56 +36,3 @@ func updateDashboardAlerts(cmd *UpdateDashboardAlertsCommand) error {
return nil
}
func getTimeDurationStringToSeconds(str string) int64 {
return 60
}
func ConvetAlertModelToAlertRule(ruleDef *m.Alert) (*AlertRule, error) {
model := &AlertRule{}
model.Id = ruleDef.Id
model.OrgId = ruleDef.OrgId
model.Name = ruleDef.Name
model.Description = ruleDef.Description
model.State = ruleDef.State
critical := ruleDef.Expression.Get("critical")
model.Critical = Level{
Operator: critical.Get("op").MustString(),
Level: critical.Get("level").MustFloat64(),
}
warning := ruleDef.Expression.Get("warning")
model.Warning = Level{
Operator: warning.Get("op").MustString(),
Level: warning.Get("level").MustFloat64(),
}
model.Frequency = getTimeDurationStringToSeconds(ruleDef.Expression.Get("frequency").MustString())
model.Transform = ruleDef.Expression.Get("transform").Get("type").MustString()
model.TransformParams = *ruleDef.Expression.Get("transform")
if model.Transform == "aggregation" {
method := ruleDef.Expression.Get("transform").Get("method").MustString()
model.Transformer = transformer.NewAggregationTransformer(method)
}
query := ruleDef.Expression.Get("query")
model.Query = AlertQuery{
Query: query.Get("query").MustString(),
DatasourceId: query.Get("datasourceId").MustInt64(),
From: query.Get("from").MustString(),
To: query.Get("to").MustString(),
Aggregator: query.Get("agg").MustString(),
}
if model.Query.Query == "" {
return nil, fmt.Errorf("missing query.query")
}
if model.Query.DatasourceId == 0 {
return nil, fmt.Errorf("missing query.datasourceId")
}
return model, nil
}
pkg/services/alerting/extractor.go
+2 -5
View File
@@ -57,12 +57,9 @@ func (e *DashAlertExtractor) GetAlerts() ([]*m.Alert, error) {
for _, panelObj := range row.Get("panels").MustArray() {
panel := simplejson.NewFromAny(panelObj)
jsonAlert := panel.Get("alert")
jsonAlert, hasAlert := panel.CheckGet("alert")
// check if marked for deletion
deleted := jsonAlert.Get("deleted").MustBool()
if deleted {
e.log.Info("Deleted alert rule found")
if !hasAlert {
continue
}
pkg/services/alerting/extractor_test.go
+4 -7
View File
@@ -55,7 +55,7 @@ func TestAlertRuleExtraction(t *testing.T) {
"method": "avg",
"type": "aggregation"
},
"warning": {
"warn": {
"level": 10,
"op": ">"
}
@@ -90,7 +90,7 @@ func TestAlertRuleExtraction(t *testing.T) {
"method": "avg",
"name": "aggregation"
},
"warning": {
"warn": {
"level": 10,
"op": ">"
}
@@ -149,10 +149,7 @@ func TestAlertRuleExtraction(t *testing.T) {
],
"title": "Broken influxdb panel",
"transform": "table",
"type": "table",
"alert": {
"deleted": true
}
"type": "table"
}
],
"title": "New row"
@@ -185,7 +182,7 @@ func TestAlertRuleExtraction(t *testing.T) {
return nil
})
alerts, err := extractor.GetRuleModels()
alerts, err := extractor.GetAlerts()
Convey("Get rules without error", func() {
So(err, ShouldBeNil)
pkg/services/alerting/reader.go
+1 -1
View File
@@ -49,7 +49,7 @@ func (arr *AlertRuleReader) Fetch() []*AlertRule {
res := make([]*AlertRule, len(cmd.Result))
for i, ruleDef := range cmd.Result {
model, _ := ConvetAlertModelToAlertRule(ruleDef)
model, _ := NewAlertRuleFromDBModel(ruleDef)
res[i] = model
}
pkg/services/sqlstore/alert_rule_parser_test.go
-55
View File
@@ -1,55 +0,0 @@
package sqlstore
import (
"testing"
"github.com/grafana/grafana/pkg/components/simplejson"
m "github.com/grafana/grafana/pkg/models"
"github.com/grafana/grafana/pkg/services/alerting"
. "github.com/smartystreets/goconvey/convey"
)
func TestAlertRuleModelParsing(t *testing.T) {
Convey("Parsing alertRule from expression", t, func() {
alertRuleDAO := &m.Alert{}
json, _ := simplejson.NewJson([]byte(`
{
"frequency": 10,
"warning": {
"op": ">",
"level": 10
},
"critical": {
"op": ">",
"level": 20
},
"query": {
"refId": "A",
"from": "5m",
"to": "now",
"datasourceId": 1,
"query": "aliasByNode(statsd.fakesite.counters.session_start.*.count, 4)"
},
"transform": {
"type": "aggregation",
"method": "avg"
}
}`))
alertRuleDAO.Name = "Test"
alertRuleDAO.Expression = json
rule, _ := alerting.ConvetAlertModelToAlertRule(alertRuleDAO)
Convey("Confirm that all properties are set", func() {
So(rule.Query.Query, ShouldEqual, "aliasByNode(statsd.fakesite.counters.session_start.*.count, 4)")
So(rule.Query.From, ShouldEqual, "5m")
So(rule.Query.To, ShouldEqual, "now")
So(rule.Query.DatasourceId, ShouldEqual, 1)
So(rule.Warning.Level, ShouldEqual, 10)
So(rule.Warning.Operator, ShouldEqual, ">")
So(rule.Critical.Level, ShouldEqual, 20)
So(rule.Critical.Operator, ShouldEqual, ">")
})
})
}