renames PartialMatch to MatchAny

pkg/api/annotations.go

@@ -24,7 +24,7 @@ func GetAnnotations(c *m.ReqContext) Response {
 		Limit:       c.QueryInt64("limit"),
 		Limit:       c.QueryInt64("limit"),
 		Tags:        c.QueryStrings("tags"),
 		Tags:        c.QueryStrings("tags"),
 		Type:        c.Query("type"),
 		Type:        c.Query("type"),
-		PartialMatch: c.QueryBool("partialMatch"),
+		MatchAny:    c.QueryBool("matchAny"),
 	}
 	}
 
 
 	repo := annotations.GetRepository()
 	repo := annotations.GetRepository()

pkg/services/annotations/annotations.go

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

pkg/services/sqlstore/annotation.go

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

pkg/services/sqlstore/annotation_test.go

@@ -202,7 +202,7 @@ func TestAnnotations(t *testing.T) {
 					OrgId:    1,
 					OrgId:    1,
 					From:     1,
 					From:     1,
 					To:       25,
 					To:       25,
-					PartialMatch: true,
+					MatchAny: true,
 					Tags:     []string{"rollback", "deploy"},
 					Tags:     []string{"rollback", "deploy"},
 				})
 				})
 
 

public/app/plugins/datasource/grafana/datasource.ts

@@ -40,7 +40,7 @@ class GrafanaDatasource {
       to: options.range.to.valueOf(),
       to: options.range.to.valueOf(),
       limit: options.annotation.limit,
       limit: options.annotation.limit,
       tags: options.annotation.tags,
       tags: options.annotation.tags,
-      partialMatch: options.annotation.partialMatch,
+      matchAny: options.annotation.matchAny,
     };
     };
 
 
     if (options.annotation.type === 'dashboard') {
     if (options.annotation.type === 'dashboard') {

public/app/plugins/datasource/grafana/partials/annotations.editor.html

@@ -28,9 +28,9 @@
 		<div class="gf-form" ng-if="ctrl.annotation.type === 'tags'">
 		<div class="gf-form" ng-if="ctrl.annotation.type === 'tags'">
 			<gf-form-switch
 			<gf-form-switch
 				class="gf-form"
 				class="gf-form"
-				label="Partial match" 
+				label="Match any"
 				label-class="width-9"
 				label-class="width-9"
-				checked="ctrl.annotation.partialMatch" 
+				checked="ctrl.annotation.matchAny"
 				on-change="ctrl.refresh()"
 				on-change="ctrl.refresh()"
 				tooltip="By default Grafana will only show annotation that matches all tags in the query. Enabling this will make Grafana return any annotation with the tags you specify."></gf-form-switch>
 				tooltip="By default Grafana will only show annotation that matches all tags in the query. Enabling this will make Grafana return any annotation with the tags you specify."></gf-form-switch>
 		</div>
 		</div>