#830 custom template bug

Author: tangjiawei

monitor-server/api/v2/service/log_metric.go

@@ -852,6 +852,15 @@ func CreateLogMetricCustomGroup(c *gin.Context) {
 			}
 		}
 	}
+	if existLogMonitorTemplate, getErr := db.GetLogMonitorTemplateByName(param.Guid, param.Name); getErr != nil {
+		err = getErr
+		middleware.ReturnServerHandleError(c, err)
+		return
+	} else if existLogMonitorTemplate != nil {
+		err = fmt.Errorf("log monitor template name:%s duplicate", param.Name)
+		middleware.ReturnServerHandleError(c, err)
+		return
+	}
 	if err := db.ValidateLogMetricGroupName(param.Guid, param.Name, param.LogMetricMonitor); err != nil {
 		err = fmt.Errorf(middleware.GetMessageMap(c).LogGroupNameDuplicateError, param.Name)
 		middleware.ReturnHandleError(c, err.Error(), err)
@@ -880,7 +889,8 @@ func CreateLogMetricCustomGroup(c *gin.Context) {
 
 func UpdateLogMetricCustomGroup(c *gin.Context) {
 	var param models.LogMetricGroupObj
-	if err := c.ShouldBindJSON(&param); err != nil {
+	var err error
+	if err = c.ShouldBindJSON(&param); err != nil {
 		middleware.ReturnValidateError(c, err.Error())
 		return
 	}
@@ -889,8 +899,21 @@ func UpdateLogMetricCustomGroup(c *gin.Context) {
 		middleware.ReturnHandleError(c, err.Error(), err)
 		return
 	}
+	if existLogMonitorTemplate, getErr := db.GetLogMonitorTemplateByName(param.Guid, param.Name); getErr != nil {
+		err = getErr
+		middleware.ReturnServerHandleError(c, err)
+		return
+	} else if existLogMonitorTemplate != nil {
+		err = fmt.Errorf("log monitor template name:%s duplicate", param.Name)
+		middleware.ReturnServerHandleError(c, err)
+		return
+	}
 	if len(param.MetricList) > 0 {
 		for _, metric := range param.MetricList {
+			// 拼接指标
+			if param.MetricPrefixCode != "" {
+				metric.Metric = param.MetricPrefixCode + metric.Metric
+			}
 			if middleware.IsIllegalLogParamNameOrMetric(metric.LogParamName) || middleware.IsIllegalLogParamNameOrMetric(metric.Metric) {
 				middleware.ReturnValidateError(c, "log_param_name or metric param invalid")
 				return

monitor-server/models/log_metric.go

@@ -219,6 +219,7 @@ type LogMetricGroupObj struct {
 	AutoCreateWarn         bool                   `json:"auto_create_warn"`      //自动创建告警
 	AutoCreateDashboard    bool                   `json:"auto_create_dashboard"` //自动创建自定义看板
 	LogMonitorTemplateDto  *LogMonitorTemplateDto `json:"log_monitor_template_data"`
+	MetricPrefixCode       string                 `json:"metric_prefix_code"`
 }
 
 type LogMetricGroupWithTemplate struct {

monitor-server/services/db/log_metric.go

@@ -1647,10 +1647,9 @@ func GetLogMetricCustomGroup(logMetricGroupGuid string) (result *models.LogMetri
 	}
 	for _, row := range logMetricConfigRows {
 		json.Unmarshal([]byte(row.TagConfig), &row.TagConfigList)
-		if strings.TrimSpace(metricGroupObj.MetricPrefixCode) == "" {
-			row.FullMetric = row.Metric
-		} else {
-			row.FullMetric = fmt.Sprintf("%s_%s", metricGroupObj.MetricPrefixCode, row.Metric)
+		row.FullMetric = row.Metric
+		if strings.TrimSpace(metricGroupObj.MetricPrefixCode) != "" && len(row.Metric) > len(metricGroupObj.MetricPrefixCode) {
+			row.Metric = row.Metric[len(metricGroupObj.MetricPrefixCode)+1:]
 		}
 		result.MetricList = append(result.MetricList, convertLogMetricConfigTable2Dto(row))
 	}