Feature mute enhancement (#1041)

* [feature(#1029)] alert mute enhancement

* handle error of proxy user Add

src/server/engine/mute.go

@@ -35,31 +35,36 @@ func matchMute(event *models.AlertCurEvent, mute *models.AlertMute, clock ...int
 	return matchTags(tg, mute.ITags)
 }
 
+func matchTag(value string, filter models.TagFilter) bool {
+	switch filter.Func {
+	case "==":
+		return filter.Value == value
+	case "!=":
+		return filter.Value != value
+	case "in":
+		_, has := filter.Vset[value]
+		return has
+	case "not in":
+		_, has := filter.Vset[value]
+		return !has
+	case "=~":
+		return filter.Regexp.MatchString(value)
+	case "!~":
+		return !filter.Regexp.MatchString(value)
+	}
+	// unexpect func
+	return false
+}
+
 func matchTags(eventTagsMap map[string]string, itags []models.TagFilter) bool {
-	for i := 0; i < len(itags); i++ {
+	for _, filter := range itags {
-		filter := itags[i]
+		value, has := eventTagsMap[filter.Key]
-		value, exists := eventTagsMap[filter.Key]
+		if !has {
-		if !exists {
 			return false
 		}
-
+		if !matchTag(value, filter) {
-		if filter.Func == "==" {
-			// ==
-			if filter.Value != value {
-				return false
-			}
-		} else if filter.Func == "in" {
-			// in
-			if _, has := filter.Vset[value]; !has {
-				return false
-			}
-		} else {
-			// =~
-			if !filter.Regexp.MatchString(value) {
 			return false
 		}
 	}
-	}
-
 	return true
 }

src/webapi/router/router_mw.go

@@ -48,6 +48,9 @@ func handleProxyUser(c *gin.Context) *models.User {
 			UpdateBy: "system",
 		}
 		err = user.Add()
+		if err != nil {
+			ginx.Bomb(http.StatusInternalServerError, err.Error())
+		}
 	}
 	return user
 }