🚀 正则表达式匹配，支持负数和小数点 (#136)

opsre · Feb 22, 2025 · c4608e3 · c4608e3
1 parent f902baf
commit c4608e3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/alert/consumer/consumer.go b/alert/consumer/consumer.go
@@ -198,7 +198,6 @@ func (c *Consume) executeTask(faultCenter models.FaultCenter, taskChan chan stru
 	// 事件分组
 	var alertGroups AlertGroups
 	c.alarmGrouping(faultCenter, &alertGroups, filterEvents)
-	fmt.Println("alertGroups->", tools.JsonMarshal(alertGroups.Rules))
 	// 事件聚合
 	aggEvents := c.alarmAggregation(faultCenter, &alertGroups)
 	// 发送事件

diff --git a/pkg/tools/cmd.go b/pkg/tools/cmd.go
@@ -152,8 +152,8 @@ func ProcessRuleExpr(ruleExpr string) (string, float64, error) {
 	// 去除空格
 	trimmedExpr := strings.ReplaceAll(ruleExpr, " ", "")
 
-	// 正则表达式匹配
-	re := regexp.MustCompile(`([^\d]+)(\d+)`)
+	// 正则表达式匹配，支持负数和小数点
+	re := regexp.MustCompile(`([^\d\-]+)(-?\d+(?:\.\d+)?)`)
 	matches := re.FindStringSubmatch(trimmedExpr)
 	if len(matches) < 3 {
 		return "", 0, fmt.Errorf("无效的表达式: %s", ruleExpr)