♻️ Remove alert rule EvalTimeType field and add validate func

Author: Cairry

alert/eval/eval.go

@@ -30,10 +30,6 @@ const (
 	DatasourceTypeCloudWatch      = "CloudWatch"
 	DatasourceTypeKubernetesEvent = "KubernetesEvent"
 
-	// 时间类型
-	TimeTypeMillisecond = "millisecond"
-	TimeTypeSecond      = "second"
-
 	// 默认恢复等待时间
 	DefaultRecoverWaitTime = 1
 
@@ -103,8 +99,14 @@ func (t *AlertRule) Restart(rule models.AlertRule) {
 }
 
 func (t *AlertRule) Eval(ctx context.Context, rule models.AlertRule) {
+	err := rule.Validate()
+	if err != nil {
+		logc.Errorf(t.ctx.Ctx, fmt.Sprintf("Rule validation failed, RuleName: %s, RuleId: %s, Error: %v", rule.RuleName, rule.RuleId, err))
+		return
+	}
+
 	taskChan := make(chan struct{}, TaskChannelBufferSize)
-	timer := time.NewTicker(t.getEvalTimeDuration(rule.EvalTimeType, rule.EvalInterval))
+	timer := time.NewTicker(t.getEvalTimeDuration(rule.EvalInterval))
 	defer func() {
 		timer.Stop()
 		if r := recover(); r != nil {
@@ -125,7 +127,7 @@ func (t *AlertRule) Eval(ctx context.Context, rule models.AlertRule) {
 			logc.Infof(t.ctx.Ctx, fmt.Sprintf("停止 RuleId: %v, RuleName: %s 的 Watch 协程", rule.RuleId, rule.RuleName))
 			return
 		}
-		timer.Reset(t.getEvalTimeDuration(rule.EvalTimeType, rule.EvalInterval))
+		timer.Reset(t.getEvalTimeDuration(rule.EvalInterval))
 	}
 }
 
@@ -214,13 +216,8 @@ func (t *AlertRule) processSingleDatasource(dsId string, rule models.AlertRule)
 }
 
 // getEvalTimeDuration 获取评估时间间隔
-func (t *AlertRule) getEvalTimeDuration(evalTimeType string, evalInterval int64) time.Duration {
-	switch evalTimeType {
-	case TimeTypeMillisecond:
-		return time.Duration(evalInterval) * time.Millisecond
-	default:
-		return time.Duration(evalInterval) * time.Second
-	}
+func (t *AlertRule) getEvalTimeDuration(evalInterval int64) time.Duration {
+	return time.Duration(evalInterval) * time.Second
 }
 
 func (t *AlertRule) Recover(tenantId, ruleId string, eventCacheKey models.AlertEventCacheKey, faultCenterInfoKey models.FaultCenterInfoCacheKey, curFingerprints []string) {

internal/models/rule.go

@@ -1,5 +1,9 @@
 package models
 
+import (
+	"fmt"
+)
+
 type AlertRule struct {
 	//gorm.Model
 	TenantId             string            `json:"tenantId"`
@@ -10,7 +14,6 @@ type AlertRule struct {
 	DatasourceIdList     []string          `json:"datasourceId" gorm:"datasourceId;serializer:json"`
 	RuleName             string            `json:"ruleName"`
 	EvalInterval         int64             `json:"evalInterval"`
-	EvalTimeType         string            `json:"evalTimeType"` // second, millisecond
 	RepeatNoticeInterval int64             `json:"repeatNoticeInterval"`
 	Description          string            `json:"description"`
 	EffectiveTime        EffectiveTime     `json:"effectiveTime" gorm:"effectiveTime;serializer:json"`
@@ -173,3 +176,10 @@ func (a *AlertRule) GetForDuration(severity string) int64 {
 	}
 	return 0
 }
+
+func (t *AlertRule) Validate() error {
+	if t.EvalInterval < 5 {
+		return fmt.Errorf("EvalInterval must be greater than 5")
+	}
+	return nil
+}

internal/services/rule.go

@@ -52,7 +52,6 @@ func (rs ruleService) Create(req interface{}) (interface{}, interface{}) {
 		DatasourceIdList:     r.DatasourceIdList,
 		RuleName:             r.RuleName,
 		EvalInterval:         r.EvalInterval,
-		EvalTimeType:         r.EvalTimeType,
 		RepeatNoticeInterval: r.RepeatNoticeInterval,
 		Description:          r.Description,
 		EffectiveTime:        r.EffectiveTime,
@@ -133,7 +132,6 @@ func (rs ruleService) Update(req interface{}) (interface{}, interface{}) {
 		DatasourceIdList:     r.DatasourceIdList,
 		RuleName:             r.RuleName,
 		EvalInterval:         r.EvalInterval,
-		EvalTimeType:         r.EvalTimeType,
 		RepeatNoticeInterval: r.RepeatNoticeInterval,
 		Description:          r.Description,
 		EffectiveTime:        r.EffectiveTime,
@@ -336,7 +334,6 @@ func (rs ruleService) Import(req interface{}) (interface{}, interface{}) {
 				DatasourceIdList: r.DatasourceIdList,
 				RuleName:         alert.Alert,
 				EvalInterval:     15,
-				EvalTimeType:     "second",
 				PrometheusConfig: models.PrometheusConfig{
 					PromQL:      alert.Expr,
 					Annotations: alert.Annotations.Description,
@@ -379,7 +376,6 @@ func (rs ruleService) Import(req interface{}) (interface{}, interface{}) {
 			DatasourceIdList:     rule.DatasourceIdList,
 			RuleName:             rule.RuleName,
 			EvalInterval:         rule.EvalInterval,
-			EvalTimeType:         rule.EvalTimeType,
 			RepeatNoticeInterval: rule.RepeatNoticeInterval,
 			Description:          rule.Description,
 			EffectiveTime:        rule.EffectiveTime,

internal/types/rule.go

@@ -10,7 +10,6 @@ type RequestRuleCreate struct {
 	DatasourceIdList     []string                   `json:"datasourceId"`
 	RuleName             string                     `json:"ruleName"`
 	EvalInterval         int64                      `json:"evalInterval"`
-	EvalTimeType         string                     `json:"evalTimeType"` // second, millisecond
 	RepeatNoticeInterval int64                      `json:"repeatNoticeInterval"`
 	Description          string                     `json:"description"`
 	EffectiveTime        models.EffectiveTime       `json:"effectiveTime"`
@@ -47,7 +46,6 @@ type RequestRuleUpdate struct {
 	DatasourceIdList     []string                   `json:"datasourceId"`
 	RuleName             string                     `json:"ruleName"`
 	EvalInterval         int64                      `json:"evalInterval"`
-	EvalTimeType         string                     `json:"evalTimeType"` // second, millisecond
 	RepeatNoticeInterval int64                      `json:"repeatNoticeInterval"`
 	Description          string                     `json:"description"`
 	EffectiveTime        models.EffectiveTime       `json:"effectiveTime"`