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

feat(alerting): requests looks to be working again

Browse Source
This commit is contained in:
Torkel Ödegaard
2016-06-06 17:11:46 +02:00
parent d1acfb4494
commit 34e17f7282
33 changed files with 471 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/services/sqlstore/alert_rule_changes_test.go
+1 -1
View File
@@ -31,7 +31,7 @@ func TestAlertRuleChangesDataAccess(t *testing.T) {
WarnOperator: ">",
CritOperator: ">",
Frequency: 10,
Title: "Alerting title",
Name: "Alerting title",
Description: "Alerting description",
QueryRange: 3600,
Aggregator: "avg",
pkg/services/sqlstore/alert_rule_test.go
+3 -3
View File
@@ -26,7 +26,7 @@ func TestAlertingDataAccess(t *testing.T) {
WarnOperator: ">",
CritOperator: ">",
Frequency: 10,
Title: "Alerting title",
Name: "Alerting title",
Description: "Alerting description",
QueryRange: 3600,
Aggregator: "avg",
@@ -65,7 +65,7 @@ func TestAlertingDataAccess(t *testing.T) {
So(alert.CritOperator, ShouldEqual, ">")
So(alert.Query, ShouldEqual, "Query")
So(alert.QueryRefId, ShouldEqual, "A")
So(alert.Title, ShouldEqual, "Alerting title")
So(alert.Name, ShouldEqual, "Alerting title")
So(alert.Description, ShouldEqual, "Alerting description")
So(alert.QueryRange, ShouldEqual, 3600)
So(alert.Aggregator, ShouldEqual, "avg")
@@ -189,7 +189,7 @@ func TestAlertingDataAccess(t *testing.T) {
WarnOperator: ">",
CritOperator: ">",
Frequency: 10,
Title: "Alerting title",
Name: "Alerting title",
Description: "Alerting description",
QueryRange: 3600,
Aggregator: "avg",
pkg/services/sqlstore/alert_state_test.go
+1 -1
View File
@@ -25,7 +25,7 @@ func TestAlertingStateAccess(t *testing.T) {
WarnOperator: ">",
CritOperator: ">",
Frequency: 10,
Title: "Alerting title",
Name: "Alerting title",
Description: "Alerting description",
QueryRange: 3600,
Aggregator: "avg",
pkg/services/sqlstore/dashboard_parser_test.go
+2 -2
View File
@@ -110,7 +110,7 @@ func TestAlertModel(t *testing.T) {
"aggregator": "sum",
"queryRange": "10m",
"frequency": 10,
"title": "active desktop users",
"name": "active desktop users",
"description": "restart webservers"
},
"links": []
@@ -386,7 +386,7 @@ func TestAlertModel(t *testing.T) {
So(v.Query, ShouldNotBeEmpty)
So(v.QueryRefId, ShouldNotBeEmpty)
So(v.QueryRange, ShouldNotBeEmpty)
So(v.Title, ShouldNotBeEmpty)
So(v.Name, ShouldNotBeEmpty)
So(v.Description, ShouldNotBeEmpty)
}
pkg/services/sqlstore/datasource.go
+8 -4
View File
@@ -19,22 +19,26 @@ func init() {
}
func GetDataSourceById(query *m.GetDataSourceByIdQuery) error {
sess := x.Limit(100, 0).Where("org_id=? AND id=?", query.OrgId, query.Id)
has, err := sess.Get(&query.Result)
datasource := m.DataSource{OrgId: query.OrgId, Id: query.Id}
has, err := x.Get(&datasource)
if !has {
return m.ErrDataSourceNotFound
}
query.Result = &datasource
return err
}
func GetDataSourceByName(query *m.GetDataSourceByNameQuery) error {
sess := x.Limit(100, 0).Where("org_id=? AND name=?", query.OrgId, query.Name)
has, err := sess.Get(&query.Result)
datasource := m.DataSource{OrgId: query.OrgId, Name: query.Name}
has, err := x.Get(&datasource)
if !has {
return m.ErrDataSourceNotFound
}
query.Result = &datasource
return err
}
pkg/services/sqlstore/migrations/alert_mig.go
+2 -2
View File
@@ -21,7 +21,7 @@ func addAlertMigrations(mg *Migrator) {
{Name: "crit_level", Type: DB_Float, Nullable: false},
{Name: "crit_operator", Type: DB_NVarchar, Length: 10, Nullable: false},
{Name: "frequency", Type: DB_BigInt, Nullable: false},
{Name: "title", Type: DB_NVarchar, Length: 255, Nullable: false},
{Name: "name", Type: DB_NVarchar, Length: 255, Nullable: false},
{Name: "description", Type: DB_NVarchar, Length: 255, Nullable: false},
{Name: "query_range", Type: DB_Int, Nullable: false},
{Name: "aggregator", Type: DB_NVarchar, Length: 255, Nullable: false},
@@ -32,7 +32,7 @@ func addAlertMigrations(mg *Migrator) {
}
// create table
mg.AddMigration("create alert_rule table v1", NewAddTableMigration(alertV1))
mg.AddMigration("create alert_rule table v2", NewAddTableMigration(alertV1))
alert_changes := Table{
Name: "alert_rule_change",