adding updated column

pkg/services/sqlstore/annotation.go

@@ -15,10 +15,14 @@ type SqlAnnotationRepo struct {
 }
 
 func (r *SqlAnnotationRepo) Save(item *annotations.Item) error {
+	if item.DashboardId == 0 {
+		return errors.New("Annotation is missing dashboard_id")
+	}
 	return inTransaction(func(sess *DBSession) error {
 		tags := models.ParseTagPairs(item.Tags)
 		item.Tags = models.JoinTagPairs(tags)
 		item.Created = time.Now().UnixNano() / int64(time.Millisecond)
+		item.Updated = item.Created
 		if _, err := sess.Table("annotation").Insert(item); err != nil {
 			return err
 		}
@@ -66,6 +70,7 @@ func (r *SqlAnnotationRepo) Update(item *annotations.Item) error {
 			err     error
 		)
 		existing := new(annotations.Item)
+		item.Updated = time.Now().UnixNano() / int64(time.Millisecond)
 
 		if item.Id == 0 && item.RegionId != 0 {
 			// Update region end time
@@ -130,6 +135,7 @@ func (r *SqlAnnotationRepo) Find(query *annotations.ItemQuery) ([]*annotations.I
 			annotation.tags,
 			annotation.data,
 			annotation.created,
+			annotation.updated,
 			usr.email,
 			usr.login,
 			alert.name as alert_name
@@ -167,6 +173,11 @@ func (r *SqlAnnotationRepo) Find(query *annotations.ItemQuery) ([]*annotations.I
 		params = append(params, query.PanelId)
 	}
 
+	if query.UserId != 0 {
+		sql.WriteString(` AND annotation.user_id = ?`)
+		params = append(params, query.UserId)
+	}
+
 	if query.From > 0 && query.To > 0 {
 		sql.WriteString(` AND annotation.epoch BETWEEN ? AND ?`)
 		params = append(params, query.From, query.To)
@@ -175,6 +186,9 @@ func (r *SqlAnnotationRepo) Find(query *annotations.ItemQuery) ([]*annotations.I
 	if query.Type == "alert" {
 		sql.WriteString(` AND annotation.alert_id > 0`)
 	}
+	if query.Type == "annotation" {
+		sql.WriteString(` AND annotation.alert_id = 0`)
+	}
 
 	if len(query.Tags) > 0 {
 		keyValueFilters := []string{}
@@ -208,17 +222,7 @@ func (r *SqlAnnotationRepo) Find(query *annotations.ItemQuery) ([]*annotations.I
 		query.Limit = 10
 	}
 
-	var sort string = "epoch DESC"
-	switch query.Sort {
-	case "time.asc":
-		sort = "epoch ASC"
-	case "created":
-		sort = "annotation.created DESC"
-	case "created.asc":
-		sort = "annotation.created ASC"
-	}
-
-	sql.WriteString(fmt.Sprintf(" ORDER BY %s LIMIT %v", sort, query.Limit))
+	sql.WriteString(fmt.Sprintf(" ORDER BY epoch DESC LIMIT %v", query.Limit))
 
 	items := make([]*annotations.ItemDTO, 0)
 

pkg/services/sqlstore/migrations/annotation_mig.go

@@ -92,12 +92,18 @@ func addAnnotationMig(mg *Migrator) {
 		Mysql(updateTextFieldSql))
 
 	//
-	// Add a 'created' column
+	// Add a 'created' & 'updated' column
 	//
 	mg.AddMigration("Add created time to annotation table", NewAddColumnMigration(table, &Column{
 		Name: "created", Type: DB_BigInt, Nullable: true, Default: "0",
 	}))
+	mg.AddMigration("Add updated time to annotation table", NewAddColumnMigration(table, &Column{
+		Name: "updated", Type: DB_BigInt, Nullable: true, Default: "0",
+	}))
 	mg.AddMigration("Add index for created in annotation table", NewAddIndexMigration(table, &Index{
 		Cols: []string{"org_id", "created"}, Type: IndexType,
 	}))
+	mg.AddMigration("Add index for updated in annotation table", NewAddIndexMigration(table, &Index{
+		Cols: []string{"org_id", "updated"}, Type: IndexType,
+	}))
 }