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

tech(alerting): expression -> settings

Browse Source
This commit is contained in:
bergquist
2016-06-13 15:18:19 +02:00
parent bb6888885e
commit 7f22b9eb6e
6 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/services/sqlstore/alert_rule_test.go
View File

@@ -21,7 +21,7 @@ func TestAlertingDataAccess(t *testing.T) {
OrgId: testDash.OrgId,
Name: "Alerting title",
Description: "Alerting description",
Expression: simplejson.New(),
Settings: simplejson.New(),
},
}
@@ -102,21 +102,21 @@ func TestAlertingDataAccess(t *testing.T) {
PanelId: 1,
Name: "1",
OrgId: 1,
Expression: simplejson.New(),
Settings: simplejson.New(),
},
{
DashboardId: testDash.Id,
PanelId: 2,
Name: "2",
OrgId: 1,
Expression: simplejson.New(),
Settings: simplejson.New(),
},
{
DashboardId: testDash.Id,
PanelId: 3,
Name: "3",
OrgId: 1,
Expression: simplejson.New(),
Settings: simplejson.New(),
},
}

2
pkg/services/sqlstore/migrations/alert_mig.go
View File

@@ -16,7 +16,7 @@ func addAlertMigrations(mg *Migrator) {
{Name: "name", Type: DB_NVarchar, Length: 255, Nullable: false},
{Name: "description", Type: DB_NVarchar, Length: 255, Nullable: false},
{Name: "state", Type: DB_NVarchar, Length: 255, Nullable: false},
{Name: "expression", Type: DB_Text, Nullable: false},
{Name: "settings", Type: DB_Text, Nullable: false},
{Name: "scheduler", Type: DB_BigInt, Nullable: false},
{Name: "enabled", Type: DB_Bool, Nullable: false},
{Name: "created", Type: DB_DateTime, Nullable: false},