#830 自定义模版生成不了阈值告警bug修复

Author: tangjiawei

monitor-server/api/v2/monitor/metric.go

@@ -292,7 +292,7 @@ func QueryMetricTagValue(c *gin.Context) {
 				continue
 			}
 			// 如果该指标为自定义类型的业务配置创建,tags内容: tags="test_service_code=addUser,test_retcode=200",需要做特殊解析处理
-			if logType == "custom" && seriesMap["tags"] != "" {
+			if logType == models.LogMonitorJsonType && seriesMap["tags"] != "" {
 				seriesMap = datasource.ResetPrometheusMetricMap(seriesMap)
 			}
 			if tmpTagValue, ok := seriesMap[v]; ok {

monitor-server/services/db/alarm_strategy.go

@@ -736,6 +736,8 @@ func buildRuleFileContentNew(ruleFileName, guidExpr, addressExpr, ipExpr string,
 }
 
 func buildStrategyAlarmRuleExpr(guidExpr, addressExpr, ipExpr string, strategy *models.AlarmStrategyMetricObj) {
+	var logType string
+	var err error
 	if strings.Contains(strategy.MetricExpr, "$address") {
 		if strings.Contains(addressExpr, "|") {
 			strategy.MetricExpr = strings.Replace(strategy.MetricExpr, "=\"$address\"", "=~\""+addressExpr+"\"", -1)
@@ -763,18 +765,35 @@ func buildStrategyAlarmRuleExpr(guidExpr, addressExpr, ipExpr string, strategy *
 			strategy.MetricExpr = strings.ReplaceAll(strategy.MetricExpr, "$ip", ipExpr)
 		}
 	}
+	// 看指标是否为 业务配置过来的,查询业务配置类型,自定义类型需要特殊处理 tags,tags="test_service_code=deleteUser,test_retcode=304"
+	if logType, err = GetLogTypeByMetric(strategy.Metric); err != nil {
+		log.Logger.Error("GetLogTypeByMetric err", log.Error(err))
+	}
 	if len(strategy.Tags) > 0 {
-		for _, tagObj := range strategy.Tags {
-			tagSourceString := "$t_" + tagObj.TagName
-			if strings.Contains(strategy.MetricExpr, tagSourceString) {
-				if len(tagObj.TagValue) == 0 {
-					strategy.MetricExpr = strings.Replace(strategy.MetricExpr, "=\""+tagSourceString+"\"", "=~\".*\"", -1)
+		if logType == models.LogMonitorCustomType {
+			originPromQl := strategy.MetricExpr
+			// 原表达式: node_log_metric_monitor_value{key="key",agg="max",service_group="log_sys",tags="$t_tags"}
+			// 正则字符串匹配 替换成 node_log_metric_monitor_value{key="key",agg="max",service_group="log_sys",tags!~".*test_service_code=addUser.*"}
+			for i, tagObj := range strategy.Tags {
+				if i == 0 {
+					strategy.MetricExpr = getTagPromQl(convertMetricTag2Dto(tagObj), originPromQl)
 				} else {
-					tmpEqual := "=~"
-					if tagObj.Equal == "notin" {
-						tmpEqual = "!~"
+					strategy.MetricExpr = "(" + strategy.MetricExpr + ") and (" + getTagPromQl(convertMetricTag2Dto(tagObj), originPromQl) + ")"
+				}
+			}
+		} else {
+			for _, tagObj := range strategy.Tags {
+				tagSourceString := "$t_" + tagObj.TagName
+				if strings.Contains(strategy.MetricExpr, tagSourceString) {
+					if len(tagObj.TagValue) == 0 {
+						strategy.MetricExpr = strings.Replace(strategy.MetricExpr, "=\""+tagSourceString+"\"", "=~\".*\"", -1)
+					} else {
+						tmpEqual := "=~"
+						if tagObj.Equal == "notin" {
+							tmpEqual = "!~"
+						}
+						strategy.MetricExpr = strings.Replace(strategy.MetricExpr, "=\""+tagSourceString+"\"", tmpEqual+"\""+strings.Join(tagObj.TagValue, "|")+"\"", -1)
 					}
-					strategy.MetricExpr = strings.Replace(strategy.MetricExpr, "=\""+tagSourceString+"\"", tmpEqual+"\""+strings.Join(tagObj.TagValue, "|")+"\"", -1)
 				}
 			}
 		}
@@ -784,6 +803,17 @@ func buildStrategyAlarmRuleExpr(guidExpr, addressExpr, ipExpr string, strategy *
 	}
 }
 
+func convertMetricTag2Dto(tag *models.MetricTag) *models.TagDto {
+	if tag == nil {
+		return &models.TagDto{}
+	}
+	return &models.TagDto{
+		TagName:  tag.TagName,
+		Equal:    tag.Equal,
+		TagValue: tag.TagValue,
+	}
+}
+
 func copyStrategyListNew(inputs []*models.AlarmStrategyMetricObj) (result []*models.AlarmStrategyMetricObj) {
 	result = []*models.AlarmStrategyMetricObj{}
 	for _, strategy := range inputs {

monitor-server/services/db/dashboard.go

@@ -210,7 +210,7 @@ func ReplacePromQlKeyword(promQl, metric string, host *m.EndpointNewTable, tagLi
 		log.Logger.Error("GetLogTypeByMetric err", log.Error(err))
 	}
 	if len(tagList) > 0 {
-		if logType == "custom" {
+		if logType == m.LogMonitorCustomType {
 			originPromQl := promQl
 			// 原表达式: node_log_metric_monitor_value{key="key",agg="max",service_group="log_sys",tags="$t_tags"}
 			// 正则字符串匹配 替换成 node_log_metric_monitor_value{key="key",agg="max",service_group="log_sys",tags!~".*test_service_code=addUser.*"}