Merge branch 'master' into develop

pkg/models/dashboards.go

@@ -11,12 +11,14 @@ import (
 
 // Typed errors
 var (
-	ErrDashboardNotFound               = errors.New("Dashboard not found")
-	ErrDashboardSnapshotNotFound       = errors.New("Dashboard snapshot not found")
-	ErrDashboardWithSameNameExists     = errors.New("A dashboard with the same name already exists")
-	ErrDashboardVersionMismatch        = errors.New("The dashboard has been changed by someone else")
-	ErrDashboardTitleEmpty             = errors.New("Dashboard title cannot be empty")
-	ErrDashboardFolderCannotHaveParent = errors.New("A Dashboard Folder cannot be added to another folder")
+	ErrDashboardNotFound                 = errors.New("Dashboard not found")
+	ErrDashboardSnapshotNotFound         = errors.New("Dashboard snapshot not found")
+	ErrDashboardWithSameNameExists       = errors.New("A dashboard with the same name already exists")
+	ErrDashboardVersionMismatch          = errors.New("The dashboard has been changed by someone else")
+	ErrDashboardTitleEmpty               = errors.New("Dashboard title cannot be empty")
+	ErrDashboardFolderCannotHaveParent   = errors.New("A Dashboard Folder cannot be added to another folder")
+	ErrDashboardContainsInvalidAlertData = errors.New("Invalid alert data. Cannot save dashboard")
+	ErrDashboardFailedToUpdateAlertData  = errors.New("Failed to save alert data")
 )
 
 type UpdatePluginDashboardError struct {
@@ -156,6 +158,8 @@ type SaveDashboardCommand struct {
 	FolderId     int64            `json:"folderId"`
 	IsFolder     bool             `json:"isFolder"`
 
+	UpdatedAt time.Time
+
 	Result *Dashboard
 }
 

pkg/models/server.go

@@ -1,6 +0,0 @@
-package models
-
-type GrafanaServer interface {
-	Start()
-	Shutdown(code int, reason string)
-}