enable partial tag matches for annotations

pkg/api/annotations.go

@@ -14,16 +14,17 @@ import (
 func GetAnnotations(c *m.ReqContext) Response {
 
 	query := &annotations.ItemQuery{
-		From:        c.QueryInt64("from"),
-		To:          c.QueryInt64("to"),
-		OrgId:       c.OrgId,
-		UserId:      c.QueryInt64("userId"),
-		AlertId:     c.QueryInt64("alertId"),
-		DashboardId: c.QueryInt64("dashboardId"),
-		PanelId:     c.QueryInt64("panelId"),
-		Limit:       c.QueryInt64("limit"),
-		Tags:        c.QueryStrings("tags"),
-		Type:        c.Query("type"),
+		From:         c.QueryInt64("from"),
+		To:           c.QueryInt64("to"),
+		OrgId:        c.OrgId,
+		UserId:       c.QueryInt64("userId"),
+		AlertId:      c.QueryInt64("alertId"),
+		DashboardId:  c.QueryInt64("dashboardId"),
+		PanelId:      c.QueryInt64("panelId"),
+		Limit:        c.QueryInt64("limit"),
+		Tags:         c.QueryStrings("tags"),
+		Type:         c.Query("type"),
+		PartialMatch: c.QueryBool("partialMatch"),
 	}
 
 	repo := annotations.GetRepository()

pkg/services/annotations/annotations.go

@@ -21,6 +21,7 @@ type ItemQuery struct {
 	RegionId     int64    `json:"regionId"`
 	Tags         []string `json:"tags"`
 	Type         string   `json:"type"`
+	PartialMatch bool     `json:"partialMatch"`
 
 	Limit int64 `json:"limit"`
 }

pkg/services/sqlstore/annotation.go

@@ -211,7 +211,12 @@ func (r *SqlAnnotationRepo) Find(query *annotations.ItemQuery) ([]*annotations.I
             )
       `, strings.Join(keyValueFilters, " OR "))
 
-			sql.WriteString(fmt.Sprintf(" AND (%s) = %d ", tagsSubQuery, len(tags)))
+			if query.PartialMatch {
+				sql.WriteString(fmt.Sprintf(" AND (%s) > 0 ", tagsSubQuery))
+			} else {
+				sql.WriteString(fmt.Sprintf(" AND (%s) = %d ", tagsSubQuery, len(tags)))
+			}
+
 		}
 	}
 

pkg/services/sqlstore/annotation_test.go

@@ -78,7 +78,31 @@ func TestAnnotations(t *testing.T) {
 			So(err, ShouldBeNil)
 			So(annotation2.Id, ShouldBeGreaterThan, 0)
 
-			Convey("Can query for annotation", func() {
+			globalAnnotation1 := &annotations.Item{
+				OrgId:  1,
+				UserId: 1,
+				Text:   "deploy",
+				Type:   "",
+				Epoch:  15,
+				Tags:   []string{"deploy"},
+			}
+			err = repo.Save(globalAnnotation1)
+			So(err, ShouldBeNil)
+			So(globalAnnotation1.Id, ShouldBeGreaterThan, 0)
+
+			globalAnnotation2 := &annotations.Item{
+				OrgId:  1,
+				UserId: 1,
+				Text:   "rollback",
+				Type:   "",
+				Epoch:  17,
+				Tags:   []string{"rollback"},
+			}
+			err = repo.Save(globalAnnotation2)
+			So(err, ShouldBeNil)
+			So(globalAnnotation2.Id, ShouldBeGreaterThan, 0)
+
+			Convey("Can query for annotation by dashboard id", func() {
 				items, err := repo.Find(&annotations.ItemQuery{
 					OrgId:       1,
 					DashboardId: 1,
@@ -165,7 +189,7 @@ func TestAnnotations(t *testing.T) {
 					OrgId:       1,
 					DashboardId: 1,
 					From:        1,
-					To:          15,
+					To:          15, //this will exclude the second test annotation
 					Tags:        []string{"outage", "error"},
 				})
 
@@ -173,6 +197,19 @@ func TestAnnotations(t *testing.T) {
 				So(items, ShouldHaveLength, 1)
 			})
 
+			Convey("Should find two annotations using partial match", func() {
+				items, err := repo.Find(&annotations.ItemQuery{
+					OrgId:        1,
+					From:         1,
+					To:           25,
+					PartialMatch: true,
+					Tags:         []string{"rollback", "deploy"},
+				})
+
+				So(err, ShouldBeNil)
+				So(items, ShouldHaveLength, 2)
+			})
+
 			Convey("Should find one when all key value tag filters does match", func() {
 				items, err := repo.Find(&annotations.ItemQuery{
 					OrgId:       1,