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

test(alerting): fixes broken unittests

Browse Source
This commit is contained in:
bergquist
2016-06-10 13:47:54 +02:00
parent 3c0b5fe78e
commit ea8fb66f73
14 changed files with 88 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/services/sqlstore/alert_rule.go
+10 -10
View File
@@ -64,7 +64,7 @@ func HeartBeat(query *m.HeartBeatCommand) error {
*/
func GetAlertById(query *m.GetAlertByIdQuery) error {
alert := m.AlertRuleDAO{}
alert := m.AlertRuleModel{}
has, err := x.Id(query.Id).Get(&alert)
if !has {
return fmt.Errorf("could not find alert")
@@ -78,7 +78,7 @@ func GetAlertById(query *m.GetAlertByIdQuery) error {
}
func GetAllAlertQueryHandler(query *m.GetAllAlertsQuery) error {
var alerts []*m.AlertRuleDAO
var alerts []*m.AlertRuleModel
err := x.Sql("select * from alert_rule").Find(&alerts)
if err != nil {
return err
@@ -131,7 +131,7 @@ func HandleAlertsQuery(query *m.GetAlertsQuery) error {
sql.WriteString(")")
}
alerts := make([]*m.AlertRuleDAO, 0)
alerts := make([]*m.AlertRuleModel, 0)
if err := x.Sql(sql.String(), params...).Find(&alerts); err != nil {
return err
}
@@ -141,7 +141,7 @@ func HandleAlertsQuery(query *m.GetAlertsQuery) error {
}
func DeleteAlertDefinition(dashboardId int64, sess *xorm.Session) error {
alerts := make([]*m.AlertRuleDAO, 0)
alerts := make([]*m.AlertRuleModel, 0)
sess.Where("dashboard_id = ?", dashboardId).Find(&alerts)
for _, alert := range alerts {
@@ -172,10 +172,10 @@ func SaveAlerts(cmd *m.SaveAlertsCommand) error {
})
}
func upsertAlerts(alerts []*m.AlertRuleDAO, posted []*m.AlertRuleDAO, sess *xorm.Session) error {
func upsertAlerts(alerts []*m.AlertRuleModel, posted []*m.AlertRuleModel, sess *xorm.Session) error {
for _, alert := range posted {
update := false
var alertToUpdate *m.AlertRuleDAO
var alertToUpdate *m.AlertRuleModel
for _, k := range alerts {
if alert.PanelId == k.PanelId {
@@ -212,7 +212,7 @@ func upsertAlerts(alerts []*m.AlertRuleDAO, posted []*m.AlertRuleDAO, sess *xorm
return nil
}
func deleteMissingAlerts(alerts []*m.AlertRuleDAO, posted []*m.AlertRuleDAO, sess *xorm.Session) error {
func deleteMissingAlerts(alerts []*m.AlertRuleModel, posted []*m.AlertRuleModel, sess *xorm.Session) error {
for _, missingAlert := range alerts {
missing := true
@@ -238,12 +238,12 @@ func deleteMissingAlerts(alerts []*m.AlertRuleDAO, posted []*m.AlertRuleDAO, ses
return nil
}
func GetAlertsByDashboardId2(dashboardId int64, sess *xorm.Session) ([]*m.AlertRuleDAO, error) {
alerts := make([]*m.AlertRuleDAO, 0)
func GetAlertsByDashboardId2(dashboardId int64, sess *xorm.Session) ([]*m.AlertRuleModel, error) {
alerts := make([]*m.AlertRuleModel, 0)
err := sess.Where("dashboard_id = ?", dashboardId).Find(&alerts)
if err != nil {
return []*m.AlertRuleDAO{}, err
return []*m.AlertRuleModel{}, err
}
return alerts, nil
pkg/services/sqlstore/alert_rule_changes.go
+1 -1
View File
@@ -48,7 +48,7 @@ func GetAlertRuleChanges(query *m.GetAlertChangesQuery) error {
return nil
}
func SaveAlertChange(change string, alert *m.AlertRuleDAO, sess *xorm.Session) error {
func SaveAlertChange(change string, alert *m.AlertRuleModel, sess *xorm.Session) error {
_, err := sess.Insert(&m.AlertRuleChange{
OrgId: alert.OrgId,
Type: change,
pkg/services/sqlstore/alert_rule_changes_test.go
+1 -1
View File
@@ -20,7 +20,7 @@ func TestAlertRuleChangesDataAccess(t *testing.T) {
var err error
Convey("When dashboard is removed", func() {
items := []*m.AlertRuleDAO{
items := []*m.AlertRuleModel{
{
PanelId: 1,
DashboardId: testDash.Id,
pkg/services/sqlstore/alert_rule_parser_test.go
+6 -6
View File
@@ -12,7 +12,7 @@ import (
func TestAlertRuleModelParsing(t *testing.T) {
Convey("Parsing alertRule from expression", t, func() {
alertRuleDAO := &m.AlertRuleDAO{}
alertRuleDAO := &m.AlertRuleModel{}
json, _ := simplejson.NewJson([]byte(`
{
"frequency": 10,
@@ -25,27 +25,27 @@ func TestAlertRuleModelParsing(t *testing.T) {
"level": 20
},
"query": {
"queryRefId": "A",
"refId": "A",
"from": "5m",
"to": "now",
"datasourceId": 1,
"query": "aliasByNode(statsd.fakesite.counters.session_start.*.count, 4)"
},
"transform": {
"name": "aggregation",
"type": "aggregation",
"method": "avg"
}`))
}
}`))
alertRuleDAO.Name = "Test"
alertRuleDAO.Expression = json
rule, _ := alerting.ParseAlertRulesFromAlertModel(alertRuleDAO)
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.ValueQuery.Aggregator, ShouldEqual, "avg")
So(rule.Warning.Level, ShouldEqual, 10)
So(rule.Warning.Operator, ShouldEqual, ">")
So(rule.Critical.Level, ShouldEqual, 20)
pkg/services/sqlstore/alert_rule_test.go
+3 -3
View File
@@ -14,7 +14,7 @@ func TestAlertingDataAccess(t *testing.T) {
testDash := insertTestDashboard("dashboard with alerts", 1, "alert")
items := []*m.AlertRuleDAO{
items := []*m.AlertRuleModel{
{
PanelId: 1,
DashboardId: testDash.Id,
@@ -96,7 +96,7 @@ func TestAlertingDataAccess(t *testing.T) {
})
Convey("Multiple alerts per dashboard", func() {
multipleItems := []*m.AlertRuleDAO{
multipleItems := []*m.AlertRuleModel{
{
DashboardId: testDash.Id,
PanelId: 1,
@@ -161,7 +161,7 @@ func TestAlertingDataAccess(t *testing.T) {
})
Convey("When dashboard is removed", func() {
items := []*m.AlertRuleDAO{
items := []*m.AlertRuleModel{
{
PanelId: 1,
DashboardId: testDash.Id,
pkg/services/sqlstore/alert_state.go
+1 -1
View File
@@ -19,7 +19,7 @@ func SetNewAlertState(cmd *m.UpdateAlertStateCommand) error {
return fmt.Errorf("new state is invalid")
}
alert := m.AlertRuleDAO{}
alert := m.AlertRuleModel{}
has, err := sess.Id(cmd.AlertId).Get(&alert)
if !has {
return fmt.Errorf("Could not find alert")
pkg/services/sqlstore/alert_state_test.go
+1 -1
View File
@@ -13,7 +13,7 @@ func TestAlertingStateAccess(t *testing.T) {
testDash := insertTestDashboard("dashboard with alerts", 1, "alert")
items := []*m.AlertRuleDAO{
items := []*m.AlertRuleModel{
{
PanelId: 1,
DashboardId: testDash.Id,
pkg/services/sqlstore/dashboard_parser_test.go
+28 -64
View File
@@ -37,44 +37,26 @@ func TestAlertModelParsing(t *testing.T) {
],
"datasource": null,
"alerting": {
"name": "alert name",
"name": "Alerting Panel Title alert",
"description": "description",
"frequency": 10,
"warning": {
"op": ">",
"level": 10
},
"critical": {
"op": ">",
"level": 20
"level": 20,
"op": ">"
},
"function": "static",
"valueQuery": {
"queryRefId": "A",
"frequency": 10,
"query": {
"from": "5m",
"to": "now",
"agg": "avg",
"params": [
"#A",
"5m",
"now",
"avg"
]
"refId": "A",
"to": "now"
},
"evalQuery": {
"queryRefId": "A",
"from": "5m",
"to": "now",
"agg": "avg",
"params": [
"#A",
"5m",
"now",
"avg"
]
"transform": {
"method": "avg",
"name": "aggregation"
},
"evalStringParam1": "",
"name": "Alerting Panel Title alert"
"warning": {
"level": 10,
"op": ">"
}
}
},
{
@@ -88,44 +70,26 @@ func TestAlertModelParsing(t *testing.T) {
],
"datasource": "graphite2",
"alerting": {
"name": "alert name",
"name": "Alerting Panel Title alert",
"description": "description",
"frequency": 10,
"warning": {
"op": ">",
"level": 10
},
"critical": {
"op": ">",
"level": 20
"level": 20,
"op": ">"
},
"function": "static",
"valueQuery": {
"queryRefId": "A",
"frequency": 10,
"query": {
"from": "5m",
"to": "now",
"agg": "avg",
"params": [
"#A",
"5m",
"now",
"avg"
]
"refId": "A",
"to": "now"
},
"evalQuery": {
"queryRefId": "A",
"from": "5m",
"to": "now",
"agg": "avg",
"params": [
"#A",
"5m",
"now",
"avg"
]
"transform": {
"method": "avg",
"name": "aggregation"
},
"evalStringParam1": "",
"name": "Alerting Panel Title alert"
"warning": {
"level": 10,
"op": ">"
}
}
}
],