fix execution of notify script

.gitignore

@@ -58,9 +58,6 @@ _test
 .idea
 .index
 .vscode
-.issue
-.cursor
-.claude
 .DS_Store
 .cache-loader
 .payload

alert/dispatch/dispatch.go

@@ -45,7 +45,6 @@ type Dispatch struct {
 	tpls             map[string]*template.Template
 	ExtraSenders     map[string]sender.Sender
 	BeforeSenderHook func(*models.AlertCurEvent) bool
-	NotifyHook       func(*models.AlertCurEvent, int64) // event, notifyRuleID, metricType, success
 
 	ctx    *ctx.Context
 	Astats *astats.Stats
@@ -77,7 +76,6 @@ func NewDispatch(alertRuleCache *memsto.AlertRuleCacheType, userCache *memsto.Us
 		tpls:             make(map[string]*template.Template),
 		ExtraSenders:     make(map[string]sender.Sender),
 		BeforeSenderHook: func(*models.AlertCurEvent) bool { return true },
-		NotifyHook:       func(*models.AlertCurEvent, int64) {}, // 默认空实现
 
 		ctx:    ctx,
 		Astats: astats,
@@ -206,8 +204,6 @@ func (e *Dispatch) HandleEventWithNotifyRule(eventOrigin *models.AlertCurEvent)
 				continue
 			}
 
-			e.NotifyHook(eventCopy, notifyRuleId)
-
 			// notify
 			for i := range notifyRule.NotifyConfigs {
 				err := NotifyRuleMatchCheck(&notifyRule.NotifyConfigs[i], eventCopy)
@@ -599,10 +595,6 @@ func (e *Dispatch) handleSub(sub *models.AlertSubscribe, event models.AlertCurEv
 		return
 	}
 
-	if !sub.MatchCate(event.Cate) {
-		return
-	}
-
 	if !common.MatchTags(event.TagsMap, sub.ITags) {
 		return
 	}

alert/pipeline/processor/aisummary/ai_summary.go

@@ -8,7 +8,6 @@ import (
 	"io"
 	"net/http"
 	"net/url"
-	"strconv"
 	"strings"
 	"text/template"
 	"time"
@@ -144,11 +143,7 @@ func (c *AISummaryConfig) generateAISummary(eventInfo string) (string, error) {
 
 	// 合并自定义参数
 	for k, v := range c.CustomParams {
-		converted, err := convertCustomParam(v)
-		if err != nil {
-			return "", fmt.Errorf("failed to convert custom param %s: %v", k, err)
-		}
-		reqParams[k] = converted
+		reqParams[k] = v
 	}
 
 	// 序列化请求体
@@ -201,44 +196,3 @@ func (c *AISummaryConfig) generateAISummary(eventInfo string) (string, error) {
 
 	return chatResp.Choices[0].Message.Content, nil
 }
-
-// convertCustomParam 将前端传入的参数转换为正确的类型
-func convertCustomParam(value interface{}) (interface{}, error) {
-	if value == nil {
-		return nil, nil
-	}
-
-	// 如果是字符串，尝试转换为其他类型
-	if str, ok := value.(string); ok {
-		// 尝试转换为数字
-		if f, err := strconv.ParseFloat(str, 64); err == nil {
-			// 检查是否为整数
-			if f == float64(int64(f)) {
-				return int64(f), nil
-			}
-			return f, nil
-		}
-
-		// 尝试转换为布尔值
-		if b, err := strconv.ParseBool(str); err == nil {
-			return b, nil
-		}
-
-		// 尝试解析为JSON数组
-		if strings.HasPrefix(strings.TrimSpace(str), "[") {
-			var arr []interface{}
-			if err := json.Unmarshal([]byte(str), &arr); err == nil {
-				return arr, nil
-			}
-		}
-
-		// 尝试解析为JSON对象
-		if strings.HasPrefix(strings.TrimSpace(str), "{") {
-			var obj map[string]interface{}
-			if err := json.Unmarshal([]byte(str), &obj); err == nil {
-				return obj, nil
-			}
-		}
-	}
-	return value, nil
-}

alert/pipeline/processor/aisummary/ai_summary_test.go

@@ -67,73 +67,3 @@ func TestAISummaryConfig_Process(t *testing.T) {
 	t.Logf("原始注释: %v", result.AnnotationsJSON["description"])
 	t.Logf("AI总结: %s", result.AnnotationsJSON["ai_summary"])
 }
-
-func TestConvertCustomParam(t *testing.T) {
-	tests := []struct {
-		name     string
-		input    interface{}
-		expected interface{}
-		hasError bool
-	}{
-		{
-			name:     "nil value",
-			input:    nil,
-			expected: nil,
-			hasError: false,
-		},
-		{
-			name:     "string number to int64",
-			input:    "123",
-			expected: int64(123),
-			hasError: false,
-		},
-		{
-			name:     "string float to float64",
-			input:    "123.45",
-			expected: 123.45,
-			hasError: false,
-		},
-		{
-			name:     "string boolean to bool",
-			input:    "true",
-			expected: true,
-			hasError: false,
-		},
-		{
-			name:     "string false to bool",
-			input:    "false",
-			expected: false,
-			hasError: false,
-		},
-		{
-			name:     "JSON array string to slice",
-			input:    `["a", "b", "c"]`,
-			expected: []interface{}{"a", "b", "c"},
-			hasError: false,
-		},
-		{
-			name:     "JSON object string to map",
-			input:    `{"key": "value", "num": 123}`,
-			expected: map[string]interface{}{"key": "value", "num": float64(123)},
-			hasError: false,
-		},
-		{
-			name:     "plain string remains string",
-			input:    "hello world",
-			expected: "hello world",
-			hasError: false,
-		},
-	}
-
-	for _, test := range tests {
-		t.Run(test.name, func(t *testing.T) {
-			converted, err := convertCustomParam(test.input)
-			if test.hasError {
-				assert.Error(t, err)
-				return
-			}
-			assert.NoError(t, err)
-			assert.Equal(t, test.expected, converted)
-		})
-	}
-}

center/integration/init.go

@@ -187,7 +187,7 @@ func Init(ctx *ctx.Context, builtinIntegrationsDir string) {
 						CreatedBy:   SYSTEM,
 						UpdatedBy:   SYSTEM,
 					}
-					BuiltinPayloadInFile.AddBuiltinPayload(&builtinAlert)
+					BuiltinPayloadInFile.addBuiltinPayload(&builtinAlert)
 
 				}
 			}
@@ -245,7 +245,7 @@ func Init(ctx *ctx.Context, builtinIntegrationsDir string) {
 					CreatedBy:   SYSTEM,
 					UpdatedBy:   SYSTEM,
 				}
-				BuiltinPayloadInFile.AddBuiltinPayload(&builtinDashboard)
+				BuiltinPayloadInFile.addBuiltinPayload(&builtinDashboard)
 			}
 		} else if err != nil {
 			logger.Warningf("read builtin component dash dir fail %s %v", component.Ident, err)
@@ -314,7 +314,7 @@ func NewBuiltinPayloadInFileType() *BuiltinPayloadInFileType {
 	}
 }
 
