fix execution of notify script

.github/workflows/issue-translator.yml

@@ -1,22 +0,0 @@
-name: 'Issue Translator'
-
-on:
-  issues:
-    types: [opened]
-
-jobs:
-  translate:
-    runs-on: ubuntu-latest
-    permissions:
-      issues: write
-      contents: read
-    steps:
-      - name: Translate Issues
-        uses: usthe/issues-translate-action@v2.7
-        with:
-          # 是否翻译 issue 标题
-          IS_MODIFY_TITLE: true
-          # GitHub Token
-          BOT_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          # 自定义翻译标注（可选）
-          # CUSTOM_BOT_NOTE: "Translation by bot"

.gitignore

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

.typos.toml

@@ -1,41 +0,0 @@
-# Configuration for typos tool
-[files]
-extend-exclude = [
-    # Ignore auto-generated easyjson files
-    "*_easyjson.go",
-    # Ignore binary files
-    "*.gz",
-    "*.tar",
-    "n9e",
-    "n9e-*"
-]
-
-[default.extend-identifiers]
-# Didi is a company name (DiDi), not a typo
-Didi = "Didi"
-# datas is intentionally used as plural of data (slice variable)
-datas = "datas"
-# pendings is intentionally used as plural
-pendings = "pendings"
-pendingsUseByRecover = "pendingsUseByRecover"
-pendingsUseByRecoverMap = "pendingsUseByRecoverMap"
-# typs is intentionally used as shorthand for types (parameter name)
-typs = "typs"
-
-[default.extend-words]
-# Some false positives
-ba = "ba"
-# Specific corrections for ambiguous typos
-contigious = "contiguous"
-onw = "own"
-componet = "component"
-Patten = "Pattern"
-Requets = "Requests"
-Mis = "Miss"
-exporer = "exporter"
-soruce = "source"
-verison = "version"
-Configations = "Configurations"
-emmited = "emitted"
-Utlization = "Utilization"
-serie = "series"

README.md

@@ -31,9 +31,7 @@
 
 Nightingale is an open-source monitoring project that focuses on alerting. Similar to Grafana, Nightingale also connects with various existing data sources. However, while Grafana emphasizes visualization, Nightingale places greater emphasis on the alerting engine, as well as the processing and distribution of alarms.
 
-> 💡 Nightingale has now officially launched the [MCP-Server](https://github.com/n9e/n9e-mcp-server/). This MCP Server enables AI assistants to interact with the Nightingale API using natural language, facilitating alert management, monitoring, and observability tasks.
-> 
-> The Nightingale project was initially developed and open-sourced by DiDi.inc. On May 11, 2022, it was donated to the Open Source Development Committee of the China Computer Federation (CCF ODTC).
+> The Nightingale project was initially developed and open-sourced by DiDi.inc. On May 11, 2022, it was donated to the Open Source Development Committee of the China Computer Federation (CCF ODC).
 
 ![](https://n9e.github.io/img/global/arch-bg.png)
 
@@ -49,7 +47,7 @@ Nightingale itself does not provide monitoring data collection capabilities. We
 
 For certain edge data centers with poor network connectivity to the central Nightingale server, we offer a distributed deployment mode for the alerting engine. In this mode, even if the network is disconnected, the alerting functionality remains unaffected.
 
-![Edge Deployment Mode](doc/img/readme/multi-region-arch.png)
+![Edge Deployment Mode](doc/img/readme/20240222102119.png)
 
 > In the above diagram, Data Center A has a good network with the central data center, so it uses the Nightingale process in the central data center as the alerting engine. Data Center B has a poor network with the central data center, so it deploys `n9e-edge` as the alerting engine to handle alerting for its own data sources.
 
@@ -70,7 +68,7 @@ Then Nightingale is not suitable. It is recommended that you choose on-call prod
 
 ## 🔑 Key Features
 
-![Nightingale Alerting rules](doc/img/readme/alerting-rules-en.png)
+![Nightingale Alerting rules](doc/img/readme/2025-05-23_18-43-37.png)
 
 - Nightingale supports alerting rules, mute rules, subscription rules, and notification rules. It natively supports 20 types of notification media and allows customization of message templates.  
 - It supports event pipelines for Pipeline processing of alarms, facilitating automated integration with in-house systems. For example, it can append metadata to alarms or perform relabeling on events. 
@@ -78,19 +76,19 @@ Then Nightingale is not suitable. It is recommended that you choose on-call prod
 - Many databases and middleware come with built-in alert rules that can be directly imported and used. It also supports direct import of Prometheus alerting rules.  
 - It supports alerting self-healing, which automatically triggers a script to execute predefined logic after an alarm is generated—such as cleaning up disk space or capturing the current system state.
 
-![Nightingale Alarm Dashboard](doc/img/readme/active-events-en.png)
+![Nightingale Alarm Dashboard](doc/img/readme/2025-05-30_08-49-28.png)
 
 - Nightingale archives historical alarms and supports multi-dimensional query and statistics.  
 - It supports flexible aggregation grouping, allowing a clear view of the distribution of alarms across the company.
 
-![Nightingale Integration Center](doc/img/readme/integration-components-en.png)
+![Nightingale Integration Center](doc/img/readme/2025-05-23_18-46-06.png)
 
 - Nightingale has built-in metric descriptions, dashboards, and alerting rules for common operating systems, middleware, and databases, which are contributed by the community with varying quality.  
 - It directly receives data via multiple protocols such as Remote Write, OpenTSDB, Datadog, and Falcon, integrates with various Agents.  
 - It supports data sources like Prometheus, ElasticSearch, Loki, ClickHouse, MySQL, Postgres, allowing alerting based on data from these sources.  
 - Nightingale can be easily embedded into internal enterprise systems (e.g. Grafana, CMDB), and even supports configuring menu visibility for these embedded systems.
 
-![Nightingale dashboards](doc/img/readme/dashboard-en.png)
+![Nightingale dashboards](doc/img/readme/2025-05-23_18-49-02.png)
 
 - Nightingale supports dashboard functionality, including common chart types, and comes with pre-built dashboards. The image above is a screenshot of one of these dashboards.  
 - If you are already accustomed to Grafana, it is recommended to continue using Grafana for visualization, as Grafana has deeper expertise in this area.  
@@ -114,4 +112,4 @@ Then Nightingale is not suitable. It is recommended that you choose on-call prod
 </a>
 
 ## 📜 License
-- [Apache License V2.0](https://github.com/ccfos/nightingale/blob/main/LICENSE)
+- [Apache License V2.0](https://github.com/didi/nightingale/blob/main/LICENSE)

README_zh.md

@@ -3,7 +3,7 @@
     <img src="doc/img/Nightingale_L_V.png" alt="nightingale - cloud native monitoring" width="100" /></a>
 </p>
 <p align="center">
-  <b>开源监控告警管理专家</b>
+  <b>开源告警管理专家</b>
 </p>
 
 <p align="center">
@@ -29,12 +29,9 @@
 
 ## 夜莺是什么
 
-夜莺 Nightingale 是一款开源云原生监控告警工具，是中国计算机学会接受捐赠并托管的第一个开源项目，在 GitHub 上有超过 12000 颗星，广受关注和使用。夜莺的统一告警引擎，可以对接 Prometheus、Elasticsearch、ClickHouse、Loki、MySQL 等多种数据源，提供全面的告警判定、丰富的事件处理和灵活的告警分发及通知能力。
+夜莺监控（Nightingale）是一款侧重告警的监控类开源项目。类似 Grafana 的数据源集成方式，夜莺也是对接多种既有的数据源，不过 Grafana 侧重在可视化，夜莺是侧重在告警引擎、告警事件的处理和分发。
 
-夜莺侧重于监控告警，类似于 Grafana 的数据源集成方式，夜莺也是对接多种既有的数据源，不过 Grafana 侧重于可视化，夜莺则是侧重于告警引擎、告警事件的处理和分发。
-
-> - 💡夜莺正式推出了 [MCP-Server](https://github.com/n9e/n9e-mcp-server/)，此 MCP Server 允许 AI 助手通过自然语言与夜莺 API 交互，实现告警管理、监控和可观测性任务。
-> - 夜莺监控项目，最初由滴滴开发和开源，并于 2022 年 5 月 11 日，捐赠予中国计算机学会开源发展技术委员会（CCF ODTC），为 CCF ODTC 成立后接受捐赠的第一个开源项目。
+> 夜莺监控项目，最初由滴滴开发和开源，并于 2022 年 5 月 11 日，捐赠予中国计算机学会开源发展委员会（CCF ODC），为 CCF ODC 成立后接受捐赠的第一个开源项目。
 
 ![](https://n9e.github.io/img/global/arch-bg.png)
 
@@ -120,4 +117,4 @@
 </a>
 
 ## License
-- [Apache License V2.0](https://github.com/ccfos/nightingale/blob/main/LICENSE)
+- [Apache License V2.0](https://github.com/didi/nightingale/blob/main/LICENSE)

alert/alert.go

@@ -75,11 +75,11 @@ func Initialize(configDir string, cryptoKey string) (func(), error) {
 
 	macros.RegisterMacro(macros.MacroInVain)
 	dscache.Init(ctx, false)
-	Start(config.Alert, config.Pushgw, syncStats, alertStats, externalProcessors, targetCache, busiGroupCache, alertMuteCache, alertRuleCache, notifyConfigCache, taskTplsCache, dsCache, ctx, promClients, userCache, userGroupCache, notifyRuleCache, notifyChannelCache, messageTemplateCache, configCvalCache)
+	Start(config.Alert, config.Pushgw, syncStats, alertStats, externalProcessors, targetCache, busiGroupCache, alertMuteCache, alertRuleCache, notifyConfigCache, taskTplsCache, dsCache, ctx, promClients, userCache, userGroupCache, notifyRuleCache, notifyChannelCache, messageTemplateCache)
 
 	r := httpx.GinEngine(config.Global.RunMode, config.HTTP,
 		configCvalCache.PrintBodyPaths, configCvalCache.PrintAccessLog)
-	rt := router.New(config.HTTP, config.Alert, alertMuteCache, targetCache, busiGroupCache, alertStats, ctx, externalProcessors, config.Log.Dir)
+	rt := router.New(config.HTTP, config.Alert, alertMuteCache, targetCache, busiGroupCache, alertStats, ctx, externalProcessors)
 
 	if config.Ibex.Enable {
 		ibex.ServerStart(false, nil, redis, config.HTTP.APIForService.BasicAuth, config.Alert.Heartbeat, &config.CenterApi, r, nil, config.Ibex, config.HTTP.Port)
@@ -98,7 +98,7 @@ func Initialize(configDir string, cryptoKey string) (func(), error) {
 
 func Start(alertc aconf.Alert, pushgwc pconf.Pushgw, syncStats *memsto.Stats, alertStats *astats.Stats, externalProcessors *process.ExternalProcessorsType, targetCache *memsto.TargetCacheType, busiGroupCache *memsto.BusiGroupCacheType,
 	alertMuteCache *memsto.AlertMuteCacheType, alertRuleCache *memsto.AlertRuleCacheType, notifyConfigCache *memsto.NotifyConfigCacheType, taskTplsCache *memsto.TaskTplCache, datasourceCache *memsto.DatasourceCacheType, ctx *ctx.Context,
-	promClients *prom.PromClientMap, userCache *memsto.UserCacheType, userGroupCache *memsto.UserGroupCacheType, notifyRuleCache *memsto.NotifyRuleCacheType, notifyChannelCache *memsto.NotifyChannelCacheType, messageTemplateCache *memsto.MessageTemplateCacheType, configCvalCache *memsto.CvalCache) {
+	promClients *prom.PromClientMap, userCache *memsto.UserCacheType, userGroupCache *memsto.UserGroupCacheType, notifyRuleCache *memsto.NotifyRuleCacheType, notifyChannelCache *memsto.NotifyChannelCacheType, messageTemplateCache *memsto.MessageTemplateCacheType) {
 	alertSubscribeCache := memsto.NewAlertSubscribeCache(ctx, syncStats)
 	recordingRuleCache := memsto.NewRecordingRuleCache(ctx, syncStats)
 	targetsOfAlertRulesCache := memsto.NewTargetOfAlertRuleCache(ctx, alertc.Heartbeat.EngineName, syncStats)
@@ -117,14 +117,14 @@ func Start(alertc aconf.Alert, pushgwc pconf.Pushgw, syncStats *memsto.Stats, al
 
 	eventProcessorCache := memsto.NewEventProcessorCache(ctx, syncStats)
 
-	dp := dispatch.NewDispatch(alertRuleCache, userCache, userGroupCache, alertSubscribeCache, targetCache, notifyConfigCache, taskTplsCache, notifyRuleCache, notifyChannelCache, messageTemplateCache, eventProcessorCache, configCvalCache, alertc.Alerting, ctx, alertStats)
-	consumer := dispatch.NewConsumer(alertc.Alerting, ctx, dp, promClients, alertMuteCache)
+	dp := dispatch.NewDispatch(alertRuleCache, userCache, userGroupCache, alertSubscribeCache, targetCache, notifyConfigCache, taskTplsCache, notifyRuleCache, notifyChannelCache, messageTemplateCache, eventProcessorCache, alertc.Alerting, ctx, alertStats)
+	consumer := dispatch.NewConsumer(alertc.Alerting, ctx, dp, promClients)
 
-	notifyRecordConsumer := sender.NewNotifyRecordConsumer(ctx)
+	notifyRecordComsumer := sender.NewNotifyRecordConsumer(ctx)
 
 	go dp.ReloadTpls()
 	go consumer.LoopConsume()
-	go notifyRecordConsumer.LoopConsume()
+	go notifyRecordComsumer.LoopConsume()
 
 	go queue.ReportQueueSize(alertStats)
 	go sender.ReportNotifyRecordQueueSize(alertStats)

alert/common/key.go

@@ -1,7 +1,6 @@
 package common
 
 import (
-	"encoding/json"
 	"fmt"
 	"strings"
 
@@ -14,20 +13,6 @@ func RuleKey(datasourceId, id int64) string {
 
 func MatchTags(eventTagsMap map[string]string, itags []models.TagFilter) bool {
 	for _, filter := range itags {
-		// target_group in和not in优先特殊处理：匹配通过则继续下一个 filter，匹配失败则整组不匹配
-		if filter.Key == "target_group" {
-			// target 字段从 event.JsonTagsAndValue() 中获取的
-			v, ok := eventTagsMap["target"]
-			if !ok {
-				return false
-			}
-			if !targetGroupMatch(v, filter) {
-				return false
-			}
-			continue
-		}
-
-		// 普通标签按原逻辑处理
 		value, has := eventTagsMap[filter.Key]
 		if !has {
 			return false
@@ -50,9 +35,9 @@ func MatchGroupsName(groupName string, groupFilter []models.TagFilter) bool {
 func matchTag(value string, filter models.TagFilter) bool {
 	switch filter.Func {
 	case "==":
-		return strings.TrimSpace(fmt.Sprintf("%v", filter.Value)) == strings.TrimSpace(value)
+		return strings.TrimSpace(filter.Value) == strings.TrimSpace(value)
 	case "!=":
-		return strings.TrimSpace(fmt.Sprintf("%v", filter.Value)) != strings.TrimSpace(value)
+		return strings.TrimSpace(filter.Value) != strings.TrimSpace(value)
 	case "in":
 		_, has := filter.Vset[value]
 		return has
@@ -64,65 +49,6 @@ func matchTag(value string, filter models.TagFilter) bool {
 	case "!~":
 		return !filter.Regexp.MatchString(value)
 	}
-	// unexpected func
+	// unexpect func
 	return false
 }
-
-// targetGroupMatch 处理 target_group 的特殊匹配逻辑
-func targetGroupMatch(value string, filter models.TagFilter) bool {
-	var valueMap map[string]interface{}
-	if err := json.Unmarshal([]byte(value), &valueMap); err != nil {
-		return false
-	}
-	switch filter.Func {
-	case "in", "not in":
-		// float64 类型的 id 切片
-		filterValueIds, ok := filter.Value.([]interface{})
-		if !ok {
-			return false
-		}
-		filterValueIdsMap := make(map[float64]struct{})
-		for _, id := range filterValueIds {
-			filterValueIdsMap[id.(float64)] = struct{}{}
-		}
-		// float64 类型的 groupIds 切片
-		groupIds, ok := valueMap["group_ids"].([]interface{})
-		if !ok {
-			return false
-		}
-		// in 只要 groupIds 中有一个在 filterGroupIds 中出现，就返回 true
-		// not in 则相反
-		found := false
-		for _, gid := range groupIds {
-			if _, found = filterValueIdsMap[gid.(float64)]; found {
-				break
-			}
-		}
-		if filter.Func == "in" {
-			return found
-		}
-		// filter.Func == "not in"
-		return !found
-
-	case "=~", "!~":
-		// 正则满足一个就认为 matched
-		groupNames, ok := valueMap["group_names"].([]interface{})
-		if !ok {
-			return false
-		}
-		matched := false
-		for _, gname := range groupNames {
-			if filter.Regexp.MatchString(fmt.Sprintf("%v", gname)) {
-				matched = true
-				break
-			}
-		}
-		if filter.Func == "=~" {
-			return matched
-		}
-		// "!~": 只要有一个匹配就返回 false，否则返回 true
-		return !matched
-	default:
-		return false
-	}
-}

alert/dispatch/consume.go

@@ -8,8 +8,8 @@ import (
 	"time"
 
 	"github.com/ccfos/nightingale/v6/alert/aconf"
+	"github.com/ccfos/nightingale/v6/alert/common"
 	"github.com/ccfos/nightingale/v6/alert/queue"
-	"github.com/ccfos/nightingale/v6/memsto"
 	"github.com/ccfos/nightingale/v6/models"
 	"github.com/ccfos/nightingale/v6/pkg/ctx"
 	"github.com/ccfos/nightingale/v6/pkg/poster"
@@ -26,15 +26,10 @@ type Consumer struct {
 	alerting aconf.Alerting
 	ctx      *ctx.Context
 
-	dispatch       *Dispatch
-	promClients    *prom.PromClientMap
-	alertMuteCache *memsto.AlertMuteCacheType
+	dispatch    *Dispatch
+	promClients *prom.PromClientMap
 }
 
-type EventMuteHookFunc func(event *models.AlertCurEvent) bool
-
-var EventMuteHook EventMuteHookFunc = func(event *models.AlertCurEvent) bool { return false }
-
 func InitRegisterQueryFunc(promClients *prom.PromClientMap) {
 	tplx.RegisterQueryFunc(func(datasourceID int64, promql string) model.Value {
 		if promClients.IsNil(datasourceID) {
@@ -48,14 +43,12 @@ func InitRegisterQueryFunc(promClients *prom.PromClientMap) {
 }
 
 // 创建一个 Consumer 实例
-func NewConsumer(alerting aconf.Alerting, ctx *ctx.Context, dispatch *Dispatch, promClients *prom.PromClientMap, alertMuteCache *memsto.AlertMuteCacheType) *Consumer {
+func NewConsumer(alerting aconf.Alerting, ctx *ctx.Context, dispatch *Dispatch, promClients *prom.PromClientMap) *Consumer {
 	return &Consumer{
 		alerting:    alerting,
 		ctx:         ctx,
 		dispatch:    dispatch,
 		promClients: promClients,
-
-		alertMuteCache: alertMuteCache,
 	}
 }
 
@@ -98,12 +91,12 @@ func (e *Consumer) consumeOne(event *models.AlertCurEvent) {
 	e.dispatch.Astats.CounterAlertsTotal.WithLabelValues(event.Cluster, eventType, event.GroupName).Inc()
 
 	if err := event.ParseRule("rule_name"); err != nil {
-		logger.Warningf("alert_eval_%d datasource_%d failed to parse rule name: %v", event.RuleId, event.DatasourceId, err)
+		logger.Warningf("ruleid:%d failed to parse rule name: %v", event.RuleId, err)
 		event.RuleName = fmt.Sprintf("failed to parse rule name: %v", err)
 	}
 
 	if err := event.ParseRule("annotations"); err != nil {
-		logger.Warningf("alert_eval_%d datasource_%d failed to parse annotations: %v", event.RuleId, event.DatasourceId, err)
+		logger.Warningf("ruleid:%d failed to parse annotations: %v", event.RuleId, err)
 		event.Annotations = fmt.Sprintf("failed to parse annotations: %v", err)
 		event.AnnotationsJSON["error"] = event.Annotations
 	}
@@ -111,12 +104,16 @@ func (e *Consumer) consumeOne(event *models.AlertCurEvent) {
 	e.queryRecoveryVal(event)
 
 	if err := event.ParseRule("rule_note"); err != nil {
-		logger.Warningf("alert_eval_%d datasource_%d failed to parse rule note: %v", event.RuleId, event.DatasourceId, err)
+		logger.Warningf("ruleid:%d failed to parse rule note: %v", event.RuleId, err)
 		event.RuleNote = fmt.Sprintf("failed to parse rule note: %v", err)
 	}
 
 	e.persist(event)
 
+	if event.IsRecovered && event.NotifyRecovered == 0 {
+		return
+	}
+
 	e.dispatch.HandleEventNotify(event, false)
 }
 
@@ -130,7 +127,7 @@ func (e *Consumer) persist(event *models.AlertCurEvent) {
 		var err error
 		event.Id, err = poster.PostByUrlsWithResp[int64](e.ctx, "/v1/n9e/event-persist", event)
 		if err != nil {
-			logger.Errorf("event:%s persist err:%v", event.Hash, err)
+			logger.Errorf("event:%+v persist err:%v", event, err)
 			e.dispatch.Astats.CounterRuleEvalErrorTotal.WithLabelValues(fmt.Sprintf("%v", event.DatasourceId), "persist_event", event.GroupName, fmt.Sprintf("%v", event.RuleId)).Inc()
 		}
 		return
@@ -138,7 +135,7 @@ func (e *Consumer) persist(event *models.AlertCurEvent) {
 
 	err := models.EventPersist(e.ctx, event)
 	if err != nil {
-		logger.Errorf("event:%s persist err:%v", event.Hash, err)
+		logger.Errorf("event%+v persist err:%v", event, err)
 		e.dispatch.Astats.CounterRuleEvalErrorTotal.WithLabelValues(fmt.Sprintf("%v", event.DatasourceId), "persist_event", event.GroupName, fmt.Sprintf("%v", event.RuleId)).Inc()
 	}
 }
@@ -156,12 +153,12 @@ func (e *Consumer) queryRecoveryVal(event *models.AlertCurEvent) {
 
 	promql = strings.TrimSpace(promql)
 	if promql == "" {
-		logger.Warningf("alert_eval_%d datasource_%d promql is blank", event.RuleId, event.DatasourceId)
+		logger.Warningf("rule_eval:%s promql is blank", getKey(event))
 		return
 	}
 
 	if e.promClients.IsNil(event.DatasourceId) {
-		logger.Warningf("alert_eval_%d datasource_%d error reader client is nil", event.RuleId, event.DatasourceId)
+		logger.Warningf("rule_eval:%s error reader client is nil", getKey(event))
 		return
 	}
 
@@ -170,7 +167,7 @@ func (e *Consumer) queryRecoveryVal(event *models.AlertCurEvent) {
 	var warnings promsdk.Warnings
 	value, warnings, err := readerClient.Query(e.ctx.Ctx, promql, time.Now())
 	if err != nil {
-		logger.Errorf("alert_eval_%d datasource_%d promql:%s, error:%v", event.RuleId, event.DatasourceId, promql, err)
+		logger.Errorf("rule_eval:%s promql:%s, error:%v", getKey(event), promql, err)
 		event.AnnotationsJSON["recovery_promql_error"] = fmt.Sprintf("promql:%s error:%v", promql, err)
 
 		b, err := json.Marshal(event.AnnotationsJSON)
@@ -184,12 +181,12 @@ func (e *Consumer) queryRecoveryVal(event *models.AlertCurEvent) {
 	}
 
 	if len(warnings) > 0 {
-		logger.Errorf("alert_eval_%d datasource_%d promql:%s, warnings:%v", event.RuleId, event.DatasourceId, promql, warnings)
+		logger.Errorf("rule_eval:%s promql:%s, warnings:%v", getKey(event), promql, warnings)
 	}
 
 	anomalyPoints := models.ConvertAnomalyPoints(value)
 	if len(anomalyPoints) == 0 {
-		logger.Warningf("alert_eval_%d datasource_%d promql:%s, result is empty", event.RuleId, event.DatasourceId, promql)
+		logger.Warningf("rule_eval:%s promql:%s, result is empty", getKey(event), promql)
 		event.AnnotationsJSON["recovery_promql_error"] = fmt.Sprintf("promql:%s error:%s", promql, "result is empty")
 	} else {
 		event.AnnotationsJSON["recovery_value"] = fmt.Sprintf("%v", anomalyPoints[0].Value)
@@ -204,3 +201,6 @@ func (e *Consumer) queryRecoveryVal(event *models.AlertCurEvent) {
 	}
 }
 
+func getKey(event *models.AlertCurEvent) string {
+	return common.RuleKey(event.DatasourceId, event.RuleId)
+}

alert/dispatch/dispatch.go

@@ -16,7 +16,6 @@ import (
 	"github.com/ccfos/nightingale/v6/alert/astats"
 	"github.com/ccfos/nightingale/v6/alert/common"
 	"github.com/ccfos/nightingale/v6/alert/pipeline"
-	"github.com/ccfos/nightingale/v6/alert/pipeline/engine"
 	"github.com/ccfos/nightingale/v6/alert/sender"
 	"github.com/ccfos/nightingale/v6/memsto"
 	"github.com/ccfos/nightingale/v6/models"
@@ -25,17 +24,6 @@ import (
 	"github.com/toolkits/pkg/logger"
 )
 
-var ShouldSkipNotify func(*ctx.Context, *models.AlertCurEvent, int64) bool
-var SendByNotifyRule func(*ctx.Context, *memsto.UserCacheType, *memsto.UserGroupCacheType, *memsto.NotifyChannelCacheType, *memsto.CvalCache,
-	[]*models.AlertCurEvent, int64, *models.NotifyConfig, *models.NotifyChannelConfig, *models.MessageTemplate)
-
-var EventProcessorCache *memsto.EventProcessorCacheType
-
-func init() {
-	ShouldSkipNotify = shouldSkipNotify
-	SendByNotifyRule = SendNotifyRuleMessage
-}
-
 type Dispatch struct {
 	alertRuleCache      *memsto.AlertRuleCacheType
 	userCache           *memsto.UserCacheType
@@ -44,7 +32,6 @@ type Dispatch struct {
 	targetCache         *memsto.TargetCacheType
 	notifyConfigCache   *memsto.NotifyConfigCacheType
 	taskTplsCache       *memsto.TaskTplCache
-	configCvalCache     *memsto.CvalCache
 
 	notifyRuleCache      *memsto.NotifyRuleCacheType
 	notifyChannelCache   *memsto.NotifyChannelCacheType
@@ -58,8 +45,9 @@ type Dispatch struct {
 	tpls             map[string]*template.Template
 	ExtraSenders     map[string]sender.Sender
 	BeforeSenderHook func(*models.AlertCurEvent) bool
-	ctx              *ctx.Context
-	Astats           *astats.Stats
+
+	ctx    *ctx.Context
+	Astats *astats.Stats
 
 	RwLock sync.RWMutex
 }
@@ -68,7 +56,7 @@ type Dispatch struct {
 func NewDispatch(alertRuleCache *memsto.AlertRuleCacheType, userCache *memsto.UserCacheType, userGroupCache *memsto.UserGroupCacheType,
 	alertSubscribeCache *memsto.AlertSubscribeCacheType, targetCache *memsto.TargetCacheType, notifyConfigCache *memsto.NotifyConfigCacheType,
 	taskTplsCache *memsto.TaskTplCache, notifyRuleCache *memsto.NotifyRuleCacheType, notifyChannelCache *memsto.NotifyChannelCacheType,
-	messageTemplateCache *memsto.MessageTemplateCacheType, eventProcessorCache *memsto.EventProcessorCacheType, configCvalCache *memsto.CvalCache, alerting aconf.Alerting, c *ctx.Context, astats *astats.Stats) *Dispatch {
+	messageTemplateCache *memsto.MessageTemplateCacheType, eventProcessorCache *memsto.EventProcessorCacheType, alerting aconf.Alerting, ctx *ctx.Context, astats *astats.Stats) *Dispatch {
 	notify := &Dispatch{
 		alertRuleCache:       alertRuleCache,
 		userCache:            userCache,
@@ -81,7 +69,6 @@ func NewDispatch(alertRuleCache *memsto.AlertRuleCacheType, userCache *memsto.Us
 		notifyChannelCache:   notifyChannelCache,
 		messageTemplateCache: messageTemplateCache,
 		eventProcessorCache:  eventProcessorCache,
-		configCvalCache:      configCvalCache,
 
 		alerting: alerting,
 
@@ -90,12 +77,11 @@ func NewDispatch(alertRuleCache *memsto.AlertRuleCacheType, userCache *memsto.Us
 		ExtraSenders:     make(map[string]sender.Sender),
 		BeforeSenderHook: func(*models.AlertCurEvent) bool { return true },
 
-		ctx:    c,
+		ctx:    ctx,
 		Astats: astats,
 	}
 
 	pipeline.Init()
-	EventProcessorCache = eventProcessorCache
 
 	// 设置通知记录回调函数
 	notifyChannelCache.SetNotifyRecordFunc(sender.NotifyRecord)
@@ -171,7 +157,7 @@ func (e *Dispatch) HandleEventWithNotifyRule(eventOrigin *models.AlertCurEvent)
 			// 深拷贝新的 event，避免并发修改 event 冲突
 			eventCopy := eventOrigin.DeepCopy()
 
-			logger.Infof("notify rule ids: %v, event: %s", notifyRuleId, eventCopy.Hash)
+			logger.Infof("notify rule ids: %v, event: %+v", notifyRuleId, eventCopy)
 			notifyRule := e.notifyRuleCache.Get(notifyRuleId)
 			if notifyRule == nil {
 				continue
@@ -180,12 +166,41 @@ func (e *Dispatch) HandleEventWithNotifyRule(eventOrigin *models.AlertCurEvent)
 			if !notifyRule.Enable {
 				continue
 			}
-			eventCopy.NotifyRuleId = notifyRuleId
-			eventCopy.NotifyRuleName = notifyRule.Name
 
-			eventCopy = HandleEventPipeline(notifyRule.PipelineConfigs, eventOrigin, eventCopy, e.eventProcessorCache, e.ctx, notifyRuleId, "notify_rule")
-			if ShouldSkipNotify(e.ctx, eventCopy, notifyRuleId) {
-				logger.Infof("notify_id: %d, event:%s, should skip notify", notifyRuleId, eventCopy.Hash)
+			var processors []models.Processor
+			for _, pipelineConfig := range notifyRule.PipelineConfigs {
+				if !pipelineConfig.Enable {
+					continue
+				}
+
+				eventPipeline := e.eventProcessorCache.Get(pipelineConfig.PipelineId)
+				if eventPipeline == nil {
+					logger.Warningf("notify_id: %d, event:%+v, processor not found", notifyRuleId, eventCopy)
+					continue
+				}
+
+				if !pipelineApplicable(eventPipeline, eventCopy) {
+					logger.Debugf("notify_id: %d, event:%+v, pipeline_id: %d, not applicable", notifyRuleId, eventCopy, pipelineConfig.PipelineId)
+					continue
+				}
+
+				processors = append(processors, e.eventProcessorCache.GetProcessorsById(pipelineConfig.PipelineId)...)
+			}
+
+			for _, processor := range processors {
+				var res string
+				var err error
+				logger.Infof("before processor notify_id: %d, event:%+v, processor:%+v", notifyRuleId, eventCopy, processor)
+				eventCopy, res, err = processor.Process(e.ctx, eventCopy)
+				if eventCopy == nil {
+					logger.Warningf("after processor notify_id: %d, event:%+v, processor:%+v, event is nil", notifyRuleId, eventCopy, processor)
+					break
+				}
+				logger.Infof("after processor notify_id: %d, event:%+v, processor:%+v, res:%v, err:%v", notifyRuleId, eventCopy, processor, res, err)
+			}
+
+			if eventCopy == nil {
+				// 如果 eventCopy 为 nil，说明 eventCopy 被 processor drop 掉了, 不再发送通知
 				continue
 			}
 
@@ -193,7 +208,7 @@ func (e *Dispatch) HandleEventWithNotifyRule(eventOrigin *models.AlertCurEvent)
 			for i := range notifyRule.NotifyConfigs {
 				err := NotifyRuleMatchCheck(&notifyRule.NotifyConfigs[i], eventCopy)
 				if err != nil {
-					logger.Errorf("notify_id: %d, event:%s, channel_id:%d, template_id: %d, notify_config:%+v, err:%v", notifyRuleId, eventCopy.Hash, notifyRule.NotifyConfigs[i].ChannelID, notifyRule.NotifyConfigs[i].TemplateID, notifyRule.NotifyConfigs[i], err)
+					logger.Errorf("notify_id: %d, event:%+v, channel_id:%d, template_id: %d, notify_config:%+v, err:%v", notifyRuleId, eventCopy, notifyRule.NotifyConfigs[i].ChannelID, notifyRule.NotifyConfigs[i].TemplateID, notifyRule.NotifyConfigs[i], err)
 					continue
 				}
 
@@ -201,85 +216,26 @@ func (e *Dispatch) HandleEventWithNotifyRule(eventOrigin *models.AlertCurEvent)
 				messageTemplate := e.messageTemplateCache.Get(notifyRule.NotifyConfigs[i].TemplateID)
 				if notifyChannel == nil {
 					sender.NotifyRecord(e.ctx, []*models.AlertCurEvent{eventCopy}, notifyRuleId, fmt.Sprintf("notify_channel_id:%d", notifyRule.NotifyConfigs[i].ChannelID), "", "", errors.New("notify_channel not found"))
-					logger.Warningf("notify_id: %d, event:%s, channel_id:%d, template_id: %d, notify_channel not found", notifyRuleId, eventCopy.Hash, notifyRule.NotifyConfigs[i].ChannelID, notifyRule.NotifyConfigs[i].TemplateID)
+					logger.Warningf("notify_id: %d, event:%+v, channel_id:%d, template_id: %d, notify_channel not found", notifyRuleId, eventCopy, notifyRule.NotifyConfigs[i].ChannelID, notifyRule.NotifyConfigs[i].TemplateID)
 					continue
 				}
 
-				if notifyChannel.RequestType != "flashduty" && notifyChannel.RequestType != "pagerduty" && messageTemplate == nil {
-					logger.Warningf("notify_id: %d, channel_name: %v, event:%s, template_id: %d, message_template not found", notifyRuleId, notifyChannel.Ident, eventCopy.Hash, notifyRule.NotifyConfigs[i].TemplateID)
+				if notifyChannel.RequestType != "flashduty" && messageTemplate == nil {
+					logger.Warningf("notify_id: %d, channel_name: %v, event:%+v, template_id: %d, message_template not found", notifyRuleId, notifyChannel.Ident, eventCopy, notifyRule.NotifyConfigs[i].TemplateID)
 					sender.NotifyRecord(e.ctx, []*models.AlertCurEvent{eventCopy}, notifyRuleId, notifyChannel.Name, "", "", errors.New("message_template not found"))
 
 					continue
 				}
 
-				go SendByNotifyRule(e.ctx, e.userCache, e.userGroupCache, e.notifyChannelCache, e.configCvalCache, []*models.AlertCurEvent{eventCopy}, notifyRuleId, &notifyRule.NotifyConfigs[i], notifyChannel, messageTemplate)
+				// todo go send
+				// todo 聚合 event
+				go e.sendV2([]*models.AlertCurEvent{eventCopy}, notifyRuleId, &notifyRule.NotifyConfigs[i], notifyChannel, messageTemplate)
 			}
 		}
 	}
 }
 
-func shouldSkipNotify(ctx *ctx.Context, event *models.AlertCurEvent, notifyRuleId int64) bool {
-	if event == nil {
-		// 如果 eventCopy 为 nil，说明 eventCopy 被 processor drop 掉了, 不再发送通知
-		return true
-	}
-
-	if event.IsRecovered && event.NotifyRecovered == 0 {
-		// 如果 eventCopy 是恢复事件，且 NotifyRecovered 为 0，则不发送通知
-		return true
-	}
-	return false
-}
-
-func HandleEventPipeline(pipelineConfigs []models.PipelineConfig, eventOrigin, event *models.AlertCurEvent, eventProcessorCache *memsto.EventProcessorCacheType, ctx *ctx.Context, id int64, from string) *models.AlertCurEvent {
-	workflowEngine := engine.NewWorkflowEngine(ctx)
-
-	for _, pipelineConfig := range pipelineConfigs {
-		if !pipelineConfig.Enable {
-			continue
-		}
-
-		eventPipeline := eventProcessorCache.Get(pipelineConfig.PipelineId)
-		if eventPipeline == nil {
-			logger.Warningf("processor_by_%s_id:%d pipeline_id:%d, event pipeline not found, event: %s", from, id, pipelineConfig.PipelineId, event.Hash)
-			continue
-		}
-
-		if !PipelineApplicable(eventPipeline, event) {
-			logger.Debugf("processor_by_%s_id:%d pipeline_id:%d, event pipeline not applicable, event: %s", from, id, pipelineConfig.PipelineId, event.Hash)
-			continue
-		}
-
-		// 统一使用工作流引擎执行（兼容线性模式和工作流模式）
-		triggerCtx := &models.WorkflowTriggerContext{
-			Mode:      models.TriggerModeEvent,
-			TriggerBy: from + "_" + strconv.FormatInt(id, 10),
-		}
-
-		resultEvent, result, err := workflowEngine.Execute(eventPipeline, event, triggerCtx)
-		if err != nil {
-			logger.Errorf("processor_by_%s_id:%d pipeline_id:%d, pipeline execute error: %v", from, id, pipelineConfig.PipelineId, err)
-			continue
-		}
-
-		if resultEvent == nil {
-			logger.Infof("processor_by_%s_id:%d pipeline_id:%d, event dropped, event: %s", from, id, pipelineConfig.PipelineId, eventOrigin.Hash)
-			if from == "notify_rule" {
-				sender.NotifyRecord(ctx, []*models.AlertCurEvent{eventOrigin}, id, "", "", result.Message, fmt.Errorf("processor_by_%s_id:%d pipeline_id:%d, drop by pipeline", from, id, pipelineConfig.PipelineId))
-			}
-			return nil
-		}
-
-		event = resultEvent
-		logger.Infof("processor_by_%s_id:%d pipeline_id:%d, pipeline executed, status:%s, message:%s", from, id, pipelineConfig.PipelineId, result.Status, result.Message)
-	}
-
-	event.FE2DB()
-	event.FillTagsMap()
-	return event
-}
-
-func PipelineApplicable(pipeline *models.EventPipeline, event *models.AlertCurEvent) bool {
+func pipelineApplicable(pipeline *models.EventPipeline, event *models.AlertCurEvent) bool {
 	if pipeline == nil {
 		return true
 	}
@@ -290,18 +246,15 @@ func PipelineApplicable(pipeline *models.EventPipeline, event *models.AlertCurEv
 
 	tagMatch := true
 	if len(pipeline.LabelFilters) > 0 {
-		// Deep copy to avoid concurrent map writes on cached objects
-		labelFiltersCopy := make([]models.TagFilter, len(pipeline.LabelFilters))
-		copy(labelFiltersCopy, pipeline.LabelFilters)
-		for i := range labelFiltersCopy {
-			if labelFiltersCopy[i].Func == "" {
-				labelFiltersCopy[i].Func = labelFiltersCopy[i].Op
+		for i := range pipeline.LabelFilters {
+			if pipeline.LabelFilters[i].Func == "" {
+				pipeline.LabelFilters[i].Func = pipeline.LabelFilters[i].Op
 			}
 		}
 
-		tagFilters, err := models.ParseTagFilter(labelFiltersCopy)
+		tagFilters, err := models.ParseTagFilter(pipeline.LabelFilters)
 		if err != nil {
-			logger.Errorf("pipeline applicable failed to parse tag filter: %v event:%s pipeline:%+v", err, event.Hash, pipeline)
+			logger.Errorf("pipeline applicable failed to parse tag filter: %v event:%+v pipeline:%+v", err, event, pipeline)
 			return false
 		}
 		tagMatch = common.MatchTags(event.TagsMap, tagFilters)
@@ -309,13 +262,9 @@ func PipelineApplicable(pipeline *models.EventPipeline, event *models.AlertCurEv
 
 	attributesMatch := true
 	if len(pipeline.AttrFilters) > 0 {
-		// Deep copy to avoid concurrent map writes on cached objects
-		attrFiltersCopy := make([]models.TagFilter, len(pipeline.AttrFilters))
-		copy(attrFiltersCopy, pipeline.AttrFilters)
-
-		tagFilters, err := models.ParseTagFilter(attrFiltersCopy)
+		tagFilters, err := models.ParseTagFilter(pipeline.AttrFilters)
 		if err != nil {
-			logger.Errorf("pipeline applicable failed to parse tag filter: %v event:%s pipeline:%+v err:%v", tagFilters, event.Hash, pipeline, err)
+			logger.Errorf("pipeline applicable failed to parse tag filter: %v event:%+v pipeline:%+v err:%v", tagFilters, event, pipeline, err)
 			return false
 		}
 
@@ -394,18 +343,15 @@ func NotifyRuleMatchCheck(notifyConfig *models.NotifyConfig, event *models.Alert
 
 	tagMatch := true
 	if len(notifyConfig.LabelKeys) > 0 {
-		// Deep copy to avoid concurrent map writes on cached objects
-		labelKeysCopy := make([]models.TagFilter, len(notifyConfig.LabelKeys))
-		copy(labelKeysCopy, notifyConfig.LabelKeys)
-		for i := range labelKeysCopy {
-			if labelKeysCopy[i].Func == "" {
-				labelKeysCopy[i].Func = labelKeysCopy[i].Op
+		for i := range notifyConfig.LabelKeys {
+			if notifyConfig.LabelKeys[i].Func == "" {
+				notifyConfig.LabelKeys[i].Func = notifyConfig.LabelKeys[i].Op
 			}
 		}
 
-		tagFilters, err := models.ParseTagFilter(labelKeysCopy)
+		tagFilters, err := models.ParseTagFilter(notifyConfig.LabelKeys)
 		if err != nil {
-			logger.Errorf("notify send failed to parse tag filter: %v event:%s notify_config:%+v", err, event.Hash, notifyConfig)
+			logger.Errorf("notify send failed to parse tag filter: %v event:%+v notify_config:%+v", err, event, notifyConfig)
 			return fmt.Errorf("failed to parse tag filter: %v", err)
 		}
 		tagMatch = common.MatchTags(event.TagsMap, tagFilters)
@@ -417,13 +363,9 @@ func NotifyRuleMatchCheck(notifyConfig *models.NotifyConfig, event *models.Alert
 
 	attributesMatch := true
 	if len(notifyConfig.Attributes) > 0 {
-		// Deep copy to avoid concurrent map writes on cached objects
-		attributesCopy := make([]models.TagFilter, len(notifyConfig.Attributes))
-		copy(attributesCopy, notifyConfig.Attributes)
-
-		tagFilters, err := models.ParseTagFilter(attributesCopy)
+		tagFilters, err := models.ParseTagFilter(notifyConfig.Attributes)
 		if err != nil {
-			logger.Errorf("notify send failed to parse tag filter: %v event:%s notify_config:%+v err:%v", tagFilters, event.Hash, notifyConfig, err)
+			logger.Errorf("notify send failed to parse tag filter: %v event:%+v notify_config:%+v err:%v", tagFilters, event, notifyConfig, err)
 			return fmt.Errorf("failed to parse tag filter: %v", err)
 		}
 
@@ -434,14 +376,13 @@ func NotifyRuleMatchCheck(notifyConfig *models.NotifyConfig, event *models.Alert
 		return fmt.Errorf("event attributes not match attributes filter")
 	}
 
-	logger.Infof("notify send timeMatch:%v severityMatch:%v tagMatch:%v attributesMatch:%v event:%s notify_config:%+v", timeMatch, severityMatch, tagMatch, attributesMatch, event.Hash, notifyConfig)
+	logger.Infof("notify send timeMatch:%v severityMatch:%v tagMatch:%v attributesMatch:%v event:%+v notify_config:%+v", timeMatch, severityMatch, tagMatch, attributesMatch, event, notifyConfig)
 	return nil
 }
 
-func GetNotifyConfigParams(notifyConfig *models.NotifyConfig, contactKey string, userCache *memsto.UserCacheType, userGroupCache *memsto.UserGroupCacheType) ([]string, []int64, []string, map[string]string) {
+func GetNotifyConfigParams(notifyConfig *models.NotifyConfig, contactKey string, userCache *memsto.UserCacheType, userGroupCache *memsto.UserGroupCacheType) ([]string, []int64, map[string]string) {
 	customParams := make(map[string]string)
 	var flashDutyChannelIDs []int64
-	var pagerDutyRoutingKeys []string
 	var userInfoParams models.CustomParams
 
 	for key, value := range notifyConfig.Params {
@@ -459,26 +400,13 @@ func GetNotifyConfigParams(notifyConfig *models.NotifyConfig, contactKey string,
 					}
 				}
 			}
-		case "pagerduty_integration_keys", "pagerduty_integration_ids":
-			if key == "pagerduty_integration_ids" {
-				// 不处理ids，直接跳过，这个字段只给前端标记用
-				continue
-			}
-			if data, err := json.Marshal(value); err == nil {
-				var keys []string
-				if json.Unmarshal(data, &keys) == nil {
-					pagerDutyRoutingKeys = keys
-					break
-				}
-			}
 		default:
-			// 避免直接 value.(string) 导致 panic，支持多种类型并统一为字符串
 			customParams[key] = value.(string)
 		}
 	}
 
 	if len(userInfoParams.UserIDs) == 0 && len(userInfoParams.UserGroupIDs) == 0 {
-		return []string{}, flashDutyChannelIDs, pagerDutyRoutingKeys, customParams
+		return []string{}, flashDutyChannelIDs, customParams
 	}
 
 	userIds := make([]int64, 0)
@@ -514,20 +442,18 @@ func GetNotifyConfigParams(notifyConfig *models.NotifyConfig, contactKey string,
 		visited[user.Id] = true
 	}
 
-	return sendtos, flashDutyChannelIDs, pagerDutyRoutingKeys, customParams
+	return sendtos, flashDutyChannelIDs, customParams
 }
 
-func SendNotifyRuleMessage(ctx *ctx.Context, userCache *memsto.UserCacheType, userGroupCache *memsto.UserGroupCacheType, notifyChannelCache *memsto.NotifyChannelCacheType, configCvalCache *memsto.CvalCache,
-	events []*models.AlertCurEvent, notifyRuleId int64, notifyConfig *models.NotifyConfig, notifyChannel *models.NotifyChannelConfig, messageTemplate *models.MessageTemplate) {
+func (e *Dispatch) sendV2(events []*models.AlertCurEvent, notifyRuleId int64, notifyConfig *models.NotifyConfig, notifyChannel *models.NotifyChannelConfig, messageTemplate *models.MessageTemplate) {
 	if len(events) == 0 {
 		logger.Errorf("notify_id: %d events is empty", notifyRuleId)
 		return
 	}
 
-	siteInfo := configCvalCache.GetSiteInfo()
 	tplContent := make(map[string]interface{})
 	if notifyChannel.RequestType != "flashduty" {
-		tplContent = messageTemplate.RenderEvent(events, siteInfo.SiteUrl)
+		tplContent = messageTemplate.RenderEvent(events)
 	}
 
 	var contactKey string
@@ -535,7 +461,10 @@ func SendNotifyRuleMessage(ctx *ctx.Context, userCache *memsto.UserCacheType, us
 		contactKey = notifyChannel.ParamConfig.UserInfo.ContactKey
 	}
 
-	sendtos, flashDutyChannelIDs, pagerdutyRoutingKeys, customParams := GetNotifyConfigParams(notifyConfig, contactKey, userCache, userGroupCache)
+	sendtos, flashDutyChannelIDs, customParams := GetNotifyConfigParams(notifyConfig, contactKey, e.userCache, e.userGroupCache)
+
+	e.Astats.GaugeNotifyRecordQueueSize.Inc()
+	defer e.Astats.GaugeNotifyRecordQueueSize.Dec()
 
 	switch notifyChannel.RequestType {
 	case "flashduty":
@@ -545,19 +474,10 @@ func SendNotifyRuleMessage(ctx *ctx.Context, userCache *memsto.UserCacheType, us
 
 		for i := range flashDutyChannelIDs {
 			start := time.Now()
-			respBody, err := notifyChannel.SendFlashDuty(events, flashDutyChannelIDs[i], notifyChannelCache.GetHttpClient(notifyChannel.ID))
-			respBody = fmt.Sprintf("send_time: %s duration: %d ms %s", time.Now().Format("2006-01-02 15:04:05"), time.Since(start).Milliseconds(), respBody)
-			logger.Infof("duty_sender notify_id: %d, channel_name: %v, event:%s, IntegrationUrl: %v dutychannel_id: %v, respBody: %v, err: %v", notifyRuleId, notifyChannel.Name, events[0].Hash, notifyChannel.RequestConfig.FlashDutyRequestConfig.IntegrationUrl, flashDutyChannelIDs[i], respBody, err)
-			sender.NotifyRecord(ctx, events, notifyRuleId, notifyChannel.Name, strconv.FormatInt(flashDutyChannelIDs[i], 10), respBody, err)
-		}
-
-	case "pagerduty":
-		for _, routingKey := range pagerdutyRoutingKeys {
-			start := time.Now()
-			respBody, err := notifyChannel.SendPagerDuty(events, routingKey, siteInfo.SiteUrl, notifyChannelCache.GetHttpClient(notifyChannel.ID))
-			respBody = fmt.Sprintf("send_time: %s duration: %d ms %s", time.Now().Format("2006-01-02 15:04:05"), time.Since(start).Milliseconds(), respBody)
-			logger.Infof("pagerduty_sender notify_id: %d, channel_name: %v, event:%s, respBody: %v, err: %v", notifyRuleId, notifyChannel.Name, events[0].Hash, respBody, err)
-			sender.NotifyRecord(ctx, events, notifyRuleId, notifyChannel.Name, "", respBody, err)
+			respBody, err := notifyChannel.SendFlashDuty(events, flashDutyChannelIDs[i], e.notifyChannelCache.GetHttpClient(notifyChannel.ID))
+			respBody = fmt.Sprintf("duration: %d ms %s", time.Since(start).Milliseconds(), respBody)
+			logger.Infof("notify_id: %d, channel_name: %v, event:%+v, IntegrationUrl: %v dutychannel_id: %v, respBody: %v, err: %v", notifyRuleId, notifyChannel.Name, events[0], notifyChannel.RequestConfig.FlashDutyRequestConfig.IntegrationUrl, flashDutyChannelIDs[i], respBody, err)
+			sender.NotifyRecord(e.ctx, events, notifyRuleId, notifyChannel.Name, strconv.FormatInt(flashDutyChannelIDs[i], 10), respBody, err)
 		}
 
 	case "http":
@@ -573,24 +493,24 @@ func SendNotifyRuleMessage(ctx *ctx.Context, userCache *memsto.UserCacheType, us
 		}
 
 		// 将任务加入队列
-		success := notifyChannelCache.EnqueueNotifyTask(task)
+		success := e.notifyChannelCache.EnqueueNotifyTask(task)
 		if !success {
 			logger.Errorf("failed to enqueue notify task for channel %d, notify_id: %d", notifyChannel.ID, notifyRuleId)
 			// 如果入队失败，记录错误通知
-			sender.NotifyRecord(ctx, events, notifyRuleId, notifyChannel.Name, getSendTarget(customParams, sendtos), "", errors.New("failed to enqueue notify task, queue is full"))
+			sender.NotifyRecord(e.ctx, events, notifyRuleId, notifyChannel.Name, getSendTarget(customParams, sendtos), "", errors.New("failed to enqueue notify task, queue is full"))
 		}
 
 	case "smtp":
-		notifyChannel.SendEmail(notifyRuleId, events, tplContent, sendtos, notifyChannelCache.GetSmtpClient(notifyChannel.ID))
+		notifyChannel.SendEmail(notifyRuleId, events, tplContent, sendtos, e.notifyChannelCache.GetSmtpClient(notifyChannel.ID))
 
 	case "script":
 		start := time.Now()
 		target, res, err := notifyChannel.SendScript(events, tplContent, customParams, sendtos)
-		res = fmt.Sprintf("send_time: %s duration: %d ms %s", time.Now().Format("2006-01-02 15:04:05"), time.Since(start).Milliseconds(), res)
-		logger.Infof("script_sender notify_id: %d, channel_name: %v, event:%s, tplContent:%s, customParams:%v, target:%s, res:%s, err:%v", notifyRuleId, notifyChannel.Name, events[0].Hash, tplContent, customParams, target, res, err)
-		sender.NotifyRecord(ctx, events, notifyRuleId, notifyChannel.Name, target, res, err)
+		res = fmt.Sprintf("duration: %d ms %s", time.Since(start).Milliseconds(), res)
+		logger.Infof("notify_id: %d, channel_name: %v, event:%+v, tplContent:%s, customParams:%v, target:%s, res:%s, err:%v", notifyRuleId, notifyChannel.Name, events[0], tplContent, customParams, target, res, err)
+		sender.NotifyRecord(e.ctx, events, notifyRuleId, notifyChannel.Name, target, res, err)
 	default:
-		logger.Warningf("notify_id: %d, channel_name: %v, event:%s send type not found", notifyRuleId, notifyChannel.Name, events[0].Hash)
+		logger.Warningf("notify_id: %d, channel_name: %v, event:%+v send type not found", notifyRuleId, notifyChannel.Name, events[0])
 	}
 }
 
@@ -603,11 +523,6 @@ func NeedBatchContacts(requestConfig *models.HTTPRequestConfig) bool {
 // event: 告警/恢复事件
 // isSubscribe: 告警事件是否由subscribe的配置产生
 func (e *Dispatch) HandleEventNotify(event *models.AlertCurEvent, isSubscribe bool) {
-	go e.HandleEventWithNotifyRule(event)
-	if event.IsRecovered && event.NotifyRecovered == 0 {
-		return
-	}
-
 	rule := e.alertRuleCache.Get(event.RuleId)
 	if rule == nil {
 		return
@@ -640,6 +555,7 @@ func (e *Dispatch) HandleEventNotify(event *models.AlertCurEvent, isSubscribe bo
 		notifyTarget.AndMerge(handler(rule, event, notifyTarget, e))
 	}
 
+	go e.HandleEventWithNotifyRule(event)
 	go e.Send(rule, event, notifyTarget, isSubscribe)
 
 	// 如果是不是订阅规则出现的event, 则需要处理订阅规则的event
@@ -679,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
 	}
@@ -734,7 +646,7 @@ func (e *Dispatch) Send(rule *models.AlertRule, event *models.AlertCurEvent, not
 				event = msgCtx.Events[0]
 			}
 
-			logger.Debugf("send to channel:%s event:%s users:%+v", channel, event.Hash, msgCtx.Users)
+			logger.Debugf("send to channel:%s event:%+v users:%+v", channel, event, msgCtx.Users)
 			s.Send(msgCtx)
 		}
 	}
@@ -833,12 +745,12 @@ func (e *Dispatch) HandleIbex(rule *models.AlertRule, event *models.AlertCurEven
 
 		if len(t.Host) == 0 {
 			sender.CallIbex(e.ctx, t.TplId, event.TargetIdent,
-				e.taskTplsCache, e.targetCache, e.userCache, event, "")
+				e.taskTplsCache, e.targetCache, e.userCache, event)
 			continue
 		}
 		for _, host := range t.Host {
 			sender.CallIbex(e.ctx, t.TplId, host,
-				e.taskTplsCache, e.targetCache, e.userCache, event, "")
+				e.taskTplsCache, e.targetCache, e.userCache, event)
 		}
 	}
 }

alert/dispatch/log.go

@@ -18,11 +18,11 @@ func LogEvent(event *models.AlertCurEvent, location string, err ...error) {
 	}
 
 	logger.Infof(
-		"alert_eval_%d event(%s %s) %s: sub_id:%d notify_rule_ids:%v cluster:%s %v%s@%d last_eval_time:%d %s",
-		event.RuleId,
+		"event(%s %s) %s: rule_id=%d sub_id:%d notify_rule_ids:%v cluster:%s %v%s@%d last_eval_time:%d %s",
 		event.Hash,
 		status,
 		location,
+		event.RuleId,
 		event.SubRuleId,
 		event.NotifyRuleIds,
 		event.Cluster,

alert/eval/alert_rule.go

@@ -101,17 +101,17 @@ func (s *Scheduler) syncAlertRules() {
 				}
 				ds := s.datasourceCache.GetById(dsId)
 				if ds == nil {
-					logger.Debugf("alert_eval_%d datasource %d not found", rule.Id, dsId)
+					logger.Debugf("datasource %d not found", dsId)
 					continue
 				}
 
 				if ds.PluginType != ruleType {
-					logger.Debugf("alert_eval_%d datasource %d category is %s not %s", rule.Id, dsId, ds.PluginType, ruleType)
+					logger.Debugf("datasource %d category is %s not %s", dsId, ds.PluginType, ruleType)
 					continue
 				}
 
 				if ds.Status != "enabled" {
-					logger.Debugf("alert_eval_%d datasource %d status is %s", rule.Id, dsId, ds.Status)
+					logger.Debugf("datasource %d status is %s", dsId, ds.Status)
 					continue
 				}
 				processor := process.NewProcessor(s.aconf.Heartbeat.EngineName, rule, dsId, s.alertRuleCache, s.targetCache, s.targetsOfAlertRuleCache, s.busiGroupCache, s.alertMuteCache, s.datasourceCache, s.ctx, s.stats)
@@ -134,12 +134,12 @@ func (s *Scheduler) syncAlertRules() {
 			for _, dsId := range dsIds {
 				ds := s.datasourceCache.GetById(dsId)
 				if ds == nil {
-					logger.Debugf("alert_eval_%d datasource %d not found", rule.Id, dsId)
+					logger.Debugf("datasource %d not found", dsId)
 					continue
 				}
 
 				if ds.Status != "enabled" {
-					logger.Debugf("alert_eval_%d datasource %d status is %s", rule.Id, dsId, ds.Status)
+					logger.Debugf("datasource %d status is %s", dsId, ds.Status)
 					continue
 				}
 				processor := process.NewProcessor(s.aconf.Heartbeat.EngineName, rule, dsId, s.alertRuleCache, s.targetCache, s.targetsOfAlertRuleCache, s.busiGroupCache, s.alertMuteCache, s.datasourceCache, s.ctx, s.stats)

alert/eval/eval.go

@@ -11,7 +11,6 @@ import (
 	"strconv"
 	"strings"
 	"sync"
-	"text/template"
 	"time"
 
 	"github.com/ccfos/nightingale/v6/alert/astats"
@@ -25,7 +24,6 @@ import (
 	"github.com/ccfos/nightingale/v6/pkg/poster"
 	promsdk "github.com/ccfos/nightingale/v6/pkg/prom"
 	promql2 "github.com/ccfos/nightingale/v6/pkg/promql"
-	"github.com/ccfos/nightingale/v6/pkg/tplx"
 	"github.com/ccfos/nightingale/v6/pkg/unit"
 	"github.com/ccfos/nightingale/v6/prom"
 	"github.com/prometheus/common/model"
@@ -62,7 +60,6 @@ const (
 	CHECK_QUERY     = "check_query_config"
 	GET_CLIENT      = "get_client"
 	QUERY_DATA      = "query_data"
-	EXEC_TEMPLATE   = "exec_template"
 )
 
 const (
@@ -109,7 +106,7 @@ func NewAlertRuleWorker(rule *models.AlertRule, datasourceId int64, Processor *p
 	})
 
 	if err != nil {
-		logger.Errorf("alert_eval_%d datasource_%d add cron pattern error: %v", arw.Rule.Id, arw.DatasourceId, err)
+		logger.Errorf("alert rule %s add cron pattern error: %v", arw.Key(), err)
 	}
 
 	Processor.ScheduleEntry = arw.Scheduler.Entry(entryID)
@@ -152,9 +149,9 @@ func (arw *AlertRuleWorker) Eval() {
 
 	defer func() {
 		if len(message) == 0 {
-			logger.Infof("alert_eval_%d datasource_%d finished, duration:%v", arw.Rule.Id, arw.DatasourceId, time.Since(begin))
+			logger.Infof("rule_eval:%s finished, duration:%v", arw.Key(), time.Since(begin))
 		} else {
-			logger.Warningf("alert_eval_%d datasource_%d finished, duration:%v, message:%s", arw.Rule.Id, arw.DatasourceId, time.Since(begin), message)
+			logger.Infof("rule_eval:%s finished, duration:%v, message:%s", arw.Key(), time.Since(begin), message)
 		}
 	}()
 
@@ -189,7 +186,8 @@ func (arw *AlertRuleWorker) Eval() {
 	}
 
 	if err != nil {
-		message = fmt.Sprintf("failed to get anomaly points: %v", err)
+		logger.Errorf("rule_eval:%s get anomaly point err:%s", arw.Key(), err.Error())
+		message = "failed to get anomaly points"
 		return
 	}
 
@@ -236,7 +234,7 @@ func (arw *AlertRuleWorker) Eval() {
 }
 
 func (arw *AlertRuleWorker) Stop() {
-	logger.Infof("alert_eval_%d datasource_%d stopped", arw.Rule.Id, arw.DatasourceId)
+	logger.Infof("rule_eval:%s stopped", arw.Key())
 	close(arw.Quit)
 	c := arw.Scheduler.Stop()
 	<-c.Done()
@@ -252,7 +250,7 @@ func (arw *AlertRuleWorker) GetPromAnomalyPoint(ruleConfig string) ([]models.Ano
 
 	var rule *models.PromRuleConfig
 	if err := json.Unmarshal([]byte(ruleConfig), &rule); err != nil {
-		logger.Errorf("alert_eval_%d datasource_%d rule_config:%s, error:%v", arw.Rule.Id, arw.DatasourceId, ruleConfig, err)
+		logger.Errorf("rule_eval:%s rule_config:%s, error:%v", arw.Key(), ruleConfig, err)
 		arw.Processor.Stats.CounterRuleEvalErrorTotal.WithLabelValues(fmt.Sprintf("%v", arw.Processor.DatasourceId()), GET_RULE_CONFIG, arw.Processor.BusiGroupCache.GetNameByBusiGroupId(arw.Rule.GroupId), fmt.Sprintf("%v", arw.Rule.Id)).Inc()
 		arw.Processor.Stats.GaugeQuerySeriesCount.WithLabelValues(
 			fmt.Sprintf("%v", arw.Rule.Id),
@@ -263,7 +261,7 @@ func (arw *AlertRuleWorker) GetPromAnomalyPoint(ruleConfig string) ([]models.Ano
 	}
 
 	if rule == nil {
-		logger.Errorf("alert_eval_%d datasource_%d rule_config:%s, error:rule is nil", arw.Rule.Id, arw.DatasourceId, ruleConfig)
+		logger.Errorf("rule_eval:%s rule_config:%s, error:rule is nil", arw.Key(), ruleConfig)
 		arw.Processor.Stats.CounterRuleEvalErrorTotal.WithLabelValues(fmt.Sprintf("%v", arw.Processor.DatasourceId()), GET_RULE_CONFIG, arw.Processor.BusiGroupCache.GetNameByBusiGroupId(arw.Rule.GroupId), fmt.Sprintf("%v", arw.Rule.Id)).Inc()
 		arw.Processor.Stats.GaugeQuerySeriesCount.WithLabelValues(
 			fmt.Sprintf("%v", arw.Rule.Id),
@@ -278,7 +276,7 @@ func (arw *AlertRuleWorker) GetPromAnomalyPoint(ruleConfig string) ([]models.Ano
 		readerClient := arw.PromClients.GetCli(arw.DatasourceId)
 
 		if readerClient == nil {
-			logger.Warningf("alert_eval_%d datasource_%d error reader client is nil", arw.Rule.Id, arw.DatasourceId)
+			logger.Warningf("rule_eval:%s error reader client is nil", arw.Key())
 			arw.Processor.Stats.CounterRuleEvalErrorTotal.WithLabelValues(fmt.Sprintf("%v", arw.Processor.DatasourceId()), GET_CLIENT, arw.Processor.BusiGroupCache.GetNameByBusiGroupId(arw.Rule.GroupId), fmt.Sprintf("%v", arw.Rule.Id)).Inc()
 			arw.Processor.Stats.GaugeQuerySeriesCount.WithLabelValues(
 				fmt.Sprintf("%v", arw.Rule.Id),
@@ -288,7 +286,7 @@ func (arw *AlertRuleWorker) GetPromAnomalyPoint(ruleConfig string) ([]models.Ano
 			continue
 		}
 
-		if query.VarEnabled && strings.Contains(query.PromQl, "$") {
+		if query.VarEnabled {
 			var anomalyPoints []models.AnomalyPoint
 			if hasLabelLossAggregator(query) || notExactMatch(query) {
 				// 若有聚合函数或非精确匹配则需要先填充变量然后查询，这个方式效率较低
@@ -314,13 +312,13 @@ func (arw *AlertRuleWorker) GetPromAnomalyPoint(ruleConfig string) ([]models.Ano
 			// 无变量
 			promql := strings.TrimSpace(query.PromQl)
 			if promql == "" {
-				logger.Warningf("alert_eval_%d datasource_%d promql is blank", arw.Rule.Id, arw.DatasourceId)
+				logger.Warningf("rule_eval:%s promql is blank", arw.Key())
 				arw.Processor.Stats.CounterRuleEvalErrorTotal.WithLabelValues(fmt.Sprintf("%v", arw.Processor.DatasourceId()), CHECK_QUERY, arw.Processor.BusiGroupCache.GetNameByBusiGroupId(arw.Rule.GroupId), fmt.Sprintf("%v", arw.Rule.Id)).Inc()
 				continue
 			}
 
 			if arw.PromClients.IsNil(arw.DatasourceId) {
-				logger.Warningf("alert_eval_%d datasource_%d error reader client is nil", arw.Rule.Id, arw.DatasourceId)
+				logger.Warningf("rule_eval:%s error reader client is nil", arw.Key())
 				arw.Processor.Stats.CounterRuleEvalErrorTotal.WithLabelValues(fmt.Sprintf("%v", arw.Processor.DatasourceId()), GET_CLIENT, arw.Processor.BusiGroupCache.GetNameByBusiGroupId(arw.Rule.GroupId), fmt.Sprintf("%v", arw.Rule.Id)).Inc()
 				continue
 			}
@@ -329,7 +327,7 @@ func (arw *AlertRuleWorker) GetPromAnomalyPoint(ruleConfig string) ([]models.Ano
 			arw.Processor.Stats.CounterQueryDataTotal.WithLabelValues(fmt.Sprintf("%d", arw.DatasourceId), fmt.Sprintf("%d", arw.Rule.Id)).Inc()
 			value, warnings, err := readerClient.Query(context.Background(), promql, time.Now())
 			if err != nil {
-				logger.Errorf("alert_eval_%d datasource_%d promql:%s, error:%v", arw.Rule.Id, arw.DatasourceId, promql, err)
+				logger.Errorf("rule_eval:%s promql:%s, error:%v", arw.Key(), promql, err)
 				arw.Processor.Stats.CounterQueryDataErrorTotal.WithLabelValues(fmt.Sprintf("%d", arw.DatasourceId)).Inc()
 				arw.Processor.Stats.CounterRuleEvalErrorTotal.WithLabelValues(fmt.Sprintf("%v", arw.Processor.DatasourceId()), QUERY_DATA, arw.Processor.BusiGroupCache.GetNameByBusiGroupId(arw.Rule.GroupId), fmt.Sprintf("%v", arw.Rule.Id)).Inc()
 				arw.Processor.Stats.GaugeQuerySeriesCount.WithLabelValues(
@@ -341,12 +339,12 @@ func (arw *AlertRuleWorker) GetPromAnomalyPoint(ruleConfig string) ([]models.Ano
 			}
 
 			if len(warnings) > 0 {
-				logger.Errorf("alert_eval_%d datasource_%d promql:%s, warnings:%v", arw.Rule.Id, arw.DatasourceId, promql, warnings)
+				logger.Errorf("rule_eval:%s promql:%s, warnings:%v", arw.Key(), promql, warnings)
 				arw.Processor.Stats.CounterQueryDataErrorTotal.WithLabelValues(fmt.Sprintf("%d", arw.DatasourceId)).Inc()
 				arw.Processor.Stats.CounterRuleEvalErrorTotal.WithLabelValues(fmt.Sprintf("%v", arw.Processor.DatasourceId()), QUERY_DATA, arw.Processor.BusiGroupCache.GetNameByBusiGroupId(arw.Rule.GroupId), fmt.Sprintf("%v", arw.Rule.Id)).Inc()
 			}
 
-			logger.Infof("alert_eval_%d datasource_%d query:%+v, value:%v", arw.Rule.Id, arw.DatasourceId, query, value)
+			logger.Infof("rule_eval:%s query:%+v, value:%v", arw.Key(), query, value)
 			points := models.ConvertAnomalyPoints(value)
 			arw.Processor.Stats.GaugeQuerySeriesCount.WithLabelValues(
 				fmt.Sprintf("%v", arw.Rule.Id),
@@ -440,14 +438,14 @@ func (arw *AlertRuleWorker) VarFillingAfterQuery(query models.PromQuery, readerC
 			arw.Processor.Stats.CounterQueryDataTotal.WithLabelValues(fmt.Sprintf("%d", arw.DatasourceId), fmt.Sprintf("%d", arw.Rule.Id)).Inc()
 			value, _, err := readerClient.Query(context.Background(), curQuery, time.Now())
 			if err != nil {
-				logger.Errorf("alert_eval_%d datasource_%d promql:%s, error:%v", arw.Rule.Id, arw.DatasourceId, curQuery, err)
+				logger.Errorf("rule_eval:%s, promql:%s, error:%v", arw.Key(), curQuery, err)
 				continue
 			}
 			seqVals := getSamples(value)
 			// 得到参数变量的所有组合
 			paramPermutation, err := arw.getParamPermutation(param, ParamKeys, varToLabel, query.PromQl, readerClient)
 			if err != nil {
-				logger.Errorf("alert_eval_%d datasource_%d paramPermutation error:%v", arw.Rule.Id, arw.DatasourceId, err)
+				logger.Errorf("rule_eval:%s, paramPermutation error:%v", arw.Key(), err)
 				continue
 			}
 			// 判断哪些参数值符合条件
@@ -580,14 +578,14 @@ func (arw *AlertRuleWorker) getParamPermutation(paramVal map[string]models.Param
 		case "host":
 			hostIdents, err := arw.getHostIdents(paramQuery)
 			if err != nil {
-				logger.Errorf("alert_eval_%d datasource_%d fail to get host idents, error:%v", arw.Rule.Id, arw.DatasourceId, err)
+				logger.Errorf("rule_eval:%s, fail to get host idents, error:%v", arw.Key(), err)
 				break
 			}
 			params = hostIdents
 		case "device":
 			deviceIdents, err := arw.getDeviceIdents(paramQuery)
 			if err != nil {
-				logger.Errorf("alert_eval_%d datasource_%d fail to get device idents, error:%v", arw.Rule.Id, arw.DatasourceId, err)
+				logger.Errorf("rule_eval:%s, fail to get device idents, error:%v", arw.Key(), err)
 				break
 			}
 			params = deviceIdents
@@ -596,12 +594,12 @@ func (arw *AlertRuleWorker) getParamPermutation(paramVal map[string]models.Param
 			var query []string
 			err := json.Unmarshal(q, &query)
 			if err != nil {
-				logger.Errorf("alert_eval_%d datasource_%d query:%s fail to unmarshalling into string slice, error:%v", arw.Rule.Id, arw.DatasourceId, paramQuery.Query, err)
+				logger.Errorf("query:%s fail to unmarshalling into string slice, error:%v", paramQuery.Query, err)
 			}
 			if len(query) == 0 {
 				paramsKeyAllLabel, err := getParamKeyAllLabel(varToLabel[paramKey], originPromql, readerClient, arw.DatasourceId, arw.Rule.Id, arw.Processor.Stats)
 				if err != nil {
-					logger.Errorf("alert_eval_%d datasource_%d fail to getParamKeyAllLabel, error:%v query:%s", arw.Rule.Id, arw.DatasourceId, err, paramQuery.Query)
+					logger.Errorf("rule_eval:%s, fail to getParamKeyAllLabel, error:%v query:%s", arw.Key(), err, paramQuery.Query)
 				}
 				params = paramsKeyAllLabel
 			} else {
@@ -615,7 +613,7 @@ func (arw *AlertRuleWorker) getParamPermutation(paramVal map[string]models.Param
 			return nil, fmt.Errorf("param key: %s, params is empty", paramKey)
 		}
 
-		logger.Infof("alert_eval_%d datasource_%d paramKey: %s, params: %v", arw.Rule.Id, arw.DatasourceId, paramKey, params)
+		logger.Infof("rule_eval:%s paramKey: %s, params: %v", arw.Key(), paramKey, params)
 		paramMap[paramKey] = params
 	}
 
@@ -766,7 +764,7 @@ func (arw *AlertRuleWorker) GetHostAnomalyPoint(ruleConfig string) ([]models.Ano
 
 	var rule *models.HostRuleConfig
 	if err := json.Unmarshal([]byte(ruleConfig), &rule); err != nil {
-		logger.Errorf("alert_eval_%d datasource_%d rule_config:%s, error:%v", arw.Rule.Id, arw.DatasourceId, ruleConfig, err)
+		logger.Errorf("rule_eval:%s rule_config:%s, error:%v", arw.Key(), ruleConfig, err)
 		arw.Processor.Stats.CounterRuleEvalErrorTotal.WithLabelValues(fmt.Sprintf("%v", arw.Processor.DatasourceId()), GET_RULE_CONFIG, arw.Processor.BusiGroupCache.GetNameByBusiGroupId(arw.Rule.GroupId), fmt.Sprintf("%v", arw.Rule.Id)).Inc()
 		arw.Processor.Stats.GaugeQuerySeriesCount.WithLabelValues(
 			fmt.Sprintf("%v", arw.Rule.Id),
@@ -777,7 +775,7 @@ func (arw *AlertRuleWorker) GetHostAnomalyPoint(ruleConfig string) ([]models.Ano
 	}
 
 	if rule == nil {
-		logger.Errorf("alert_eval_%d datasource_%d rule_config:%s, error:rule is nil", arw.Rule.Id, arw.DatasourceId, ruleConfig)
+		logger.Errorf("rule_eval:%s rule_config:%s, error:rule is nil", arw.Key(), ruleConfig)
 		arw.Processor.Stats.CounterRuleEvalErrorTotal.WithLabelValues(fmt.Sprintf("%v", arw.Processor.DatasourceId()), GET_RULE_CONFIG, arw.Processor.BusiGroupCache.GetNameByBusiGroupId(arw.Rule.GroupId), fmt.Sprintf("%v", arw.Rule.Id)).Inc()
 		arw.Processor.Stats.GaugeQuerySeriesCount.WithLabelValues(
 			fmt.Sprintf("%v", arw.Rule.Id),
@@ -800,7 +798,7 @@ func (arw *AlertRuleWorker) GetHostAnomalyPoint(ruleConfig string) ([]models.Ano
 				// 如果是中心节点, 将不再上报数据的主机 engineName 为空的机器，也加入到 targets 中
 				missEngineIdents, exists = arw.Processor.TargetsOfAlertRuleCache.Get("", arw.Rule.Id)
 				if !exists {
-					logger.Debugf("alert_eval_%d datasource_%d targets not found engineName:%s", arw.Rule.Id, arw.DatasourceId, arw.Processor.EngineName)
+					logger.Debugf("rule_eval:%s targets not found engineName:%s", arw.Key(), arw.Processor.EngineName)
 					arw.Processor.Stats.CounterRuleEvalErrorTotal.WithLabelValues(fmt.Sprintf("%v", arw.Processor.DatasourceId()), QUERY_DATA, arw.Processor.BusiGroupCache.GetNameByBusiGroupId(arw.Rule.GroupId), fmt.Sprintf("%v", arw.Rule.Id)).Inc()
 				}
 			}
@@ -808,7 +806,7 @@ func (arw *AlertRuleWorker) GetHostAnomalyPoint(ruleConfig string) ([]models.Ano
 
 			engineIdents, exists = arw.Processor.TargetsOfAlertRuleCache.Get(arw.Processor.EngineName, arw.Rule.Id)
 			if !exists {
-				logger.Warningf("alert_eval_%d datasource_%d targets not found engineName:%s", arw.Rule.Id, arw.DatasourceId, arw.Processor.EngineName)
+				logger.Warningf("rule_eval:%s targets not found engineName:%s", arw.Key(), arw.Processor.EngineName)
 				arw.Processor.Stats.CounterRuleEvalErrorTotal.WithLabelValues(fmt.Sprintf("%v", arw.Processor.DatasourceId()), QUERY_DATA, arw.Processor.BusiGroupCache.GetNameByBusiGroupId(arw.Rule.GroupId), fmt.Sprintf("%v", arw.Rule.Id)).Inc()
 			}
 			idents = append(idents, engineIdents...)
@@ -835,7 +833,7 @@ func (arw *AlertRuleWorker) GetHostAnomalyPoint(ruleConfig string) ([]models.Ano
 				"",
 			).Set(float64(len(missTargets)))
 
-			logger.Debugf("alert_eval_%d datasource_%d missTargets:%v", arw.Rule.Id, arw.DatasourceId, missTargets)
+			logger.Debugf("rule_eval:%s missTargets:%v", arw.Key(), missTargets)
 			targets := arw.Processor.TargetCache.Gets(missTargets)
 			for _, target := range targets {
 				m := make(map[string]string)
@@ -844,7 +842,7 @@ func (arw *AlertRuleWorker) GetHostAnomalyPoint(ruleConfig string) ([]models.Ano
 				}
 				m["ident"] = target.Ident
 
-				lst = append(lst, models.NewAnomalyPoint(trigger.Type, m, now, float64(now-target.BeatTime), trigger.Severity))
+				lst = append(lst, models.NewAnomalyPoint(trigger.Type, m, now, float64(now-target.UpdateAt), trigger.Severity))
 			}
 		case "offset":
 			idents, exists := arw.Processor.TargetsOfAlertRuleCache.Get(arw.Processor.EngineName, arw.Rule.Id)
@@ -854,7 +852,7 @@ func (arw *AlertRuleWorker) GetHostAnomalyPoint(ruleConfig string) ([]models.Ano
 					fmt.Sprintf("%v", arw.Processor.DatasourceId()),
 					"",
 				).Set(0)
-				logger.Warningf("alert_eval_%d datasource_%d targets not found", arw.Rule.Id, arw.DatasourceId)
+				logger.Warningf("rule_eval:%s targets not found", arw.Key())
 				arw.Processor.Stats.CounterRuleEvalErrorTotal.WithLabelValues(fmt.Sprintf("%v", arw.Processor.DatasourceId()), QUERY_DATA, arw.Processor.BusiGroupCache.GetNameByBusiGroupId(arw.Rule.GroupId), fmt.Sprintf("%v", arw.Rule.Id)).Inc()
 				continue
 			}
@@ -873,7 +871,7 @@ func (arw *AlertRuleWorker) GetHostAnomalyPoint(ruleConfig string) ([]models.Ano
 					continue
 				}
 				if target, exists := targetMap[ident]; exists {
-					if now-target.BeatTime > 120 {
+					if now-target.UpdateAt > 120 {
 						// means this target is not a active host, do not check offset
 						continue
 					}
@@ -885,7 +883,7 @@ func (arw *AlertRuleWorker) GetHostAnomalyPoint(ruleConfig string) ([]models.Ano
 				}
 			}
 
-			logger.Debugf("alert_eval_%d datasource_%d offsetIdents:%v", arw.Rule.Id, arw.DatasourceId, offsetIdents)
+			logger.Debugf("rule_eval:%s offsetIdents:%v", arw.Key(), offsetIdents)
 			arw.Processor.Stats.GaugeQuerySeriesCount.WithLabelValues(
 				fmt.Sprintf("%v", arw.Rule.Id),
 				fmt.Sprintf("%v", arw.Processor.DatasourceId()),
@@ -912,7 +910,7 @@ func (arw *AlertRuleWorker) GetHostAnomalyPoint(ruleConfig string) ([]models.Ano
 					fmt.Sprintf("%v", arw.Processor.DatasourceId()),
 					"",
 				).Set(0)
-				logger.Warningf("alert_eval_%d datasource_%d targets not found", arw.Rule.Id, arw.DatasourceId)
+				logger.Warningf("rule_eval:%s targets not found", arw.Key())
 				arw.Processor.Stats.CounterRuleEvalErrorTotal.WithLabelValues(fmt.Sprintf("%v", arw.Processor.DatasourceId()), QUERY_DATA, arw.Processor.BusiGroupCache.GetNameByBusiGroupId(arw.Rule.GroupId), fmt.Sprintf("%v", arw.Rule.Id)).Inc()
 				continue
 			}
@@ -924,7 +922,7 @@ func (arw *AlertRuleWorker) GetHostAnomalyPoint(ruleConfig string) ([]models.Ano
 					missTargets = append(missTargets, ident)
 				}
 			}
-			logger.Debugf("alert_eval_%d datasource_%d missTargets:%v", arw.Rule.Id, arw.DatasourceId, missTargets)
+			logger.Debugf("rule_eval:%s missTargets:%v", arw.Key(), missTargets)
 			arw.Processor.Stats.GaugeQuerySeriesCount.WithLabelValues(
 				fmt.Sprintf("%v", arw.Rule.Id),
 				fmt.Sprintf("%v", arw.Processor.DatasourceId()),
@@ -1079,15 +1077,15 @@ func exclude(reHashTagIndex1 map[uint64][][]uint64, reHashTagIndex2 map[uint64][
 
 func MakeSeriesMap(series []models.DataResp, seriesTagIndex map[uint64][]uint64, seriesStore map[uint64]models.DataResp) {
 	for i := 0; i < len(series); i++ {
-		seriesHash := hash.GetHash(series[i].Metric, series[i].Ref)
+		serieHash := hash.GetHash(series[i].Metric, series[i].Ref)
 		tagHash := hash.GetTagHash(series[i].Metric)
-		seriesStore[seriesHash] = series[i]
+		seriesStore[serieHash] = series[i]
 
 		// 将曲线按照相同的 tag 分组
 		if _, exists := seriesTagIndex[tagHash]; !exists {
 			seriesTagIndex[tagHash] = make([]uint64, 0)
 		}
-		seriesTagIndex[tagHash] = append(seriesTagIndex[tagHash], seriesHash)
+		seriesTagIndex[tagHash] = append(seriesTagIndex[tagHash], serieHash)
 	}
 }
 
@@ -1120,7 +1118,7 @@ func ProcessJoins(ruleId int64, trigger models.Trigger, seriesTagIndexes map[str
 
 	// 有 join 条件，按条件依次合并
 	if len(seriesTagIndexes) < len(trigger.Joins)+1 {
-		logger.Errorf("alert_eval_%d queries' count: %d not match join condition's count: %d", ruleId, len(seriesTagIndexes), len(trigger.Joins))
+		logger.Errorf("rule_eval rid:%d queries' count: %d not match join condition's count: %d", ruleId, len(seriesTagIndexes), len(trigger.Joins))
 		return nil
 	}
 
@@ -1156,7 +1154,7 @@ func ProcessJoins(ruleId int64, trigger models.Trigger, seriesTagIndexes map[str
 			lastRehashed = exclude(curRehashed, lastRehashed)
 			last = flatten(lastRehashed)
 		default:
-			logger.Warningf("alert_eval_%d join type:%s not support", ruleId, trigger.Joins[i].JoinType)
+			logger.Warningf("rule_eval rid:%d join type:%s not support", ruleId, trigger.Joins[i].JoinType)
 		}
 	}
 	return last
@@ -1276,7 +1274,7 @@ func (arw *AlertRuleWorker) VarFillingBeforeQuery(query models.PromQuery, reader
 			// 得到参数变量的所有组合
 			paramPermutation, err := arw.getParamPermutation(param, ParamKeys, varToLabel, query.PromQl, readerClient)
 			if err != nil {
-				logger.Errorf("alert_eval_%d datasource_%d paramPermutation error:%v", arw.Rule.Id, arw.DatasourceId, err)
+				logger.Errorf("rule_eval:%s, paramPermutation error:%v", arw.Key(), err)
 				continue
 			}
 
@@ -1304,10 +1302,10 @@ func (arw *AlertRuleWorker) VarFillingBeforeQuery(query models.PromQuery, reader
 					arw.Processor.Stats.CounterQueryDataTotal.WithLabelValues(fmt.Sprintf("%d", arw.DatasourceId), fmt.Sprintf("%d", arw.Rule.Id)).Inc()
 					value, _, err := readerClient.Query(context.Background(), promql, time.Now())
 					if err != nil {
-						logger.Errorf("alert_eval_%d datasource_%d promql:%s, error:%v", arw.Rule.Id, arw.DatasourceId, promql, err)
+						logger.Errorf("rule_eval:%s, promql:%s, error:%v", arw.Key(), promql, err)
 						return
 					}
-					logger.Infof("alert_eval_%d datasource_%d promql:%s, value:%+v", arw.Rule.Id, arw.DatasourceId, promql, value)
+					logger.Infof("rule_eval:%s, promql:%s, value:%+v", arw.Key(), promql, value)
 
 					points := models.ConvertAnomalyPoints(value)
 					if len(points) == 0 {
@@ -1446,7 +1444,7 @@ func (arw *AlertRuleWorker) GetAnomalyPoint(rule *models.AlertRule, dsId int64)
 	recoverPoints := []models.AnomalyPoint{}
 	ruleConfig := strings.TrimSpace(rule.RuleConfig)
 	if ruleConfig == "" {
-		logger.Warningf("alert_eval_%d datasource_%d ruleConfig is blank", rule.Id, dsId)
+		logger.Warningf("rule_eval:%d ruleConfig is blank", rule.Id)
 		arw.Processor.Stats.CounterRuleEvalErrorTotal.WithLabelValues(fmt.Sprintf("%v", arw.Processor.DatasourceId()), GET_RULE_CONFIG, arw.Processor.BusiGroupCache.GetNameByBusiGroupId(arw.Rule.GroupId), fmt.Sprintf("%v", arw.Rule.Id)).Inc()
 		arw.Processor.Stats.GaugeQuerySeriesCount.WithLabelValues(
 			fmt.Sprintf("%v", arw.Rule.Id),
@@ -1454,15 +1452,15 @@ func (arw *AlertRuleWorker) GetAnomalyPoint(rule *models.AlertRule, dsId int64)
 			"",
 		).Set(0)
 
-		return points, recoverPoints, fmt.Errorf("alert_eval_%d datasource_%d ruleConfig is blank", rule.Id, dsId)
+		return points, recoverPoints, fmt.Errorf("rule_eval:%d ruleConfig is blank", rule.Id)
 	}
 
 	var ruleQuery models.RuleQuery
 	err := json.Unmarshal([]byte(ruleConfig), &ruleQuery)
 	if err != nil {
-		logger.Warningf("alert_eval_%d datasource_%d promql parse error:%s", rule.Id, dsId, err.Error())
+		logger.Warningf("rule_eval:%d promql parse error:%s", rule.Id, err.Error())
 		arw.Processor.Stats.CounterRuleEvalErrorTotal.WithLabelValues(fmt.Sprintf("%v", arw.Processor.DatasourceId()), GET_RULE_CONFIG, arw.Processor.BusiGroupCache.GetNameByBusiGroupId(arw.Rule.GroupId), fmt.Sprintf("%v", arw.Rule.Id)).Inc()
-		return points, recoverPoints, fmt.Errorf("alert_eval_%d datasource_%d promql parse error:%s", rule.Id, dsId, err.Error())
+		return points, recoverPoints, fmt.Errorf("rule_eval:%d promql parse error:%s", rule.Id, err.Error())
 	}
 
 	arw.Inhibit = ruleQuery.Inhibit
@@ -1474,7 +1472,7 @@ func (arw *AlertRuleWorker) GetAnomalyPoint(rule *models.AlertRule, dsId int64)
 
 			plug, exists := dscache.DsCache.Get(rule.Cate, dsId)
 			if !exists {
-				logger.Warningf("alert_eval_%d datasource_%d not exists", rule.Id, dsId)
+				logger.Warningf("rule_eval rid:%d datasource:%d not exists", rule.Id, dsId)
 				arw.Processor.Stats.CounterRuleEvalErrorTotal.WithLabelValues(fmt.Sprintf("%v", arw.Processor.DatasourceId()), GET_CLIENT, arw.Processor.BusiGroupCache.GetNameByBusiGroupId(arw.Rule.GroupId), fmt.Sprintf("%v", arw.Rule.Id)).Inc()
 
 				arw.Processor.Stats.GaugeQuerySeriesCount.WithLabelValues(
@@ -1483,24 +1481,14 @@ func (arw *AlertRuleWorker) GetAnomalyPoint(rule *models.AlertRule, dsId int64)
 					fmt.Sprintf("%v", i),
 				).Set(-2)
 
-				return points, recoverPoints, fmt.Errorf("alert_eval_%d datasource_%d not exists", rule.Id, dsId)
-			}
-
-			if err = ExecuteQueryTemplate(rule.Cate, query, nil); err != nil {
-				logger.Warningf("alert_eval_%d datasource_%d execute query template error: %v", rule.Id, dsId, err)
-				arw.Processor.Stats.CounterRuleEvalErrorTotal.WithLabelValues(fmt.Sprintf("%v", arw.Processor.DatasourceId()), EXEC_TEMPLATE, arw.Processor.BusiGroupCache.GetNameByBusiGroupId(arw.Rule.GroupId), fmt.Sprintf("%v", arw.Rule.Id)).Inc()
-				arw.Processor.Stats.GaugeQuerySeriesCount.WithLabelValues(
-					fmt.Sprintf("%v", arw.Rule.Id),
-					fmt.Sprintf("%v", arw.Processor.DatasourceId()),
-					fmt.Sprintf("%v", i),
-				).Set(-3)
+				return points, recoverPoints, fmt.Errorf("rule_eval:%d datasource:%d not exists", rule.Id, dsId)
 			}
 
 			ctx := context.WithValue(context.Background(), "delay", int64(rule.Delay))
 			series, err := plug.QueryData(ctx, query)
 			arw.Processor.Stats.CounterQueryDataTotal.WithLabelValues(fmt.Sprintf("%d", arw.DatasourceId), fmt.Sprintf("%d", rule.Id)).Inc()
 			if err != nil {
-				logger.Warningf("alert_eval_%d datasource_%d query data error: %v", rule.Id, dsId, err)
+				logger.Warningf("rule_eval rid:%d query data error: %v", rule.Id, err)
 				arw.Processor.Stats.CounterRuleEvalErrorTotal.WithLabelValues(fmt.Sprintf("%v", arw.Processor.DatasourceId()), GET_CLIENT, arw.Processor.BusiGroupCache.GetNameByBusiGroupId(arw.Rule.GroupId), fmt.Sprintf("%v", arw.Rule.Id)).Inc()
 				arw.Processor.Stats.GaugeQuerySeriesCount.WithLabelValues(
 					fmt.Sprintf("%v", arw.Rule.Id),
@@ -1508,7 +1496,7 @@ func (arw *AlertRuleWorker) GetAnomalyPoint(rule *models.AlertRule, dsId int64)
 					fmt.Sprintf("%v", i),
 				).Set(-1)
 
-				return points, recoverPoints, fmt.Errorf("alert_eval_%d datasource_%d query data error: %v", rule.Id, dsId, err)
+				return points, recoverPoints, fmt.Errorf("rule_eval:%d query data error: %v", rule.Id, err)
 			}
 
 			arw.Processor.Stats.GaugeQuerySeriesCount.WithLabelValues(
@@ -1518,21 +1506,21 @@ func (arw *AlertRuleWorker) GetAnomalyPoint(rule *models.AlertRule, dsId int64)
 			).Set(float64(len(series)))
 
 			//  此条日志很重要，是告警判断的现场值
-			logger.Infof("alert_eval_%d datasource_%d req:%+v resp:%v", rule.Id, dsId, query, series)
+			logger.Infof("rule_eval rid:%d req:%+v resp:%v", rule.Id, query, series)
 			for i := 0; i < len(series); i++ {
-				seriesHash := hash.GetHash(series[i].Metric, series[i].Ref)
+				serieHash := hash.GetHash(series[i].Metric, series[i].Ref)
 				tagHash := hash.GetTagHash(series[i].Metric)
-				seriesStore[seriesHash] = series[i]
+				seriesStore[serieHash] = series[i]
 
 				// 将曲线按照相同的 tag 分组
 				if _, exists := seriesTagIndex[tagHash]; !exists {
 					seriesTagIndex[tagHash] = make([]uint64, 0)
 				}
-				seriesTagIndex[tagHash] = append(seriesTagIndex[tagHash], seriesHash)
+				seriesTagIndex[tagHash] = append(seriesTagIndex[tagHash], serieHash)
 			}
 			ref, err := GetQueryRef(query)
 			if err != nil {
-				logger.Warningf("alert_eval_%d datasource_%d query:%+v get ref error:%s", rule.Id, dsId, query, err.Error())
+				logger.Warningf("rule_eval rid:%d query:%+v get ref error:%s", rule.Id, query, err.Error())
 				continue
 			}
 			seriesTagIndexes[ref] = seriesTagIndex
@@ -1542,7 +1530,7 @@ func (arw *AlertRuleWorker) GetAnomalyPoint(rule *models.AlertRule, dsId int64)
 		for _, query := range ruleQuery.Queries {
 			ref, unit, err := GetQueryRefAndUnit(query)
 			if err != nil {
-				logger.Warningf("alert_eval_%d datasource_%d query:%+v get ref and unit error:%s", rule.Id, dsId, query, err.Error())
+				logger.Warningf("rule_eval rid:%d query:%+v get ref and unit error:%s", rule.Id, query, err.Error())
 				continue
 			}
 			unitMap[ref] = unit
@@ -1562,15 +1550,15 @@ func (arw *AlertRuleWorker) GetAnomalyPoint(rule *models.AlertRule, dsId int64)
 					var ts int64
 					var sample models.DataResp
 					var value float64
-					for _, seriesHash := range seriesHash {
-						series, exists := seriesStore[seriesHash]
+					for _, serieHash := range seriesHash {
+						series, exists := seriesStore[serieHash]
 						if !exists {
-							logger.Warningf("alert_eval_%d datasource_%d series:%+v not found", rule.Id, dsId, series)
+							logger.Warningf("rule_eval rid:%d series:%+v not found", rule.Id, series)
 							continue
 						}
 						t, v, exists := series.Last()
 						if !exists {
-							logger.Warningf("alert_eval_%d datasource_%d series:%+v value not found", rule.Id, dsId, series)
+							logger.Warningf("rule_eval rid:%d series:%+v value not found", rule.Id, series)
 							continue
 						}
 
@@ -1601,12 +1589,12 @@ func (arw *AlertRuleWorker) GetAnomalyPoint(rule *models.AlertRule, dsId int64)
 						ts = int64(t)
 						sample = series
 						value = v
-						logger.Infof("alert_eval_%d datasource_%d origin series labels:%+v", rule.Id, dsId, series.Metric)
+						logger.Infof("rule_eval rid:%d origin series labels:%+v", rule.Id, series.Metric)
 					}
 
 					isTriggered := parser.CalcWithRid(trigger.Exp, m, rule.Id)
 					//  此条日志很重要，是告警判断的现场值
-					logger.Infof("alert_eval_%d datasource_%d trigger:%+v exp:%s res:%v m:%v", rule.Id, dsId, trigger, trigger.Exp, isTriggered, m)
+					logger.Infof("rule_eval rid:%d trigger:%+v exp:%s res:%v m:%v", rule.Id, trigger, trigger.Exp, isTriggered, m)
 
 					var values string
 					for k, v := range m {
@@ -1614,15 +1602,11 @@ func (arw *AlertRuleWorker) GetAnomalyPoint(rule *models.AlertRule, dsId int64)
 							continue
 						}
 
-						if u, exists := valuesUnitMap[k]; exists { // 配置了单位，优先用配置了单位的值
-							values += fmt.Sprintf("%s:%s ", k, u.Text)
-						} else {
-							switch v.(type) {
-							case float64:
-								values += fmt.Sprintf("%s:%.3f ", k, v)
-							case string:
-								values += fmt.Sprintf("%s:%s ", k, v)
-							}
+						switch v.(type) {
+						case float64:
+							values += fmt.Sprintf("%s:%.3f ", k, v)
+						case string:
+							values += fmt.Sprintf("%s:%s ", k, v)
 						}
 					}
 
@@ -1679,7 +1663,7 @@ func (arw *AlertRuleWorker) GetAnomalyPoint(rule *models.AlertRule, dsId int64)
 
 						// 检查是否超过 resolve_after 时间
 						if now-int64(lastTs) > int64(ruleQuery.NodataTrigger.ResolveAfter) {
-							logger.Infof("alert_eval_%d datasource_%d series:%+v resolve after %d seconds now:%d lastTs:%d", rule.Id, dsId, lastSeries, ruleQuery.NodataTrigger.ResolveAfter, now, int64(lastTs))
+							logger.Infof("rule_eval rid:%d series:%+v resolve after %d seconds now:%d lastTs:%d", rule.Id, lastSeries, ruleQuery.NodataTrigger.ResolveAfter, now, int64(lastTs))
 							delete(arw.LastSeriesStore, hash)
 							continue
 						}
@@ -1700,7 +1684,7 @@ func (arw *AlertRuleWorker) GetAnomalyPoint(rule *models.AlertRule, dsId int64)
 							TriggerType: models.TriggerTypeNodata,
 						}
 						points = append(points, point)
-						logger.Infof("alert_eval_%d datasource_%d nodata point:%+v", rule.Id, dsId, point)
+						logger.Infof("rule_eval rid:%d nodata point:%+v", rule.Id, point)
 					}
 				}
 
@@ -1715,61 +1699,3 @@ func (arw *AlertRuleWorker) GetAnomalyPoint(rule *models.AlertRule, dsId int64)
 
 	return points, recoverPoints, nil
 }
-
-// ExecuteQueryTemplate 根据数据源类型对 Query 进行模板渲染处理
-// cate: 数据源类别，如 "mysql", "pgsql" 等
-// query: 查询对象，如果是数据库类型的数据源，会处理其中的 sql 字段
-// data: 模板数据对象，如果为 nil 则使用空结构体（不支持变量渲染），如果不为 nil 则使用传入的数据（支持变量渲染）
-func ExecuteQueryTemplate(cate string, query interface{}, data interface{}) error {
-	// 检查 query 是否是 map，且包含 sql 字段
-	queryMap, ok := query.(map[string]interface{})
-	if !ok {
-		return nil
-	}
-
-	sqlVal, exists := queryMap["sql"]
-	if !exists {
-		return nil
-	}
-
-	sqlStr, ok := sqlVal.(string)
-	if !ok {
-		return nil
-	}
-
-	// 调用 ExecuteSqlTemplate 处理 sql 字段
-	processedSQL, err := ExecuteSqlTemplate(sqlStr, data)
-	if err != nil {
-		return fmt.Errorf("execute sql template error: %w", err)
-	}
-
-	// 更新 query 中的 sql 字段
-	queryMap["sql"] = processedSQL
-	return nil
-}
-
-// ExecuteSqlTemplate 执行 query 中的 golang 模板语法函数
-// query: 要处理的 query 字符串
-// data: 模板数据对象，如果为 nil 则使用空结构体（不支持变量渲染），如果不为 nil 则使用传入的数据（支持变量渲染）
-func ExecuteSqlTemplate(query string, data interface{}) (string, error) {
-	if !strings.Contains(query, "{{") || !strings.Contains(query, "}}") {
-		return query, nil
-	}
-
-	tmpl, err := template.New("query").Funcs(tplx.TemplateFuncMap).Parse(query)
-	if err != nil {
-		return "", fmt.Errorf("query tmpl parse error: %w", err)
-	}
-
-	var buf strings.Builder
-	templateData := data
-	if templateData == nil {
-		templateData = struct{}{}
-	}
-
-	if err := tmpl.Execute(&buf, templateData); err != nil {
-		return "", fmt.Errorf("query tmpl execute error: %w", err)
-	}
-
-	return buf.String(), nil
-}

alert/mute/mute.go

@@ -1,7 +1,6 @@
 package mute
 
 import (
-	"slices"
 	"strconv"
 	"strings"
 	"time"
@@ -41,28 +40,8 @@ func IsMuted(rule *models.AlertRule, event *models.AlertCurEvent, targetCache *m
 
 // TimeSpanMuteStrategy 根据规则配置的告警生效时间段过滤,如果产生的告警不在规则配置的告警生效时间段内,则不告警,即被mute
 // 时间范围，左闭右开，默认范围：00:00-24:00
-// 如果规则配置了时区，则在该时区下进行时间判断；如果时区为空，则使用系统时区
 func TimeSpanMuteStrategy(rule *models.AlertRule, event *models.AlertCurEvent) bool {
-	// 确定使用的时区
-	var targetLoc *time.Location
-	var err error
-
-	timezone := rule.TimeZone
-	if timezone == "" {
-		// 如果时区为空，使用系统时区（保持原有逻辑）
-		targetLoc = time.Local
-	} else {
-		// 加载规则配置的时区
-		targetLoc, err = time.LoadLocation(timezone)
-		if err != nil {
-			// 如果时区加载失败，记录错误并使用系统时区
-			logger.Warningf("Failed to load timezone %s for rule %d, using system timezone: %v", timezone, rule.Id, err)
-			targetLoc = time.Local
-		}
-	}
-
-	// 将触发时间转换到目标时区
-	tm := time.Unix(event.TriggerTime, 0).In(targetLoc)
+	tm := time.Unix(event.TriggerTime, 0)
 	triggerTime := tm.Format("15:04")
 	triggerWeek := strconv.Itoa(int(tm.Weekday()))
 
@@ -122,7 +101,7 @@ func IdentNotExistsMuteStrategy(rule *models.AlertRule, event *models.AlertCurEv
 	// 如果是target_up的告警,且ident已经不存在了,直接过滤掉
 	// 这里的判断有点太粗暴了,但是目前没有更好的办法
 	if !exists && strings.Contains(rule.PromQl, "target_up") {
-		logger.Debugf("alert_eval_%d [IdentNotExistsMuteStrategy] mute: cluster:%s ident:%s", rule.Id, event.Cluster, ident)
+		logger.Debugf("[%s] mute: rule_eval:%d cluster:%s ident:%s", "IdentNotExistsMuteStrategy", rule.Id, event.Cluster, ident)
 		return true
 	}
 	return false
@@ -144,7 +123,7 @@ func BgNotMatchMuteStrategy(rule *models.AlertRule, event *models.AlertCurEvent,
 	// 对于包含ident的告警事件，check一下ident所属bg和rule所属bg是否相同
 	// 如果告警规则选择了只在本BG生效，那其他BG的机器就不能因此规则产生告警
 	if exists && !target.MatchGroupId(rule.GroupId) {
-		logger.Debugf("alert_eval_%d [BgNotMatchMuteStrategy] mute: cluster:%s", rule.Id, event.Cluster)
+		logger.Debugf("[%s] mute: rule_eval:%d cluster:%s", "BgNotMatchMuteStrategy", rule.Id, event.Cluster)
 		return true
 	}
 	return false
@@ -174,7 +153,13 @@ func MatchMute(event *models.AlertCurEvent, mute *models.AlertMute, clock ...int
 
 	// 如果不是全局的，判断 匹配的 datasource id
 	if len(mute.DatasourceIdsJson) != 0 && mute.DatasourceIdsJson[0] != 0 && event.DatasourceId != 0 {
-		if !slices.Contains(mute.DatasourceIdsJson, event.DatasourceId) {
+		idm := make(map[int64]struct{}, len(mute.DatasourceIdsJson))
+		for i := 0; i < len(mute.DatasourceIdsJson); i++ {
+			idm[mute.DatasourceIdsJson[i]] = struct{}{}
+		}
+
+		// 判断 event.datasourceId 是否包含在 idm 中
+		if _, has := idm[event.DatasourceId]; !has {
 			return false, errors.New("datasource id not match")
 		}
 	}
@@ -213,7 +198,7 @@ func MatchMute(event *models.AlertCurEvent, mute *models.AlertMute, clock ...int
 		return false, errors.New("event severity not match mute severity")
 	}
 
-	if len(mute.ITags) == 0 {
+	if mute.ITags == nil || len(mute.ITags) == 0 {
 		return true, nil
 	}
 	if !common.MatchTags(event.TagsMap, mute.ITags) {

alert/naming/heartbeat.go

@@ -115,7 +115,7 @@ func (n *Naming) heartbeat() error {
 		newDatasource[datasourceIds[i]] = struct{}{}
 		servers, err := n.ActiveServers(datasourceIds[i])
 		if err != nil {
-			logger.Warningf("heartbeat %d get active server err:%v", datasourceIds[i], err)
+			logger.Warningf("hearbeat %d get active server err:%v", datasourceIds[i], err)
 			n.astats.CounterHeartbeatErrorTotal.WithLabelValues().Inc()
 			continue
 		}
@@ -148,7 +148,7 @@ func (n *Naming) heartbeat() error {
 
 	servers, err := n.ActiveServersByEngineName()
 	if err != nil {
-		logger.Warningf("heartbeat %d get active server err:%v", HostDatasource, err)
+		logger.Warningf("hearbeat %d get active server err:%v", HostDatasource, err)
 		n.astats.CounterHeartbeatErrorTotal.WithLabelValues().Inc()
 		return nil
 	}

alert/pipeline/engine/engine.go

@@ -1,380 +0,0 @@
-package engine
-
-import (
-	"fmt"
-	"time"
-
-	"github.com/ccfos/nightingale/v6/models"
-	"github.com/ccfos/nightingale/v6/pkg/ctx"
-	"github.com/google/uuid"
-	"github.com/toolkits/pkg/logger"
-)
-
-type WorkflowEngine struct {
-	ctx *ctx.Context
-}
-
-func NewWorkflowEngine(c *ctx.Context) *WorkflowEngine {
-	return &WorkflowEngine{ctx: c}
-}
-
-func (e *WorkflowEngine) Execute(pipeline *models.EventPipeline, event *models.AlertCurEvent, triggerCtx *models.WorkflowTriggerContext) (*models.AlertCurEvent, *models.WorkflowResult, error) {
-	startTime := time.Now()
-
-	wfCtx := e.initWorkflowContext(pipeline, event, triggerCtx)
-
-	nodes := pipeline.GetWorkflowNodes()
-	connections := pipeline.GetWorkflowConnections()
-
-	if len(nodes) == 0 {
-		return event, &models.WorkflowResult{
-			Event:   event,
-			Status:  models.ExecutionStatusSuccess,
-			Message: "no nodes to execute",
-		}, nil
-	}
-
-	nodeMap := make(map[string]*models.WorkflowNode)
-	for i := range nodes {
-		if nodes[i].RetryInterval == 0 {
-			nodes[i].RetryInterval = 1
-		}
-
-		if nodes[i].MaxRetries == 0 {
-			nodes[i].MaxRetries = 1
-		}
-
-		nodeMap[nodes[i].ID] = &nodes[i]
-	}
-
-	result := e.executeDAG(nodeMap, connections, wfCtx)
-	result.Event = wfCtx.Event
-
-	duration := time.Since(startTime).Milliseconds()
-
-	if triggerCtx != nil && triggerCtx.Mode != "" {
-		e.saveExecutionRecord(pipeline, wfCtx, result, triggerCtx, startTime.Unix(), duration)
-	}
-
-	return wfCtx.Event, result, nil
-}
-
-func (e *WorkflowEngine) initWorkflowContext(pipeline *models.EventPipeline, event *models.AlertCurEvent, triggerCtx *models.WorkflowTriggerContext) *models.WorkflowContext {
-	// 合并输入参数
-	inputs := pipeline.GetInputsMap()
-	if triggerCtx != nil && triggerCtx.InputsOverrides != nil {
-		for k, v := range triggerCtx.InputsOverrides {
-			inputs[k] = v
-		}
-	}
-
-	metadata := map[string]string{
-		"start_time":  fmt.Sprintf("%d", time.Now().Unix()),
-		"pipeline_id": fmt.Sprintf("%d", pipeline.ID),
-	}
-
-	// 是否启用流式输出
-	stream := false
-	if triggerCtx != nil {
-		metadata["request_id"] = triggerCtx.RequestID
-		metadata["trigger_mode"] = triggerCtx.Mode
-		metadata["trigger_by"] = triggerCtx.TriggerBy
-		stream = triggerCtx.Stream
-	}
-
-	return &models.WorkflowContext{
-		Event:    event,
-		Inputs:   inputs,
-		Vars:     make(map[string]interface{}), // 初始化空的 Vars，供节点间传递数据
-		Metadata: metadata,
-		Stream:   stream,
-	}
-}
-
-// executeDAG 使用 Kahn 算法执行 DAG
-func (e *WorkflowEngine) executeDAG(nodeMap map[string]*models.WorkflowNode, connections models.Connections, wfCtx *models.WorkflowContext) *models.WorkflowResult {
-	result := &models.WorkflowResult{
-		Status:      models.ExecutionStatusSuccess,
-		NodeResults: make([]*models.NodeExecutionResult, 0),
-		Stream:      wfCtx.Stream, // 从上下文继承流式输出设置
-	}
-
-	// 计算每个节点的入度
-	inDegree := make(map[string]int)
-	for nodeID := range nodeMap {
-		inDegree[nodeID] = 0
-	}
-
-	// 遍历连接，计算入度
-	for _, nodeConns := range connections {
-		for _, targets := range nodeConns.Main {
-			for _, target := range targets {
-				inDegree[target.Node]++
-			}
-		}
-	}
-
-	// 找到所有入度为 0 的节点（起始节点）
-	queue := make([]string, 0)
-	for nodeID, degree := range inDegree {
-		if degree == 0 {
-			queue = append(queue, nodeID)
-		}
-	}
-
-	// 如果没有起始节点，说明存在循环依赖
-	if len(queue) == 0 && len(nodeMap) > 0 {
-		result.Status = models.ExecutionStatusFailed
-		result.Message = "workflow has circular dependency"
-		return result
-	}
-
-	// 记录已执行的节点
-	executed := make(map[string]bool)
-	// 记录节点的分支选择结果
-	branchResults := make(map[string]*int)
-
-	for len(queue) > 0 {
-		// 取出队首节点
-		nodeID := queue[0]
-		queue = queue[1:]
-
-		// 检查是否已执行
-		if executed[nodeID] {
-			continue
-		}
-
-		node, exists := nodeMap[nodeID]
-		if !exists {
-			continue
-		}
-
-		// 执行节点
-		nodeResult, nodeOutput := e.executeNode(node, wfCtx)
-		result.NodeResults = append(result.NodeResults, nodeResult)
-
-		if nodeOutput != nil && nodeOutput.Stream && nodeOutput.StreamChan != nil {
-			// 流式输出节点通常是最后一个节点
-			// 直接传递 StreamChan 给 WorkflowResult，不阻塞等待
-			result.Stream = true
-			result.StreamChan = nodeOutput.StreamChan
-			result.Event = wfCtx.Event
-			result.Status = "streaming"
-			result.Message = fmt.Sprintf("streaming output from node: %s", node.Name)
-
-			// 更新节点状态为 streaming
-			nodeResult.Status = "streaming"
-			nodeResult.Message = "streaming in progress"
-
-			// 立即返回，让 API 层处理流式响应
-			return result
-		}
-		executed[nodeID] = true
-
-		// 保存分支结果
-		if nodeResult.BranchIndex != nil {
-			branchResults[nodeID] = nodeResult.BranchIndex
-		}
-
-		// 检查执行状态
-		if nodeResult.Status == "failed" {
-			if !node.ContinueOnFail {
-				result.Status = models.ExecutionStatusFailed
-				result.ErrorNode = nodeID
-				result.Message = fmt.Sprintf("node %s failed: %s", node.Name, nodeResult.Error)
-			}
-		}
-
-		// 检查是否终止
-		if nodeResult.Status == "terminated" {
-			result.Message = fmt.Sprintf("workflow terminated at node %s", node.Name)
-			return result
-		}
-
-		// 更新后继节点的入度
-		if nodeConns, ok := connections[nodeID]; ok {
-			for outputIndex, targets := range nodeConns.Main {
-				// 检查是否应该走这个分支
-				if !e.shouldFollowBranch(nodeID, outputIndex, branchResults) {
-					continue
-				}
-
-				for _, target := range targets {
-					inDegree[target.Node]--
-					if inDegree[target.Node] == 0 {
-						queue = append(queue, target.Node)
-					}
-				}
-			}
-		}
-	}
-
-	return result
-}
-
-// executeNode 执行单个节点
-// 返回：节点执行结果、节点输出（用于流式输出检测）
-func (e *WorkflowEngine) executeNode(node *models.WorkflowNode, wfCtx *models.WorkflowContext) (*models.NodeExecutionResult, *models.NodeOutput) {
-	startTime := time.Now()
-	nodeResult := &models.NodeExecutionResult{
-		NodeID:    node.ID,
-		NodeName:  node.Name,
-		NodeType:  node.Type,
-		StartedAt: startTime.Unix(),
-	}
-
-	var nodeOutput *models.NodeOutput
-
-	// 跳过禁用的节点
-	if node.Disabled {
-		nodeResult.Status = "skipped"
-		nodeResult.Message = "node is disabled"
-		nodeResult.FinishedAt = time.Now().Unix()
-		nodeResult.DurationMs = time.Since(startTime).Milliseconds()
-		return nodeResult, nil
-	}
-
-	// 获取处理器
-	processor, err := models.GetProcessorByType(node.Type, node.Config)
-	if err != nil {
-		nodeResult.Status = "failed"
-		nodeResult.Error = fmt.Sprintf("failed to get processor: %v", err)
-		nodeResult.FinishedAt = time.Now().Unix()
-		nodeResult.DurationMs = time.Since(startTime).Milliseconds()
-		return nodeResult, nil
-	}
-
-	// 执行处理器（带重试）
-	var retries int
-	maxRetries := node.MaxRetries
-	if !node.RetryOnFail {
-		maxRetries = 0
-	}
-
-	for retries <= maxRetries {
-		// 检查是否为分支处理器
-		if branchProcessor, ok := processor.(models.BranchProcessor); ok {
-			output, err := branchProcessor.ProcessWithBranch(e.ctx, wfCtx)
-			if err != nil {
-				if retries < maxRetries {
-					retries++
-					time.Sleep(time.Duration(node.RetryInterval) * time.Second)
-					continue
-				}
-				nodeResult.Status = "failed"
-				nodeResult.Error = err.Error()
-			} else {
-				nodeResult.Status = "success"
-				if output != nil {
-					nodeOutput = output
-					if output.WfCtx != nil {
-						wfCtx = output.WfCtx
-					}
-					nodeResult.Message = output.Message
-					nodeResult.BranchIndex = output.BranchIndex
-					if output.Terminate {
-						nodeResult.Status = "terminated"
-					}
-				}
-			}
-			break
-		}
-
-		// 普通处理器
-		newWfCtx, msg, err := processor.Process(e.ctx, wfCtx)
-		if err != nil {
-			if retries < maxRetries {
-				retries++
-				time.Sleep(time.Duration(node.RetryInterval) * time.Second)
-				continue
-			}
-			nodeResult.Status = "failed"
-			nodeResult.Error = err.Error()
-		} else {
-			nodeResult.Status = "success"
-			nodeResult.Message = msg
-			if newWfCtx != nil {
-				wfCtx = newWfCtx
-
-				// 检测流式输出标记
-				if newWfCtx.Stream && newWfCtx.StreamChan != nil {
-					nodeOutput = &models.NodeOutput{
-						WfCtx:      newWfCtx,
-						Message:    msg,
-						Stream:     true,
-						StreamChan: newWfCtx.StreamChan,
-					}
-				}
-			}
-
-			// 如果事件被 drop（返回 nil 或 Event 为 nil），标记为终止
-			if newWfCtx == nil || newWfCtx.Event == nil {
-				nodeResult.Status = "terminated"
-				nodeResult.Message = msg
-			}
-		}
-		break
-	}
-
-	nodeResult.FinishedAt = time.Now().Unix()
-	nodeResult.DurationMs = time.Since(startTime).Milliseconds()
-
-	logger.Infof("workflow: executed node %s (type=%s) status=%s msg=%s duration=%dms",
-		node.Name, node.Type, nodeResult.Status, nodeResult.Message, nodeResult.DurationMs)
-
-	return nodeResult, nodeOutput
-}
-
-// shouldFollowBranch 判断是否应该走某个分支
-func (e *WorkflowEngine) shouldFollowBranch(nodeID string, outputIndex int, branchResults map[string]*int) bool {
-	branchIndex, hasBranch := branchResults[nodeID]
-	if !hasBranch {
-		// 没有分支结果，说明不是分支节点，只走第一个输出
-		return outputIndex == 0
-	}
-
-	if branchIndex == nil {
-		// branchIndex 为 nil，走默认分支（通常是最后一个）
-		return true
-	}
-
-	// 只走选中的分支
-	return outputIndex == *branchIndex
-}
-
-func (e *WorkflowEngine) saveExecutionRecord(pipeline *models.EventPipeline, wfCtx *models.WorkflowContext, result *models.WorkflowResult, triggerCtx *models.WorkflowTriggerContext, startTime int64, duration int64) {
-	executionID := triggerCtx.RequestID
-	if executionID == "" {
-		executionID = uuid.New().String()
-	}
-
-	execution := &models.EventPipelineExecution{
-		ID:           executionID,
-		PipelineID:   pipeline.ID,
-		PipelineName: pipeline.Name,
-		Mode:         triggerCtx.Mode,
-		Status:       result.Status,
-		ErrorMessage: result.Message,
-		ErrorNode:    result.ErrorNode,
-		CreatedAt:    startTime,
-		FinishedAt:   time.Now().Unix(),
-		DurationMs:   duration,
-		TriggerBy:    triggerCtx.TriggerBy,
-	}
-
-	if wfCtx.Event != nil {
-		execution.EventID = wfCtx.Event.Id
-	}
-
-	if err := execution.SetNodeResults(result.NodeResults); err != nil {
-		logger.Errorf("workflow: failed to set node results: pipeline_id=%d, error=%v", pipeline.ID, err)
-	}
-
-	if err := execution.SetInputsSnapshot(wfCtx.Inputs); err != nil {
-		logger.Errorf("workflow: failed to set inputs snapshot: pipeline_id=%d, error=%v", pipeline.ID, err)
-	}
-
-	if err := models.CreateEventPipelineExecution(e.ctx, execution); err != nil {
-		logger.Errorf("workflow: failed to save execution record: pipeline_id=%d, error=%v", pipeline.ID, err)
-	}
-}

alert/pipeline/pipeline.go

@@ -5,7 +5,6 @@ import (
 	_ "github.com/ccfos/nightingale/v6/alert/pipeline/processor/callback"
 	_ "github.com/ccfos/nightingale/v6/alert/pipeline/processor/eventdrop"
 	_ "github.com/ccfos/nightingale/v6/alert/pipeline/processor/eventupdate"
-	_ "github.com/ccfos/nightingale/v6/alert/pipeline/processor/logic"
 	_ "github.com/ccfos/nightingale/v6/alert/pipeline/processor/relabel"
 )
 

alert/pipeline/processor/aisummary/ai_summary.go

@@ -8,7 +8,6 @@ import (
 	"io"
 	"net/http"
 	"net/url"
-	"strconv"
 	"strings"
 	"text/template"
 	"time"
@@ -55,24 +54,23 @@ func (c *AISummaryConfig) Init(settings interface{}) (models.Processor, error) {
 	return result, err
 }
 
-func (c *AISummaryConfig) Process(ctx *ctx.Context, wfCtx *models.WorkflowContext) (*models.WorkflowContext, string, error) {
-	event := wfCtx.Event
+func (c *AISummaryConfig) Process(ctx *ctx.Context, event *models.AlertCurEvent) (*models.AlertCurEvent, string, error) {
 	if c.Client == nil {
 		if err := c.initHTTPClient(); err != nil {
-			return wfCtx, "", fmt.Errorf("failed to initialize HTTP client: %v processor: %v", err, c)
+			return event, "", fmt.Errorf("failed to initialize HTTP client: %v processor: %v", err, c)
 		}
 	}
 
 	// 准备告警事件信息
-	eventInfo, err := c.prepareEventInfo(wfCtx)
+	eventInfo, err := c.prepareEventInfo(event)
 	if err != nil {
-		return wfCtx, "", fmt.Errorf("failed to prepare event info: %v processor: %v", err, c)
+		return event, "", fmt.Errorf("failed to prepare event info: %v processor: %v", err, c)
 	}
 
 	// 调用AI模型生成总结
 	summary, err := c.generateAISummary(eventInfo)
 	if err != nil {
-		return wfCtx, "", fmt.Errorf("failed to generate AI summary: %v processor: %v", err, c)
+		return event, "", fmt.Errorf("failed to generate AI summary: %v processor: %v", err, c)
 	}
 
 	// 将总结添加到annotations字段
@@ -84,11 +82,11 @@ func (c *AISummaryConfig) Process(ctx *ctx.Context, wfCtx *models.WorkflowContex
 	// 更新Annotations字段
 	b, err := json.Marshal(event.AnnotationsJSON)
 	if err != nil {
-		return wfCtx, "", fmt.Errorf("failed to marshal annotations: %v processor: %v", err, c)
+		return event, "", fmt.Errorf("failed to marshal annotations: %v processor: %v", err, c)
 	}
 	event.Annotations = string(b)
 
-	return wfCtx, "", nil
+	return event, "", nil
 }
 
 func (c *AISummaryConfig) initHTTPClient() error {
@@ -111,10 +109,9 @@ func (c *AISummaryConfig) initHTTPClient() error {
 	return nil
 }
 
-func (c *AISummaryConfig) prepareEventInfo(wfCtx *models.WorkflowContext) (string, error) {
+func (c *AISummaryConfig) prepareEventInfo(event *models.AlertCurEvent) (string, error) {
 	var defs = []string{
-		"{{$event := .Event}}",
-		"{{$inputs := .Inputs}}",
+		"{{$event := .}}",
 	}
 
 	text := strings.Join(append(defs, c.PromptTemplate), "")
@@ -124,7 +121,7 @@ func (c *AISummaryConfig) prepareEventInfo(wfCtx *models.WorkflowContext) (strin
 	}
 
 	var body bytes.Buffer
-	err = t.Execute(&body, wfCtx)
+	err = t.Execute(&body, event)
 	if err != nil {
 		return "", fmt.Errorf("failed to execute prompt template: %v", err)
 	}
@@ -146,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
 	}
 
 	// 序列化请求体
@@ -203,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

@@ -42,14 +42,8 @@ func TestAISummaryConfig_Process(t *testing.T) {
 		},
 	}
 
-	// 创建 WorkflowContext
-	wfCtx := &models.WorkflowContext{
-		Event:  event,
-		Inputs: map[string]string{},
-	}
-
 	// 测试模板处理
-	eventInfo, err := config.prepareEventInfo(wfCtx)
+	eventInfo, err := config.prepareEventInfo(event)
 	assert.NoError(t, err)
 	assert.Contains(t, eventInfo, "Test Rule")
 	assert.Contains(t, eventInfo, "1")
@@ -60,86 +54,16 @@ func TestAISummaryConfig_Process(t *testing.T) {
 	assert.NotNil(t, processor)
 
 	// 测试处理函数
-	result, _, err := processor.Process(&ctx.Context{}, wfCtx)
+	result, _, err := processor.Process(&ctx.Context{}, event)
 	assert.NoError(t, err)
 	assert.NotNil(t, result)
-	assert.NotEmpty(t, result.Event.AnnotationsJSON["ai_summary"])
+	assert.NotEmpty(t, result.AnnotationsJSON["ai_summary"])
 
 	// 展示处理结果
 	t.Log("\n=== 处理结果 ===")
-	t.Logf("告警规则: %s", result.Event.RuleName)
-	t.Logf("严重程度: %d", result.Event.Severity)
-	t.Logf("标签: %v", result.Event.TagsMap)
-	t.Logf("原始注释: %v", result.Event.AnnotationsJSON["description"])
-	t.Logf("AI总结: %s", result.Event.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)
-		})
-	}
+	t.Logf("告警规则: %s", result.RuleName)
+	t.Logf("严重程度: %d", result.Severity)
+	t.Logf("标签: %v", result.TagsMap)
+	t.Logf("原始注释: %v", result.AnnotationsJSON["description"])
+	t.Logf("AI总结: %s", result.AnnotationsJSON["ai_summary"])
 }

alert/pipeline/processor/callback/callback.go

@@ -11,7 +11,6 @@ import (
 	"time"
 
 	"github.com/ccfos/nightingale/v6/alert/pipeline/processor/common"
-	"github.com/ccfos/nightingale/v6/alert/pipeline/processor/utils"
 	"github.com/ccfos/nightingale/v6/models"
 	"github.com/ccfos/nightingale/v6/pkg/ctx"
 	"github.com/toolkits/pkg/logger"
@@ -44,8 +43,7 @@ func (c *CallbackConfig) Init(settings interface{}) (models.Processor, error) {
 	return result, err
 }
 
-func (c *CallbackConfig) Process(ctx *ctx.Context, wfCtx *models.WorkflowContext) (*models.WorkflowContext, string, error) {
-	event := wfCtx.Event
+func (c *CallbackConfig) Process(ctx *ctx.Context, event *models.AlertCurEvent) (*models.AlertCurEvent, string, error) {
 	if c.Client == nil {
 		transport := &http.Transport{
 			TLSClientConfig: &tls.Config{InsecureSkipVerify: c.SkipSSLVerify},
@@ -54,7 +52,7 @@ func (c *CallbackConfig) Process(ctx *ctx.Context, wfCtx *models.WorkflowContext
 		if c.Proxy != "" {
 			proxyURL, err := url.Parse(c.Proxy)
 			if err != nil {
-				return wfCtx, "", fmt.Errorf("failed to parse proxy url: %v processor: %v", err, c)
+				return event, "", fmt.Errorf("failed to parse proxy url: %v processor: %v", err, c)
 			} else {
 				transport.Proxy = http.ProxyURL(proxyURL)
 			}
@@ -72,19 +70,14 @@ func (c *CallbackConfig) Process(ctx *ctx.Context, wfCtx *models.WorkflowContext
 		headers[k] = v
 	}
 
-	url, err := utils.TplRender(wfCtx, c.URL)
-	if err != nil {
-		return wfCtx, "", fmt.Errorf("failed to render url template: %v processor: %v", err, c)
-	}
-
 	body, err := json.Marshal(event)
 	if err != nil {
-		return wfCtx, "", fmt.Errorf("failed to marshal event: %v processor: %v", err, c)
+		return event, "", fmt.Errorf("failed to marshal event: %v processor: %v", err, c)
 	}
 
-	req, err := http.NewRequest("POST", url, strings.NewReader(string(body)))
+	req, err := http.NewRequest("POST", c.URL, strings.NewReader(string(body)))
 	if err != nil {
-		return wfCtx, "", fmt.Errorf("failed to create request: %v processor: %v", err, c)
+		return event, "", fmt.Errorf("failed to create request: %v processor: %v", err, c)
 	}
 
 	for k, v := range headers {
@@ -97,14 +90,14 @@ func (c *CallbackConfig) Process(ctx *ctx.Context, wfCtx *models.WorkflowContext
 
 	resp, err := c.Client.Do(req)
 	if err != nil {
-		return wfCtx, "", fmt.Errorf("failed to send request: %v processor: %v", err, c)
+		return event, "", fmt.Errorf("failed to send request: %v processor: %v", err, c)
 	}
 
 	b, err := io.ReadAll(resp.Body)
 	if err != nil {
-		return wfCtx, "", fmt.Errorf("failed to read response body: %v processor: %v", err, c)
+		return event, "", fmt.Errorf("failed to read response body: %v processor: %v", err, c)
 	}
 
 	logger.Debugf("callback processor response body: %s", string(b))
-	return wfCtx, "callback success", nil
+	return event, "callback success", nil
 }

alert/pipeline/processor/eventdrop/event_drop.go

@@ -26,38 +26,35 @@ func (c *EventDropConfig) Init(settings interface{}) (models.Processor, error) {
 	return result, err
 }
 
-func (c *EventDropConfig) Process(ctx *ctx.Context, wfCtx *models.WorkflowContext) (*models.WorkflowContext, string, error) {
+func (c *EventDropConfig) Process(ctx *ctx.Context, event *models.AlertCurEvent) (*models.AlertCurEvent, string, error) {
 	// 使用背景是可以根据此处理器，实现对事件进行更加灵活的过滤的逻辑
 	// 在标签过滤和属性过滤都不满足需求时可以使用
 	// 如果模板执行结果为 true，则删除该事件
-	event := wfCtx.Event
 
 	var defs = []string{
-		"{{ $event := .Event }}",
-		"{{ $labels := .Event.TagsMap }}",
-		"{{ $value := .Event.TriggerValue }}",
-		"{{ $inputs := .Inputs }}",
+		"{{ $event := . }}",
+		"{{ $labels := .TagsMap }}",
+		"{{ $value := .TriggerValue }}",
 	}
 
 	text := strings.Join(append(defs, c.Content), "")
 
 	tpl, err := texttemplate.New("eventdrop").Funcs(tplx.TemplateFuncMap).Parse(text)
 	if err != nil {
-		return wfCtx, "", fmt.Errorf("processor failed to parse template: %v processor: %v", err, c)
+		return event, "", fmt.Errorf("processor failed to parse template: %v processor: %v", err, c)
 	}
 
 	var body bytes.Buffer
-	if err = tpl.Execute(&body, wfCtx); err != nil {
-		return wfCtx, "", fmt.Errorf("processor failed to execute template: %v processor: %v", err, c)
+	if err = tpl.Execute(&body, event); err != nil {
+		return event, "", fmt.Errorf("processor failed to execute template: %v processor: %v", err, c)
 	}
 
 	result := strings.TrimSpace(body.String())
 	logger.Infof("processor eventdrop result: %v", result)
 	if result == "true" {
-		wfCtx.Event = nil
-		logger.Infof("processor eventdrop drop event: %s", event.Hash)
-		return wfCtx, "drop event success", nil
+		logger.Infof("processor eventdrop drop event: %v", event)
+		return nil, "drop event success", nil
 	}
 
-	return wfCtx, "drop event failed", nil
+	return event, "drop event failed", nil
 }

alert/pipeline/processor/eventupdate/event_update.go

@@ -31,8 +31,7 @@ func (c *EventUpdateConfig) Init(settings interface{}) (models.Processor, error)
 	return result, err
 }
 
-func (c *EventUpdateConfig) Process(ctx *ctx.Context, wfCtx *models.WorkflowContext) (*models.WorkflowContext, string, error) {
-	event := wfCtx.Event
+func (c *EventUpdateConfig) Process(ctx *ctx.Context, event *models.AlertCurEvent) (*models.AlertCurEvent, string, error) {
 	if c.Client == nil {
 		transport := &http.Transport{
 			TLSClientConfig: &tls.Config{InsecureSkipVerify: c.SkipSSLVerify},
@@ -41,7 +40,7 @@ func (c *EventUpdateConfig) Process(ctx *ctx.Context, wfCtx *models.WorkflowCont
 		if c.Proxy != "" {
 			proxyURL, err := url.Parse(c.Proxy)
 			if err != nil {
-				return wfCtx, "", fmt.Errorf("failed to parse proxy url: %v processor: %v", err, c)
+				return event, "", fmt.Errorf("failed to parse proxy url: %v processor: %v", err, c)
 			} else {
 				transport.Proxy = http.ProxyURL(proxyURL)
 			}
@@ -61,12 +60,12 @@ func (c *EventUpdateConfig) Process(ctx *ctx.Context, wfCtx *models.WorkflowCont
 
 	body, err := json.Marshal(event)
 	if err != nil {
-		return wfCtx, "", fmt.Errorf("failed to marshal event: %v processor: %v", err, c)
+		return event, "", fmt.Errorf("failed to marshal event: %v processor: %v", err, c)
 	}
 
 	req, err := http.NewRequest("POST", c.URL, strings.NewReader(string(body)))
 	if err != nil {
-		return wfCtx, "", fmt.Errorf("failed to create request: %v processor: %v", err, c)
+		return event, "", fmt.Errorf("failed to create request: %v processor: %v", err, c)
 	}
 
 	for k, v := range headers {
@@ -79,7 +78,7 @@ func (c *EventUpdateConfig) Process(ctx *ctx.Context, wfCtx *models.WorkflowCont
 
 	resp, err := c.Client.Do(req)
 	if err != nil {
-		return wfCtx, "", fmt.Errorf("failed to send request: %v processor: %v", err, c)
+		return event, "", fmt.Errorf("failed to send request: %v processor: %v", err, c)
 	}
 
 	b, err := io.ReadAll(resp.Body)
@@ -90,8 +89,8 @@ func (c *EventUpdateConfig) Process(ctx *ctx.Context, wfCtx *models.WorkflowCont
 
 	err = json.Unmarshal(b, &event)
 	if err != nil {
-		return wfCtx, "", fmt.Errorf("failed to unmarshal response body: %v processor: %v", err, c)
+		return event, "", fmt.Errorf("failed to unmarshal response body: %v processor: %v", err, c)
 	}
 
-	return wfCtx, "", nil
+	return event, "", nil
 }

alert/pipeline/processor/logic/if.go

@@ -1,197 +0,0 @@
-package logic
-
-import (
-	"bytes"
-	"fmt"
-	"strings"
-	"text/template"
-
-	alertCommon "github.com/ccfos/nightingale/v6/alert/common"
-	"github.com/ccfos/nightingale/v6/alert/pipeline/processor/common"
-	"github.com/ccfos/nightingale/v6/models"
-	"github.com/ccfos/nightingale/v6/pkg/ctx"
-	"github.com/ccfos/nightingale/v6/pkg/tplx"
-)
-
-// 判断模式常量
-const (
-	ConditionModeExpression = "expression" // 表达式模式（默认）
-	ConditionModeTags       = "tags"       // 标签/属性模式
-)
-
-// IfConfig If 条件处理器配置
-type IfConfig struct {
-	// 判断模式：expression（表达式）或 tags（标签/属性）
-	Mode string `json:"mode,omitempty"`
-
-	// 表达式模式配置
-	// 条件表达式（支持 Go 模板语法）
-	// 例如：{{ if eq .Severity 1 }}true{{ end }}
-	Condition string `json:"condition,omitempty"`
-
-	// 标签/属性模式配置
-	LabelKeys  []models.TagFilter `json:"label_keys,omitempty"` // 适用标签
-	Attributes []models.TagFilter `json:"attributes,omitempty"` // 适用属性
-
-	// 内部使用，解析后的过滤器
-	parsedLabelKeys  []models.TagFilter `json:"-"`
-	parsedAttributes []models.TagFilter `json:"-"`
-}
-
-func init() {
-	models.RegisterProcessor("logic.if", &IfConfig{})
-}
-
-func (c *IfConfig) Init(settings interface{}) (models.Processor, error) {
-	result, err := common.InitProcessor[*IfConfig](settings)
-	if err != nil {
-		return nil, err
-	}
-
-	// 解析标签过滤器
-	if len(result.LabelKeys) > 0 {
-		// Deep copy to avoid concurrent map writes on cached objects
-		labelKeysCopy := make([]models.TagFilter, len(result.LabelKeys))
-		copy(labelKeysCopy, result.LabelKeys)
-		for i := range labelKeysCopy {
-			if labelKeysCopy[i].Func == "" {
-				labelKeysCopy[i].Func = labelKeysCopy[i].Op
-			}
-		}
-		result.parsedLabelKeys, err = models.ParseTagFilter(labelKeysCopy)
-		if err != nil {
-			return nil, fmt.Errorf("failed to parse label_keys: %v", err)
-		}
-	}
-
-	// 解析属性过滤器
-	if len(result.Attributes) > 0 {
-		// Deep copy to avoid concurrent map writes on cached objects
-		attributesCopy := make([]models.TagFilter, len(result.Attributes))
-		copy(attributesCopy, result.Attributes)
-		for i := range attributesCopy {
-			if attributesCopy[i].Func == "" {
-				attributesCopy[i].Func = attributesCopy[i].Op
-			}
-		}
-		result.parsedAttributes, err = models.ParseTagFilter(attributesCopy)
-		if err != nil {
-			return nil, fmt.Errorf("failed to parse attributes: %v", err)
-		}
-	}
-
-	return result, nil
-}
-
-// Process 实现 Processor 接口（兼容旧模式）
-func (c *IfConfig) Process(ctx *ctx.Context, wfCtx *models.WorkflowContext) (*models.WorkflowContext, string, error) {
-	result, err := c.evaluateCondition(wfCtx)
-	if err != nil {
-		return wfCtx, "", fmt.Errorf("if processor: failed to evaluate condition: %v", err)
-	}
-
-	if result {
-		return wfCtx, "condition matched (true branch)", nil
-	}
-	return wfCtx, "condition not matched (false branch)", nil
-}
-
-// ProcessWithBranch 实现 BranchProcessor 接口
-func (c *IfConfig) ProcessWithBranch(ctx *ctx.Context, wfCtx *models.WorkflowContext) (*models.NodeOutput, error) {
-	result, err := c.evaluateCondition(wfCtx)
-	if err != nil {
-		return nil, fmt.Errorf("if processor: failed to evaluate condition: %v", err)
-	}
-
-	output := &models.NodeOutput{
-		WfCtx: wfCtx,
-	}
-
-	if result {
-		// 条件为 true，走输出 0（true 分支）
-		branchIndex := 0
-		output.BranchIndex = &branchIndex
-		output.Message = "condition matched (true branch)"
-	} else {
-		// 条件为 false，走输出 1（false 分支）
-		branchIndex := 1
-		output.BranchIndex = &branchIndex
-		output.Message = "condition not matched (false branch)"
-	}
-
-	return output, nil
-}
-
-// evaluateCondition 评估条件
-func (c *IfConfig) evaluateCondition(wfCtx *models.WorkflowContext) (bool, error) {
-	mode := c.Mode
-	if mode == "" {
-		mode = ConditionModeExpression // 默认表达式模式
-	}
-
-	switch mode {
-	case ConditionModeTags:
-		return c.evaluateTagsCondition(wfCtx.Event)
-	default:
-		return c.evaluateExpressionCondition(wfCtx)
-	}
-}
-
-// evaluateExpressionCondition 评估表达式条件
-func (c *IfConfig) evaluateExpressionCondition(wfCtx *models.WorkflowContext) (bool, error) {
-	if c.Condition == "" {
-		return true, nil
-	}
-
-	// 构建模板数据
-	var defs = []string{
-		"{{ $event := .Event }}",
-		"{{ $labels := .Event.TagsMap }}",
-		"{{ $value := .Event.TriggerValue }}",
-		"{{ $inputs := .Inputs }}",
-	}
-
-	text := strings.Join(append(defs, c.Condition), "")
-
-	tpl, err := template.New("if_condition").Funcs(tplx.TemplateFuncMap).Parse(text)
-	if err != nil {
-		return false, err
-	}
-
-	var buf bytes.Buffer
-	if err = tpl.Execute(&buf, wfCtx); err != nil {
-		return false, err
-	}
-
-	result := strings.TrimSpace(strings.ToLower(buf.String()))
-	return result == "true" || result == "1", nil
-}
-
-// evaluateTagsCondition 评估标签/属性条件
-func (c *IfConfig) evaluateTagsCondition(event *models.AlertCurEvent) (bool, error) {
-	// 如果没有配置任何过滤条件，默认返回 true
-	if len(c.parsedLabelKeys) == 0 && len(c.parsedAttributes) == 0 {
-		return true, nil
-	}
-
-	// 匹配标签 (TagsMap)
-	if len(c.parsedLabelKeys) > 0 {
-		tagsMap := event.TagsMap
-		if tagsMap == nil {
-			tagsMap = make(map[string]string)
-		}
-		if !alertCommon.MatchTags(tagsMap, c.parsedLabelKeys) {
-			return false, nil
-		}
-	}
-
-	// 匹配属性 (JsonTagsAndValue - 所有 JSON 字段)
-	if len(c.parsedAttributes) > 0 {
-		attributesMap := event.JsonTagsAndValue()
-		if !alertCommon.MatchTags(attributesMap, c.parsedAttributes) {
-			return false, nil
-		}
-	}
-
-	return true, nil
-}

alert/pipeline/processor/logic/switch.go

@@ -1,224 +0,0 @@
-package logic
-
-import (
-	"bytes"
-	"fmt"
-	"strings"
-	"text/template"
-
-	alertCommon "github.com/ccfos/nightingale/v6/alert/common"
-	"github.com/ccfos/nightingale/v6/alert/pipeline/processor/common"
-	"github.com/ccfos/nightingale/v6/models"
-	"github.com/ccfos/nightingale/v6/pkg/ctx"
-	"github.com/ccfos/nightingale/v6/pkg/tplx"
-)
-
-// SwitchCase Switch 分支定义
-type SwitchCase struct {
-	// 判断模式：expression（表达式）或 tags（标签/属性）
-	Mode string `json:"mode,omitempty"`
-
-	// 表达式模式配置
-	// 条件表达式（支持 Go 模板语法）
-	Condition string `json:"condition,omitempty"`
-
-	// 标签/属性模式配置
-	LabelKeys  []models.TagFilter `json:"label_keys,omitempty"` // 适用标签
-	Attributes []models.TagFilter `json:"attributes,omitempty"` // 适用属性
-
-	// 分支名称（可选，用于日志）
-	Name string `json:"name,omitempty"`
-
-	// 内部使用，解析后的过滤器
-	parsedLabelKeys  []models.TagFilter `json:"-"`
-	parsedAttributes []models.TagFilter `json:"-"`
-}
-
-// SwitchConfig Switch 多分支处理器配置
-type SwitchConfig struct {
-	// 分支条件列表
-	// 按顺序匹配，第一个为 true 的分支将被选中
-	Cases []SwitchCase `json:"cases"`
-	// 是否允许多个分支同时匹配（默认 false，只走第一个匹配的）
-	AllowMultiple bool `json:"allow_multiple,omitempty"`
-}
-
-func init() {
-	models.RegisterProcessor("logic.switch", &SwitchConfig{})
-}
-
-func (c *SwitchConfig) Init(settings interface{}) (models.Processor, error) {
-	result, err := common.InitProcessor[*SwitchConfig](settings)
-	if err != nil {
-		return nil, err
-	}
-
-	// 解析每个 case 的标签和属性过滤器
-	for i := range result.Cases {
-		if len(result.Cases[i].LabelKeys) > 0 {
-			// Deep copy to avoid concurrent map writes on cached objects
-			labelKeysCopy := make([]models.TagFilter, len(result.Cases[i].LabelKeys))
-			copy(labelKeysCopy, result.Cases[i].LabelKeys)
-			for j := range labelKeysCopy {
-				if labelKeysCopy[j].Func == "" {
-					labelKeysCopy[j].Func = labelKeysCopy[j].Op
-				}
-			}
-			result.Cases[i].parsedLabelKeys, err = models.ParseTagFilter(labelKeysCopy)
-			if err != nil {
-				return nil, fmt.Errorf("failed to parse label_keys for case[%d]: %v", i, err)
-			}
-		}
-
-		if len(result.Cases[i].Attributes) > 0 {
-			// Deep copy to avoid concurrent map writes on cached objects
-			attributesCopy := make([]models.TagFilter, len(result.Cases[i].Attributes))
-			copy(attributesCopy, result.Cases[i].Attributes)
-			for j := range attributesCopy {
-				if attributesCopy[j].Func == "" {
-					attributesCopy[j].Func = attributesCopy[j].Op
-				}
-			}
-			result.Cases[i].parsedAttributes, err = models.ParseTagFilter(attributesCopy)
-			if err != nil {
-				return nil, fmt.Errorf("failed to parse attributes for case[%d]: %v", i, err)
-			}
-		}
-	}
-
-	return result, nil
-}
-
-// Process 实现 Processor 接口（兼容旧模式）
-func (c *SwitchConfig) Process(ctx *ctx.Context, wfCtx *models.WorkflowContext) (*models.WorkflowContext, string, error) {
-	index, caseName, err := c.evaluateCases(wfCtx)
-	if err != nil {
-		return wfCtx, "", fmt.Errorf("switch processor: failed to evaluate cases: %v", err)
-	}
-
-	if index >= 0 {
-		if caseName != "" {
-			return wfCtx, fmt.Sprintf("matched case[%d]: %s", index, caseName), nil
-		}
-		return wfCtx, fmt.Sprintf("matched case[%d]", index), nil
-	}
-
-	// 走默认分支（最后一个输出）
-	return wfCtx, "no case matched, using default branch", nil
-}
-
-// ProcessWithBranch 实现 BranchProcessor 接口
-func (c *SwitchConfig) ProcessWithBranch(ctx *ctx.Context, wfCtx *models.WorkflowContext) (*models.NodeOutput, error) {
-	index, caseName, err := c.evaluateCases(wfCtx)
-	if err != nil {
-		return nil, fmt.Errorf("switch processor: failed to evaluate cases: %v", err)
-	}
-
-	output := &models.NodeOutput{
-		WfCtx: wfCtx,
-	}
-
-	if index >= 0 {
-		output.BranchIndex = &index
-		if caseName != "" {
-			output.Message = fmt.Sprintf("matched case[%d]: %s", index, caseName)
-		} else {
-			output.Message = fmt.Sprintf("matched case[%d]", index)
-		}
-	} else {
-		// 默认分支的索引是 cases 数量（即最后一个输出端口）
-		defaultIndex := len(c.Cases)
-		output.BranchIndex = &defaultIndex
-		output.Message = "no case matched, using default branch"
-	}
-
-	return output, nil
-}
-
-// evaluateCases 评估所有分支条件
-// 返回匹配的分支索引和分支名称，如果没有匹配返回 -1
-func (c *SwitchConfig) evaluateCases(wfCtx *models.WorkflowContext) (int, string, error) {
-	for i := range c.Cases {
-		matched, err := c.evaluateCaseCondition(&c.Cases[i], wfCtx)
-		if err != nil {
-			return -1, "", fmt.Errorf("case[%d] evaluation error: %v", i, err)
-		}
-		if matched {
-			return i, c.Cases[i].Name, nil
-		}
-	}
-	return -1, "", nil
-}
-
-// evaluateCaseCondition 评估单个分支条件
-func (c *SwitchConfig) evaluateCaseCondition(caseItem *SwitchCase, wfCtx *models.WorkflowContext) (bool, error) {
-	mode := caseItem.Mode
-	if mode == "" {
-		mode = ConditionModeExpression // 默认表达式模式
-	}
-
-	switch mode {
-	case ConditionModeTags:
-		return c.evaluateTagsCondition(caseItem, wfCtx.Event)
-	default:
-		return c.evaluateExpressionCondition(caseItem.Condition, wfCtx)
-	}
-}
-
-// evaluateExpressionCondition 评估表达式条件
-func (c *SwitchConfig) evaluateExpressionCondition(condition string, wfCtx *models.WorkflowContext) (bool, error) {
-	if condition == "" {
-		return false, nil
-	}
-
-	var defs = []string{
-		"{{ $event := .Event }}",
-		"{{ $labels := .Event.TagsMap }}",
-		"{{ $value := .Event.TriggerValue }}",
-		"{{ $inputs := .Inputs }}",
-	}
-
-	text := strings.Join(append(defs, condition), "")
-
-	tpl, err := template.New("switch_condition").Funcs(tplx.TemplateFuncMap).Parse(text)
-	if err != nil {
-		return false, err
-	}
-
-	var buf bytes.Buffer
-	if err = tpl.Execute(&buf, wfCtx); err != nil {
-		return false, err
-	}
-
-	result := strings.TrimSpace(strings.ToLower(buf.String()))
-	return result == "true" || result == "1", nil
-}
-
-// evaluateTagsCondition 评估标签/属性条件
-func (c *SwitchConfig) evaluateTagsCondition(caseItem *SwitchCase, event *models.AlertCurEvent) (bool, error) {
-	// 如果没有配置任何过滤条件，默认返回 false（不匹配）
-	if len(caseItem.parsedLabelKeys) == 0 && len(caseItem.parsedAttributes) == 0 {
-		return false, nil
-	}
-
-	// 匹配标签 (TagsMap)
-	if len(caseItem.parsedLabelKeys) > 0 {
-		tagsMap := event.TagsMap
-		if tagsMap == nil {
-			tagsMap = make(map[string]string)
-		}
-		if !alertCommon.MatchTags(tagsMap, caseItem.parsedLabelKeys) {
-			return false, nil
-		}
-	}
-
-	// 匹配属性 (JsonTagsAndValue - 所有 JSON 字段)
-	if len(caseItem.parsedAttributes) > 0 {
-		attributesMap := event.JsonTagsAndValue()
-		if !alertCommon.MatchTags(attributesMap, caseItem.parsedAttributes) {
-			return false, nil
-		}
-	}
-
-	return true, nil
-}

alert/pipeline/processor/relabel/relabel.go

@@ -42,7 +42,7 @@ func (r *RelabelConfig) Init(settings interface{}) (models.Processor, error) {
 	return result, err
 }
 
-func (r *RelabelConfig) Process(ctx *ctx.Context, wfCtx *models.WorkflowContext) (*models.WorkflowContext, string, error) {
+func (r *RelabelConfig) Process(ctx *ctx.Context, event *models.AlertCurEvent) (*models.AlertCurEvent, string, error) {
 	sourceLabels := make([]model.LabelName, len(r.SourceLabels))
 	for i := range r.SourceLabels {
 		sourceLabels[i] = model.LabelName(strings.ReplaceAll(r.SourceLabels[i], ".", REPLACE_DOT))
@@ -63,8 +63,8 @@ func (r *RelabelConfig) Process(ctx *ctx.Context, wfCtx *models.WorkflowContext)
 		},
 	}
 
-	EventRelabel(wfCtx.Event, relabelConfigs)
-	return wfCtx, "", nil
+	EventRelabel(event, relabelConfigs)
+	return event, "", nil
 }
 
 func EventRelabel(event *models.AlertCurEvent, relabelConfigs []*pconf.RelabelConfig) {

alert/pipeline/processor/utils/utils.go

@@ -1,32 +0,0 @@
-package utils
-
-import (
-	"bytes"
-	"fmt"
-	"strings"
-	"text/template"
-
-	"github.com/ccfos/nightingale/v6/models"
-	"github.com/ccfos/nightingale/v6/pkg/tplx"
-)
-
-func TplRender(wfCtx *models.WorkflowContext, content string) (string, error) {
-	var defs = []string{
-		"{{ $event := .Event }}",
-		"{{ $labels := .Event.TagsMap }}",
-		"{{ $value := .Event.TriggerValue }}",
-		"{{ $inputs := .Inputs }}",
-	}
-	text := strings.Join(append(defs, content), "")
-	tpl, err := template.New("tpl").Funcs(tplx.TemplateFuncMap).Parse(text)
-	if err != nil {
-		return "", fmt.Errorf("failed to parse template: %v", err)
-	}
-
-	var body bytes.Buffer
-	if err = tpl.Execute(&body, wfCtx); err != nil {
-		return "", fmt.Errorf("failed to execute template: %v", err)
-	}
-
-	return strings.TrimSpace(body.String()), nil
-}

alert/process/process.go

@@ -26,6 +26,8 @@ import (
 	"github.com/toolkits/pkg/str"
 )
 
+type EventMuteHookFunc func(event *models.AlertCurEvent) bool
+
 type ExternalProcessorsType struct {
 	ExternalLock sync.RWMutex
 	Processors   map[string]*Processor
@@ -74,6 +76,7 @@ type Processor struct {
 
 	HandleFireEventHook    HandleEventFunc
 	HandleRecoverEventHook HandleEventFunc
+	EventMuteHook          EventMuteHookFunc
 
 	ScheduleEntry    cron.Entry
 	PromEvalInterval int
@@ -118,6 +121,7 @@ func NewProcessor(engineName string, rule *models.AlertRule, datasourceId int64,
 
 		HandleFireEventHook:    func(event *models.AlertCurEvent) {},
 		HandleRecoverEventHook: func(event *models.AlertCurEvent) {},
+		EventMuteHook:          func(event *models.AlertCurEvent) bool { return false },
 	}
 
 	p.mayHandleGroup()
@@ -131,7 +135,7 @@ func (p *Processor) Handle(anomalyPoints []models.AnomalyPoint, from string, inh
 	p.inhibit = inhibit
 	cachedRule := p.alertRuleCache.Get(p.rule.Id)
 	if cachedRule == nil {
-		logger.Warningf("alert_eval_%d datasource_%d handle error: rule not found, maybe rule has been deleted, anomalyPoints:%+v", p.rule.Id, p.datasourceId, anomalyPoints)
+		logger.Errorf("rule not found %+v", anomalyPoints)
 		p.Stats.CounterRuleEvalErrorTotal.WithLabelValues(fmt.Sprintf("%v", p.DatasourceId()), "handle_event", p.BusiGroupCache.GetNameByBusiGroupId(p.rule.GroupId), fmt.Sprintf("%v", p.rule.Id)).Inc()
 		return
 	}
@@ -151,19 +155,9 @@ func (p *Processor) Handle(anomalyPoints []models.AnomalyPoint, from string, inh
 		// 如果 event 被 mute 了,本质也是 fire 的状态,这里无论如何都添加到 alertingKeys 中,防止 fire 的事件自动恢复了
 		hash := event.Hash
 		alertingKeys[hash] = struct{}{}
-
-		// event processor
-		eventCopy := event.DeepCopy()
-		event = dispatch.HandleEventPipeline(cachedRule.PipelineConfigs, eventCopy, event, dispatch.EventProcessorCache, p.ctx, cachedRule.Id, "alert_rule")
-		if event == nil {
-			logger.Infof("alert_eval_%d datasource_%d is muted drop by pipeline event:%s", p.rule.Id, p.datasourceId, eventCopy.Hash)
-			continue
-		}
-
-		// event mute
 		isMuted, detail, muteId := mute.IsMuted(cachedRule, event, p.TargetCache, p.alertMuteCache)
 		if isMuted {
-			logger.Infof("alert_eval_%d datasource_%d is muted, detail:%s event:%s", p.rule.Id, p.datasourceId, detail, event.Hash)
+			logger.Debugf("rule_eval:%s event:%v is muted, detail:%s", p.Key(), event, detail)
 			p.Stats.CounterMuteTotal.WithLabelValues(
 				fmt.Sprintf("%v", event.GroupName),
 				fmt.Sprintf("%v", p.rule.Id),
@@ -173,8 +167,8 @@ func (p *Processor) Handle(anomalyPoints []models.AnomalyPoint, from string, inh
 			continue
 		}
 
-		if dispatch.EventMuteHook(event) {
-			logger.Infof("alert_eval_%d datasource_%d is muted by hook event:%s", p.rule.Id, p.datasourceId, event.Hash)
+		if p.EventMuteHook(event) {
+			logger.Debugf("rule_eval:%s event:%v is muted by hook", p.Key(), event)
 			p.Stats.CounterMuteTotal.WithLabelValues(
 				fmt.Sprintf("%v", event.GroupName),
 				fmt.Sprintf("%v", p.rule.Id),
@@ -247,7 +241,7 @@ func (p *Processor) BuildEvent(anomalyPoint models.AnomalyPoint, from string, no
 
 	if err := json.Unmarshal([]byte(p.rule.Annotations), &event.AnnotationsJSON); err != nil {
 		event.AnnotationsJSON = make(map[string]string) // 解析失败时使用空 map
-		logger.Warningf("alert_eval_%d datasource_%d unmarshal annotations json failed: %v", p.rule.Id, p.datasourceId, err)
+		logger.Warningf("unmarshal annotations json failed: %v, rule: %d", err, p.rule.Id)
 	}
 
 	if event.TriggerValues != "" && strings.Count(event.TriggerValues, "$") > 1 {
@@ -272,7 +266,7 @@ func (p *Processor) BuildEvent(anomalyPoint models.AnomalyPoint, from string, no
 			pt.GroupNames = p.BusiGroupCache.GetNamesByBusiGroupIds(pt.GroupIds)
 			event.Target = pt
 		} else {
-			logger.Infof("alert_eval_%d datasource_%d fill event target error, ident: %s doesn't exist in cache.", p.rule.Id, p.datasourceId, event.TargetIdent)
+			logger.Infof("fill event target error, ident: %s doesn't exist in cache.", event.TargetIdent)
 		}
 	}
 
@@ -371,19 +365,19 @@ func (p *Processor) RecoverSingle(byRecover bool, hash string, now int64, value
 		lastPendingEvent, has := p.pendingsUseByRecover.Get(hash)
 		if !has {
 			// 说明没有产生过异常点，就不需要恢复了
-			logger.Debugf("alert_eval_%d datasource_%d event:%s do not has pending event, not recover", p.rule.Id, p.datasourceId, event.Hash)
+			logger.Debugf("rule_eval:%s event:%v do not has pending event, not recover", p.Key(), event)
 			return
 		}
 
 		if now-lastPendingEvent.LastEvalTime < cachedRule.RecoverDuration {
-			logger.Debugf("alert_eval_%d datasource_%d event:%s not recover", p.rule.Id, p.datasourceId, event.Hash)
+			logger.Debugf("rule_eval:%s event:%v not recover", p.Key(), event)
 			return
 		}
 	}
 
 	// 如果设置了恢复条件，则不能在此处恢复，必须依靠 recoverPoint 来恢复
 	if event.RecoverConfig.JudgeType != models.Origin && !byRecover {
-		logger.Debugf("alert_eval_%d datasource_%d event:%s not recover", p.rule.Id, p.datasourceId, event.Hash)
+		logger.Debugf("rule_eval:%s event:%v not recover", p.Key(), event)
 		return
 	}
 
@@ -460,7 +454,7 @@ func (p *Processor) handleEvent(events []*models.AlertCurEvent) {
 func (p *Processor) inhibitEvent(events []*models.AlertCurEvent, highSeverity int) {
 	for _, event := range events {
 		if p.inhibit && event.Severity > highSeverity {
-			logger.Debugf("alert_eval_%d datasource_%d event:%s inhibit highSeverity:%d", p.rule.Id, p.datasourceId, event.Hash, highSeverity)
+			logger.Debugf("rule_eval:%s event:%+v inhibit highSeverity:%d", p.Key(), event, highSeverity)
 			continue
 		}
 		p.fireEvent(event)
@@ -476,7 +470,7 @@ func (p *Processor) fireEvent(event *models.AlertCurEvent) {
 
 	message := "unknown"
 	defer func() {
-		logger.Infof("alert_eval_%d datasource_%d event-hash-%s %s", p.rule.Id, p.datasourceId, event.Hash, message)
+		logger.Infof("rule_eval:%s event-hash-%s %s", p.Key(), event.Hash, message)
 	}()
 
 	if fired, has := p.fires.Get(event.Hash); has {
@@ -527,7 +521,7 @@ func (p *Processor) pushEventToQueue(e *models.AlertCurEvent) {
 
 	dispatch.LogEvent(e, "push_queue")
 	if !queue.EventQueue.PushFront(e) {
-		logger.Warningf("alert_eval_%d datasource_%d event_push_queue: queue is full, event:%s", p.rule.Id, p.datasourceId, e.Hash)
+		logger.Warningf("event_push_queue: queue is full, event:%+v", e)
 		p.Stats.CounterRuleEvalErrorTotal.WithLabelValues(fmt.Sprintf("%v", p.DatasourceId()), "push_event_queue", p.BusiGroupCache.GetNameByBusiGroupId(p.rule.GroupId), fmt.Sprintf("%v", p.rule.Id)).Inc()
 	}
 }
@@ -538,7 +532,7 @@ func (p *Processor) RecoverAlertCurEventFromDb() {
 
 	curEvents, err := models.AlertCurEventGetByRuleIdAndDsId(p.ctx, p.rule.Id, p.datasourceId)
 	if err != nil {
-		logger.Errorf("alert_eval_%d datasource_%d recover event from db failed, err:%s", p.rule.Id, p.datasourceId, err)
+		logger.Errorf("recover event from db for rule:%s failed, err:%s", p.Key(), err)
 		p.Stats.CounterRuleEvalErrorTotal.WithLabelValues(fmt.Sprintf("%v", p.DatasourceId()), "get_recover_event", p.BusiGroupCache.GetNameByBusiGroupId(p.rule.GroupId), fmt.Sprintf("%v", p.rule.Id)).Inc()
 		p.fires = NewAlertCurEventMap(nil)
 		return

alert/router/router.go

@@ -22,11 +22,10 @@ type Router struct {
 	AlertStats         *astats.Stats
 	Ctx                *ctx.Context
 	ExternalProcessors *process.ExternalProcessorsType
-	LogDir             string
 }
 
 func New(httpConfig httpx.Config, alert aconf.Alert, amc *memsto.AlertMuteCacheType, tc *memsto.TargetCacheType, bgc *memsto.BusiGroupCacheType,
-	astats *astats.Stats, ctx *ctx.Context, externalProcessors *process.ExternalProcessorsType, logDir string) *Router {
+	astats *astats.Stats, ctx *ctx.Context, externalProcessors *process.ExternalProcessorsType) *Router {
 	return &Router{
 		HTTP:               httpConfig,
 		Alert:              alert,
@@ -36,7 +35,6 @@ func New(httpConfig httpx.Config, alert aconf.Alert, amc *memsto.AlertMuteCacheT
 		AlertStats:         astats,
 		Ctx:                ctx,
 		ExternalProcessors: externalProcessors,
-		LogDir:             logDir,
 	}
 }
 
@@ -52,9 +50,6 @@ func (rt *Router) Config(r *gin.Engine) {
 	service.POST("/event", rt.pushEventToQueue)
 	service.POST("/event-persist", rt.eventPersist)
 	service.POST("/make-event", rt.makeEvent)
-	service.GET("/event-detail/:hash", rt.eventDetail)
-	service.GET("/alert-eval-detail/:id", rt.alertEvalDetail)
-	service.GET("/trace-logs/:traceid", rt.traceLogs)
 }
 
 func Render(c *gin.Context, data, msg interface{}) {

alert/router/router_alert_eval_detail.go

@@ -1,28 +0,0 @@
-package router
-
-import (
-	"fmt"
-
-	"github.com/ccfos/nightingale/v6/pkg/loggrep"
-	"github.com/ccfos/nightingale/v6/pkg/ginx"
-
-	"github.com/gin-gonic/gin"
-)
-
-func (rt *Router) alertEvalDetail(c *gin.Context) {
-	id := ginx.UrlParamStr(c, "id")
-	if !loggrep.IsValidRuleID(id) {
-		ginx.Bomb(200, "invalid rule id format")
-	}
-
-	instance := fmt.Sprintf("%s:%d", rt.Alert.Heartbeat.IP, rt.HTTP.Port)
-
-	keyword := fmt.Sprintf("alert_eval_%s", id)
-	logs, err := loggrep.GrepLogDir(rt.LogDir, keyword)
-	ginx.Dangerous(err)
-
-	ginx.NewRender(c).Data(loggrep.EventDetailResp{
-		Logs:     logs,
-		Instance: instance,
-	}, nil)
-}

alert/router/router_event.go

@@ -13,9 +13,9 @@ import (
 	"github.com/ccfos/nightingale/v6/alert/queue"
 	"github.com/ccfos/nightingale/v6/models"
 	"github.com/ccfos/nightingale/v6/pkg/poster"
-	"github.com/ccfos/nightingale/v6/pkg/ginx"
 
 	"github.com/gin-gonic/gin"
+	"github.com/toolkits/pkg/ginx"
 	"github.com/toolkits/pkg/logger"
 )
 
@@ -25,7 +25,6 @@ func (rt *Router) pushEventToQueue(c *gin.Context) {
 	if event.RuleId == 0 {
 		ginx.Bomb(200, "event is illegal")
 	}
-	event.FE2DB()
 
 	event.TagsMap = make(map[string]string)
 	for i := 0; i < len(event.TagsJSON); i++ {
@@ -41,7 +40,7 @@ func (rt *Router) pushEventToQueue(c *gin.Context) {
 
 		event.TagsMap[arr[0]] = arr[1]
 	}
-	hit, _ := mute.EventMuteStrategy(event, rt.AlertMuteCache)
+	hit, _ :=  mute.EventMuteStrategy(event, rt.AlertMuteCache)
 	if hit {
 		logger.Infof("event_muted: rule_id=%d %s", event.RuleId, event.Hash)
 		ginx.NewRender(c).Message(nil)
@@ -75,7 +74,7 @@ func (rt *Router) pushEventToQueue(c *gin.Context) {
 
 	dispatch.LogEvent(event, "http_push_queue")
 	if !queue.EventQueue.PushFront(event) {
-		msg := fmt.Sprintf("event:%s push_queue err: queue is full", event.Hash)
+		msg := fmt.Sprintf("event:%+v push_queue err: queue is full", event)
 		ginx.Bomb(200, msg)
 		logger.Warningf(msg)
 	}
@@ -105,21 +104,21 @@ func (rt *Router) makeEvent(c *gin.Context) {
 	for i := 0; i < len(events); i++ {
 		node, err := naming.DatasourceHashRing.GetNode(strconv.FormatInt(events[i].DatasourceId, 10), fmt.Sprintf("%d", events[i].RuleId))
 		if err != nil {
-			logger.Warningf("event(rule_id=%d ds_id=%d) get node err:%v", events[i].RuleId, events[i].DatasourceId, err)
+			logger.Warningf("event:%+v get node err:%v", events[i], err)
 			ginx.Bomb(200, "event node not exists")
 		}
 
 		if node != rt.Alert.Heartbeat.Endpoint {
 			err := forwardEvent(events[i], node)
 			if err != nil {
-				logger.Warningf("event(rule_id=%d ds_id=%d) forward err:%v", events[i].RuleId, events[i].DatasourceId, err)
+				logger.Warningf("event:%+v forward err:%v", events[i], err)
 				ginx.Bomb(200, "event forward error")
 			}
 			continue
 		}
 
 		ruleWorker, exists := rt.ExternalProcessors.GetExternalAlertRule(events[i].DatasourceId, events[i].RuleId)
-		logger.Debugf("handle event(rule_id=%d ds_id=%d) exists:%v", events[i].RuleId, events[i].DatasourceId, exists)
+		logger.Debugf("handle event:%+v exists:%v", events[i], exists)
 		if !exists {
 			ginx.Bomb(200, "rule not exists")
 		}
@@ -143,6 +142,6 @@ func forwardEvent(event *eventForm, instance string) error {
 	if err != nil {
 		return err
 	}
-	logger.Infof("forward event: result=succ url=%s code=%d rule_id=%d response=%s", ur, code, event.RuleId, string(res))
+	logger.Infof("forward event: result=succ url=%s code=%d event:%v response=%s", ur, code, event, string(res))
 	return nil
 }

alert/router/router_event_detail.go

@@ -1,27 +0,0 @@
-package router
-
-import (
-	"fmt"
-
-	"github.com/ccfos/nightingale/v6/pkg/loggrep"
-	"github.com/ccfos/nightingale/v6/pkg/ginx"
-
-	"github.com/gin-gonic/gin"
-)
-
-func (rt *Router) eventDetail(c *gin.Context) {
-	hash := ginx.UrlParamStr(c, "hash")
-	if !loggrep.IsValidHash(hash) {
-		ginx.Bomb(200, "invalid hash format")
-	}
-
-	instance := fmt.Sprintf("%s:%d", rt.Alert.Heartbeat.IP, rt.HTTP.Port)
-
-	logs, err := loggrep.GrepLogDir(rt.LogDir, hash)
-	ginx.Dangerous(err)
-
-	ginx.NewRender(c).Data(loggrep.EventDetailResp{
-		Logs:     logs,
-		Instance: instance,
-	}, nil)
-}

alert/router/router_trace_logs.go

@@ -1,28 +0,0 @@
-package router
-
-import (
-	"fmt"
-
-	"github.com/ccfos/nightingale/v6/pkg/ginx"
-	"github.com/ccfos/nightingale/v6/pkg/loggrep"
-
-	"github.com/gin-gonic/gin"
-)
-
-func (rt *Router) traceLogs(c *gin.Context) {
-	traceId := ginx.UrlParamStr(c, "traceid")
-	if !loggrep.IsValidTraceID(traceId) {
-		ginx.Bomb(200, "invalid trace id format")
-	}
-
-	instance := fmt.Sprintf("%s:%d", rt.Alert.Heartbeat.IP, rt.HTTP.Port)
-
-	keyword := "trace_id=" + traceId
-	logs, err := loggrep.GrepLatestLogFiles(rt.LogDir, keyword)
-	ginx.Dangerous(err)
-
-	ginx.NewRender(c).Data(loggrep.EventDetailResp{
-		Logs:     logs,
-		Instance: instance,
-	}, nil)
-}

alert/sender/callback.go

@@ -135,13 +135,15 @@ func (c *DefaultCallBacker) CallBack(ctx CallBackContext) {
 
 func doSendAndRecord(ctx *ctx.Context, url, token string, body interface{}, channel string,
 	stats *astats.Stats, events []*models.AlertCurEvent) {
+	start := time.Now()
 	res, err := doSend(url, body, channel, stats)
+	res = fmt.Sprintf("duration: %d ms %s", time.Since(start).Milliseconds(), res)
 	NotifyRecord(ctx, events, 0, channel, token, res, err)
 }
 
 func NotifyRecord(ctx *ctx.Context, evts []*models.AlertCurEvent, notifyRuleID int64, channel, target, res string, err error) {
 	// 一个通知可能对应多个 event，都需要记录
-	notis := make([]*models.NotificationRecord, 0, len(evts))
+	notis := make([]*models.NotificaitonRecord, 0, len(evts))
 	for _, evt := range evts {
 		noti := models.NewNotificationRecord(evt, notifyRuleID, channel, target)
 		if err != nil {
@@ -169,11 +171,11 @@ func doSend(url string, body interface{}, channel string, stats *astats.Stats) (
 
 	start := time.Now()
 	res, code, err := poster.PostJSON(url, time.Second*5, body, 3)
-	res = []byte(fmt.Sprintf("duration: %d ms status_code:%d, response:%s", time.Since(start).Milliseconds(), code, string(res)))
+	res = []byte(fmt.Sprintf("duration: %d ms %s", time.Since(start).Milliseconds(), res))
 	if err != nil {
 		logger.Errorf("%s_sender: result=fail url=%s code=%d error=%v req:%v response=%s", channel, url, code, err, body, string(res))
 		stats.AlertNotifyErrorTotal.WithLabelValues(channel).Inc()
-		return string(res), err
+		return "", err
 	}
 
 	logger.Infof("%s_sender: result=succ url=%s code=%d req:%v response=%s", channel, url, code, body, string(res))
@@ -205,6 +207,6 @@ func PushCallbackEvent(ctx *ctx.Context, webhook *models.Webhook, event *models.
 
 	succ := queue.eventQueue.Push(event)
 	if !succ {
-		logger.Warningf("Write channel(%s) full, current channel size: %d event:%s", webhook.Url, queue.eventQueue.Len(), event.Hash)
+		logger.Warningf("Write channel(%s) full, current channel size: %d event:%v", webhook.Url, queue.eventQueue.Len(), event)
 	}
 }

alert/sender/email.go

@@ -141,7 +141,7 @@ func updateSmtp(ctx *ctx.Context, ncc *memsto.NotifyConfigCacheType) {
 func startEmailSender(ctx *ctx.Context, smtp aconf.SMTPConfig) {
 	conf := smtp
 	if conf.Host == "" || conf.Port == 0 {
-		logger.Debug("SMTP configurations invalid")
+		logger.Warning("SMTP configurations invalid")
 		<-mailQuit
 		return
 	}

alert/sender/ibex.go

@@ -30,14 +30,14 @@ type IbexCallBacker struct {
 
 func (c *IbexCallBacker) CallBack(ctx CallBackContext) {
 	if len(ctx.CallBackURL) == 0 || len(ctx.Events) == 0 {
-		logger.Warningf("event_callback_ibex: url or events is empty, url: %s", ctx.CallBackURL)
+		logger.Warningf("event_callback_ibex: url or events is empty, url: %s, events: %+v", ctx.CallBackURL, ctx.Events)
 		return
 	}
 
 	event := ctx.Events[0]
 
 	if event.IsRecovered {
-		logger.Infof("event_callback_ibex: event is recovered, event: %s", event.Hash)
+		logger.Infof("event_callback_ibex: event is recovered, event: %+v", event)
 		return
 	}
 
@@ -45,9 +45,9 @@ func (c *IbexCallBacker) CallBack(ctx CallBackContext) {
 }
 
 func (c *IbexCallBacker) handleIbex(ctx *ctx.Context, url string, event *models.AlertCurEvent) {
-	logger.Infof("event_callback_ibex: url: %s, event: %s", url, event.Hash)
+	logger.Infof("event_callback_ibex: url: %s, event: %+v", url, event)
 	if imodels.DB() == nil && ctx.IsCenter {
-		logger.Warningf("event_callback_ibex: db is nil, event: %s", event.Hash)
+		logger.Warningf("event_callback_ibex: db is nil, event: %+v", event)
 		return
 	}
 
@@ -66,7 +66,7 @@ func (c *IbexCallBacker) handleIbex(ctx *ctx.Context, url string, event *models.
 
 	id, err := strconv.ParseInt(idstr, 10, 64)
 	if err != nil {
-		logger.Errorf("event_callback_ibex: failed to parse url: %s event: %s", url, event.Hash)
+		logger.Errorf("event_callback_ibex: failed to parse url: %s event: %+v", url, event)
 		return
 	}
 
@@ -82,37 +82,34 @@ func (c *IbexCallBacker) handleIbex(ctx *ctx.Context, url string, event *models.
 	}
 
 	if host == "" {
-		logger.Errorf("event_callback_ibex: failed to get host, id: %d, event: %s", id, event.Hash)
+		logger.Errorf("event_callback_ibex: failed to get host, id: %d, event: %+v", id, event)
 		return
 	}
 
-	CallIbex(ctx, id, host, c.taskTplCache, c.targetCache, c.userCache, event, "")
+	CallIbex(ctx, id, host, c.taskTplCache, c.targetCache, c.userCache, event)
 }
 
 func CallIbex(ctx *ctx.Context, id int64, host string,
 	taskTplCache *memsto.TaskTplCache, targetCache *memsto.TargetCacheType,
-	userCache *memsto.UserCacheType, event *models.AlertCurEvent, args string) (int64, error) {
-	logger.Infof("event_callback_ibex: id: %d, host: %s, args: %s, event: %s", id, host, args, event.Hash)
+	userCache *memsto.UserCacheType, event *models.AlertCurEvent) {
+	logger.Infof("event_callback_ibex: id: %d, host: %s, event: %+v", id, host, event)
 
 	tpl := taskTplCache.Get(id)
 	if tpl == nil {
-		err := fmt.Errorf("event_callback_ibex: no such tpl(%d), event: %s", id, event.Hash)
-		logger.Errorf("%s", err)
-		return 0, err
+		logger.Errorf("event_callback_ibex: no such tpl(%d), event: %+v", id, event)
+		return
 	}
 	// check perm
 	// tpl.GroupId - host - account 三元组校验权限
-	can, err := CanDoIbex(tpl.UpdateBy, tpl, host, targetCache, userCache)
+	can, err := canDoIbex(tpl.UpdateBy, tpl, host, targetCache, userCache)
 	if err != nil {
-		err = fmt.Errorf("event_callback_ibex: check perm fail: %v, event: %s", err, event.Hash)
-		logger.Errorf("%s", err)
-		return 0, err
+		logger.Errorf("event_callback_ibex: check perm fail: %v, event: %+v", err, event)
+		return
 	}
 
 	if !can {
-		err = fmt.Errorf("event_callback_ibex: user(%s) no permission, event: %s", tpl.UpdateBy, event.Hash)
-		logger.Errorf("%s", err)
-		return 0, err
+		logger.Errorf("event_callback_ibex: user(%s) no permission, event: %+v", tpl.UpdateBy, event)
+		return
 	}
 
 	tagsMap := make(map[string]string)
@@ -136,16 +133,11 @@ func CallIbex(ctx *ctx.Context, id int64, host string,
 
 	tags, err := json.Marshal(tagsMap)
 	if err != nil {
-		err = fmt.Errorf("event_callback_ibex: failed to marshal tags to json: %v, event: %s", tagsMap, event.Hash)
-		logger.Errorf("%s", err)
-		return 0, err
+		logger.Errorf("event_callback_ibex: failed to marshal tags to json: %v, event: %+v", tagsMap, event)
+		return
 	}
 
 	// call ibex
-	taskArgs := tpl.Args
-	if args != "" {
-		taskArgs = args
-	}
 	in := models.TaskForm{
 		Title:          tpl.Title + " FH: " + host,
 		Account:        tpl.Account,
@@ -154,7 +146,7 @@ func CallIbex(ctx *ctx.Context, id int64, host string,
 		Timeout:        tpl.Timeout,
 		Pause:          tpl.Pause,
 		Script:         tpl.Script,
-		Args:           taskArgs,
+		Args:           tpl.Args,
 		Stdin:          string(tags),
 		Action:         "start",
 		Creator:        tpl.UpdateBy,
@@ -164,9 +156,8 @@ func CallIbex(ctx *ctx.Context, id int64, host string,
 
 	id, err = TaskAdd(in, tpl.UpdateBy, ctx.IsCenter)
 	if err != nil {
-		err = fmt.Errorf("event_callback_ibex: call ibex fail: %v, event: %s", err, event.Hash)
-		logger.Errorf("%s", err)
-		return 0, err
+		logger.Errorf("event_callback_ibex: call ibex fail: %v, event: %+v", err, event)
+		return
 	}
 
 	// write db
@@ -187,14 +178,11 @@ func CallIbex(ctx *ctx.Context, id int64, host string,
 	}
 
 	if err = record.Add(ctx); err != nil {
-		err = fmt.Errorf("event_callback_ibex: persist task_record fail: %v, event: %s", err, event.Hash)
-		logger.Errorf("%s", err)
-		return id, err
+		logger.Errorf("event_callback_ibex: persist task_record fail: %v, event: %+v", err, event)
 	}
-	return id, nil
 }
 
-func CanDoIbex(username string, tpl *models.TaskTpl, host string, targetCache *memsto.TargetCacheType, userCache *memsto.UserCacheType) (bool, error) {
+func canDoIbex(username string, tpl *models.TaskTpl, host string, targetCache *memsto.TargetCacheType, userCache *memsto.UserCacheType) (bool, error) {
 	user := userCache.GetByUsername(username)
 	if user != nil && user.IsAdmin() {
 		return true, nil

alert/sender/notify_record_queue.go

@@ -24,7 +24,7 @@ func ReportNotifyRecordQueueSize(stats *astats.Stats) {
 
 // 推送通知记录到队列
 // 若队列满 则返回 error
-func PushNotifyRecords(records []*models.NotificationRecord) error {
+func PushNotifyRecords(records []*models.NotificaitonRecord) error {
 	for _, record := range records {
 		if ok := NotifyRecordQueue.PushFront(record); !ok {
 			logger.Warningf("notify record queue is full, record: %+v", record)
@@ -59,16 +59,16 @@ func (c *NotifyRecordConsumer) LoopConsume() {
 		}
 
 		// 类型转换，不然 CreateInBatches 会报错
-		notis := make([]*models.NotificationRecord, 0, len(inotis))
+		notis := make([]*models.NotificaitonRecord, 0, len(inotis))
 		for _, inoti := range inotis {
-			notis = append(notis, inoti.(*models.NotificationRecord))
+			notis = append(notis, inoti.(*models.NotificaitonRecord))
 		}
 
 		c.consume(notis)
 	}
 }
 
-func (c *NotifyRecordConsumer) consume(notis []*models.NotificationRecord) {
+func (c *NotifyRecordConsumer) consume(notis []*models.NotificaitonRecord) {
 	if err := models.DB(c.ctx).CreateInBatches(notis, 100).Error; err != nil {
 		logger.Errorf("add notis:%v failed, err: %v", notis, err)
 	}

alert/sender/plugin.go

@@ -35,7 +35,7 @@ func alertingCallScript(ctx *ctx.Context, stdinBytes []byte, notifyScript models
 
 	channel := "script"
 	stats.AlertNotifyTotal.WithLabelValues(channel).Inc()
-	fpath := ".notify_script"
+	fpath := ".notify_scriptt"
 	if config.Type == 1 {
 		fpath = config.Content
 	} else {
@@ -89,7 +89,7 @@ func alertingCallScript(ctx *ctx.Context, stdinBytes []byte, notifyScript models
 	err, isTimeout := sys.WrapTimeout(cmd, time.Duration(config.Timeout)*time.Second)
 
 	res := buf.String()
-	res = fmt.Sprintf("send_time: %s duration: %d ms %s", time.Now().Format("2006-01-02 15:04:05"), time.Since(start).Milliseconds(), res)
+	res = fmt.Sprintf("duration: %d ms %s", time.Since(start).Milliseconds(), res)
 
 	// 截断超出长度的输出
 	if len(res) > 512 {

alert/sender/webhook.go

@@ -13,53 +13,10 @@ import (
 	"github.com/ccfos/nightingale/v6/alert/astats"
 	"github.com/ccfos/nightingale/v6/models"
 	"github.com/ccfos/nightingale/v6/pkg/ctx"
-	"github.com/ccfos/nightingale/v6/pkg/poster"
 
 	"github.com/toolkits/pkg/logger"
 )
 
-// webhookClientCache 缓存 http.Client，避免每次请求都创建新的 Client 导致连接泄露
-var webhookClientCache sync.Map // key: clientKey (string), value: *http.Client
-
-// 相同配置的 webhook 会复用同一个 Client
-func getWebhookClient(webhook *models.Webhook) *http.Client {
-	clientKey := webhook.Hash()
-
-	if client, ok := webhookClientCache.Load(clientKey); ok {
-		return client.(*http.Client)
-	}
-
-	// 创建新的 Client
-	transport := &http.Transport{
-		TLSClientConfig:     &tls.Config{InsecureSkipVerify: webhook.SkipVerify},
-		MaxIdleConns:        100,
-		MaxIdleConnsPerHost: 10,
-		IdleConnTimeout:     90 * time.Second,
-	}
-
-	if poster.UseProxy(webhook.Url) {
-		transport.Proxy = http.ProxyFromEnvironment
-	}
-
-	timeout := webhook.Timeout
-	if timeout <= 0 {
-		timeout = 10
-	}
-
-	newClient := &http.Client{
-		Timeout:   time.Duration(timeout) * time.Second,
-		Transport: transport,
-	}
-
-	// 使用 LoadOrStore 确保并发安全，避免重复创建
-	actual, loaded := webhookClientCache.LoadOrStore(clientKey, newClient)
-	if loaded {
-		return actual.(*http.Client)
-	}
-
-	return newClient
-}
-
 func sendWebhook(webhook *models.Webhook, event interface{}, stats *astats.Stats) (bool, string, error) {
 	channel := "webhook"
 	if webhook.Type == models.RuleCallback {
@@ -72,7 +29,7 @@ func sendWebhook(webhook *models.Webhook, event interface{}, stats *astats.Stats
 	}
 	bs, err := json.Marshal(event)
 	if err != nil {
-		logger.Errorf("%s alertingWebhook failed to marshal event err:%v", channel, err)
+		logger.Errorf("%s alertingWebhook failed to marshal event:%+v err:%v", channel, event, err)
 		return false, "", err
 	}
 
@@ -80,7 +37,7 @@ func sendWebhook(webhook *models.Webhook, event interface{}, stats *astats.Stats
 
 	req, err := http.NewRequest("POST", conf.Url, bf)
 	if err != nil {
-		logger.Warningf("%s alertingWebhook failed to new request event:%s err:%v", channel, string(bs), err)
+		logger.Warningf("%s alertingWebhook failed to new reques event:%s err:%v", channel, string(bs), err)
 		return true, "", err
 	}
 
@@ -98,13 +55,25 @@ func sendWebhook(webhook *models.Webhook, event interface{}, stats *astats.Stats
 			req.Header.Set(conf.Headers[i], conf.Headers[i+1])
 		}
 	}
-	// 使用全局 Client 缓存，避免每次请求都创建新的 Client 导致连接泄露
-	client := getWebhookClient(conf)
+	insecureSkipVerify := false
+	if webhook != nil {
+		insecureSkipVerify = webhook.SkipVerify
+	}
+
+	if conf.Client == nil {
+		logger.Warningf("event_%s, event:%s, url: [%s], error: [%s]", channel, string(bs), conf.Url, "client is nil")
+		conf.Client = &http.Client{
+			Timeout: time.Duration(conf.Timeout) * time.Second,
+			Transport: &http.Transport{
+				TLSClientConfig: &tls.Config{InsecureSkipVerify: insecureSkipVerify},
+			},
+		}
+	}
 
 	stats.AlertNotifyTotal.WithLabelValues(channel).Inc()
 	var resp *http.Response
 	var body []byte
-	resp, err = client.Do(req)
+	resp, err = conf.Client.Do(req)
 
 	if err != nil {
 		stats.AlertNotifyErrorTotal.WithLabelValues(channel).Inc()
@@ -119,11 +88,11 @@ func sendWebhook(webhook *models.Webhook, event interface{}, stats *astats.Stats
 
 	if resp.StatusCode == 429 {
 		logger.Errorf("event_%s_fail, url: %s, response code: %d, body: %s event:%s", channel, conf.Url, resp.StatusCode, string(body), string(bs))
-		return true, fmt.Sprintf("status_code:%d, response:%s", resp.StatusCode, string(body)), fmt.Errorf("status code is 429")
+		return true, string(body), fmt.Errorf("status code is 429")
 	}
 
 	logger.Debugf("event_%s_succ, url: %s, response code: %d, body: %s event:%s", channel, conf.Url, resp.StatusCode, string(body), string(bs))
-	return false, fmt.Sprintf("status_code:%d, response:%s", resp.StatusCode, string(body)), nil
+	return false, string(body), nil
 }
 
 func SingleSendWebhooks(ctx *ctx.Context, webhooks map[string]*models.Webhook, event *models.AlertCurEvent, stats *astats.Stats) {
@@ -132,7 +101,7 @@ func SingleSendWebhooks(ctx *ctx.Context, webhooks map[string]*models.Webhook, e
 		for retryCount < 3 {
 			start := time.Now()
 			needRetry, res, err := sendWebhook(conf, event, stats)
-			res = fmt.Sprintf("send_time: %s duration: %d ms %s", time.Now().Format("2006-01-02 15:04:05"), time.Since(start).Milliseconds(), res)
+			res = fmt.Sprintf("duration: %d ms %s", time.Since(start).Milliseconds(), res)
 			NotifyRecord(ctx, []*models.AlertCurEvent{event}, 0, "webhook", conf.Url, res, err)
 			if !needRetry {
 				break
@@ -145,7 +114,7 @@ func SingleSendWebhooks(ctx *ctx.Context, webhooks map[string]*models.Webhook, e
 
 func BatchSendWebhooks(ctx *ctx.Context, webhooks map[string]*models.Webhook, event *models.AlertCurEvent, stats *astats.Stats) {
 	for _, conf := range webhooks {
-		logger.Infof("push event:%s to queue:%v", event.Hash, conf)
+		logger.Infof("push event:%+v to queue:%v", event, conf)
 		PushEvent(ctx, conf, event, stats)
 	}
 }
@@ -183,7 +152,7 @@ func PushEvent(ctx *ctx.Context, webhook *models.Webhook, event *models.AlertCur
 	succ := queue.eventQueue.Push(event)
 	if !succ {
 		stats.AlertNotifyErrorTotal.WithLabelValues("push_event_queue").Inc()
-		logger.Warningf("Write channel(%s) full, current channel size: %d event:%s", webhook.Url, queue.eventQueue.Len(), event.Hash)
+		logger.Warningf("Write channel(%s) full, current channel size: %d event:%v", webhook.Url, queue.eventQueue.Len(), event)
 	}
 }
 
@@ -204,7 +173,7 @@ func StartConsumer(ctx *ctx.Context, queue *WebhookQueue, popSize int, webhook *
 			for retryCount < webhook.RetryCount {
 				start := time.Now()
 				needRetry, res, err := sendWebhook(webhook, events, stats)
-				res = fmt.Sprintf("send_time: %s duration: %d ms %s", time.Now().Format("2006-01-02 15:04:05"), time.Since(start).Milliseconds(), res)
+				res = fmt.Sprintf("duration: %d ms %s", time.Since(start).Milliseconds(), res)
 				go NotifyRecord(ctx, events, 0, "webhook", webhook.Url, res, err)
 				if !needRetry {
 					break

center/cconf/conf.go

@@ -1,26 +1,20 @@
 package cconf
 
-import (
-	"time"
-
-	"github.com/ccfos/nightingale/v6/pkg/httpx"
-)
+import "time"
 
 type Center struct {
-	Plugins                   []Plugin
-	MetricsYamlFile           string
-	OpsYamlFile               string
-	BuiltinIntegrationsDir    string
-	I18NHeaderKey             string
-	MetricDesc                MetricDescType
-	AnonymousAccess           AnonymousAccess
-	UseFileAssets             bool
-	FlashDuty                 FlashDuty
-	EventHistoryGroupView     bool
-	CleanNotifyRecordDay      int
-	CleanPipelineExecutionDay int
-	MigrateBusiGroupLabel     bool
-	RSA                       httpx.RSAConfig
+	Plugins                []Plugin
+	MetricsYamlFile        string
+	OpsYamlFile            string
+	BuiltinIntegrationsDir string
+	I18NHeaderKey          string
+	MetricDesc             MetricDescType
+	AnonymousAccess        AnonymousAccess
+	UseFileAssets          bool
+	FlashDuty              FlashDuty
+	EventHistoryGroupView  bool
+	CleanNotifyRecordDay   int
+	MigrateBusiGroupLabel  bool
 }
 
 type Plugin struct {

center/cconf/plugin.go

@@ -55,10 +55,4 @@ var Plugins = []Plugin{
 		Type:     "opensearch",
 		TypeName: "OpenSearch",
 	},
-	{
-		Id:       10,
-		Category: "logging",
-		Type:     "victorialogs",
-		TypeName: "VictoriaLogs",
-	},
 }

center/center.go

@@ -2,13 +2,10 @@ package center
 
 import (
 	"context"
-	"encoding/json"
 	"fmt"
 
 	"github.com/ccfos/nightingale/v6/dscache"
 
-	"github.com/toolkits/pkg/logger"
-
 	"github.com/ccfos/nightingale/v6/alert"
 	"github.com/ccfos/nightingale/v6/alert/astats"
 	"github.com/ccfos/nightingale/v6/alert/dispatch"
@@ -99,9 +96,6 @@ func Initialize(configDir string, cryptoKey string) (func(), error) {
 		models.MigrateEP(ctx)
 	}
 
-	// 初始化 siteUrl，如果为空则设置默认值
-	InitSiteUrl(ctx, config.Alert.Heartbeat.IP, config.HTTP.Port)
-
 	configCache := memsto.NewConfigCache(ctx, syncStats, config.HTTP.RSA.RSAPrivateKey, config.HTTP.RSA.RSAPassWord)
 	busiGroupCache := memsto.NewBusiGroupCache(ctx, syncStats)
 	targetCache := memsto.NewTargetCache(ctx, syncStats, redis)
@@ -127,19 +121,18 @@ func Initialize(configDir string, cryptoKey string) (func(), error) {
 
 	macros.RegisterMacro(macros.MacroInVain)
 	dscache.Init(ctx, false)
-	alert.Start(config.Alert, config.Pushgw, syncStats, alertStats, externalProcessors, targetCache, busiGroupCache, alertMuteCache, alertRuleCache, notifyConfigCache, taskTplCache, dsCache, ctx, promClients, userCache, userGroupCache, notifyRuleCache, notifyChannelCache, messageTemplateCache, configCvalCache)
+	alert.Start(config.Alert, config.Pushgw, syncStats, alertStats, externalProcessors, targetCache, busiGroupCache, alertMuteCache, alertRuleCache, notifyConfigCache, taskTplCache, dsCache, ctx, promClients, userCache, userGroupCache, notifyRuleCache, notifyChannelCache, messageTemplateCache)
 
 	writers := writer.NewWriters(config.Pushgw)
 
 	go version.GetGithubVersion()
 
 	go cron.CleanNotifyRecord(ctx, config.Center.CleanNotifyRecordDay)
-	go cron.CleanPipelineExecution(ctx, config.Center.CleanPipelineExecutionDay)
 
-	alertrtRouter := alertrt.New(config.HTTP, config.Alert, alertMuteCache, targetCache, busiGroupCache, alertStats, ctx, externalProcessors, config.Log.Dir)
+	alertrtRouter := alertrt.New(config.HTTP, config.Alert, alertMuteCache, targetCache, busiGroupCache, alertStats, ctx, externalProcessors)
 	centerRouter := centerrt.New(config.HTTP, config.Center, config.Alert, config.Ibex,
 		cconf.Operations, dsCache, notifyConfigCache, promClients,
-		redis, sso, ctx, metas, idents, targetCache, userCache, userGroupCache, userTokenCache, config.Log.Dir)
+		redis, sso, ctx, metas, idents, targetCache, userCache, userGroupCache, userTokenCache)
 	pushgwRouter := pushgwrt.New(config.HTTP, config.Pushgw, config.Alert, targetCache, busiGroupCache, idents, metas, writers, ctx)
 
 	r := httpx.GinEngine(config.Global.RunMode, config.HTTP, configCvalCache.PrintBodyPaths, configCvalCache.PrintAccessLog)
@@ -166,67 +159,3 @@ func Initialize(configDir string, cryptoKey string) (func(), error) {
 		httpClean()
 	}, nil
 }
-
-// initSiteUrl 初始化 site_info 中的 site_url，如果为空则使用服务器IP和端口设置默认值
-func InitSiteUrl(ctx *ctx.Context, serverIP string, serverPort int) {
-	// 构造默认的 SiteUrl
-	defaultSiteUrl := fmt.Sprintf("http://%s:%d", serverIP, serverPort)
-
-	// 获取现有的 site_info 配置
-	siteInfoStr, err := models.ConfigsGet(ctx, "site_info")
-	if err != nil {
-		logger.Errorf("failed to get site_info config: %v", err)
-		return
-	}
-
-	// 如果 site_info 不存在，创建新的
-	if siteInfoStr == "" {
-		newSiteInfo := memsto.SiteInfo{
-			SiteUrl: defaultSiteUrl,
-		}
-		siteInfoBytes, err := json.Marshal(newSiteInfo)
-		if err != nil {
-			logger.Errorf("failed to marshal site_info: %v", err)
-			return
-		}
-
-		err = models.ConfigsSet(ctx, "site_info", string(siteInfoBytes))
-		if err != nil {
-			logger.Errorf("failed to set site_info: %v", err)
-			return
-		}
-
-		logger.Infof("initialized site_url with default value: %s", defaultSiteUrl)
-		return
-	}
-
-	// 检查现有的 site_info 中的 site_url 字段
-	var existingSiteInfo memsto.SiteInfo
-	err = json.Unmarshal([]byte(siteInfoStr), &existingSiteInfo)
-	if err != nil {
-		logger.Errorf("failed to unmarshal site_info: %v", err)
-		return
-	}
-
-	// 如果 site_url 已经有值，则不需要初始化
-	if existingSiteInfo.SiteUrl != "" {
-		return
-	}
-
-	// 设置 site_url
-	existingSiteInfo.SiteUrl = defaultSiteUrl
-
-	siteInfoBytes, err := json.Marshal(existingSiteInfo)
-	if err != nil {
-		logger.Errorf("failed to marshal updated site_info: %v", err)
-		return
-	}
-
-	err = models.ConfigsSet(ctx, "site_info", string(siteInfoBytes))
-	if err != nil {
-		logger.Errorf("failed to update site_info: %v", err)
-		return
-	}
-
-	logger.Infof("initialized site_url with default value: %s", defaultSiteUrl)
-}

center/integration/init.go

@@ -22,7 +22,7 @@ const SYSTEM = "system"
 var BuiltinPayloadInFile *BuiltinPayloadInFileType
 
 type BuiltinPayloadInFileType struct {
-	Data      map[uint64]map[string]map[string][]*models.BuiltinPayload // map[component_id]map[type]map[cate][]*models.BuiltinPayload
+	Data      map[uint64]map[string]map[string][]*models.BuiltinPayload // map[componet_id]map[type]map[cate][]*models.BuiltinPayload
 	IndexData map[int64]*models.BuiltinPayload                          // map[uuid]payload
 
 	BuiltinMetrics map[string]*models.BuiltinMetric
@@ -124,13 +124,13 @@ func Init(ctx *ctx.Context, builtinIntegrationsDir string) {
 			component.ID = old.ID
 		}
 
-		// delete uuid is empty
+		// delete uuid is emtpy
 		err = models.DB(ctx).Exec("delete from builtin_payloads where uuid = 0 and type != 'collect' and (updated_by = 'system' or updated_by = '')").Error
 		if err != nil {
 			logger.Warning("delete builtin payloads fail ", err)
 		}
 
-		// delete builtin metrics uuid is empty
+		// delete builtin metrics uuid is emtpy
 		err = models.DB(ctx).Exec("delete from builtin_metrics where uuid = 0 and (updated_by = 'system' or updated_by = '')").Error
 		if err != nil {
 			logger.Warning("delete builtin metrics fail ", err)
@@ -187,7 +187,7 @@ func Init(ctx *ctx.Context, builtinIntegrationsDir string) {
 						CreatedBy:   SYSTEM,
 						UpdatedBy:   SYSTEM,
 					}
-					BuiltinPayloadInFile.AddBuiltinPayload(&builtinAlert)
+					BuiltinPayloadInFile.addBuiltinPayload(&builtinAlert)
 
 				}
 			}
@@ -239,14 +239,13 @@ func Init(ctx *ctx.Context, builtinIntegrationsDir string) {
 					Cate:        "",
 					Name:        dashboard.Name,
 					Tags:        dashboard.Tags,
-					Note:        dashboard.Note,
 					Content:     string(content),
 					UUID:        dashboard.UUID,
 					ID:          dashboard.UUID,
 					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)
@@ -271,8 +270,10 @@ func Init(ctx *ctx.Context, builtinIntegrationsDir string) {
 				}
 
 				for _, metric := range metrics {
-					time.Sleep(time.Microsecond)
-					metric.UUID = time.Now().UnixMicro()
+					if metric.UUID == 0 {
+						time.Sleep(time.Microsecond)
+						metric.UUID = time.Now().UnixMicro()
+					}
 					metric.ID = metric.UUID
 					metric.CreatedBy = SYSTEM
 					metric.UpdatedBy = SYSTEM
@@ -292,7 +293,6 @@ type BuiltinBoard struct {
 	Name       string      `json:"name"`
 	Ident      string      `json:"ident"`
 	Tags       string      `json:"tags"`
-	Note       string      `json:"note"`
 	CreateAt   int64       `json:"create_at"`
 	CreateBy   string      `json:"create_by"`
 	UpdateAt   int64       `json:"update_at"`
@@ -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)
 	}
@@ -331,30 +331,6 @@ func (b *BuiltinPayloadInFileType) AddBuiltinPayload(bp *models.BuiltinPayload)
 	b.IndexData[bp.UUID] = bp
 }
 
-func (b *BuiltinPayloadInFileType) GetComponentIdentByCate(typ, cate string) string {
-
-	for _, source := range b.Data {
-		if source == nil {
-			continue
-		}
-
-		typeMap, exists := source[typ]
-		if !exists {
-			continue
-		}
-
-		payloads, exists := typeMap[cate]
-		if !exists {
-			continue
-		}
-
-		if len(payloads) > 0 {
-			return payloads[0].Component
-		}
-	}
-	return ""
-}
-
 func (b *BuiltinPayloadInFileType) GetBuiltinPayload(typ, cate, query string, componentId uint64) ([]*models.BuiltinPayload, error) {
 
 	var result []*models.BuiltinPayload
@@ -414,10 +390,9 @@ func filterByQuery(payloads []*models.BuiltinPayload, query string) []*models.Bu
 		return payloads
 	}
 
-	queryLower := strings.ToLower(query)
 	var filtered []*models.BuiltinPayload
 	for _, p := range payloads {
-		if strings.Contains(strings.ToLower(p.Name), queryLower) || strings.Contains(strings.ToLower(p.Tags), queryLower) {
+		if strings.Contains(p.Name, query) || strings.Contains(p.Tags, query) {
 			filtered = append(filtered, p)
 		}
 	}
@@ -617,7 +592,7 @@ func convertBuiltinMetricByDB(metricsInDB []*models.BuiltinMetric) map[string]*m
 		})
 
 		currentBuiltinMetric := builtinMetrics[0]
-		// User has no customized translation, so we can merge it
+		// User have no customed translation, so we can merge it
 		if len(currentBuiltinMetric.Translation) == 0 {
 			translationMap := make(map[string]models.Translation)
 			for _, bm := range builtinMetrics {

center/metas/metas.go

@@ -118,7 +118,7 @@ func (s *Set) updateTargets(m map[string]models.HostMeta) error {
 	}
 
 	start := time.Now()
-	err := storage.MSet(context.Background(), s.redis, newMap, 7*24*time.Hour)
+	err := storage.MSet(context.Background(), s.redis, newMap)
 	if err != nil {
 		cstats.RedisOperationLatency.WithLabelValues("mset_target_meta", "fail").Observe(time.Since(start).Seconds())
 		return err
@@ -127,7 +127,7 @@ func (s *Set) updateTargets(m map[string]models.HostMeta) error {
 	}
 
 	if len(extendMap) > 0 {
-		err = storage.MSet(context.Background(), s.redis, extendMap, 7*24*time.Hour)
+		err = storage.MSet(context.Background(), s.redis, extendMap)
 		if err != nil {
 			cstats.RedisOperationLatency.WithLabelValues("mset_target_extend", "fail").Observe(time.Since(start).Seconds())
 			return err

center/router/router.go

@@ -24,11 +24,11 @@ import (
 	"github.com/ccfos/nightingale/v6/prom"
 	"github.com/ccfos/nightingale/v6/pushgw/idents"
 	"github.com/ccfos/nightingale/v6/storage"
-	"github.com/ccfos/nightingale/v6/pkg/ginx"
 	"gorm.io/gorm"
 
 	"github.com/gin-gonic/gin"
 	"github.com/rakyll/statik/fs"
+	"github.com/toolkits/pkg/ginx"
 	"github.com/toolkits/pkg/logger"
 	"github.com/toolkits/pkg/runner"
 )
@@ -51,7 +51,6 @@ type Router struct {
 	UserGroupCache    *memsto.UserGroupCacheType
 	UserTokenCache    *memsto.UserTokenCacheType
 	Ctx               *ctx.Context
-	LogDir            string
 
 	HeartbeatHook       HeartbeatHookFunc
 	TargetDeleteHook    models.TargetDeleteHookFunc
@@ -62,7 +61,7 @@ func New(httpConfig httpx.Config, center cconf.Center, alert aconf.Alert, ibex c
 	operations cconf.Operation, ds *memsto.DatasourceCacheType, ncc *memsto.NotifyConfigCacheType,
 	pc *prom.PromClientMap, redis storage.Redis,
 	sso *sso.SsoClient, ctx *ctx.Context, metaSet *metas.Set, idents *idents.Set,
-	tc *memsto.TargetCacheType, uc *memsto.UserCacheType, ugc *memsto.UserGroupCacheType, utc *memsto.UserTokenCacheType, logDir string) *Router {
+	tc *memsto.TargetCacheType, uc *memsto.UserCacheType, ugc *memsto.UserGroupCacheType, utc *memsto.UserTokenCacheType) *Router {
 	return &Router{
 		HTTP:                httpConfig,
 		Center:              center,
@@ -81,7 +80,6 @@ func New(httpConfig httpx.Config, center cconf.Center, alert aconf.Alert, ibex c
 		UserGroupCache:      ugc,
 		UserTokenCache:      utc,
 		Ctx:                 ctx,
-		LogDir:              logDir,
 		HeartbeatHook:       func(ident string) map[string]interface{} { return nil },
 		TargetDeleteHook:    func(tx *gorm.DB, idents []string) error { return nil },
 		AlertRuleModifyHook: func(ar *models.AlertRule) {},
@@ -213,8 +211,8 @@ func (rt *Router) Config(r *gin.Engine) {
 			pages.GET("/datasource/brief", rt.auth(), rt.user(), rt.datasourceBriefs)
 			pages.POST("/datasource/query", rt.auth(), rt.user(), rt.datasourceQuery)
 
-			pages.POST("/ds-query", rt.auth(), rt.user(), rt.QueryData)
-			pages.POST("/logs-query", rt.auth(), rt.user(), rt.QueryLogV2)
+			pages.POST("/ds-query", rt.auth(), rt.QueryData)
+			pages.POST("/logs-query", rt.auth(), rt.QueryLogV2)
 
 			pages.POST("/tdengine-databases", rt.auth(), rt.tdengineDatabases)
 			pages.POST("/tdengine-tables", rt.auth(), rt.tdengineTables)
@@ -252,13 +250,9 @@ func (rt *Router) Config(r *gin.Engine) {
 		pages.GET("/auth/redirect", rt.loginRedirect)
 		pages.GET("/auth/redirect/cas", rt.loginRedirectCas)
 		pages.GET("/auth/redirect/oauth", rt.loginRedirectOAuth)
-		pages.GET("/auth/redirect/dingtalk", rt.loginRedirectDingTalk)
-		pages.GET("/auth/redirect/feishu", rt.loginRedirectFeiShu)
 		pages.GET("/auth/callback", rt.loginCallback)
 		pages.GET("/auth/callback/cas", rt.loginCallbackCas)
 		pages.GET("/auth/callback/oauth", rt.loginCallbackOAuth)
-		pages.GET("/auth/callback/dingtalk", rt.loginCallbackDingTalk)
-		pages.GET("/auth/callback/feishu", rt.loginCallbackFeiShu)
 		pages.GET("/auth/perms", rt.allPerms)
 
 		pages.GET("/metrics/desc", rt.metricsDescGetFile)
@@ -322,7 +316,6 @@ func (rt *Router) Config(r *gin.Engine) {
 		pages.GET("/busi-groups/tags", rt.auth(), rt.user(), rt.busiGroupsGetTags)
 
 		pages.GET("/targets", rt.auth(), rt.user(), rt.targetGets)
-		pages.POST("/target-update", rt.auth(), rt.targetUpdate)
 		pages.GET("/target/extra-meta", rt.auth(), rt.user(), rt.targetExtendInfoByIdent)
 		pages.POST("/target/list", rt.auth(), rt.user(), rt.targetGetsByHostFilter)
 		pages.DELETE("/targets", rt.auth(), rt.user(), rt.perm("/targets/del"), rt.targetDel)
@@ -370,7 +363,6 @@ func (rt *Router) Config(r *gin.Engine) {
 		// pages.GET("/alert-rules/builtin/alerts-cates", rt.auth(), rt.user(), rt.builtinAlertCateGets)
 		// pages.GET("/alert-rules/builtin/list", rt.auth(), rt.user(), rt.builtinAlertRules)
 		pages.GET("/alert-rules/callbacks", rt.auth(), rt.user(), rt.alertRuleCallbacks)
-		pages.GET("/timezones", rt.auth(), rt.user(), rt.timezonesGet)
 
 		pages.GET("/busi-groups/alert-rules", rt.auth(), rt.user(), rt.perm("/alert-rules"), rt.alertRuleGetsByGids)
 		pages.GET("/busi-group/:id/alert-rules", rt.auth(), rt.user(), rt.perm("/alert-rules"), rt.alertRuleGets)
@@ -394,8 +386,8 @@ func (rt *Router) Config(r *gin.Engine) {
 		pages.GET("/busi-group/:id/recording-rules", rt.auth(), rt.user(), rt.perm("/recording-rules"), rt.recordingRuleGets)
 		pages.POST("/busi-group/:id/recording-rules", rt.auth(), rt.user(), rt.perm("/recording-rules/add"), rt.bgrw(), rt.recordingRuleAddByFE)
 		pages.DELETE("/busi-group/:id/recording-rules", rt.auth(), rt.user(), rt.perm("/recording-rules/del"), rt.bgrw(), rt.recordingRuleDel)
+		pages.PUT("/busi-group/:id/recording-rule/:rrid", rt.auth(), rt.user(), rt.perm("/recording-rules/put"), rt.bgrw(), rt.recordingRulePutByFE)
 		pages.GET("/recording-rule/:rrid", rt.auth(), rt.user(), rt.perm("/recording-rules"), rt.recordingRuleGet)
-		pages.PUT("/recording-rule/:rrid", rt.auth(), rt.user(), rt.perm("/recording-rules"), rt.recordingRulePutByFE)
 		pages.PUT("/busi-group/:id/recording-rules/fields", rt.auth(), rt.user(), rt.perm("/recording-rules/put"), rt.recordingRulePutFields)
 
 		pages.GET("/busi-groups/alert-mutes", rt.auth(), rt.user(), rt.perm("/alert-mutes"), rt.alertMuteGetsByGids)
@@ -419,9 +411,6 @@ func (rt *Router) Config(r *gin.Engine) {
 		pages.GET("/alert-cur-event/:eid", rt.alertCurEventGet)
 		pages.GET("/alert-his-event/:eid", rt.alertHisEventGet)
 		pages.GET("/event-notify-records/:eid", rt.notificationRecordList)
-		pages.GET("/event-detail/:hash", rt.eventDetailPage)
-		pages.GET("/alert-eval-detail/:id", rt.alertEvalDetailPage)
-		pages.GET("/trace-logs/:traceid", rt.traceLogsPage)
 
 		// card logic
 		pages.GET("/alert-cur-events/list", rt.auth(), rt.user(), rt.alertCurEventsList)
@@ -554,9 +543,6 @@ func (rt *Router) Config(r *gin.Engine) {
 		pages.GET("/notify-rule/custom-params", rt.auth(), rt.user(), rt.perm("/notification-rules"), rt.notifyRuleCustomParamsGet)
 		pages.POST("/notify-rule/event-pipelines-tryrun", rt.auth(), rt.user(), rt.perm("/notification-rules/add"), rt.tryRunEventProcessorByNotifyRule)
 
-		pages.GET("/event-tagkeys", rt.auth(), rt.user(), rt.eventTagKeys)
-		pages.GET("/event-tagvalues", rt.auth(), rt.user(), rt.eventTagValues)
-
 		// 事件Pipeline相关路由
 		pages.GET("/event-pipelines", rt.auth(), rt.user(), rt.perm("/event-pipelines"), rt.eventPipelinesList)
 		pages.POST("/event-pipeline", rt.auth(), rt.user(), rt.perm("/event-pipelines/add"), rt.addEventPipeline)
@@ -566,19 +552,6 @@ func (rt *Router) Config(r *gin.Engine) {
 		pages.POST("/event-pipeline-tryrun", rt.auth(), rt.user(), rt.perm("/event-pipelines"), rt.tryRunEventPipeline)
 		pages.POST("/event-processor-tryrun", rt.auth(), rt.user(), rt.perm("/event-pipelines"), rt.tryRunEventProcessor)
 
-		// API 触发工作流
-		pages.POST("/event-pipeline/:id/trigger", rt.auth(), rt.user(), rt.perm("/event-pipelines"), rt.triggerEventPipelineByAPI)
-		// SSE 流式执行工作流
-		pages.POST("/event-pipeline/:id/stream", rt.auth(), rt.user(), rt.perm("/event-pipelines"), rt.streamEventPipeline)
-
-		// 事件Pipeline执行记录路由
-		pages.GET("/event-pipeline-executions", rt.auth(), rt.user(), rt.perm("/event-pipelines"), rt.listAllEventPipelineExecutions)
-		pages.GET("/event-pipeline/:id/executions", rt.auth(), rt.user(), rt.perm("/event-pipelines"), rt.listEventPipelineExecutions)
-		pages.GET("/event-pipeline/:id/execution/:exec_id", rt.auth(), rt.user(), rt.perm("/event-pipelines"), rt.getEventPipelineExecution)
-		pages.GET("/event-pipeline-execution/:exec_id", rt.auth(), rt.user(), rt.perm("/event-pipelines"), rt.getEventPipelineExecution)
-		pages.GET("/event-pipeline/:id/execution-stats", rt.auth(), rt.user(), rt.perm("/event-pipelines"), rt.getEventPipelineExecutionStats)
-		pages.POST("/event-pipeline-executions/clean", rt.auth(), rt.user(), rt.admin(), rt.cleanEventPipelineExecutions)
-
 		pages.POST("/notify-channel-configs", rt.auth(), rt.user(), rt.perm("/notification-channels/add"), rt.notifyChannelsAdd)
 		pages.DELETE("/notify-channel-configs", rt.auth(), rt.user(), rt.perm("/notification-channels/del"), rt.notifyChannelsDel)
 		pages.PUT("/notify-channel-config/:id", rt.auth(), rt.user(), rt.perm("/notification-channels/put"), rt.notifyChannelPut)
@@ -586,18 +559,8 @@ func (rt *Router) Config(r *gin.Engine) {
 		pages.GET("/notify-channel-configs", rt.auth(), rt.user(), rt.perm("/notification-channels"), rt.notifyChannelsGet)
 		pages.GET("/simplified-notify-channel-configs", rt.notifyChannelsGetForNormalUser)
 		pages.GET("/flashduty-channel-list/:id", rt.auth(), rt.user(), rt.flashDutyNotifyChannelsGet)
-		pages.GET("/pagerduty-integration-key/:id/:service_id/:integration_id", rt.auth(), rt.user(), rt.pagerDutyIntegrationKeyGet)
-		pages.GET("/pagerduty-service-list/:id", rt.auth(), rt.user(), rt.pagerDutyNotifyServicesGet)
 		pages.GET("/notify-channel-config", rt.auth(), rt.user(), rt.notifyChannelGetBy)
 		pages.GET("/notify-channel-config/idents", rt.notifyChannelIdentsGet)
-
-		// saved view 查询条件保存相关路由
-		pages.GET("/saved-views", rt.auth(), rt.user(), rt.savedViewGets)
-		pages.POST("/saved-views", rt.auth(), rt.user(), rt.savedViewAdd)
-		pages.PUT("/saved-view/:id", rt.auth(), rt.user(), rt.savedViewPut)
-		pages.DELETE("/saved-view/:id", rt.auth(), rt.user(), rt.savedViewDel)
-		pages.POST("/saved-view/:id/favorite", rt.auth(), rt.user(), rt.savedViewFavoriteAdd)
-		pages.DELETE("/saved-view/:id/favorite", rt.auth(), rt.user(), rt.savedViewFavoriteDel)
 	}
 
 	r.GET("/api/n9e/versions", func(c *gin.Context) {
@@ -654,7 +617,6 @@ func (rt *Router) Config(r *gin.Engine) {
 			service.GET("/busi-groups", rt.busiGroupGetsByService)
 
 			service.GET("/datasources", rt.datasourceGetsByService)
-			service.GET("/datasource-rsa-config", rt.datasourceRsaConfigGet)
 			service.GET("/datasource-ids", rt.getDatasourceIds)
 			service.POST("/server-heartbeat", rt.serverHeartbeat)
 			service.GET("/servers-active", rt.serversActive)
@@ -662,7 +624,6 @@ func (rt *Router) Config(r *gin.Engine) {
 			service.GET("/recording-rules", rt.recordingRuleGetsByService)
 
 			service.GET("/alert-mutes", rt.alertMuteGets)
-			service.GET("/active-alert-mutes", rt.activeAlertMuteGets)
 			service.POST("/alert-mutes", rt.alertMuteAddByService)
 			service.DELETE("/alert-mutes", rt.alertMuteDel)
 
@@ -711,17 +672,6 @@ func (rt *Router) Config(r *gin.Engine) {
 			service.GET("/message-templates", rt.messageTemplateGets)
 
 			service.GET("/event-pipelines", rt.eventPipelinesListByService)
-			service.POST("/event-pipeline/:id/trigger", rt.triggerEventPipelineByService)
-			service.POST("/event-pipeline/:id/stream", rt.streamEventPipelineByService)
-			service.POST("/event-pipeline-execution", rt.eventPipelineExecutionAdd)
-
-			// 手机号加密存储配置接口
-			service.POST("/users/phone/encrypt", rt.usersPhoneEncrypt)
-			service.POST("/users/phone/decrypt", rt.usersPhoneDecrypt)
-			service.POST("/users/phone/refresh-encryption-config", rt.usersPhoneDecryptRefresh)
-
-			service.GET("/builtin-components", rt.builtinComponentsGets)
-			service.GET("/builtin-payloads", rt.builtinPayloadsGets)
 		}
 	}
 

center/router/router_alert_aggr_view.go

@@ -4,9 +4,9 @@ import (
 	"net/http"
 
 	"github.com/ccfos/nightingale/v6/models"
-	"github.com/ccfos/nightingale/v6/pkg/ginx"
 
 	"github.com/gin-gonic/gin"
+	"github.com/toolkits/pkg/ginx"
 )
 
 // no param

center/router/router_alert_cur_event.go

@@ -10,10 +10,9 @@ import (
 	"github.com/ccfos/nightingale/v6/models"
 	"github.com/ccfos/nightingale/v6/pkg/ctx"
 	"github.com/ccfos/nightingale/v6/pkg/strx"
-	"github.com/ccfos/nightingale/v6/pkg/ginx"
 
 	"github.com/gin-gonic/gin"
-	"github.com/toolkits/pkg/logger"
+	"github.com/toolkits/pkg/ginx"
 )
 
 func getUserGroupIds(ctx *gin.Context, rt *Router, myGroups bool) ([]int64, error) {
@@ -264,11 +263,11 @@ func GetCurEventDetail(ctx *ctx.Context, eid int64) (*models.AlertCurEvent, erro
 	event.NotifyVersion, err = GetEventNotifyVersion(ctx, event.RuleId, event.NotifyRuleIds)
 	ginx.Dangerous(err)
 
-	event.NotifyRules, err = GetEventNotifyRuleNames(ctx, event.NotifyRuleIds)
+	event.NotifyRules, err = GetEventNorifyRuleNames(ctx, event.NotifyRuleIds)
 	return event, err
 }
 
-func GetEventNotifyRuleNames(ctx *ctx.Context, notifyRuleIds []int64) ([]*models.EventNotifyRule, error) {
+func GetEventNorifyRuleNames(ctx *ctx.Context, notifyRuleIds []int64) ([]*models.EventNotifyRule, error) {
 	notifyRuleNames := make([]*models.EventNotifyRule, 0)
 	notifyRules, err := models.NotifyRulesGet(ctx, "id in ?", notifyRuleIds)
 	if err != nil {
@@ -306,123 +305,3 @@ func (rt *Router) alertCurEventDelByHash(c *gin.Context) {
 	hash := ginx.QueryStr(c, "hash")
 	ginx.NewRender(c).Message(models.AlertCurEventDelByHash(rt.Ctx, hash))
 }
-
-func (rt *Router) eventTagKeys(c *gin.Context) {
-	// 获取最近1天的活跃告警事件
-	now := time.Now().Unix()
-	stime := now - 24*3600
-	etime := now
-
-	// 获取用户可见的业务组ID列表
-	bgids, err := GetBusinessGroupIds(c, rt.Ctx, rt.Center.EventHistoryGroupView, false)
-	if err != nil {
-		logger.Warningf("failed to get business group ids: %v", err)
-		ginx.NewRender(c).Data([]string{"ident", "app", "service", "instance"}, nil)
-		return
-	}
-
-	// 查询活跃告警事件，限制数量以提高性能
-	events, err := models.AlertCurEventsGet(rt.Ctx, []string{}, bgids, stime, etime, []int64{}, []int64{}, []string{}, 0, "", 200, 0, []int64{})
-	if err != nil {
-		logger.Warningf("failed to get current alert events: %v", err)
-		ginx.NewRender(c).Data([]string{"ident", "app", "service", "instance"}, nil)
-		return
-	}
-
-	// 如果没有查到事件，返回默认标签
-	if len(events) == 0 {
-		ginx.NewRender(c).Data([]string{"ident", "app", "service", "instance"}, nil)
-		return
-	}
-
-	// 收集所有标签键并去重
-	tagKeys := make(map[string]struct{})
-	for _, event := range events {
-		for key := range event.TagsMap {
-			tagKeys[key] = struct{}{}
-		}
-	}
-
-	// 转换为字符串切片
-	var result []string
-	for key := range tagKeys {
-		result = append(result, key)
-	}
-
-	// 如果没有收集到任何标签键，返回默认值
-	if len(result) == 0 {
-		result = []string{"ident", "app", "service", "instance"}
-	}
-
-	ginx.NewRender(c).Data(result, nil)
-}
-
-func (rt *Router) eventTagValues(c *gin.Context) {
-	// 获取标签key
-	tagKey := ginx.QueryStr(c, "key")
-
-	// 获取最近1天的活跃告警事件
-	now := time.Now().Unix()
-	stime := now - 24*3600
-	etime := now
-
-	// 获取用户可见的业务组ID列表
-	bgids, err := GetBusinessGroupIds(c, rt.Ctx, rt.Center.EventHistoryGroupView, false)
-	if err != nil {
-		logger.Warningf("failed to get business group ids: %v", err)
-		ginx.NewRender(c).Data([]string{}, nil)
-		return
-	}
-
-	// 查询活跃告警事件，获取更多数据以保证统计准确性
-	events, err := models.AlertCurEventsGet(rt.Ctx, []string{}, bgids, stime, etime, []int64{}, []int64{}, []string{}, 0, "", 1000, 0, []int64{})
-	if err != nil {
-		logger.Warningf("failed to get current alert events: %v", err)
-		ginx.NewRender(c).Data([]string{}, nil)
-		return
-	}
-
-	// 如果没有查到事件，返回空数组
-	if len(events) == 0 {
-		ginx.NewRender(c).Data([]string{}, nil)
-		return
-	}
-
-	// 统计标签值出现次数
-	valueCount := make(map[string]int)
-	for _, event := range events {
-		// TagsMap已经在AlertCurEventsGet中处理，直接使用
-		if value, exists := event.TagsMap[tagKey]; exists && value != "" {
-			valueCount[value]++
-		}
-	}
-
-	// 转换为切片并按出现次数降序排序
-	type tagValue struct {
-		value string
-		count int
-	}
-
-	tagValues := make([]tagValue, 0, len(valueCount))
-	for value, count := range valueCount {
-		tagValues = append(tagValues, tagValue{value, count})
-	}
-
-	// 按出现次数降序排序
-	sort.Slice(tagValues, func(i, j int) bool {
-		return tagValues[i].count > tagValues[j].count
-	})
-
-	// 只取Top20并转换为字符串数组
-	limit := 20
-	if len(tagValues) < limit {
-		limit = len(tagValues)
-	}
-
-	result := make([]string, 0, limit)
-	for i := 0; i < limit; i++ {
-		result = append(result, tagValues[i].value)
-	}
-
-	ginx.NewRender(c).Data(result, nil)
-}

center/router/router_alert_eval_detail.go

@@ -1,168 +0,0 @@
-package router
-
-import (
-	"encoding/json"
-	"fmt"
-	"io"
-	"net/http"
-	"sort"
-	"strconv"
-	"strings"
-	"time"
-
-	"github.com/ccfos/nightingale/v6/models"
-	"github.com/ccfos/nightingale/v6/pkg/loggrep"
-	"github.com/ccfos/nightingale/v6/pkg/ginx"
-
-	"github.com/gin-gonic/gin"
-)
-
-// alertEvalDetailPage renders an HTML log viewer page for alert rule evaluation logs.
-func (rt *Router) alertEvalDetailPage(c *gin.Context) {
-	id := ginx.UrlParamStr(c, "id")
-	if !loggrep.IsValidRuleID(id) {
-		c.String(http.StatusBadRequest, "invalid rule id format")
-		return
-	}
-
-	logs, instance, err := rt.getAlertEvalLogs(id)
-	if err != nil {
-		c.String(http.StatusInternalServerError, "Error: %v", err)
-		return
-	}
-
-	c.Header("Content-Type", "text/html; charset=utf-8")
-	err = loggrep.RenderAlertEvalHTML(c.Writer, loggrep.AlertEvalPageData{
-		RuleID:   id,
-		Instance: instance,
-		Logs:     logs,
-		Total:    len(logs),
-	})
-	if err != nil {
-		c.String(http.StatusInternalServerError, "render error: %v", err)
-	}
-}
-
-// alertEvalDetailJSON returns JSON for alert rule evaluation logs.
-func (rt *Router) alertEvalDetailJSON(c *gin.Context) {
-	id := ginx.UrlParamStr(c, "id")
-	if !loggrep.IsValidRuleID(id) {
-		ginx.Bomb(200, "invalid rule id format")
-	}
-
-	logs, instance, err := rt.getAlertEvalLogs(id)
-	ginx.Dangerous(err)
-
-	ginx.NewRender(c).Data(loggrep.EventDetailResp{
-		Logs:     logs,
-		Instance: instance,
-	}, nil)
-}
-
-// getAlertEvalLogs resolves the target instance(s) and retrieves alert eval logs.
-func (rt *Router) getAlertEvalLogs(id string) ([]string, string, error) {
-	ruleId, _ := strconv.ParseInt(id, 10, 64)
-	rule, err := models.AlertRuleGetById(rt.Ctx, ruleId)
-	if err != nil {
-		return nil, "", err
-	}
-	if rule == nil {
-		return nil, "", fmt.Errorf("no such alert rule")
-	}
-
-	instance := fmt.Sprintf("%s:%d", rt.Alert.Heartbeat.IP, rt.HTTP.Port)
-	keyword := fmt.Sprintf("alert_eval_%s", id)
-
-	// Get datasource IDs for this rule
-	dsIds := rt.DatasourceCache.GetIDsByDsCateAndQueries(rule.Cate, rule.DatasourceQueries)
-	if len(dsIds) == 0 {
-		// No datasources found (e.g. host rule), try local grep
-		logs, err := loggrep.GrepLogDir(rt.LogDir, keyword)
-		return logs, instance, err
-	}
-
-	// Find unique target nodes via hash ring, with DB fallback
-	nodeSet := make(map[string]struct{})
-	for _, dsId := range dsIds {
-		node, err := rt.getNodeForDatasource(dsId, id)
-		if err != nil {
-			continue
-		}
-		nodeSet[node] = struct{}{}
-	}
-
-	if len(nodeSet) == 0 {
-		// Hash ring not ready, grep locally
-		logs, err := loggrep.GrepLogDir(rt.LogDir, keyword)
-		return logs, instance, err
-	}
-
-	// Collect logs from all target nodes
-	var allLogs []string
-	var instances []string
-
-	for node := range nodeSet {
-		if node == instance {
-			logs, err := loggrep.GrepLogDir(rt.LogDir, keyword)
-			if err == nil {
-				allLogs = append(allLogs, logs...)
-				instances = append(instances, node)
-			}
-		} else {
-			logs, nodeAddr, err := rt.forwardAlertEvalDetail(node, id)
-			if err == nil {
-				allLogs = append(allLogs, logs...)
-				instances = append(instances, nodeAddr)
-			}
-		}
-	}
-
-	// Sort logs by timestamp descending
-	sort.Slice(allLogs, func(i, j int) bool {
-		return allLogs[i] > allLogs[j]
-	})
-
-	if len(allLogs) > loggrep.MaxLogLines {
-		allLogs = allLogs[:loggrep.MaxLogLines]
-	}
-
-	return allLogs, strings.Join(instances, ", "), nil
-}
-
-func (rt *Router) forwardAlertEvalDetail(node, id string) ([]string, string, error) {
-	url := fmt.Sprintf("http://%s/v1/n9e/alert-eval-detail/%s", node, id)
-	req, err := http.NewRequest("GET", url, nil)
-	if err != nil {
-		return nil, node, err
-	}
-
-	for user, pass := range rt.HTTP.APIForService.BasicAuth {
-		req.SetBasicAuth(user, pass)
-		break
-	}
-
-	client := &http.Client{Timeout: 15 * time.Second}
-	resp, err := client.Do(req)
-	if err != nil {
-		return nil, node, fmt.Errorf("forward to %s failed: %v", node, err)
-	}
-	defer resp.Body.Close()
-
-	body, err := io.ReadAll(io.LimitReader(resp.Body, 10*1024*1024)) // 10MB limit
-	if err != nil {
-		return nil, node, err
-	}
-
-	var result struct {
-		Dat loggrep.EventDetailResp `json:"dat"`
-		Err string                  `json:"err"`
-	}
-	if err := json.Unmarshal(body, &result); err != nil {
-		return nil, node, err
-	}
-	if result.Err != "" {
-		return nil, node, fmt.Errorf("%s", result.Err)
-	}
-
-	return result.Dat.Logs, result.Dat.Instance, nil
-}

center/router/router_alert_his_event.go

@@ -8,9 +8,9 @@ import (
 
 	"github.com/ccfos/nightingale/v6/models"
 	"github.com/ccfos/nightingale/v6/pkg/ctx"
-	"github.com/ccfos/nightingale/v6/pkg/ginx"
 
 	"github.com/gin-gonic/gin"
+	"github.com/toolkits/pkg/ginx"
 	"github.com/toolkits/pkg/logger"
 	"golang.org/x/exp/slices"
 )
@@ -62,11 +62,11 @@ func (rt *Router) alertHisEventsList(c *gin.Context) {
 	ginx.Dangerous(err)
 
 	total, err := models.AlertHisEventTotal(rt.Ctx, prods, bgids, stime, etime, severity,
-		recovered, dsIds, cates, ruleId, query, []int64{})
+		recovered, dsIds, cates, ruleId, query)
 	ginx.Dangerous(err)
 
 	list, err := models.AlertHisEventGets(rt.Ctx, prods, bgids, stime, etime, severity, recovered,
-		dsIds, cates, ruleId, query, limit, ginx.Offset(c, limit), []int64{})
+		dsIds, cates, ruleId, query, limit, ginx.Offset(c, limit))
 	ginx.Dangerous(err)
 
 	cache := make(map[int64]*models.UserGroup)
@@ -115,18 +115,7 @@ func (rt *Router) alertHisEventsDelete(c *gin.Context) {
 			time.Sleep(100 * time.Millisecond) // 防止锁表
 		}
 	}()
-	ginx.NewRender(c).Data("Alert history events deletion started", nil)
-}
-
-var TransferEventToCur func(*ctx.Context, *models.AlertHisEvent) *models.AlertCurEvent
-
-func init() {
-	TransferEventToCur = transferEventToCur
-}
-
-func transferEventToCur(ctx *ctx.Context, event *models.AlertHisEvent) *models.AlertCurEvent {
-	cur := event.ToCur()
-	return cur
+	ginx.NewRender(c).Message("Alert history events deletion started")
 }
 
 func (rt *Router) alertHisEventGet(c *gin.Context) {
@@ -152,8 +141,8 @@ func (rt *Router) alertHisEventGet(c *gin.Context) {
 	event.NotifyVersion, err = GetEventNotifyVersion(rt.Ctx, event.RuleId, event.NotifyRuleIds)
 	ginx.Dangerous(err)
 
-	event.NotifyRules, err = GetEventNotifyRuleNames(rt.Ctx, event.NotifyRuleIds)
-	ginx.NewRender(c).Data(TransferEventToCur(rt.Ctx, event), err)
+	event.NotifyRules, err = GetEventNorifyRuleNames(rt.Ctx, event.NotifyRuleIds)
+	ginx.NewRender(c).Data(event, err)
 }
 
 func GetBusinessGroupIds(c *gin.Context, ctx *ctx.Context, onlySelfGroupView bool, myGroups bool) ([]int64, error) {

center/router/router_alert_rule.go

@@ -16,12 +16,12 @@ import (
 	"github.com/ccfos/nightingale/v6/pkg/strx"
 	"github.com/ccfos/nightingale/v6/pushgw/pconf"
 	"github.com/ccfos/nightingale/v6/pushgw/writer"
-	"github.com/ccfos/nightingale/v6/pkg/ginx"
 
 	"github.com/gin-gonic/gin"
 	"github.com/jinzhu/copier"
 	"github.com/pkg/errors"
 	"github.com/prometheus/prometheus/prompb"
+	"github.com/toolkits/pkg/ginx"
 	"github.com/toolkits/pkg/i18n"
 )
 
@@ -35,13 +35,13 @@ func (rt *Router) alertRuleGets(c *gin.Context) {
 		cache := make(map[int64]*models.UserGroup)
 		for i := 0; i < len(ars); i++ {
 			ars[i].FillNotifyGroups(rt.Ctx, cache)
+			ars[i].FillSeverities()
 		}
-		models.FillUpdateByNicknames(rt.Ctx, ars)
 	}
 	ginx.NewRender(c).Data(ars, err)
 }
 
-func GetAlertCueEventTimeRange(c *gin.Context) (stime, etime int64) {
+func getAlertCueEventTimeRange(c *gin.Context) (stime, etime int64) {
 	stime = ginx.QueryInt64(c, "stime", 0)
 	etime = ginx.QueryInt64(c, "etime", 0)
 	if etime == 0 {
@@ -77,17 +77,20 @@ func (rt *Router) alertRuleGetsByGids(c *gin.Context) {
 	if err == nil {
 		cache := make(map[int64]*models.UserGroup)
 		rids := make([]int64, 0, len(ars))
+		names := make([]string, 0, len(ars))
 		for i := 0; i < len(ars); i++ {
 			ars[i].FillNotifyGroups(rt.Ctx, cache)
+			ars[i].FillSeverities()
 
 			if len(ars[i].DatasourceQueries) != 0 {
 				ars[i].DatasourceIdsJson = rt.DatasourceCache.GetIDsByDsCateAndQueries(ars[i].Cate, ars[i].DatasourceQueries)
 			}
 
 			rids = append(rids, ars[i].Id)
+			names = append(names, ars[i].UpdateBy)
 		}
 
-		stime, etime := GetAlertCueEventTimeRange(c)
+		stime, etime := getAlertCueEventTimeRange(c)
 		cnt := models.AlertCurEventCountByRuleId(rt.Ctx, rids, stime, etime)
 		if cnt != nil {
 			for i := 0; i < len(ars); i++ {
@@ -95,7 +98,14 @@ func (rt *Router) alertRuleGetsByGids(c *gin.Context) {
 			}
 		}
 
-		models.FillUpdateByNicknames(rt.Ctx, ars)
+		users := models.UserMapGet(rt.Ctx, "username in (?)", names)
+		if users != nil {
+			for i := 0; i < len(ars); i++ {
+				if user, exist := users[ars[i].UpdateBy]; exist {
+					ars[i].UpdateByNickname = user.Nickname
+				}
+			}
+		}
 	}
 	ginx.NewRender(c).Data(ars, err)
 }
@@ -127,7 +137,6 @@ func (rt *Router) alertRulesGetByService(c *gin.Context) {
 				ars[i].DatasourceIdsJson = rt.DatasourceCache.GetIDsByDsCateAndQueries(ars[i].Cate, ars[i].DatasourceQueries)
 			}
 		}
-		models.FillUpdateByNicknames(rt.Ctx, ars)
 	}
 	ginx.NewRender(c).Data(ars, err)
 }
@@ -281,15 +290,6 @@ func (rt *Router) alertRuleAddByImport(c *gin.Context) {
 				models.DataSourceQueryAll,
 			}
 		}
-
-		// 将导入的规则统一转为新版本的通知规则配置
-		lst[i].NotifyVersion = 1
-		lst[i].NotifyChannelsJSON = []string{}
-		lst[i].NotifyGroupsJSON = []string{}
-		lst[i].NotifyChannels = ""
-		lst[i].NotifyGroups = ""
-		lst[i].Callbacks = ""
-		lst[i].CallbacksJSON = []string{}
 	}
 
 	bgid := ginx.UrlParamInt64(c, "id")
@@ -308,52 +308,19 @@ func (rt *Router) alertRuleAddByImportPromRule(c *gin.Context) {
 	var f promRuleForm
 	ginx.Dangerous(c.BindJSON(&f))
 
-	// 首先尝试解析带 groups 的格式
 	var pr struct {
 		Groups []models.PromRuleGroup `yaml:"groups"`
 	}
 	err := yaml.Unmarshal([]byte(f.Payload), &pr)
-
-	var groups []models.PromRuleGroup
-
-	if err != nil || len(pr.Groups) == 0 {
-		// 如果解析失败或没有 groups，尝试解析规则数组格式
-		var rules []models.PromRule
-		err = yaml.Unmarshal([]byte(f.Payload), &rules)
-		if err != nil {
-			// 最后尝试解析单个规则格式
-			var singleRule models.PromRule
-			err = yaml.Unmarshal([]byte(f.Payload), &singleRule)
-			if err != nil {
-				ginx.Bomb(http.StatusBadRequest, "invalid yaml format. err: %v", err)
-			}
-
-			// 验证单个规则是否有效
-			if singleRule.Alert == "" && singleRule.Record == "" {
-				ginx.Bomb(http.StatusBadRequest, "input yaml is empty or invalid")
-			}
-
-			rules = []models.PromRule{singleRule}
-		}
-
-		// 验证规则数组是否为空
-		if len(rules) == 0 {
-			ginx.Bomb(http.StatusBadRequest, "input yaml contains no rules")
-		}
-
-		// 将规则数组包装成 group
-		groups = []models.PromRuleGroup{
-			{
-				Name:  "imported_rules",
-				Rules: rules,
-			},
-		}
-	} else {
-		// 使用已解析的 groups
-		groups = pr.Groups
+	if err != nil {
+		ginx.Bomb(http.StatusBadRequest, "invalid yaml format, please use the example format. err: %v", err)
 	}
 
-	lst := models.DealPromGroup(groups, f.DatasourceQueries, f.Disabled)
+	if len(pr.Groups) == 0 {
+		ginx.Bomb(http.StatusBadRequest, "input yaml is empty")
+	}
+
+	lst := models.DealPromGroup(pr.Groups, f.DatasourceQueries, f.Disabled)
 	username := c.MustGet("username").(string)
 	bgid := ginx.UrlParamInt64(c, "id")
 	ginx.NewRender(c).Data(rt.alertRuleAdd(lst, username, bgid, c.GetHeader("X-Language")), nil)
@@ -498,8 +465,8 @@ func (rt *Router) alertRulePutFields(c *gin.Context) {
 		ginx.Bomb(http.StatusBadRequest, "fields empty")
 	}
 
-	updateBy := c.MustGet("username").(string)
-	updateAt := time.Now().Unix()
+	f.Fields["update_by"] = c.MustGet("username").(string)
+	f.Fields["update_at"] = time.Now().Unix()
 
 	for i := 0; i < len(f.Ids); i++ {
 		ar, err := models.AlertRuleGetById(rt.Ctx, f.Ids[i])
@@ -516,6 +483,7 @@ func (rt *Router) alertRulePutFields(c *gin.Context) {
 				b, err := json.Marshal(originRule)
 				ginx.Dangerous(err)
 				ginx.Dangerous(ar.UpdateFieldsMap(rt.Ctx, map[string]interface{}{"rule_config": string(b)}))
+				continue
 			}
 		}
 
@@ -528,6 +496,7 @@ func (rt *Router) alertRulePutFields(c *gin.Context) {
 				b, err := json.Marshal(ar.AnnotationsJSON)
 				ginx.Dangerous(err)
 				ginx.Dangerous(ar.UpdateFieldsMap(rt.Ctx, map[string]interface{}{"annotations": string(b)}))
+				continue
 			}
 		}
 
@@ -540,6 +509,7 @@ func (rt *Router) alertRulePutFields(c *gin.Context) {
 				b, err := json.Marshal(ar.AnnotationsJSON)
 				ginx.Dangerous(err)
 				ginx.Dangerous(ar.UpdateFieldsMap(rt.Ctx, map[string]interface{}{"annotations": string(b)}))
+				continue
 			}
 		}
 
@@ -549,6 +519,7 @@ func (rt *Router) alertRulePutFields(c *gin.Context) {
 				callback := callbacks.(string)
 				if !strings.Contains(ar.Callbacks, callback) {
 					ginx.Dangerous(ar.UpdateFieldsMap(rt.Ctx, map[string]interface{}{"callbacks": ar.Callbacks + " " + callback}))
+					continue
 				}
 			}
 		}
@@ -558,6 +529,7 @@ func (rt *Router) alertRulePutFields(c *gin.Context) {
 			if callbacks, has := f.Fields["callbacks"]; has {
 				callback := callbacks.(string)
 				ginx.Dangerous(ar.UpdateFieldsMap(rt.Ctx, map[string]interface{}{"callbacks": strings.ReplaceAll(ar.Callbacks, callback, "")}))
+				continue
 			}
 		}
 
@@ -567,6 +539,7 @@ func (rt *Router) alertRulePutFields(c *gin.Context) {
 				bytes, err := json.Marshal(datasourceQueries)
 				ginx.Dangerous(err)
 				ginx.Dangerous(ar.UpdateFieldsMap(rt.Ctx, map[string]interface{}{"datasource_queries": bytes}))
+				continue
 			}
 		}
 
@@ -582,12 +555,6 @@ func (rt *Router) alertRulePutFields(c *gin.Context) {
 				ginx.Dangerous(ar.UpdateColumn(rt.Ctx, k, v))
 			}
 		}
-
-		// 统一更新更新时间和更新人，只有更新时间变了，告警规则才会被引擎拉取
-		ginx.Dangerous(ar.UpdateFieldsMap(rt.Ctx, map[string]interface{}{
-			"update_by": updateBy,
-			"update_at": updateAt,
-		}))
 	}
 
 	ginx.NewRender(c).Message(nil)
@@ -882,27 +849,3 @@ func (rt *Router) batchAlertRuleClone(c *gin.Context) {
 
 	ginx.NewRender(c).Data(reterr, nil)
 }
-
-func (rt *Router) timezonesGet(c *gin.Context) {
-	// 返回常用时区列表（按时差去重，每个时差只保留一个代表性时区）
-	timezones := []string{
-		"UTC",
-		"Asia/Shanghai",       // UTC+8 (代表 Asia/Hong_Kong, Asia/Singapore 等)
-		"Asia/Tokyo",          // UTC+9 (代表 Asia/Seoul 等)
-		"Asia/Dubai",          // UTC+4
-		"Asia/Kolkata",        // UTC+5:30
-		"Asia/Bangkok",        // UTC+7 (代表 Asia/Jakarta 等)
-		"Europe/London",       // UTC+0 (代表 UTC)
-		"Europe/Paris",        // UTC+1 (代表 Europe/Berlin, Europe/Rome, Europe/Madrid 等)
-		"Europe/Moscow",       // UTC+3
-		"America/New_York",    // UTC-5 (代表 America/Toronto 等)
-		"America/Chicago",     // UTC-6 (代表 America/Mexico_City 等)
-		"America/Denver",      // UTC-7
-		"America/Los_Angeles", // UTC-8
-		"America/Sao_Paulo",   // UTC-3
-		"Australia/Sydney",    // UTC+10 (代表 Australia/Melbourne 等)
-		"Pacific/Auckland",    // UTC+12
-	}
-
-	ginx.NewRender(c).Data(timezones, nil)
-}

center/router/router_alert_subscribe.go

@@ -9,9 +9,9 @@ import (
 	"github.com/ccfos/nightingale/v6/alert/common"
 	"github.com/ccfos/nightingale/v6/models"
 	"github.com/ccfos/nightingale/v6/pkg/strx"
-	"github.com/ccfos/nightingale/v6/pkg/ginx"
 
 	"github.com/gin-gonic/gin"
+	"github.com/toolkits/pkg/ginx"
 	"github.com/toolkits/pkg/i18n"
 )
 
@@ -30,7 +30,6 @@ func (rt *Router) alertSubscribeGets(c *gin.Context) {
 		ginx.Dangerous(lst[i].FillDatasourceIds(rt.Ctx))
 		ginx.Dangerous(lst[i].DB2FE())
 	}
-	models.FillUpdateByNicknames(rt.Ctx, lst)
 
 	ginx.NewRender(c).Data(lst, err)
 }
@@ -67,7 +66,6 @@ func (rt *Router) alertSubscribeGetsByGids(c *gin.Context) {
 		ginx.Dangerous(lst[i].FillDatasourceIds(rt.Ctx))
 		ginx.Dangerous(lst[i].DB2FE())
 	}
-	models.FillUpdateByNicknames(rt.Ctx, lst)
 
 	ginx.NewRender(c).Data(lst, err)
 }
@@ -290,7 +288,6 @@ func (rt *Router) alertSubscribePut(c *gin.Context) {
 			"busi_groups",
 			"note",
 			"notify_rule_ids",
-			"notify_version",
 		))
 	}
 

center/router/router_board.go

@@ -7,9 +7,9 @@ import (
 
 	"github.com/ccfos/nightingale/v6/models"
 	"github.com/ccfos/nightingale/v6/pkg/strx"
-	"github.com/ccfos/nightingale/v6/pkg/ginx"
 
 	"github.com/gin-gonic/gin"
+	"github.com/toolkits/pkg/ginx"
 	"github.com/toolkits/pkg/i18n"
 )
 
@@ -17,7 +17,6 @@ type boardForm struct {
 	Name       string  `json:"name"`
 	Ident      string  `json:"ident"`
 	Tags       string  `json:"tags"`
-	Note       string  `json:"note"`
 	Configs    string  `json:"configs"`
 	Public     int     `json:"public"`
 	PublicCate int     `json:"public_cate"`
@@ -35,7 +34,6 @@ func (rt *Router) boardAdd(c *gin.Context) {
 		Name:     f.Name,
 		Ident:    f.Ident,
 		Tags:     f.Tags,
-		Note:     f.Note,
 		Configs:  f.Configs,
 		CreateBy: me.Username,
 		UpdateBy: me.Username,
@@ -117,10 +115,6 @@ func (rt *Router) boardPureGet(c *gin.Context) {
 		ginx.Bomb(http.StatusNotFound, "No such dashboard")
 	}
 
-	// 清除创建者和更新者信息
-	board.CreateBy = ""
-	board.UpdateBy = ""
-
 	ginx.NewRender(c).Data(board, nil)
 }
 
@@ -186,11 +180,10 @@ func (rt *Router) boardPut(c *gin.Context) {
 	bo.Name = f.Name
 	bo.Ident = f.Ident
 	bo.Tags = f.Tags
-	bo.Note = f.Note
 	bo.UpdateBy = me.Username
 	bo.UpdateAt = time.Now().Unix()
 
-	err = bo.Update(rt.Ctx, "name", "ident", "tags", "note", "update_by", "update_at")
+	err = bo.Update(rt.Ctx, "name", "ident", "tags", "update_by", "update_at")
 	ginx.NewRender(c).Data(bo, err)
 }
 
@@ -260,9 +253,6 @@ func (rt *Router) boardGets(c *gin.Context) {
 	query := ginx.QueryStr(c, "query", "")
 
 	boards, err := models.BoardGetsByGroupId(rt.Ctx, bgid, query)
-	if err == nil {
-		models.FillUpdateByNicknames(rt.Ctx, boards)
-	}
 	ginx.NewRender(c).Data(boards, err)
 }
 
@@ -276,9 +266,6 @@ func (rt *Router) publicBoardGets(c *gin.Context) {
 	ginx.Dangerous(err)
 
 	boards, err := models.BoardGets(rt.Ctx, "", "public=1 and (public_cate in (?) or id in (?))", []int64{0, 1}, boardIds)
-	if err == nil {
-		models.FillUpdateByNicknames(rt.Ctx, boards)
-	}
 	ginx.NewRender(c).Data(boards, err)
 }
 
@@ -318,7 +305,6 @@ func (rt *Router) boardGetsByGids(c *gin.Context) {
 			boards[i].Bgids = ids
 		}
 	}
-	models.FillUpdateByNicknames(rt.Ctx, boards)
 
 	ginx.NewRender(c).Data(boards, err)
 }

center/router/router_builtin.go

@@ -8,10 +8,10 @@ import (
 	"strings"
 
 	"github.com/ccfos/nightingale/v6/models"
-	"github.com/ccfos/nightingale/v6/pkg/ginx"
 
 	"github.com/gin-gonic/gin"
 	"github.com/toolkits/pkg/file"
+	"github.com/toolkits/pkg/ginx"
 	"github.com/toolkits/pkg/logger"
 	"github.com/toolkits/pkg/runner"
 )

center/router/router_builtin_componet.go

@@ -5,9 +5,9 @@ import (
 
 	"github.com/ccfos/nightingale/v6/models"
 	"github.com/ccfos/nightingale/v6/pkg/ctx"
-	"github.com/ccfos/nightingale/v6/pkg/ginx"
 
 	"github.com/gin-gonic/gin"
+	"github.com/toolkits/pkg/ginx"
 	"gorm.io/gorm"
 )
 

center/router/router_builtin_metric_filter.go

@@ -3,8 +3,8 @@ package router
 import (
 	"github.com/ccfos/nightingale/v6/models"
 	"github.com/ccfos/nightingale/v6/pkg/prom"
-	"github.com/ccfos/nightingale/v6/pkg/ginx"
 	"github.com/gin-gonic/gin"
+	"github.com/toolkits/pkg/ginx"
 )
 
 func (rt *Router) metricFilterGets(c *gin.Context) {
@@ -27,8 +27,6 @@ func (rt *Router) metricFilterGets(c *gin.Context) {
 		}
 	}
 
-	models.FillUpdateByNicknames(rt.Ctx, arr)
-
 	ginx.NewRender(c).Data(arr, err)
 }
 

center/router/router_builtin_metrics.go

@@ -7,9 +7,9 @@ import (
 
 	"github.com/ccfos/nightingale/v6/center/integration"
 	"github.com/ccfos/nightingale/v6/models"
-	"github.com/ccfos/nightingale/v6/pkg/ginx"
 
 	"github.com/gin-gonic/gin"
+	"github.com/toolkits/pkg/ginx"
 	"github.com/toolkits/pkg/i18n"
 )
 
@@ -50,7 +50,7 @@ func (rt *Router) builtinMetricsGets(c *gin.Context) {
 		lang = "zh_CN"
 	}
 
-	bmInDB, err := models.BuiltinMetricGets(rt.Ctx, "", collector, typ, query, unit)
+	bmInDB, err := models.BuiltinMetricGets(rt.Ctx, "", collector, typ, query, unit, limit, ginx.Offset(c, limit))
 	ginx.Dangerous(err)
 
 	bm, total, err := integration.BuiltinPayloadInFile.BuiltinMetricGets(bmInDB, lang, collector, typ, query, unit, limit, ginx.Offset(c, limit))

center/router/router_builtin_payload.go

@@ -9,8 +9,8 @@ import (
 	"github.com/BurntSushi/toml"
 	"github.com/ccfos/nightingale/v6/center/integration"
 	"github.com/ccfos/nightingale/v6/models"
-	"github.com/ccfos/nightingale/v6/pkg/ginx"
 	"github.com/gin-gonic/gin"
+	"github.com/toolkits/pkg/ginx"
 	"github.com/toolkits/pkg/i18n"
 )
 
@@ -19,7 +19,6 @@ type Board struct {
 	Tags    string      `json:"tags"`
 	Configs interface{} `json:"configs"`
 	UUID    int64       `json:"uuid"`
-	Note    string      `json:"note"`
 }
 
 func (rt *Router) builtinPayloadsAdd(c *gin.Context) {
@@ -130,7 +129,6 @@ func (rt *Router) builtinPayloadsAdd(c *gin.Context) {
 						Name:        dashboard.Name,
 						Tags:        dashboard.Tags,
 						UUID:        dashboard.UUID,
-						Note:        dashboard.Note,
 						Content:     string(contentBytes),
 						CreatedBy:   username,
 						UpdatedBy:   username,
@@ -166,7 +164,6 @@ func (rt *Router) builtinPayloadsAdd(c *gin.Context) {
 				Name:        dashboard.Name,
 				Tags:        dashboard.Tags,
 				UUID:        dashboard.UUID,
-				Note:        dashboard.Note,
 				Content:     string(contentBytes),
 				CreatedBy:   username,
 				UpdatedBy:   username,
@@ -278,7 +275,6 @@ func (rt *Router) builtinPayloadsPut(c *gin.Context) {
 
 		req.Name = dashboard.Name
 		req.Tags = dashboard.Tags
-		req.Note = dashboard.Note
 	} else if req.Type == "collect" {
 		c := make(map[string]interface{})
 		if _, err := toml.Decode(req.Content, &c); err != nil {

center/router/router_busi_group.go

@@ -5,9 +5,9 @@ import (
 
 	"github.com/ccfos/nightingale/v6/models"
 	"github.com/ccfos/nightingale/v6/pkg/strx"
-	"github.com/ccfos/nightingale/v6/pkg/ginx"
 
 	"github.com/gin-gonic/gin"
+	"github.com/toolkits/pkg/ginx"
 	"github.com/toolkits/pkg/logger"
 )
 
@@ -119,9 +119,6 @@ func (rt *Router) busiGroupGets(c *gin.Context) {
 	if len(lst) == 0 {
 		lst = []models.BusiGroup{}
 	}
-	if err == nil {
-		models.FillUpdateByNicknames(rt.Ctx, lst)
-	}
 
 	ginx.NewRender(c).Data(lst, err)
 }

center/router/router_captcha.go

@@ -5,9 +5,9 @@ import (
 	"time"
 
 	"github.com/ccfos/nightingale/v6/storage"
-	"github.com/ccfos/nightingale/v6/pkg/ginx"
 	"github.com/gin-gonic/gin"
 	captcha "github.com/mojocn/base64Captcha"
+	"github.com/toolkits/pkg/ginx"
 	"github.com/toolkits/pkg/logger"
 )
 

center/router/router_chart_share.go

@@ -5,9 +5,9 @@ import (
 
 	"github.com/ccfos/nightingale/v6/models"
 	"github.com/ccfos/nightingale/v6/pkg/strx"
-	"github.com/ccfos/nightingale/v6/pkg/ginx"
 
 	"github.com/gin-gonic/gin"
+	"github.com/toolkits/pkg/ginx"
 )
 
 func (rt *Router) chartShareGets(c *gin.Context) {

center/router/router_config.go

@@ -4,9 +4,9 @@ import (
 	"encoding/json"
 
 	"github.com/ccfos/nightingale/v6/models"
-	"github.com/ccfos/nightingale/v6/pkg/ginx"
 
 	"github.com/gin-gonic/gin"
+	"github.com/toolkits/pkg/ginx"
 )
 
 func (rt *Router) notifyChannelsGets(c *gin.Context) {

center/router/router_configs.go

@@ -4,9 +4,9 @@ import (
 	"time"
 
 	"github.com/ccfos/nightingale/v6/models"
-	"github.com/ccfos/nightingale/v6/pkg/ginx"
 
 	"github.com/gin-gonic/gin"
+	"github.com/toolkits/pkg/ginx"
 )
 
 const EMBEDDEDDASHBOARD = "embedded-dashboards"
@@ -15,9 +15,6 @@ func (rt *Router) configsGet(c *gin.Context) {
 	prefix := ginx.QueryStr(c, "prefix", "")
 	limit := ginx.QueryInt(c, "limit", 10)
 	configs, err := models.ConfigsGets(rt.Ctx, prefix, limit, ginx.Offset(c, limit))
-	if err == nil {
-		models.FillUpdateByNicknames(rt.Ctx, configs)
-	}
 	ginx.NewRender(c).Data(configs, err)
 }
 

center/router/router_crypto.go

@@ -2,9 +2,9 @@ package router
 
 import (
 	"github.com/ccfos/nightingale/v6/pkg/secu"
-	"github.com/ccfos/nightingale/v6/pkg/ginx"
 
 	"github.com/gin-gonic/gin"
+	"github.com/toolkits/pkg/ginx"
 )
 
 type confPropCrypto struct {

center/router/router_dash_annotation.go

@@ -7,9 +7,9 @@ import (
 
 	"github.com/ccfos/nightingale/v6/models"
 	"github.com/ccfos/nightingale/v6/pkg/ctx"
-	"github.com/ccfos/nightingale/v6/pkg/ginx"
 
 	"github.com/gin-gonic/gin"
+	"github.com/toolkits/pkg/ginx"
 )
 
 func checkAnnotationPermission(c *gin.Context, ctx *ctx.Context, dashboardId int64) {

center/router/router_datasource.go

@@ -1,23 +1,19 @@
 package router
 
 import (
-	"context"
 	"crypto/tls"
-	"encoding/base64"
 	"encoding/json"
 	"fmt"
 	"io"
 	"net/http"
 	"net/url"
 	"strings"
-	"time"
 
 	"github.com/ccfos/nightingale/v6/datasource/opensearch"
-	"github.com/ccfos/nightingale/v6/dskit/clickhouse"
 	"github.com/ccfos/nightingale/v6/models"
-	"github.com/ccfos/nightingale/v6/pkg/ginx"
+
 	"github.com/gin-gonic/gin"
-	"github.com/toolkits/pkg/i18n"
+	"github.com/toolkits/pkg/ginx"
 	"github.com/toolkits/pkg/logger"
 )
 
@@ -53,41 +49,9 @@ func (rt *Router) datasourceList(c *gin.Context) {
 func (rt *Router) datasourceGetsByService(c *gin.Context) {
 	typ := ginx.QueryStr(c, "typ", "")
 	lst, err := models.GetDatasourcesGetsBy(rt.Ctx, typ, "", "", "")
-
-	openRsa := rt.Center.RSA.OpenRSA
-	for _, item := range lst {
-		if err := item.Encrypt(openRsa, rt.HTTP.RSA.RSAPublicKey); err != nil {
-			logger.Errorf("datasource %+v encrypt failed: %v", item, err)
-			continue
-		}
-	}
 	ginx.NewRender(c).Data(lst, err)
 }
 
-func (rt *Router) datasourceRsaConfigGet(c *gin.Context) {
-	if rt.Center.RSA.OpenRSA {
-		publicKey := ""
-		privateKey := ""
-		if len(rt.HTTP.RSA.RSAPublicKey) > 0 {
-			publicKey = base64.StdEncoding.EncodeToString(rt.HTTP.RSA.RSAPublicKey)
-		}
-		if len(rt.HTTP.RSA.RSAPrivateKey) > 0 {
-			privateKey = base64.StdEncoding.EncodeToString(rt.HTTP.RSA.RSAPrivateKey)
-		}
-		logger.Debugf("OpenRSA=%v", rt.Center.RSA.OpenRSA)
-		ginx.NewRender(c).Data(models.RsaConfig{
-			OpenRSA:       rt.Center.RSA.OpenRSA,
-			RSAPublicKey:  publicKey,
-			RSAPrivateKey: privateKey,
-			RSAPassWord:   rt.HTTP.RSA.RSAPassWord,
-		}, nil)
-	} else {
-		ginx.NewRender(c).Data(models.RsaConfig{
-			OpenRSA: rt.Center.RSA.OpenRSA,
-		}, nil)
-	}
-}
-
 func (rt *Router) datasourceBriefs(c *gin.Context) {
 	var dss []*models.Datasource
 	list, err := models.GetDatasourcesGetsBy(rt.Ctx, "", "", "", "")
@@ -138,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
@@ -188,79 +152,6 @@ func (rt *Router) datasourceUpsert(c *gin.Context) {
 		}
 	}
 
-	if req.PluginType == models.CLICKHOUSE {
-		b, err := json.Marshal(req.SettingsJson)
-		if err != nil {
-			logger.Warningf("marshal clickhouse settings failed: %v", err)
-			Dangerous(c, err)
-			return
-		}
-
-		var ckConfig clickhouse.Clickhouse
-		err = json.Unmarshal(b, &ckConfig)
-		if err != nil {
-			logger.Warningf("unmarshal clickhouse settings failed: %v", err)
-			Dangerous(c, err)
-			return
-		}
-		// 检查ckconfig的nodes不应该以http://或https://开头
-		for _, addr := range ckConfig.Nodes {
-			if strings.HasPrefix(addr, "http://") || strings.HasPrefix(addr, "https://") {
-				err = fmt.Errorf("clickhouse node address should not start with http:// or https:// : %s", addr)
-				logger.Warningf("clickhouse node address invalid: %v", err)
-				Dangerous(c, err)
-				return
-			}
-		}
-
-		// InitCli 会自动检测并选择 HTTP 或 Native 协议
-		err = ckConfig.InitCli()
-		if err != nil {
-			logger.Warningf("clickhouse connection failed: %v", err)
-			Dangerous(c, err)
-			return
-		}
-
-		// 执行 SHOW DATABASES 测试连通性
-		_, err = ckConfig.ShowDatabases(context.Background())
-		if err != nil {
-			logger.Warningf("clickhouse test query failed: %v", err)
-			Dangerous(c, err)
-			return
-		}
-	}
-
-	if req.PluginType == models.ELASTICSEARCH {
-		skipAuto := false
-		// 若用户输入了version（version字符串存在且不为空），则不自动获取
-		if req.SettingsJson != nil {
-			if v, ok := req.SettingsJson["version"]; ok {
-				switch vv := v.(type) {
-				case string:
-					if strings.TrimSpace(vv) != "" {
-						skipAuto = true
-					}
-				default:
-					if strings.TrimSpace(fmt.Sprint(vv)) != "" {
-						skipAuto = true
-					}
-				}
-			}
-		}
-
-		if !skipAuto {
-			version, err := getElasticsearchVersion(req, 10*time.Second)
-			if err != nil {
-				logger.Warningf("failed to get elasticsearch version: %v", err)
-			} else {
-				if req.SettingsJson == nil {
-					req.SettingsJson = make(map[string]interface{})
-				}
-				req.SettingsJson["version"] = version
-			}
-		}
-	}
-
 	if req.Id == 0 {
 		req.CreatedBy = username
 		req.Status = "enabled"
@@ -276,13 +167,13 @@ func (rt *Router) datasourceUpsert(c *gin.Context) {
 		}
 		err = req.Add(rt.Ctx)
 	} else {
-		err = req.Update(rt.Ctx, "name", "identifier", "description", "cluster_name", "settings", "http", "auth", "updated_by", "updated_at", "is_default", "weight")
+		err = req.Update(rt.Ctx, "name", "identifier", "description", "cluster_name", "settings", "http", "auth", "updated_by", "updated_at", "is_default")
 	}
 
 	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")
@@ -293,15 +184,11 @@ func DatasourceCheck(c *gin.Context, ds models.Datasource) error {
 		}
 	}
 
-	// 使用 TLS 配置（支持 mTLS）
-	tlsConfig, err := ds.HTTPJson.TLS.TLSConfig()
-	if err != nil {
-		return fmt.Errorf("failed to create TLS config: %v", err)
-	}
-
 	client := &http.Client{
 		Transport: &http.Transport{
-			TLSClientConfig: tlsConfig,
+			TLSClientConfig: &tls.Config{
+				InsecureSkipVerify: ds.HTTPJson.TLS.SkipTlsVerify,
+			},
 		},
 	}
 
@@ -345,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)
 		}
 	}
@@ -370,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))
 	}
@@ -459,82 +338,3 @@ func (rt *Router) datasourceQuery(c *gin.Context) {
 	}
 	ginx.NewRender(c).Data(req, err)
 }
-
-// getElasticsearchVersion 该函数尝试从提供的Elasticsearch数据源中获取版本号，遍历所有URL，
-// 直到成功获取版本号或所有URL均尝试失败为止。
-func getElasticsearchVersion(ds models.Datasource, timeout time.Duration) (string, error) {
-	client := &http.Client{
-		Timeout: timeout,
-		Transport: &http.Transport{
-			TLSClientConfig: &tls.Config{
-				InsecureSkipVerify: ds.HTTPJson.TLS.SkipTlsVerify,
-			},
-		},
-	}
-
-	urls := make([]string, 0)
-	if len(ds.HTTPJson.Urls) > 0 {
-		urls = append(urls, ds.HTTPJson.Urls...)
-	}
-	if ds.HTTPJson.Url != "" {
-		urls = append(urls, ds.HTTPJson.Url)
-	}
-	if len(urls) == 0 {
-		return "", fmt.Errorf("no url provided")
-	}
-
-	var lastErr error
-	for _, raw := range urls {
-		baseURL := strings.TrimRight(raw, "/") + "/"
-		req, err := http.NewRequest("GET", baseURL, nil)
-		if err != nil {
-			lastErr = err
-			continue
-		}
-
-		if ds.AuthJson.BasicAuthUser != "" {
-			req.SetBasicAuth(ds.AuthJson.BasicAuthUser, ds.AuthJson.BasicAuthPassword)
-		}
-
-		for k, v := range ds.HTTPJson.Headers {
-			req.Header.Set(k, v)
-		}
-
-		resp, err := client.Do(req)
-		if err != nil {
-			lastErr = err
-			continue
-		}
-
-		body, err := io.ReadAll(resp.Body)
-		resp.Body.Close()
-		if err != nil {
-			lastErr = err
-			continue
-		}
-
-		if resp.StatusCode != 200 {
-			lastErr = fmt.Errorf("request to %s failed with status: %d body:%s", baseURL, resp.StatusCode, string(body))
-			continue
-		}
-
-		var result map[string]interface{}
-		if err := json.Unmarshal(body, &result); err != nil {
-			lastErr = err
-			continue
-		}
-
-		if version, ok := result["version"].(map[string]interface{}); ok {
-			if number, ok := version["number"].(string); ok && number != "" {
-				return number, nil
-			}
-		}
-
-		lastErr = fmt.Errorf("version not found in response from %s", baseURL)
-	}
-
-	if lastErr != nil {
-		return "", lastErr
-	}
-	return "", fmt.Errorf("failed to get elasticsearch version")
-}

center/router/router_datasource_db.go

@@ -6,10 +6,10 @@ import (
 	"github.com/ccfos/nightingale/v6/dscache"
 	"github.com/ccfos/nightingale/v6/dskit/types"
 	"github.com/ccfos/nightingale/v6/models"
-	"github.com/ccfos/nightingale/v6/pkg/ginx"
-	"github.com/ccfos/nightingale/v6/pkg/logx"
 
 	"github.com/gin-gonic/gin"
+	"github.com/toolkits/pkg/ginx"
+	"github.com/toolkits/pkg/logger"
 )
 
 func (rt *Router) ShowDatabases(c *gin.Context) {
@@ -18,7 +18,7 @@ func (rt *Router) ShowDatabases(c *gin.Context) {
 
 	plug, exists := dscache.DsCache.Get(f.Cate, f.DatasourceId)
 	if !exists {
-		logx.Warningf(c.Request.Context(), "cluster:%d not exists", f.DatasourceId)
+		logger.Warningf("cluster:%d not exists", f.DatasourceId)
 		ginx.Bomb(200, "cluster not exists")
 	}
 
@@ -48,7 +48,7 @@ func (rt *Router) ShowTables(c *gin.Context) {
 
 	plug, exists := dscache.DsCache.Get(f.Cate, f.DatasourceId)
 	if !exists {
-		logx.Warningf(c.Request.Context(), "cluster:%d not exists", f.DatasourceId)
+		logger.Warningf("cluster:%d not exists", f.DatasourceId)
 		ginx.Bomb(200, "cluster not exists")
 	}
 
@@ -60,8 +60,8 @@ func (rt *Router) ShowTables(c *gin.Context) {
 	}
 	switch plug.(type) {
 	case TableShower:
-		if len(f.Queries) > 0 {
-			database, ok := f.Queries[0].(string)
+		if len(f.Querys) > 0 {
+			database, ok := f.Querys[0].(string)
 			if ok {
 				tables, err = plug.(TableShower).ShowTables(c.Request.Context(), database)
 			}
@@ -78,7 +78,7 @@ func (rt *Router) DescribeTable(c *gin.Context) {
 
 	plug, exists := dscache.DsCache.Get(f.Cate, f.DatasourceId)
 	if !exists {
-		logx.Warningf(c.Request.Context(), "cluster:%d not exists", f.DatasourceId)
+		logger.Warningf("cluster:%d not exists", f.DatasourceId)
 		ginx.Bomb(200, "cluster not exists")
 	}
 	// 只接受一个入参
@@ -90,8 +90,8 @@ func (rt *Router) DescribeTable(c *gin.Context) {
 	switch plug.(type) {
 	case TableDescriber:
 		client := plug.(TableDescriber)
-		if len(f.Queries) > 0 {
-			columns, err = client.DescribeTable(c.Request.Context(), f.Queries[0])
+		if len(f.Querys) > 0 {
+			columns, err = client.DescribeTable(c.Request.Context(), f.Querys[0])
 		}
 	default:
 		ginx.Bomb(200, "datasource not exists")

center/router/router_embedded.go

@@ -5,15 +5,14 @@ import (
 
 	"github.com/ccfos/nightingale/v6/models"
 	"github.com/ccfos/nightingale/v6/pkg/ctx"
-	"github.com/ccfos/nightingale/v6/pkg/ginx"
 
 	"github.com/gin-gonic/gin"
+	"github.com/toolkits/pkg/ginx"
 )
 
 func (rt *Router) embeddedProductGets(c *gin.Context) {
 	products, err := models.EmbeddedProductGets(rt.Ctx)
 	ginx.Dangerous(err)
-	models.FillUpdateByNicknames(rt.Ctx, products)
 	// 获取当前用户可访问的Group ID 列表
 	me := c.MustGet("user").(*models.User)
 

center/router/router_es.go

@@ -3,10 +3,10 @@ package router
 import (
 	"github.com/ccfos/nightingale/v6/datasource/es"
 	"github.com/ccfos/nightingale/v6/dscache"
-	"github.com/ccfos/nightingale/v6/pkg/ginx"
-	"github.com/ccfos/nightingale/v6/pkg/logx"
 
 	"github.com/gin-gonic/gin"
+	"github.com/toolkits/pkg/ginx"
+	"github.com/toolkits/pkg/logger"
 )
 
 type IndexReq struct {
@@ -34,7 +34,7 @@ func (rt *Router) QueryIndices(c *gin.Context) {
 
 	plug, exists := dscache.DsCache.Get(f.Cate, f.DatasourceId)
 	if !exists {
-		logx.Warningf(c.Request.Context(), "cluster:%d not exists", f.DatasourceId)
+		logger.Warningf("cluster:%d not exists", f.DatasourceId)
 		ginx.Bomb(200, "cluster not exists")
 	}
 
@@ -50,7 +50,7 @@ func (rt *Router) QueryFields(c *gin.Context) {
 
 	plug, exists := dscache.DsCache.Get(f.Cate, f.DatasourceId)
 	if !exists {
-		logx.Warningf(c.Request.Context(), "cluster:%d not exists", f.DatasourceId)
+		logger.Warningf("cluster:%d not exists", f.DatasourceId)
 		ginx.Bomb(200, "cluster not exists")
 	}
 
@@ -66,7 +66,7 @@ func (rt *Router) QueryESVariable(c *gin.Context) {
 
 	plug, exists := dscache.DsCache.Get(f.Cate, f.DatasourceId)
 	if !exists {
-		logx.Warningf(c.Request.Context(), "cluster:%d not exists", f.DatasourceId)
+		logger.Warningf("cluster:%d not exists", f.DatasourceId)
 		ginx.Bomb(200, "cluster not exists")
 	}
 

center/router/router_es_index_pattern.go

@@ -5,8 +5,8 @@ import (
 	"time"
 
 	"github.com/ccfos/nightingale/v6/models"
-	"github.com/ccfos/nightingale/v6/pkg/ginx"
 	"github.com/gin-gonic/gin"
+	"github.com/toolkits/pkg/ginx"
 )
 
 // 创建 ES Index Pattern
@@ -69,10 +69,6 @@ func (rt *Router) esIndexPatternGetList(c *gin.Context) {
 		lst, err = models.EsIndexPatternGets(rt.Ctx, "")
 	}
 
-	if err == nil {
-		models.FillUpdateByNicknames(rt.Ctx, lst)
-	}
-
 	ginx.NewRender(c).Data(lst, err)
 }
 

center/router/router_event_detail.go

@@ -1,149 +0,0 @@
-package router
-
-import (
-	"encoding/json"
-	"fmt"
-	"io"
-	"net/http"
-	"strconv"
-	"time"
-
-	"github.com/ccfos/nightingale/v6/alert/naming"
-	"github.com/ccfos/nightingale/v6/models"
-	"github.com/ccfos/nightingale/v6/pkg/loggrep"
-	"github.com/ccfos/nightingale/v6/pkg/ginx"
-
-	"github.com/gin-gonic/gin"
-)
-
-// eventDetailPage renders an HTML log viewer page (for pages group).
-func (rt *Router) eventDetailPage(c *gin.Context) {
-	hash := ginx.UrlParamStr(c, "hash")
-	if !loggrep.IsValidHash(hash) {
-		c.String(http.StatusBadRequest, "invalid hash format")
-		return
-	}
-
-	logs, instance, err := rt.getEventLogs(hash)
-	if err != nil {
-		c.String(http.StatusInternalServerError, "Error: %v", err)
-		return
-	}
-
-	c.Header("Content-Type", "text/html; charset=utf-8")
-	err = loggrep.RenderHTML(c.Writer, loggrep.PageData{
-		Hash:     hash,
-		Instance: instance,
-		Logs:     logs,
-		Total:    len(logs),
-	})
-	if err != nil {
-		c.String(http.StatusInternalServerError, "render error: %v", err)
-	}
-}
-
-// eventDetailJSON returns JSON (for service group).
-func (rt *Router) eventDetailJSON(c *gin.Context) {
-	hash := ginx.UrlParamStr(c, "hash")
-	if !loggrep.IsValidHash(hash) {
-		ginx.Bomb(200, "invalid hash format")
-	}
-
-	logs, instance, err := rt.getEventLogs(hash)
-	ginx.Dangerous(err)
-
-	ginx.NewRender(c).Data(loggrep.EventDetailResp{
-		Logs:     logs,
-		Instance: instance,
-	}, nil)
-}
-
-// getNodeForDatasource returns the alert engine instance responsible for the given
-// datasource and primary key. It first checks the local hashring, and falls back
-// to querying the database for active instances if the hashring is empty
-// (e.g. when the datasource belongs to another engine cluster).
-func (rt *Router) getNodeForDatasource(datasourceId int64, pk string) (string, error) {
-	dsIdStr := strconv.FormatInt(datasourceId, 10)
-	node, err := naming.DatasourceHashRing.GetNode(dsIdStr, pk)
-	if err == nil {
-		return node, nil
-	}
-
-	// Hashring is empty for this datasource (likely belongs to another engine cluster).
-	// Query the DB for active instances.
-	servers, dbErr := models.AlertingEngineGetsInstances(rt.Ctx,
-		"datasource_id = ? and clock > ?",
-		datasourceId, time.Now().Unix()-30)
-	if dbErr != nil {
-		return "", dbErr
-	}
-	if len(servers) == 0 {
-		return "", fmt.Errorf("no active instances for datasource %d", datasourceId)
-	}
-
-	ring := naming.NewConsistentHashRing(int32(naming.NodeReplicas), servers)
-	return ring.Get(pk)
-}
-
-// getEventLogs resolves the target instance and retrieves logs.
-func (rt *Router) getEventLogs(hash string) ([]string, string, error) {
-	event, err := models.AlertHisEventGetByHash(rt.Ctx, hash)
-	if err != nil {
-		return nil, "", err
-	}
-	if event == nil {
-		return nil, "", fmt.Errorf("no such alert event")
-	}
-
-	ruleId := strconv.FormatInt(event.RuleId, 10)
-
-	instance := fmt.Sprintf("%s:%d", rt.Alert.Heartbeat.IP, rt.HTTP.Port)
-
-	node, err := rt.getNodeForDatasource(event.DatasourceId, ruleId)
-	if err != nil || node == instance {
-		// hashring not ready or target is self, handle locally
-		logs, err := loggrep.GrepLogDir(rt.LogDir, hash)
-		return logs, instance, err
-	}
-
-	// forward to the target alert instance
-	return rt.forwardEventDetail(node, hash)
-}
-
-func (rt *Router) forwardEventDetail(node, hash string) ([]string, string, error) {
-	url := fmt.Sprintf("http://%s/v1/n9e/event-detail/%s", node, hash)
-	req, err := http.NewRequest("GET", url, nil)
-	if err != nil {
-		return nil, node, err
-	}
-
-	for user, pass := range rt.HTTP.APIForService.BasicAuth {
-		req.SetBasicAuth(user, pass)
-		break
-	}
-
-	client := &http.Client{Timeout: 15 * time.Second}
-	resp, err := client.Do(req)
-	if err != nil {
-		return nil, node, fmt.Errorf("forward to %s failed: %v", node, err)
-	}
-	defer resp.Body.Close()
-
-	body, err := io.ReadAll(io.LimitReader(resp.Body, 10*1024*1024)) // 10MB limit
-	if err != nil {
-		return nil, node, err
-	}
-
-	var result struct {
-		Dat loggrep.EventDetailResp `json:"dat"`
-		Err string                  `json:"err"`
-	}
-	if err := json.Unmarshal(body, &result); err != nil {
-		return nil, node, err
-	}
-	if result.Err != "" {
-		return nil, node, fmt.Errorf("%s", result.Err)
-	}
-
-	return result.Dat.Logs, result.Dat.Instance, nil
-}

center/router/router_event_pipeline.go

@@ -1,19 +1,13 @@
 package router
 
 import (
-	"encoding/json"
-	"fmt"
 	"net/http"
 	"time"
 
-	"github.com/ccfos/nightingale/v6/alert/pipeline/engine"
 	"github.com/ccfos/nightingale/v6/models"
-	"github.com/ccfos/nightingale/v6/pkg/ginx"
 
 	"github.com/gin-gonic/gin"
-	"github.com/google/uuid"
-	"github.com/toolkits/pkg/i18n"
-	"github.com/toolkits/pkg/logger"
+	"github.com/toolkits/pkg/ginx"
 )
 
 // 获取事件Pipeline列表
@@ -32,38 +26,18 @@ func (rt *Router) eventPipelinesList(c *gin.Context) {
 		for _, tid := range pipeline.TeamIds {
 			pipeline.TeamNames = append(pipeline.TeamNames, ugMap[tid])
 		}
-		// 兼容处理：自动填充工作流字段
-		pipeline.FillWorkflowFields()
 	}
-	models.FillUpdateByNicknames(rt.Ctx, pipelines)
 
 	gids, err := models.MyGroupIdsMap(rt.Ctx, me.Id)
 	ginx.Dangerous(err)
 
 	if me.IsAdmin() {
-		for _, pipeline := range pipelines {
-			if pipeline.TriggerMode == "" {
-				pipeline.TriggerMode = models.TriggerModeEvent
-			}
-
-			if pipeline.UseCase == "" {
-				pipeline.UseCase = models.UseCaseEventPipeline
-			}
-		}
 		ginx.NewRender(c).Data(pipelines, nil)
 		return
 	}
 
 	res := make([]*models.EventPipeline, 0)
 	for _, pipeline := range pipelines {
-		if pipeline.TriggerMode == "" {
-			pipeline.TriggerMode = models.TriggerModeEvent
-		}
-
-		if pipeline.UseCase == "" {
-			pipeline.UseCase = models.UseCaseEventPipeline
-		}
-
 		for _, tid := range pipeline.TeamIds {
 			if _, ok := gids[tid]; ok {
 				res = append(res, pipeline)
@@ -86,15 +60,6 @@ func (rt *Router) getEventPipeline(c *gin.Context) {
 	err = pipeline.FillTeamNames(rt.Ctx)
 	ginx.Dangerous(err)
 
-	// 兼容处理：自动填充工作流字段
-	pipeline.FillWorkflowFields()
-	if pipeline.TriggerMode == "" {
-		pipeline.TriggerMode = models.TriggerModeEvent
-	}
-	if pipeline.UseCase == "" {
-		pipeline.UseCase = models.UseCaseEventPipeline
-	}
-
 	ginx.NewRender(c).Data(pipeline, nil)
 }
 
@@ -165,9 +130,7 @@ func (rt *Router) tryRunEventPipeline(c *gin.Context) {
 	var f struct {
 		EventId        int64                `json:"event_id"`
 		PipelineConfig models.EventPipeline `json:"pipeline_config"`
-		InputVariables map[string]string    `json:"input_variables,omitempty"`
 	}
-
 	ginx.BindJSON(c, &f)
 
 	hisEvent, err := models.AlertHisEventGetById(rt.Ctx, f.EventId)
@@ -176,34 +139,29 @@ func (rt *Router) tryRunEventPipeline(c *gin.Context) {
 	}
 	event := hisEvent.ToCur()
 
-	lang := c.GetHeader("X-Language")
-	me := c.MustGet("user").(*models.User)
+	for _, p := range f.PipelineConfig.ProcessorConfigs {
+		processor, err := models.GetProcessorByType(p.Typ, p.Config)
+		if err != nil {
+			ginx.Bomb(http.StatusBadRequest, "get processor: %+v err: %+v", p, err)
+		}
+		event, _, err = processor.Process(rt.Ctx, event)
+		if err != nil {
+			ginx.Bomb(http.StatusBadRequest, "processor: %+v err: %+v", p, err)
+		}
 
-	// 统一使用工作流引擎执行（兼容线性模式和工作流模式）
-	workflowEngine := engine.NewWorkflowEngine(rt.Ctx)
-
-	triggerCtx := &models.WorkflowTriggerContext{
-		Mode:            models.TriggerModeAPI,
-		TriggerBy:       me.Username,
-		InputsOverrides: f.InputVariables,
-	}
-
-	resultEvent, result, err := workflowEngine.Execute(&f.PipelineConfig, event, triggerCtx)
-	if err != nil {
-		ginx.Bomb(http.StatusBadRequest, "pipeline execute error: %v", err)
+		if event == nil {
+			ginx.NewRender(c).Data(map[string]interface{}{
+				"event":  event,
+				"result": "event is dropped",
+			}, nil)
+			return
+		}
 	}
 
 	m := map[string]interface{}{
-		"event":        resultEvent,
-		"result":       i18n.Sprintf(lang, result.Message),
-		"status":       result.Status,
-		"node_results": result.NodeResults,
+		"event":  event,
+		"result": "",
 	}
-
-	if resultEvent == nil {
-		m["result"] = i18n.Sprintf(lang, "event is dropped")
-	}
-
 	ginx.NewRender(c).Data(m, nil)
 }
 
@@ -225,19 +183,14 @@ func (rt *Router) tryRunEventProcessor(c *gin.Context) {
 	if err != nil {
 		ginx.Bomb(200, "get processor err: %+v", err)
 	}
-	wfCtx := &models.WorkflowContext{
-		Event: event,
-		Vars:  make(map[string]interface{}),
-	}
-	wfCtx, res, err := processor.Process(rt.Ctx, wfCtx)
+	event, res, err := processor.Process(rt.Ctx, event)
 	if err != nil {
 		ginx.Bomb(200, "processor err: %+v", err)
 	}
 
-	lang := c.GetHeader("X-Language")
 	ginx.NewRender(c).Data(map[string]interface{}{
-		"event":  wfCtx.Event,
-		"result": i18n.Sprintf(lang, res),
+		"event":  event,
+		"result": res,
 	}, nil)
 }
 
@@ -266,10 +219,6 @@ func (rt *Router) tryRunEventProcessorByNotifyRule(c *gin.Context) {
 		ginx.Bomb(http.StatusBadRequest, "processors not found")
 	}
 
-	wfCtx := &models.WorkflowContext{
-		Event: event,
-		Vars:  make(map[string]interface{}),
-	}
 	for _, pl := range pipelines {
 		for _, p := range pl.ProcessorConfigs {
 			processor, err := models.GetProcessorByType(p.Typ, p.Config)
@@ -277,363 +226,24 @@ func (rt *Router) tryRunEventProcessorByNotifyRule(c *gin.Context) {
 				ginx.Bomb(http.StatusBadRequest, "get processor: %+v err: %+v", p, err)
 			}
 
-			wfCtx, _, err = processor.Process(rt.Ctx, wfCtx)
+			event, _, err := processor.Process(rt.Ctx, event)
 			if err != nil {
 				ginx.Bomb(http.StatusBadRequest, "processor: %+v err: %+v", p, err)
 			}
-			if wfCtx == nil || wfCtx.Event == nil {
-				lang := c.GetHeader("X-Language")
+			if event == nil {
 				ginx.NewRender(c).Data(map[string]interface{}{
-					"event":  nil,
-					"result": i18n.Sprintf(lang, "event is dropped"),
+					"event":  event,
+					"result": "event is dropped",
 				}, nil)
 				return
 			}
 		}
 	}
 
-	ginx.NewRender(c).Data(wfCtx.Event, nil)
+	ginx.NewRender(c).Data(event, nil)
 }
 
 func (rt *Router) eventPipelinesListByService(c *gin.Context) {
 	pipelines, err := models.ListEventPipelines(rt.Ctx)
 	ginx.NewRender(c).Data(pipelines, err)
 }
-
-type EventPipelineRequest struct {
-	// 事件数据（可选，如果不传则使用空事件）
-	Event *models.AlertCurEvent `json:"event,omitempty"`
-	// 输入参数覆盖
-	InputsOverrides map[string]string `json:"inputs_overrides,omitempty"`
-
-	Username string `json:"username,omitempty"`
-}
-
-// executePipelineTrigger 执行 Pipeline 触发的公共逻辑
-func (rt *Router) executePipelineTrigger(pipeline *models.EventPipeline, req *EventPipelineRequest, triggerBy string) (string, error) {
-	// 准备事件数据
-	var event *models.AlertCurEvent
-	if req.Event != nil {
-		event = req.Event
-	} else {
-		// 创建空事件
-		event = &models.AlertCurEvent{
-			TriggerTime: time.Now().Unix(),
-		}
-	}
-
-	// 生成执行ID
-	executionID := uuid.New().String()
-
-	// 创建触发上下文
-	triggerCtx := &models.WorkflowTriggerContext{
-		Mode:            models.TriggerModeAPI,
-		TriggerBy:       triggerBy,
-		InputsOverrides: req.InputsOverrides,
-		RequestID:       executionID,
-	}
-
-	// 异步执行工作流
-	go func() {
-		workflowEngine := engine.NewWorkflowEngine(rt.Ctx)
-		_, _, err := workflowEngine.Execute(pipeline, event, triggerCtx)
-		if err != nil {
-			logger.Errorf("async workflow execute error: pipeline_id=%d execution_id=%s err=%v",
-				pipeline.ID, executionID, err)
-		}
-	}()
-
-	return executionID, nil
-}
-
-// triggerEventPipelineByService Service 调用触发工作流执行
-func (rt *Router) triggerEventPipelineByService(c *gin.Context) {
-	pipelineID := ginx.UrlParamInt64(c, "id")
-	var f EventPipelineRequest
-	ginx.BindJSON(c, &f)
-
-	// 获取 Pipeline
-	pipeline, err := models.GetEventPipeline(rt.Ctx, pipelineID)
-	if err != nil {
-		ginx.Bomb(http.StatusNotFound, "pipeline not found: %v", err)
-	}
-
-	executionID, err := rt.executePipelineTrigger(pipeline, &f, f.Username)
-	if err != nil {
-		ginx.Bomb(http.StatusBadRequest, "%v", err)
-	}
-
-	ginx.NewRender(c).Data(gin.H{
-		"execution_id": executionID,
-		"message":      "workflow execution started",
-	}, nil)
-}
-
-// triggerEventPipelineByAPI API 触发工作流执行
-func (rt *Router) triggerEventPipelineByAPI(c *gin.Context) {
-	pipelineID := ginx.UrlParamInt64(c, "id")
-	var f EventPipelineRequest
-	ginx.BindJSON(c, &f)
-
-	// 获取 Pipeline
-	pipeline, err := models.GetEventPipeline(rt.Ctx, pipelineID)
-	if err != nil {
-		ginx.Bomb(http.StatusNotFound, "pipeline not found: %v", err)
-	}
-
-	// 检查权限
-	me := c.MustGet("user").(*models.User)
-	ginx.Dangerous(me.CheckGroupPermission(rt.Ctx, pipeline.TeamIds))
-
-	executionID, err := rt.executePipelineTrigger(pipeline, &f, me.Username)
-	if err != nil {
-		ginx.Bomb(http.StatusBadRequest, err.Error())
-	}
-
-	ginx.NewRender(c).Data(gin.H{
-		"execution_id": executionID,
-		"message":      "workflow execution started",
-	}, nil)
-}
-
-func (rt *Router) listAllEventPipelineExecutions(c *gin.Context) {
-	pipelineId := ginx.QueryInt64(c, "pipeline_id", 0)
-	pipelineName := ginx.QueryStr(c, "pipeline_name", "")
-	mode := ginx.QueryStr(c, "mode", "")
-	status := ginx.QueryStr(c, "status", "")
-	limit := ginx.QueryInt(c, "limit", 20)
-	offset := ginx.QueryInt(c, "p", 1)
-
-	if limit <= 0 || limit > 1000 {
-		limit = 20
-	}
-	if offset <= 0 {
-		offset = 1
-	}
-
-	executions, total, err := models.ListAllEventPipelineExecutions(rt.Ctx, pipelineId, pipelineName, mode, status, limit, (offset-1)*limit)
-	ginx.Dangerous(err)
-
-	ginx.NewRender(c).Data(gin.H{
-		"list":  executions,
-		"total": total,
-	}, nil)
-}
-
-func (rt *Router) listEventPipelineExecutions(c *gin.Context) {
-	pipelineID := ginx.UrlParamInt64(c, "id")
-	mode := ginx.QueryStr(c, "mode", "")
-	status := ginx.QueryStr(c, "status", "")
-	limit := ginx.QueryInt(c, "limit", 20)
-	offset := ginx.QueryInt(c, "p", 1)
-
-	if limit <= 0 || limit > 1000 {
-		limit = 20
-	}
-	if offset <= 0 {
-		offset = 1
-	}
-
-	executions, total, err := models.ListEventPipelineExecutions(rt.Ctx, pipelineID, mode, status, limit, (offset-1)*limit)
-	ginx.Dangerous(err)
-
-	ginx.NewRender(c).Data(gin.H{
-		"list":  executions,
-		"total": total,
-	}, nil)
-}
-
-func (rt *Router) getEventPipelineExecution(c *gin.Context) {
-	execID := ginx.UrlParamStr(c, "exec_id")
-
-	detail, err := models.GetEventPipelineExecutionDetail(rt.Ctx, execID)
-	if err != nil {
-		ginx.Bomb(http.StatusNotFound, "execution not found: %v", err)
-	}
-
-	ginx.NewRender(c).Data(detail, nil)
-}
-
-func (rt *Router) getEventPipelineExecutionStats(c *gin.Context) {
-	pipelineID := ginx.UrlParamInt64(c, "id")
-
-	stats, err := models.GetEventPipelineExecutionStatistics(rt.Ctx, pipelineID)
-	ginx.Dangerous(err)
-
-	ginx.NewRender(c).Data(stats, nil)
-}
-
-func (rt *Router) cleanEventPipelineExecutions(c *gin.Context) {
-	var f struct {
-		BeforeDays int `json:"before_days"`
-	}
-	ginx.BindJSON(c, &f)
-
-	if f.BeforeDays <= 0 {
-		f.BeforeDays = 30
-	}
-
-	beforeTime := time.Now().AddDate(0, 0, -f.BeforeDays).Unix()
-	affected, err := models.DeleteEventPipelineExecutions(rt.Ctx, beforeTime)
-	ginx.Dangerous(err)
-
-	ginx.NewRender(c).Data(gin.H{
-		"deleted": affected,
-	}, nil)
-}
-
-func (rt *Router) streamEventPipeline(c *gin.Context) {
-	pipelineID := ginx.UrlParamInt64(c, "id")
-
-	var f EventPipelineRequest
-	ginx.BindJSON(c, &f)
-
-	pipeline, err := models.GetEventPipeline(rt.Ctx, pipelineID)
-	if err != nil {
-		ginx.Bomb(http.StatusNotFound, "pipeline not found: %v", err)
-	}
-
-	me := c.MustGet("user").(*models.User)
-	ginx.Dangerous(me.CheckGroupPermission(rt.Ctx, pipeline.TeamIds))
-
-	var event *models.AlertCurEvent
-	if f.Event != nil {
-		event = f.Event
-	} else {
-		event = &models.AlertCurEvent{
-			TriggerTime: time.Now().Unix(),
-		}
-	}
-
-	triggerCtx := &models.WorkflowTriggerContext{
-		Mode:            models.TriggerModeAPI,
-		TriggerBy:       me.Username,
-		InputsOverrides: f.InputsOverrides,
-		RequestID:       uuid.New().String(),
-		Stream:          true, // 流式端点强制启用流式输出
-	}
-
-	workflowEngine := engine.NewWorkflowEngine(rt.Ctx)
-	_, result, err := workflowEngine.Execute(pipeline, event, triggerCtx)
-	if err != nil {
-		ginx.Bomb(http.StatusInternalServerError, "execute failed: %v", err)
-	}
-
-	if result.Stream && result.StreamChan != nil {
-		rt.handleStreamResponse(c, result, triggerCtx.RequestID)
-		return
-	}
-
-	ginx.NewRender(c).Data(result, nil)
-}
-
-func (rt *Router) handleStreamResponse(c *gin.Context, result *models.WorkflowResult, requestID string) {
-	// 设置 SSE 响应头
-	c.Header("Content-Type", "text/event-stream")
-	c.Header("Cache-Control", "no-cache")
-	c.Header("Connection", "keep-alive")
-	c.Header("X-Accel-Buffering", "no") // 禁用 nginx 缓冲
-	c.Header("X-Request-ID", requestID)
-
-	flusher, ok := c.Writer.(http.Flusher)
-	if !ok {
-		ginx.Bomb(http.StatusInternalServerError, "streaming not supported")
-		return
-	}
-
-	// 发送初始连接成功消息
-	initData := fmt.Sprintf(`{"type":"connected","request_id":"%s","timestamp":%d}`, requestID, time.Now().UnixMilli())
-	fmt.Fprintf(c.Writer, "data: %s\n\n", initData)
-	flusher.Flush()
-
-	// 从 channel 读取并发送 SSE
-	timeout := time.After(30 * time.Minute) // 最长流式输出时间
-	for {
-		select {
-		case chunk, ok := <-result.StreamChan:
-			if !ok {
-				// channel 关闭，发送结束标记
-				return
-			}
-
-			data, err := json.Marshal(chunk)
-			if err != nil {
-				logger.Errorf("stream: failed to marshal chunk: %v", err)
-				continue
-			}
-
-			fmt.Fprintf(c.Writer, "data: %s\n\n", data)
-			flusher.Flush()
-
-			if chunk.Done {
-				return
-			}
-
-		case <-c.Request.Context().Done():
-			// 客户端断开连接
-			logger.Infof("stream: client disconnected, request_id=%s", requestID)
-			return
-		case <-timeout:
-			logger.Errorf("stream: timeout, request_id=%s", requestID)
-			return
-		}
-	}
-}
-
-func (rt *Router) streamEventPipelineByService(c *gin.Context) {
-	pipelineID := ginx.UrlParamInt64(c, "id")
-
-	var f EventPipelineRequest
-	ginx.BindJSON(c, &f)
-
-	pipeline, err := models.GetEventPipeline(rt.Ctx, pipelineID)
-	if err != nil {
-		ginx.Bomb(http.StatusNotFound, "pipeline not found: %v", err)
-	}
-
-	var event *models.AlertCurEvent
-	if f.Event != nil {
-		event = f.Event
-	} else {
-		event = &models.AlertCurEvent{
-			TriggerTime: time.Now().Unix(),
-		}
-	}
-
-	triggerCtx := &models.WorkflowTriggerContext{
-		Mode:            models.TriggerModeAPI,
-		TriggerBy:       f.Username,
-		InputsOverrides: f.InputsOverrides,
-		RequestID:       uuid.New().String(),
-		Stream:          true, // 流式端点强制启用流式输出
-	}
-
-	workflowEngine := engine.NewWorkflowEngine(rt.Ctx)
-	_, result, err := workflowEngine.Execute(pipeline, event, triggerCtx)
-	if err != nil {
-		ginx.Bomb(http.StatusInternalServerError, "execute failed: %v", err)
-	}
-
-	// 检查是否是流式输出
-	if result.Stream && result.StreamChan != nil {
-		rt.handleStreamResponse(c, result, triggerCtx.RequestID)
-		return
-	}
-
-	ginx.NewRender(c).Data(result, nil)
-}
-
-// eventPipelineExecutionAdd 接收 edge 节点同步的 Pipeline 执行记录
-func (rt *Router) eventPipelineExecutionAdd(c *gin.Context) {
-	var execution models.EventPipelineExecution
-	ginx.BindJSON(c, &execution)
-
-	if execution.ID == "" {
-		ginx.Bomb(http.StatusBadRequest, "id is required")
-	}
-	if execution.PipelineID <= 0 {
-		ginx.Bomb(http.StatusBadRequest, "pipeline_id is required")
-	}
-
-	ginx.NewRender(c).Message(models.DB(rt.Ctx).Create(&execution).Error)
-}

center/router/router_funcs.go

@@ -7,9 +7,9 @@ import (
 
 	"github.com/ccfos/nightingale/v6/models"
 	"github.com/ccfos/nightingale/v6/pkg/ctx"
-	"github.com/ccfos/nightingale/v6/pkg/ginx"
 
 	"github.com/gin-gonic/gin"
+	"github.com/toolkits/pkg/ginx"
 )
 
 const defaultLimit = 300
@@ -128,12 +128,6 @@ func UserGroup(ctx *ctx.Context, id int64) *models.UserGroup {
 		ginx.Bomb(http.StatusNotFound, "No such UserGroup")
 	}
 
-	bgids, err := models.BusiGroupIds(ctx, []int64{id})
-	ginx.Dangerous(err)
-
-	obj.BusiGroups, err = models.BusiGroupGetByIds(ctx, bgids)
-	ginx.Dangerous(err)
-
 	return obj
 }
 

center/router/router_heartbeat.go

@@ -15,9 +15,9 @@ import (
 	"github.com/ccfos/nightingale/v6/models"
 	"github.com/ccfos/nightingale/v6/pkg/ctx"
 	"github.com/ccfos/nightingale/v6/pushgw/idents"
-	"github.com/ccfos/nightingale/v6/pkg/ginx"
 
 	"github.com/gin-gonic/gin"
+	"github.com/toolkits/pkg/ginx"
 	"github.com/toolkits/pkg/logger"
 )
 

center/router/router_login.go

@@ -2,29 +2,23 @@ package router
 
 import (
 	"encoding/base64"
-	"encoding/json"
 	"fmt"
 	"net/http"
 	"strconv"
 	"strings"
-	"time"
 
 	"github.com/ccfos/nightingale/v6/models"
 	"github.com/ccfos/nightingale/v6/pkg/cas"
-	"github.com/ccfos/nightingale/v6/pkg/dingtalk"
-	"github.com/ccfos/nightingale/v6/pkg/feishu"
 	"github.com/ccfos/nightingale/v6/pkg/ldapx"
-	"github.com/ccfos/nightingale/v6/pkg/logx"
 	"github.com/ccfos/nightingale/v6/pkg/oauth2x"
 	"github.com/ccfos/nightingale/v6/pkg/oidcx"
 	"github.com/ccfos/nightingale/v6/pkg/secu"
-	"github.com/ccfos/nightingale/v6/pkg/ginx"
 
 	"github.com/dgrijalva/jwt-go"
 	"github.com/gin-gonic/gin"
 	"github.com/pelletier/go-toml/v2"
-	"github.com/pkg/errors"
-	"gorm.io/gorm"
+	"github.com/toolkits/pkg/ginx"
+	"github.com/toolkits/pkg/logger"
 )
 
 type loginForm struct {
@@ -37,9 +31,7 @@ type loginForm struct {
 func (rt *Router) loginPost(c *gin.Context) {
 	var f loginForm
 	ginx.BindJSON(c, &f)
-
-	rctx := c.Request.Context()
-	logx.Infof(rctx, "username:%s login from:%s", f.Username, c.ClientIP())
+	logger.Infof("username:%s login from:%s", f.Username, c.ClientIP())
 
 	if rt.HTTP.ShowCaptcha.Enable {
 		if !CaptchaVerify(f.Captchaid, f.Verifyvalue) {
@@ -52,25 +44,23 @@ func (rt *Router) loginPost(c *gin.Context) {
 	if rt.HTTP.RSA.OpenRSA {
 		decPassWord, err := secu.Decrypt(f.Password, rt.HTTP.RSA.RSAPrivateKey, rt.HTTP.RSA.RSAPassWord)
 		if err != nil {
-			logx.Errorf(rctx, "RSA Decrypt failed: %v username: %s", err, f.Username)
+			logger.Errorf("RSA Decrypt failed: %v username: %s", err, f.Username)
 			ginx.NewRender(c).Message(err)
 			return
 		}
 		authPassWord = decPassWord
 	}
 
-	reqCtx := rt.Ctx.WithContext(rctx)
-
 	var user *models.User
 	var err error
 	lc := rt.Sso.LDAP.Copy()
 	if lc.Enable {
-		user, err = ldapx.LdapLogin(reqCtx, f.Username, authPassWord, lc.DefaultRoles, lc.DefaultTeams, lc)
+		user, err = ldapx.LdapLogin(rt.Ctx, f.Username, authPassWord, lc.DefaultRoles, lc.DefaultTeams, lc)
 		if err != nil {
-			logx.Debugf(rctx, "ldap login failed: %v username: %s", err, f.Username)
+			logger.Debugf("ldap login failed: %v username: %s", err, f.Username)
 			var errLoginInN9e error
 			// to use n9e as the minimum guarantee for login
-			if user, errLoginInN9e = models.PassLogin(reqCtx, rt.Redis, f.Username, authPassWord); errLoginInN9e != nil {
+			if user, errLoginInN9e = models.PassLogin(rt.Ctx, rt.Redis, f.Username, authPassWord); errLoginInN9e != nil {
 				ginx.NewRender(c).Message("ldap login failed: %v; n9e login failed: %v", err, errLoginInN9e)
 				return
 			}
@@ -78,7 +68,7 @@ func (rt *Router) loginPost(c *gin.Context) {
 			user.RolesLst = strings.Fields(user.Roles)
 		}
 	} else {
-		user, err = models.PassLogin(reqCtx, rt.Redis, f.Username, authPassWord)
+		user, err = models.PassLogin(rt.Ctx, rt.Redis, f.Username, authPassWord)
 		ginx.Dangerous(err)
 	}
 
@@ -102,8 +92,7 @@ func (rt *Router) loginPost(c *gin.Context) {
 }
 
 func (rt *Router) logoutPost(c *gin.Context) {
-	rctx := c.Request.Context()
-	logx.Infof(rctx, "username:%s logout from:%s", c.GetString("username"), c.ClientIP())
+	logger.Infof("username:%s logout from:%s", c.GetString("username"), c.ClientIP())
 	metadata, err := rt.extractTokenMetadata(c.Request)
 	if err != nil {
 		ginx.NewRender(c, http.StatusBadRequest).Message("failed to parse jwt token")
@@ -118,20 +107,9 @@ func (rt *Router) logoutPost(c *gin.Context) {
 
 	var logoutAddr string
 	user := c.MustGet("user").(*models.User)
-
-	// 获取用户的 id_token
-	idToken, err := rt.fetchIdToken(c.Request.Context(), user.Id)
-	if err != nil {
-		logx.Debugf(rctx, "fetch id_token failed: %v, user_id: %d", err, user.Id)
-		idToken = "" // 如果获取失败，使用空字符串
-	}
-
-	// 删除 id_token
-	rt.deleteIdToken(c.Request.Context(), user.Id)
-
 	switch user.Belong {
 	case "oidc":
-		logoutAddr = rt.Sso.OIDC.GetSsoLogoutAddr(idToken)
+		logoutAddr = rt.Sso.OIDC.GetSsoLogoutAddr()
 	case "cas":
 		logoutAddr = rt.Sso.CAS.GetSsoLogoutAddr()
 	case "oauth2":
@@ -221,14 +199,6 @@ func (rt *Router) refreshPost(c *gin.Context) {
 		ginx.Dangerous(err)
 		ginx.Dangerous(rt.createAuth(c.Request.Context(), userIdentity, ts))
 
-		// 延长 id_token 的过期时间，使其与新的 refresh token 生命周期保持一致
-		// 注意：这里不会获取新的 id_token，只是延长 Redis 中现有 id_token 的 TTL
-		if idToken, err := rt.fetchIdToken(c.Request.Context(), userid); err == nil && idToken != "" {
-			if err := rt.saveIdToken(c.Request.Context(), userid, idToken); err != nil {
-				logx.Debugf(c.Request.Context(), "refresh id_token ttl failed: %v, user_id: %d", err, userid)
-			}
-		}
-
 		ginx.NewRender(c).Data(gin.H{
 			"access_token":  ts.AccessToken,
 			"refresh_token": ts.RefreshToken,
@@ -276,13 +246,12 @@ type CallbackOutput struct {
 }
 
 func (rt *Router) loginCallback(c *gin.Context) {
-	rctx := c.Request.Context()
 	code := ginx.QueryStr(c, "code", "")
 	state := ginx.QueryStr(c, "state", "")
 
-	ret, err := rt.Sso.OIDC.Callback(rt.Redis, rctx, code, state)
+	ret, err := rt.Sso.OIDC.Callback(rt.Redis, c.Request.Context(), code, state)
 	if err != nil {
-		logx.Errorf(rctx, "sso_callback fail. code:%s, state:%s, get ret: %+v. error: %v", code, state, ret, err)
+		logger.Errorf("sso_callback fail. code:%s, state:%s, get ret: %+v. error: %v", code, state, ret, err)
 		ginx.NewRender(c).Data(CallbackOutput{}, err)
 		return
 	}
@@ -305,7 +274,7 @@ func (rt *Router) loginCallback(c *gin.Context) {
 			for _, gid := range rt.Sso.OIDC.DefaultTeams {
 				err = models.UserGroupMemberAdd(rt.Ctx, gid, user.Id)
 				if err != nil {
-					logx.Errorf(rctx, "user:%v UserGroupMemberAdd: %s", user, err)
+					logger.Errorf("user:%v UserGroupMemberAdd: %s", user, err)
 				}
 			}
 		}
@@ -315,14 +284,7 @@ func (rt *Router) loginCallback(c *gin.Context) {
 	userIdentity := fmt.Sprintf("%d-%s", user.Id, user.Username)
 	ts, err := rt.createTokens(rt.HTTP.JWTAuth.SigningKey, userIdentity)
 	ginx.Dangerous(err)
-	ginx.Dangerous(rt.createAuth(rctx, userIdentity, ts))
-
-	// 保存 id_token 到 Redis，用于登出时使用
-	if ret.IdToken != "" {
-		if err := rt.saveIdToken(rctx, user.Id, ret.IdToken); err != nil {
-			logx.Errorf(rctx, "save id_token failed: %v, user_id: %d", err, user.Id)
-		}
-	}
+	ginx.Dangerous(rt.createAuth(c.Request.Context(), userIdentity, ts))
 
 	redirect := "/"
 	if ret.Redirect != "/login" {
@@ -361,7 +323,7 @@ func (rt *Router) loginRedirectCas(c *gin.Context) {
 	}
 
 	if !rt.Sso.CAS.Enable {
-		logx.Errorf(c.Request.Context(), "cas is not enable")
+		logger.Error("cas is not enable")
 		ginx.NewRender(c).Data("", nil)
 		return
 	}
@@ -376,18 +338,17 @@ func (rt *Router) loginRedirectCas(c *gin.Context) {
 }
 
 func (rt *Router) loginCallbackCas(c *gin.Context) {
-	rctx := c.Request.Context()
 	ticket := ginx.QueryStr(c, "ticket", "")
 	state := ginx.QueryStr(c, "state", "")
-	ret, err := rt.Sso.CAS.ValidateServiceTicket(rctx, ticket, state, rt.Redis)
+	ret, err := rt.Sso.CAS.ValidateServiceTicket(c.Request.Context(), ticket, state, rt.Redis)
 	if err != nil {
-		logx.Errorf(rctx, "ValidateServiceTicket: %s", err)
+		logger.Errorf("ValidateServiceTicket: %s", err)
 		ginx.NewRender(c).Data("", err)
 		return
 	}
 	user, err := models.UserGet(rt.Ctx, "username=?", ret.Username)
 	if err != nil {
-		logx.Errorf(rctx, "UserGet: %s", err)
+		logger.Errorf("UserGet: %s", err)
 	}
 	ginx.Dangerous(err)
 	if user != nil {
@@ -406,10 +367,10 @@ func (rt *Router) loginCallbackCas(c *gin.Context) {
 	userIdentity := fmt.Sprintf("%d-%s", user.Id, user.Username)
 	ts, err := rt.createTokens(rt.HTTP.JWTAuth.SigningKey, userIdentity)
 	if err != nil {
-		logx.Errorf(rctx, "createTokens: %s", err)
+		logger.Errorf("createTokens: %s", err)
 	}
 	ginx.Dangerous(err)
-	ginx.Dangerous(rt.createAuth(rctx, userIdentity, ts))
+	ginx.Dangerous(rt.createAuth(c.Request.Context(), userIdentity, ts))
 
 	redirect := "/"
 	if ret.Redirect != "/login" {
@@ -452,180 +413,13 @@ func (rt *Router) loginRedirectOAuth(c *gin.Context) {
 	ginx.NewRender(c).Data(redirect, err)
 }
 
-func (rt *Router) loginRedirectDingTalk(c *gin.Context) {
-	redirect := ginx.QueryStr(c, "redirect", "/")
-
-	v, exists := c.Get("userid")
-	if exists {
-		userid := v.(int64)
-		user, err := models.UserGetById(rt.Ctx, userid)
-		ginx.Dangerous(err)
-		if user == nil {
-			ginx.Bomb(200, "user not found")
-		}
-
-		if user.Username != "" { // already login
-			ginx.NewRender(c).Data(redirect, nil)
-			return
-		}
-	}
-
-	if !rt.Sso.DingTalk.Enable {
-		ginx.NewRender(c).Data("", nil)
-		return
-	}
-
-	redirect, err := rt.Sso.DingTalk.Authorize(rt.Redis, redirect)
-	ginx.Dangerous(err)
-
-	ginx.NewRender(c).Data(redirect, err)
-}
-
-func (rt *Router) loginCallbackDingTalk(c *gin.Context) {
-	rctx := c.Request.Context()
-	code := ginx.QueryStr(c, "code", "")
-	state := ginx.QueryStr(c, "state", "")
-
-	ret, err := rt.Sso.DingTalk.Callback(rt.Redis, rctx, code, state)
-	if err != nil {
-		logx.Errorf(rctx, "sso_callback DingTalk fail. code:%s, state:%s, get ret: %+v. error: %v", code, state, ret, err)
-		ginx.NewRender(c).Data(CallbackOutput{}, err)
-		return
-	}
-
-	user, err := models.UserGet(rt.Ctx, "username=?", ret.Username)
-	ginx.Dangerous(err)
-
-	if user != nil {
-		if rt.Sso.DingTalk.DingTalkConfig.CoverAttributes {
-			updatedFields := user.UpdateSsoFields(dingtalk.SsoTypeName, ret.Nickname, ret.Phone, ret.Email)
-			ginx.Dangerous(user.Update(rt.Ctx, "update_at", updatedFields...))
-		}
-	} else {
-		user = new(models.User)
-		user.FullSsoFields(dingtalk.SsoTypeName, ret.Username, ret.Nickname, ret.Phone, ret.Email, rt.Sso.DingTalk.DingTalkConfig.DefaultRoles)
-		// create user from dingtalk
-		ginx.Dangerous(user.Add(rt.Ctx))
-	}
-
-	// set user login state
-	userIdentity := fmt.Sprintf("%d-%s", user.Id, user.Username)
-	ts, err := rt.createTokens(rt.HTTP.JWTAuth.SigningKey, userIdentity)
-	ginx.Dangerous(err)
-	ginx.Dangerous(rt.createAuth(c.Request.Context(), userIdentity, ts))
-
-	redirect := "/"
-	if ret.Redirect != "/login" {
-		redirect = ret.Redirect
-	}
-
-	ginx.NewRender(c).Data(CallbackOutput{
-		Redirect:     redirect,
-		User:         user,
-		AccessToken:  ts.AccessToken,
-		RefreshToken: ts.RefreshToken,
-	}, nil)
-
-}
-
-func (rt *Router) loginRedirectFeiShu(c *gin.Context) {
-	redirect := ginx.QueryStr(c, "redirect", "/")
-
-	v, exists := c.Get("userid")
-	if exists {
-		userid := v.(int64)
-		user, err := models.UserGetById(rt.Ctx, userid)
-		ginx.Dangerous(err)
-		if user == nil {
-			ginx.Bomb(200, "user not found")
-		}
-
-		if user.Username != "" { // already login
-			ginx.NewRender(c).Data(redirect, nil)
-			return
-		}
-	}
-
-	if rt.Sso.FeiShu == nil || !rt.Sso.FeiShu.Enable {
-		ginx.NewRender(c).Data("", nil)
-		return
-	}
-
-	redirect, err := rt.Sso.FeiShu.Authorize(rt.Redis, redirect)
-	ginx.Dangerous(err)
-
-	ginx.NewRender(c).Data(redirect, err)
-}
-
-func (rt *Router) loginCallbackFeiShu(c *gin.Context) {
-	rctx := c.Request.Context()
-	code := ginx.QueryStr(c, "code", "")
-	state := ginx.QueryStr(c, "state", "")
-
-	ret, err := rt.Sso.FeiShu.Callback(rt.Redis, rctx, code, state)
-	if err != nil {
-		logx.Errorf(rctx, "sso_callback FeiShu fail. code:%s, state:%s, get ret: %+v. error: %v", code, state, ret, err)
-		ginx.NewRender(c).Data(CallbackOutput{}, err)
-		return
-	}
-
-	user, err := models.UserGet(rt.Ctx, "username=?", ret.Username)
-	ginx.Dangerous(err)
-
-	if user != nil {
-		if rt.Sso.FeiShu != nil && rt.Sso.FeiShu.FeiShuConfig != nil && rt.Sso.FeiShu.FeiShuConfig.CoverAttributes {
-			updatedFields := user.UpdateSsoFields(feishu.SsoTypeName, ret.Nickname, ret.Phone, ret.Email)
-			ginx.Dangerous(user.Update(rt.Ctx, "update_at", updatedFields...))
-		}
-	} else {
-		user = new(models.User)
-		defaultRoles := []string{}
-		defaultUserGroups := []int64{}
-		if rt.Sso.FeiShu != nil && rt.Sso.FeiShu.FeiShuConfig != nil {
-			defaultRoles = rt.Sso.FeiShu.FeiShuConfig.DefaultRoles
-			defaultUserGroups = rt.Sso.FeiShu.FeiShuConfig.DefaultUserGroups
-		}
-
-		user.FullSsoFields(feishu.SsoTypeName, ret.Username, ret.Nickname, ret.Phone, ret.Email, defaultRoles)
-		ginx.Dangerous(user.Add(rt.Ctx))
-
-		if len(defaultUserGroups) > 0 {
-			err = user.AddToUserGroups(rt.Ctx, defaultUserGroups)
-			if err != nil {
-				logx.Errorf(rctx, "sso feishu add user group error %v %v", ret, err)
-			}
-		}
-
-	}
-
-	// set user login state
-	userIdentity := fmt.Sprintf("%d-%s", user.Id, user.Username)
-	ts, err := rt.createTokens(rt.HTTP.JWTAuth.SigningKey, userIdentity)
-	ginx.Dangerous(err)
-	ginx.Dangerous(rt.createAuth(c.Request.Context(), userIdentity, ts))
-
-	redirect := "/"
-	if ret.Redirect != "/login" {
-		redirect = ret.Redirect
-	}
-
-	ginx.NewRender(c).Data(CallbackOutput{
-		Redirect:     redirect,
-		User:         user,
-		AccessToken:  ts.AccessToken,
-		RefreshToken: ts.RefreshToken,
-	}, nil)
-
-}
-
 func (rt *Router) loginCallbackOAuth(c *gin.Context) {
-	rctx := c.Request.Context()
 	code := ginx.QueryStr(c, "code", "")
 	state := ginx.QueryStr(c, "state", "")
 
-	ret, err := rt.Sso.OAuth2.Callback(rt.Redis, rctx, code, state)
+	ret, err := rt.Sso.OAuth2.Callback(rt.Redis, c.Request.Context(), code, state)
 	if err != nil {
-		logx.Debugf(rctx, "sso.callback() get ret %+v error %v", ret, err)
+		logger.Debugf("sso.callback() get ret %+v error %v", ret, err)
 		ginx.NewRender(c).Data(CallbackOutput{}, err)
 		return
 	}
@@ -665,15 +459,13 @@ func (rt *Router) loginCallbackOAuth(c *gin.Context) {
 }
 
 type SsoConfigOutput struct {
-	OidcDisplayName     string `json:"oidcDisplayName"`
-	CasDisplayName      string `json:"casDisplayName"`
-	OauthDisplayName    string `json:"oauthDisplayName"`
-	DingTalkDisplayName string `json:"dingTalkDisplayName"`
-	FeiShuDisplayName   string `json:"feishuDisplayName"`
+	OidcDisplayName  string `json:"oidcDisplayName"`
+	CasDisplayName   string `json:"casDisplayName"`
+	OauthDisplayName string `json:"oauthDisplayName"`
 }
 
 func (rt *Router) ssoConfigNameGet(c *gin.Context) {
-	var oidcDisplayName, casDisplayName, oauthDisplayName, dingTalkDisplayName, feiShuDisplayName string
+	var oidcDisplayName, casDisplayName, oauthDisplayName string
 	if rt.Sso.OIDC != nil {
 		oidcDisplayName = rt.Sso.OIDC.GetDisplayName()
 	}
@@ -686,117 +478,23 @@ func (rt *Router) ssoConfigNameGet(c *gin.Context) {
 		oauthDisplayName = rt.Sso.OAuth2.GetDisplayName()
 	}
 
-	if rt.Sso.DingTalk != nil {
-		dingTalkDisplayName = rt.Sso.DingTalk.GetDisplayName()
-	}
-
-	if rt.Sso.FeiShu != nil {
-		feiShuDisplayName = rt.Sso.FeiShu.GetDisplayName()
-	}
-
 	ginx.NewRender(c).Data(SsoConfigOutput{
-		OidcDisplayName:     oidcDisplayName,
-		CasDisplayName:      casDisplayName,
-		OauthDisplayName:    oauthDisplayName,
-		DingTalkDisplayName: dingTalkDisplayName,
-		FeiShuDisplayName:   feiShuDisplayName,
+		OidcDisplayName:  oidcDisplayName,
+		CasDisplayName:   casDisplayName,
+		OauthDisplayName: oauthDisplayName,
 	}, nil)
 }
 
 func (rt *Router) ssoConfigGets(c *gin.Context) {
-	var ssoConfigs []models.SsoConfig
-	lst, err := models.SsoConfigGets(rt.Ctx)
-	ginx.Dangerous(err)
-	if len(lst) == 0 {
-		ginx.NewRender(c).Data(ssoConfigs, nil)
-		return
-	}
-
-	// TODO: dingTalkExist 为了兼容当前前端配置, 后期单点登陆统一调整后不在预先设置默认内容
-	dingTalkExist := false
-	feiShuExist := false
-	for _, config := range lst {
-		var ssoReqConfig models.SsoConfig
-		ssoReqConfig.Id = config.Id
-		ssoReqConfig.Name = config.Name
-		ssoReqConfig.UpdateAt = config.UpdateAt
-		switch config.Name {
-		case dingtalk.SsoTypeName:
-			dingTalkExist = true
-			err := json.Unmarshal([]byte(config.Content), &ssoReqConfig.SettingJson)
-			ginx.Dangerous(err)
-		case feishu.SsoTypeName:
-			feiShuExist = true
-			err := json.Unmarshal([]byte(config.Content), &ssoReqConfig.SettingJson)
-			ginx.Dangerous(err)
-		default:
-			ssoReqConfig.Content = config.Content
-		}
-
-		ssoConfigs = append(ssoConfigs, ssoReqConfig)
-	}
-	// TODO: dingTalkExist 为了兼容当前前端配置, 后期单点登陆统一调整后不在预先设置默认内容
-	if !dingTalkExist {
-		var ssoConfig models.SsoConfig
-		ssoConfig.Name = dingtalk.SsoTypeName
-		ssoConfigs = append(ssoConfigs, ssoConfig)
-	}
-	if !feiShuExist {
-		var ssoConfig models.SsoConfig
-		ssoConfig.Name = feishu.SsoTypeName
-		ssoConfigs = append(ssoConfigs, ssoConfig)
-	}
-
-	ginx.NewRender(c).Data(ssoConfigs, nil)
+	ginx.NewRender(c).Data(models.SsoConfigGets(rt.Ctx))
 }
 
 func (rt *Router) ssoConfigUpdate(c *gin.Context) {
 	var f models.SsoConfig
-	var ssoConfig models.SsoConfig
-	ginx.BindJSON(c, &ssoConfig)
+	ginx.BindJSON(c, &f)
 
-	switch ssoConfig.Name {
-	case dingtalk.SsoTypeName:
-		f.Name = ssoConfig.Name
-		setting, err := json.Marshal(ssoConfig.SettingJson)
-		ginx.Dangerous(err)
-		f.Content = string(setting)
-		f.UpdateAt = time.Now().Unix()
-		sso, err := f.Query(rt.Ctx)
-		if !errors.Is(err, gorm.ErrRecordNotFound) {
-			ginx.Dangerous(err)
-		}
-		if errors.Is(err, gorm.ErrRecordNotFound) {
-			err = f.Create(rt.Ctx)
-		} else {
-			f.Id = sso.Id
-			err = f.Update(rt.Ctx)
-		}
-		ginx.Dangerous(err)
-	case feishu.SsoTypeName:
-		f.Name = ssoConfig.Name
-		setting, err := json.Marshal(ssoConfig.SettingJson)
-		ginx.Dangerous(err)
-		f.Content = string(setting)
-		f.UpdateAt = time.Now().Unix()
-		sso, err := f.Query(rt.Ctx)
-		if !errors.Is(err, gorm.ErrRecordNotFound) {
-			ginx.Dangerous(err)
-		}
-		if errors.Is(err, gorm.ErrRecordNotFound) {
-			err = f.Create(rt.Ctx)
-		} else {
-			f.Id = sso.Id
-			err = f.Update(rt.Ctx)
-		}
-		ginx.Dangerous(err)
-	default:
-		f.Id = ssoConfig.Id
-		f.Name = ssoConfig.Name
-		f.Content = ssoConfig.Content
-		err := f.Update(rt.Ctx)
-		ginx.Dangerous(err)
-	}
+	err := f.Update(rt.Ctx)
+	ginx.Dangerous(err)
 
 	switch f.Name {
 	case "LDAP":
@@ -820,22 +518,6 @@ func (rt *Router) ssoConfigUpdate(c *gin.Context) {
 		err := toml.Unmarshal([]byte(f.Content), &config)
 		ginx.Dangerous(err)
 		rt.Sso.OAuth2.Reload(config)
-	case dingtalk.SsoTypeName:
-		var config dingtalk.Config
-		err := json.Unmarshal([]byte(f.Content), &config)
-		ginx.Dangerous(err)
-		if rt.Sso.DingTalk == nil {
-			rt.Sso.DingTalk = dingtalk.New(config)
-		}
-		rt.Sso.DingTalk.Reload(config)
-	case feishu.SsoTypeName:
-		var config feishu.Config
-		err := json.Unmarshal([]byte(f.Content), &config)
-		ginx.Dangerous(err)
-		if rt.Sso.FeiShu == nil {
-			rt.Sso.FeiShu = feishu.New(config)
-		}
-		rt.Sso.FeiShu.Reload(config)
 	}
 
 	ginx.NewRender(c).Message(nil)

center/router/router_message_template.go

@@ -12,10 +12,10 @@ import (
 	"github.com/ccfos/nightingale/v6/pkg/slice"
 	"github.com/ccfos/nightingale/v6/pkg/strx"
 	"github.com/ccfos/nightingale/v6/pkg/tplx"
-	"github.com/ccfos/nightingale/v6/pkg/ginx"
 
 	"github.com/gin-gonic/gin"
 	"github.com/google/uuid"
+	"github.com/toolkits/pkg/ginx"
 )
 
 func (rt *Router) messageTemplatesAdd(c *gin.Context) {
@@ -154,7 +154,6 @@ func (rt *Router) messageTemplatesGet(c *gin.Context) {
 
 	lst, err := models.MessageTemplatesGetBy(rt.Ctx, notifyChannelIdents)
 	ginx.Dangerous(err)
-	models.FillUpdateByNicknames(rt.Ctx, lst)
 
 	if me.IsAdmin() {
 		ginx.NewRender(c).Data(lst, nil)
@@ -194,9 +193,10 @@ func (rt *Router) eventsMessage(c *gin.Context) {
 		events[i] = he.ToCur()
 	}
 
-	renderData := make(map[string]interface{})
-	renderData["events"] = events
-	defs := models.GetDefs(renderData)
+	var defs = []string{
+		"{{$events := .}}",
+		"{{$event := index . 0}}",
+	}
 	ret := make(map[string]string, len(req.Tpl.Content))
 	for k, v := range req.Tpl.Content {
 		text := strings.Join(append(defs, v), "")
@@ -207,7 +207,7 @@ func (rt *Router) eventsMessage(c *gin.Context) {
 		}
 
 		var buf bytes.Buffer
-		err = tpl.Execute(&buf, renderData)
+		err = tpl.Execute(&buf, events)
 		if err != nil {
 			ret[k] = err.Error()
 			continue

center/router/router_metric_desc.go

@@ -2,9 +2,9 @@ package router
 
 import (
 	"github.com/ccfos/nightingale/v6/center/cconf"
-	"github.com/ccfos/nightingale/v6/pkg/ginx"
 
 	"github.com/gin-gonic/gin"
+	"github.com/toolkits/pkg/ginx"
 )
 
 func (rt *Router) metricsDescGetFile(c *gin.Context) {

center/router/router_metric_view.go

@@ -4,9 +4,9 @@ import (
 	"net/http"
 
 	"github.com/ccfos/nightingale/v6/models"
-	"github.com/ccfos/nightingale/v6/pkg/ginx"
 
 	"github.com/gin-gonic/gin"
+	"github.com/toolkits/pkg/ginx"
 )
 
 // no param

center/router/router_mute.go

@@ -9,22 +9,16 @@ import (
 	"github.com/ccfos/nightingale/v6/alert/mute"
 	"github.com/ccfos/nightingale/v6/models"
 	"github.com/ccfos/nightingale/v6/pkg/strx"
-	"github.com/ccfos/nightingale/v6/pkg/ginx"
 
 	"github.com/gin-gonic/gin"
+	"github.com/toolkits/pkg/ginx"
 	"github.com/toolkits/pkg/i18n"
 )
 
 // Return all, front-end search and paging
 func (rt *Router) alertMuteGetsByBG(c *gin.Context) {
 	bgid := ginx.UrlParamInt64(c, "id")
-	prods := strings.Fields(ginx.QueryStr(c, "prods", ""))
-	query := ginx.QueryStr(c, "query", "")
-	expired := ginx.QueryInt(c, "expired", -1)
-	lst, err := models.AlertMuteGets(rt.Ctx, prods, bgid, -1, expired, query)
-	if err == nil {
-		models.FillUpdateByNicknames(rt.Ctx, lst)
-	}
+	lst, err := models.AlertMuteGetsByBG(rt.Ctx, bgid)
 
 	ginx.NewRender(c).Data(lst, err)
 }
@@ -50,9 +44,6 @@ func (rt *Router) alertMuteGetsByGids(c *gin.Context) {
 	}
 
 	lst, err := models.AlertMuteGetsByBGIds(rt.Ctx, gids)
-	if err == nil {
-		models.FillUpdateByNicknames(rt.Ctx, lst)
-	}
 
 	ginx.NewRender(c).Data(lst, err)
 }
@@ -62,20 +53,11 @@ func (rt *Router) alertMuteGets(c *gin.Context) {
 	bgid := ginx.QueryInt64(c, "bgid", -1)
 	query := ginx.QueryStr(c, "query", "")
 	disabled := ginx.QueryInt(c, "disabled", -1)
-	expired := ginx.QueryInt(c, "expired", -1)
-	lst, err := models.AlertMuteGets(rt.Ctx, prods, bgid, disabled, expired, query)
-	if err == nil {
-		models.FillUpdateByNicknames(rt.Ctx, lst)
-	}
+	lst, err := models.AlertMuteGets(rt.Ctx, prods, bgid, disabled, query)
 
 	ginx.NewRender(c).Data(lst, err)
 }
 
-func (rt *Router) activeAlertMuteGets(c *gin.Context) {
-	lst, err := models.AlertMuteGetsAll(rt.Ctx)
-	ginx.NewRender(c).Data(lst, err)
-}
-
 func (rt *Router) alertMuteAdd(c *gin.Context) {
 
 	var f models.AlertMute
@@ -85,9 +67,7 @@ func (rt *Router) alertMuteAdd(c *gin.Context) {
 	f.CreateBy = username
 	f.UpdateBy = username
 	f.GroupId = ginx.UrlParamInt64(c, "id")
-
-	ginx.Dangerous(f.Add(rt.Ctx))
-	ginx.NewRender(c).Data(f.Id, nil)
+	ginx.NewRender(c).Message(f.Add(rt.Ctx))
 }
 
 type MuteTestForm struct {

center/router/router_mw.go

@@ -11,11 +11,11 @@ import (
 
 	"github.com/ccfos/nightingale/v6/center/cstats"
 	"github.com/ccfos/nightingale/v6/models"
-	"github.com/ccfos/nightingale/v6/pkg/ginx"
 
 	"github.com/gin-gonic/gin"
 	"github.com/golang-jwt/jwt"
 	"github.com/google/uuid"
+	"github.com/toolkits/pkg/ginx"
 )
 
 const (
@@ -453,30 +453,6 @@ func (rt *Router) wrapJwtKey(key string) string {
 	return rt.HTTP.JWTAuth.RedisKeyPrefix + key
 }
 
-func (rt *Router) wrapIdTokenKey(userId int64) string {
-	return fmt.Sprintf("n9e_id_token_%d", userId)
-}
-
-// saveIdToken 保存用户的 id_token 到 Redis
-func (rt *Router) saveIdToken(ctx context.Context, userId int64, idToken string) error {
-	if idToken == "" {
-		return nil
-	}
-	// id_token 的过期时间应该与 RefreshToken 保持一致，确保在整个会话期间都可用于登出
-	expiration := time.Minute * time.Duration(rt.HTTP.JWTAuth.RefreshExpired)
-	return rt.Redis.Set(ctx, rt.wrapIdTokenKey(userId), idToken, expiration).Err()
-}
-
-// fetchIdToken 从 Redis 获取用户的 id_token
-func (rt *Router) fetchIdToken(ctx context.Context, userId int64) (string, error) {
-	return rt.Redis.Get(ctx, rt.wrapIdTokenKey(userId)).Result()
-}
-
-// deleteIdToken 从 Redis 删除用户的 id_token
-func (rt *Router) deleteIdToken(ctx context.Context, userId int64) error {
-	return rt.Redis.Del(ctx, rt.wrapIdTokenKey(userId)).Err()
-}
-
 type TokenDetails struct {
 	AccessToken  string
 	RefreshToken string

center/router/router_notification_record.go

@@ -6,9 +6,9 @@ import (
 	"github.com/ccfos/nightingale/v6/alert/sender"
 	"github.com/ccfos/nightingale/v6/models"
 	"github.com/ccfos/nightingale/v6/pkg/ctx"
-	"github.com/ccfos/nightingale/v6/pkg/ginx"
 
 	"github.com/gin-gonic/gin"
+	"github.com/toolkits/pkg/ginx"
 	"github.com/toolkits/pkg/logger"
 )
 
@@ -33,7 +33,7 @@ type Record struct {
 
 // notificationRecordAdd
 func (rt *Router) notificationRecordAdd(c *gin.Context) {
-	var req []*models.NotificationRecord
+	var req []*models.NotificaitonRecord
 	ginx.BindJSON(c, &req)
 	err := sender.PushNotifyRecords(req)
 	ginx.Dangerous(err, 429)
@@ -43,14 +43,14 @@ func (rt *Router) notificationRecordAdd(c *gin.Context) {
 
 func (rt *Router) notificationRecordList(c *gin.Context) {
 	eid := ginx.UrlParamInt64(c, "eid")
-	lst, err := models.NotificationRecordsGetByEventId(rt.Ctx, eid)
+	lst, err := models.NotificaitonRecordsGetByEventId(rt.Ctx, eid)
 	ginx.Dangerous(err)
 
 	response := buildNotificationResponse(rt.Ctx, lst)
 	ginx.NewRender(c).Data(response, nil)
 }
 
-func buildNotificationResponse(ctx *ctx.Context, nl []*models.NotificationRecord) NotificationResponse {
+func buildNotificationResponse(ctx *ctx.Context, nl []*models.NotificaitonRecord) NotificationResponse {
 	response := NotificationResponse{
 		SubRules: []SubRule{},
 		Notifies: make(map[string][]Record),

center/router/router_notify_channel.go

@@ -11,8 +11,8 @@ import (
 	"time"
 
 	"github.com/ccfos/nightingale/v6/models"
-	"github.com/ccfos/nightingale/v6/pkg/ginx"
 	"github.com/gin-gonic/gin"
+	"github.com/toolkits/pkg/ginx"
 )
 
 func (rt *Router) notifyChannelsAdd(c *gin.Context) {
@@ -118,9 +118,6 @@ func (rt *Router) notifyChannelGetBy(c *gin.Context) {
 
 func (rt *Router) notifyChannelsGet(c *gin.Context) {
 	lst, err := models.NotifyChannelsGet(rt.Ctx, "", nil)
-	if err == nil {
-		models.FillUpdateByNicknames(rt.Ctx, lst)
-	}
 	ginx.NewRender(c).Data(lst, err)
 }
 
@@ -165,6 +162,21 @@ func (rt *Router) notifyChannelIdentsGet(c *gin.Context) {
 	ginx.NewRender(c).Data(lst, nil)
 }
 
+type flushDutyChannelsResponse struct {
+	Error struct {
+		Code    string `json:"code"`
+		Message string `json:"message"`
+	} `json:"error"`
+	Data struct {
+		Items []struct {
+			ChannelID   int    `json:"channel_id"`
+			ChannelName string `json:"channel_name"`
+			Status      string `json:"status"`
+		} `json:"items"`
+		Total int `json:"total"`
+	} `json:"data"`
+}
+
 func (rt *Router) flashDutyNotifyChannelsGet(c *gin.Context) {
 	cid := ginx.UrlParamInt64(c, "id")
 	nc, err := models.NotifyChannelGet(rt.Ctx, "id = ?", cid)
@@ -184,31 +196,18 @@ func (rt *Router) flashDutyNotifyChannelsGet(c *gin.Context) {
 		jsonData = []byte(fmt.Sprintf(`{"member_name":"%s","email":"%s","phone":"%s"}`, me.Username, me.Email, me.Phone))
 	}
 
-	items, err := getFlashDutyChannels(nc.RequestConfig.FlashDutyRequestConfig.IntegrationUrl, jsonData, time.Duration(nc.RequestConfig.FlashDutyRequestConfig.Timeout)*time.Millisecond)
+	items, err := getFlashDutyChannels(nc.RequestConfig.FlashDutyRequestConfig.IntegrationUrl, jsonData)
 	ginx.Dangerous(err)
 
 	ginx.NewRender(c).Data(items, nil)
 }
 
-type flushDutyChannelsResponse struct {
-	Error struct {
-		Code    string `json:"code"`
-		Message string `json:"message"`
-	} `json:"error"`
-	Data struct {
-		Items []FlashDutyChannel `json:"items"`
-		Total int                `json:"total"`
-	} `json:"data"`
-}
-
-type FlashDutyChannel struct {
+// getFlashDutyChannels 从FlashDuty API获取频道列表
+func getFlashDutyChannels(integrationUrl string, jsonData []byte) ([]struct {
 	ChannelID   int    `json:"channel_id"`
 	ChannelName string `json:"channel_name"`
 	Status      string `json:"status"`
-}
-
-// getFlashDutyChannels 从FlashDuty API获取频道列表
-func getFlashDutyChannels(integrationUrl string, jsonData []byte, timeout time.Duration) ([]FlashDutyChannel, error) {
+}, error) {
 	// 解析URL，提取baseUrl和参数
 	baseUrl, integrationKey, err := parseIntegrationUrl(integrationUrl)
 	if err != nil {
@@ -228,9 +227,7 @@ func getFlashDutyChannels(integrationUrl string, jsonData []byte, timeout time.D
 	}
 
 	req.Header.Set("Content-Type", "application/json")
-	httpResp, err := (&http.Client{
-		Timeout: timeout,
-	}).Do(req)
+	httpResp, err := (&http.Client{}).Do(req)
 	if err != nil {
 		return nil, err
 	}
@@ -269,149 +266,3 @@ func parseIntegrationUrl(urlStr string) (baseUrl string, integrationKey string,
 
 	return host, integrationKey, nil
 }
-
-func (rt *Router) pagerDutyNotifyServicesGet(c *gin.Context) {
-	cid := ginx.UrlParamInt64(c, "id")
-	nc, err := models.NotifyChannelGet(rt.Ctx, "id = ?", cid)
-	ginx.Dangerous(err)
-	if err != nil || nc == nil {
-		ginx.Bomb(http.StatusNotFound, "notify channel not found")
-	}
-
-	items, err := getPagerDutyServices(nc.RequestConfig.PagerDutyRequestConfig.ApiKey, time.Duration(nc.RequestConfig.PagerDutyRequestConfig.Timeout)*time.Millisecond)
-	if err != nil {
-		ginx.Bomb(http.StatusInternalServerError, fmt.Sprintf("failed to get pagerduty services: %v", err))
-	}
-	// 服务: []集成，扁平化为服务-集成
-	var flattenedItems []map[string]string
-	for _, svc := range items {
-		for _, integ := range svc.Integrations {
-			flattenedItems = append(flattenedItems, map[string]string{
-				"service_id":          svc.ID,
-				"service_name":        svc.Name,
-				"integration_summary": integ.Summary,
-				"integration_id":      integ.ID,
-				"integration_url":     integ.Self,
-			})
-		}
-	}
-
-	ginx.NewRender(c).Data(flattenedItems, nil)
-}
-
-func (rt *Router) pagerDutyIntegrationKeyGet(c *gin.Context) {
-	serviceId := ginx.UrlParamStr(c, "service_id")
-	integrationId := ginx.UrlParamStr(c, "integration_id")
-	cid := ginx.UrlParamInt64(c, "id")
-	nc, err := models.NotifyChannelGet(rt.Ctx, "id = ?", cid)
-	ginx.Dangerous(err)
-	if err != nil || nc == nil {
-		ginx.Bomb(http.StatusNotFound, "notify channel not found")
-	}
-
-	integrationUrl := fmt.Sprintf("https://api.pagerduty.com/services/%s/integrations/%s", serviceId, integrationId)
-	integrationKey, err := getPagerDutyIntegrationKey(integrationUrl, nc.RequestConfig.PagerDutyRequestConfig.ApiKey, time.Duration(nc.RequestConfig.PagerDutyRequestConfig.Timeout)*time.Millisecond)
-	if err != nil {
-		ginx.Bomb(http.StatusInternalServerError, fmt.Sprintf("failed to get pagerduty integration key: %v", err))
-	}
-
-	ginx.NewRender(c).Data(map[string]string{
-		"integration_key": integrationKey,
-	}, nil)
-}
-
-type PagerDutyIntegration struct {
-	ID             string `json:"id"`
-	IntegrationKey string `json:"integration_key"`
-	Self           string `json:"self"` // integration 的 API URL
-	Summary        string `json:"summary"`
-}
-
-type PagerDutyService struct {
-	Name         string                 `json:"name"`
-	ID           string                 `json:"id"`
-	Integrations []PagerDutyIntegration `json:"integrations"`
-}
-
-// getPagerDutyServices 从 PagerDuty API 分页获取所有服务及其集成信息
-func getPagerDutyServices(apiKey string, timeout time.Duration) ([]PagerDutyService, error) {
-	const limit = 100 // 每页最大数量
-	var offset uint   // 分页偏移量
-	var allServices []PagerDutyService
-
-	for {
-		// 构建带分页参数的 URL
-		url := fmt.Sprintf("https://api.pagerduty.com/services?limit=%d&offset=%d", limit, offset)
-
-		req, err := http.NewRequest("GET", url, nil)
-		if err != nil {
-			return nil, err
-		}
-		req.Header.Set("Authorization", fmt.Sprintf("Token token=%s", apiKey))
-		req.Header.Set("Accept", "application/vnd.pagerduty+json;version=2")
-
-		httpResp, err := (&http.Client{Timeout: timeout}).Do(req)
-		if err != nil {
-			return nil, err
-		}
-
-		body, err := io.ReadAll(httpResp.Body)
-		httpResp.Body.Close()
-		if err != nil {
-			return nil, err
-		}
-
-		// 定义包含分页信息的响应结构
-		var serviceRes struct {
-			Services []PagerDutyService `json:"services"`
-			More     bool               `json:"more"` // 是否还有更多数据
-			Limit    uint               `json:"limit"`
-			Offset   uint               `json:"offset"`
-		}
-
-		if err := json.Unmarshal(body, &serviceRes); err != nil {
-			return nil, err
-		}
-		allServices = append(allServices, serviceRes.Services...)
-		// 判断是否还有更多数据
-		if !serviceRes.More || len(serviceRes.Services) < int(limit) {
-			break
-		}
-		offset += limit // 准备请求下一页
-	}
-
-	return allServices, nil
-}
-
-// getPagerDutyIntegrationKey 通过 integration 的 API URL 获取 integration key
-func getPagerDutyIntegrationKey(integrationUrl, apiKey string, timeout time.Duration) (string, error) {
-	req, err := http.NewRequest("GET", integrationUrl, nil)
-	if err != nil {
-		return "", err
-	}
-	req.Header.Set("Authorization", fmt.Sprintf("Token token=%s", apiKey))
-
-	httpResp, err := (&http.Client{
-		Timeout: timeout,
-	}).Do(req)
-	if err != nil {
-		return "", err
-	}
-	defer httpResp.Body.Close()
-	body, err := io.ReadAll(httpResp.Body)
-	if err != nil {
-		return "", err
-	}
-
-	var integRes struct {
-		Integration struct {
-			IntegrationKey string `json:"integration_key"`
-		} `json:"integration"`
-	}
-
-	if err := json.Unmarshal(body, &integRes); err != nil {
-		return "", err
-	}
-
-	return integRes.Integration.IntegrationKey, nil
-}

center/router/router_notify_channel_test.go

@@ -11,7 +11,7 @@ func TestGetFlashDutyChannels(t *testing.T) {
 	jsonData := []byte(`{}`)
 
 	// 调用被测试的函数
-	channels, err := getFlashDutyChannels(integrationUrl, jsonData, 5000)
+	channels, err := getFlashDutyChannels(integrationUrl, jsonData)
 
 	fmt.Println(channels, err)
 }

center/router/router_notify_config.go

@@ -10,10 +10,10 @@ import (
 	"github.com/ccfos/nightingale/v6/memsto"
 	"github.com/ccfos/nightingale/v6/models"
 	"github.com/ccfos/nightingale/v6/pkg/tplx"
-	"github.com/ccfos/nightingale/v6/pkg/ginx"
 
 	"github.com/gin-gonic/gin"
 	"github.com/pelletier/go-toml/v2"
+	"github.com/toolkits/pkg/ginx"
 	"github.com/toolkits/pkg/str"
 )
 
@@ -162,7 +162,7 @@ func (rt *Router) notifyConfigPut(c *gin.Context) {
 		ginx.Bomb(200, "key %s can not modify", f.Ckey)
 	}
 	username := c.MustGet("username").(string)
-	//insert or update built-in config
+	//insert or update build-in config
 	ginx.Dangerous(models.ConfigsSetWithUname(rt.Ctx, f.Ckey, f.Cval, username))
 	if f.Ckey == models.SMTP {
 		// 重置邮件发送器
@@ -219,8 +219,8 @@ func (rt *Router) notifyChannelConfigGets(c *gin.Context) {
 	id := ginx.QueryInt64(c, "id", 0)
 	name := ginx.QueryStr(c, "name", "")
 	ident := ginx.QueryStr(c, "ident", "")
-	enabled := ginx.QueryInt(c, "enabled", -1)
+	eabled := ginx.QueryInt(c, "eabled", -1)
 
-	notifyChannels, err := models.NotifyChannelGets(rt.Ctx, id, name, ident, enabled)
+	notifyChannels, err := models.NotifyChannelGets(rt.Ctx, id, name, ident, eabled)
 	ginx.NewRender(c).Data(notifyChannels, err)
 }

center/router/router_notify_rule.go

@@ -10,9 +10,9 @@ import (
 	"github.com/ccfos/nightingale/v6/models"
 	"github.com/ccfos/nightingale/v6/pkg/ctx"
 	"github.com/ccfos/nightingale/v6/pkg/slice"
-	"github.com/ccfos/nightingale/v6/pkg/ginx"
 
 	"github.com/gin-gonic/gin"
+	"github.com/toolkits/pkg/ginx"
 	"github.com/toolkits/pkg/logger"
 )
 
@@ -118,7 +118,6 @@ func (rt *Router) notifyRulesGet(c *gin.Context) {
 
 	lst, err := models.NotifyRulesGet(rt.Ctx, "", nil)
 	ginx.Dangerous(err)
-	models.FillUpdateByNicknames(rt.Ctx, lst)
 	if me.IsAdmin() {
 		ginx.NewRender(c).Data(lst, nil)
 		return
@@ -162,9 +161,6 @@ func (rt *Router) notifyTest(c *gin.Context) {
 	}
 
 	resp, err := SendNotifyChannelMessage(rt.Ctx, rt.UserCache, rt.UserGroupCache, f.NotifyConfig, events)
-	if resp == "" {
-		resp = "success"
-	}
 	ginx.NewRender(c).Data(resp, err)
 }
 
@@ -182,13 +178,6 @@ func SendNotifyChannelMessage(ctx *ctx.Context, userCache *memsto.UserCacheType,
 	if !notifyChannel.Enable {
 		return "", fmt.Errorf("notify channel not enabled, please enable it first")
 	}
-
-	// 获取站点URL用于模板渲染
-	siteUrl, _ := models.ConfigsGetSiteUrl(ctx)
-	if siteUrl == "" {
-		siteUrl = "http://127.0.0.1:17000"
-	}
-
 	tplContent := make(map[string]interface{})
 	if notifyChannel.RequestType != "flashduty" {
 		messageTemplates, err := models.MessageTemplateGets(ctx, notifyConfig.TemplateID, "", "")
@@ -199,14 +188,14 @@ func SendNotifyChannelMessage(ctx *ctx.Context, userCache *memsto.UserCacheType,
 		if len(messageTemplates) == 0 {
 			return "", fmt.Errorf("message template not found")
 		}
-		tplContent = messageTemplates[0].RenderEvent(events, siteUrl)
+		tplContent = messageTemplates[0].RenderEvent(events)
 	}
 	var contactKey string
 	if notifyChannel.ParamConfig != nil && notifyChannel.ParamConfig.UserInfo != nil {
 		contactKey = notifyChannel.ParamConfig.UserInfo.ContactKey
 	}
 
-	sendtos, flashDutyChannelIDs, pagerDutyRoutingKeys, customParams := dispatch.GetNotifyConfigParams(&notifyConfig, contactKey, userCache, userGroup)
+	sendtos, flashDutyChannelIDs, customParams := dispatch.GetNotifyConfigParams(&notifyConfig, contactKey, userCache, userGroup)
 
 	var resp string
 	switch notifyChannel.RequestType {
@@ -222,21 +211,7 @@ func SendNotifyChannelMessage(ctx *ctx.Context, userCache *memsto.UserCacheType,
 				return "", fmt.Errorf("failed to send flashduty notify: %v", err)
 			}
 		}
-		logger.Infof("channel_name: %v, event:%s, tplContent:%s, customParams:%v, respBody: %v, err: %v", notifyChannel.Name, events[0].Hash, tplContent, customParams, resp, err)
-		return resp, nil
-	case "pagerduty":
-		client, err := models.GetHTTPClient(notifyChannel)
-		if err != nil {
-			return "", fmt.Errorf("failed to get http client: %v", err)
-		}
-
-		for _, routingKey := range pagerDutyRoutingKeys {
-			resp, err = notifyChannel.SendPagerDuty(events, routingKey, siteUrl, client)
-			if err != nil {
-				return "", fmt.Errorf("failed to send pagerduty notify: %v", err)
-			}
-		}
-		logger.Infof("channel_name: %v, event:%s, tplContent:%s, customParams:%v, respBody: %v, err: %v", notifyChannel.Name, events[0].Hash, tplContent, customParams, resp, err)
+		logger.Infof("channel_name: %v, event:%+v, tplContent:%s, customParams:%v, respBody: %v, err: %v", notifyChannel.Name, events[0], tplContent, customParams, resp, err)
 		return resp, nil
 	case "http":
 		client, err := models.GetHTTPClient(notifyChannel)
@@ -254,7 +229,7 @@ func SendNotifyChannelMessage(ctx *ctx.Context, userCache *memsto.UserCacheType,
 
 		if dispatch.NeedBatchContacts(notifyChannel.RequestConfig.HTTPRequestConfig) || len(sendtos) == 0 {
 			resp, err = notifyChannel.SendHTTP(events, tplContent, customParams, sendtos, client)
-			logger.Infof("channel_name: %v, event:%s, sendtos:%+v, tplContent:%s, customParams:%v, respBody: %v, err: %v", notifyChannel.Name, events[0].Hash, sendtos, tplContent, customParams, resp, err)
+			logger.Infof("channel_name: %v, event:%+v, sendtos:%+v, tplContent:%s, customParams:%v, respBody: %v, err: %v", notifyChannel.Name, events[0], sendtos, tplContent, customParams, resp, err)
 			if err != nil {
 				return "", fmt.Errorf("failed to send http notify: %v", err)
 			}
@@ -262,7 +237,7 @@ func SendNotifyChannelMessage(ctx *ctx.Context, userCache *memsto.UserCacheType,
 		} else {
 			for i := range sendtos {
 				resp, err = notifyChannel.SendHTTP(events, tplContent, customParams, []string{sendtos[i]}, client)
-				logger.Infof("channel_name: %v, event:%s,  tplContent:%s, customParams:%v, sendto:%+v, respBody: %v, err: %v", notifyChannel.Name, events[0].Hash, tplContent, customParams, sendtos[i], resp, err)
+				logger.Infof("channel_name: %v, event:%+v,  tplContent:%s, customParams:%v, sendto:%+v, respBody: %v, err: %v", notifyChannel.Name, events[0], tplContent, customParams, sendtos[i], resp, err)
 				if err != nil {
 					return "", fmt.Errorf("failed to send http notify: %v", err)
 				}
@@ -281,7 +256,7 @@ func SendNotifyChannelMessage(ctx *ctx.Context, userCache *memsto.UserCacheType,
 		return resp, nil
 	case "script":
 		resp, _, err := notifyChannel.SendScript(events, tplContent, customParams, sendtos)
-		logger.Infof("channel_name: %v, event:%s, tplContent:%s, customParams:%v, respBody: %v, err: %v", notifyChannel.Name, events[0].Hash, tplContent, customParams, resp, err)
+		logger.Infof("channel_name: %v, event:%+v, tplContent:%s, customParams:%v, respBody: %v, err: %v", notifyChannel.Name, events[0], tplContent, customParams, resp, err)
 		return resp, err
 	default:
 		logger.Errorf("unsupported request type: %v", notifyChannel.RequestType)
@@ -339,8 +314,8 @@ func (rt *Router) notifyRuleCustomParamsGet(c *gin.Context) {
 			filterKey := ""
 			for key, value := range nc.Params {
 				// 找到在通知媒介中的自定义变量配置项，进行 cname 转换
-				cname, exists := keyMap[key]
-				if exists {
+				cname, exsits := keyMap[key]
+				if exsits {
 					list = append(list, paramList{
 						Name:  key,
 						CName: cname,

center/router/router_notify_tpl.go

@@ -11,9 +11,9 @@ import (
 	"github.com/ccfos/nightingale/v6/center/cconf"
 	"github.com/ccfos/nightingale/v6/models"
 	"github.com/ccfos/nightingale/v6/pkg/tplx"
-	"github.com/ccfos/nightingale/v6/pkg/ginx"
 
 	"github.com/gin-gonic/gin"
+	"github.com/toolkits/pkg/ginx"
 	"github.com/toolkits/pkg/str"
 )
 
@@ -25,14 +25,11 @@ func (rt *Router) notifyTplGets(c *gin.Context) {
 	m[models.EmailSubject] = struct{}{}
 
 	lst, err := models.NotifyTplGets(rt.Ctx)
-	ginx.Dangerous(err)
-
 	for i := 0; i < len(lst); i++ {
 		if _, exists := m[lst[i].Channel]; exists {
 			lst[i].BuiltIn = true
 		}
 	}
-	models.FillUpdateByNicknames(rt.Ctx, lst)
 
 	ginx.NewRender(c).Data(lst, err)
 }
@@ -203,9 +200,6 @@ func (rt *Router) messageTemplateGets(c *gin.Context) {
 	ident := ginx.QueryStr(c, "ident", "")
 
 	tpls, err := models.MessageTemplateGets(rt.Ctx, id, name, ident)
-	if err == nil {
-		models.FillUpdateByNicknames(rt.Ctx, tpls)
-	}
 
 	ginx.NewRender(c).Data(tpls, err)
 }

center/router/router_opensearch.go

@@ -3,9 +3,9 @@ package router
 import (
 	"github.com/ccfos/nightingale/v6/datasource/opensearch"
 	"github.com/ccfos/nightingale/v6/dscache"
-	"github.com/ccfos/nightingale/v6/pkg/ginx"
 
 	"github.com/gin-gonic/gin"
+	"github.com/toolkits/pkg/ginx"
 	"github.com/toolkits/pkg/logger"
 )
 

center/router/router_proxy.go

@@ -2,6 +2,7 @@ package router
 
 import (
 	"context"
+	"crypto/tls"
 	"fmt"
 	"net"
 	"net/http"
@@ -12,13 +13,12 @@ import (
 	"sync"
 	"time"
 
-	"github.com/ccfos/nightingale/v6/pkg/logx"
 	"github.com/ccfos/nightingale/v6/pkg/poster"
 	pkgprom "github.com/ccfos/nightingale/v6/pkg/prom"
 	"github.com/ccfos/nightingale/v6/prom"
-	"github.com/ccfos/nightingale/v6/pkg/ginx"
 	"github.com/gin-gonic/gin"
 	"github.com/prometheus/common/model"
+	"github.com/toolkits/pkg/ginx"
 	"github.com/toolkits/pkg/logger"
 	"github.com/toolkits/pkg/net/httplib"
 )
@@ -39,16 +39,15 @@ func (rt *Router) promBatchQueryRange(c *gin.Context) {
 	var f BatchQueryForm
 	ginx.Dangerous(c.BindJSON(&f))
 
-	lst, err := PromBatchQueryRange(c.Request.Context(), rt.PromClients, f)
+	lst, err := PromBatchQueryRange(rt.PromClients, f)
 	ginx.NewRender(c).Data(lst, err)
 }
 
-func PromBatchQueryRange(ctx context.Context, pc *prom.PromClientMap, f BatchQueryForm) ([]model.Value, error) {
+func PromBatchQueryRange(pc *prom.PromClientMap, f BatchQueryForm) ([]model.Value, error) {
 	var lst []model.Value
 
 	cli := pc.GetCli(f.DatasourceId)
 	if cli == nil {
-		logx.Warningf(ctx, "no such datasource id: %d", f.DatasourceId)
 		return lst, fmt.Errorf("no such datasource id: %d", f.DatasourceId)
 	}
 
@@ -59,9 +58,8 @@ func PromBatchQueryRange(ctx context.Context, pc *prom.PromClientMap, f BatchQue
 			Step:  time.Duration(item.Step) * time.Second,
 		}
 
-		resp, _, err := cli.QueryRange(ctx, item.Query, r)
+		resp, _, err := cli.QueryRange(context.Background(), item.Query, r)
 		if err != nil {
-			logx.Warningf(ctx, "query range error: query:%s err:%v", item.Query, err)
 			return lst, err
 		}
 
@@ -84,23 +82,22 @@ func (rt *Router) promBatchQueryInstant(c *gin.Context) {
 	var f BatchInstantForm
 	ginx.Dangerous(c.BindJSON(&f))
 
-	lst, err := PromBatchQueryInstant(c.Request.Context(), rt.PromClients, f)
+	lst, err := PromBatchQueryInstant(rt.PromClients, f)
 	ginx.NewRender(c).Data(lst, err)
 }
 
-func PromBatchQueryInstant(ctx context.Context, pc *prom.PromClientMap, f BatchInstantForm) ([]model.Value, error) {
+func PromBatchQueryInstant(pc *prom.PromClientMap, f BatchInstantForm) ([]model.Value, error) {
 	var lst []model.Value
 
 	cli := pc.GetCli(f.DatasourceId)
 	if cli == nil {
-		logx.Warningf(ctx, "no such datasource id: %d", f.DatasourceId)
+		logger.Warningf("no such datasource id: %d", f.DatasourceId)
 		return lst, fmt.Errorf("no such datasource id: %d", f.DatasourceId)
 	}
 
 	for _, item := range f.Queries {
-		resp, _, err := cli.Query(ctx, item.Query, time.Unix(item.Time, 0))
+		resp, _, err := cli.Query(context.Background(), item.Query, time.Unix(item.Time, 0))
 		if err != nil {
-			logx.Warningf(ctx, "query instant error: query:%s err:%v", item.Query, err)
 			return lst, err
 		}
 
@@ -151,8 +148,6 @@ func (rt *Router) dsProxy(c *gin.Context) {
 
 		if ds.AuthJson.BasicAuthUser != "" {
 			req.SetBasicAuth(ds.AuthJson.BasicAuthUser, ds.AuthJson.BasicAuthPassword)
-		} else {
-			req.Header.Del("Authorization")
 		}
 
 		headerCount := len(ds.HTTPJson.Headers)
@@ -172,15 +167,8 @@ func (rt *Router) dsProxy(c *gin.Context) {
 
 	transport, has := transportGet(dsId, ds.UpdatedAt)
 	if !has {
-		// 使用 TLS 配置（支持 mTLS）
-		tlsConfig, err := ds.HTTPJson.TLS.TLSConfig()
-		if err != nil {
-			c.String(http.StatusInternalServerError, "failed to create TLS config: %s", err.Error())
-			return
-		}
-
 		transport = &http.Transport{
-			TLSClientConfig: tlsConfig,
+			TLSClientConfig: &tls.Config{InsecureSkipVerify: ds.HTTPJson.TLS.SkipTlsVerify},
 			Proxy:           http.ProxyFromEnvironment,
 			DialContext: (&net.Dialer{
 				Timeout: time.Duration(ds.HTTPJson.DialTimeout) * time.Millisecond,
@@ -193,7 +181,7 @@ func (rt *Router) dsProxy(c *gin.Context) {
 
 	modifyResponse := func(r *http.Response) error {
 		if r.StatusCode == http.StatusUnauthorized {
-			logx.Warningf(c.Request.Context(), "proxy path:%s unauthorized access ", c.Request.URL.Path)
+			logger.Warningf("proxy path:%s unauthorized access ", c.Request.URL.Path)
 			return fmt.Errorf("unauthorized access")
 		}
 
@@ -288,11 +276,11 @@ func (rt *Router) deleteDatasourceSeries(c *gin.Context) {
 	}
 
 	timeout := time.Duration(ds.HTTPJson.DialTimeout) * time.Millisecond
-	matchQueries := make([]string, 0)
+	matchQuerys := make([]string, 0)
 	for _, match := range ddsf.Match {
-		matchQueries = append(matchQueries, fmt.Sprintf("match[]=%s", match))
+		matchQuerys = append(matchQuerys, fmt.Sprintf("match[]=%s", match))
 	}
-	matchQuery := strings.Join(matchQueries, "&")
+	matchQuery := strings.Join(matchQuerys, "&")
 
 	switch datasourceType {
 	case DatasourceTypePrometheus:

center/router/router_query.go

@@ -5,17 +5,14 @@ import (
 	"sort"
 	"sync"
 
-	"github.com/ccfos/nightingale/v6/alert/eval"
 	"github.com/ccfos/nightingale/v6/dscache"
 	"github.com/ccfos/nightingale/v6/models"
-	"github.com/ccfos/nightingale/v6/pkg/logx"
-	"github.com/ccfos/nightingale/v6/pkg/ginx"
 	"github.com/gin-gonic/gin"
+	"github.com/toolkits/pkg/ginx"
+	"github.com/toolkits/pkg/logger"
 )
 
-type CheckDsPermFunc func(c *gin.Context, dsId int64, cate string, q interface{}) bool
-
-var CheckDsPerm CheckDsPermFunc = func(c *gin.Context, dsId int64, cate string, q interface{}) bool {
+func CheckDsPerm(c *gin.Context, dsId int64, cate string, q interface{}) bool {
 	// todo: 后续需要根据 cate 判断是否需要权限
 	return true
 }
@@ -47,7 +44,6 @@ func QueryLogBatchConcurrently(anonymousAccess bool, ctx *gin.Context, f QueryFr
 	var mu sync.Mutex
 	var wg sync.WaitGroup
 	var errs []error
-	rctx := ctx.Request.Context()
 
 	for _, q := range f.Queries {
 		if !anonymousAccess && !CheckDsPerm(ctx, q.Did, q.DsCate, q) {
@@ -56,27 +52,20 @@ func QueryLogBatchConcurrently(anonymousAccess bool, ctx *gin.Context, f QueryFr
 
 		plug, exists := dscache.DsCache.Get(q.DsCate, q.Did)
 		if !exists {
-			logx.Warningf(rctx, "cluster:%d not exists query:%+v", q.Did, q)
+			logger.Warningf("cluster:%d not exists query:%+v", q.Did, q)
 			return LogResp{}, fmt.Errorf("cluster not exists")
 		}
 
-		// 根据数据源类型对 Query 进行模板渲染处理
-		err := eval.ExecuteQueryTemplate(q.DsCate, q.Query, nil)
-		if err != nil {
-			logx.Warningf(rctx, "query template execute error: %v", err)
-			return LogResp{}, fmt.Errorf("query template execute error: %v", err)
-		}
-
 		wg.Add(1)
 		go func(query Query) {
 			defer wg.Done()
 
-			data, total, err := plug.QueryLog(rctx, query.Query)
+			data, total, err := plug.QueryLog(ctx.Request.Context(), query.Query)
 			mu.Lock()
 			defer mu.Unlock()
 			if err != nil {
 				errMsg := fmt.Sprintf("query data error: %v query:%v\n ", err, query)
-				logx.Warningf(rctx, "%s", errMsg)
+				logger.Warningf(errMsg)
 				errs = append(errs, err)
 				return
 			}
@@ -122,16 +111,15 @@ func QueryDataConcurrently(anonymousAccess bool, ctx *gin.Context, f models.Quer
 	var mu sync.Mutex
 	var wg sync.WaitGroup
 	var errs []error
-	rctx := ctx.Request.Context()
 
-	for _, q := range f.Queries {
+	for _, q := range f.Querys {
 		if !anonymousAccess && !CheckDsPerm(ctx, f.DatasourceId, f.Cate, q) {
 			return nil, fmt.Errorf("forbidden")
 		}
 
 		plug, exists := dscache.DsCache.Get(f.Cate, f.DatasourceId)
 		if !exists {
-			logx.Warningf(rctx, "cluster:%d not exists", f.DatasourceId)
+			logger.Warningf("cluster:%d not exists", f.DatasourceId)
 			return nil, fmt.Errorf("cluster not exists")
 		}
 
@@ -139,18 +127,18 @@ func QueryDataConcurrently(anonymousAccess bool, ctx *gin.Context, f models.Quer
 		go func(query interface{}) {
 			defer wg.Done()
 
-			data, err := plug.QueryData(rctx, query)
+			datas, err := plug.QueryData(ctx.Request.Context(), query)
 			if err != nil {
-				logx.Warningf(rctx, "query data error: req:%+v err:%v", query, err)
+				logger.Warningf("query data error: req:%+v err:%v", query, err)
 				mu.Lock()
 				errs = append(errs, err)
 				mu.Unlock()
 				return
 			}
 
-			logx.Debugf(rctx, "query data: req:%+v resp:%+v", query, data)
+			logger.Debugf("query data: req:%+v resp:%+v", query, datas)
 			mu.Lock()
-			resp = append(resp, data...)
+			resp = append(resp, datas...)
 			mu.Unlock()
 		}(q)
 	}
@@ -194,16 +182,15 @@ func QueryLogConcurrently(anonymousAccess bool, ctx *gin.Context, f models.Query
 	var mu sync.Mutex
 	var wg sync.WaitGroup
 	var errs []error
-	rctx := ctx.Request.Context()
 
-	for _, q := range f.Queries {
+	for _, q := range f.Querys {
 		if !anonymousAccess && !CheckDsPerm(ctx, f.DatasourceId, f.Cate, q) {
 			return LogResp{}, fmt.Errorf("forbidden")
 		}
 
 		plug, exists := dscache.DsCache.Get(f.Cate, f.DatasourceId)
 		if !exists {
-			logx.Warningf(rctx, "cluster:%d not exists query:%+v", f.DatasourceId, f)
+			logger.Warningf("cluster:%d not exists query:%+v", f.DatasourceId, f)
 			return LogResp{}, fmt.Errorf("cluster not exists")
 		}
 
@@ -211,11 +198,11 @@ func QueryLogConcurrently(anonymousAccess bool, ctx *gin.Context, f models.Query
 		go func(query interface{}) {
 			defer wg.Done()
 
-			data, total, err := plug.QueryLog(rctx, query)
-			logx.Debugf(rctx, "query log: req:%+v resp:%+v", query, data)
+			data, total, err := plug.QueryLog(ctx.Request.Context(), query)
+			logger.Debugf("query log: req:%+v resp:%+v", query, data)
 			if err != nil {
 				errMsg := fmt.Sprintf("query data error: %v query:%v\n ", err, query)
-				logx.Warningf(rctx, "%s", errMsg)
+				logger.Warningf(errMsg)
 				mu.Lock()
 				errs = append(errs, err)
 				mu.Unlock()
@@ -253,23 +240,22 @@ func (rt *Router) QueryLogV2(c *gin.Context) {
 func (rt *Router) QueryLog(c *gin.Context) {
 	var f models.QueryParam
 	ginx.BindJSON(c, &f)
-	rctx := c.Request.Context()
 
 	var resp []interface{}
-	for _, q := range f.Queries {
+	for _, q := range f.Querys {
 		if !rt.Center.AnonymousAccess.PromQuerier && !CheckDsPerm(c, f.DatasourceId, f.Cate, q) {
 			ginx.Bomb(200, "forbidden")
 		}
 
 		plug, exists := dscache.DsCache.Get("elasticsearch", f.DatasourceId)
 		if !exists {
-			logx.Warningf(rctx, "cluster:%d not exists", f.DatasourceId)
+			logger.Warningf("cluster:%d not exists", f.DatasourceId)
 			ginx.Bomb(200, "cluster not exists")
 		}
 
-		data, _, err := plug.QueryLog(rctx, q)
+		data, _, err := plug.QueryLog(c.Request.Context(), q)
 		if err != nil {
-			logx.Warningf(rctx, "query data error: %v", err)
+			logger.Warningf("query data error: %v", err)
 			ginx.Bomb(200, "err:%v", err)
 			continue
 		}

center/router/router_recording_rule.go

@@ -7,17 +7,14 @@ import (
 
 	"github.com/ccfos/nightingale/v6/models"
 	"github.com/ccfos/nightingale/v6/pkg/strx"
-	"github.com/ccfos/nightingale/v6/pkg/ginx"
 
 	"github.com/gin-gonic/gin"
+	"github.com/toolkits/pkg/ginx"
 )
 
 func (rt *Router) recordingRuleGets(c *gin.Context) {
 	busiGroupId := ginx.UrlParamInt64(c, "id")
 	ars, err := models.RecordingRuleGets(rt.Ctx, busiGroupId)
-	if err == nil {
-		models.FillUpdateByNicknames(rt.Ctx, ars)
-	}
 	ginx.NewRender(c).Data(ars, err)
 }
 
@@ -42,9 +39,6 @@ func (rt *Router) recordingRuleGetsByGids(c *gin.Context) {
 	}
 
 	ars, err := models.RecordingRuleGetsByBGIds(rt.Ctx, gids)
-	if err == nil {
-		models.FillUpdateByNicknames(rt.Ctx, ars)
-	}
 	ginx.NewRender(c).Data(ars, err)
 }
 
@@ -118,7 +112,6 @@ func (rt *Router) recordingRulePutByFE(c *gin.Context) {
 	}
 
 	rt.bgrwCheck(c, ar.GroupId)
-	rt.bgroCheck(c, f.GroupId)
 
 	f.UpdateBy = c.MustGet("username").(string)
 	ginx.NewRender(c).Message(ar.Update(rt.Ctx, f))
@@ -156,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)

center/router/router_role.go

@@ -6,9 +6,9 @@ import (
 
 	"github.com/ccfos/nightingale/v6/center/cconf"
 	"github.com/ccfos/nightingale/v6/models"
-	"github.com/ccfos/nightingale/v6/pkg/ginx"
 
 	"github.com/gin-gonic/gin"
+	"github.com/toolkits/pkg/ginx"
 )
 
 func (rt *Router) rolesGets(c *gin.Context) {

center/router/router_role_operation.go

@@ -5,8 +5,8 @@ import (
 
 	"github.com/ccfos/nightingale/v6/center/cconf"
 	"github.com/ccfos/nightingale/v6/models"
-	"github.com/ccfos/nightingale/v6/pkg/ginx"
 	"github.com/gin-gonic/gin"
+	"github.com/toolkits/pkg/ginx"
 	"github.com/toolkits/pkg/i18n"
 )
 

center/router/router_saved_view.go

@@ -1,145 +0,0 @@
-package router
-
-import (
-	"net/http"
-
-	"github.com/ccfos/nightingale/v6/models"
-	"github.com/ccfos/nightingale/v6/pkg/slice"
-	"github.com/ccfos/nightingale/v6/pkg/ginx"
-
-	"github.com/gin-gonic/gin"
-)
-
-func (rt *Router) savedViewGets(c *gin.Context) {
-	page := ginx.QueryStr(c, "page", "")
-
-	me := c.MustGet("user").(*models.User)
-
-	lst, err := models.SavedViewGets(rt.Ctx, page)
-	if err != nil {
-		ginx.NewRender(c).Data(nil, err)
-		return
-	}
-	models.FillUpdateByNicknames(rt.Ctx, lst)
-
-	userGids, err := models.MyGroupIds(rt.Ctx, me.Id)
-	if err != nil {
-		ginx.NewRender(c).Data(nil, err)
-		return
-	}
-
-	favoriteMap, err := models.SavedViewFavoriteGetByUserId(rt.Ctx, me.Id)
-	if err != nil {
-		ginx.NewRender(c).Data(nil, err)
-		return
-	}
-
-	favoriteViews := make([]models.SavedView, 0)
-	normalViews := make([]models.SavedView, 0)
-
-	for _, view := range lst {
-		visible := view.CreateBy == me.Username ||
-			view.PublicCate == 2 ||
-			(view.PublicCate == 1 && slice.HaveIntersection[int64](userGids, view.Gids))
-
-		if !visible {
-			continue
-		}
-
-		view.IsFavorite = favoriteMap[view.Id]
-
-		// 收藏的排前面
-		if view.IsFavorite {
-			favoriteViews = append(favoriteViews, view)
-		} else {
-			normalViews = append(normalViews, view)
-		}
-	}
-
-	ginx.NewRender(c).Data(append(favoriteViews, normalViews...), nil)
-}
-
-func (rt *Router) savedViewAdd(c *gin.Context) {
-	var f models.SavedView
-	ginx.BindJSON(c, &f)
-
-	me := c.MustGet("user").(*models.User)
-	f.Id = 0
-	f.CreateBy = me.Username
-	f.UpdateBy = me.Username
-
-	err := models.SavedViewAdd(rt.Ctx, &f)
-	ginx.NewRender(c).Data(f.Id, err)
-}
-
-func (rt *Router) savedViewPut(c *gin.Context) {
-	id := ginx.UrlParamInt64(c, "id")
-
-	view, err := models.SavedViewGetById(rt.Ctx, id)
-	if err != nil {
-		ginx.NewRender(c).Data(nil, err)
-		return
-	}
-	if view == nil {
-		ginx.NewRender(c, http.StatusNotFound).Message("saved view not found")
-		return
-	}
-
-	me := c.MustGet("user").(*models.User)
-	// 只有创建者可以更新
-	if view.CreateBy != me.Username && !me.IsAdmin() {
-		ginx.NewRender(c, http.StatusForbidden).Message("forbidden")
-		return
-	}
-
-	var f models.SavedView
-	ginx.BindJSON(c, &f)
-
-	view.Name = f.Name
-	view.Filter = f.Filter
-	view.PublicCate = f.PublicCate
-	view.Gids = f.Gids
-
-	err = models.SavedViewUpdate(rt.Ctx, view, me.Username)
-	ginx.NewRender(c).Message(err)
-}
-
-func (rt *Router) savedViewDel(c *gin.Context) {
-	id := ginx.UrlParamInt64(c, "id")
-
-	view, err := models.SavedViewGetById(rt.Ctx, id)
-	if err != nil {
-		ginx.NewRender(c).Data(nil, err)
-		return
-	}
-	if view == nil {
-		ginx.NewRender(c, http.StatusNotFound).Message("saved view not found")
-		return
-	}
-
-	me := c.MustGet("user").(*models.User)
-	// 只有创建者或管理员可以删除
-	if view.CreateBy != me.Username && !me.IsAdmin() {
-		ginx.NewRender(c, http.StatusForbidden).Message("forbidden")
-		return
-	}
-
-	err = models.SavedViewDel(rt.Ctx, id)
-	ginx.NewRender(c).Message(err)
-}
-
-func (rt *Router) savedViewFavoriteAdd(c *gin.Context) {
-	id := ginx.UrlParamInt64(c, "id")
-	me := c.MustGet("user").(*models.User)
-
-	err := models.UserViewFavoriteAdd(rt.Ctx, id, me.Id)
-	ginx.NewRender(c).Message(err)
-}
-
-func (rt *Router) savedViewFavoriteDel(c *gin.Context) {
-	id := ginx.UrlParamInt64(c, "id")
-	me := c.MustGet("user").(*models.User)
-
-	err := models.UserViewFavoriteDel(rt.Ctx, id, me.Id)
-	ginx.NewRender(c).Message(err)
-}

center/router/router_self.go

@@ -5,10 +5,10 @@ import (
 	"github.com/ccfos/nightingale/v6/pkg/flashduty"
 	"github.com/ccfos/nightingale/v6/pkg/ormx"
 	"github.com/ccfos/nightingale/v6/pkg/secu"
-	"github.com/ccfos/nightingale/v6/pkg/ginx"
 	"github.com/google/uuid"
 
 	"github.com/gin-gonic/gin"
+	"github.com/toolkits/pkg/ginx"
 	"github.com/toolkits/pkg/logger"
 )
 

center/router/router_server.go

@@ -4,9 +4,9 @@ import (
 	"time"
 
 	"github.com/ccfos/nightingale/v6/models"
-	"github.com/ccfos/nightingale/v6/pkg/ginx"
 
 	"github.com/gin-gonic/gin"
+	"github.com/toolkits/pkg/ginx"
 )
 
 func (rt *Router) serversGet(c *gin.Context) {

center/router/router_source_token.go

@@ -5,10 +5,10 @@ import (
 	"time"
 
 	"github.com/ccfos/nightingale/v6/models"
-	"github.com/ccfos/nightingale/v6/pkg/ginx"
 	"github.com/google/uuid"
 
 	"github.com/gin-gonic/gin"
+	"github.com/toolkits/pkg/ginx"
 )
 
 // sourceTokenAdd 生成新的源令牌

center/router/router_target.go

@@ -11,12 +11,11 @@ import (
 	"github.com/ccfos/nightingale/v6/models"
 	"github.com/ccfos/nightingale/v6/pkg/ctx"
 	"github.com/ccfos/nightingale/v6/pkg/strx"
-	"github.com/ccfos/nightingale/v6/pushgw/idents"
 	"github.com/ccfos/nightingale/v6/storage"
-	"github.com/ccfos/nightingale/v6/pkg/ginx"
 
 	"github.com/gin-gonic/gin"
 	"github.com/prometheus/common/model"
+	"github.com/toolkits/pkg/ginx"
 	"github.com/toolkits/pkg/logger"
 )
 
@@ -38,16 +37,6 @@ func (rt *Router) targetGetsByHostFilter(c *gin.Context) {
 	total, err := models.TargetCountByFilter(rt.Ctx, query)
 	ginx.Dangerous(err)
 
-	models.FillTargetsBeatTime(rt.Redis, hosts)
-	now := time.Now().Unix()
-	for i := 0; i < len(hosts); i++ {
-		if now-hosts[i].BeatTime < 60 {
-			hosts[i].TargetUp = 2
-		} else if now-hosts[i].BeatTime < 180 {
-			hosts[i].TargetUp = 1
-		}
-	}
-
 	ginx.NewRender(c).Data(gin.H{
 		"list":  hosts,
 		"total": total,
@@ -91,24 +80,9 @@ func (rt *Router) targetGets(c *gin.Context) {
 		models.BuildTargetWhereWithBgids(bgids),
 		models.BuildTargetWhereWithDsIds(dsIds),
 		models.BuildTargetWhereWithQuery(query),
+		models.BuildTargetWhereWithDowntime(downtime),
 		models.BuildTargetWhereWithHosts(hosts),
 	}
-
-	// downtime 筛选：从缓存获取心跳时间，选择较小的集合用 IN 或 NOT IN 过滤
-	if downtime != 0 {
-		downtimeOpt, hasMatch := rt.downtimeFilter(downtime)
-		if !hasMatch {
-			ginx.NewRender(c).Data(gin.H{
-				"list":  []*models.Target{},
-				"total": 0,
-			}, nil)
-			return
-		}
-		if downtimeOpt != nil {
-			options = append(options, downtimeOpt)
-		}
-	}
-
 	total, err := models.TargetTotal(rt.Ctx, options...)
 	ginx.Dangerous(err)
 
@@ -127,17 +101,14 @@ func (rt *Router) targetGets(c *gin.Context) {
 		now := time.Now()
 		cache := make(map[int64]*models.BusiGroup)
 
-		// 从 Redis 补全 BeatTime
-		models.FillTargetsBeatTime(rt.Redis, list)
-
 		var keys []string
 		for i := 0; i < len(list); i++ {
 			ginx.Dangerous(list[i].FillGroup(rt.Ctx, cache))
 			keys = append(keys, models.WrapIdent(list[i].Ident))
 
-			if now.Unix()-list[i].BeatTime < 60 {
+			if now.Unix()-list[i].UpdateAt < 60 {
 				list[i].TargetUp = 2
-			} else if now.Unix()-list[i].BeatTime < 180 {
+			} else if now.Unix()-list[i].UpdateAt < 180 {
 				list[i].TargetUp = 1
 			}
 		}
@@ -176,43 +147,6 @@ func (rt *Router) targetGets(c *gin.Context) {
 	}, nil)
 }
 
-// downtimeFilter 从缓存获取心跳时间，生成 downtime 筛选条件
-// 选择匹配集和非匹配集中较小的一方，用 IN 或 NOT IN 来减少 SQL 参数量
-// 返回值：
-//   - option: 筛选条件，nil 表示所有 target 都符合条件（无需过滤）
-//   - hasMatch: 是否有符合条件的 target，false 表示无匹配应返回空结果
-func (rt *Router) downtimeFilter(downtime int64) (option models.BuildTargetWhereOption, hasMatch bool) {
-	now := time.Now().Unix()
-	targets := rt.TargetCache.GetAll()
-	var matchIdents, nonMatchIdents []string
-	for _, target := range targets {
-		matched := false
-		if downtime > 0 {
-			matched = target.BeatTime < now-downtime
-		} else if downtime < 0 {
-			matched = target.BeatTime > now+downtime
-		}
-		if matched {
-			matchIdents = append(matchIdents, target.Ident)
-		} else {
-			nonMatchIdents = append(nonMatchIdents, target.Ident)
-		}
-	}
-
-	if len(matchIdents) == 0 {
-		return nil, false
-	}
-
-	if len(nonMatchIdents) == 0 {
-		return nil, true
-	}
-
-	if len(matchIdents) <= len(nonMatchIdents) {
-		return models.BuildTargetWhereWithIdents(matchIdents), true
-	}
-	return models.BuildTargetWhereExcludeIdents(nonMatchIdents), true
-}
-
 func (rt *Router) targetExtendInfoByIdent(c *gin.Context) {
 	ident := ginx.QueryStr(c, "ident", "")
 	key := models.WrapExtendIdent(ident)
@@ -667,10 +601,3 @@ func (rt *Router) targetsOfHostQuery(c *gin.Context) {
 
 	ginx.NewRender(c).Data(lst, nil)
 }
-
-func (rt *Router) targetUpdate(c *gin.Context) {
-	var f idents.TargetUpdate
-	ginx.BindJSON(c, &f)
-
-	ginx.NewRender(c).Message(rt.IdentSet.UpdateTargets(f.Lst, f.Now))
-}

center/router/router_task.go

@@ -7,9 +7,9 @@ import (
 	"github.com/ccfos/nightingale/v6/alert/sender"
 	"github.com/ccfos/nightingale/v6/models"
 	"github.com/ccfos/nightingale/v6/pkg/strx"
-	"github.com/ccfos/nightingale/v6/pkg/ginx"
 
 	"github.com/gin-gonic/gin"
+	"github.com/toolkits/pkg/ginx"
 	"github.com/toolkits/pkg/i18n"
 )
 

center/router/router_task_tpl.go

@@ -8,9 +8,9 @@ import (
 
 	"github.com/ccfos/nightingale/v6/models"
 	"github.com/ccfos/nightingale/v6/pkg/strx"
-	"github.com/ccfos/nightingale/v6/pkg/ginx"
 
 	"github.com/gin-gonic/gin"
+	"github.com/toolkits/pkg/ginx"
 	"github.com/toolkits/pkg/i18n"
 	"github.com/toolkits/pkg/str"
 )
@@ -25,7 +25,6 @@ func (rt *Router) taskTplGets(c *gin.Context) {
 
 	list, err := models.TaskTplGets(rt.Ctx, []int64{groupId}, query, limit, ginx.Offset(c, limit))
 	ginx.Dangerous(err)
-	models.FillUpdateByNicknames(rt.Ctx, list)
 
 	ginx.NewRender(c).Data(gin.H{
 		"total": total,
@@ -61,7 +60,6 @@ func (rt *Router) taskTplGetsByGids(c *gin.Context) {
 
 	list, err := models.TaskTplGets(rt.Ctx, gids, query, limit, ginx.Offset(c, limit))
 	ginx.Dangerous(err)
-	models.FillUpdateByNicknames(rt.Ctx, list)
 
 	ginx.NewRender(c).Data(gin.H{
 		"total": total,

center/router/router_tdengine.go

@@ -2,14 +2,13 @@ package router
 
 import (
 	"fmt"
-	"net/http"
-
 	"github.com/ccfos/nightingale/v6/center/cconf"
 	"github.com/ccfos/nightingale/v6/datasource/tdengine"
 	"github.com/ccfos/nightingale/v6/dscache"
 	"github.com/ccfos/nightingale/v6/models"
-	"github.com/ccfos/nightingale/v6/pkg/ginx"
 	"github.com/gin-gonic/gin"
+	"github.com/toolkits/pkg/ginx"
+	"net/http"
 )
 
 type databasesQueryForm struct {

center/router/router_trace_logs.go

@@ -1,136 +0,0 @@
-package router
-
-import (
-	"encoding/json"
-	"fmt"
-	"io"
-	"net/http"
-	"time"
-
-	"github.com/ccfos/nightingale/v6/models"
-	"github.com/ccfos/nightingale/v6/pkg/ginx"
-	"github.com/ccfos/nightingale/v6/pkg/loggrep"
-	"github.com/toolkits/pkg/logger"
-
-	"github.com/gin-gonic/gin"
-)
-
-// traceLogsPage renders an HTML log viewer page for trace logs.
-func (rt *Router) traceLogsPage(c *gin.Context) {
-	traceId := ginx.UrlParamStr(c, "traceid")
-	if !loggrep.IsValidTraceID(traceId) {
-		c.String(http.StatusBadRequest, "invalid trace id format")
-		return
-	}
-
-	logs, instance, err := rt.getTraceLogs(traceId)
-	if err != nil {
-		c.String(http.StatusInternalServerError, "Error: %v", err)
-		return
-	}
-
-	c.Header("Content-Type", "text/html; charset=utf-8")
-	err = loggrep.RenderTraceLogsHTML(c.Writer, loggrep.TraceLogsPageData{
-		TraceID:  traceId,
-		Instance: instance,
-		Logs:     logs,
-		Total:    len(logs),
-	})
-	if err != nil {
-		c.String(http.StatusInternalServerError, "render error: %v", err)
-	}
-}
-
-// traceLogsJSON returns JSON for trace logs.
-func (rt *Router) traceLogsJSON(c *gin.Context) {
-	traceId := ginx.UrlParamStr(c, "traceid")
-	if !loggrep.IsValidTraceID(traceId) {
-		ginx.Bomb(200, "invalid trace id format")
-	}
-
-	logs, instance, err := rt.getTraceLogs(traceId)
-	ginx.Dangerous(err)
-
-	ginx.NewRender(c).Data(loggrep.EventDetailResp{
-		Logs:     logs,
-		Instance: instance,
-	}, nil)
-}
-
-// getTraceLogs finds the same-engine instances and queries each one
-// until trace logs are found. Trace logs belong to a single instance.
-func (rt *Router) getTraceLogs(traceId string) ([]string, string, error) {
-	keyword := "trace_id=" + traceId
-	instance := fmt.Sprintf("%s:%d", rt.Alert.Heartbeat.IP, rt.HTTP.Port)
-	engineName := rt.Alert.Heartbeat.EngineName
-
-	// try local first
-	logs, err := loggrep.GrepLatestLogFiles(rt.LogDir, keyword)
-	if err == nil && len(logs) > 0 {
-		return logs, instance, nil
-	}
-
-	// find all instances with the same engineName
-	servers, err := models.AlertingEngineGetsInstances(rt.Ctx,
-		"engine_cluster = ? and clock > ?",
-		engineName, time.Now().Unix()-30)
-	if err != nil {
-		return nil, "", err
-	}
-
-	// loop through remote instances until we find logs
-	for _, node := range servers {
-		if node == instance {
-			continue // already tried local
-		}
-
-		logs, nodeAddr, err := rt.forwardTraceLogs(node, traceId)
-		if err != nil {
-			logger.Errorf("forwardTraceLogs failed: %v", err)
-			continue
-		}
-		if len(logs) > 0 {
-			return logs, nodeAddr, nil
-		}
-	}
-
-	return nil, instance, nil
-}
-
-func (rt *Router) forwardTraceLogs(node, traceId string) ([]string, string, error) {
-	url := fmt.Sprintf("http://%s/v1/n9e/trace-logs/%s", node, traceId)
-	req, err := http.NewRequest("GET", url, nil)
-	if err != nil {
-		return nil, node, err
-	}
-
-	for user, pass := range rt.HTTP.APIForService.BasicAuth {
-		req.SetBasicAuth(user, pass)
-		break
-	}
-
-	client := &http.Client{Timeout: 15 * time.Second}
-	resp, err := client.Do(req)
-	if err != nil {
-		return nil, node, fmt.Errorf("forward to %s failed: %v", node, err)
-	}
-	defer resp.Body.Close()
-
-	body, err := io.ReadAll(io.LimitReader(resp.Body, 10*1024*1024))
-	if err != nil {
-		return nil, node, err
-	}
-
-	var result struct {
-		Dat loggrep.EventDetailResp `json:"dat"`
-		Err string                  `json:"err"`
-	}
-	if err := json.Unmarshal(body, &result); err != nil {
-		return nil, node, err
-	}
-	if result.Err != "" {
-		return nil, node, fmt.Errorf("%s", result.Err)
-	}
-
-	return result.Dat.Logs, result.Dat.Instance, nil
-}

center/router/router_user.go

@@ -1,7 +1,6 @@
 package router
 
 import (
-	"fmt"
 	"net/http"
 	"strings"
 
@@ -9,11 +8,10 @@ import (
 	"github.com/ccfos/nightingale/v6/pkg/flashduty"
 	"github.com/ccfos/nightingale/v6/pkg/ormx"
 	"github.com/ccfos/nightingale/v6/pkg/secu"
-	"github.com/ccfos/nightingale/v6/pkg/ginx"
 
 	"github.com/gin-gonic/gin"
+	"github.com/toolkits/pkg/ginx"
 	"github.com/toolkits/pkg/logger"
-	"gorm.io/gorm"
 )
 
 func (rt *Router) userBusiGroupsGets(c *gin.Context) {
@@ -235,16 +233,6 @@ func (rt *Router) userDel(c *gin.Context) {
 		return
 	}
 
-	// 如果要删除的用户是 admin 角色，检查是否是最后一个 admin
-	if target.IsAdmin() {
-		adminCount, err := models.CountAdminUsers(rt.Ctx)
-		ginx.Dangerous(err)
-
-		if adminCount <= 1 {
-			ginx.Bomb(http.StatusBadRequest, "Cannot delete the last admin user")
-		}
-	}
-
 	ginx.NewRender(c).Message(target.Del(rt.Ctx))
 }
 
@@ -264,210 +252,3 @@ func (rt *Router) installDateGet(c *gin.Context) {
 
 	ginx.NewRender(c).Data(rootUser.CreateAt, nil)
 }
-
-// usersPhoneEncrypt 统一手机号加密
-func (rt *Router) usersPhoneEncrypt(c *gin.Context) {
-	users, err := models.UserGetAll(rt.Ctx)
-	if err != nil {
-		ginx.NewRender(c).Message(fmt.Errorf("get users failed: %v", err))
-		return
-	}
-
-	// 获取RSA密钥
-	_, publicKey, _, err := models.GetRSAKeys(rt.Ctx)
-	if err != nil {
-		ginx.NewRender(c).Message(fmt.Errorf("get RSA keys failed: %v", err))
-		return
-	}
-
-	// 先启用手机号加密功能
-	err = models.SetPhoneEncryptionEnabled(rt.Ctx, true)
-	if err != nil {
-		ginx.NewRender(c).Message(fmt.Errorf("enable phone encryption failed: %v", err))
-		return
-	}
-
-	// 刷新配置缓存
-	err = models.RefreshPhoneEncryptionCache(rt.Ctx)
-	if err != nil {
-		logger.Errorf("Failed to refresh phone encryption cache: %v", err)
-		// 回滚配置
-		models.SetPhoneEncryptionEnabled(rt.Ctx, false)
-		ginx.NewRender(c).Message(fmt.Errorf("refresh cache failed: %v", err))
-		return
-	}
-
-	successCount := 0
-	failCount := 0
-	var failedUsers []string
-
-	// 使用事务处理所有用户的手机号加密
-	err = models.DB(rt.Ctx).Transaction(func(tx *gorm.DB) error {
-		// 对每个用户的手机号进行加密
-		for _, user := range users {
-			if user.Phone == "" {
-				continue
-			}
-
-			if isPhoneEncrypted(user.Phone) {
-				continue
-			}
-
-			encryptedPhone, err := secu.EncryptValue(user.Phone, publicKey)
-			if err != nil {
-				logger.Errorf("Failed to encrypt phone for user %s: %v", user.Username, err)
-				failCount++
-				failedUsers = append(failedUsers, user.Username)
-				continue
-			}
-
-			err = tx.Model(&models.User{}).Where("id = ?", user.Id).Update("phone", encryptedPhone).Error
-			if err != nil {
-				logger.Errorf("Failed to update phone for user %s: %v", user.Username, err)
-				failCount++
-				failedUsers = append(failedUsers, user.Username)
-				continue
-			}
-
-			successCount++
-			logger.Debugf("Successfully encrypted phone for user %s", user.Username)
-		}
-
-		// 如果有失败的用户，回滚事务
-		if failCount > 0 {
-			return fmt.Errorf("encrypt failed users: %d, failed users: %v", failCount, failedUsers)
-		}
-
-		return nil
-	})
-
-	if err != nil {
-		// 加密失败，回滚配置
-		models.SetPhoneEncryptionEnabled(rt.Ctx, false)
-		models.RefreshPhoneEncryptionCache(rt.Ctx)
-		ginx.NewRender(c).Message(fmt.Errorf("encrypt phone failed: %v", err))
-		return
-	}
-
-	ginx.NewRender(c).Data(gin.H{
-		"success_count": successCount,
-		"fail_count":    failCount,
-	}, nil)
-}
-
-func (rt *Router) usersPhoneDecryptRefresh(c *gin.Context) {
-	err := models.RefreshPhoneEncryptionCache(rt.Ctx)
-	if err != nil {
-		ginx.NewRender(c).Message(fmt.Errorf("refresh phone encryption cache failed: %v", err))
-		return
-	}
-
-	ginx.NewRender(c).Message(nil)
-}
-
-// usersPhoneDecrypt 统一手机号解密
-func (rt *Router) usersPhoneDecrypt(c *gin.Context) {
-	// 先关闭手机号加密功能
-	err := models.SetPhoneEncryptionEnabled(rt.Ctx, false)
-	if err != nil {
-		ginx.NewRender(c).Message(fmt.Errorf("disable phone encryption failed: %v", err))
-		return
-	}
-
-	// 刷新配置缓存
-	err = models.RefreshPhoneEncryptionCache(rt.Ctx)
-	if err != nil {
-		logger.Errorf("Failed to refresh phone encryption cache: %v", err)
-		// 回滚配置
-		models.SetPhoneEncryptionEnabled(rt.Ctx, true)
-		ginx.NewRender(c).Message(fmt.Errorf("refresh cache failed: %v", err))
-		return
-	}
-
-	// 获取所有用户（此时加密开关已关闭，直接读取数据库原始数据）
-	var users []*models.User
-	err = models.DB(rt.Ctx).Find(&users).Error
-	if err != nil {
-		// 回滚配置
-		models.SetPhoneEncryptionEnabled(rt.Ctx, true)
-		models.RefreshPhoneEncryptionCache(rt.Ctx)
-		ginx.NewRender(c).Message(fmt.Errorf("get users failed: %v", err))
-		return
-	}
-
-	// 获取RSA密钥
-	privateKey, _, password, err := models.GetRSAKeys(rt.Ctx)
-	if err != nil {
-		// 回滚配置
-		models.SetPhoneEncryptionEnabled(rt.Ctx, true)
-		models.RefreshPhoneEncryptionCache(rt.Ctx)
-		ginx.NewRender(c).Message(fmt.Errorf("get RSA keys failed: %v", err))
-		return
-	}
-
-	successCount := 0
-	failCount := 0
-	var failedUsers []string
-
-	// 使用事务处理所有用户的手机号解密
-	err = models.DB(rt.Ctx).Transaction(func(tx *gorm.DB) error {
-		// 对每个用户的手机号进行解密
-		for _, user := range users {
-			if user.Phone == "" {
-				continue
-			}
-
-			// 检查是否是加密的手机号
-			if !isPhoneEncrypted(user.Phone) {
-				continue
-			}
-
-			// 对手机号进行解密
-			decryptedPhone, err := secu.Decrypt(user.Phone, privateKey, password)
-			if err != nil {
-				logger.Errorf("Failed to decrypt phone for user %s: %v", user.Username, err)
-				failCount++
-				failedUsers = append(failedUsers, user.Username)
-				continue
-			}
-
-			// 直接更新数据库中的手机号字段（绕过GORM钩子）
-			err = tx.Model(&models.User{}).Where("id = ?", user.Id).Update("phone", decryptedPhone).Error
-			if err != nil {
-				logger.Errorf("Failed to update phone for user %s: %v", user.Username, err)
-				failCount++
-				failedUsers = append(failedUsers, user.Username)
-				continue
-			}
-
-			successCount++
-			logger.Debugf("Successfully decrypted phone for user %s", user.Username)
-		}
-
-		// 如果有失败的用户，回滚事务
-		if failCount > 0 {
-			return fmt.Errorf("decrypt failed users: %d, failed users: %v", failCount, failedUsers)
-		}
-
-		return nil
-	})
-
-	if err != nil {
-		// 解密失败，回滚配置
-		models.SetPhoneEncryptionEnabled(rt.Ctx, true)
-		models.RefreshPhoneEncryptionCache(rt.Ctx)
-		ginx.NewRender(c).Message(fmt.Errorf("decrypt phone failed: %v", err))
-		return
-	}
-
-	ginx.NewRender(c).Data(gin.H{
-		"success_count": successCount,
-		"fail_count":    failCount,
-	}, nil)
-}
-
-// isPhoneEncrypted 检查手机号是否已经加密
-func isPhoneEncrypted(phone string) bool {
-	// 检查是否有 "enc:" 前缀标记
-	return len(phone) > 4 && phone[:4] == "enc:"
-}

center/router/router_user_group.go

@@ -7,9 +7,9 @@ import (
 	"github.com/ccfos/nightingale/v6/models"
 	"github.com/ccfos/nightingale/v6/pkg/flashduty"
 	"github.com/ccfos/nightingale/v6/pkg/strx"
-	"github.com/ccfos/nightingale/v6/pkg/ginx"
 
 	"github.com/gin-gonic/gin"
+	"github.com/toolkits/pkg/ginx"
 	"github.com/toolkits/pkg/logger"
 )
 
@@ -27,9 +27,6 @@ func (rt *Router) userGroupGets(c *gin.Context) {
 
 	me := c.MustGet("user").(*models.User)
 	lst, err := me.UserGroups(rt.Ctx, limit, query)
-	if err == nil {
-		models.FillUpdateByNicknames(rt.Ctx, lst)
-	}
 
 	ginx.NewRender(c).Data(lst, err)
 }