feat(alerting): add migration for create and update

pkg/cmd/grafana-server/main.go

@@ -16,7 +16,7 @@ import (
 	"github.com/grafana/grafana/pkg/login"
 	"github.com/grafana/grafana/pkg/metrics"
 	"github.com/grafana/grafana/pkg/plugins"
-	"github.com/grafana/grafana/pkg/services/alerting"
+	//"github.com/grafana/grafana/pkg/services/alerting"
 	"github.com/grafana/grafana/pkg/services/eventpublisher"
 	"github.com/grafana/grafana/pkg/services/notifications"
 	"github.com/grafana/grafana/pkg/services/search"
@@ -65,7 +65,7 @@ func main() {
 	social.NewOAuthService()
 	eventpublisher.Init()
 	plugins.Init()
-	alerting.Init()
+	//alerting.Init()
 
 	if err := notifications.Init(); err != nil {
 		log.Fatal(3, "Notification service failed to initialize", err)

pkg/models/alerts.go

@@ -7,9 +7,9 @@ import (
 )
 
 type AlertRule struct {
-	Id           int64  `json:"id"`
-	OrgId        int64  `json:"-"`
-	DataSourceId int64  `json:"datasourceId"`
+	Id    int64 `json:"id"`
+	OrgId int64 `json:"-"`
+	//DataSourceId int64  `json:"datasourceId"`
 	DashboardId  int64  `json:"dashboardId"`
 	PanelId      int64  `json:"panelId"`
 	Query        string `json:"query"`
@@ -19,12 +19,12 @@ type AlertRule struct {
 	WarnOperator string `json:"warnOperator"`
 	CritOperator string `json:"critOperator"`
 	Interval     string `json:"interval"`
-	Frequency    int64  `json:"frequency"`
-	Title        string `json:"title"`
-	Description  string `json:"description"`
-	QueryRange   string `json:"queryRange"`
-	Aggregator   string `json:"aggregator"`
-	State        string `json:"state"`
+	//Frequency    int64  `json:"frequency"`
+	Title       string `json:"title"`
+	Description string `json:"description"`
+	QueryRange  string `json:"queryRange"`
+	Aggregator  string `json:"aggregator"`
+	State       string `json:"state"`
 
 	Created time.Time `json:"created"`
 	Updated time.Time `json:"updated"`

pkg/services/sqlstore/alert_rule.go

@@ -21,7 +21,6 @@ func init() {
 func GetAlertById(query *m.GetAlertByIdQuery) error {
 	alert := m.AlertRule{}
 	has, err := x.Id(query.Id).Get(&alert)
-
 	if !has {
 		return fmt.Errorf("could not find alert")
 	}

pkg/services/sqlstore/migrations/alert_mig.go

@@ -22,6 +22,8 @@ func addAlertMigrations(mg *Migrator) {
 			{Name: "query_range", Type: DB_NVarchar, Length: 255, Nullable: false},
 			{Name: "aggregator", Type: DB_NVarchar, Length: 255, Nullable: false},
 			{Name: "state", Type: DB_NVarchar, Length: 255, Nullable: false},
+			{Name: "created", Type: DB_DateTime, Nullable: false},
+			{Name: "updated", Type: DB_DateTime, Nullable: false},
 		},
 	}