diff --git a/pkg/models/alerts.go b/pkg/models/alerts.go index 624ff7015ea..bc110d8024f 100644 --- a/pkg/models/alerts.go +++ b/pkg/models/alerts.go @@ -5,17 +5,18 @@ import ( ) type Alert struct { - Id int64 - DashboardId int64 - PanelId int64 - Query string - QueryRefId string - WarnLevel int64 - ErrorLevel int64 - CheckInterval string - Title string - Description string - QueryRange string + Id int64 + DashboardId int64 + PanelId int64 + Query string + QueryRefId string + WarnLevel int64 + ErrorLevel int64 + Interval string + Title string + Description string + QueryRange string + Aggregator string } func (cmd *SaveDashboardCommand) GetAlertModels() *[]Alert { @@ -24,17 +25,18 @@ func (cmd *SaveDashboardCommand) GetAlertModels() *[]Alert { alerts := make([]Alert, 0) alerts = append(alerts, Alert{ - DashboardId: dash.Id, - Id: 1, - PanelId: 1, - Query: "", - QueryRefId: "", - WarnLevel: 0, - ErrorLevel: 0, - CheckInterval: "5s", - Title: dash.Title + " Alert", - Description: dash.Title + " Description", - QueryRange: "10m", + DashboardId: dash.Id, + Id: 1, + PanelId: 1, + Query: "query", + QueryRefId: "query_ref", + WarnLevel: 0, + ErrorLevel: 0, + Interval: "5s", + Title: dash.Title + " Alert", + Description: dash.Title + " Description", + QueryRange: "10m", + Aggregator: "avg", }) return &alerts diff --git a/pkg/services/sqlstore/migrations/alert_mig.go b/pkg/services/sqlstore/migrations/alert_mig.go index 1cf6813ce9b..05476633891 100644 --- a/pkg/services/sqlstore/migrations/alert_mig.go +++ b/pkg/services/sqlstore/migrations/alert_mig.go @@ -15,10 +15,11 @@ func addAlertMigrations(mg *Migrator) { {Name: "query_ref_id", Type: DB_NVarchar, Length: 255, Nullable: false}, {Name: "warn_level", Type: DB_NVarchar, Length: 255, Nullable: false}, {Name: "error_level", Type: DB_NVarchar, Length: 255, Nullable: false}, - {Name: "check_interval", Type: DB_NVarchar, Length: 255, Nullable: false}, + {Name: "interval", Type: DB_NVarchar, Length: 255, Nullable: false}, {Name: "title", Type: DB_NVarchar, Length: 255, Nullable: false}, {Name: "description", Type: DB_NVarchar, Length: 255, Nullable: false}, {Name: "query_range", Type: DB_NVarchar, Length: 255, Nullable: false}, + {Name: "aggregator", Type: DB_NVarchar, Length: 255, Nullable: false}, }, }