-func (b *BuiltinPayloadInFileType) AddBuiltinPayload(bp *models.BuiltinPayload) {
+func (b *BuiltinPayloadInFileType) addBuiltinPayload(bp *models.BuiltinPayload) {
 	if _, exists := b.Data[bp.ComponentID]; !exists {
 		b.Data[bp.ComponentID] = make(map[string]map[string][]*models.BuiltinPayload)
 	}

center/router/router_alert_rule.go

@@ -543,20 +543,6 @@ func (rt *Router) alertRulePutFields(c *gin.Context) {
 			}
 		}
 
-		// 检测是否是批量更新通知规则的字段，如果是清理掉旧版本的配置
-		for k := range f.Fields {
-			if k == "notify_rule_ids" {
-				f.Fields["notify_version"] = 1
-				f.Fields["notify_channels"] = ""
-				f.Fields["notify_groups"] = ""
-				f.Fields["callbacks"] = ""
-			}
-
-			if k == "notify_channels" {
-				f.Fields["notify_version"] = 0
-			}
-		}
-
 		for k, v := range f.Fields {
 			// 检查 v 是否为各种切片类型
 			switch v.(type) {

center/router/router_alert_subscribe.go

@@ -288,7 +288,6 @@ func (rt *Router) alertSubscribePut(c *gin.Context) {
 			"busi_groups",
 			"note",
 			"notify_rule_ids",
-			"notify_version",
 		))
 	}
 

center/router/router_datasource.go

@@ -14,7 +14,6 @@ import (
 
 	"github.com/gin-gonic/gin"
 	"github.com/toolkits/pkg/ginx"
-	"github.com/toolkits/pkg/i18n"
 	"github.com/toolkits/pkg/logger"
 )
 
@@ -103,7 +102,7 @@ func (rt *Router) datasourceUpsert(c *gin.Context) {
 
 	if !req.ForceSave {
 		if req.PluginType == models.PROMETHEUS || req.PluginType == models.LOKI || req.PluginType == models.TDENGINE {
-			err = DatasourceCheck(c, req)
+			err = DatasourceCheck(req)
 			if err != nil {
 				Dangerous(c, err)
 				return
@@ -174,7 +173,7 @@ func (rt *Router) datasourceUpsert(c *gin.Context) {
 	Render(c, nil, err)
 }
 
-func DatasourceCheck(c *gin.Context, ds models.Datasource) error {
+func DatasourceCheck(ds models.Datasource) error {
 	if ds.PluginType == models.PROMETHEUS || ds.PluginType == models.LOKI || ds.PluginType == models.TDENGINE {
 		if ds.HTTPJson.Url == "" {
 			return fmt.Errorf("url is empty")
@@ -233,10 +232,6 @@ func DatasourceCheck(c *gin.Context, ds models.Datasource) error {
 		req, err = http.NewRequest("GET", fullURL, nil)
 		if err != nil {
 			logger.Errorf("Error creating request: %v", err)
-			if !strings.Contains(ds.HTTPJson.Url, "/loki") {
-				lang := c.GetHeader("X-Language")
-				return fmt.Errorf(i18n.Sprintf(lang, "/loki suffix is miss, please add /loki to the url: %s", ds.HTTPJson.Url+"/loki"))
-			}
 			return fmt.Errorf("request url:%s failed: %v", fullURL, err)
 		}
 	}
@@ -258,10 +253,6 @@ func DatasourceCheck(c *gin.Context, ds models.Datasource) error {
 
 	if resp.StatusCode != 200 {
 		logger.Errorf("Error making request: %v\n", resp.StatusCode)
-		if resp.StatusCode == 404 && ds.PluginType == models.LOKI && !strings.Contains(ds.HTTPJson.Url, "/loki") {
-			lang := c.GetHeader("X-Language")
-			return fmt.Errorf(i18n.Sprintf(lang, "/loki suffix is miss, please add /loki to the url: %s", ds.HTTPJson.Url+"/loki"))
-		}
 		body, _ := io.ReadAll(resp.Body)
 		return fmt.Errorf("request url:%s failed code:%d body:%s", fullURL, resp.StatusCode, string(body))
 	}

center/router/router_recording_rule.go

@@ -149,12 +149,6 @@ func (rt *Router) recordingRulePutFields(c *gin.Context) {
 		f.Fields["datasource_queries"] = string(bytes)
 	}
 
-	if datasourceIds, ok := f.Fields["datasource_ids"]; ok {
-		bytes, err := json.Marshal(datasourceIds)
-		ginx.Dangerous(err)
-		f.Fields["datasource_ids"] = string(bytes)
-	}
-
 	for i := 0; i < len(f.Ids); i++ {
 		ar, err := models.RecordingRuleGetById(rt.Ctx, f.Ids[i])
 		ginx.Dangerous(err)

datasource/doris/doris.go

@@ -8,7 +8,6 @@ import (
 	"github.com/ccfos/nightingale/v6/datasource"
 	"github.com/ccfos/nightingale/v6/dskit/doris"
 	"github.com/ccfos/nightingale/v6/dskit/types"
-	"github.com/ccfos/nightingale/v6/pkg/macros"
 	"github.com/ccfos/nightingale/v6/models"
 
 	"github.com/mitchellh/mapstructure"
@@ -28,16 +27,11 @@ type Doris struct {
 }
 
 type QueryParam struct {
-	Ref        string          `json:"ref" mapstructure:"ref"`
-	Database   string          `json:"database" mapstructure:"database"`
-	Table      string          `json:"table" mapstructure:"table"`
-	SQL        string          `json:"sql" mapstructure:"sql"`
-	Keys       datasource.Keys `json:"keys" mapstructure:"keys"`
-	Limit      int             `json:"limit" mapstructure:"limit"`
-	From       int64           `json:"from" mapstructure:"from"`
-	To         int64           `json:"to" mapstructure:"to"`
-	TimeField  string          `json:"time_field" mapstructure:"time_field"`
-	TimeFormat string          `json:"time_format" mapstructure:"time_format"`
+	Ref      string          `json:"ref" mapstructure:"ref"`
+	Database string          `json:"database" mapstructure:"database"`
+	Table    string          `json:"table" mapstructure:"table"`
+	SQL      string          `json:"sql" mapstructure:"sql"`
+	Keys     datasource.Keys `json:"keys" mapstructure:"keys"`
 }
 
 func (d *Doris) InitClient() error {
@@ -72,7 +66,7 @@ func (d *Doris) Validate(ctx context.Context) error {
 func (d *Doris) Equal(p datasource.Datasource) bool {
 	newest, ok := p.(*Doris)
 	if !ok {
-		logger.Errorf("unexpected plugin type, expected is doris")
+		logger.Errorf("unexpected plugin type, expected is ck")
 		return false
 	}
 
@@ -180,14 +174,6 @@ func (d *Doris) QueryLog(ctx context.Context, query interface{}) ([]interface{},
 		return nil, 0, err
 	}
 
-	if strings.Contains(dorisQueryParam.SQL, "$__") {
-		var err error
-		dorisQueryParam.SQL, err = macros.Macro(dorisQueryParam.SQL, dorisQueryParam.From, dorisQueryParam.To)
-		if err != nil {
-			return nil, 0, err
-		}
-	}
-
 	items, err := d.QueryLogs(ctx, &doris.QueryParam{
 		Database: dorisQueryParam.Database,
 		Sql:      dorisQueryParam.SQL,
@@ -201,7 +187,7 @@ func (d *Doris) QueryLog(ctx context.Context, query interface{}) ([]interface{},
 		logs = append(logs, items[i])
 	}
 
-	return logs, int64(len(logs)), nil
+	return logs, 0, nil
 }
 
 func (d *Doris) DescribeTable(ctx context.Context, query interface{}) ([]*types.ColumnProperty, error) {

docker/compose-postgres/initsql_for_postgres/a-n9e-for-Postgres.sql

@@ -956,7 +956,7 @@ CREATE TABLE notify_rule (
     id bigserial PRIMARY KEY,
     name varchar(255) NOT NULL,
     description text,
-    enable boolean DEFAULT false,
+    enable smallint NOT NULL DEFAULT 0,
     user_group_ids varchar(255) NOT NULL DEFAULT '',
     notify_configs text,
     pipeline_configs text,
@@ -971,7 +971,7 @@ CREATE TABLE notify_channel (
     name varchar(255) NOT NULL,
     ident varchar(255) NOT NULL,
     description text,
-    enable boolean DEFAULT false,
+    enable smallint NOT NULL DEFAULT 0,
     param_config text,
     request_type varchar(50) NOT NULL,
     request_config text,

dskit/doris/doris.go

@@ -20,8 +20,8 @@ import (
 
 // Doris struct to hold connection details and the connection object
 type Doris struct {
-	Addr            string `json:"doris.addr" mapstructure:"doris.addr"`         // fe mysql endpoint
-	FeAddr          string `json:"doris.fe_addr" mapstructure:"doris.fe_addr"`   // fe http endpoint
+	Addr            string `json:"doris.addr" mapstructure:"doris.addr"`         // be node
+	FeAddr          string `json:"doris.fe_addr" mapstructure:"doris.fe_addr"`   // fe node
 	User            string `json:"doris.user" mapstructure:"doris.user"`         //
 	Password        string `json:"doris.password" mapstructure:"doris.password"` //
 	Timeout         int    `json:"doris.timeout" mapstructure:"doris.timeout"`

go.mod

@@ -1,6 +1,6 @@
 module github.com/ccfos/nightingale/v6
 
-go 1.23.0
+go 1.22
 
 require (
 	github.com/BurntSushi/toml v1.4.0
@@ -47,7 +47,7 @@ require (
 	github.com/tidwall/gjson v1.14.2
 	github.com/toolkits/pkg v1.3.8
 	golang.org/x/exp v0.0.0-20231006140011-7918f672742d
-	golang.org/x/oauth2 v0.27.0
+	golang.org/x/oauth2 v0.23.0
 	gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df
 	gopkg.in/yaml.v2 v2.4.0
 	gorm.io/driver/clickhouse v0.6.1

go.sum

@@ -416,8 +416,8 @@ golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc=
 golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
 golang.org/x/net v0.34.0 h1:Mb7Mrk043xzHgnRM88suvJFwzVrRfHEHJEl5/71CKw0=
 golang.org/x/net v0.34.0/go.mod h1:di0qlW3YNM5oh6GqDGQr92MyTozJPmybPK4Ev/Gm31k=
-golang.org/x/oauth2 v0.27.0 h1:da9Vo7/tDv5RH/7nZDz1eMGS/q1Vv1N/7FCrBhI9I3M=
-golang.org/x/oauth2 v0.27.0/go.mod h1:onh5ek6nERTohokkhCD/y2cV4Do3fxFHFuAejCkRWT8=
+golang.org/x/oauth2 v0.23.0 h1:PbgcYx2W7i4LvjJWEbf0ngHV6qJYr86PkAV3bXdLEbs=
+golang.org/x/oauth2 v0.23.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=

memsto/notify_channel_cache.go

@@ -240,17 +240,17 @@ func (ncc *NotifyChannelCacheType) startHttpChannel(chID int64, channel *models.
 		go ncc.startNotifyConsumer(chID, queue, quitCh)
 	}
 
-	logger.Debugf("started %d notify consumers for channel %d", concurrency, chID)
+	logger.Infof("started %d notify consumers for channel %d", concurrency, chID)
 }
 
 // 启动通知消费者协程
 func (ncc *NotifyChannelCacheType) startNotifyConsumer(channelID int64, queue *list.SafeListLimited, quitCh chan struct{}) {
-	logger.Debugf("starting notify consumer for channel %d", channelID)
+	logger.Infof("starting notify consumer for channel %d", channelID)
 
 	for {
 		select {
 		case <-quitCh:
-			logger.Debugf("notify consumer for channel %d stopped", channelID)
+			logger.Infof("notify consumer for channel %d stopped", channelID)
 			return
 		default:
 			// 从队列中取出任务
@@ -502,11 +502,7 @@ func (ncc *NotifyChannelCacheType) startEmailSender(chID int64, smtp *models.SMT
 					m.Mail.GetHeader("Subject"), m.Mail.GetHeader("To"))
 			}
 
-			// 记录通知详情
-			if ncc.notifyRecordFunc != nil {
-				target := strings.Join(m.Mail.GetHeader("To"), ",")
-				ncc.notifyRecordFunc(ncc.ctx, m.Events, m.NotifyRuleId, "Email", target, "success", err)
-			}
+			// sender.NotifyRecord(ncc.ctx, m.Events, m.NotifyRuleId, models.Email, strings.Join(m.Mail.GetHeader("To"), ","), "", err)
 			size++
 
 			if size >= conf.Batch {

models/alert_rule.go

@@ -892,8 +892,7 @@ func (ar *AlertRule) FE2DB() error {
 	}
 	ar.AlgoParams = string(algoParamsByte)
 
-	// 老的规则，是 PromQl 和 Severity 字段，新版的规则，使用 RuleConfig 字段
-	if ar.RuleConfigJson == nil || len(ar.PromQl) > 0 {
+	if ar.RuleConfigJson == nil {
 		query := PromQuery{
 			PromQl:   ar.PromQl,
 			Severity: ar.Severity,
@@ -1009,8 +1008,11 @@ func AlertRuleExists(ctx *ctx.Context, id, groupId int64, name string) (bool, er
 	if err != nil {
 		return false, err
 	}
+	if len(lst) == 0 {
+		return false, nil
+	}
 
-	return len(lst) > 0, nil
+	return false, nil
 }
 
 func GetAlertRuleIdsByTaskId(ctx *ctx.Context, taskId int64) ([]int64, error) {

models/alert_subscribe.go

@@ -116,18 +116,7 @@ func (s *AlertSubscribe) Verify() error {
 		return errors.New("severities is required")
 	}
 
-	if s.NotifyVersion == 1 {
-		if len(s.NotifyRuleIds) == 0 {
-			return errors.New("no notify rules selected")
-		}
-
-		s.UserGroupIds = ""
-		s.RedefineChannels = 0
-		s.NewChannels = ""
-		s.RedefineWebhooks = 0
-		s.Webhooks = ""
-		s.RedefineSeverity = 0
-		s.NewSeverity = 0
+	if len(s.NotifyRuleIds) > 0 {
 		return nil
 	}
 
@@ -143,8 +132,8 @@ func (s *AlertSubscribe) Verify() error {
 		}
 	}
 
-	if s.NotifyVersion == 0 {
-		s.NotifyRuleIds = []int64{}
+	if s.NotifyVersion == 1 && len(s.NotifyRuleIds) == 0 {
+		return errors.New("no notify rules selected")
 	}
 
 	return nil
@@ -392,17 +381,6 @@ func (s *AlertSubscribe) MatchProd(prod string) bool {
 	return s.Prod == prod
 }
 
-func (s *AlertSubscribe) MatchCate(cate string) bool {
-	if s.Cate == "" {
-		return true
-	}
-
-	if s.Cate == "host" {
-		return cate == "host"
-	}
-	return true
-}
-
 func (s *AlertSubscribe) MatchCluster(dsId int64) bool {
 	// 没有配置数据源, 或者事件不需要关联数据源
 	// do not match any datasource or event not related to datasource

models/migrate/migrate.go

@@ -72,10 +72,8 @@ func MigrateTables(db *gorm.DB) error {
 
 	if isPostgres(db) {
 		dts = append(dts, &models.PostgresBuiltinComponent{})
-		DropUniqueFiledLimit(db, &models.PostgresBuiltinComponent{}, "idx_ident", "idx_ident")
 	} else {
 		dts = append(dts, &models.BuiltinComponent{})
-		DropUniqueFiledLimit(db, &models.BuiltinComponent{}, "idx_ident", "idx_ident")
 	}
 
 	if !db.Migrator().HasColumn(&imodels.TaskSchedulerHealth{}, "scheduler") {
@@ -126,17 +124,11 @@ func MigrateTables(db *gorm.DB) error {
 	DropUniqueFiledLimit(db, &Configs{}, "ckey", "configs_ckey_key")
 	// 删除 builtin_metrics 表的 idx_collector_typ_name 唯一索引
 	DropUniqueFiledLimit(db, &models.BuiltinMetric{}, "idx_collector_typ_name", "idx_collector_typ_name")
-
 	InsertPermPoints(db)
 	return nil
 }
 
 func DropUniqueFiledLimit(db *gorm.DB, dst interface{}, uniqueFiled string, pgUniqueFiled string) { // UNIQUE KEY (`ckey`)
-	// 先检查表是否存在，如果不存在则直接返回
-	if !db.Migrator().HasTable(dst) {
-		return
-	}
-
 	if db.Migrator().HasIndex(dst, uniqueFiled) {
 		err := db.Migrator().DropIndex(dst, uniqueFiled) //mysql  DROP INDEX
 		if err != nil {
@@ -444,7 +436,6 @@ type NotifyRule struct {
 	UserGroupIds    []int64                 `gorm:"column:user_group_ids;type:varchar(255)"`
 	NotifyConfigs   []models.NotifyConfig   `gorm:"column:notify_configs;type:text"`
 	PipelineConfigs []models.PipelineConfig `gorm:"column:pipeline_configs;type:text"`
-	ExtraConfig     interface{}             `gorm:"column:extra_config;type:text"`
 	CreateAt        int64                   `gorm:"column:create_at;not null;default:0"`
 	CreateBy        string                  `gorm:"column:create_by;type:varchar(64);not null;default:''"`
 	UpdateAt        int64                   `gorm:"column:update_at;not null;default:0"`

models/notify_channel.go

@@ -922,6 +922,11 @@ func (ncc *NotifyChannelConfig) ValidateFlashDutyRequestConfig() error {
 }
 
 func (ncc *NotifyChannelConfig) Update(ctx *ctx.Context, ref NotifyChannelConfig) error {
+	// ref.FE2DB()
+	if ncc.Ident != ref.Ident {
+		return errors.New("cannot update ident")
+	}
+
 	ref.ID = ncc.ID
 	ref.CreateAt = ncc.CreateAt
 	ref.CreateBy = ncc.CreateBy

models/notify_rule.go

@@ -19,7 +19,6 @@ type NotifyRule struct {
 
 	// 通知配置
 	NotifyConfigs []NotifyConfig `json:"notify_configs" gorm:"serializer:json"`
-	ExtraConfig   interface{}    `json:"extra_config" gorm:"serializer:json"`
 
 	CreateAt int64  `json:"create_at"`
 	CreateBy string `json:"create_by"`

models/prom_alert_rule.go

@@ -75,8 +75,6 @@ func ConvertAlert(rule PromRule, interval string, datasouceQueries []DatasourceQ
 		AnnotationsJSON:   annotations,
 		AppendTagsJSON:    appendTags,
 		DatasourceQueries: datasouceQueries,
-		NotifyVersion:     1,
-		NotifyRuleIds:     []int64{},
 	}
 
 	return ar

models/target.go

@@ -124,7 +124,7 @@ func TargetStatistics(ctx *ctx.Context) (*Statistics, error) {
 
 func TargetDel(ctx *ctx.Context, idents []string, deleteHook TargetDeleteHookFunc) error {
 	if len(idents) == 0 {
-		return errors.New("idents cannot be empty")
+		panic("idents empty")
 	}
 
 	return DB(ctx).Transaction(func(tx *gorm.DB) error {

models/user_token.go

@@ -8,11 +8,11 @@ import (
 
 type UserToken struct {
 	Id        int64  `json:"id" gorm:"primaryKey"`
-	Username  string `json:"username" gorm:"type:varchar(255); not null; default ''"`
-	TokenName string `json:"token_name" gorm:"type:varchar(255); not null; default ''"`
-	Token     string `json:"token" gorm:"type:varchar(255); not null; default ''"`
-	CreateAt  int64  `json:"create_at" gorm:"type:bigint; not null; default 0"`
-	LastUsed  int64  `json:"last_used" gorm:"type:bigint; not null; default 0"`
+	Username  string `json:"username" gorm:"type:varchar(255) not null default ''"`
+	TokenName string `json:"token_name" gorm:"type:varchar(255) not null default ''"`
+	Token     string `json:"token" gorm:"type:varchar(255) not null default ''"`
+	CreateAt  int64  `json:"create_at" gorm:"type:bigint not null default 0"`
+	LastUsed  int64  `json:"last_used" gorm:"type:bigint not null default 0"`
 }
 
 func (UserToken) TableName() string {

pkg/flashduty/sync_user.go

@@ -89,7 +89,7 @@ func diffMap(m1, m2 map[int64]*models.User) []models.User {
 func updateUser(appKey string, m1, m2 map[int64]*models.User) {
 	for i := range m1 {
 		if _, ok := m2[i]; ok {
-			if m1[i].Email != m2[i].Email || !PhoneIsSame(m1[i].Phone, m2[i].Phone) || m1[i].Username != m2[i].Username {
+			if m1[i].Email != m2[i].Email || m1[i].Phone != m2[i].Phone || m1[i].Username != m2[i].Username {
 				var flashdutyUser User
 
 				flashdutyUser = User{
@@ -110,30 +110,6 @@ func updateUser(appKey string, m1, m2 map[int64]*models.User) {
 	}
 }
 
-func PhoneIsSame(phone1, phone2 string) bool {
-	// 兼容不同国家/地区前缀，例如 +86、+1、+44 等，以及包含空格或短横线的格式
-	normalize := func(p string) string {
-		p = strings.TrimSpace(p)
-		p = strings.ReplaceAll(p, " ", "")
-		p = strings.ReplaceAll(p, "-", "")
-		p = strings.TrimPrefix(p, "+")
-		return p
-	}
-
-	p1 := normalize(phone1)
-	p2 := normalize(phone2)
-
-	if p1 == p2 {
-		return true
-	}
-
-	// 如果长度相差不超过 3 且较长的以较短的结尾，则认为是相同号码（忽略最多 3 位国家区号差异）
-	if len(p1) > len(p2) {
-		return len(p1)-len(p2) <= 3 && strings.HasSuffix(p1, p2)
-	}
-	return len(p2)-len(p1) <= 3 && strings.HasSuffix(p2, p1)
-}
-
 type User struct {
 	Email      string  `json:"email,omitempty"`
 	Phone      string  `json:"phone,omitempty"`

pkg/flashduty/sync_user_test.go

@@ -1,67 +0,0 @@
-package flashduty
-
-import "testing"
-
-func TestPhoneIsSame(t *testing.T) {
-	tests := []struct {
-		name   string
-		phone1 string
-		phone2 string
-		same   bool
-	}{
-		{
-			name:   "blank",
-			phone1: "",
-			phone2: "",
-			same:   true,
-		},
-		{
-			name:   "China +86 prefix",
-			phone1: "+8613812345678",
-			phone2: "13812345678",
-			same:   true,
-		},
-		{
-			name:   "China +86 with spaces and hyphens",
-			phone1: "+86 138-1234-5678",
-			phone2: "13812345678",
-			same:   true,
-		},
-		{
-			name:   "USA +1 prefix",
-			phone1: "+1 234-567-8900",
-			phone2: "2345678900",
-			same:   true,
-		},
-		{
-			name:   "UK +44 prefix",
-			phone1: "+442078765432",
-			phone2: "2078765432",
-			same:   true,
-		},
-		{
-			name:   "India +91 prefix",
-			phone1: "+919876543210",
-			phone2: "9876543210",
-			same:   true,
-		},
-		{
-			name:   "Germany +49 prefix",
-			phone1: "+4915123456789",
-			phone2: "15123456789",
-			same:   true,
-		},
-		{
-			name:   "Different numbers",
-			phone1: "+8613812345678",
-			phone2: "13812345679",
-			same:   false,
-		},
-	}
-
-	for _, tt := range tests {
-		if got := PhoneIsSame(tt.phone1, tt.phone2); got != tt.same {
-			t.Errorf("%s: expected %v, got %v", tt.name, tt.same, got)
-		}
-	}
-}

pkg/i18nx/var.go

@@ -71,7 +71,6 @@ var I18N = `{
     "no notify groups selected": "未选择通知组",
     "all users missing notify channel configurations: %v": "所有用户缺少通知渠道配置: %v",
     "event match subscribe and notify settings ok": "事件匹配订阅规则，通知设置正常",
-    "/loki suffix is miss, please add /loki to the url: %s": "缺少/loki后缀，请在URL中添加/loki：%s",
 
     "event time not match time filter": "事件时间不匹配时间过滤器",
     "event severity not match severity filter": "事件等级不匹配等级过滤器",
@@ -262,7 +261,6 @@ var I18N = `{
     "no notify groups selected": "未選擇通知組",
     "all users missing notify channel configurations: %v": "所有用戶缺少通知渠道配置: %v",
     "event match subscribe and notify settings ok": "事件匹配訂閱規則，通知設置正常",
-    "/loki suffix is miss, please add /loki to the url: %s": "缺少/loki後綴，請在URL中添加/loki：%s",
 
     "event time not match time filter": "事件時間不匹配時間過濾器",
     "event severity not match severity filter": "事件等級不匹配等級過濾器",
@@ -450,7 +448,6 @@ var I18N = `{
     "no notify groups selected": "通知グループが選択されていません",
     "all users missing notify channel configurations: %v": "すべてのユーザーに通知チャンネル設定がありません: %v",
     "event match subscribe and notify settings ok": "イベントがサブスクライブルールに一致し、通知設定が正常です",
-    "/loki suffix is miss, please add /loki to the url: %s": "/lokiサフィックスがありません。URLに/lokiを追加してください: %s",
 
     "event time not match time filter": "イベント時間が時間フィルタと一致しません",
     "event severity not match severity filter": "イベント等級が等級フィルタと一致しません",
@@ -638,7 +635,6 @@ var I18N = `{
     "no notify groups selected": "Группы уведомлений не выбраны",
     "all users missing notify channel configurations: %v": "У всех пользователей отсутствуют настройки каналов уведомлений: %v",
     "event match subscribe and notify settings ok": "Событие соответствует правилу подписки, настройки уведомлений в порядке",
-    "/loki suffix is miss, please add /loki to the url: %s": "Отсутствует суффикс /loki, пожалуйста, добавьте /loki к URL: %s",
 
     "event time not match time filter": "Время события не соответствует временному фильтру",
     "event severity not match severity filter": "Уровень события не соответствует фильтру уровня",