add stats

refactor callback
merge main
2026-03-03 14:38:55 +00:00 · 2024-08-01 15:18:49 +08:00 · 2024-08-01 15:12:03 +08:00 · 2024-07-30 15:58:31 +08:00 · 2024-07-30 15:57:15 +08:00 · 2024-07-30 15:47:25 +08:00
132 changed files with 3606 additions and 10209 deletions
--- a/README.md
+++ b/README.md
@@ -29,16 +29,15 @@

 ## 夜莺 Nightingale 是什么

-夜莺监控是一款开源云原生观测分析工具，采用 All-in-One 的设计理念，集数据采集、可视化、监控告警、数据分析于一体，与云原生生态紧密集成，提供开箱即用的企业级监控分析和告警能力。夜莺于 2020 年 3 月 20 日，在 GitHub 上发布 v1 版本，已累计迭代 100 多个版本。
+夜莺监控是一款开源云原生观测分析工具，采用 All-in-One 的设计理念，集数据采集、可视化、监控告警、数据分析于一体，与云原生生态紧密集成，提供开箱即用的企业级监控分析和告警能力。夜莺于 2020 年 3 月 20 日，在 github 上发布 v1 版本，已累计迭代 100 多个版本。

 夜莺最初由滴滴开发和开源，并于 2022 年 5 月 11 日，捐赠予中国计算机学会开源发展委员会（CCF ODC），为 CCF ODC 成立后接受捐赠的第一个开源项目。夜莺的核心研发团队，也是 Open-Falcon 项目原核心研发人员，从 2014 年（Open-Falcon 是 2014 年开源）算起来，也有 10 年了，只为把监控这个事情做好。


 ## 快速开始
- 👉 [文档中心](https://flashcat.cloud/docs/) | [下载中心](https://flashcat.cloud/download/nightingale/)
- ❤️ [报告 Bug](https://github.com/ccfos/nightingale/issues/new?assignees=&labels=&projects=&template=question.yml)
- ℹ️ 为了提供更快速的访问体验，上述文档和下载站点托管于 [FlashcatCloud](https://flashcat.cloud)
- 💡 前后端代码分离，前端代码仓库：[https://github.com/n9e/fe](https://github.com/n9e/fe)
+- 👉[文档中心](https://flashcat.cloud/docs/) | [下载中心](https://flashcat.cloud/download/nightingale/)
+- ❤️[报告 Bug](https://github.com/ccfos/nightingale/issues/new?assignees=&labels=&projects=&template=question.yml)
+- ℹ️为了提供更快速的访问体验，上述文档和下载站点托管于 [FlashcatCloud](https://flashcat.cloud)

 ## 功能特点

@@ -51,11 +50,6 @@

 ## 截图演示

-
-你可以在页面的右上角，切换语言和主题，目前我们支持英语、简体中文、繁体中文。
-
-![语言切换](https://download.flashcat.cloud/ulric/n9e-switch-i18n.png)
-
 即时查询，类似 Prometheus 内置的查询分析页面，做 ad-hoc 查询，夜莺做了一些 UI 优化，同时提供了一些内置 promql 指标，让不太了解 promql 的用户也可以快速查询。

 ![即时查询](https://download.flashcat.cloud/ulric/20240513103305.png)
@@ -89,16 +83,15 @@
 - 报告Bug，优先推荐提交[夜莺GitHub Issue](https://github.com/ccfos/nightingale/issues/new?assignees=&labels=kind%2Fbug&projects=&template=bug_report.yml)
 - 推荐完整浏览[夜莺文档站点](https://flashcat.cloud/docs/content/flashcat-monitor/nightingale-v7/introduction/)，了解更多信息
 - 推荐搜索关注夜莺公众号，第一时间获取社区动态：`夜莺监控Nightingale`
- 日常问题交流：
-  - QQ群：730841964
-  - [加入微信群](https://download.flashcat.cloud/ulric/20241022141621.png)，如果二维码过期了，可以联系我（我的微信：`picobyte`）拉群，备注： `夜莺互助群`
+- 日常问题交流推荐加入[知识星球](https://download.flashcat.cloud/ulric/20240319095409.png)，也可以加我微信 `picobyte`，备注：`夜莺加群-<公司>-<姓名>` 拉入微信群，不过研发人员主要是关注 github issue 和星球，微信群关注较少

 ## 广受关注
 [![Stargazers over time](https://api.star-history.com/svg?repos=ccfos/nightingale&type=Date)](https://star-history.com/#ccfos/nightingale&Date)

+
 ## 社区共建
- ❇️ 请阅读浏览[夜莺开源项目和社区治理架构草案](./doc/community-governance.md)，真诚欢迎每一位用户、开发者、公司以及组织，使用夜莺监控、积极反馈 Bug、提交功能需求、分享最佳实践，共建专业、活跃的夜莺开源社区。
- ❤️ 夜莺贡献者
+- ❇️请阅读浏览[夜莺开源项目和社区治理架构草案](./doc/community-governance.md)，真诚欢迎每一位用户、开发者、公司以及组织，使用夜莺监控、积极反馈 Bug、提交功能需求、分享最佳实践，共建专业、活跃的夜莺开源社区。
+- 夜莺贡献者❤️
 <a href="https://github.com/ccfos/nightingale/graphs/contributors">
  <img src="https://contrib.rocks/image?repo=ccfos/nightingale" />
 </a>
--- a/README_en.md
+++ b/README_en.md
@@ -1,113 +1,104 @@
 <p align="center">
  <a href="https://github.com/ccfos/nightingale">
-    <img src="doc/img/Nightingale_L_V.png" alt="nightingale - cloud native monitoring" width="100" /></a>
-</p>
-<p align="center">
-  <b>Open-source Alert Management Expert, an Integrated Observability Platform</b>
+    <img src="doc/img/Nightingale_L_V.png" alt="nightingale - cloud native monitoring" width="240" /></a>
 </p>

 <p align="center">
-<a href="https://flashcat.cloud/docs/">
+<img alt="GitHub latest release" src="https://img.shields.io/github/v/release/ccfos/nightingale"/>
+<a href="https://n9e.github.io">
  <img alt="Docs" src="https://img.shields.io/badge/docs-get%20started-brightgreen"/></a>
 <a href="https://hub.docker.com/u/flashcatcloud">
  <img alt="Docker pulls" src="https://img.shields.io/docker/pulls/flashcatcloud/nightingale"/></a>
+<img alt="GitHub Repo stars" src="https://img.shields.io/github/stars/ccfos/nightingale">
+<img alt="GitHub Repo issues" src="https://img.shields.io/github/issues/ccfos/nightingale">
+<img alt="GitHub Repo issues closed" src="https://img.shields.io/github/issues-closed/ccfos/nightingale">
+<img alt="GitHub forks" src="https://img.shields.io/github/forks/ccfos/nightingale">
 <a href="https://github.com/ccfos/nightingale/graphs/contributors">
  <img alt="GitHub contributors" src="https://img.shields.io/github/contributors-anon/ccfos/nightingale"/></a>
-<img alt="GitHub Repo stars" src="https://img.shields.io/github/stars/ccfos/nightingale">
-<img alt="GitHub forks" src="https://img.shields.io/github/forks/ccfos/nightingale">
-<br/><img alt="GitHub Repo issues" src="https://img.shields.io/github/issues/ccfos/nightingale">
-<img alt="GitHub Repo issues closed" src="https://img.shields.io/github/issues-closed/ccfos/nightingale">
-<img alt="GitHub latest release" src="https://img.shields.io/github/v/release/ccfos/nightingale"/>
-<img alt="License" src="https://img.shields.io/badge/license-Apache--2.0-blue"/>
 <a href="https://n9e-talk.slack.com/">
  <img alt="GitHub contributors" src="https://img.shields.io/badge/join%20slack-%23n9e-brightgreen.svg"/></a>
+<img alt="License" src="https://img.shields.io/badge/license-Apache--2.0-blue"/>
+</p>
+<p align="center">
+  An open-source cloud-native monitoring system that is <b>all-in-one</b> <br/>
+  <b>Out-of-the-box</b>, it integrates data collection, visualization, and monitoring alert <br/>
+  We recommend upgrading your <b>Prometheus + AlertManager + Grafana</b> combination to Nightingale!
 </p>
-
-

 [English](./README_en.md) | [中文](./README.md)

-## What is Nightingale

-Nightingale aims to combine the advantages of Prometheus and Grafana. It manages alert rules and visualizes metrics, logs, traces in a beautiful WebUI.
+## Highlighted Features

-Originally developed and open-sourced by Didi, Nightingale was donated to the China Computer Federation Open Source Development Committee (CCF ODC) on May 11, 2022, becoming the first open-source project accepted by the CCF ODC after its establishment. 
+- **Out-of-the-box**
+  - Supports multiple deployment methods such as **Docker, Helm Chart, and cloud services**, integrates data collection, monitoring, and alerting into one system, and comes with various monitoring dashboards, quick views, and alert rule templates. **It greatly reduces the construction cost, learning cost, and usage cost of cloud-native monitoring systems**.
+- **Professional Alerting**
+  - Provides visual alert configuration and management, supports various alert rules, offers the ability to configure silence and subscription rules, supports multiple alert delivery channels, and has features such as alert self-healing and event management.
+- **Cloud-Native**
+  - Quickly builds an enterprise-level cloud-native monitoring system through a turnkey approach, supports multiple collectors such as [Categraf](https://github.com/flashcatcloud/categraf), Telegraf, and Grafana-agent, supports multiple data sources such as Prometheus, VictoriaMetrics, M3DB, ElasticSearch, and Jaeger, and is compatible with importing Grafana dashboards. **It seamlessly integrates with the cloud-native ecosystem**.
+- **High Performance and High Availability**
+  - Due to the multi-data-source management engine of Nightingale and its excellent architecture design, and utilizing a high-performance time-series database, it can handle data collection, storage, and alert analysis scenarios with billions of time-series data, saving a lot of costs.
+  - Nightingale components can be horizontally scaled with no single point of failure. It has been deployed in thousands of enterprises and tested in harsh production practices. Many leading Internet companies have used Nightingale for cluster machines with hundreds of nodes, processing billions of time-series data.
+- **Flexible Extension and Centralized Management**
+  - Nightingale can be deployed on a 1-core 1G cloud host, deployed in a cluster of hundreds of machines, or run in Kubernetes. Time-series databases, alert engines, and other components can also be decentralized to various data centers and regions, balancing edge deployment with centralized management. **It solves the problem of data fragmentation and lack of unified views**.


-## Quick Start
+#### If you are using Prometheus and have one or more of the following requirement scenarios, it is recommended that you upgrade to Nightingale:

- 👉 [Documentation](https://flashcat.cloud/docs/) | [Download](https://flashcat.cloud/download/nightingale/)
- ❤️ [Report a Bug](https://github.com/ccfos/nightingale/issues/new?assignees=&labels=&projects=&template=question.yml)
- ℹ️ For faster access, the above documentation and download sites are hosted on [FlashcatCloud](https://flashcat.cloud).
+- Multiple systems such as Prometheus, Alertmanager, Grafana, etc. are fragmented and lack a unified view and cannot be used out of the box;
+- The way to manage Prometheus and Alertmanager by modifying configuration files has a big learning curve and is difficult to collaborate;
+- Too much data to scale-up your Prometheus cluster;
+- Multiple Prometheus clusters running in production environments, which faced high management and usage costs;

-## Features
+#### If you are using Zabbix and have the following scenarios, it is recommended that you upgrade to Nightingale:

- **Integration with Multiple Time-Series Databases:** Supports integration with various time-series databases such as Prometheus, VictoriaMetrics, Thanos, Mimir, M3DB, and TDengine, enabling unified alert management.
- **Advanced Alerting Capabilities:** Comes with built-in support for multiple alerting rules, extensible to common notification channels. It also supports alert suppression, silencing, subscription, self-healing, and alert event management.
- **High-Performance Visualization Engine:** Offers various chart styles with numerous built-in dashboard templates and the ability to import Grafana templates. Ready to use with a business-friendly open-source license.
- **Support for Common Collectors:** Compatible with [Categraf](https://flashcat.cloud/product/categraf), Telegraf, Grafana-agent, Datadog-agent, and various exporters as collectors—there's no data that can't be monitored.
- **Seamless Integration with [Flashduty](https://flashcat.cloud/product/flashcat-duty/):** Enables alert aggregation, acknowledgment, escalation, scheduling, and IM integration, ensuring no alerts are missed, reducing unnecessary interruptions, and enhancing efficient collaboration.
+- Monitoring too much data and wanting a better scalable solution;
+- A high learning curve and a desire for better efficiency of collaborative use in a multi-person, multi-team model;
+- Microservice and cloud-native architectures with variable monitoring data lifecycles and high monitoring data dimension bases, which are not easily adaptable to the Zabbix data model;


+#### If you are using [open-falcon](https://github.com/open-falcon/falcon-plus), we recommend you to upgrade to Nightingale：
+- For more information about open-falcon and Nightingale, please refer to read [Ten features and trends of cloud-native monitoring](https://mp.weixin.qq.com/s?__biz=MzkzNjI5OTM5Nw==&mid=2247483738&idx=1&sn=e8bdbb974a2cd003c1abcc2b5405dd18&chksm=c2a19fb0f5d616a63185cd79277a79a6b80118ef2185890d0683d2bb20451bd9303c78d083c5#rd)。
+
+## Getting Started
+
+[https://n9e.github.io/](https://n9e.github.io/)
+
 ## Screenshots

-You can switch languages and themes in the top right corner. We now support English, Simplified Chinese, and Traditional Chinese. 
-
-![18n switch](https://download.flashcat.cloud/ulric/n9e-switch-i18n.png)
-
-### Instant Query
-
-Similar to the built-in query analysis page in Prometheus, Nightingale offers an ad-hoc query feature with UI enhancements. It also provides built-in PromQL metrics, allowing users unfamiliar with PromQL to quickly perform queries.
-
-![Instant Query](https://download.flashcat.cloud/ulric/20240513103305.png)
-
-### Metric View
-
-Alternatively, you can use the Metric View to access data. With this feature, Instant Query becomes less necessary, as it caters more to advanced users. Regular users can easily perform queries using the Metric View.
-
-![Metric View](https://download.flashcat.cloud/ulric/20240513103530.png)
-
-### Built-in Dashboards
-
-Nightingale includes commonly used dashboards that can be imported and used directly. You can also import Grafana dashboards, although compatibility is limited to basic Grafana charts. If you’re accustomed to Grafana, it’s recommended to continue using it for visualization, with Nightingale serving as an alerting engine.
-
-![Built-in Dashboards](https://download.flashcat.cloud/ulric/20240513103628.png)
-
-### Built-in Alert Rules
-
-In addition to the built-in dashboards, Nightingale also comes with numerous alert rules that are ready to use out of the box.
-
-![Built-in Alert Rules](https://download.flashcat.cloud/ulric/20240513103825.png)
-
-
+https://user-images.githubusercontent.com/792850/216888712-2565fcea-9df5-47bd-a49e-d60af9bd76e8.mp4

 ## Architecture

-In most community scenarios, Nightingale is primarily used as an alert engine, integrating with multiple time-series databases to unify alert rule management. Grafana remains the preferred tool for visualization. As an alert engine, the product architecture of Nightingale is as follows:
+<img src="doc/img/arch-product.png" width="600">

-![Product Architecture](https://download.flashcat.cloud/ulric/20240221152601.png)
+Nightingale monitoring can receive monitoring data reported by various collectors (such as [Categraf](https://github.com/flashcatcloud/categraf) , telegraf, grafana-agent, Prometheus, etc.) and write them to various popular time-series databases (such as Prometheus, M3DB, VictoriaMetrics, Thanos, TDEngine, etc.). It provides configuration capabilities for alert rules, silence rules, and subscription rules, as well as the ability to view monitoring data. It also provides automatic alarm self-healing mechanisms (such as automatically calling back to a webhook address or executing a script after an alarm is triggered), and the ability to store and manage historical alarm events and view them in groups.

-For certain edge data centers with poor network connectivity to the central Nightingale server, we offer a distributed deployment mode for the alert engine. In this mode, even if the network is disconnected, the alerting functionality remains unaffected.
+If the performance of a standalone time-series database (such as Prometheus) has bottlenecks or poor disaster recovery, we recommend using [VictoriaMetrics](https://github.com/VictoriaMetrics/VictoriaMetrics). The VictoriaMetrics architecture is relatively simple, has excellent performance, and is easy to deploy and maintain. The architecture diagram is as shown above. For more detailed documentation on VictoriaMetrics, please refer to its [official website](https://victoriametrics.com/).

-![Edge Deployment Mode](https://download.flashcat.cloud/ulric/20240222102119.png)
+**We welcome you to participate in the Nightingale open-source project and community in various ways, including but not limited to**：
+- Adding and improving documentation => [n9e.github.io](https://n9e.github.io/)
+- Sharing your best practices and experience in using Nightingale monitoring => [Article sharing]((https://n9e.github.io/docs/prologue/share/))
+- Submitting product suggestions => [github issue](https://github.com/ccfos/nightingale/issues/new?assignees=&labels=kind%2Ffeature&template=enhancement.md)
+- Submitting code to make Nightingale monitoring faster, more stable, and easier to use => [github pull request](https://github.com/didi/nightingale/pulls)


-## Communication Channels
+**Respecting, recognizing, and recording the work of every contributor** is the first guiding principle of the Nightingale open-source community. We advocate effective questioning, which not only respects the developer's time but also contributes to the accumulation of knowledge in the entire community
+- Before asking a question, please first refer to the [FAQ](https://www.gitlink.org.cn/ccfos/nightingale/wiki/faq) 
+- We use [GitHub Discussions](https://github.com/ccfos/nightingale/discussions) as the communication forum. You can search and ask questions here.
+- We also recommend that you join ours [Slack channel](https://n9e-talk.slack.com/) to exchange experiences with other Nightingale users.

- **Report Bugs:** It is highly recommended to submit issues via the [Nightingale GitHub Issue tracker](https://github.com/ccfos/nightingale/issues/new?assignees=&labels=kind%2Fbug&projects=&template=bug_report.yml).
- **Documentation:** For more information, we recommend thoroughly browsing the [Nightingale Documentation Site](https://flashcat.cloud/docs/content/flashcat-monitor/nightingale-v7/introduction/).
+
+## Who is using Nightingale
+You can register your usage and share your experience by posting on **[Who is Using Nightingale](https://github.com/ccfos/nightingale/issues/897)**.

 ## Stargazers over time
+[![Stargazers over time](https://starchart.cc/ccfos/nightingale.svg)](https://starchart.cc/ccfos/nightingale)

-[![Stargazers over time](https://api.star-history.com/svg?repos=ccfos/nightingale&type=Date)](https://star-history.com/#ccfos/nightingale&Date)
-
-## Community Co-Building
-
- ❇️ Please read the [Nightingale Open Source Project and Community Governance Draft](./doc/community-governance.md). We sincerely welcome every user, developer, company, and organization to use Nightingale, actively report bugs, submit feature requests, share best practices, and help build a professional and active open-source community.
-  ❤️ Nightingale Contributors
+## Contributors
 <a href="https://github.com/ccfos/nightingale/graphs/contributors">
  <img src="https://contrib.rocks/image?repo=ccfos/nightingale" />
 </a>

 ## License
- [Apache License V2.0](https://github.com/didi/nightingale/blob/main/LICENSE)
+[Apache License V2.0](https://github.com/didi/nightingale/blob/main/LICENSE)
--- a/alert/aconf/conf.go
+++ b/alert/aconf/conf.go
@@ -60,6 +60,10 @@ func (a *Alert) PreCheck(configDir string) {
 		a.Heartbeat.Interval = 1000
 	}

+	if a.Heartbeat.EngineName == "" {
+		a.Heartbeat.EngineName = "default"
+	}
+
 	if a.EngineDelay == 0 {
 		a.EngineDelay = 30
 	}
--- a/alert/alert.go
+++ b/alert/alert.go
@@ -62,7 +62,6 @@ func Initialize(configDir string, cryptoKey string) (func(), error) {
 	userCache := memsto.NewUserCache(ctx, syncStats)
 	userGroupCache := memsto.NewUserGroupCache(ctx, syncStats)
 	taskTplsCache := memsto.NewTaskTplCache(ctx)
-	configCvalCache := memsto.NewCvalCache(ctx, syncStats)

 	promClients := prom.NewPromClient(ctx)
 	tdengineClients := tdengine.NewTdengineClient(ctx, config.Alert.Heartbeat)
@@ -71,8 +70,7 @@ func Initialize(configDir string, cryptoKey string) (func(), error) {

 	Start(config.Alert, config.Pushgw, syncStats, alertStats, externalProcessors, targetCache, busiGroupCache, alertMuteCache, alertRuleCache, notifyConfigCache, taskTplsCache, dsCache, ctx, promClients, tdengineClients, userCache, userGroupCache)

-	r := httpx.GinEngine(config.Global.RunMode, config.HTTP,
-		configCvalCache.PrintBodyPaths, configCvalCache.PrintAccessLog)
+	r := httpx.GinEngine(config.Global.RunMode, config.HTTP)
 	rt := router.New(config.HTTP, config.Alert, alertMuteCache, targetCache, busiGroupCache, alertStats, ctx, externalProcessors)

 	if config.Ibex.Enable {
@@ -102,7 +100,7 @@ func Start(alertc aconf.Alert, pushgwc pconf.Pushgw, syncStats *memsto.Stats, al
 	naming := naming.NewNaming(ctx, alertc.Heartbeat, alertStats)

 	writers := writer.NewWriters(pushgwc)
-	record.NewScheduler(alertc, recordingRuleCache, promClients, writers, alertStats, datasourceCache)
+	record.NewScheduler(alertc, recordingRuleCache, promClients, writers, alertStats)

 	eval.NewScheduler(alertc, externalProcessors, alertRuleCache, targetCache, targetsOfAlertRulesCache,
 		busiGroupCache, alertMuteCache, datasourceCache, promClients, tdendgineClients, naming, ctx, alertStats)
@@ -114,5 +112,5 @@ func Start(alertc aconf.Alert, pushgwc pconf.Pushgw, syncStats *memsto.Stats, al
 	go consumer.LoopConsume()

 	go queue.ReportQueueSize(alertStats)
-	go sender.InitEmailSender(ctx, notifyConfigCache)
+	go sender.InitEmailSender(notifyConfigCache)
 }
--- a/alert/common/conv.go
+++ b/alert/common/conv.go
@@ -5,20 +5,18 @@ import (
 	"math"
 	"strings"

-	"github.com/ccfos/nightingale/v6/models"
 	"github.com/prometheus/common/model"
 )

 type AnomalyPoint struct {
-	Key           string               `json:"key"`
-	Labels        model.Metric         `json:"labels"`
-	Timestamp     int64                `json:"timestamp"`
-	Value         float64              `json:"value"`
-	Severity      int                  `json:"severity"`
-	Triggered     bool                 `json:"triggered"`
-	Query         string               `json:"query"`
-	Values        string               `json:"values"`
-	RecoverConfig models.RecoverConfig `json:"recover_config"`
+	Key       string       `json:"key"`
+	Labels    model.Metric `json:"labels"`
+	Timestamp int64        `json:"timestamp"`
+	Value     float64      `json:"value"`
+	Severity  int          `json:"severity"`
+	Triggered bool         `json:"triggered"`
+	Query     string       `json:"query"`
+	Values    string       `json:"values"`
 }

 func NewAnomalyPoint(key string, labels map[string]string, ts int64, value float64, severity int) AnomalyPoint {
--- a/alert/common/key.go
+++ b/alert/common/key.go
@@ -2,7 +2,6 @@ package common

 import (
 	"fmt"
-	"strings"

 	"github.com/ccfos/nightingale/v6/models"
 )
@@ -35,9 +34,9 @@ func MatchGroupsName(groupName string, groupFilter []models.TagFilter) bool {
 func matchTag(value string, filter models.TagFilter) bool {
 	switch filter.Func {
 	case "==":
-		return strings.TrimSpace(filter.Value) == strings.TrimSpace(value)
+		return filter.Value == value
 	case "!=":
-		return strings.TrimSpace(filter.Value) != strings.TrimSpace(value)
+		return filter.Value != value
 	case "in":
 		_, has := filter.Vset[value]
 		return has
--- a/alert/dispatch/dispatch.go
+++ b/alert/dispatch/dispatch.go
@@ -139,11 +139,6 @@ func (e *Dispatch) HandleEventNotify(event *models.AlertCurEvent, isSubscribe bo
 	if rule == nil {
 		return
 	}
-
-	if e.blockEventNotify(rule, event) {
-		return
-	}
-
 	fillUsers(event, e.userCache, e.userGroupCache)

 	var (
@@ -172,7 +167,7 @@ func (e *Dispatch) HandleEventNotify(event *models.AlertCurEvent, isSubscribe bo
 	}

 	// 处理事件发送,这里用一个goroutine处理一个event的所有发送事件
-	go e.Send(rule, event, notifyTarget, isSubscribe)
+	go e.Send(rule, event, notifyTarget)

 	// 如果是不是订阅规则出现的event, 则需要处理订阅规则的event
 	if !isSubscribe {
@@ -180,25 +175,6 @@ func (e *Dispatch) HandleEventNotify(event *models.AlertCurEvent, isSubscribe bo
 	}
 }

-func (e *Dispatch) blockEventNotify(rule *models.AlertRule, event *models.AlertCurEvent) bool {
-	ruleType := rule.GetRuleType()
-
-	// 若为机器则先看机器是否删除
-	if ruleType == models.HOST {
-		host, ok := e.targetCache.Get(event.TagsMap["ident"])
-		if !ok || host == nil {
-			return true
-		}
-	}
-
-	// 规则配置是否改变
-	if event.RuleHash != rule.Hash() {
-		return true
-	}
-
-	return false
-}
-
 func (e *Dispatch) handleSubs(event *models.AlertCurEvent) {
 	// handle alert subscribes
 	subscribes := make([]*models.AlertSubscribe, 0)
@@ -262,12 +238,11 @@ func (e *Dispatch) handleSub(sub *models.AlertSubscribe, event models.AlertCurEv
 	e.HandleEventNotify(&event, true)
 }

-func (e *Dispatch) Send(rule *models.AlertRule, event *models.AlertCurEvent, notifyTarget *NotifyTarget, isSubscribe bool) {
+func (e *Dispatch) Send(rule *models.AlertRule, event *models.AlertCurEvent, notifyTarget *NotifyTarget) {
 	needSend := e.BeforeSenderHook(event)
 	if needSend {
 		for channel, uids := range notifyTarget.ToChannelUserMap() {
-			msgCtx := sender.BuildMessageContext(e.ctx, rule, []*models.AlertCurEvent{event},
-				uids, e.userCache, e.Astats)
+			msgCtx := sender.BuildMessageContext(rule, []*models.AlertCurEvent{event}, uids, e.userCache, e.Astats)
 			e.RwLock.RLock()
 			s := e.Senders[channel]
 			e.RwLock.RUnlock()
@@ -291,26 +266,19 @@ func (e *Dispatch) Send(rule *models.AlertRule, event *models.AlertCurEvent, not

 	// handle global webhooks
 	if e.alerting.WebhookBatchSend {
-		sender.BatchSendWebhooks(e.ctx, notifyTarget.ToWebhookList(), event, e.Astats)
+		sender.BatchSendWebhooks(notifyTarget.ToWebhookList(), event, e.Astats)
 	} else {
-		sender.SingleSendWebhooks(e.ctx, notifyTarget.ToWebhookList(), event, e.Astats)
+		sender.SingleSendWebhooks(notifyTarget.ToWebhookList(), event, e.Astats)
 	}

 	// handle plugin call
-	go sender.MayPluginNotify(e.ctx, e.genNoticeBytes(event), e.notifyConfigCache.
-		GetNotifyScript(), e.Astats, event)
-
-	if !isSubscribe {
-		// handle ibex callbacks
-		e.HandleIbex(rule, event)
-	}
+	go sender.MayPluginNotify(e.genNoticeBytes(event), e.notifyConfigCache.GetNotifyScript(), e.Astats)
 }

 func (e *Dispatch) SendCallbacks(rule *models.AlertRule, notifyTarget *NotifyTarget, event *models.AlertCurEvent) {

 	uids := notifyTarget.ToUidList()
 	urls := notifyTarget.ToCallbackList()
-	whMap := notifyTarget.ToWebhookMap()
 	for _, urlStr := range urls {
 		if len(urlStr) == 0 {
 			continue
@@ -318,11 +286,6 @@ func (e *Dispatch) SendCallbacks(rule *models.AlertRule, notifyTarget *NotifyTar

 		cbCtx := sender.BuildCallBackContext(e.ctx, urlStr, rule, []*models.AlertCurEvent{event}, uids, e.userCache, e.alerting.WebhookBatchSend, e.Astats)

-		if wh, ok := whMap[cbCtx.CallBackURL]; ok && wh.Enable {
-			logger.Debugf("SendCallbacks: webhook[%s] is in global conf.", cbCtx.CallBackURL)
-			continue
-		}
-
 		if strings.HasPrefix(urlStr, "${ibex}") {
 			e.CallBacks[models.IbexDomain].CallBack(cbCtx)
 			continue
@@ -359,30 +322,6 @@ func (e *Dispatch) SendCallbacks(rule *models.AlertRule, notifyTarget *NotifyTar
 	}
 }

-func (e *Dispatch) HandleIbex(rule *models.AlertRule, event *models.AlertCurEvent) {
-	// 解析 RuleConfig 字段
-	var ruleConfig struct {
-		TaskTpls []*models.Tpl `json:"task_tpls"`
-	}
-	json.Unmarshal([]byte(rule.RuleConfig), &ruleConfig)
-
-	for _, t := range ruleConfig.TaskTpls {
-		if t.TplId == 0 {
-			continue
-		}
-
-		if len(t.Host) == 0 {
-			sender.CallIbex(e.ctx, t.TplId, event.TargetIdent,
-				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)
-		}
-	}
-}
-
 type Notice struct {
 	Event *models.AlertCurEvent `json:"event"`
 	Tpls  map[string]string     `json:"tpls"`
--- a/alert/dispatch/notify_target.go
+++ b/alert/dispatch/notify_target.go
@@ -100,32 +100,8 @@ func (s *NotifyTarget) ToWebhookList() []*models.Webhook {
 	return webhooks
 }

-func (s *NotifyTarget) ToWebhookMap() map[string]*models.Webhook {
-	webhookMap := make(map[string]*models.Webhook, len(s.webhooks))
-	for _, wh := range s.webhooks {
-		if wh.Batch == 0 {
-			wh.Batch = 1000
-		}
-
-		if wh.Timeout == 0 {
-			wh.Timeout = 10
-		}
-
-		if wh.RetryCount == 0 {
-			wh.RetryCount = 10
-		}
-
-		if wh.RetryInterval == 0 {
-			wh.RetryInterval = 10
-		}
-
-		webhookMap[wh.Url] = wh
-	}
-	return webhookMap
-}
-
 func (s *NotifyTarget) ToUidList() []int64 {
-	uids := make([]int64, 0, len(s.userMap))
+	uids := make([]int64, len(s.userMap))
 	for uid, _ := range s.userMap {
 		uids = append(uids, uid)
 	}
--- a/alert/eval/alert_rule.go
+++ b/alert/eval/alert_rule.go
@@ -96,7 +96,8 @@ func (s *Scheduler) syncAlertRules() {

 		ruleType := rule.GetRuleType()
 		if rule.IsPrometheusRule() || rule.IsLokiRule() || rule.IsTdengineRule() {
-			datasourceIds := s.datasourceCache.GetIDsByDsCateAndQueries(rule.Cate, rule.DatasourceQueries)
+			datasourceIds := s.promClients.Hit(rule.DatasourceIdsJson)
+			datasourceIds = append(datasourceIds, s.tdengineClients.Hit(rule.DatasourceIdsJson)...)
 			for _, dsId := range datasourceIds {
 				if !naming.DatasourceHashRing.IsHit(strconv.FormatInt(dsId, 10), fmt.Sprintf("%d", rule.Id), s.aconf.Heartbeat.Endpoint) {
 					continue
@@ -132,8 +133,7 @@ func (s *Scheduler) syncAlertRules() {
 		} else {
 			// 如果 rule 不是通过 prometheus engine 来告警的，则创建为 externalRule
 			// if rule is not processed by prometheus engine, create it as externalRule
-			dsIds := s.datasourceCache.GetIDsByDsCateAndQueries(rule.Cate, rule.DatasourceQueries)
-			for _, dsId := range dsIds {
+			for _, dsId := range rule.DatasourceIdsJson {
 				ds := s.datasourceCache.GetById(dsId)
 				if ds == nil {
 					logger.Debugf("datasource %d not found", dsId)
--- a/alert/eval/eval.go
+++ b/alert/eval/eval.go
@@ -3,10 +3,8 @@ package eval
 import (
 	"context"
 	"encoding/json"
-	"errors"
 	"fmt"
 	"math"
-	"reflect"
 	"sort"
 	"strings"
 	"time"
@@ -48,14 +46,6 @@ const (
 	QUERY_DATA      = "query_data"
 )

-type JoinType string
-
-const (
-	Left  JoinType = "left"
-	Right JoinType = "right"
-	Inner JoinType = "inner"
-)
-
 func NewAlertRuleWorker(rule *models.AlertRule, datasourceId int64, processor *process.Processor, promClients *prom.PromClientMap, tdengineClients *tdengine.TdengineClientMap, ctx *ctx.Context) *AlertRuleWorker {
 	arw := &AlertRuleWorker{
 		datasourceId: datasourceId,
@@ -118,29 +108,21 @@ func (arw *AlertRuleWorker) Eval() {
 	arw.processor.Stats.CounterRuleEval.WithLabelValues().Inc()

 	typ := cachedRule.GetRuleType()
-	var (
-		anomalyPoints []common.AnomalyPoint
-		recoverPoints []common.AnomalyPoint
-		err           error
-	)
+	var anomalyPoints []common.AnomalyPoint
+	var recoverPoints []common.AnomalyPoint
 	switch typ {
 	case models.PROMETHEUS:
-		anomalyPoints, err = arw.GetPromAnomalyPoint(cachedRule.RuleConfig)
+		anomalyPoints = arw.GetPromAnomalyPoint(cachedRule.RuleConfig)
 	case models.HOST:
-		anomalyPoints, err = arw.GetHostAnomalyPoint(cachedRule.RuleConfig)
+		anomalyPoints = arw.GetHostAnomalyPoint(cachedRule.RuleConfig)
 	case models.TDENGINE:
-		anomalyPoints, recoverPoints, err = arw.GetTdengineAnomalyPoint(cachedRule, arw.processor.DatasourceId())
+		anomalyPoints, recoverPoints = arw.GetTdengineAnomalyPoint(cachedRule, arw.processor.DatasourceId())
 	case models.LOKI:
-		anomalyPoints, err = arw.GetPromAnomalyPoint(cachedRule.RuleConfig)
+		anomalyPoints = arw.GetPromAnomalyPoint(cachedRule.RuleConfig)
 	default:
 		return
 	}

-	if err != nil {
-		logger.Errorf("rule_eval:%s get anomaly point err:%s", arw.Key(), err.Error())
-		return
-	}
-
 	if arw.processor == nil {
 		logger.Warningf("rule_eval:%s processor is nil", arw.Key())
 		return
@@ -170,13 +152,13 @@ func (arw *AlertRuleWorker) Eval() {
 		now := time.Now().Unix()
 		for _, point := range pointsMap {
 			str := fmt.Sprintf("%v", point.Value)
-			arw.processor.RecoverSingle(true, process.Hash(cachedRule.Id, arw.processor.DatasourceId(), point), now, &str)
+			arw.processor.RecoverSingle(process.Hash(cachedRule.Id, arw.processor.DatasourceId(), point), now, &str)
 		}
 	} else {
 		now := time.Now().Unix()
 		for _, point := range recoverPoints {
 			str := fmt.Sprintf("%v", point.Value)
-			arw.processor.RecoverSingle(true, process.Hash(cachedRule.Id, arw.processor.DatasourceId(), point), now, &str)
+			arw.processor.RecoverSingle(process.Hash(cachedRule.Id, arw.processor.DatasourceId(), point), now, &str)
 		}
 	}

@@ -188,7 +170,7 @@ func (arw *AlertRuleWorker) Stop() {
 	close(arw.quit)
 }

-func (arw *AlertRuleWorker) GetPromAnomalyPoint(ruleConfig string) ([]common.AnomalyPoint, error) {
+func (arw *AlertRuleWorker) GetPromAnomalyPoint(ruleConfig string) []common.AnomalyPoint {
 	var lst []common.AnomalyPoint
 	var severity int

@@ -196,13 +178,13 @@ func (arw *AlertRuleWorker) GetPromAnomalyPoint(ruleConfig string) ([]common.Ano
 	if err := json.Unmarshal([]byte(ruleConfig), &rule); err != nil {
 		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).Inc()
-		return lst, err
+		return lst
 	}

 	if rule == nil {
 		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).Inc()
-		return lst, errors.New("rule is nil")
+		return lst
 	}

 	arw.inhibit = rule.Inhibit
@@ -233,7 +215,7 @@ func (arw *AlertRuleWorker) GetPromAnomalyPoint(ruleConfig string) ([]common.Ano
 			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).Inc()
-			return lst, err
+			continue
 		}

 		if len(warnings) > 0 {
@@ -250,10 +232,10 @@ func (arw *AlertRuleWorker) GetPromAnomalyPoint(ruleConfig string) ([]common.Ano
 		}
 		lst = append(lst, points...)
 	}
-	return lst, nil
+	return lst
 }

-func (arw *AlertRuleWorker) GetTdengineAnomalyPoint(rule *models.AlertRule, dsId int64) ([]common.AnomalyPoint, []common.AnomalyPoint, error) {
+func (arw *AlertRuleWorker) GetTdengineAnomalyPoint(rule *models.AlertRule, dsId int64) ([]common.AnomalyPoint, []common.AnomalyPoint) {
 	// 获取查询和规则判断条件
 	points := []common.AnomalyPoint{}
 	recoverPoints := []common.AnomalyPoint{}
@@ -261,7 +243,7 @@ func (arw *AlertRuleWorker) GetTdengineAnomalyPoint(rule *models.AlertRule, dsId
 	if ruleConfig == "" {
 		logger.Warningf("rule_eval:%d promql is blank", rule.Id)
 		arw.processor.Stats.CounterRuleEvalErrorTotal.WithLabelValues(fmt.Sprintf("%v", arw.processor.DatasourceId()), GET_RULE_CONFIG).Inc()
-		return points, recoverPoints, errors.New("rule config is nil")
+		return points, recoverPoints
 	}

 	var ruleQuery models.RuleQuery
@@ -270,18 +252,15 @@ func (arw *AlertRuleWorker) GetTdengineAnomalyPoint(rule *models.AlertRule, dsId
 		logger.Warningf("rule_eval:%d promql parse error:%s", rule.Id, err.Error())
 		arw.processor.Stats.CounterRuleEvalErrorTotal.WithLabelValues(fmt.Sprintf("%v", arw.processor.DatasourceId())).Inc()
 		arw.processor.Stats.CounterRuleEvalErrorTotal.WithLabelValues(fmt.Sprintf("%v", arw.processor.DatasourceId()), GET_RULE_CONFIG).Inc()
-		return points, recoverPoints, err
+		return points, recoverPoints
 	}

 	arw.inhibit = ruleQuery.Inhibit
 	if len(ruleQuery.Queries) > 0 {
 		seriesStore := make(map[uint64]models.DataResp)
-		// 将不同查询的 hash 索引分组存放
-		seriesTagIndexes := make(map[string]map[uint64][]uint64)
+		seriesTagIndex := make(map[uint64][]uint64)

 		for _, query := range ruleQuery.Queries {
-			seriesTagIndex := make(map[uint64][]uint64)
-
 			arw.processor.Stats.CounterQueryDataTotal.WithLabelValues(fmt.Sprintf("%d", arw.datasourceId)).Inc()
 			cli := arw.tdengineClients.GetCli(dsId)
 			if cli == nil {
@@ -297,27 +276,21 @@ func (arw *AlertRuleWorker) GetTdengineAnomalyPoint(rule *models.AlertRule, dsId
 				logger.Warningf("rule_eval rid:%d query data error: %v", rule.Id, 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).Inc()
-				return points, recoverPoints, err
+				continue
 			}
+
 			//  此条日志很重要，是告警判断的现场值
 			logger.Debugf("rule_eval rid:%d req:%+v resp:%+v", rule.Id, query, series)
 			MakeSeriesMap(series, seriesTagIndex, seriesStore)
-			ref, err := GetQueryRef(query)
-			if err != nil {
-				logger.Warningf("rule_eval rid:%d query ref error: %v query:%+v", rule.Id, err, query)
-				arw.processor.Stats.CounterRuleEvalErrorTotal.WithLabelValues(fmt.Sprintf("%v", arw.processor.DatasourceId()), GET_RULE_CONFIG).Inc()
-				continue
-			}
-			seriesTagIndexes[ref] = seriesTagIndex
 		}

-		points, recoverPoints = GetAnomalyPoint(rule.Id, ruleQuery, seriesTagIndexes, seriesStore)
+		points, recoverPoints = GetAnomalyPoint(rule.Id, ruleQuery, seriesTagIndex, seriesStore)
 	}

-	return points, recoverPoints, nil
+	return points, recoverPoints
 }

-func (arw *AlertRuleWorker) GetHostAnomalyPoint(ruleConfig string) ([]common.AnomalyPoint, error) {
+func (arw *AlertRuleWorker) GetHostAnomalyPoint(ruleConfig string) []common.AnomalyPoint {
 	var lst []common.AnomalyPoint
 	var severity int

@@ -325,13 +298,13 @@ func (arw *AlertRuleWorker) GetHostAnomalyPoint(ruleConfig string) ([]common.Ano
 	if err := json.Unmarshal([]byte(ruleConfig), &rule); err != nil {
 		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).Inc()
-		return lst, err
+		return lst
 	}

 	if rule == nil {
 		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).Inc()
-		return lst, errors.New("rule is nil")
+		return lst
 	}

 	arw.inhibit = rule.Inhibit
@@ -379,11 +352,17 @@ func (arw *AlertRuleWorker) GetHostAnomalyPoint(ruleConfig string) ([]common.Ano
 			targets := arw.processor.TargetCache.Gets(missTargets)
 			for _, target := range targets {
 				m := make(map[string]string)
+				target.FillTagsMap()
 				for k, v := range target.TagsMap {
 					m[k] = v
 				}
 				m["ident"] = target.Ident

+				bg := arw.processor.BusiGroupCache.GetByBusiGroupId(target.GroupId)
+				if bg != nil && bg.LabelEnable == 1 {
+					m["busigroup"] = bg.LabelValue
+				}
+
 				lst = append(lst, common.NewAnomalyPoint(trigger.Type, m, now, float64(now-target.UpdateAt), trigger.Severity))
 			}
 		case "offset":
@@ -425,12 +404,18 @@ func (arw *AlertRuleWorker) GetHostAnomalyPoint(ruleConfig string) ([]common.Ano
 				m := make(map[string]string)
 				target, exists := arw.processor.TargetCache.Get(host)
 				if exists {
+					target.FillTagsMap()
 					for k, v := range target.TagsMap {
 						m[k] = v
 					}
 				}
 				m["ident"] = host

+				bg := arw.processor.BusiGroupCache.GetByBusiGroupId(target.GroupId)
+				if bg != nil && bg.LabelEnable == 1 {
+					m["busigroup"] = bg.LabelValue
+				}
+
 				lst = append(lst, common.NewAnomalyPoint(trigger.Type, m, now, float64(offset), trigger.Severity))
 			}
 		case "pct_target_miss":
@@ -456,31 +441,20 @@ func (arw *AlertRuleWorker) GetHostAnomalyPoint(ruleConfig string) ([]common.Ano
 			}
 		}
 	}
-	return lst, nil
+	return lst
 }

-func GetAnomalyPoint(ruleId int64, ruleQuery models.RuleQuery, seriesTagIndexes map[string]map[uint64][]uint64, seriesStore map[uint64]models.DataResp) ([]common.AnomalyPoint, []common.AnomalyPoint) {
+func GetAnomalyPoint(ruleId int64, ruleQuery models.RuleQuery, seriesTagIndex map[uint64][]uint64, seriesStore map[uint64]models.DataResp) ([]common.AnomalyPoint, []common.AnomalyPoint) {
 	points := []common.AnomalyPoint{}
 	recoverPoints := []common.AnomalyPoint{}

-	if len(ruleQuery.Triggers) == 0 {
-		return points, recoverPoints
-	}
-
-	if len(seriesTagIndexes) == 0 {
-		return points, recoverPoints
-	}
-
 	for _, trigger := range ruleQuery.Triggers {
-		// seriesTagIndex 的 key 仅做分组使用，value 为每组 series 的 hash
-		seriesTagIndex := ProcessJoins(ruleId, trigger, seriesTagIndexes, seriesStore)
-
 		for _, seriesHash := range seriesTagIndex {
 			sort.Slice(seriesHash, func(i, j int) bool {
 				return seriesHash[i] < seriesHash[j]
 			})

-			m := make(map[string]interface{})
+			m := make(map[string]float64)
 			var ts int64
 			var sample models.DataResp
 			var value float64
@@ -520,37 +494,23 @@ func GetAnomalyPoint(ruleId int64, ruleQuery models.RuleQuery, seriesTagIndexes
 			}

 			point := common.AnomalyPoint{
-				Key:           sample.MetricName(),
-				Labels:        sample.Metric,
-				Timestamp:     int64(ts),
-				Value:         value,
-				Values:        values,
-				Severity:      trigger.Severity,
-				Triggered:     isTriggered,
-				Query:         fmt.Sprintf("query:%+v trigger:%+v", ruleQuery.Queries, trigger),
-				RecoverConfig: trigger.RecoverConfig,
+				Key:       sample.MetricName(),
+				Labels:    sample.Metric,
+				Timestamp: int64(ts),
+				Value:     value,
+				Values:    values,
+				Severity:  trigger.Severity,
+				Triggered: isTriggered,
+				Query:     fmt.Sprintf("query:%+v trigger:%+v", ruleQuery.Queries, trigger),
 			}

 			if sample.Query != "" {
 				point.Query = sample.Query
 			}
-			// 恢复条件判断经过讨论是只在表达式模式下支持，表达式模式会通过 isTriggered 判断是告警点还是恢复点
-			// 1. 不设置恢复判断，满足恢复条件产生 recoverPoint 恢复，无数据不产生 anomalyPoint 恢复
-			// 2. 设置满足条件才恢复，仅可通过产生 recoverPoint 恢复，不能通过不产生 anomalyPoint 恢复
-			// 3. 设置无数据不恢复，仅可通过产生 recoverPoint 恢复，不产生 anomalyPoint 恢复
+
 			if isTriggered {
 				points = append(points, point)
 			} else {
-				switch trigger.RecoverConfig.JudgeType {
-				case models.Origin:
-					// 对齐原实现 do nothing
-				case models.RecoverOnCondition:
-					// 额外判断恢复条件，满足才恢复
-					fulfill := parser.Calc(trigger.RecoverConfig.RecoverExp, m)
-					if !fulfill {
-						continue
-					}
-				}
 				recoverPoints = append(recoverPoints, point)
 			}
 		}
@@ -559,144 +519,6 @@ func GetAnomalyPoint(ruleId int64, ruleQuery models.RuleQuery, seriesTagIndexes
 	return points, recoverPoints
 }

-func flatten(rehashed map[uint64][][]uint64) map[uint64][]uint64 {
-	seriesTagIndex := make(map[uint64][]uint64)
-	var i uint64
-	for _, HashTagIndex := range rehashed {
-		for u := range HashTagIndex {
-			seriesTagIndex[i] = HashTagIndex[u]
-			i++
-		}
-	}
-	return seriesTagIndex
-}
-
-// onJoin 组合两个经过 rehash 之后的集合
-// 如查询 A，经过 on data_base rehash 分组后
-// [[A1{data_base=1, table=alert}，A2{data_base=1, table=alert}]，[A5{data_base=1, table=board}]]
-// [[A3{data_base=2, table=board}]，[A4{data_base=2, table=alert}]]
-// 查询 B，经过 on data_base rehash 分组后
-// [[B1{data_base=1, table=alert}]]
-// [[B2{data_base=2, table=alert}]]
-// 内联得到
-// [[A1{data_base=1, table=alert}，A2{data_base=1, table=alert}，B1{data_base=1, table=alert}]，[A5{data_base=1, table=board}，[B1{data_base=1, table=alert}]]
-// [[A3{data_base=2, table=board}，B2{data_base=2, table=alert}]，[A4{data_base=2, table=alert}，B2{data_base=2, table=alert}]]
-func onJoin(reHashTagIndex1 map[uint64][][]uint64, reHashTagIndex2 map[uint64][][]uint64, joinType JoinType) map[uint64][][]uint64 {
-	reHashTagIndex := make(map[uint64][][]uint64)
-	for rehash := range reHashTagIndex1 {
-		if _, ok := reHashTagIndex2[rehash]; ok {
-			// 若有 rehash 相同的记录，两两合并
-			for i1 := range reHashTagIndex1[rehash] {
-				for i2 := range reHashTagIndex2[rehash] {
-					reHashTagIndex[rehash] = append(reHashTagIndex[rehash], mergeNewArray(reHashTagIndex1[rehash][i1], reHashTagIndex2[rehash][i2]))
-				}
-			}
-		} else {
-			// 合并方式不为 inner 时，需要保留 reHashTagIndex1 中未匹配的记录
-			if joinType != Inner {
-				reHashTagIndex[rehash] = reHashTagIndex1[rehash]
-			}
-		}
-	}
-	return reHashTagIndex
-}
-
-// rehashSet 重新 hash 分组
-// 如当前查询 A 有五条记录
-// A1{data_base=1, table=alert}
-// A2{data_base=1, table=alert}
-// A3{data_base=2, table=board}
-// A4{data_base=2, table=alert}
-// A5{data_base=1, table=board}
-// 经过预处理（按曲线分组，此步已在进入 GetAnomalyPoint 函数前完成）后，分为 4 组，
-// [A1{data_base=1, table=alert}，A2{data_base=1, table=alert}]
-// [A3{data_base=2, table=board}]
-// [A4{data_base=2, table=alert}]
-// [A5{data_base=1, table=board}]
-// 若 rehashSet 按 data_base 重新分组，此时会得到按 rehash 值分的二维数组，即不会将 rehash 值相同的记录完全合并
-// [[A1{data_base=1, table=alert}，A2{data_base=1, table=alert}]，[A5{data_base=1, table=board}]]
-// [[A3{data_base=2, table=board}]，[A4{data_base=2, table=alert}]]
-func rehashSet(seriesTagIndex1 map[uint64][]uint64, seriesStore map[uint64]models.DataResp, on []string) map[uint64][][]uint64 {
-	reHashTagIndex := make(map[uint64][][]uint64)
-	for _, seriesHashes := range seriesTagIndex1 {
-		if len(seriesHashes) == 0 {
-			continue
-		}
-		series, exists := seriesStore[seriesHashes[0]]
-		if !exists {
-			continue
-		}
-
-		rehash := hash.GetTargetTagHash(series.Metric, on)
-		if _, ok := reHashTagIndex[rehash]; !ok {
-			reHashTagIndex[rehash] = make([][]uint64, 0)
-		}
-		reHashTagIndex[rehash] = append(reHashTagIndex[rehash], seriesHashes)
-	}
-	return reHashTagIndex
-}
-
-// 笛卡尔积，查询的结果两两合并
-func cartesianJoin(seriesTagIndex1 map[uint64][]uint64, seriesTagIndex2 map[uint64][]uint64) map[uint64][]uint64 {
-	var index uint64
-	seriesTagIndex := make(map[uint64][]uint64)
-	for _, seriesHashes1 := range seriesTagIndex1 {
-		for _, seriesHashes2 := range seriesTagIndex2 {
-			seriesTagIndex[index] = mergeNewArray(seriesHashes1, seriesHashes2)
-			index++
-		}
-	}
-	return seriesTagIndex
-}
-
-// noneJoin 直接拼接
-func noneJoin(seriesTagIndex1 map[uint64][]uint64, seriesTagIndex2 map[uint64][]uint64) map[uint64][]uint64 {
-	seriesTagIndex := make(map[uint64][]uint64)
-	var index uint64
-	for _, seriesHashes := range seriesTagIndex1 {
-		seriesTagIndex[index] = seriesHashes
-		index++
-	}
-	for _, seriesHashes := range seriesTagIndex2 {
-		seriesTagIndex[index] = seriesHashes
-		index++
-	}
-	return seriesTagIndex
-}
-
-// originalJoin 原始分组方案，key 相同，即标签全部相同分为一组
-func originalJoin(seriesTagIndex1 map[uint64][]uint64, seriesTagIndex2 map[uint64][]uint64) map[uint64][]uint64 {
-	seriesTagIndex := make(map[uint64][]uint64)
-	for tagHash, seriesHashes := range seriesTagIndex1 {
-		if _, ok := seriesTagIndex[tagHash]; !ok {
-			seriesTagIndex[tagHash] = mergeNewArray(seriesHashes)
-		} else {
-			seriesTagIndex[tagHash] = append(seriesTagIndex[tagHash], seriesHashes...)
-		}
-	}
-
-	for tagHash, seriesHashes := range seriesTagIndex2 {
-		if _, ok := seriesTagIndex[tagHash]; !ok {
-			seriesTagIndex[tagHash] = mergeNewArray(seriesHashes)
-		} else {
-			seriesTagIndex[tagHash] = append(seriesTagIndex[tagHash], seriesHashes...)
-		}
-	}
-
-	return seriesTagIndex
-}
-
-// exclude 左斥，留下在 reHashTagIndex1 中，但不在 reHashTagIndex2 中的记录
-func exclude(reHashTagIndex1 map[uint64][][]uint64, reHashTagIndex2 map[uint64][][]uint64) map[uint64][][]uint64 {
-	reHashTagIndex := make(map[uint64][][]uint64)
-	for rehash, _ := range reHashTagIndex1 {
-		if _, ok := reHashTagIndex2[rehash]; !ok {
-			reHashTagIndex[rehash] = reHashTagIndex1[rehash]
-		}
-	}
-	return reHashTagIndex
-}
-
 func MakeSeriesMap(series []models.DataResp, seriesTagIndex map[uint64][]uint64, seriesStore map[uint64]models.DataResp) {
 	for i := 0; i < len(series); i++ {
 		serieHash := hash.GetHash(series[i].Metric, series[i].Ref)
@@ -710,108 +532,3 @@ func MakeSeriesMap(series []models.DataResp, seriesTagIndex map[uint64][]uint64,
 		seriesTagIndex[tagHash] = append(seriesTagIndex[tagHash], serieHash)
 	}
 }
-
-func mergeNewArray(arg ...[]uint64) []uint64 {
-	res := make([]uint64, 0)
-	for _, a := range arg {
-		res = append(res, a...)
-	}
-	return res
-}
-
-func ProcessJoins(ruleId int64, trigger models.Trigger, seriesTagIndexes map[string]map[uint64][]uint64, seriesStore map[uint64]models.DataResp) map[uint64][]uint64 {
-	last := make(map[uint64][]uint64)
-	if len(seriesTagIndexes) == 0 {
-		return last
-	}
-
-	if len(trigger.Joins) == 0 {
-		idx := 0
-		for _, seriesTagIndex := range seriesTagIndexes {
-			if idx == 0 {
-				last = seriesTagIndex
-			} else {
-				last = originalJoin(last, seriesTagIndex)
-			}
-			idx++
-		}
-		return last
-	}
-
-	// 有 join 条件，按条件依次合并
-	if len(seriesTagIndexes) < len(trigger.Joins)+1 {
-		logger.Errorf("rule_eval rid:%d queries' count: %d not match join condition's count: %d", ruleId, len(seriesTagIndexes), len(trigger.Joins))
-		return nil
-	}
-
-	last = seriesTagIndexes[trigger.JoinRef]
-	lastRehashed := rehashSet(last, seriesStore, trigger.Joins[0].On)
-	for i := range trigger.Joins {
-		cur := seriesTagIndexes[trigger.Joins[i].Ref]
-		switch trigger.Joins[i].JoinType {
-		case "original":
-			last = originalJoin(last, cur)
-		case "none":
-			last = noneJoin(last, cur)
-		case "cartesian":
-			last = cartesianJoin(last, cur)
-		case "inner_join":
-			curRehashed := rehashSet(cur, seriesStore, trigger.Joins[i].On)
-			lastRehashed = onJoin(lastRehashed, curRehashed, Inner)
-			last = flatten(lastRehashed)
-		case "left_join":
-			curRehashed := rehashSet(cur, seriesStore, trigger.Joins[i].On)
-			lastRehashed = onJoin(lastRehashed, curRehashed, Left)
-			last = flatten(lastRehashed)
-		case "right_join":
-			curRehashed := rehashSet(cur, seriesStore, trigger.Joins[i].On)
-			lastRehashed = onJoin(curRehashed, lastRehashed, Right)
-			last = flatten(lastRehashed)
-		case "left_exclude":
-			curRehashed := rehashSet(cur, seriesStore, trigger.Joins[i].On)
-			lastRehashed = exclude(lastRehashed, curRehashed)
-			last = flatten(lastRehashed)
-		case "right_exclude":
-			curRehashed := rehashSet(cur, seriesStore, trigger.Joins[i].On)
-			lastRehashed = exclude(curRehashed, lastRehashed)
-			last = flatten(lastRehashed)
-		default:
-			logger.Warningf("rule_eval rid:%d join type:%s not support", ruleId, trigger.Joins[i].JoinType)
-		}
-	}
-	return last
-}
-
-func GetQueryRef(query interface{}) (string, error) {
-	// 首先检查是否为 map
-	if m, ok := query.(map[string]interface{}); ok {
-		if ref, exists := m["ref"]; exists {
-			if refStr, ok := ref.(string); ok {
-				return refStr, nil
-			}
-			return "", fmt.Errorf("ref 字段不是字符串类型")
-		}
-		return "", fmt.Errorf("query 中没有找到 ref 字段")
-	}
-
-	// 如果不是 map，则按原来的方式处理结构体
-	v := reflect.ValueOf(query)
-	if v.Kind() == reflect.Ptr {
-		v = v.Elem()
-	}
-
-	if v.Kind() != reflect.Struct {
-		return "", fmt.Errorf("query not a struct or map")
-	}
-
-	refField := v.FieldByName("Ref")
-	if !refField.IsValid() {
-		return "", fmt.Errorf("not find ref field")
-	}
-
-	if refField.Kind() != reflect.String {
-		return "", fmt.Errorf("ref not a string")
-	}
-
-	return refField.String(), nil
-}
--- a/alert/eval/eval_test.go
+++ b/alert/eval/eval_test.go
@@ -1,271 +0,0 @@
-package eval
-
-import (
-	"reflect"
-	"testing"
-
-	"golang.org/x/exp/slices"
-)
-
-var (
-	reHashTagIndex1 = map[uint64][][]uint64{
-		1: {
-			{1, 2}, {3, 4},
-		},
-		2: {
-			{5, 6}, {7, 8},
-		},
-	}
-	reHashTagIndex2 = map[uint64][][]uint64{
-		1: {
-			{9, 10}, {11, 12},
-		},
-		3: {
-			{13, 14}, {15, 16},
-		},
-	}
-	seriesTagIndex1 = map[uint64][]uint64{
-		1: {1, 2, 3, 4},
-		2: {5, 6, 7, 8},
-	}
-	seriesTagIndex2 = map[uint64][]uint64{
-		1: {9, 10, 11, 12},
-		3: {13, 14, 15, 16},
-	}
-)
-
-func Test_originalJoin(t *testing.T) {
-	type args struct {
-		seriesTagIndex1 map[uint64][]uint64
-		seriesTagIndex2 map[uint64][]uint64
-	}
-	tests := []struct {
-		name string
-		args args
-		want map[uint64][]uint64
-	}{
-		{
-			name: "original join",
-			args: args{
-				seriesTagIndex1: map[uint64][]uint64{
-					1: {1, 2, 3, 4},
-					2: {5, 6, 7, 8},
-				},
-				seriesTagIndex2: map[uint64][]uint64{
-					1: {9, 10, 11, 12},
-					3: {13, 14, 15, 16},
-				},
-			},
-			want: map[uint64][]uint64{
-				1: {1, 2, 3, 4, 9, 10, 11, 12},
-				2: {5, 6, 7, 8},
-				3: {13, 14, 15, 16},
-			},
-		},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			if got := originalJoin(tt.args.seriesTagIndex1, tt.args.seriesTagIndex2); !reflect.DeepEqual(got, tt.want) {
-				t.Errorf("originalJoin() = %v, want %v", got, tt.want)
-			}
-		})
-	}
-}
-
-func Test_exclude(t *testing.T) {
-	type args struct {
-		reHashTagIndex1 map[uint64][][]uint64
-		reHashTagIndex2 map[uint64][][]uint64
-	}
-	tests := []struct {
-		name string
-		args args
-		want map[uint64][]uint64
-	}{
-		{
-			name: "left exclude",
-			args: args{
-				reHashTagIndex1: reHashTagIndex1,
-				reHashTagIndex2: reHashTagIndex2,
-			},
-			want: map[uint64][]uint64{
-				0: {5, 6},
-				1: {7, 8},
-			},
-		},
-		{
-			name: "right exclude",
-			args: args{
-				reHashTagIndex1: reHashTagIndex2,
-				reHashTagIndex2: reHashTagIndex1,
-			},
-			want: map[uint64][]uint64{
-				3: {13, 14},
-				4: {15, 16},
-			},
-		},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			if got := exclude(tt.args.reHashTagIndex1, tt.args.reHashTagIndex2); !allValueDeepEqual(flatten(got), tt.want) {
-				t.Errorf("exclude() = %v, want %v", got, tt.want)
-			}
-		})
-	}
-}
-
-func Test_noneJoin(t *testing.T) {
-	type args struct {
-		seriesTagIndex1 map[uint64][]uint64
-		seriesTagIndex2 map[uint64][]uint64
-	}
-	tests := []struct {
-		name string
-		args args
-		want map[uint64][]uint64
-	}{
-		{
-			name: "none join, direct splicing",
-			args: args{
-				seriesTagIndex1: seriesTagIndex1,
-				seriesTagIndex2: seriesTagIndex2,
-			},
-			want: map[uint64][]uint64{
-				0: {1, 2, 3, 4},
-				1: {5, 6, 7, 8},
-				2: {9, 10, 11, 12},
-				3: {13, 14, 15, 16},
-			},
-		},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			if got := noneJoin(tt.args.seriesTagIndex1, tt.args.seriesTagIndex2); !allValueDeepEqual(got, tt.want) {
-				t.Errorf("noneJoin() = %v, want %v", got, tt.want)
-			}
-		})
-	}
-}
-
-func Test_cartesianJoin(t *testing.T) {
-	type args struct {
-		seriesTagIndex1 map[uint64][]uint64
-		seriesTagIndex2 map[uint64][]uint64
-	}
-	tests := []struct {
-		name string
-		args args
-		want map[uint64][]uint64
-	}{
-		{
-			name: "cartesian join",
-			args: args{
-				seriesTagIndex1: seriesTagIndex1,
-				seriesTagIndex2: seriesTagIndex2,
-			},
-			want: map[uint64][]uint64{
-				0: {1, 2, 3, 4, 9, 10, 11, 12},
-				1: {5, 6, 7, 8, 9, 10, 11, 12},
-				2: {5, 6, 7, 8, 13, 14, 15, 16},
-				3: {1, 2, 3, 4, 13, 14, 15, 16},
-			},
-		},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			if got := cartesianJoin(tt.args.seriesTagIndex1, tt.args.seriesTagIndex2); !allValueDeepEqual(got, tt.want) {
-				t.Errorf("cartesianJoin() = %v, want %v", got, tt.want)
-			}
-		})
-	}
-}
-
-func Test_onJoin(t *testing.T) {
-	type args struct {
-		reHashTagIndex1 map[uint64][][]uint64
-		reHashTagIndex2 map[uint64][][]uint64
-		joinType        JoinType
-	}
-	tests := []struct {
-		name string
-		args args
-		want map[uint64][]uint64
-	}{
-		{
-			name: "left join",
-			args: args{
-				reHashTagIndex1: reHashTagIndex1,
-				reHashTagIndex2: reHashTagIndex2,
-				joinType:        Left,
-			},
-			want: map[uint64][]uint64{
-				1: {1, 2, 9, 10},
-				2: {3, 4, 9, 10},
-				3: {1, 2, 11, 12},
-				4: {3, 4, 11, 12},
-				5: {5, 6},
-				6: {7, 8},
-			},
-		},
-		{
-			name: "right join",
-			args: args{
-				reHashTagIndex1: reHashTagIndex2,
-				reHashTagIndex2: reHashTagIndex1,
-				joinType:        Right,
-			},
-			want: map[uint64][]uint64{
-				1: {1, 2, 9, 10},
-				2: {3, 4, 9, 10},
-				3: {1, 2, 11, 12},
-				4: {3, 4, 11, 12},
-				5: {13, 14},
-				6: {15, 16},
-			},
-		},
-
-		{
-			name: "inner join",
-			args: args{
-				reHashTagIndex1: reHashTagIndex1,
-				reHashTagIndex2: reHashTagIndex2,
-				joinType:        Inner,
-			},
-			want: map[uint64][]uint64{
-				1: {1, 2, 9, 10},
-				2: {3, 4, 9, 10},
-				3: {1, 2, 11, 12},
-				4: {3, 4, 11, 12},
-			},
-		},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			if got := onJoin(tt.args.reHashTagIndex1, tt.args.reHashTagIndex2, tt.args.joinType); !allValueDeepEqual(flatten(got), tt.want) {
-				t.Errorf("onJoin() = %v, want %v", got, tt.want)
-			}
-		})
-	}
-}
-
-// allValueDeepEqual 判断 map 的 value 是否相同，不考虑 key
-func allValueDeepEqual(got, want map[uint64][]uint64) bool {
-	if len(got) != len(want) {
-		return false
-	}
-	for _, v1 := range got {
-		curEqual := false
-		slices.Sort(v1)
-		for _, v2 := range want {
-			slices.Sort(v2)
-			if reflect.DeepEqual(v1, v2) {
-				curEqual = true
-				break
-			}
-		}
-		if !curEqual {
-			return false
-		}
-	}
-	return true
-}
--- a/alert/mute/mute.go
+++ b/alert/mute/mute.go
@@ -114,7 +114,7 @@ func BgNotMatchMuteStrategy(rule *models.AlertRule, event *models.AlertCurEvent,
 	target, exists := targetCache.Get(ident)
 	// 对于包含ident的告警事件，check一下ident所属bg和rule所属bg是否相同
 	// 如果告警规则选择了只在本BG生效，那其他BG的机器就不能因此规则产生告警
-	if exists && !target.MatchGroupId(rule.GroupId) {
+	if exists && target.GroupId != rule.GroupId {
 		logger.Debugf("[%s] mute: rule_eval:%d cluster:%s", "BgNotMatchMuteStrategy", rule.Id, event.Cluster)
 		return true
 	}
--- a/alert/process/process.go
+++ b/alert/process/process.go
@@ -53,11 +53,10 @@ type Processor struct {
 	datasourceId int64
 	EngineName   string

-	rule                 *models.AlertRule
-	fires                *AlertCurEventMap
-	pendings             *AlertCurEventMap
-	pendingsUseByRecover *AlertCurEventMap
-	inhibit              bool
+	rule     *models.AlertRule
+	fires    *AlertCurEventMap
+	pendings *AlertCurEventMap
+	inhibit  bool

 	tagsMap    map[string]string
 	tagsArr    []string
@@ -138,9 +137,6 @@ func (p *Processor) Handle(anomalyPoints []common.AnomalyPoint, from string, inh
 		return
 	}

-	// 在 rule 变化之前取到 ruleHash
-	ruleHash := p.rule.Hash()
-
 	p.rule = cachedRule
 	now := time.Now().Unix()
 	alertingKeys := map[string]struct{}{}
@@ -148,7 +144,7 @@ func (p *Processor) Handle(anomalyPoints []common.AnomalyPoint, from string, inh
 	// 根据 event 的 tag 将 events 分组，处理告警抑制的情况
 	eventsMap := make(map[string][]*models.AlertCurEvent)
 	for _, anomalyPoint := range anomalyPoints {
-		event := p.BuildEvent(anomalyPoint, from, now, ruleHash)
+		event := p.BuildEvent(anomalyPoint, from, now)
 		// 如果 event 被 mute 了,本质也是 fire 的状态,这里无论如何都添加到 alertingKeys 中,防止 fire 的事件自动恢复了
 		hash := event.Hash
 		alertingKeys[hash] = struct{}{}
@@ -173,12 +169,10 @@ func (p *Processor) Handle(anomalyPoints []common.AnomalyPoint, from string, inh
 		p.handleEvent(events)
 	}

-	if from == "inner" {
-		p.HandleRecover(alertingKeys, now, inhibit)
-	}
+	p.HandleRecover(alertingKeys, now, inhibit)
 }

-func (p *Processor) BuildEvent(anomalyPoint common.AnomalyPoint, from string, now int64, ruleHash string) *models.AlertCurEvent {
+func (p *Processor) BuildEvent(anomalyPoint common.AnomalyPoint, from string, now int64) *models.AlertCurEvent {
 	p.fillTags(anomalyPoint)
 	p.mayHandleIdent()
 	hash := Hash(p.rule.Id, p.datasourceId, anomalyPoint)
@@ -216,17 +210,6 @@ func (p *Processor) BuildEvent(anomalyPoint common.AnomalyPoint, from string, no
 	event.Severity = anomalyPoint.Severity
 	event.ExtraConfig = p.rule.ExtraConfigJSON
 	event.PromQl = anomalyPoint.Query
-	event.RecoverConfig = anomalyPoint.RecoverConfig
-	event.RuleHash = ruleHash
-
-	if p.target != "" {
-		if pt, exist := p.TargetCache.Get(p.target); exist {
-			pt.GroupNames = p.BusiGroupCache.GetNamesByBusiGroupIds(pt.GroupIds)
-			event.Target = pt
-		} else {
-			logger.Infof("Target[ident: %s] doesn't exist in cache.", p.target)
-		}
-	}

 	if event.TriggerValues != "" && strings.Count(event.TriggerValues, "$") > 1 {
 		// TriggerValues 有多个变量，将多个变量都放到 TriggerValue 中
@@ -249,17 +232,17 @@ func Relabel(rule *models.AlertRule, event *models.AlertCurEvent) {
 		return
 	}

-	if len(rule.EventRelabelConfig) == 0 {
-		return
-	}
-
 	// need to keep the original label
 	event.OriginalTags = event.Tags
 	event.OriginalTagsJSON = make([]string, len(event.TagsJSON))

 	labels := make([]prompb.Label, len(event.TagsJSON))
 	for i, tag := range event.TagsJSON {
-		label := strings.SplitN(tag, "=", 2)
+		label := strings.Split(tag, "=")
+		if len(label) != 2 {
+			logger.Errorf("event%+v relabel: the label length is not 2:%v", event, label)
+			continue
+		}
 		event.OriginalTagsJSON[i] = tag
 		labels[i] = prompb.Label{Name: label[0], Value: label[1]}
 	}
@@ -298,7 +281,7 @@ func (p *Processor) HandleRecover(alertingKeys map[string]struct{}, now int64, i
 	}

 	hashArr := make([]string, 0, len(alertingKeys))
-	for hash, _ := range p.fires.GetAll() {
+	for hash := range p.fires.GetAll() {
 		if _, has := alertingKeys[hash]; has {
 			continue
 		}
@@ -317,7 +300,7 @@ func (p *Processor) HandleRecoverEvent(hashArr []string, now int64, inhibit bool

 	if !inhibit {
 		for _, hash := range hashArr {
-			p.RecoverSingle(false, hash, now, nil)
+			p.RecoverSingle(hash, now, nil)
 		}
 		return
 	}
@@ -345,11 +328,11 @@ func (p *Processor) HandleRecoverEvent(hashArr []string, now int64, inhibit bool
 	}

 	for _, event := range eventMap {
-		p.RecoverSingle(false, event.Hash, now, nil)
+		p.RecoverSingle(event.Hash, now, nil)
 	}
 }

-func (p *Processor) RecoverSingle(byRecover bool, hash string, now int64, value *string, values ...string) {
+func (p *Processor) RecoverSingle(hash string, now int64, value *string, values ...string) {
 	cachedRule := p.rule
 	if cachedRule == nil {
 		return
@@ -359,28 +342,11 @@ func (p *Processor) RecoverSingle(byRecover bool, hash string, now int64, value
 	if !has {
 		return
 	}
-
 	// 如果配置了留观时长，就不能立马恢复了
-	if cachedRule.RecoverDuration > 0 {
-		lastPendingEvent, has := p.pendingsUseByRecover.Get(hash)
-		if !has {
-			// 说明没有产生过异常点，就不需要恢复了
-			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("rule_eval:%s event:%v not recover", p.Key(), event)
-			return
-		}
-	}
-
-	// 如果设置了恢复条件，则不能在此处恢复，必须依靠 recoverPoint 来恢复
-	if event.RecoverConfig.JudgeType != models.Origin && !byRecover {
+	if cachedRule.RecoverDuration > 0 && now-event.LastEvalTime < cachedRule.RecoverDuration {
 		logger.Debugf("rule_eval:%s event:%v not recover", p.Key(), event)
 		return
 	}
-
 	if value != nil {
 		event.TriggerValue = *value
 		if len(values) > 0 {
@@ -392,7 +358,6 @@ func (p *Processor) RecoverSingle(byRecover bool, hash string, now int64, value
 	// 我确实无法分辨，是prom中有值但是未满足阈值所以没返回，还是prom中确实丢了一些点导致没有数据可以返回，尴尬
 	p.fires.Delete(hash)
 	p.pendings.Delete(hash)
-	p.pendingsUseByRecover.Delete(hash)

 	// 可能是因为调整了promql才恢复的，所以事件里边要体现最新的promql，否则用户会比较困惑
 	// 当然，其实rule的各个字段都可能发生变化了，都更新一下吧
@@ -412,13 +377,6 @@ func (p *Processor) handleEvent(events []*models.AlertCurEvent) {
 		if event == nil {
 			continue
 		}
-
-		if _, has := p.pendingsUseByRecover.Get(event.Hash); has {
-			p.pendingsUseByRecover.UpdateLastEvalTime(event.Hash, event.LastEvalTime)
-		} else {
-			p.pendingsUseByRecover.Set(event.Hash, event)
-		}
-
 		if p.rule.PromForDuration == 0 {
 			fireEvents = append(fireEvents, event)
 			if severity > event.Severity {
@@ -427,7 +385,7 @@ func (p *Processor) handleEvent(events []*models.AlertCurEvent) {
 			continue
 		}

-		var preTriggerTime int64 // 第一个 pending event 的触发时间
+		var preTriggerTime int64
 		preEvent, has := p.pendings.Get(event.Hash)
 		if has {
 			p.pendings.UpdateLastEvalTime(event.Hash, event.LastEvalTime)
@@ -519,7 +477,6 @@ func (p *Processor) pushEventToQueue(e *models.AlertCurEvent) {

 func (p *Processor) RecoverAlertCurEventFromDb() {
 	p.pendings = NewAlertCurEventMap(nil)
-	p.pendingsUseByRecover = NewAlertCurEventMap(nil)

 	curEvents, err := models.AlertCurEventGetByRuleIdAndDsId(p.ctx, p.rule.Id, p.datasourceId)
 	if err != nil {
@@ -530,7 +487,6 @@ func (p *Processor) RecoverAlertCurEventFromDb() {
 	}

 	fireMap := make(map[string]*models.AlertCurEvent)
-	pendingsUseByRecoverMap := make(map[string]*models.AlertCurEvent)
 	for _, event := range curEvents {
 		if event.Cate == models.HOST {
 			target, exists := p.TargetCache.Get(event.TargetIdent)
@@ -541,21 +497,10 @@ func (p *Processor) RecoverAlertCurEventFromDb() {
 		}

 		event.DB2Mem()
-		target, exists := p.TargetCache.Get(event.TargetIdent)
-		if exists {
-			target.GroupNames = p.BusiGroupCache.GetNamesByBusiGroupIds(target.GroupIds)
-			event.Target = target
-		}
-
 		fireMap[event.Hash] = event
-		e := *event
-		pendingsUseByRecoverMap[event.Hash] = &e
 	}

 	p.fires = NewAlertCurEventMap(fireMap)
-
-	// 修改告警规则，或者进程重启之后，需要重新加载 pendingsUseByRecover
-	p.pendingsUseByRecover = NewAlertCurEventMap(pendingsUseByRecoverMap)
 }

 func (p *Processor) fillTags(anomalyPoint common.AnomalyPoint) {
@@ -631,7 +576,6 @@ func (p *Processor) mayHandleGroup() {
 func (p *Processor) DeleteProcessEvent(hash string) {
 	p.fires.Delete(hash)
 	p.pendings.Delete(hash)
-	p.pendingsUseByRecover.Delete(hash)
 }

 func labelMapToArr(m map[string]string) []string {
--- a/alert/record/prom_rule.go
+++ b/alert/record/prom_rule.go
@@ -56,12 +56,11 @@ func (rrc *RecordRuleContext) Key() string {
 }

 func (rrc *RecordRuleContext) Hash() string {
-	return str.MD5(fmt.Sprintf("%d_%s_%s_%d_%s",
+	return str.MD5(fmt.Sprintf("%d_%s_%s_%d",
 		rrc.rule.Id,
 		rrc.rule.CronPattern,
 		rrc.rule.PromQl,
 		rrc.datasourceId,
-		rrc.rule.AppendTags,
 	))
 }

--- a/alert/record/scheduler.go
+++ b/alert/record/scheduler.go
@@ -26,11 +26,9 @@ type Scheduler struct {
 	writers     *writer.WritersType

 	stats *astats.Stats
-
-	datasourceCache *memsto.DatasourceCacheType
 }

-func NewScheduler(aconf aconf.Alert, rrc *memsto.RecordingRuleCacheType, promClients *prom.PromClientMap, writers *writer.WritersType, stats *astats.Stats, datasourceCache *memsto.DatasourceCacheType) *Scheduler {
+func NewScheduler(aconf aconf.Alert, rrc *memsto.RecordingRuleCacheType, promClients *prom.PromClientMap, writers *writer.WritersType, stats *astats.Stats) *Scheduler {
 	scheduler := &Scheduler{
 		aconf:       aconf,
 		recordRules: make(map[string]*RecordRuleContext),
@@ -41,8 +39,6 @@ func NewScheduler(aconf aconf.Alert, rrc *memsto.RecordingRuleCacheType, promCli
 		writers:     writers,

 		stats: stats,
-
-		datasourceCache: datasourceCache,
 	}

 	go scheduler.LoopSyncRules(context.Background())
@@ -71,7 +67,7 @@ func (s *Scheduler) syncRecordRules() {
 			continue
 		}

-		datasourceIds := s.datasourceCache.GetIDsByDsCateAndQueries("prometheus", rule.DatasourceQueries)
+		datasourceIds := s.promClients.Hit(rule.DatasourceIdsJson)
 		for _, dsId := range datasourceIds {
 			if !naming.DatasourceHashRing.IsHit(strconv.FormatInt(dsId, 10), fmt.Sprintf("%d", rule.Id), s.aconf.Heartbeat.Endpoint) {
 				continue
--- a/alert/router/router_event.go
+++ b/alert/router/router_event.go
@@ -34,7 +34,7 @@ func (rt *Router) pushEventToQueue(c *gin.Context) {
 			continue
 		}

-		arr := strings.SplitN(pair, "=", 2)
+		arr := strings.Split(pair, "=")
 		if len(arr) != 2 {
 			continue
 		}
@@ -129,7 +129,7 @@ func (rt *Router) makeEvent(c *gin.Context) {
 		} else {
 			for _, vector := range events[i].AnomalyPoints {
 				readableString := vector.ReadableValue()
-				go ruleWorker.RecoverSingle(false, process.Hash(events[i].RuleId, events[i].DatasourceId, vector), vector.Timestamp, &readableString)
+				go ruleWorker.RecoverSingle(process.Hash(events[i].RuleId, events[i].DatasourceId, vector), vector.Timestamp, &readableString)
 			}
 		}
 	}
--- a/alert/sender/callback.go
+++ b/alert/sender/callback.go
@@ -125,53 +125,32 @@ func (c *DefaultCallBacker) CallBack(ctx CallBackContext) {
 			Batch:         1000,
 		}

-		PushCallbackEvent(ctx.Ctx, webhookConf, event, ctx.Stats)
+		PushCallbackEvent(webhookConf, event, ctx.Stats)
 		return
 	}

-	doSendAndRecord(ctx.Ctx, ctx.CallBackURL, ctx.CallBackURL, event, "callback", ctx.Stats, event)
-}
-
-func doSendAndRecord(ctx *ctx.Context, url, token string, body interface{}, channel string,
-	stats *astats.Stats, event *models.AlertCurEvent) {
-	res, err := doSend(url, body, channel, stats)
-	NotifyRecord(ctx, event, channel, token, res, err)
-}
-
-func NotifyRecord(ctx *ctx.Context, evt *models.AlertCurEvent, channel, target, res string, err error) {
-	noti := models.NewNotificationRecord(evt, channel, target)
+	ctx.Stats.AlertNotifyTotal.WithLabelValues("rule_callback").Inc()
+	resp, code, err := poster.PostJSON(ctx.CallBackURL, 5*time.Second, event, 3)
 	if err != nil {
-		noti.SetStatus(models.NotiStatusFailure)
-		noti.SetDetails(err.Error())
-	} else if res != "" {
-		noti.SetDetails(string(res))
-	}
-
-	if !ctx.IsCenter {
-		_, err := poster.PostByUrlsWithResp[int64](ctx, "/v1/n9e/notify-record", noti)
-		if err != nil {
-			logger.Errorf("add noti:%v failed, err: %v", noti, err)
-		}
-		return
-	}
-
-	if err := noti.Add(ctx); err != nil {
-		logger.Errorf("add noti:%v failed, err: %v", noti, err)
+		logger.Errorf("event_callback_fail(rule_id=%d url=%s), event:%+v, resp: %s, err: %v, code: %d",
+			event.RuleId, ctx.CallBackURL, event, string(resp), err, code)
+		ctx.Stats.AlertNotifyErrorTotal.WithLabelValues("rule_callback").Inc()
+	} else {
+		logger.Infof("event_callback_succ(rule_id=%d url=%s), event:%+v, resp: %s, code: %d",
+			event.RuleId, ctx.CallBackURL, event, string(resp), code)
 	}
 }

-func doSend(url string, body interface{}, channel string, stats *astats.Stats) (string, error) {
+func doSend(url string, body interface{}, channel string, stats *astats.Stats) {
 	stats.AlertNotifyTotal.WithLabelValues(channel).Inc()

 	res, code, err := poster.PostJSON(url, time.Second*5, body, 3)
 	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 "", err
+	} else {
+		logger.Infof("%s_sender: result=succ url=%s code=%d req:%v response=%s", channel, url, code, body, string(res))
 	}
-
-	logger.Infof("%s_sender: result=succ url=%s code=%d req:%v response=%s", channel, url, code, body, string(res))
-	return string(res), nil
 }

 type TaskCreateReply struct {
@@ -179,26 +158,26 @@ type TaskCreateReply struct {
 	Dat int64  `json:"dat"` // task.id
 }

-func PushCallbackEvent(ctx *ctx.Context, webhook *models.Webhook, event *models.AlertCurEvent, stats *astats.Stats) {
+func PushCallbackEvent(webhook *models.Webhook, event *models.AlertCurEvent, stats *astats.Stats) {
 	CallbackEventQueueLock.RLock()
 	queue := CallbackEventQueue[webhook.Url]
 	CallbackEventQueueLock.RUnlock()

 	if queue == nil {
 		queue = &WebhookQueue{
-			eventQueue: NewSafeEventQueue(QueueMaxSize),
-			closeCh:    make(chan struct{}),
+			list:    NewSafeListLimited(QueueMaxSize),
+			closeCh: make(chan struct{}),
 		}

 		CallbackEventQueueLock.Lock()
 		CallbackEventQueue[webhook.Url] = queue
 		CallbackEventQueueLock.Unlock()

-		StartConsumer(ctx, queue, webhook.Batch, webhook, stats)
+		StartConsumer(queue, webhook.Batch, webhook, stats)
 	}

-	succ := queue.eventQueue.Push(event)
+	succ := queue.list.PushFront(event)
 	if !succ {
-		logger.Warningf("Write channel(%s) full, current channel size: %d event:%v", webhook.Url, queue.eventQueue.Len(), event)
+		logger.Warningf("Write channel(%s) full, current channel size: %d event:%v", webhook.Url, queue.list.Len(), event)
 	}
 }
--- a/alert/sender/dingtalk.go
+++ b/alert/sender/dingtalk.go
@@ -1,10 +1,9 @@
 package sender

 import (
+	"github.com/ccfos/nightingale/v6/models"
 	"html/template"
 	"strings"
-
-	"github.com/ccfos/nightingale/v6/models"
 )

 type dingtalkMarkdown struct {
@@ -36,13 +35,13 @@ func (ds *DingtalkSender) Send(ctx MessageContext) {
 		return
 	}

-	urls, ats, tokens := ds.extract(ctx.Users)
+	urls, ats := ds.extract(ctx.Users)
 	if len(urls) == 0 {
 		return
 	}
 	message := BuildTplMessage(models.Dingtalk, ds.tpl, ctx.Events)

-	for i, url := range urls {
+	for _, url := range urls {
 		var body dingtalk
 		// NoAt in url
 		if strings.Contains(url, "noat=1") {
@@ -67,7 +66,7 @@ func (ds *DingtalkSender) Send(ctx MessageContext) {
 			}
 		}

-		doSendAndRecord(ctx.Ctx, url, tokens[i], body, models.Dingtalk, ctx.Stats, ctx.Events[0])
+		doSend(url, body, models.Dingtalk, ctx.Stats)
 	}
 }

@@ -97,15 +96,15 @@ func (ds *DingtalkSender) CallBack(ctx CallBackContext) {
 		body.Markdown.Text = message
 	}

-	doSendAndRecord(ctx.Ctx, ctx.CallBackURL, ctx.CallBackURL, body,
-		"callback", ctx.Stats, ctx.Events[0])
+	doSend(ctx.CallBackURL, body, models.Dingtalk, ctx.Stats)
+
+	ctx.Stats.AlertNotifyTotal.WithLabelValues("rule_callback").Inc()
 }

 // extract urls and ats from Users
-func (ds *DingtalkSender) extract(users []*models.User) ([]string, []string, []string) {
+func (ds *DingtalkSender) extract(users []*models.User) ([]string, []string) {
 	urls := make([]string, 0, len(users))
 	ats := make([]string, 0, len(users))
-	tokens := make([]string, 0, len(users))

 	for _, user := range users {
 		if user.Phone != "" {
@@ -117,8 +116,7 @@ func (ds *DingtalkSender) extract(users []*models.User) ([]string, []string, []s
 				url = "https://oapi.dingtalk.com/robot/send?access_token=" + token
 			}
 			urls = append(urls, url)
-			tokens = append(tokens, token)
 		}
 	}
-	return urls, ats, tokens
+	return urls, ats
 }
--- a/alert/sender/email.go
+++ b/alert/sender/email.go
@@ -9,14 +9,13 @@ import (
 	"github.com/ccfos/nightingale/v6/alert/aconf"
 	"github.com/ccfos/nightingale/v6/memsto"
 	"github.com/ccfos/nightingale/v6/models"
-	"github.com/ccfos/nightingale/v6/pkg/ctx"

 	"github.com/toolkits/pkg/logger"

 	"gopkg.in/gomail.v2"
 )

-var mailch chan *EmailContext
+var mailch chan *gomail.Message

 type EmailSender struct {
 	subjectTpl *template.Template
@@ -24,11 +23,6 @@ type EmailSender struct {
 	smtp       aconf.SMTPConfig
 }

-type EmailContext struct {
-	event *models.AlertCurEvent
-	mail  *gomail.Message
-}
-
 func (es *EmailSender) Send(ctx MessageContext) {
 	if len(ctx.Users) == 0 || len(ctx.Events) == 0 {
 		return
@@ -42,7 +36,7 @@ func (es *EmailSender) Send(ctx MessageContext) {
 		subject = ctx.Events[0].RuleName
 	}
 	content := BuildTplMessage(models.Email, es.contentTpl, ctx.Events)
-	es.WriteEmail(subject, content, tos, ctx.Events[0])
+	es.WriteEmail(subject, content, tos)

 	ctx.Stats.AlertNotifyTotal.WithLabelValues(models.Email).Add(float64(len(tos)))
 }
@@ -79,8 +73,7 @@ func SendEmail(subject, content string, tos []string, stmp aconf.SMTPConfig) err
 	return nil
 }

-func (es *EmailSender) WriteEmail(subject, content string, tos []string,
-	event *models.AlertCurEvent) {
+func (es *EmailSender) WriteEmail(subject, content string, tos []string) {
 	m := gomail.NewMessage()

 	m.SetHeader("From", es.smtp.From)
@@ -88,7 +81,7 @@ func (es *EmailSender) WriteEmail(subject, content string, tos []string,
 	m.SetHeader("Subject", subject)
 	m.SetBody("text/html", content)

-	mailch <- &EmailContext{event, m}
+	mailch <- m
 }

 func dialSmtp(d *gomail.Dialer) gomail.SendCloser {
@@ -111,22 +104,22 @@ func dialSmtp(d *gomail.Dialer) gomail.SendCloser {

 var mailQuit = make(chan struct{})

-func RestartEmailSender(ctx *ctx.Context, smtp aconf.SMTPConfig) {
+func RestartEmailSender(smtp aconf.SMTPConfig) {
 	// Notify internal start exit
 	mailQuit <- struct{}{}
-	startEmailSender(ctx, smtp)
+	startEmailSender(smtp)
 }

 var smtpConfig aconf.SMTPConfig

-func InitEmailSender(ctx *ctx.Context, ncc *memsto.NotifyConfigCacheType) {
-	mailch = make(chan *EmailContext, 100000)
-	go updateSmtp(ctx, ncc)
+func InitEmailSender(ncc *memsto.NotifyConfigCacheType) {
+	mailch = make(chan *gomail.Message, 100000)
+	go updateSmtp(ncc)
 	smtpConfig = ncc.GetSMTP()
-	go startEmailSender(ctx, smtpConfig)
+	startEmailSender(smtpConfig)
 }

-func updateSmtp(ctx *ctx.Context, ncc *memsto.NotifyConfigCacheType) {
+func updateSmtp(ncc *memsto.NotifyConfigCacheType) {
 	for {
 		time.Sleep(1 * time.Minute)
 		smtp := ncc.GetSMTP()
@@ -134,16 +127,15 @@ func updateSmtp(ctx *ctx.Context, ncc *memsto.NotifyConfigCacheType) {
 			smtpConfig.Pass != smtp.Pass || smtpConfig.User != smtp.User || smtpConfig.Port != smtp.Port ||
 			smtpConfig.InsecureSkipVerify != smtp.InsecureSkipVerify { //diff
 			smtpConfig = smtp
-			RestartEmailSender(ctx, smtp)
+			RestartEmailSender(smtp)
 		}
 	}
 }

-func startEmailSender(ctx *ctx.Context, smtp aconf.SMTPConfig) {
+func startEmailSender(smtp aconf.SMTPConfig) {
 	conf := smtp
 	if conf.Host == "" || conf.Port == 0 {
 		logger.Warning("SMTP configurations invalid")
-		<-mailQuit
 		return
 	}
 	logger.Infof("start email sender... conf.Host:%+v,conf.Port:%+v", conf.Host, conf.Port)
@@ -175,8 +167,7 @@ func startEmailSender(ctx *ctx.Context, smtp aconf.SMTPConfig) {
 				}
 				open = true
 			}
-			var err error
-			if err = gomail.Send(s, m.mail); err != nil {
+			if err := gomail.Send(s, m); err != nil {
 				logger.Errorf("email_sender: failed to send: %s", err)

 				// close and retry
@@ -193,20 +184,11 @@ func startEmailSender(ctx *ctx.Context, smtp aconf.SMTPConfig) {
 				}
 				open = true

-				if err = gomail.Send(s, m.mail); err != nil {
+				if err := gomail.Send(s, m); err != nil {
 					logger.Errorf("email_sender: failed to retry send: %s", err)
 				}
 			} else {
-				logger.Infof("email_sender: result=succ subject=%v to=%v",
-					m.mail.GetHeader("Subject"), m.mail.GetHeader("To"))
-			}
-
-			for _, to := range m.mail.GetHeader("To") {
-				msg := ""
-				if err == nil {
-					msg = "ok"
-				}
-				NotifyRecord(ctx, m.event, models.Email, to, msg, err)
+				logger.Infof("email_sender: result=succ subject=%v to=%v", m.GetHeader("Subject"), m.GetHeader("To"))
 			}

 			size++
--- a/alert/sender/feishu.go
+++ b/alert/sender/feishu.go
@@ -54,17 +54,17 @@ func (fs *FeishuSender) CallBack(ctx CallBackContext) {
 		},
 	}

-	doSendAndRecord(ctx.Ctx, ctx.CallBackURL, ctx.CallBackURL, body, "callback",
-		ctx.Stats, ctx.Events[0])
+	doSend(ctx.CallBackURL, body, models.Feishu, ctx.Stats)
+	ctx.Stats.AlertNotifyTotal.WithLabelValues("rule_callback").Inc()
 }

 func (fs *FeishuSender) Send(ctx MessageContext) {
 	if len(ctx.Users) == 0 || len(ctx.Events) == 0 {
 		return
 	}
-	urls, ats, tokens := fs.extract(ctx.Users)
+	urls, ats := fs.extract(ctx.Users)
 	message := BuildTplMessage(models.Feishu, fs.tpl, ctx.Events)
-	for i, url := range urls {
+	for _, url := range urls {
 		body := feishu{
 			Msgtype: "text",
 			Content: feishuContent{
@@ -77,14 +77,13 @@ func (fs *FeishuSender) Send(ctx MessageContext) {
 				IsAtAll:   false,
 			}
 		}
-		doSendAndRecord(ctx.Ctx, url, tokens[i], body, models.Feishu, ctx.Stats, ctx.Events[0])
+		doSend(url, body, models.Feishu, ctx.Stats)
 	}
 }

-func (fs *FeishuSender) extract(users []*models.User) ([]string, []string, []string) {
+func (fs *FeishuSender) extract(users []*models.User) ([]string, []string) {
 	urls := make([]string, 0, len(users))
 	ats := make([]string, 0, len(users))
-	tokens := make([]string, 0, len(users))

 	for _, user := range users {
 		if user.Phone != "" {
@@ -96,8 +95,7 @@ func (fs *FeishuSender) extract(users []*models.User) ([]string, []string, []str
 				url = "https://open.feishu.cn/open-apis/bot/v2/hook/" + token
 			}
 			urls = append(urls, url)
-			tokens = append(tokens, token)
 		}
 	}
-	return urls, ats, tokens
+	return urls, ats
 }
--- a/alert/sender/feishucard.go
+++ b/alert/sender/feishucard.go
@@ -56,8 +56,8 @@ const (
 	Triggered = "triggered"
 )

-func createFeishuCardBody() feishuCard {
-	return feishuCard{
+var (
+	body = feishuCard{
 		feishu: feishu{Msgtype: "interactive"},
 		Card: Cards{
 			Config: Conf{
@@ -90,7 +90,7 @@ func createFeishuCardBody() feishuCard {
 			},
 		},
 	}
-}
+)

 func (fs *FeishuCardSender) CallBack(ctx CallBackContext) {
 	if len(ctx.Events) == 0 || len(ctx.CallBackURL) == 0 {
@@ -121,7 +121,6 @@ func (fs *FeishuCardSender) CallBack(ctx CallBackContext) {
 	}

 	SendTitle := fmt.Sprintf("🔔 %s", ctx.Events[0].RuleName)
-	body := createFeishuCardBody()
 	body.Card.Header.Title.Content = SendTitle
 	body.Card.Header.Template = color
 	body.Card.Elements[0].Text.Content = message
@@ -135,15 +134,14 @@ func (fs *FeishuCardSender) CallBack(ctx CallBackContext) {
 	}
 	parsedURL.RawQuery = ""

-	doSendAndRecord(ctx.Ctx, parsedURL.String(), parsedURL.String(), body, "callback",
-		ctx.Stats, ctx.Events[0])
+	doSend(parsedURL.String(), body, models.FeishuCard, ctx.Stats)
 }

 func (fs *FeishuCardSender) Send(ctx MessageContext) {
 	if len(ctx.Users) == 0 || len(ctx.Events) == 0 {
 		return
 	}
-	urls, tokens := fs.extract(ctx.Users)
+	urls, _ := fs.extract(ctx.Users)
 	message := BuildTplMessage(models.FeishuCard, fs.tpl, ctx.Events)
 	color := "red"
 	lowerUnicode := strings.ToLower(message)
@@ -154,20 +152,18 @@ func (fs *FeishuCardSender) Send(ctx MessageContext) {
 	}

 	SendTitle := fmt.Sprintf("🔔 %s", ctx.Events[0].RuleName)
-	body := createFeishuCardBody()
 	body.Card.Header.Title.Content = SendTitle
 	body.Card.Header.Template = color
 	body.Card.Elements[0].Text.Content = message
 	body.Card.Elements[2].Elements[0].Content = SendTitle
-	for i, url := range urls {
-		doSendAndRecord(ctx.Ctx, url, tokens[i], body, models.FeishuCard,
-			ctx.Stats, ctx.Events[0])
+	for _, url := range urls {
+		doSend(url, body, models.FeishuCard, ctx.Stats)
 	}
 }

 func (fs *FeishuCardSender) extract(users []*models.User) ([]string, []string) {
 	urls := make([]string, 0, len(users))
-	tokens := make([]string, 0, len(users))
+	ats := make([]string, 0)
 	for i := range users {
 		if token, has := users[i].ExtractToken(models.FeishuCard); has {
 			url := token
@@ -175,8 +171,7 @@ func (fs *FeishuCardSender) extract(users []*models.User) ([]string, []string) {
 				url = "https://open.feishu.cn/open-apis/bot/v2/hook/" + strings.TrimSpace(token)
 			}
 			urls = append(urls, url)
-			tokens = append(tokens, token)
 		}
 	}
-	return urls, tokens
+	return urls, ats
 }
--- a/alert/sender/ibex.go
+++ b/alert/sender/ibex.go
@@ -77,20 +77,15 @@ func (c *IbexCallBacker) handleIbex(ctx *ctx.Context, url string, event *models.
 		return
 	}

-	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) {
-	tpl := taskTplCache.Get(id)
+	tpl := c.taskTplCache.Get(id)
 	if tpl == nil {
 		logger.Errorf("event_callback_ibex: no such tpl(%d)", id)
 		return
 	}
+
 	// check perm
 	// tpl.GroupId - host - account 三元组校验权限
-	can, err := canDoIbex(tpl.UpdateBy, tpl, host, targetCache, userCache)
+	can, err := canDoIbex(tpl.UpdateBy, tpl, host, c.targetCache, c.userCache)
 	if err != nil {
 		logger.Errorf("event_callback_ibex: check perm fail: %v", err)
 		return
@@ -108,7 +103,7 @@ func CallIbex(ctx *ctx.Context, id int64, host string,
 			continue
 		}

-		arr := strings.SplitN(pair, "=", 2)
+		arr := strings.Split(pair, "=")
 		if len(arr) != 2 {
 			continue
 		}
@@ -181,15 +176,10 @@ func canDoIbex(username string, tpl *models.TaskTpl, host string, targetCache *m
 		return false, nil
 	}

-	return target.MatchGroupId(tpl.GroupId), nil
+	return target.GroupId == tpl.GroupId, nil
 }

 func TaskAdd(f models.TaskForm, authUser string, isCenter bool) (int64, error) {
-	if storage.Cache == nil {
-		logger.Warning("event_callback_ibex: redis cache is nil")
-		return 0, fmt.Errorf("redis cache is nil")
-	}
-
 	hosts := cleanHosts(f.Hosts)
 	if len(hosts) == 0 {
 		return 0, fmt.Errorf("arg(hosts) empty")
--- a/alert/sender/lark.go
+++ b/alert/sender/lark.go
@@ -27,30 +27,29 @@ func (lk *LarkSender) CallBack(ctx CallBackContext) {
 		},
 	}

-	doSendAndRecord(ctx.Ctx, ctx.CallBackURL, ctx.CallBackURL, body, "callback",
-		ctx.Stats, ctx.Events[0])
+	doSend(ctx.CallBackURL, body, models.Lark, ctx.Stats)
+	ctx.Stats.AlertNotifyTotal.WithLabelValues("rule_callback").Inc()
 }

 func (lk *LarkSender) Send(ctx MessageContext) {
 	if len(ctx.Users) == 0 || len(ctx.Events) == 0 {
 		return
 	}
-	urls, tokens := lk.extract(ctx.Users)
+	urls := lk.extract(ctx.Users)
 	message := BuildTplMessage(models.Lark, lk.tpl, ctx.Events)
-	for i, url := range urls {
+	for _, url := range urls {
 		body := feishu{
 			Msgtype: "text",
 			Content: feishuContent{
 				Text: message,
 			},
 		}
-		doSendAndRecord(ctx.Ctx, url, tokens[i], body, models.Lark, ctx.Stats, ctx.Events[0])
+		doSend(url, body, models.Lark, ctx.Stats)
 	}
 }

-func (lk *LarkSender) extract(users []*models.User) ([]string, []string) {
+func (lk *LarkSender) extract(users []*models.User) []string {
 	urls := make([]string, 0, len(users))
-	tokens := make([]string, 0, len(users))

 	for _, user := range users {
 		if token, has := user.ExtractToken(models.Lark); has {
@@ -59,8 +58,7 @@ func (lk *LarkSender) extract(users []*models.User) ([]string, []string) {
 				url = "https://open.larksuite.com/open-apis/bot/v2/hook/" + token
 			}
 			urls = append(urls, url)
-			tokens = append(tokens, token)
 		}
 	}
-	return urls, tokens
+	return urls
 }
--- a/alert/sender/larkcard.go
+++ b/alert/sender/larkcard.go
@@ -42,7 +42,6 @@ func (fs *LarkCardSender) CallBack(ctx CallBackContext) {
 	}

 	SendTitle := fmt.Sprintf("🔔 %s", ctx.Events[0].RuleName)
-	body := createFeishuCardBody()
 	body.Card.Header.Title.Content = SendTitle
 	body.Card.Header.Template = color
 	body.Card.Elements[0].Text.Content = message
@@ -56,15 +55,14 @@ func (fs *LarkCardSender) CallBack(ctx CallBackContext) {
 	}
 	parsedURL.RawQuery = ""

-	doSendAndRecord(ctx.Ctx, ctx.CallBackURL, ctx.CallBackURL, body, "callback",
-		ctx.Stats, ctx.Events[0])
+	doSend(parsedURL.String(), body, models.LarkCard, ctx.Stats)
 }

 func (fs *LarkCardSender) Send(ctx MessageContext) {
 	if len(ctx.Users) == 0 || len(ctx.Events) == 0 {
 		return
 	}
-	urls, tokens := fs.extract(ctx.Users)
+	urls, _ := fs.extract(ctx.Users)
 	message := BuildTplMessage(models.LarkCard, fs.tpl, ctx.Events)
 	color := "red"
 	lowerUnicode := strings.ToLower(message)
@@ -75,19 +73,18 @@ func (fs *LarkCardSender) Send(ctx MessageContext) {
 	}

 	SendTitle := fmt.Sprintf("🔔 %s", ctx.Events[0].RuleName)
-	body := createFeishuCardBody()
 	body.Card.Header.Title.Content = SendTitle
 	body.Card.Header.Template = color
 	body.Card.Elements[0].Text.Content = message
 	body.Card.Elements[2].Elements[0].Content = SendTitle
-	for i, url := range urls {
-		doSendAndRecord(ctx.Ctx, url, tokens[i], body, models.LarkCard, ctx.Stats, ctx.Events[0])
+	for _, url := range urls {
+		doSend(url, body, models.LarkCard, ctx.Stats)
 	}
 }

 func (fs *LarkCardSender) extract(users []*models.User) ([]string, []string) {
 	urls := make([]string, 0, len(users))
-	tokens := make([]string, 0)
+	ats := make([]string, 0)
 	for i := range users {
 		if token, has := users[i].ExtractToken(models.Lark); has {
 			url := token
@@ -95,8 +92,7 @@ func (fs *LarkCardSender) extract(users []*models.User) ([]string, []string) {
 				url = "https://open.larksuite.com/open-apis/bot/v2/hook/" + strings.TrimSpace(token)
 			}
 			urls = append(urls, url)
-			tokens = append(tokens, token)
 		}
 	}
-	return urls, tokens
+	return urls, ats
 }
--- a/alert/sender/mm.go
+++ b/alert/sender/mm.go
@@ -7,7 +7,6 @@ import (

 	"github.com/ccfos/nightingale/v6/alert/astats"
 	"github.com/ccfos/nightingale/v6/models"
-	"github.com/ccfos/nightingale/v6/pkg/ctx"

 	"github.com/toolkits/pkg/logger"
 )
@@ -39,11 +38,11 @@ func (ms *MmSender) Send(ctx MessageContext) {
 	}
 	message := BuildTplMessage(models.Mm, ms.tpl, ctx.Events)

-	SendMM(ctx.Ctx, MatterMostMessage{
+	SendMM(MatterMostMessage{
 		Text:   message,
 		Tokens: urls,
 		Stats:  ctx.Stats,
-	}, ctx.Events[0], models.Mm)
+	})
 }

 func (ms *MmSender) CallBack(ctx CallBackContext) {
@@ -52,11 +51,13 @@ func (ms *MmSender) CallBack(ctx CallBackContext) {
 	}
 	message := BuildTplMessage(models.Mm, ms.tpl, ctx.Events)

-	SendMM(ctx.Ctx, MatterMostMessage{
+	SendMM(MatterMostMessage{
 		Text:   message,
 		Tokens: []string{ctx.CallBackURL},
 		Stats:  ctx.Stats,
-	}, ctx.Events[0], "callback")
+	})
+
+	ctx.Stats.AlertNotifyTotal.WithLabelValues("rule_callback").Inc()
 }

 func (ms *MmSender) extract(users []*models.User) []string {
@@ -69,12 +70,11 @@ func (ms *MmSender) extract(users []*models.User) []string {
 	return tokens
 }

-func SendMM(ctx *ctx.Context, message MatterMostMessage, event *models.AlertCurEvent, channel string) {
+func SendMM(message MatterMostMessage) {
 	for i := 0; i < len(message.Tokens); i++ {
 		u, err := url.Parse(message.Tokens[i])
 		if err != nil {
 			logger.Errorf("mm_sender: failed to parse error=%v", err)
-			NotifyRecord(ctx, event, channel, message.Tokens[i], "", err)
 			continue
 		}

@@ -103,7 +103,7 @@ func SendMM(ctx *ctx.Context, message MatterMostMessage, event *models.AlertCurE
 				Username: username,
 				Text:     txt + message.Text,
 			}
-			doSendAndRecord(ctx, ur, message.Tokens[i], body, channel, message.Stats, event)
+			doSend(ur, body, models.Mm, message.Stats)
 		}
 	}
 }
--- a/alert/sender/plugin.go
+++ b/alert/sender/plugin.go
@@ -2,30 +2,26 @@ package sender

 import (
 	"bytes"
-	"fmt"
 	"os"
 	"os/exec"
 	"time"

 	"github.com/ccfos/nightingale/v6/alert/astats"
 	"github.com/ccfos/nightingale/v6/models"
-	"github.com/ccfos/nightingale/v6/pkg/ctx"

 	"github.com/toolkits/pkg/file"
 	"github.com/toolkits/pkg/logger"
 	"github.com/toolkits/pkg/sys"
 )

-func MayPluginNotify(ctx *ctx.Context, noticeBytes []byte, notifyScript models.NotifyScript,
-	stats *astats.Stats, event *models.AlertCurEvent) {
+func MayPluginNotify(noticeBytes []byte, notifyScript models.NotifyScript, stats *astats.Stats) {
 	if len(noticeBytes) == 0 {
 		return
 	}
-	alertingCallScript(ctx, noticeBytes, notifyScript, stats, event)
+	alertingCallScript(noticeBytes, notifyScript, stats)
 }

-func alertingCallScript(ctx *ctx.Context, stdinBytes []byte, notifyScript models.NotifyScript,
-	stats *astats.Stats, event *models.AlertCurEvent) {
+func alertingCallScript(stdinBytes []byte, notifyScript models.NotifyScript, stats *astats.Stats) {
 	// not enable or no notify.py? do nothing
 	config := notifyScript
 	if !config.Enable || config.Content == "" {
@@ -85,7 +81,6 @@ func alertingCallScript(ctx *ctx.Context, stdinBytes []byte, notifyScript models
 	}

 	err, isTimeout := sys.WrapTimeout(cmd, time.Duration(config.Timeout)*time.Second)
-	NotifyRecord(ctx, event, channel, cmd.String(), "", buildErr(err, isTimeout))

 	if isTimeout {
 		if err == nil {
@@ -107,11 +102,3 @@ func alertingCallScript(ctx *ctx.Context, stdinBytes []byte, notifyScript models

 	logger.Infof("event_script_notify_ok: exec %s output: %s", fpath, buf.String())
 }
-
-func buildErr(err error, isTimeout bool) error {
-	if err == nil && !isTimeout {
-		return nil
-	} else {
-		return fmt.Errorf("is_timeout: %v, err: %v", isTimeout, err)
-	}
-}
--- a/alert/sender/sender.go
+++ b/alert/sender/sender.go
@@ -8,7 +8,6 @@ import (
 	"github.com/ccfos/nightingale/v6/alert/astats"
 	"github.com/ccfos/nightingale/v6/memsto"
 	"github.com/ccfos/nightingale/v6/models"
-	"github.com/ccfos/nightingale/v6/pkg/ctx"
 )

 type (
@@ -23,7 +22,6 @@ type (
 		Rule   *models.AlertRule
 		Events []*models.AlertCurEvent
 		Stats  *astats.Stats
-		Ctx    *ctx.Context
 	}
 )

@@ -51,15 +49,13 @@ func NewSender(key string, tpls map[string]*template.Template, smtp ...aconf.SMT
 	return nil
 }

-func BuildMessageContext(ctx *ctx.Context, rule *models.AlertRule, events []*models.AlertCurEvent,
-	uids []int64, userCache *memsto.UserCacheType, stats *astats.Stats) MessageContext {
+func BuildMessageContext(rule *models.AlertRule, events []*models.AlertCurEvent, uids []int64, userCache *memsto.UserCacheType, stats *astats.Stats) MessageContext {
 	users := userCache.GetByUserIds(uids)
 	return MessageContext{
 		Rule:   rule,
 		Events: events,
 		Users:  users,
 		Stats:  stats,
-		Ctx:    ctx,
 	}
 }

--- a/alert/sender/telegram.go
+++ b/alert/sender/telegram.go
@@ -1,13 +1,11 @@
 package sender

 import (
-	"errors"
 	"html/template"
 	"strings"

 	"github.com/ccfos/nightingale/v6/alert/astats"
 	"github.com/ccfos/nightingale/v6/models"
-	"github.com/ccfos/nightingale/v6/pkg/ctx"

 	"github.com/toolkits/pkg/logger"
 )
@@ -37,11 +35,13 @@ func (ts *TelegramSender) CallBack(ctx CallBackContext) {
 	}

 	message := BuildTplMessage(models.Telegram, ts.tpl, ctx.Events)
-	SendTelegram(ctx.Ctx, TelegramMessage{
+	SendTelegram(TelegramMessage{
 		Text:   message,
 		Tokens: []string{ctx.CallBackURL},
 		Stats:  ctx.Stats,
-	}, ctx.Events[0], "callback")
+	})
+
+	ctx.Stats.AlertNotifyTotal.WithLabelValues("rule_callback").Inc()
 }

 func (ts *TelegramSender) Send(ctx MessageContext) {
@@ -51,11 +51,11 @@ func (ts *TelegramSender) Send(ctx MessageContext) {
 	tokens := ts.extract(ctx.Users)
 	message := BuildTplMessage(models.Telegram, ts.tpl, ctx.Events)

-	SendTelegram(ctx.Ctx, TelegramMessage{
+	SendTelegram(TelegramMessage{
 		Text:   message,
 		Tokens: tokens,
 		Stats:  ctx.Stats,
-	}, ctx.Events[0], models.Telegram)
+	})
 }

 func (ts *TelegramSender) extract(users []*models.User) []string {
@@ -68,11 +68,10 @@ func (ts *TelegramSender) extract(users []*models.User) []string {
 	return tokens
 }

-func SendTelegram(ctx *ctx.Context, message TelegramMessage, event *models.AlertCurEvent, channel string) {
+func SendTelegram(message TelegramMessage) {
 	for i := 0; i < len(message.Tokens); i++ {
 		if !strings.Contains(message.Tokens[i], "/") && !strings.HasPrefix(message.Tokens[i], "https://") {
 			logger.Errorf("telegram_sender: result=fail invalid token=%s", message.Tokens[i])
-			NotifyRecord(ctx, event, channel, message.Tokens[i], "", errors.New("invalid token"))
 			continue
 		}
 		var url string
@@ -93,6 +92,6 @@ func SendTelegram(ctx *ctx.Context, message TelegramMessage, event *models.Alert
 			Text:      message.Text,
 		}

-		doSendAndRecord(ctx, url, message.Tokens[i], body, channel, message.Stats, event)
+		doSend(url, body, models.Telegram, message.Stats)
 	}
 }
--- a/alert/sender/webhook.go
+++ b/alert/sender/webhook.go
@@ -4,7 +4,6 @@ import (
 	"bytes"
 	"crypto/tls"
 	"encoding/json"
-	"fmt"
 	"io"
 	"net/http"
 	"sync"
@@ -12,12 +11,11 @@ import (

 	"github.com/ccfos/nightingale/v6/alert/astats"
 	"github.com/ccfos/nightingale/v6/models"
-	"github.com/ccfos/nightingale/v6/pkg/ctx"

 	"github.com/toolkits/pkg/logger"
 )

-func sendWebhook(webhook *models.Webhook, event interface{}, stats *astats.Stats) (bool, string, error) {
+func sendWebhook(webhook *models.Webhook, event interface{}, stats *astats.Stats) bool {
 	channel := "webhook"
 	if webhook.Type == models.RuleCallback {
 		channel = "callback"
@@ -25,12 +23,12 @@ func sendWebhook(webhook *models.Webhook, event interface{}, stats *astats.Stats

 	conf := webhook
 	if conf.Url == "" || !conf.Enable {
-		return false, "", nil
+		return false
 	}
 	bs, err := json.Marshal(event)
 	if err != nil {
 		logger.Errorf("%s alertingWebhook failed to marshal event:%+v err:%v", channel, event, err)
-		return false, "", err
+		return false
 	}

 	bf := bytes.NewBuffer(bs)
@@ -38,7 +36,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 reques event:%s err:%v", channel, string(bs), err)
-		return true, "", err
+		return true
 	}

 	req.Header.Set("Content-Type", "application/json")
@@ -68,15 +66,14 @@ func sendWebhook(webhook *models.Webhook, event interface{}, stats *astats.Stats

 	stats.AlertNotifyTotal.WithLabelValues(channel).Inc()
 	var resp *http.Response
-	var body []byte
 	resp, err = client.Do(req)
-
 	if err != nil {
 		stats.AlertNotifyErrorTotal.WithLabelValues(channel).Inc()
 		logger.Errorf("event_%s_fail, event:%s, url: [%s], error: [%s]", channel, string(bs), conf.Url, err)
-		return true, "", err
+		return true
 	}

+	var body []byte
 	if resp.Body != nil {
 		defer resp.Body.Close()
 		body, _ = io.ReadAll(resp.Body)
@@ -84,19 +81,18 @@ 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, string(body), fmt.Errorf("status code is 429")
+		return true
 	}

 	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, string(body), nil
+	return false
 }

-func SingleSendWebhooks(ctx *ctx.Context, webhooks []*models.Webhook, event *models.AlertCurEvent, stats *astats.Stats) {
+func SingleSendWebhooks(webhooks []*models.Webhook, event *models.AlertCurEvent, stats *astats.Stats) {
 	for _, conf := range webhooks {
 		retryCount := 0
 		for retryCount < 3 {
-			needRetry, res, err := sendWebhook(conf, event, stats)
-			NotifyRecord(ctx, event, "webhook", conf.Url, res, err)
+			needRetry := sendWebhook(conf, event, stats)
 			if !needRetry {
 				break
 			}
@@ -106,10 +102,10 @@ func SingleSendWebhooks(ctx *ctx.Context, webhooks []*models.Webhook, event *mod
 	}
 }

-func BatchSendWebhooks(ctx *ctx.Context, webhooks []*models.Webhook, event *models.AlertCurEvent, stats *astats.Stats) {
+func BatchSendWebhooks(webhooks []*models.Webhook, event *models.AlertCurEvent, stats *astats.Stats) {
 	for _, conf := range webhooks {
 		logger.Infof("push event:%+v to queue:%v", event, conf)
-		PushEvent(ctx, conf, event, stats)
+		PushEvent(conf, event, stats)
 	}
 }

@@ -121,43 +117,43 @@ var EventQueueLock sync.RWMutex
 const QueueMaxSize = 100000

 type WebhookQueue struct {
-	eventQueue *SafeEventQueue
-	closeCh    chan struct{}
+	list    *SafeListLimited
+	closeCh chan struct{}
 }

-func PushEvent(ctx *ctx.Context, webhook *models.Webhook, event *models.AlertCurEvent, stats *astats.Stats) {
+func PushEvent(webhook *models.Webhook, event *models.AlertCurEvent, stats *astats.Stats) {
 	EventQueueLock.RLock()
 	queue := EventQueue[webhook.Url]
 	EventQueueLock.RUnlock()

 	if queue == nil {
 		queue = &WebhookQueue{
-			eventQueue: NewSafeEventQueue(QueueMaxSize),
-			closeCh:    make(chan struct{}),
+			list:    NewSafeListLimited(QueueMaxSize),
+			closeCh: make(chan struct{}),
 		}

 		EventQueueLock.Lock()
 		EventQueue[webhook.Url] = queue
 		EventQueueLock.Unlock()

-		StartConsumer(ctx, queue, webhook.Batch, webhook, stats)
+		StartConsumer(queue, webhook.Batch, webhook, stats)
 	}

-	succ := queue.eventQueue.Push(event)
+	succ := queue.list.PushFront(event)
 	if !succ {
 		stats.AlertNotifyErrorTotal.WithLabelValues("push_event_queue").Inc()
-		logger.Warningf("Write channel(%s) full, current channel size: %d event:%v", webhook.Url, queue.eventQueue.Len(), event)
+		logger.Warningf("Write channel(%s) full, current channel size: %d event:%v", webhook.Url, queue.list.Len(), event)
 	}
 }

-func StartConsumer(ctx *ctx.Context, queue *WebhookQueue, popSize int, webhook *models.Webhook, stats *astats.Stats) {
+func StartConsumer(queue *WebhookQueue, popSize int, webhook *models.Webhook, stats *astats.Stats) {
 	for {
 		select {
 		case <-queue.closeCh:
 			logger.Infof("event queue:%v closed", queue)
 			return
 		default:
-			events := queue.eventQueue.PopN(popSize)
+			events := queue.list.PopBack(popSize)
 			if len(events) == 0 {
 				time.Sleep(time.Millisecond * 400)
 				continue
@@ -165,8 +161,7 @@ func StartConsumer(ctx *ctx.Context, queue *WebhookQueue, popSize int, webhook *

 			retryCount := 0
 			for retryCount < webhook.RetryCount {
-				needRetry, res, err := sendWebhook(webhook, events, stats)
-				go RecordEvents(ctx, webhook, events, stats, res, err)
+				needRetry := sendWebhook(webhook, events, stats)
 				if !needRetry {
 					break
 				}
@@ -176,10 +171,3 @@ func StartConsumer(ctx *ctx.Context, queue *WebhookQueue, popSize int, webhook *
 		}
 	}
 }
-
-func RecordEvents(ctx *ctx.Context, webhook *models.Webhook, events []*models.AlertCurEvent, stats *astats.Stats, res string, err error) {
-	for _, event := range events {
-		time.Sleep(time.Millisecond * 10)
-		NotifyRecord(ctx, event, "webhook", webhook.Url, res, err)
-	}
-}
--- a/alert/sender/webhook_event_queue.go
+++ b/alert/sender/webhook_event_queue.go
@@ -1,109 +0,0 @@
-package sender
-
-import (
-	"container/list"
-	"sync"
-
-	"github.com/ccfos/nightingale/v6/models"
-)
-
-type SafeEventQueue struct {
-	lock        sync.RWMutex
-	maxSize     int
-	queueHigh   *list.List
-	queueMiddle *list.List
-	queueLow    *list.List
-}
-
-const (
-	High   = 1
-	Middle = 2
-	Low    = 3
-)
-
-func NewSafeEventQueue(maxSize int) *SafeEventQueue {
-	return &SafeEventQueue{
-		maxSize:     maxSize,
-		lock:        sync.RWMutex{},
-		queueHigh:   list.New(),
-		queueMiddle: list.New(),
-		queueLow:    list.New(),
-	}
-}
-
-func (spq *SafeEventQueue) Len() int {
-	spq.lock.RLock()
-	defer spq.lock.RUnlock()
-	return spq.queueHigh.Len() + spq.queueMiddle.Len() + spq.queueLow.Len()
-}
-
-// len 无锁读取长度，不要在本文件外调用
-func (spq *SafeEventQueue) len() int {
-	return spq.queueHigh.Len() + spq.queueMiddle.Len() + spq.queueLow.Len()
-}
-
-func (spq *SafeEventQueue) Push(event *models.AlertCurEvent) bool {
-	spq.lock.Lock()
-	defer spq.lock.Unlock()
-
-	for spq.len() > spq.maxSize {
-		return false
-	}
-
-	switch event.Severity {
-	case High:
-		spq.queueHigh.PushBack(event)
-	case Middle:
-		spq.queueMiddle.PushBack(event)
-	case Low:
-		spq.queueLow.PushBack(event)
-	default:
-		return false
-	}
-
-	return true
-}
-
-// pop 无锁弹出事件，不要在本文件外调用
-func (spq *SafeEventQueue) pop() *models.AlertCurEvent {
-	if spq.len() == 0 {
-		return nil
-	}
-
-	var elem interface{}
-
-	if spq.queueHigh.Len() > 0 {
-		elem = spq.queueHigh.Remove(spq.queueHigh.Front())
-	} else if spq.queueMiddle.Len() > 0 {
-		elem = spq.queueMiddle.Remove(spq.queueMiddle.Front())
-	} else {
-		elem = spq.queueLow.Remove(spq.queueLow.Front())
-	}
-	event, ok := elem.(*models.AlertCurEvent)
-	if !ok {
-		return nil
-	}
-	return event
-}
-
-func (spq *SafeEventQueue) Pop() *models.AlertCurEvent {
-	spq.lock.Lock()
-	defer spq.lock.Unlock()
-	return spq.pop()
-}
-
-func (spq *SafeEventQueue) PopN(n int) []*models.AlertCurEvent {
-	spq.lock.Lock()
-	defer spq.lock.Unlock()
-
-	events := make([]*models.AlertCurEvent, 0, n)
-	count := 0
-	for count < n && spq.len() > 0 {
-		event := spq.pop()
-		if event != nil {
-			events = append(events, event)
-		}
-		count++
-	}
-	return events
-}
--- a/alert/sender/webhook_event_queue_test.go
+++ b/alert/sender/webhook_event_queue_test.go
@@ -1,157 +0,0 @@
-package sender
-
-import (
-	"sync"
-	"testing"
-	"time"
-
-	"github.com/ccfos/nightingale/v6/models"
-	"github.com/stretchr/testify/assert"
-)
-
-func TestSafePriorityQueue_ConcurrentPushPop(t *testing.T) {
-	spq := NewSafeEventQueue(100000)
-
-	var wg sync.WaitGroup
-	numGoroutines := 100
-	numEvents := 1000
-
-	// 并发 Push
-	wg.Add(numGoroutines)
-	for i := 0; i < numGoroutines; i++ {
-		go func(goroutineID int) {
-			defer wg.Done()
-			for j := 0; j < numEvents; j++ {
-				event := &models.AlertCurEvent{
-					Severity:    goroutineID%3 + 1,
-					TriggerTime: time.Now().UnixNano(),
-				}
-				spq.Push(event)
-			}
-		}(i)
-	}
-	wg.Wait()
-
-	// 检查队列长度是否正确
-	expectedLen := numGoroutines * numEvents
-	assert.Equal(t, expectedLen, spq.Len(), "Queue length mismatch after concurrent pushes")
-
-	// 并发 Pop
-	wg.Add(numGoroutines)
-	for i := 0; i < numGoroutines; i++ {
-		go func() {
-			defer wg.Done()
-			for {
-				event := spq.Pop()
-				if event == nil {
-					return
-				}
-			}
-		}()
-	}
-	wg.Wait()
-
-	// 最终队列应该为空
-	assert.Equal(t, 0, spq.Len(), "Queue should be empty after concurrent pops")
-}
-
-func TestSafePriorityQueue_ConcurrentPopMax(t *testing.T) {
-	spq := NewSafeEventQueue(100000)
-
-	// 添加初始数据
-	for i := 0; i < 1000; i++ {
-		spq.Push(&models.AlertCurEvent{
-			Severity:    i%3 + 1,
-			TriggerTime: time.Now().UnixNano(),
-		})
-	}
-
-	var wg sync.WaitGroup
-	numGoroutines := 10
-	popMax := 100
-
-	// 并发 PopN
-	wg.Add(numGoroutines)
-	for i := 0; i < numGoroutines; i++ {
-		go func() {
-			defer wg.Done()
-			events := spq.PopN(popMax)
-			assert.LessOrEqual(t, len(events), popMax, "PopN exceeded maximum")
-		}()
-	}
-	wg.Wait()
-
-	// 检查队列长度是否正确
-	expectedRemaining := 1000 - (numGoroutines * popMax)
-	if expectedRemaining < 0 {
-		expectedRemaining = 0
-	}
-	assert.Equal(t, expectedRemaining, spq.Len(), "Queue length mismatch after concurrent PopN")
-}
-
-func TestSafePriorityQueue_ConcurrentPushPopWithDifferentSeverities(t *testing.T) {
-	spq := NewSafeEventQueue(100000)
-
-	var wg sync.WaitGroup
-	numGoroutines := 50
-	numEvents := 500
-
-	// 并发 Push 不同优先级的事件
-	wg.Add(numGoroutines)
-	for i := 0; i < numGoroutines; i++ {
-		go func(goroutineID int) {
-			defer wg.Done()
-			for j := 0; j < numEvents; j++ {
-				event := &models.AlertCurEvent{
-					Severity:    goroutineID%3 + 1, // 模拟不同的 Severity
-					TriggerTime: time.Now().UnixNano(),
-				}
-				spq.Push(event)
-			}
-		}(i)
-	}
-	wg.Wait()
-
-	// 检查队列长度是否正确
-	expectedLen := numGoroutines * numEvents
-	assert.Equal(t, expectedLen, spq.Len(), "Queue length mismatch after concurrent pushes")
-
-	// 检查事件的顺序是否按照优先级排列
-	var lastEvent *models.AlertCurEvent
-	for spq.Len() > 0 {
-		event := spq.Pop()
-		if lastEvent != nil {
-			assert.LessOrEqual(t, lastEvent.Severity, event.Severity, "Events are not in correct priority order")
-		}
-		lastEvent = event
-	}
-}
-
-func TestSafePriorityQueue_ExceedMaxSize(t *testing.T) {
-	spq := NewSafeEventQueue(5)
-
-	// 插入超过最大容量的事件
-	for i := 0; i < 10; i++ {
-		spq.Push(&models.AlertCurEvent{
-			Severity:    i % 3,
-			TriggerTime: int64(i),
-		})
-	}
-
-	// 验证队列的长度是否不超过 maxSize
-	assert.LessOrEqual(t, spq.Len(), spq.maxSize)
-
-	// 验证队列中剩余事件的内容
-	expectedEvents := 5
-	if spq.Len() < 5 {
-		expectedEvents = spq.Len()
-	}
-
-	// 检查最后存入的事件是否是按优先级排序
-	for i := 0; i < expectedEvents; i++ {
-		event := spq.Pop()
-		if event != nil {
-			assert.LessOrEqual(t, event.Severity, 2)
-		}
-	}
-}
--- a/alert/sender/wecom.go
+++ b/alert/sender/wecom.go
@@ -37,30 +37,29 @@ func (ws *WecomSender) CallBack(ctx CallBackContext) {
 		},
 	}

-	doSendAndRecord(ctx.Ctx, ctx.CallBackURL, ctx.CallBackURL, body, "callback",
-		ctx.Stats, ctx.Events[0])
+	doSend(ctx.CallBackURL, body, models.Wecom, ctx.Stats)
+	ctx.Stats.AlertNotifyTotal.WithLabelValues("rule_callback").Inc()
 }

 func (ws *WecomSender) Send(ctx MessageContext) {
 	if len(ctx.Users) == 0 || len(ctx.Events) == 0 {
 		return
 	}
-	urls, tokens := ws.extract(ctx.Users)
+	urls := ws.extract(ctx.Users)
 	message := BuildTplMessage(models.Wecom, ws.tpl, ctx.Events)
-	for i, url := range urls {
+	for _, url := range urls {
 		body := wecom{
 			Msgtype: "markdown",
 			Markdown: wecomMarkdown{
 				Content: message,
 			},
 		}
-		doSendAndRecord(ctx.Ctx, url, tokens[i], body, models.Wecom, ctx.Stats, ctx.Events[0])
+		doSend(url, body, models.Wecom, ctx.Stats)
 	}
 }

-func (ws *WecomSender) extract(users []*models.User) ([]string, []string) {
+func (ws *WecomSender) extract(users []*models.User) []string {
 	urls := make([]string, 0, len(users))
-	tokens := make([]string, 0, len(users))
 	for _, user := range users {
 		if token, has := user.ExtractToken(models.Wecom); has {
 			url := token
@@ -68,8 +67,7 @@ func (ws *WecomSender) extract(users []*models.User) ([]string, []string) {
 				url = "https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key=" + token
 			}
 			urls = append(urls, url)
-			tokens = append(tokens, token)
 		}
 	}
-	return urls, tokens
+	return urls
 }
--- a/center/cconf/conf.go
+++ b/center/cconf/conf.go
@@ -13,8 +13,6 @@ type Center struct {
 	UseFileAssets          bool
 	FlashDuty              FlashDuty
 	EventHistoryGroupView  bool
-	CleanNotifyRecordDay   int
-	MigrateBusiGroupLabel  bool
 }

 type Plugin struct {
--- a/center/center.go
+++ b/center/center.go
@@ -16,7 +16,6 @@ import (
 	centerrt "github.com/ccfos/nightingale/v6/center/router"
 	"github.com/ccfos/nightingale/v6/center/sso"
 	"github.com/ccfos/nightingale/v6/conf"
-	"github.com/ccfos/nightingale/v6/cron"
 	"github.com/ccfos/nightingale/v6/dumper"
 	"github.com/ccfos/nightingale/v6/memsto"
 	"github.com/ccfos/nightingale/v6/models"
@@ -48,10 +47,6 @@ func Initialize(configDir string, cryptoKey string) (func(), error) {

 	cconf.MergeOperationConf()

-	if config.Alert.Heartbeat.EngineName == "" {
-		config.Alert.Heartbeat.EngineName = "default"
-	}
-
 	logxClean, err := logx.Init(config.Log)
 	if err != nil {
 		return nil, err
@@ -76,7 +71,7 @@ func Initialize(configDir string, cryptoKey string) (func(), error) {
 		return nil, err
 	}

-	go integration.Init(ctx, config.Center.BuiltinIntegrationsDir)
+	integration.Init(ctx, config.Center.BuiltinIntegrationsDir)
 	var redis storage.Redis
 	redis, err = storage.NewRedis(config.Redis)
 	if err != nil {
@@ -99,7 +94,6 @@ func Initialize(configDir string, cryptoKey string) (func(), error) {
 	userCache := memsto.NewUserCache(ctx, syncStats)
 	userGroupCache := memsto.NewUserGroupCache(ctx, syncStats)
 	taskTplCache := memsto.NewTaskTplCache(ctx)
-	configCvalCache := memsto.NewCvalCache(ctx, syncStats)

 	sso := sso.Init(config.Center, ctx, configCache)
 	promClients := prom.NewPromClient(ctx)
@@ -112,17 +106,12 @@ func Initialize(configDir string, cryptoKey string) (func(), error) {

 	go version.GetGithubVersion()

-	go cron.CleanNotifyRecord(ctx, config.Center.CleanNotifyRecordDay)
-
 	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, tdengineClients,
+	centerRouter := centerrt.New(config.HTTP, config.Center, config.Alert, config.Ibex, cconf.Operations, dsCache, notifyConfigCache, promClients, tdengineClients,
 		redis, sso, ctx, metas, idents, targetCache, userCache, userGroupCache)
 	pushgwRouter := pushgwrt.New(config.HTTP, config.Pushgw, config.Alert, targetCache, busiGroupCache, idents, metas, writers, ctx)

-	go models.MigrateBg(ctx, pushgwRouter.Pushgw.BusiGroupLabelKey)
-
-	r := httpx.GinEngine(config.Global.RunMode, config.HTTP, configCvalCache.PrintBodyPaths, configCvalCache.PrintAccessLog)
+	r := httpx.GinEngine(config.Global.RunMode, config.HTTP)

 	centerRouter.Config(r)
 	alertrtRouter.Config(r)
--- a/center/integration/init.go
+++ b/center/integration/init.go
@@ -16,12 +16,6 @@ import (
 const SYSTEM = "system"

 func Init(ctx *ctx.Context, builtinIntegrationsDir string) {
-	err := models.InitBuiltinPayloads(ctx)
-	if err != nil {
-		logger.Warning("init old builtinPayloads fail ", err)
-		return
-	}
-
 	fp := builtinIntegrationsDir
 	if fp == "" {
 		fp = path.Join(runner.Cwd, "integrations")
@@ -98,7 +92,6 @@ func Init(ctx *ctx.Context, builtinIntegrationsDir string) {
 					logger.Warning("update builtin component fail ", old, err)
 				}
 			}
-			component.ID = old.ID
 		}

 		// delete uuid is emtpy
@@ -148,13 +141,13 @@ func Init(ctx *ctx.Context, builtinIntegrationsDir string) {

 					cate := strings.Replace(f, ".json", "", -1)
 					builtinAlert := models.BuiltinPayload{
-						ComponentID: component.ID,
-						Type:        "alert",
-						Cate:        cate,
-						Name:        alert.Name,
-						Tags:        alert.AppendTags,
-						Content:     string(content),
-						UUID:        alert.UUID,
+						Component: component.Ident,
+						Type:      "alert",
+						Cate:      cate,
+						Name:      alert.Name,
+						Tags:      alert.AppendTags,
+						Content:   string(content),
+						UUID:      alert.UUID,
 					}

 					old, err := models.BuiltinPayloadGet(ctx, "uuid = ?", alert.UUID)
@@ -172,7 +165,6 @@ func Init(ctx *ctx.Context, builtinIntegrationsDir string) {
 					}

 					if old.UpdatedBy == SYSTEM {
-						old.ComponentID = component.ID
 						old.Content = string(content)
 						old.Name = alert.Name
 						old.Tags = alert.AppendTags
@@ -239,13 +231,13 @@ func Init(ctx *ctx.Context, builtinIntegrationsDir string) {
 				}

 				builtinDashboard := models.BuiltinPayload{
-					ComponentID: component.ID,
-					Type:        "dashboard",
-					Cate:        "",
-					Name:        dashboard.Name,
-					Tags:        dashboard.Tags,
-					Content:     string(content),
-					UUID:        dashboard.UUID,
+					Component: component.Ident,
+					Type:      "dashboard",
+					Cate:      "",
+					Name:      dashboard.Name,
+					Tags:      dashboard.Tags,
+					Content:   string(content),
+					UUID:      dashboard.UUID,
 				}

 				old, err := models.BuiltinPayloadGet(ctx, "uuid = ?", dashboard.UUID)
@@ -263,7 +255,6 @@ func Init(ctx *ctx.Context, builtinIntegrationsDir string) {
 				}

 				if old.UpdatedBy == SYSTEM {
-					old.ComponentID = component.ID
 					old.Content = string(content)
 					old.Name = dashboard.Name
 					old.Tags = dashboard.Tags
--- a/center/router/router.go
+++ b/center/router/router.go
@@ -16,7 +16,6 @@ import (
 	"github.com/ccfos/nightingale/v6/conf"
 	_ "github.com/ccfos/nightingale/v6/front/statik"
 	"github.com/ccfos/nightingale/v6/memsto"
-	"github.com/ccfos/nightingale/v6/models"
 	"github.com/ccfos/nightingale/v6/pkg/aop"
 	"github.com/ccfos/nightingale/v6/pkg/ctx"
 	"github.com/ccfos/nightingale/v6/pkg/httpx"
@@ -52,14 +51,9 @@ type Router struct {
 	UserGroupCache    *memsto.UserGroupCacheType
 	Ctx               *ctx.Context
 	HeartbeatHook     HeartbeatHookFunc
-	TargetDeleteHook  models.TargetDeleteHookFunc
 }

-func New(httpConfig httpx.Config, center cconf.Center, alert aconf.Alert, ibex conf.Ibex,
-	operations cconf.Operation, ds *memsto.DatasourceCacheType, ncc *memsto.NotifyConfigCacheType,
-	pc *prom.PromClientMap, tdendgineClients *tdengine.TdengineClientMap, redis storage.Redis,
-	sso *sso.SsoClient, ctx *ctx.Context, metaSet *metas.Set, idents *idents.Set,
-	tc *memsto.TargetCacheType, uc *memsto.UserCacheType, ugc *memsto.UserGroupCacheType) *Router {
+func New(httpConfig httpx.Config, center cconf.Center, alert aconf.Alert, ibex conf.Ibex, operations cconf.Operation, ds *memsto.DatasourceCacheType, ncc *memsto.NotifyConfigCacheType, pc *prom.PromClientMap, tdendgineClients *tdengine.TdengineClientMap, redis storage.Redis, sso *sso.SsoClient, ctx *ctx.Context, metaSet *metas.Set, idents *idents.Set, tc *memsto.TargetCacheType, uc *memsto.UserCacheType, ugc *memsto.UserGroupCacheType) *Router {
 	return &Router{
 		HTTP:              httpConfig,
 		Center:            center,
@@ -79,14 +73,9 @@ func New(httpConfig httpx.Config, center cconf.Center, alert aconf.Alert, ibex c
 		UserGroupCache:    ugc,
 		Ctx:               ctx,
 		HeartbeatHook:     func(ident string) map[string]interface{} { return nil },
-		TargetDeleteHook:  emptyDeleteHook,
 	}
 }

-func emptyDeleteHook(ctx *ctx.Context, idents []string) error {
-	return nil
-}
-
 func stat() gin.HandlerFunc {
 	return func(c *gin.Context) {
 		start := time.Now()
@@ -184,7 +173,6 @@ func (rt *Router) Config(r *gin.Engine) {
 			pages.POST("/query-range-batch", rt.promBatchQueryRange)
 			pages.POST("/query-instant-batch", rt.promBatchQueryInstant)
 			pages.GET("/datasource/brief", rt.datasourceBriefs)
-			pages.POST("/datasource/query", rt.datasourceQuery)

 			pages.POST("/ds-query", rt.QueryData)
 			pages.POST("/logs-query", rt.QueryLog)
@@ -198,7 +186,6 @@ func (rt *Router) Config(r *gin.Engine) {
 			pages.POST("/query-range-batch", rt.auth(), rt.promBatchQueryRange)
 			pages.POST("/query-instant-batch", rt.auth(), rt.promBatchQueryInstant)
 			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.QueryData)
 			pages.POST("/logs-query", rt.auth(), rt.QueryLog)
@@ -289,7 +276,7 @@ func (rt *Router) Config(r *gin.Engine) {
 		pages.POST("/targets/tags", rt.auth(), rt.user(), rt.perm("/targets/put"), rt.targetBindTagsByFE)
 		pages.DELETE("/targets/tags", rt.auth(), rt.user(), rt.perm("/targets/put"), rt.targetUnbindTagsByFE)
 		pages.PUT("/targets/note", rt.auth(), rt.user(), rt.perm("/targets/put"), rt.targetUpdateNote)
-		pages.PUT("/targets/bgids", rt.auth(), rt.user(), rt.perm("/targets/put"), rt.targetBindBgids)
+		pages.PUT("/targets/bgid", rt.auth(), rt.user(), rt.perm("/targets/put"), rt.targetUpdateBgid)

 		pages.POST("/builtin-cate-favorite", rt.auth(), rt.user(), rt.builtinCateFavoriteAdd)
 		pages.DELETE("/builtin-cate-favorite/:name", rt.auth(), rt.user(), rt.builtinCateFavoriteDel)
@@ -310,7 +297,6 @@ func (rt *Router) Config(r *gin.Engine) {
 		pages.POST("/busi-group/:id/board/:bid/clone", rt.auth(), rt.user(), rt.perm("/dashboards/add"), rt.bgrw(), rt.boardClone)
 		pages.POST("/busi-groups/boards/clones", rt.auth(), rt.user(), rt.perm("/dashboards/add"), rt.boardBatchClone)

-		pages.GET("/boards", rt.auth(), rt.user(), rt.boardGetsByBids)
 		pages.GET("/board/:bid", rt.boardGet)
 		pages.GET("/board/:bid/pure", rt.boardPureGet)
 		pages.PUT("/board/:bid", rt.auth(), rt.user(), rt.perm("/dashboards/put"), rt.boardPut)
@@ -329,8 +315,6 @@ func (rt *Router) Config(r *gin.Engine) {
 		pages.GET("/busi-group/:id/alert-rules", rt.auth(), rt.user(), rt.perm("/alert-rules"), rt.alertRuleGets)
 		pages.POST("/busi-group/:id/alert-rules", rt.auth(), rt.user(), rt.perm("/alert-rules/add"), rt.bgrw(), rt.alertRuleAddByFE)
 		pages.POST("/busi-group/:id/alert-rules/import", rt.auth(), rt.user(), rt.perm("/alert-rules/add"), rt.bgrw(), rt.alertRuleAddByImport)
-		pages.POST("/busi-group/:id/alert-rules/import-prom-rule", rt.auth(),
-			rt.user(), rt.perm("/alert-rules/add"), rt.bgrw(), rt.alertRuleAddByImportPromRule)
 		pages.DELETE("/busi-group/:id/alert-rules", rt.auth(), rt.user(), rt.perm("/alert-rules/del"), rt.bgrw(), rt.alertRuleDel)
 		pages.PUT("/busi-group/:id/alert-rules/fields", rt.auth(), rt.user(), rt.perm("/alert-rules/put"), rt.bgrw(), rt.alertRulePutFields)
 		pages.PUT("/busi-group/:id/alert-rule/:arid", rt.auth(), rt.user(), rt.perm("/alert-rules/put"), rt.alertRulePutByFE)
@@ -338,7 +322,6 @@ func (rt *Router) Config(r *gin.Engine) {
 		pages.GET("/alert-rule/:arid/pure", rt.auth(), rt.user(), rt.perm("/alert-rules"), rt.alertRulePureGet)
 		pages.PUT("/busi-group/alert-rule/validate", rt.auth(), rt.user(), rt.perm("/alert-rules/put"), rt.alertRuleValidation)
 		pages.POST("/relabel-test", rt.auth(), rt.user(), rt.relabelTest)
-		pages.POST("/busi-group/:id/alert-rules/clone", rt.auth(), rt.user(), rt.perm("/alert-rules/add"), rt.bgrw(), rt.cloneToMachine)

 		pages.GET("/busi-groups/recording-rules", rt.auth(), rt.user(), rt.perm("/recording-rules"), rt.recordingRuleGetsByGids)
 		pages.GET("/busi-group/:id/recording-rules", rt.auth(), rt.user(), rt.perm("/recording-rules"), rt.recordingRuleGets)
@@ -367,11 +350,9 @@ func (rt *Router) Config(r *gin.Engine) {
 		if rt.Center.AnonymousAccess.AlertDetail {
 			pages.GET("/alert-cur-event/:eid", rt.alertCurEventGet)
 			pages.GET("/alert-his-event/:eid", rt.alertHisEventGet)
-			pages.GET("/event-notify-records/:eid", rt.notificationRecordList)
 		} else {
 			pages.GET("/alert-cur-event/:eid", rt.auth(), rt.user(), rt.alertCurEventGet)
 			pages.GET("/alert-his-event/:eid", rt.auth(), rt.user(), rt.alertHisEventGet)
-			pages.GET("/event-notify-records/:eid", rt.auth(), rt.user(), rt.notificationRecordList)
 		}

 		// card logic
@@ -477,7 +458,6 @@ func (rt *Router) Config(r *gin.Engine) {
 		pages.GET("/builtin-payload/:id", rt.auth(), rt.user(), rt.perm("/built-in-components"), rt.builtinPayloadGet)
 		pages.PUT("/builtin-payloads", rt.auth(), rt.user(), rt.perm("/built-in-components/put"), rt.builtinPayloadsPut)
 		pages.DELETE("/builtin-payloads", rt.auth(), rt.user(), rt.perm("/built-in-components/del"), rt.builtinPayloadsDel)
-		pages.GET("/builtin-payload", rt.auth(), rt.user(), rt.builtinPayloadsGetByUUIDOrID)
 	}

 	r.GET("/api/n9e/versions", func(c *gin.Context) {
@@ -554,7 +534,6 @@ func (rt *Router) Config(r *gin.Engine) {
 			service.GET("/config/:id", rt.configGet)
 			service.GET("/configs", rt.configsGet)
 			service.GET("/config", rt.configGetByKey)
-			service.GET("/all-configs", rt.configGetAll)
 			service.PUT("/configs", rt.configsPut)
 			service.POST("/configs", rt.configsPost)
 			service.DELETE("/configs", rt.configsDel)
@@ -572,11 +551,6 @@ func (rt *Router) Config(r *gin.Engine) {

 			service.GET("/targets-of-alert-rule", rt.targetsOfAlertRule)

-			service.POST("/notify-record", rt.notificationRecordAdd)
-
-			service.GET("/alert-cur-events-del-by-hash", rt.alertCurEventDelByHash)
-
-			service.POST("/center/heartbeat", rt.heartbeat)
 		}
 	}

--- a/center/router/router_alert_cur_event.go
+++ b/center/router/router_alert_cur_event.go
@@ -65,8 +65,7 @@ func (rt *Router) alertCurEventsCard(c *gin.Context) {
 	ginx.Dangerous(err)

 	// 最多获取50000个，获取太多也没啥意义
-	list, err := models.AlertCurEventsGet(rt.Ctx, prods, bgids, stime, etime, severity, dsIds,
-		cates, 0, query, 50000, 0)
+	list, err := models.AlertCurEventGets(rt.Ctx, prods, bgids, stime, etime, severity, dsIds, cates, query, 50000, 0)
 	ginx.Dangerous(err)

 	cardmap := make(map[string]*AlertCard)
@@ -163,17 +162,13 @@ func (rt *Router) alertCurEventsList(c *gin.Context) {
 		cates = strings.Split(cate, ",")
 	}

-	ruleId := ginx.QueryInt64(c, "rid", 0)
-
 	bgids, err := GetBusinessGroupIds(c, rt.Ctx, rt.Center.EventHistoryGroupView)
 	ginx.Dangerous(err)

-	total, err := models.AlertCurEventTotal(rt.Ctx, prods, bgids, stime, etime, severity, dsIds,
-		cates, ruleId, query)
+	total, err := models.AlertCurEventTotal(rt.Ctx, prods, bgids, stime, etime, severity, dsIds, cates, query)
 	ginx.Dangerous(err)

-	list, err := models.AlertCurEventsGet(rt.Ctx, prods, bgids, stime, etime, severity, dsIds,
-		cates, ruleId, query, limit, ginx.Offset(c, limit))
+	list, err := models.AlertCurEventGets(rt.Ctx, prods, bgids, stime, etime, severity, dsIds, cates, query, limit, ginx.Offset(c, limit))
 	ginx.Dangerous(err)

 	cache := make(map[int64]*models.UserGroup)
@@ -206,9 +201,7 @@ func (rt *Router) checkCurEventBusiGroupRWPermission(c *gin.Context, ids []int64
 	for i := 0; i < len(ids); i++ {
 		event, err := models.AlertCurEventGetById(rt.Ctx, ids[i])
 		ginx.Dangerous(err)
-		if event == nil {
-			continue
-		}
+
 		if _, has := set[event.GroupId]; !has {
 			rt.bgrwCheck(c, event.GroupId)
 			set[event.GroupId] = struct{}{}
@@ -229,12 +222,6 @@ func (rt *Router) alertCurEventGet(c *gin.Context) {
 		rt.bgroCheck(c, event.GroupId)
 	}

-	ruleConfig, needReset := models.FillRuleConfigTplName(rt.Ctx, event.RuleConfig)
-	if needReset {
-		event.RuleConfigJson = ruleConfig
-	}
-
-	event.LastEvalTime = event.TriggerTime
 	ginx.NewRender(c).Data(event, nil)
 }

@@ -242,8 +229,3 @@ func (rt *Router) alertCurEventsStatistics(c *gin.Context) {

 	ginx.NewRender(c).Data(models.AlertCurEventStatistics(rt.Ctx, time.Now()), nil)
 }
-
-func (rt *Router) alertCurEventDelByHash(c *gin.Context) {
-	hash := ginx.QueryStr(c, "hash")
-	ginx.NewRender(c).Message(models.AlertCurEventDelByHash(rt.Ctx, hash))
-}
--- a/center/router/router_alert_his_event.go
+++ b/center/router/router_alert_his_event.go
@@ -54,17 +54,13 @@ func (rt *Router) alertHisEventsList(c *gin.Context) {
 		cates = strings.Split(cate, ",")
 	}

-	ruleId := ginx.QueryInt64(c, "rid", 0)
-
 	bgids, err := GetBusinessGroupIds(c, rt.Ctx, rt.Center.EventHistoryGroupView)
 	ginx.Dangerous(err)

-	total, err := models.AlertHisEventTotal(rt.Ctx, prods, bgids, stime, etime, severity,
-		recovered, dsIds, cates, ruleId, query)
+	total, err := models.AlertHisEventTotal(rt.Ctx, prods, bgids, stime, etime, severity, recovered, dsIds, cates, 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))
+	list, err := models.AlertHisEventGets(rt.Ctx, prods, bgids, stime, etime, severity, recovered, dsIds, cates, query, limit, ginx.Offset(c, limit))
 	ginx.Dangerous(err)

 	cache := make(map[int64]*models.UserGroup)
@@ -91,11 +87,6 @@ func (rt *Router) alertHisEventGet(c *gin.Context) {
 		rt.bgroCheck(c, event.GroupId)
 	}

-	ruleConfig, needReset := models.FillRuleConfigTplName(rt.Ctx, event.RuleConfig)
-	if needReset {
-		event.RuleConfigJson = ruleConfig
-	}
-
 	ginx.NewRender(c).Data(event, err)
 }

--- a/center/router/router_alert_rule.go
+++ b/center/router/router_alert_rule.go
@@ -1,22 +1,17 @@
 package router

 import (
-	"encoding/json"
 	"fmt"
 	"net/http"
-	"regexp"
 	"strconv"
 	"strings"
 	"time"

-	"gopkg.in/yaml.v2"
-
 	"github.com/ccfos/nightingale/v6/models"
 	"github.com/ccfos/nightingale/v6/pushgw/pconf"
 	"github.com/ccfos/nightingale/v6/pushgw/writer"

 	"github.com/gin-gonic/gin"
-	"github.com/jinzhu/copier"
 	"github.com/prometheus/prometheus/prompb"
 	"github.com/toolkits/pkg/ginx"
 	"github.com/toolkits/pkg/i18n"
@@ -37,18 +32,6 @@ func (rt *Router) alertRuleGets(c *gin.Context) {
 	ginx.NewRender(c).Data(ars, err)
 }

-func getAlertCueEventTimeRange(c *gin.Context) (stime, etime int64) {
-	stime = ginx.QueryInt64(c, "stime", 0)
-	etime = ginx.QueryInt64(c, "etime", 0)
-	if etime == 0 {
-		etime = time.Now().Unix()
-	}
-	if stime == 0 || stime >= etime {
-		stime = etime - 30*24*int64(time.Hour.Seconds())
-	}
-	return
-}
-
 func (rt *Router) alertRuleGetsByGids(c *gin.Context) {
 	gids := str.IdsInt64(ginx.QueryStr(c, "gids", ""), ",")
 	if len(gids) > 0 {
@@ -72,35 +55,9 @@ func (rt *Router) alertRuleGetsByGids(c *gin.Context) {
 	ars, err := models.AlertRuleGetsByBGIds(rt.Ctx, gids)
 	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)
-		cnt := models.AlertCurEventCountByRuleId(rt.Ctx, rids, stime, etime)
-		if cnt != nil {
-			for i := 0; i < len(ars); i++ {
-				ars[i].CurEventCount = cnt[ars[i].Id]
-			}
-		}
-
-		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)
@@ -128,10 +85,6 @@ func (rt *Router) alertRulesGetByService(c *gin.Context) {
 		cache := make(map[int64]*models.UserGroup)
 		for i := 0; i < len(ars); i++ {
 			ars[i].FillNotifyGroups(rt.Ctx, cache)
-
-			if len(ars[i].DatasourceQueries) != 0 {
-				ars[i].DatasourceIdsJson = rt.DatasourceCache.GetIDsByDsCateAndQueries(ars[i].Cate, ars[i].DatasourceQueries)
-			}
 		}
 	}
 	ginx.NewRender(c).Data(ars, err)
@@ -166,48 +119,12 @@ func (rt *Router) alertRuleAddByImport(c *gin.Context) {
 		ginx.Bomb(http.StatusBadRequest, "input json is empty")
 	}

-	for i := range lst {
-		if len(lst[i].DatasourceQueries) == 0 {
-			lst[i].DatasourceQueries = []models.DatasourceQuery{
-				models.DataSourceQueryAll,
-			}
-		}
-	}
-
 	bgid := ginx.UrlParamInt64(c, "id")
 	reterr := rt.alertRuleAdd(lst, username, bgid, c.GetHeader("X-Language"))

 	ginx.NewRender(c).Data(reterr, nil)
 }

-type promRuleForm struct {
-	Payload           string                   `json:"payload" binding:"required"`
-	DatasourceQueries []models.DatasourceQuery `json:"datasource_queries" binding:"required"`
-	Disabled          int                      `json:"disabled" binding:"gte=0,lte=1"`
-}
-
-func (rt *Router) alertRuleAddByImportPromRule(c *gin.Context) {
-	var f promRuleForm
-	ginx.Dangerous(c.BindJSON(&f))
-
-	var pr struct {
-		Groups []models.PromRuleGroup `yaml:"groups"`
-	}
-	err := yaml.Unmarshal([]byte(f.Payload), &pr)
-	if err != nil {
-		ginx.Bomb(http.StatusBadRequest, "invalid yaml format, please use the example format. err: %v", err)
-	}
-
-	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)
-}
-
 func (rt *Router) alertRuleAddByService(c *gin.Context) {
 	var lst []models.AlertRule
 	ginx.BindJSON(c, &lst)
@@ -358,43 +275,6 @@ func (rt *Router) alertRulePutFields(c *gin.Context) {
 			continue
 		}

-		if f.Action == "update_triggers" {
-			if triggers, has := f.Fields["triggers"]; has {
-				originRule := ar.RuleConfigJson.(map[string]interface{})
-				originRule["triggers"] = triggers
-				b, err := json.Marshal(originRule)
-				ginx.Dangerous(err)
-				ginx.Dangerous(ar.UpdateFieldsMap(rt.Ctx, map[string]interface{}{"rule_config": string(b)}))
-				continue
-			}
-		}
-
-		if f.Action == "annotations_add" {
-			if annotations, has := f.Fields["annotations"]; has {
-				annotationsMap := annotations.(map[string]interface{})
-				for k, v := range annotationsMap {
-					ar.AnnotationsJSON[k] = v.(string)
-				}
-				b, err := json.Marshal(ar.AnnotationsJSON)
-				ginx.Dangerous(err)
-				ginx.Dangerous(ar.UpdateFieldsMap(rt.Ctx, map[string]interface{}{"annotations": string(b)}))
-				continue
-			}
-		}
-
-		if f.Action == "annotations_del" {
-			if annotations, has := f.Fields["annotations"]; has {
-				annotationsKeys := annotations.(map[string]interface{})
-				for key := range annotationsKeys {
-					delete(ar.AnnotationsJSON, key)
-				}
-				b, err := json.Marshal(ar.AnnotationsJSON)
-				ginx.Dangerous(err)
-				ginx.Dangerous(ar.UpdateFieldsMap(rt.Ctx, map[string]interface{}{"annotations": string(b)}))
-				continue
-			}
-		}
-
 		if f.Action == "callback_add" {
 			// 增加一个 callback 地址
 			if callbacks, has := f.Fields["callbacks"]; has {
@@ -415,16 +295,6 @@ func (rt *Router) alertRulePutFields(c *gin.Context) {
 			}
 		}

-		if f.Action == "datasource_change" {
-			// 修改数据源
-			if datasourceQueries, has := f.Fields["datasource_queries"]; has {
-				bytes, err := json.Marshal(datasourceQueries)
-				ginx.Dangerous(err)
-				ginx.Dangerous(ar.UpdateFieldsMap(rt.Ctx, map[string]interface{}{"datasource_queries": bytes}))
-				continue
-			}
-		}
-
 		for k, v := range f.Fields {
 			ginx.Dangerous(ar.UpdateColumn(rt.Ctx, k, v))
 		}
@@ -444,10 +314,6 @@ func (rt *Router) alertRuleGet(c *gin.Context) {
 		return
 	}

-	if len(ar.DatasourceQueries) != 0 {
-		ar.DatasourceIdsJson = rt.DatasourceCache.GetIDsByDsCateAndQueries(ar.Cate, ar.DatasourceQueries)
-	}
-
 	err = ar.FillNotifyGroups(rt.Ctx, make(map[int64]*models.UserGroup))
 	ginx.Dangerous(err)

@@ -556,7 +422,7 @@ func (rt *Router) relabelTest(c *gin.Context) {

 	labels := make([]prompb.Label, len(f.Tags))
 	for i, tag := range f.Tags {
-		label := strings.SplitN(tag, "=", 2)
+		label := strings.Split(tag, "=")
 		if len(label) != 2 {
 			ginx.Bomb(http.StatusBadRequest, "tag:%s format error", tag)
 		}
@@ -587,91 +453,3 @@ func (rt *Router) relabelTest(c *gin.Context) {

 	ginx.NewRender(c).Data(tags, nil)
 }
-
-type identListForm struct {
-	Ids       []int64  `json:"ids"`
-	IdentList []string `json:"ident_list"`
-}
-
-func containsIdentOperator(s string) bool {
-	pattern := `ident\s*(!=|!~|=~)`
-	matched, err := regexp.MatchString(pattern, s)
-	if err != nil {
-		return false
-	}
-	return matched
-}
-
-func (rt *Router) cloneToMachine(c *gin.Context) {
-	var f identListForm
-	ginx.BindJSON(c, &f)
-
-	if len(f.IdentList) == 0 {
-		ginx.Bomb(http.StatusBadRequest, "ident_list is empty")
-	}
-
-	alertRules, err := models.AlertRuleGetsByIds(rt.Ctx, f.Ids)
-	ginx.Dangerous(err)
-
-	re := regexp.MustCompile(`ident\s*=\s*\\".*?\\"`)
-
-	user := c.MustGet("username").(string)
-	now := time.Now().Unix()
-
-	newRules := make([]*models.AlertRule, 0)
-
-	reterr := make(map[string]map[string]string)
-
-	for i := range alertRules {
-		errMsg := make(map[string]string)
-
-		if alertRules[i].Cate != "prometheus" {
-			errMsg["all"] = "Only Prometheus rule can be cloned to machines"
-			reterr[alertRules[i].Name] = errMsg
-			continue
-		}
-
-		if containsIdentOperator(alertRules[i].RuleConfig) {
-			errMsg["all"] = "promql is missing ident"
-			reterr[alertRules[i].Name] = errMsg
-			continue
-		}
-
-		for j := range f.IdentList {
-			alertRules[i].RuleConfig = re.ReplaceAllString(alertRules[i].RuleConfig, fmt.Sprintf(`ident=\"%s\"`, f.IdentList[j]))
-
-			newRule := &models.AlertRule{}
-			if err := copier.Copy(newRule, alertRules[i]); err != nil {
-				errMsg[f.IdentList[j]] = fmt.Sprintf("fail to clone rule, err: %s", err)
-				continue
-			}
-
-			newRule.Id = 0
-			newRule.Name = alertRules[i].Name + "_" + f.IdentList[j]
-			newRule.CreateBy = user
-			newRule.UpdateBy = user
-			newRule.UpdateAt = now
-			newRule.CreateAt = now
-			newRule.RuleConfig = alertRules[i].RuleConfig
-
-			exist, err := models.AlertRuleExists(rt.Ctx, 0, newRule.GroupId, newRule.Name)
-			if err != nil {
-				errMsg[f.IdentList[j]] = err.Error()
-				continue
-			}
-
-			if exist {
-				errMsg[f.IdentList[j]] = fmt.Sprintf("rule already exists, ruleName: %s", newRule.Name)
-				continue
-			}
-
-			newRules = append(newRules, newRule)
-		}
-
-		if len(errMsg) > 0 {
-			reterr[alertRules[i].Name] = errMsg
-		}
-	}
-
-	ginx.NewRender(c).Data(reterr, models.InsertAlertRule(rt.Ctx, newRules))
-}
--- a/center/router/router_board.go
+++ b/center/router/router_board.go
@@ -94,14 +94,6 @@ func (rt *Router) boardGet(c *gin.Context) {
 	ginx.NewRender(c).Data(board, nil)
 }

-// 根据 bids 参数，获取多个 board
-func (rt *Router) boardGetsByBids(c *gin.Context) {
-	bids := str.IdsInt64(ginx.QueryStr(c, "bids", ""), ",")
-	boards, err := models.BoardGetsByBids(rt.Ctx, bids)
-	ginx.Dangerous(err)
-	ginx.NewRender(c).Data(boards, err)
-}
-
 func (rt *Router) boardPureGet(c *gin.Context) {
 	board, err := models.BoardGetByID(rt.Ctx, ginx.UrlParamInt64(c, "bid"))
 	ginx.Dangerous(err)
--- a/center/router/router_builtin_componet.go
+++ b/center/router/router_builtin_componet.go
@@ -4,15 +4,10 @@ import (
 	"net/http"

 	"github.com/ccfos/nightingale/v6/models"
-	"github.com/ccfos/nightingale/v6/pkg/ctx"
-
 	"github.com/gin-gonic/gin"
 	"github.com/toolkits/pkg/ginx"
-	"gorm.io/gorm"
 )

-const SYSTEM = "system"
-
 func (rt *Router) builtinComponentsAdd(c *gin.Context) {
 	var lst []models.BuiltinComponent
 	ginx.BindJSON(c, &lst)
@@ -55,31 +50,10 @@ func (rt *Router) builtinComponentsPut(c *gin.Context) {
 		return
 	}

-	if bc.CreatedBy == SYSTEM {
-		req.Ident = bc.Ident
-	}
-
 	username := Username(c)
 	req.UpdatedBy = username

-	err = models.DB(rt.Ctx).Transaction(func(tx *gorm.DB) error {
-		tCtx := &ctx.Context{
-			DB: tx,
-		}
-
-		txErr := models.BuiltinMetricBatchUpdateColumn(tCtx, "typ", bc.Ident, req.Ident, req.UpdatedBy)
-		if txErr != nil {
-			return txErr
-		}
-
-		txErr = bc.Update(tCtx, req)
-		if txErr != nil {
-			return txErr
-		}
-		return nil
-	})
-
-	ginx.NewRender(c).Message(err)
+	ginx.NewRender(c).Message(bc.Update(rt.Ctx, req))
 }

 func (rt *Router) builtinComponentsDel(c *gin.Context) {
--- a/center/router/router_builtin_payload.go
+++ b/center/router/router_builtin_payload.go
@@ -6,7 +6,6 @@ import (
 	"strings"
 	"time"

-	"github.com/BurntSushi/toml"
 	"github.com/ccfos/nightingale/v6/models"
 	"github.com/gin-gonic/gin"
 	"github.com/toolkits/pkg/ginx"
@@ -53,15 +52,15 @@ func (rt *Router) builtinPayloadsAdd(c *gin.Context) {
 					}

 					bp := models.BuiltinPayload{
-						Type:        lst[i].Type,
-						ComponentID: lst[i].ComponentID,
-						Cate:        lst[i].Cate,
-						Name:        rule.Name,
-						Tags:        rule.AppendTags,
-						UUID:        rule.UUID,
-						Content:     string(contentBytes),
-						CreatedBy:   username,
-						UpdatedBy:   username,
+						Type:      lst[i].Type,
+						Component: lst[i].Component,
+						Cate:      lst[i].Cate,
+						Name:      rule.Name,
+						Tags:      rule.AppendTags,
+						UUID:      rule.UUID,
+						Content:   string(contentBytes),
+						CreatedBy: username,
+						UpdatedBy: username,
 					}

 					if err := bp.Add(rt.Ctx, username); err != nil {
@@ -82,15 +81,15 @@ func (rt *Router) builtinPayloadsAdd(c *gin.Context) {
 			}

 			bp := models.BuiltinPayload{
-				Type:        lst[i].Type,
-				ComponentID: lst[i].ComponentID,
-				Cate:        lst[i].Cate,
-				Name:        alertRule.Name,
-				Tags:        alertRule.AppendTags,
-				UUID:        alertRule.UUID,
-				Content:     lst[i].Content,
-				CreatedBy:   username,
-				UpdatedBy:   username,
+				Type:      lst[i].Type,
+				Component: lst[i].Component,
+				Cate:      lst[i].Cate,
+				Name:      alertRule.Name,
+				Tags:      alertRule.AppendTags,
+				UUID:      alertRule.UUID,
+				Content:   lst[i].Content,
+				CreatedBy: username,
+				UpdatedBy: username,
 			}

 			if err := bp.Add(rt.Ctx, username); err != nil {
@@ -116,15 +115,15 @@ func (rt *Router) builtinPayloadsAdd(c *gin.Context) {
 					}

 					bp := models.BuiltinPayload{
-						Type:        lst[i].Type,
-						ComponentID: lst[i].ComponentID,
-						Cate:        lst[i].Cate,
-						Name:        dashboard.Name,
-						Tags:        dashboard.Tags,
-						UUID:        dashboard.UUID,
-						Content:     string(contentBytes),
-						CreatedBy:   username,
-						UpdatedBy:   username,
+						Type:      lst[i].Type,
+						Component: lst[i].Component,
+						Cate:      lst[i].Cate,
+						Name:      dashboard.Name,
+						Tags:      dashboard.Tags,
+						UUID:      dashboard.UUID,
+						Content:   string(contentBytes),
+						CreatedBy: username,
+						UpdatedBy: username,
 					}

 					if err := bp.Add(rt.Ctx, username); err != nil {
@@ -145,29 +144,21 @@ func (rt *Router) builtinPayloadsAdd(c *gin.Context) {
 			}

 			bp := models.BuiltinPayload{
-				Type:        lst[i].Type,
-				ComponentID: lst[i].ComponentID,
-				Cate:        lst[i].Cate,
-				Name:        dashboard.Name,
-				Tags:        dashboard.Tags,
-				UUID:        dashboard.UUID,
-				Content:     lst[i].Content,
-				CreatedBy:   username,
-				UpdatedBy:   username,
+				Type:      lst[i].Type,
+				Component: lst[i].Component,
+				Cate:      lst[i].Cate,
+				Name:      dashboard.Name,
+				Tags:      dashboard.Tags,
+				UUID:      dashboard.UUID,
+				Content:   lst[i].Content,
+				CreatedBy: username,
+				UpdatedBy: username,
 			}

 			if err := bp.Add(rt.Ctx, username); err != nil {
 				reterr[bp.Name] = i18n.Sprintf(c.GetHeader("X-Language"), err.Error())
 			}
 		} else {
-			if lst[i].Type == "collect" {
-				c := make(map[string]interface{})
-				if _, err := toml.Decode(lst[i].Content, &c); err != nil {
-					reterr[lst[i].Name] = err.Error()
-					continue
-				}
-			}
-
 			if err := lst[i].Add(rt.Ctx, username); err != nil {
 				reterr[lst[i].Name] = i18n.Sprintf(c.GetHeader("X-Language"), err.Error())
 			}
@@ -180,20 +171,19 @@ func (rt *Router) builtinPayloadsAdd(c *gin.Context) {

 func (rt *Router) builtinPayloadsGets(c *gin.Context) {
 	typ := ginx.QueryStr(c, "type", "")
-	ComponentID := ginx.QueryInt64(c, "component_id", 0)
-
+	component := ginx.QueryStr(c, "component", "")
 	cate := ginx.QueryStr(c, "cate", "")
 	query := ginx.QueryStr(c, "query", "")

-	lst, err := models.BuiltinPayloadGets(rt.Ctx, uint64(ComponentID), typ, cate, query)
+	lst, err := models.BuiltinPayloadGets(rt.Ctx, typ, component, cate, query)
 	ginx.NewRender(c).Data(lst, err)
 }

 func (rt *Router) builtinPayloadcatesGet(c *gin.Context) {
 	typ := ginx.QueryStr(c, "type", "")
-	ComponentID := ginx.QueryInt64(c, "component_id", 0)
+	component := ginx.QueryStr(c, "component", "")

-	cates, err := models.BuiltinPayloadCates(rt.Ctx, typ, uint64(ComponentID))
+	cates, err := models.BuiltinPayloadCates(rt.Ctx, typ, component)
 	ginx.NewRender(c).Data(cates, err)
 }

@@ -239,11 +229,6 @@ func (rt *Router) builtinPayloadsPut(c *gin.Context) {

 		req.Name = dashboard.Name
 		req.Tags = dashboard.Tags
-	} else if req.Type == "collect" {
-		c := make(map[string]interface{})
-		if _, err := toml.Decode(req.Content, &c); err != nil {
-			ginx.Bomb(http.StatusBadRequest, err.Error())
-		}
 	}

 	username := Username(c)
@@ -260,15 +245,3 @@ func (rt *Router) builtinPayloadsDel(c *gin.Context) {

 	ginx.NewRender(c).Message(models.BuiltinPayloadDels(rt.Ctx, req.Ids))
 }
-
-func (rt *Router) builtinPayloadsGetByUUIDOrID(c *gin.Context) {
-	uuid := ginx.QueryInt64(c, "uuid", 0)
-	// 优先以 uuid 为准
-	if uuid != 0 {
-		ginx.NewRender(c).Data(models.BuiltinPayloadGet(rt.Ctx, "uuid = ?", uuid))
-		return
-	}
-
-	id := ginx.QueryInt64(c, "id", 0)
-	ginx.NewRender(c).Data(models.BuiltinPayloadGet(rt.Ctx, "id = ?", id))
-}
--- a/center/router/router_configs.go
+++ b/center/router/router_configs.go
@@ -24,11 +24,6 @@ func (rt *Router) configGet(c *gin.Context) {
 	ginx.NewRender(c).Data(configs, err)
 }

-func (rt *Router) configGetAll(c *gin.Context) {
-	config, err := models.ConfigsGetAll(rt.Ctx)
-	ginx.NewRender(c).Data(config, err)
-}
-
 func (rt *Router) configGetByKey(c *gin.Context) {
 	config, err := models.ConfigsGet(rt.Ctx, ginx.QueryStr(c, "key"))
 	ginx.NewRender(c).Data(config, err)
--- a/center/router/router_datasource.go
+++ b/center/router/router_datasource.go
@@ -92,12 +92,10 @@ func (rt *Router) datasourceUpsert(c *gin.Context) {
 	var err error
 	var count int64

-	if !req.ForceSave {
-		err = DatasourceCheck(req)
-		if err != nil {
-			Dangerous(c, err)
-			return
-		}
+	err = DatasourceCheck(req)
+	if err != nil {
+		Dangerous(c, err)
+		return
 	}

 	if req.Id == 0 {
@@ -122,14 +120,12 @@ func (rt *Router) datasourceUpsert(c *gin.Context) {
 }

 func DatasourceCheck(ds models.Datasource) error {
-	if ds.PluginType != models.ELASTICSEARCH {
-		if ds.HTTPJson.Url == "" {
-			return fmt.Errorf("url is empty")
-		}
+	if ds.HTTPJson.Url == "" {
+		return fmt.Errorf("url is empty")
+	}

-		if !strings.HasPrefix(ds.HTTPJson.Url, "http") {
-			return fmt.Errorf("url must start with http or https")
-		}
+	if !strings.HasPrefix(ds.HTTPJson.Url, "http") {
+		return fmt.Errorf("url must start with http or https")
 	}

 	client := &http.Client{
@@ -140,11 +136,11 @@ func DatasourceCheck(ds models.Datasource) error {
 		},
 	}

-	var fullURL string
-	req, err := ds.HTTPJson.NewReq(&fullURL)
+	fullURL := ds.HTTPJson.Url
+	req, err := http.NewRequest("GET", fullURL, nil)
 	if err != nil {
 		logger.Errorf("Error creating request: %v", err)
-		return fmt.Errorf("request urls:%v failed", ds.HTTPJson.GetUrls())
+		return fmt.Errorf("request url:%s failed", fullURL)
 	}

 	if ds.PluginType == models.PROMETHEUS {
@@ -251,37 +247,3 @@ func (rt *Router) getDatasourceIds(c *gin.Context) {

 	ginx.NewRender(c).Data(datasourceIds, err)
 }
-
-type datasourceQueryForm struct {
-	Cate              string                   `json:"datasource_cate"`
-	DatasourceQueries []models.DatasourceQuery `json:"datasource_queries"`
-}
-
-type datasourceQueryResp struct {
-	ID   int64  `json:"id"`
-	Name string `json:"name"`
-}
-
-func (rt *Router) datasourceQuery(c *gin.Context) {
-	var dsf datasourceQueryForm
-	ginx.BindJSON(c, &dsf)
-	datasources, err := models.GetDatasourcesGetsByTypes(rt.Ctx, []string{dsf.Cate})
-	ginx.Dangerous(err)
-
-	nameToID := make(map[string]int64)
-	IDToName := make(map[int64]string)
-	for _, ds := range datasources {
-		nameToID[ds.Name] = ds.Id
-		IDToName[ds.Id] = ds.Name
-	}
-
-	ids := models.GetDatasourceIDsByDatasourceQueries(dsf.DatasourceQueries, IDToName, nameToID)
-	var req []datasourceQueryResp
-	for _, id := range ids {
-		req = append(req, datasourceQueryResp{
-			ID:   id,
-			Name: IDToName[id],
-		})
-	}
-	ginx.NewRender(c).Data(req, err)
-}
--- a/center/router/router_funcs.go
+++ b/center/router/router_funcs.go
@@ -45,10 +45,6 @@ func (rt *Router) statistic(c *gin.Context) {
 		statistics, err = models.ConfigsUserVariableStatistics(rt.Ctx)
 		ginx.NewRender(c).Data(statistics, err)
 		return
-	case "cval":
-		statistics, err = models.ConfigCvalStatistics(rt.Ctx)
-		ginx.NewRender(c).Data(statistics, err)
-		return
 	default:
 		ginx.Bomb(http.StatusBadRequest, "invalid name")
 	}
@@ -69,23 +65,6 @@ func queryDatasourceIds(c *gin.Context) []int64 {
 	return ids
 }

-func queryStrListField(c *gin.Context, fieldName string, sep ...string) []string {
-	str := ginx.QueryStr(c, fieldName, "")
-	if str == "" {
-		return nil
-	}
-
-	lst := []string{str}
-	for _, s := range sep {
-		var newLst []string
-		for _, str := range lst {
-			newLst = append(newLst, strings.Split(str, s)...)
-		}
-		lst = newLst
-	}
-	return lst
-}
-
 type idsForm struct {
 	Ids               []int64 `json:"ids"`
 	IsSyncToFlashDuty bool    `json:"is_sync_to_flashduty"`
--- a/center/router/router_heartbeat.go
+++ b/center/router/router_heartbeat.go
@@ -3,10 +3,8 @@ package router
 import (
 	"compress/gzip"
 	"encoding/json"
-	"errors"
+	"fmt"
 	"io/ioutil"
-	"sort"
-	"strconv"
 	"strings"
 	"time"

@@ -59,7 +57,7 @@ func HandleHeartbeat(c *gin.Context, ctx *ctx.Context, engineName string, metaSe
 	}

 	if req.Hostname == "" {
-		return req, errors.New("hostname is required")
+		return req, fmt.Errorf("hostname is required", 400)
 	}

 	// maybe from pushgw
@@ -81,122 +79,55 @@ func HandleHeartbeat(c *gin.Context, ctx *ctx.Context, engineName string, metaSe
 	identSet.MSet(items)

 	if target, has := targetCache.Get(req.Hostname); has && target != nil {
-		gidsStr := ginx.QueryStr(c, "gid", "")
-		overwriteGids := ginx.QueryBool(c, "overwrite_gids", false)
+		gid := ginx.QueryInt64(c, "gid", 0)
 		hostIp := strings.TrimSpace(req.HostIp)
-		gids := strings.Split(gidsStr, ",")

-		if overwriteGids {
-			groupIds := make([]int64, 0)
-			for i := range gids {
-				if gids[i] == "" {
-					continue
-				}
-				groupId, err := strconv.ParseInt(gids[i], 10, 64)
-				if err != nil {
-					logger.Warningf("update target:%s group ids failed, err: %v", req.Hostname, err)
-					continue
-				}
-				groupIds = append(groupIds, groupId)
-			}
-
-			err := models.TargetOverrideBgids(ctx, []string{target.Ident}, groupIds)
-			if err != nil {
-				logger.Warningf("update target:%s group ids failed, err: %v", target.Ident, err)
-			}
-		} else if gidsStr != "" {
-			for i := range gids {
-				groupId, err := strconv.ParseInt(gids[i], 10, 64)
-				if err != nil {
-					logger.Warningf("update target:%s group ids failed, err: %v", req.Hostname, err)
-					continue
-				}
-
-				if !target.MatchGroupId(groupId) {
-					err := models.TargetBindBgids(ctx, []string{target.Ident}, []int64{groupId})
-					if err != nil {
-						logger.Warningf("update target:%s group ids failed, err: %v", target.Ident, err)
-					}
-				}
-			}
+		field := make(map[string]interface{})
+		if gid != 0 && gid != target.GroupId {
+			field["group_id"] = gid
 		}

-		newTarget := models.Target{}
-		targetNeedUpdate := false
 		if hostIp != "" && hostIp != target.HostIp {
-			newTarget.HostIp = hostIp
-			targetNeedUpdate = true
+			field["host_ip"] = hostIp
 		}

-		hostTagsMap := target.GetHostTagsMap()
-		hostTagNeedUpdate := false
-		if len(hostTagsMap) != len(req.GlobalLabels) {
-			hostTagNeedUpdate = true
-		} else {
-			for k, v := range req.GlobalLabels {
-				if v == "" {
-					continue
-				}
-
-				if tagv, ok := hostTagsMap[k]; !ok || tagv != v {
-					hostTagNeedUpdate = true
-					break
-				}
-			}
-		}
-
-		if hostTagNeedUpdate {
-			lst := []string{}
-			for k, v := range req.GlobalLabels {
-				lst = append(lst, k+"="+v)
-			}
-			sort.Strings(lst)
-			newTarget.HostTags = lst
-			targetNeedUpdate = true
-		}
-
-		userTagsMap := target.GetTagsMap()
-		userTagNeedUpdate := false
-		userTags := []string{}
-		for k, v := range userTagsMap {
+		tagsMap := target.GetTagsMap()
+		tagNeedUpdate := false
+		for k, v := range req.GlobalLabels {
 			if v == "" {
 				continue
 			}

-			if _, ok := req.GlobalLabels[k]; !ok {
-				userTags = append(userTags, k+"="+v)
-			} else { // 该key在hostTags中已经存在
-				userTagNeedUpdate = true
+			if tagv, ok := tagsMap[k]; !ok || tagv != v {
+				tagNeedUpdate = true
+				tagsMap[k] = v
 			}
 		}

-		if userTagNeedUpdate {
-			newTarget.Tags = strings.Join(userTags, " ") + " "
-			targetNeedUpdate = true
+		if tagNeedUpdate {
+			lst := []string{}
+			for k, v := range tagsMap {
+				lst = append(lst, k+"="+v)
+			}
+			labels := strings.Join(lst, " ") + " "
+			field["tags"] = labels
 		}

 		if req.EngineName != "" && req.EngineName != target.EngineName {
-			newTarget.EngineName = req.EngineName
-			targetNeedUpdate = true
+			field["engine_name"] = req.EngineName
 		}

 		if req.AgentVersion != "" && req.AgentVersion != target.AgentVersion {
-			newTarget.AgentVersion = req.AgentVersion
-			targetNeedUpdate = true
+			field["agent_version"] = req.AgentVersion
 		}

-		if req.OS != "" && req.OS != target.OS {
-			newTarget.OS = req.OS
-			targetNeedUpdate = true
-		}
-
-		if targetNeedUpdate {
-			err := models.DB(ctx).Model(&target).Updates(newTarget).Error
+		if len(field) > 0 {
+			err := target.UpdateFieldsMap(ctx, field)
 			if err != nil {
 				logger.Errorf("update target fields failed, err: %v", err)
 			}
 		}
-		logger.Debugf("heartbeat field:%+v target: %v", newTarget, *target)
+		logger.Debugf("heartbeat field:%+v target: %v", field, *target)
 	}

 	return req, nil
--- a/center/router/router_mute.go
+++ b/center/router/router_mute.go
@@ -50,8 +50,7 @@ func (rt *Router) alertMuteGets(c *gin.Context) {
 	prods := strings.Fields(ginx.QueryStr(c, "prods", ""))
 	bgid := ginx.QueryInt64(c, "bgid", -1)
 	query := ginx.QueryStr(c, "query", "")
-	disabled := ginx.QueryInt(c, "disabled", -1)
-	lst, err := models.AlertMuteGets(rt.Ctx, prods, bgid, disabled, query)
+	lst, err := models.AlertMuteGets(rt.Ctx, prods, bgid, query)

 	ginx.NewRender(c).Data(lst, err)
 }
--- a/center/router/router_notification_record.go
+++ b/center/router/router_notification_record.go
@@ -1,205 +0,0 @@
-package router
-
-import (
-	"strings"
-
-	"github.com/ccfos/nightingale/v6/models"
-	"github.com/ccfos/nightingale/v6/pkg/ctx"
-
-	"github.com/gin-gonic/gin"
-	"github.com/toolkits/pkg/ginx"
-	"github.com/toolkits/pkg/logger"
-)
-
-type NotificationResponse struct {
-	SubRules []SubRule           `json:"sub_rules"`
-	Notifies map[string][]Record `json:"notifies"`
-}
-
-type SubRule struct {
-	SubID    int64               `json:"sub_id"`
-	Notifies map[string][]Record `json:"notifies"`
-}
-
-type Notify struct {
-	Channel string   `json:"channel"`
-	Records []Record `json:"records"`
-}
-
-type Record struct {
-	Target   string `json:"target"`
-	Username string `json:"username"`
-	Status   int    `json:"status"`
-	Detail   string `json:"detail"`
-}
-
-// notificationRecordAdd
-func (rt *Router) notificationRecordAdd(c *gin.Context) {
-	var req models.NotificaitonRecord
-	ginx.BindJSON(c, &req)
-	err := req.Add(rt.Ctx)
-
-	ginx.NewRender(c).Data(req.Id, err)
-}
-
-func (rt *Router) notificationRecordList(c *gin.Context) {
-	eid := ginx.UrlParamInt64(c, "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.NotificaitonRecord) NotificationResponse {
-	response := NotificationResponse{
-		SubRules: []SubRule{},
-		Notifies: make(map[string][]Record),
-	}
-
-	subRuleMap := make(map[int64]*SubRule)
-
-	// Collect all group IDs
-	groupIdSet := make(map[int64]struct{})
-
-	// map[SubId]map[Channel]map[Target]index
-	filter := make(map[int64]map[string]map[string]int)
-
-	for i, n := range nl {
-		// 对相同的 channel-target 进行合并
-		for _, gid := range n.GetGroupIds(ctx) {
-			groupIdSet[gid] = struct{}{}
-		}
-
-		if _, exists := filter[n.SubId]; !exists {
-			filter[n.SubId] = make(map[string]map[string]int)
-		}
-
-		if _, exists := filter[n.SubId][n.Channel]; !exists {
-			filter[n.SubId][n.Channel] = make(map[string]int)
-		}
-
-		idx, exists := filter[n.SubId][n.Channel][n.Target]
-		if !exists {
-			filter[n.SubId][n.Channel][n.Target] = i
-		} else {
-			if nl[idx].Status < n.Status {
-				nl[idx].Status = n.Status
-			}
-			nl[idx].Details = nl[idx].Details + ", " + n.Details
-			nl[i] = nil
-		}
-
-	}
-
-	// Fill usernames only once
-	usernameByTarget := fillUserNames(ctx, groupIdSet)
-
-	for _, n := range nl {
-		if n == nil {
-			continue
-		}
-
-		m := usernameByTarget[n.Target]
-		usernames := make([]string, 0, len(m))
-		for k := range m {
-			usernames = append(usernames, k)
-		}
-
-		if !checkChannel(n.Channel) {
-			// Hide sensitive information
-			n.Target = replaceLastEightChars(n.Target)
-		}
-		record := Record{
-			Target: n.Target,
-			Status: n.Status,
-			Detail: n.Details,
-		}
-
-		record.Username = strings.Join(usernames, ",")
-
-		if n.SubId > 0 {
-			// Handle SubRules
-			subRule, ok := subRuleMap[n.SubId]
-			if !ok {
-				newSubRule := &SubRule{
-					SubID: n.SubId,
-				}
-				newSubRule.Notifies = make(map[string][]Record)
-				newSubRule.Notifies[n.Channel] = []Record{record}
-
-				subRuleMap[n.SubId] = newSubRule
-			} else {
-				if _, exists := subRule.Notifies[n.Channel]; !exists {
-
-					subRule.Notifies[n.Channel] = []Record{record}
-				} else {
-					subRule.Notifies[n.Channel] = append(subRule.Notifies[n.Channel], record)
-				}
-			}
-			continue
-		}
-
-		if response.Notifies == nil {
-			response.Notifies = make(map[string][]Record)
-		}
-
-		if _, exists := response.Notifies[n.Channel]; !exists {
-			response.Notifies[n.Channel] = []Record{record}
-		} else {
-			response.Notifies[n.Channel] = append(response.Notifies[n.Channel], record)
-		}
-	}
-
-	for _, subRule := range subRuleMap {
-		response.SubRules = append(response.SubRules, *subRule)
-	}
-
-	return response
-}
-
-// check channel is one of the following:  tx-sms, tx-voice, ali-sms, ali-voice, email, script
-func checkChannel(channel string) bool {
-	switch channel {
-	case "tx-sms", "tx-voice", "ali-sms", "ali-voice", "email", "script":
-		return true
-	}
-	return false
-}
-
-func replaceLastEightChars(s string) string {
-	if len(s) <= 8 {
-		return strings.Repeat("*", len(s))
-	}
-	return s[:len(s)-8] + strings.Repeat("*", 8)
-}
-
-func fillUserNames(ctx *ctx.Context, groupIdSet map[int64]struct{}) map[string]map[string]struct{} {
-	userNameByTarget := make(map[string]map[string]struct{})
-
-	gids := make([]int64, 0, len(groupIdSet))
-	for gid := range groupIdSet {
-		gids = append(gids, gid)
-	}
-
-	users, err := models.UsersGetByGroupIds(ctx, gids)
-	if err != nil {
-		logger.Errorf("UsersGetByGroupIds failed, err: %v", err)
-		return userNameByTarget
-	}
-
-	for _, user := range users {
-		logger.Warningf("user: %s", user.Username)
-		for _, ch := range models.DefaultChannels {
-			target, exist := user.ExtractToken(ch)
-			if exist {
-				if _, ok := userNameByTarget[target]; !ok {
-					userNameByTarget[target] = make(map[string]struct{})
-				}
-				userNameByTarget[target][user.Username] = struct{}{}
-			}
-		}
-	}
-
-	return userNameByTarget
-}
--- a/center/router/router_notify_config.go
+++ b/center/router/router_notify_config.go
@@ -182,7 +182,7 @@ func (rt *Router) notifyConfigPut(c *gin.Context) {

 		smtp, errSmtp := SmtpValidate(text)
 		ginx.Dangerous(errSmtp)
-		go sender.RestartEmailSender(rt.Ctx, smtp)
+		go sender.RestartEmailSender(smtp)
 	}

 	ginx.NewRender(c).Message(nil)
--- a/center/router/router_notify_tpl.go
+++ b/center/router/router_notify_tpl.go
@@ -68,7 +68,7 @@ func (rt *Router) notifyTplUpdate(c *gin.Context) {
 	}

 	// get the count of the same channel and name but different id
-	count, err := models.Count(models.DB(rt.Ctx).Model(&models.NotifyTpl{}).Where("(channel = ? or name = ?) and id <> ?", f.Channel, f.Name, f.Id))
+	count, err := models.Count(models.DB(rt.Ctx).Model(&models.NotifyTpl{}).Where("channel = ? or name = ? and id <> ?", f.Channel, f.Name, f.Id))
 	ginx.Dangerous(err)
 	if count != 0 {
 		ginx.Bomb(200, "Refuse to create duplicate channel or name")
@@ -138,7 +138,7 @@ func (rt *Router) notifyTplPreview(c *gin.Context) {
 			continue
 		}

-		arr := strings.SplitN(pair, "=", 2)
+		arr := strings.Split(pair, "=")
 		if len(arr) != 2 {
 			continue
 		}
--- a/center/router/router_proxy.go
+++ b/center/router/router_proxy.go
@@ -7,6 +7,7 @@ import (
 	"net"
 	"net/http"
 	"net/http/httputil"
+	"net/url"
 	"strings"
 	"sync"
 	"time"
@@ -111,9 +112,9 @@ func (rt *Router) dsProxy(c *gin.Context) {
 		return
 	}

-	target, err := ds.HTTPJson.ParseUrl()
+	target, err := url.Parse(ds.HTTPJson.Url)
 	if err != nil {
-		c.String(http.StatusInternalServerError, "invalid urls: %s", ds.HTTPJson.GetUrls())
+		c.String(http.StatusInternalServerError, "invalid  url: %s", ds.HTTPJson.Url)
 		return
 	}

--- a/center/router/router_recording_rule.go
+++ b/center/router/router_recording_rule.go
@@ -3,6 +3,8 @@ package router
 import (
 	"encoding/json"
 	"net/http"
+	"strconv"
+	"strings"
 	"time"

 	"github.com/ccfos/nightingale/v6/models"
@@ -72,14 +74,6 @@ func (rt *Router) recordingRuleAddByFE(c *gin.Context) {
 		ginx.Bomb(http.StatusBadRequest, "input json is empty")
 	}

-	for i := range lst {
-		if len(lst[i].DatasourceQueries) == 0 {
-			lst[i].DatasourceQueries = []models.DatasourceQuery{
-				models.DataSourceQueryAll,
-			}
-		}
-	}
-
 	bgid := ginx.UrlParamInt64(c, "id")
 	reterr := make(map[string]string)
 	for i := 0; i < count; i++ {
@@ -143,10 +137,23 @@ func (rt *Router) recordingRulePutFields(c *gin.Context) {
 	f.Fields["update_by"] = c.MustGet("username").(string)
 	f.Fields["update_at"] = time.Now().Unix()

-	if datasourceQueries, ok := f.Fields["datasource_queries"]; ok {
-		bytes, err := json.Marshal(datasourceQueries)
-		ginx.Dangerous(err)
-		f.Fields["datasource_queries"] = string(bytes)
+	if _, ok := f.Fields["datasource_ids"]; ok {
+		// datasource_ids = "1 2 3"
+		idsStr := strings.Fields(f.Fields["datasource_ids"].(string))
+		ids := make([]int64, 0)
+		for _, idStr := range idsStr {
+			id, err := strconv.ParseInt(idStr, 10, 64)
+			if err != nil {
+				ginx.Bomb(http.StatusBadRequest, "datasource_ids error")
+			}
+			ids = append(ids, id)
+		}
+
+		bs, err := json.Marshal(ids)
+		if err != nil {
+			ginx.Bomb(http.StatusBadRequest, "datasource_ids error")
+		}
+		f.Fields["datasource_ids"] = string(bs)
 	}

 	for i := 0; i < len(f.Ids); i++ {
--- a/center/router/router_target.go
+++ b/center/router/router_target.go
@@ -52,8 +52,6 @@ func (rt *Router) targetGets(c *gin.Context) {
 	order := ginx.QueryStr(c, "order", "ident")
 	desc := ginx.QueryBool(c, "desc", false)

-	hosts := queryStrListField(c, "hosts", ",", " ", "\n")
-
 	var err error
 	if len(bgids) == 0 {
 		user := c.MustGet("user").(*models.User)
@@ -67,13 +65,11 @@ func (rt *Router) targetGets(c *gin.Context) {
 			bgids = append(bgids, 0)
 		}
 	}
-
 	options := []models.BuildTargetWhereOption{
 		models.BuildTargetWhereWithBgids(bgids),
 		models.BuildTargetWhereWithDsIds(dsIds),
 		models.BuildTargetWhereWithQuery(query),
 		models.BuildTargetWhereWithDowntime(downtime),
-		models.BuildTargetWhereWithHosts(hosts),
 	}
 	total, err := models.TargetTotal(rt.Ctx, options...)
 	ginx.Dangerous(err)
@@ -82,13 +78,6 @@ func (rt *Router) targetGets(c *gin.Context) {
 		ginx.Offset(c, limit), order, desc, options...)
 	ginx.Dangerous(err)

-	tgs, err := models.TargetBusiGroupsGetAll(rt.Ctx)
-	ginx.Dangerous(err)
-
-	for _, t := range list {
-		t.GroupIds = tgs[t.Ident]
-	}
-
 	if err == nil {
 		now := time.Now()
 		cache := make(map[int64]*models.BusiGroup)
@@ -168,8 +157,7 @@ func (rt *Router) targetGetsByService(c *gin.Context) {
 func (rt *Router) targetGetTags(c *gin.Context) {
 	idents := ginx.QueryStr(c, "idents", "")
 	idents = strings.ReplaceAll(idents, ",", " ")
-	ignoreHostTag := ginx.QueryBool(c, "ignore_host_tag", false)
-	lst, err := models.TargetGetTags(rt.Ctx, strings.Fields(idents), ignoreHostTag)
+	lst, err := models.TargetGetTags(rt.Ctx, strings.Fields(idents))
 	ginx.NewRender(c).Data(lst, err)
 }

@@ -272,11 +260,9 @@ func (rt *Router) validateTags(tags []string) error {
 }

 func (rt *Router) addTagsToTarget(target *models.Target, tags []string) error {
-	hostTagsMap := target.GetHostTagsMap()
 	for _, tag := range tags {
 		tagKey := strings.Split(tag, "=")[0]
-		if _, ok := hostTagsMap[tagKey]; ok ||
-			strings.Contains(target.Tags, tagKey+"=") {
+		if strings.Contains(target.Tags, tagKey+"=") {
 			return fmt.Errorf("duplicate tagkey(%s)", tagKey)
 		}
 	}
@@ -393,15 +379,8 @@ type targetBgidForm struct {
 	Bgid    int64    `json:"bgid"`
 }

-type targetBgidsForm struct {
-	Idents  []string `json:"idents" binding:"required_without=HostIps"`
-	HostIps []string `json:"host_ips" binding:"required_without=Idents"`
-	Bgids   []int64  `json:"bgids"`
-	Action  string   `json:"action"` // add del reset
-}
-
-func (rt *Router) targetBindBgids(c *gin.Context) {
-	var f targetBgidsForm
+func (rt *Router) targetUpdateBgid(c *gin.Context) {
+	var f targetBgidForm
 	var err error
 	var failedResults = make(map[string]string)
 	ginx.BindJSON(c, &f)
@@ -417,24 +396,35 @@ func (rt *Router) targetBindBgids(c *gin.Context) {
 	}

 	user := c.MustGet("user").(*models.User)
-	if !user.IsAdmin() {
-		// 普通用户，检查用户是否有权限操作所有请求的业务组
-		existing, _, err := models.SeparateTargetIdents(rt.Ctx, f.Idents)
+	if user.IsAdmin() {
+		ginx.NewRender(c).Data(failedResults, models.TargetUpdateBgid(rt.Ctx, f.Idents, f.Bgid, false))
+		return
+	}
+
+	if f.Bgid > 0 {
+		// 把要操作的机器分成两部分，一部分是bgid为0，需要管理员分配，另一部分bgid>0，说明是业务组内部想调整
+		// 比如原来分配给didiyun的机器，didiyun的管理员想把部分机器调整到didiyun-ceph下
+		// 对于调整的这种情况，当前登录用户要对这批机器有操作权限，同时还要对目标BG有操作权限
+		orphans, err := models.IdentsFilter(rt.Ctx, f.Idents, "group_id = ?", 0)
 		ginx.Dangerous(err)
-		rt.checkTargetPerm(c, existing)

-		var groupIds []int64
-		if f.Action == "reset" {
-			// 如果是复写，则需要检查用户是否有权限操作机器之前的业务组
-			bgids, err := models.TargetGroupIdsGetByIdents(rt.Ctx, f.Idents)
+		// 机器里边存在未归组的，登录用户就需要是admin
+		if len(orphans) > 0 && !user.IsAdmin() {
+			can, err := user.CheckPerm(rt.Ctx, "/targets/bind")
 			ginx.Dangerous(err)
-
-			groupIds = append(groupIds, bgids...)
+			if !can {
+				ginx.Bomb(http.StatusForbidden, "No permission. Only admin can assign BG")
+			}
 		}
-		groupIds = append(groupIds, f.Bgids...)

-		for _, bgid := range groupIds {
-			bg := BusiGroup(rt.Ctx, bgid)
+		reBelongs, err := models.IdentsFilter(rt.Ctx, f.Idents, "group_id > ?", 0)
+		ginx.Dangerous(err)
+
+		if len(reBelongs) > 0 {
+			// 对于这些要重新分配的机器，操作者要对这些机器本身有权限，同时要对目标bgid有权限
+			rt.checkTargetPerm(c, f.Idents)
+
+			bg := BusiGroup(rt.Ctx, f.Bgid)
 			can, err := user.CanDoBusiGroup(rt.Ctx, bg, "rw")
 			ginx.Dangerous(err)

@@ -442,24 +432,14 @@ func (rt *Router) targetBindBgids(c *gin.Context) {
 				ginx.Bomb(http.StatusForbidden, "No permission. You are not admin of BG(%s)", bg.Name)
 			}
 		}
-
-		can, err := user.CheckPerm(rt.Ctx, "/targets/bind")
-		ginx.Dangerous(err)
-		if !can {
-			ginx.Bomb(http.StatusForbidden, "No permission. Only admin can assign BG")
-		}
+	} else if f.Bgid == 0 {
+		// 退还机器
+		rt.checkTargetPerm(c, f.Idents)
+	} else {
+		ginx.Bomb(http.StatusBadRequest, "invalid bgid")
 	}

-	switch f.Action {
-	case "add":
-		ginx.NewRender(c).Data(failedResults, models.TargetBindBgids(rt.Ctx, f.Idents, f.Bgids))
-	case "del":
-		ginx.NewRender(c).Data(failedResults, models.TargetUnbindBgids(rt.Ctx, f.Idents, f.Bgids))
-	case "reset":
-		ginx.NewRender(c).Data(failedResults, models.TargetOverrideBgids(rt.Ctx, f.Idents, f.Bgids))
-	default:
-		ginx.Bomb(http.StatusBadRequest, "invalid action")
-	}
+	ginx.NewRender(c).Data(failedResults, models.TargetUpdateBgid(rt.Ctx, f.Idents, f.Bgid, false))
 }

 func (rt *Router) targetUpdateBgidByService(c *gin.Context) {
@@ -478,7 +458,7 @@ func (rt *Router) targetUpdateBgidByService(c *gin.Context) {
 		ginx.Bomb(http.StatusBadRequest, err.Error())
 	}

-	ginx.NewRender(c).Data(failedResults, models.TargetOverrideBgids(rt.Ctx, f.Idents, []int64{f.Bgid}))
+	ginx.NewRender(c).Data(failedResults, models.TargetUpdateBgid(rt.Ctx, f.Idents, f.Bgid, false))
 }

 type identsForm struct {
@@ -502,7 +482,7 @@ func (rt *Router) targetDel(c *gin.Context) {
 		ginx.Bomb(http.StatusBadRequest, err.Error())
 	}

-	ginx.NewRender(c).Data(failedResults, models.TargetDel(rt.Ctx, f.Idents, rt.TargetDeleteHook))
+	ginx.NewRender(c).Data(failedResults, models.TargetDel(rt.Ctx, f.Idents))
 }

 func (rt *Router) targetDelByService(c *gin.Context) {
@@ -521,7 +501,7 @@ func (rt *Router) targetDelByService(c *gin.Context) {
 		ginx.Bomb(http.StatusBadRequest, err.Error())
 	}

-	ginx.NewRender(c).Data(failedResults, models.TargetDel(rt.Ctx, f.Idents, rt.TargetDeleteHook))
+	ginx.NewRender(c).Data(failedResults, models.TargetDel(rt.Ctx, f.Idents))
 }

 func (rt *Router) checkTargetPerm(c *gin.Context, idents []string) {
--- a/center/router/router_task_tpl.go
+++ b/center/router/router_task_tpl.go
@@ -196,13 +196,6 @@ func (rt *Router) taskTplDel(c *gin.Context) {
 		return
 	}

-	ids, err := models.GetAlertRuleIdsByTaskId(rt.Ctx, tid)
-	ginx.Dangerous(err)
-	if len(ids) > 0 {
-		ginx.NewRender(c).Message("can't del this task tpl, used by alert rule ids(%v) ", ids)
-		return
-	}
-
 	ginx.NewRender(c).Message(tpl.Del(rt.Ctx))
 }

--- a/center/router/router_user.go
+++ b/center/router/router_user.go
@@ -48,7 +48,7 @@ func (rt *Router) userGets(c *gin.Context) {
 	order := ginx.QueryStr(c, "order", "username")
 	desc := ginx.QueryBool(c, "desc", false)

-	go rt.UserCache.UpdateUsersLastActiveTime()
+	rt.UserCache.UpdateUsersLastActiveTime()
 	total, err := models.UserTotal(rt.Ctx, query, stime, etime)
 	ginx.Dangerous(err)

--- a/center/sso/init.go
+++ b/center/sso/init.go
@@ -1,7 +1,6 @@
 package sso

 import (
-	"fmt"
 	"log"
 	"time"

@@ -146,7 +145,7 @@ func Init(center cconf.Center, ctx *ctx.Context, configCache *memsto.ConfigCache
 		}
 	}
 	if configCache == nil {
-		log.Fatalln(fmt.Errorf("configCache is nil, sso initialization failed"))
+		logger.Error("configCache is nil, sso initialization failed")
 	}
 	ssoClient.configCache = configCache
 	userVariableMap := configCache.Get()
--- a/cmd/edge/edge.go
+++ b/cmd/edge/edge.go
@@ -52,13 +52,11 @@ func Initialize(configDir string, cryptoKey string) (func(), error) {

 	targetCache := memsto.NewTargetCache(ctx, syncStats, redis)
 	busiGroupCache := memsto.NewBusiGroupCache(ctx, syncStats)
-	configCvalCache := memsto.NewCvalCache(ctx, syncStats)
 	idents := idents.New(ctx, redis)
 	metas := metas.New(redis)
 	writers := writer.NewWriters(config.Pushgw)
 	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)
-
+	r := httpx.GinEngine(config.Global.RunMode, config.HTTP)
 	pushgwRouter.Config(r)

 	if !config.Alert.Disable {
--- a/cron/clean_notify_record.go
+++ b/cron/clean_notify_record.go
@@ -1,41 +0,0 @@
-package cron
-
-import (
-	"time"
-
-	"github.com/ccfos/nightingale/v6/models"
-	"github.com/ccfos/nightingale/v6/pkg/ctx"
-
-	"github.com/robfig/cron/v3"
-	"github.com/toolkits/pkg/logger"
-)
-
-func cleanNotifyRecord(ctx *ctx.Context, day int) {
-	lastWeek := time.Now().Unix() - 86400*int64(day)
-	err := models.DB(ctx).Model(&models.NotificaitonRecord{}).Where("created_at < ?", lastWeek).Delete(&models.NotificaitonRecord{}).Error
-	if err != nil {
-		logger.Errorf("Failed to clean notify record: %v", err)
-	}
-
-}
-
-// 每天凌晨1点执行清理任务
-func CleanNotifyRecord(ctx *ctx.Context, day int) {
-	c := cron.New()
-	if day < 1 {
-		day = 7
-	}
-
-	// 使用cron表达式设置每天凌晨1点执行
-	_, err := c.AddFunc("0 1 * * *", func() {
-		cleanNotifyRecord(ctx, day)
-	})
-
-	if err != nil {
-		logger.Errorf("Failed to add clean notify record cron job: %v", err)
-		return
-	}
-
-	// 启动cron任务
-	c.Start()
-}
--- a/docker/compose-bridge/docker-compose.yaml
+++ b/docker/compose-bridge/docker-compose.yaml
@@ -1,3 +1,5 @@
+version: "3.7"
+
 networks:
  nightingale:
    driver: bridge
--- a/docker/compose-postgres/initsql_for_postgres/a-n9e-for-Postgres.sql
+++ b/docker/compose-postgres/initsql_for_postgres/a-n9e-for-Postgres.sql
@@ -561,7 +561,7 @@ CREATE TABLE alert_cur_event (
    target_note varchar(191) not null default '' ,
    first_trigger_time bigint,
    trigger_time bigint not null,
-    trigger_value varchar(2048) not null,
+    trigger_value varchar(255) not null,
    annotations text not null ,
    rule_config text not null ,
    tags varchar(1024) not null default '' ,
@@ -621,7 +621,7 @@ CREATE TABLE alert_his_event (
    target_note varchar(191) not null default '' ,
    first_trigger_time bigint,
    trigger_time bigint not null,
-    trigger_value varchar(2048) not null,
+    trigger_value varchar(255) not null,
    recover_time bigint not null default 0,
    last_eval_time bigint not null default 0 ,
    tags varchar(1024) not null default '' ,
--- a/docker/initsql/a-n9e.sql
+++ b/docker/initsql/a-n9e.sql
@@ -1,6 +1,6 @@
 set names utf8mb4;

-- drop database if exists n9e_v6;
+drop database if exists n9e_v6;
 create database n9e_v6;
 use n9e_v6;

@@ -363,11 +363,9 @@ CREATE TABLE `target` (
    `ident` varchar(191) not null comment 'target id',
    `note` varchar(255) not null default '' comment 'append to alert event as field',
    `tags` varchar(512) not null default '' comment 'append to series data as tags, split by space, append external space at suffix',
-    `host_tags` varchar(512) not null default '' comment 'append to series data as tags, split by space, append external space at suffix',
    `host_ip` varchar(15) default '' COMMENT 'IPv4 string',
    `agent_version` varchar(255) default '' COMMENT 'agent version',
    `engine_name` varchar(255) default '' COMMENT 'engine_name',
-    `os` VARCHAR(31) DEFAULT '' COMMENT 'os type',
    `update_at` bigint not null default 0,
    PRIMARY KEY (`id`),
    UNIQUE KEY (`ident`),
@@ -454,7 +452,7 @@ CREATE TABLE `alert_cur_event` (
    `target_note` varchar(191) not null default '' comment 'target note',
    `first_trigger_time` bigint,
    `trigger_time` bigint not null,
-    `trigger_value` text not null,
+    `trigger_value` varchar(255) not null,
    `annotations` text not null comment 'annotations',
    `rule_config` text not null comment 'annotations',
    `tags` varchar(1024) not null default '' comment 'merge data_tags rule_tags, split by ,,',
@@ -494,7 +492,7 @@ CREATE TABLE `alert_his_event` (
    `target_note` varchar(191) not null default '' comment 'target note',
    `first_trigger_time` bigint,
    `trigger_time` bigint not null,
-    `trigger_value` text not null,
+    `trigger_value` varchar(255) not null,
    `recover_time` bigint not null default 0,
    `last_eval_time` bigint not null default 0 comment 'for time filter',
    `tags` varchar(1024) not null default '' comment 'merge data_tags rule_tags, split by ,,',
@@ -529,7 +527,6 @@ CREATE TABLE `builtin_components` (

 CREATE TABLE `builtin_payloads` (
  `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '''unique identifier''',
-  `component_id` bigint(20) NOT NULL DEFAULT 0 COMMENT 'component_id',
  `uuid` bigint(20) NOT NULL COMMENT '''uuid of payload''',
  `type` varchar(191) NOT NULL COMMENT '''type of payload''',
  `component` varchar(191) NOT NULL COMMENT '''component of payload''',
@@ -549,18 +546,6 @@ CREATE TABLE `builtin_payloads` (
  KEY `idx_type` (`type`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;

-CREATE TABLE notification_record (
-    `id` BIGINT PRIMARY KEY AUTO_INCREMENT,
-    `event_id` BIGINT NOT NULL,
-    `sub_id` BIGINT NOT NULL,
-    `channel` VARCHAR(255) NOT NULL,
-    `status` TINYINT NOT NULL DEFAULT 0,
-    `target` VARCHAR(1024) NOT NULL,
-    `details` VARCHAR(2048),
-    `created_at` BIGINT NOT NULL,
-    INDEX idx_evt (event_id)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
-
 CREATE TABLE `task_tpl`
 (
    `id`        int unsigned NOT NULL AUTO_INCREMENT,
@@ -726,15 +711,6 @@ CREATE TABLE `metric_filter` (
  KEY `idx_name` (`name`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;

-CREATE TABLE `target_busi_group` (
-  `id` bigint NOT NULL AUTO_INCREMENT,
-  `target_ident` varchar(191) NOT NULL,
-  `group_id` bigint NOT NULL,
-  `update_at` bigint NOT NULL,
-  PRIMARY KEY (`id`),
-  UNIQUE KEY `idx_target_group` (`target_ident`,`group_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
-
 CREATE TABLE `task_meta`
 (
    `id`          bigint unsigned NOT NULL AUTO_INCREMENT,
--- a/docker/initsql/sqlite.sql
+++ b/docker/initsql/sqlite.sql
@@ -389,7 +389,7 @@ CREATE TABLE `alert_cur_event` (
    `target_note` varchar(191) not null default '',
    `first_trigger_time` bigint,
    `trigger_time` bigint not null,
-    `trigger_value` varchar(2048) not null,
+    `trigger_value` varchar(255) not null,
    `annotations` text not null,
    `rule_config` text not null,
    `tags` varchar(1024) not null default ''
@@ -427,7 +427,7 @@ CREATE TABLE `alert_his_event` (
    `target_note` varchar(191) not null default '',
    `first_trigger_time` bigint,
    `trigger_time` bigint not null,
-    `trigger_value` varchar(2048) not null,
+    `trigger_value` varchar(255) not null,
    `recover_time` bigint not null default 0,
    `last_eval_time` bigint not null default 0,
    `tags` varchar(1024) not null default '',
--- a/docker/migratesql/migrate.sql
+++ b/docker/migratesql/migrate.sql
@@ -83,37 +83,4 @@ ALTER TABLE recording_rule ADD COLUMN cron_pattern VARCHAR(255) DEFAULT '' COMME

 /* v7.0.0-beta.14 */
 ALTER TABLE alert_cur_event ADD COLUMN original_tags TEXT COMMENT 'labels key=val,,k2=v2';
-ALTER TABLE alert_his_event ADD COLUMN original_tags TEXT COMMENT 'labels key=val,,k2=v2';
-
-/* v7.1.0 */
-ALTER TABLE target ADD COLUMN os VARCHAR(31) DEFAULT '' COMMENT 'os type';
-
-/* v7.2.0 */
-CREATE TABLE notification_record (
-    `id` BIGINT PRIMARY KEY AUTO_INCREMENT,
-    `event_id` BIGINT NOT NULL,
-    `sub_id` BIGINT NOT NULL,
-    `channel` VARCHAR(255) NOT NULL,
-    `status` TINYINT NOT NULL DEFAULT 0,
-    `target` VARCHAR(1024) NOT NULL,
-    `details` VARCHAR(2048),
-    `created_at` BIGINT NOT NULL,
-    INDEX idx_evt (event_id)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
-
-
-/* v7.3.0 2024-08-26 */
-ALTER TABLE `target` ADD COLUMN `host_tags` TEXT COMMENT 'global labels set in conf file';
-
-/* v7.3.4 2024-08-28 */
-ALTER TABLE `builtin_payloads` ADD COLUMN `component_id` bigint(20) NOT NULL DEFAULT 0 COMMENT 'component_id';
-
-/* v7.4.0 2024-09-20 */
-CREATE TABLE `target_busi_group` (
-  `id` bigint NOT NULL AUTO_INCREMENT,
-  `target_ident` varchar(191) NOT NULL,
-  `group_id` bigint NOT NULL,
-  `update_at` bigint NOT NULL,
-  PRIMARY KEY (`id`),
-  UNIQUE KEY `idx_target_group` (`target_ident`,`group_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+ALTER TABLE alert_his_event ADD COLUMN original_tags TEXT COMMENT 'labels key=val,,k2=v2';
--- a/front/statik/statik.go
+++ b/front/statik/statik.go
--- a/go.mod
+++ b/go.mod
@@ -18,7 +18,6 @@ require (
 	github.com/golang/snappy v0.0.4
 	github.com/google/uuid v1.3.0
 	github.com/hashicorp/go-version v1.6.0
-	github.com/jinzhu/copier v0.4.0
 	github.com/json-iterator/go v1.1.12
 	github.com/koding/multiconfig v0.0.0-20171124222453-69c27309b2d7
 	github.com/mailru/easyjson v0.7.7
@@ -32,9 +31,8 @@ require (
 	github.com/rakyll/statik v0.1.7
 	github.com/redis/go-redis/v9 v9.0.2
 	github.com/spaolacci/murmur3 v1.1.0
-	github.com/stretchr/testify v1.8.4
 	github.com/tidwall/gjson v1.14.0
-	github.com/toolkits/pkg v1.3.8
+	github.com/toolkits/pkg v1.3.6
 	golang.org/x/exp v0.0.0-20230713183714-613f0c0eb8a1
 	golang.org/x/oauth2 v0.10.0
 	gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df
@@ -45,8 +43,6 @@ require (
 	gorm.io/gorm v1.25.7-0.20240204074919-46816ad31dde
 )

-require github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
-
 require (
 	github.com/Azure/go-ntlmssp v0.0.0-20220621081337-cb9428e4ac1e // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
--- a/go.sum
+++ b/go.sum
@@ -160,8 +160,6 @@ github.com/jackc/puddle v0.0.0-20190413234325-e4ced69a3a2b/go.mod h1:m4B5Dj62Y0f
 github.com/jackc/puddle v0.0.0-20190608224051-11cab39313c9/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk=
 github.com/jackc/puddle v1.1.3/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk=
 github.com/jackc/puddle v1.3.0/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk=
-github.com/jinzhu/copier v0.4.0 h1:w3ciUoD19shMCRargcpm0cm91ytaBhDvuRpz1ODO/U8=
-github.com/jinzhu/copier v0.4.0/go.mod h1:DfbEm0FYsaqBcKcFuvmOZb218JkPGtvSHsKg8S8hyyg=
 github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD/E=
 github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc=
 github.com/jinzhu/now v1.1.4/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8=
@@ -234,7 +232,6 @@ github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U=
-github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/pquerna/cachecontrol v0.1.0 h1:yJMy84ti9h/+OEWa752kBTKv4XC30OtVVHYv/8cTqKc=
 github.com/pquerna/cachecontrol v0.1.0/go.mod h1:NrUG3Z7Rdu85UNR3vm7SOsl1nFIeSiQnrHV5K9mBcUI=
 github.com/prashantv/gostub v1.1.0 h1:BTyx3RfQjRHnUWaGF9oQos79AlQ5k8WNktv7VGvVH4g=
@@ -289,15 +286,14 @@ github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o
 github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
 github.com/stretchr/testify v1.8.3/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
 github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
-github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
 github.com/tidwall/gjson v1.14.0 h1:6aeJ0bzojgWLa82gDQHcx3S0Lr/O51I9bJ5nv6JFx5w=
 github.com/tidwall/gjson v1.14.0/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=
 github.com/tidwall/match v1.1.1 h1:+Ho715JplO36QYgwN9PGYNhgZvoUSc9X2c80KVTi+GA=
 github.com/tidwall/match v1.1.1/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM=
 github.com/tidwall/pretty v1.2.0 h1:RWIZEg2iJ8/g6fDDYzMpobmaoGh5OLl4AXtGUGPcqCs=
 github.com/tidwall/pretty v1.2.0/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU=
-github.com/toolkits/pkg v1.3.8 h1:2yamC20c5mHRtbcGiLY99Lm/2mVitFn6onE8KKvMT1o=
-github.com/toolkits/pkg v1.3.8/go.mod h1:M9ecwFGW1vxCTUFM9sr2ZjXSKb04N+1sTQ6SA3RNAIU=
+github.com/toolkits/pkg v1.3.6 h1:47e1amsY6mJmcnF3Y2lIpkJXfoYY2RmgI09PtwdAEMU=
+github.com/toolkits/pkg v1.3.6/go.mod h1:M9ecwFGW1vxCTUFM9sr2ZjXSKb04N+1sTQ6SA3RNAIU=
 github.com/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS4MhqMhdFk5YI=
 github.com/twitchyliquid64/golang-asm v0.15.1/go.mod h1:a1lVb/DtPvCB8fslRZhAngC2+aY1QWCk3Cedj/Gdt08=
 github.com/ugorji/go v1.2.7/go.mod h1:nF9osbDWLy6bDVv/Rtoh6QgnvNDpmCalQV5urGCCS6M=
--- a/integrations/Appdynamics/collect/appdynamics/app.toml
+++ b/integrations/Appdynamics/collect/appdynamics/app.toml
--- a/integrations/Appdynamics/icon/appdynamics.png
+++ b/integrations/Appdynamics/icon/appdynamics.png
--- a/integrations/Appdynamics/markdown/README.md
+++ b/integrations/Appdynamics/markdown/README.md
--- a/integrations/AutoMQ/dashboards/cluster_overview.json
+++ b/integrations/AutoMQ/dashboards/cluster_overview.json
@@ -584,7 +584,7 @@
                    "links": [
                        {
                            "title": "下钻",
-                            "url": "/built-in-components/dashboard/detail?__uuid__=1717556327172992000&TSDB=${DS_PROMETHEUS}\u0026cluster_id=${cluster_id}\u0026group_id=${__field.labels.consumer_group}\u0026partition=all\u0026topic=${__field.labels.topic}"
+                            "url": "/dashboards/automq-group-metrics?TSDB=${DS_PROMETHEUS}\u0026cluster_id=${cluster_id}\u0026group_id=${__field.labels.consumer_group}\u0026partition=all\u0026topic=${__field.labels.topic}"
                        }
                    ],
                    "showHeader": true
@@ -669,7 +669,7 @@
                    "links": [
                        {
                            "title": "下钻",
-                            "url": "/built-in-components/dashboard/detail?__uuid__=1717556327174664000&TSDB=${DS_PROMETHEUS}\u0026cluster_id=${cluster_id}\u0026topic=${__field.labels.topic}"
+                            "url": "/dashboards/automq-topic-metrics?TSDB=${DS_PROMETHEUS}\u0026cluster_id=${cluster_id}\u0026topic=${__field.labels.topic}"
                        }
                    ],
                    "showHeader": true
@@ -781,7 +781,7 @@
                    "links": [
                        {
                            "title": "下钻",
-                            "url": "/built-in-components/dashboard/detail?__uuid__=1717556327159415000&DS_PROMETHEUS=${DS_PROMETHEUS}\u0026cluster_id=${cluster_id}\u0026node_id=${__field.labels.instance}"
+                            "url": "/dashboards/automq-broker-metrics?DS_PROMETHEUS=${DS_PROMETHEUS}\u0026cluster_id=${cluster_id}\u0026node_id=${__field.labels.instance}"
                        }
                    ],
                    "showHeader": true
--- a/integrations/ElasticSearch/alerts/elasticsearch_by_categraf.json
+++ b/integrations/ElasticSearch/alerts/elasticsearch_by_categraf.json
@@ -192,7 +192,7 @@
            "prom_ql": "",
            "queries": [
                {
-                    "prom_ql": "elasticsearch_filesystem_data_available_bytes / elasticsearch_filesystem_data_size_in_bytes * 100 \u003c 10",
+                    "prom_ql": "elasticsearch_filesystem_data_available_bytes / elasticsearch_filesystem_data_size_bytes * 100 \u003c 10",
                    "severity": 1
                }
            ],
@@ -275,7 +275,7 @@
            "prom_ql": "",
            "queries": [
                {
-                    "prom_ql": "elasticsearch_filesystem_data_available_bytes / elasticsearch_filesystem_data_size_in_bytes * 100 \u003c 20",
+                    "prom_ql": "elasticsearch_filesystem_data_available_bytes / elasticsearch_filesystem_data_size_bytes * 100 \u003c 20",
                    "severity": 2
                }
            ],
@@ -1078,4 +1078,4 @@
        "update_by": "",
        "uuid": 1717556327360313000
    }
-]
+]
--- a/integrations/ElasticSearch/markdown/README.md
+++ b/integrations/ElasticSearch/markdown/README.md
@@ -4,6 +4,7 @@ ElasticSearch 通过 HTTP JSON 的方式暴露了自身的监控指标，通过

 如果是小规模集群，设置 `local=false`，从集群中某一个节点抓取数据，即可拿到整个集群所有节点的监控数据。如果是大规模集群，建议设置 `local=true`，在集群的每个节点上都部署抓取器，抓取本地 elasticsearch 进程的监控数据。

+ElasticSearch 详细的监控讲解，请参考这篇 [文章](https://time.geekbang.org/column/article/628847)。

 ## 配置示例

--- a/integrations/IPMI/dashboards/IPMI_by_prometheus.json
+++ b/integrations/IPMI/dashboards/IPMI_by_prometheus.json
@@ -1,463 +0,0 @@
-{
-    "name": "IPMI for Prometheus",
-    "ident": "",
-    "configs": {
-        "version": "2.0.0",
-        "links": [],
-        "var": [
-            {
-                "name": "node",
-                "type": "query",
-                "datasource": {
-                    "cate": "prometheus"
-                },
-                "definition": "label_values(ipmi_bmc_info, ident)",
-                "reg": "",
-                "multi": false
-            }
-        ],
-        "panels": [
-            {
-                "type": "gauge",
-                "id": "f975fded-f57e-4a6e-80b4-50d5be6dd84c",
-                "layout": {
-                    "h": 7,
-                    "w": 24,
-                    "x": 0,
-                    "y": 0,
-                    "i": "f975fded-f57e-4a6e-80b4-50d5be6dd84c",
-                    "isResizable": true
-                },
-                "version": "2.0.0",
-                "datasourceCate": "prometheus",
-                "targets": [
-                    {
-                        "refId": "A",
-                        "expr": "ipmi_temperature_celsius{ident='$node'}",
-                        "legend": "{{name}}"
-                    }
-                ],
-                "transformations": [
-                    {
-                        "id": "organize",
-                        "options": {}
-                    }
-                ],
-                "name": "Temperatures",
-                "links": [],
-                "custom": {
-                    "textMode": "valueAndName",
-                    "calc": "avg"
-                },
-                "options": {
-                    "valueMappings": [],
-                    "standardOptions": {
-                        "util": "none"
-                    },
-                    "thresholds": {
-                        "steps": [
-                            {
-                                "color": "green",
-                                "value": null,
-                                "type": "base"
-                            },
-                            {
-                                "color": "red",
-                                "value": 80
-                            }
-                        ]
-                    }
-                }
-            },
-            {
-                "type": "timeseries",
-                "id": "681f1191-4777-4377-8b77-404d9f036406",
-                "layout": {
-                    "h": 5,
-                    "w": 12,
-                    "x": 0,
-                    "y": 7,
-                    "i": "681f1191-4777-4377-8b77-404d9f036406",
-                    "isResizable": true
-                },
-                "version": "2.0.0",
-                "datasourceCate": "prometheus",
-                "targets": [
-                    {
-                        "refId": "A",
-                        "expr": "ipmi_power_watts{ident='$node'}",
-                        "legend": "{{name}}"
-                    }
-                ],
-                "transformations": [
-                    {
-                        "id": "organize",
-                        "options": {}
-                    }
-                ],
-                "name": "Power",
-                "links": [],
-                "options": {
-                    "tooltip": {
-                        "mode": "all",
-                        "sort": "none"
-                    },
-                    "legend": {
-                        "displayMode": "hidden"
-                    },
-                    "standardOptions": {},
-                    "thresholds": {
-                        "steps": [
-                            {
-                                "color": "#634CD9",
-                                "value": null,
-                                "type": "base"
-                            }
-                        ]
-                    }
-                },
-                "custom": {
-                    "drawStyle": "lines",
-                    "lineInterpolation": "smooth",
-                    "spanNulls": false,
-                    "lineWidth": 1,
-                    "fillOpacity": 0.5,
-                    "gradientMode": "none",
-                    "stack": "off",
-                    "scaleDistribution": {
-                        "type": "linear"
-                    }
-                }
-            },
-            {
-                "type": "timeseries",
-                "id": "feede24c-8296-4127-982e-08cfc4151933",
-                "layout": {
-                    "h": 5,
-                    "w": 12,
-                    "x": 12,
-                    "y": 7,
-                    "i": "feede24c-8296-4127-982e-08cfc4151933",
-                    "isResizable": true
-                },
-                "version": "2.0.0",
-                "datasourceCate": "prometheus",
-                "targets": [
-                    {
-                        "refId": "A",
-                        "expr": "ipmi_power_watts{ident='$node'} * 30 * 24 ",
-                        "legend": "{{name}}"
-                    }
-                ],
-                "transformations": [
-                    {
-                        "id": "organize",
-                        "options": {}
-                    }
-                ],
-                "name": "Power usage 30d",
-                "links": [],
-                "options": {
-                    "tooltip": {
-                        "mode": "all",
-                        "sort": "none"
-                    },
-                    "legend": {
-                        "displayMode": "hidden"
-                    },
-                    "standardOptions": {},
-                    "thresholds": {
-                        "steps": [
-                            {
-                                "color": "#634CD9",
-                                "value": null,
-                                "type": "base"
-                            }
-                        ]
-                    }
-                },
-                "custom": {
-                    "drawStyle": "lines",
-                    "lineInterpolation": "smooth",
-                    "spanNulls": false,
-                    "lineWidth": 1,
-                    "fillOpacity": 0.5,
-                    "gradientMode": "none",
-                    "stack": "off",
-                    "scaleDistribution": {
-                        "type": "linear"
-                    }
-                }
-            },
-            {
-                "type": "timeseries",
-                "id": "9e11e7f5-ed3c-49eb-8a72-ee76c8700c24",
-                "layout": {
-                    "h": 7,
-                    "w": 12,
-                    "x": 0,
-                    "y": 12,
-                    "i": "9e11e7f5-ed3c-49eb-8a72-ee76c8700c24",
-                    "isResizable": true
-                },
-                "version": "2.0.0",
-                "datasourceCate": "prometheus",
-                "targets": [
-                    {
-                        "refId": "A",
-                        "expr": "ipmi_temperature_celsius{ident='$node'}",
-                        "legend": "{{name}}"
-                    }
-                ],
-                "transformations": [
-                    {
-                        "id": "organize",
-                        "options": {}
-                    }
-                ],
-                "name": "Temperatures",
-                "links": [],
-                "description": "",
-                "options": {
-                    "tooltip": {
-                        "mode": "multi"
-                    },
-                    "legend": {
-                        "displayMode": "list",
-                        "placement": "bottom"
-                    },
-                    "standardOptions": {
-                        "util": "none"
-                    },
-                    "thresholds": {
-                        "steps": [
-                            {
-                                "color": "green",
-                                "value": null,
-                                "type": "base"
-                            },
-                            {
-                                "color": "red",
-                                "value": 80
-                            }
-                        ]
-                    }
-                },
-                "custom": {
-                    "drawStyle": "lines",
-                    "lineInterpolation": "linear",
-                    "spanNulls": false,
-                    "lineWidth": 1,
-                    "fillOpacity": 0.5,
-                    "gradientMode": "none",
-                    "stack": "off",
-                    "scaleDistribution": {
-                        "type": "linear"
-                    }
-                }
-            },
-            {
-                "type": "timeseries",
-                "id": "95c734f7-26cb-41a7-8376-49332cc220c2",
-                "layout": {
-                    "h": 7,
-                    "w": 12,
-                    "x": 12,
-                    "y": 12,
-                    "i": "95c734f7-26cb-41a7-8376-49332cc220c2",
-                    "isResizable": true
-                },
-                "version": "2.0.0",
-                "datasourceCate": "prometheus",
-                "targets": [
-                    {
-                        "refId": "A",
-                        "expr": "ipmi_power_watts{ident='$node'}",
-                        "legend": "{{name}}"
-                    }
-                ],
-                "transformations": [
-                    {
-                        "id": "organize",
-                        "options": {}
-                    }
-                ],
-                "name": "Power",
-                "links": [],
-                "description": "",
-                "options": {
-                    "tooltip": {
-                        "mode": "multi"
-                    },
-                    "legend": {
-                        "displayMode": "list",
-                        "placement": "bottom"
-                    },
-                    "standardOptions": {
-                        "util": "none"
-                    },
-                    "thresholds": {
-                        "steps": [
-                            {
-                                "color": "green",
-                                "value": null,
-                                "type": "base"
-                            },
-                            {
-                                "color": "red",
-                                "value": 80
-                            }
-                        ]
-                    }
-                },
-                "custom": {
-                    "drawStyle": "lines",
-                    "lineInterpolation": "linear",
-                    "spanNulls": false,
-                    "lineWidth": 1,
-                    "fillOpacity": 0.01,
-                    "gradientMode": "none",
-                    "stack": "off",
-                    "scaleDistribution": {
-                        "type": "linear"
-                    }
-                }
-            },
-            {
-                "type": "timeseries",
-                "id": "0313f34f-afcf-41e9-8f69-9a3dbd4b2e56",
-                "layout": {
-                    "h": 7,
-                    "w": 12,
-                    "x": 0,
-                    "y": 19,
-                    "i": "0313f34f-afcf-41e9-8f69-9a3dbd4b2e56",
-                    "isResizable": true
-                },
-                "version": "2.0.0",
-                "datasourceCate": "prometheus",
-                "targets": [
-                    {
-                        "refId": "A",
-                        "expr": "ipmi_fan_speed_rpm{ident='$node'}",
-                        "legend": "{{name}}"
-                    }
-                ],
-                "transformations": [
-                    {
-                        "id": "organize",
-                        "options": {}
-                    }
-                ],
-                "name": "Fans",
-                "links": [],
-                "description": "",
-                "options": {
-                    "tooltip": {
-                        "mode": "multi"
-                    },
-                    "legend": {
-                        "displayMode": "list",
-                        "placement": "bottom"
-                    },
-                    "standardOptions": {
-                        "util": "none"
-                    },
-                    "thresholds": {
-                        "steps": [
-                            {
-                                "color": "green",
-                                "value": null,
-                                "type": "base"
-                            },
-                            {
-                                "color": "red",
-                                "value": 80
-                            }
-                        ]
-                    }
-                },
-                "custom": {
-                    "drawStyle": "lines",
-                    "lineInterpolation": "linear",
-                    "spanNulls": false,
-                    "lineWidth": 1,
-                    "fillOpacity": 0.5,
-                    "gradientMode": "none",
-                    "stack": "off",
-                    "scaleDistribution": {
-                        "type": "linear"
-                    }
-                }
-            },
-            {
-                "type": "timeseries",
-                "id": "29ee004d-a95c-405d-97d1-d715fab4e1de",
-                "layout": {
-                    "h": 7,
-                    "w": 12,
-                    "x": 12,
-                    "y": 19,
-                    "i": "29ee004d-a95c-405d-97d1-d715fab4e1de",
-                    "isResizable": true
-                },
-                "version": "2.0.0",
-                "datasourceCate": "prometheus",
-                "targets": [
-                    {
-                        "refId": "A",
-                        "expr": "ipmi_voltage_volts{ident='$node',name!~\"Voltage 1|Voltage 2\"}",
-                        "legend": "{{name}}"
-                    }
-                ],
-                "transformations": [
-                    {
-                        "id": "organize",
-                        "options": {}
-                    }
-                ],
-                "name": "Voltages",
-                "links": [],
-                "description": "",
-                "options": {
-                    "tooltip": {
-                        "mode": "multi"
-                    },
-                    "legend": {
-                        "displayMode": "list",
-                        "placement": "bottom"
-                    },
-                    "standardOptions": {
-                        "util": "none"
-                    },
-                    "thresholds": {
-                        "steps": [
-                            {
-                                "color": "green",
-                                "value": null,
-                                "type": "base"
-                            },
-                            {
-                                "color": "red",
-                                "value": 80
-                            }
-                        ]
-                    }
-                },
-                "custom": {
-                    "drawStyle": "lines",
-                    "lineInterpolation": "linear",
-                    "spanNulls": false,
-                    "lineWidth": 1,
-                    "fillOpacity": 0.5,
-                    "gradientMode": "none",
-                    "stack": "off",
-                    "scaleDistribution": {
-                        "type": "linear"
-                    }
-                }
-            }
-        ]
-    },
-    "uuid": 1727587308068775200
-}
--- a/integrations/Kafka/markdown/README.md
+++ b/integrations/Kafka/markdown/README.md
@@ -1,6 +1,6 @@
 # kafka plugin

-Kafka 的核心指标，其实都是通过 JMX 的方式暴露的。对于 JMX 暴露的指标，使用 jolokia 或者使用 jmx_exporter 那个 jar 包来采集即可，不需要本插件。
+Kafka 的核心指标，其实都是通过 JMX 的方式暴露的，可以参考这篇 [文章](https://time.geekbang.org/column/article/628498)。对于 JMX 暴露的指标，使用 jolokia 或者使用 jmx_exporter 那个 jar 包来采集即可，不需要本插件。

 本插件主要是采集的消费者延迟数据，这个数据无法通过 Kafka 服务端的 JMX 拿到。

--- a/integrations/Kubernetes/dashboards/DeploymentContainer.json
+++ b/integrations/Kubernetes/dashboards/DeploymentContainer.json
--- a/integrations/Kubernetes/dashboards/StatefulsetContainer.json
+++ b/integrations/Kubernetes/dashboards/StatefulsetContainer.json
--- a/integrations/Kubernetes/markdown/README.md
+++ b/integrations/Kubernetes/markdown/README.md
@@ -1,6 +1,6 @@
 # Kubernetes

-这个插件已经废弃。Kubernetes 监控系列可以参考这个 [文章](https://flashcat.cloud/categories/kubernetes%E7%9B%91%E6%8E%A7%E4%B8%93%E6%A0%8F/)。
+这个插件已经废弃。Kubernetes 监控系列可以参考这个 [文章](https://flashcat.cloud/categories/kubernetes%E7%9B%91%E6%8E%A7%E4%B8%93%E6%A0%8F/)。或者参考 [专栏](https://time.geekbang.org/column/article/630306)。

 不过 Kubernetes 这个类别下的内置告警规则和内置仪表盘都是可以使用的。

--- a/integrations/Linux/alerts/常用中文告警规则-采集器Categraf.json
+++ b/integrations/Linux/alerts/常用中文告警规则-采集器Categraf.json
@@ -1425,7 +1425,7 @@
        "rule_config": {
            "queries": [
                {
-                    "prom_ql": "increase(kernel_vmstat_oom_kill[2m]) > 0",
+                    "prom_ql": "kernel_vmstat_oom_kill != 0",
                    "severity": 2
                }
            ]
@@ -2139,4 +2139,4 @@
        "update_by": "",
        "uuid": 1717556327737117000
    }
-]
+]
--- a/integrations/Linux/dashboards/host_table_view_demo.json
+++ b/integrations/Linux/dashboards/host_table_view_demo.json
@@ -1,6 +1,13 @@
 {
+    "id": 0,
+    "group_id": 0,
    "name": "机器台账表格视图",
+    "ident": "",
    "tags": "",
+    "create_at": 0,
+    "create_by": "",
+    "update_at": 0,
+    "update_by": "",
    "configs": {
        "links": [
            {
@@ -21,7 +28,7 @@
                    "colorRange": [
                        "thresholds"
                    ],
-                    "detailUrl": "/built-in-components/dashboard/detail?__uuid__=1717556327744505000&ident=${__field.labels.ident}",
+                    "detailUrl": "/dashboards-built-in/detail?__built-in-cate=Linux\u0026__built-in-name=Linux%20Host%20by%20Categraf%20v2\u0026ident=${__field.labels.ident}",
                    "textMode": "valueAndName",
                    "valueField": "Value"
                },
@@ -91,7 +98,7 @@
                    "colorRange": [
                        "thresholds"
                    ],
-                    "detailUrl": "/built-in-components/dashboard/detail?__uuid__=1717556327744505000&ident=${__field.labels.ident}",
+                    "detailUrl": "/dashboards-built-in/detail?__built-in-cate=Linux\u0026__built-in-name=Linux%20Host%20by%20Categraf%20v2\u0026ident=${__field.labels.ident}",
                    "textMode": "valueAndName",
                    "valueField": "Value"
                },
@@ -164,16 +171,13 @@
                    "linkMode": "appendLinkColumn",
                    "links": [
                        {
-                            "targetBlank": true,
                            "title": "详情",
-                            "url": "/built-in-components/dashboard/detail?__uuid__=1717556327744505000&ident=${__field.labels.ident}"
+                            "url": "/dashboards-built-in/detail?__built-in-cate=Linux\u0026__built-in-name=Linux%20Host%20by%20Categraf%20v2\u0026ident=${__field.labels.ident}"
                        }
                    ],
-                    "nowrap": false,
                    "showHeader": true,
                    "sortColumn": "ident",
-                    "sortOrder": "ascend",
-                    "tableLayout": "fixed"
+                    "sortOrder": "ascend"
                },
                "datasourceCate": "prometheus",
                "datasourceValue": "${prom}",
@@ -381,5 +385,10 @@
        ],
        "version": "3.0.0"
    },
+    "public": 0,
+    "public_cate": 0,
+    "bgids": null,
+    "built_in": 0,
+    "hide": 0,
    "uuid": 1717556327742611000
 }
--- a/integrations/Linux/dashboards/linux_by_exporter.json
+++ b/integrations/Linux/dashboards/linux_by_exporter.json
@@ -2051,7 +2051,7 @@
                    "cate": "prometheus",
                    "value": "${prom}"
                },
-                "definition": "label_values(node_uname_info,  instance)",
+                "definition": "label_values(node_cpu_seconds_total,  instance)",
                "name": "node",
                "selected": "$node",
                "type": "query"
--- a/integrations/Linux/dashboards/linux_by_exporter_overview.json
+++ b/integrations/Linux/dashboards/linux_by_exporter_overview.json
@@ -252,7 +252,7 @@
                    "cate": "prometheus",
                    "value": "${prom}"
                },
-                "definition": "label_values(node_uname_info,  instance)",
+                "definition": "label_values(node_cpu_seconds_total,  instance)",
                "name": "node",
                "selected": "$node",
                "type": "query"
--- a/integrations/Linux/metrics/categraf-base.json
+++ b/integrations/Linux/metrics/categraf-base.json
@@ -259,11 +259,11 @@
        "uuid": 1717556327796195000,
        "collector": "Categraf",
        "typ": "Linux",
-        "name": "1分钟内 OOM 次数统计",
+        "name": "OOM 次数统计",
        "unit": "none",
        "note": "取自 `/proc/vmstat`，需要较高版本的内核，没记错的话应该是 4.13 以上版本",
        "lang": "zh_CN",
-        "expression": "increase(kernel_vmstat_oom_kill[1m])",
+        "expression": "kernel_vmstat_oom_kill",
        "created_at": 0,
        "created_by": "",
        "updated_at": 0,
@@ -1334,4 +1334,4 @@
        "updated_at": 0,
        "updated_by": ""
    }
-]
+]
--- a/integrations/Process/alerts/process_by_exporter.json
+++ b/integrations/Process/alerts/process_by_exporter.json
@@ -0,0 +1,251 @@
+[
+    {
+        "id": 0,
+        "group_id": 0,
+        "cate": "prometheus",
+        "datasource_ids": [
+            0
+        ],
+        "cluster": "",
+        "name": "Process X high number of open files - exporter",
+        "note": "",
+        "prod": "metric",
+        "algorithm": "",
+        "algo_params": null,
+        "delay": 0,
+        "severity": 2,
+        "severities": [
+            2
+        ],
+        "disabled": 1,
+        "prom_for_duration": 60,
+        "prom_ql": "",
+        "rule_config": {
+            "algo_params": null,
+            "inhibit": false,
+            "prom_ql": "",
+            "queries": [
+                {
+                    "prom_ql": "avg by (instance) (namedprocess_namegroup_worst_fd_ratio{groupname=\"X\"}) * 100 \u003e 80",
+                    "severity": 2
+                }
+            ],
+            "severity": 0
+        },
+        "prom_eval_interval": 15,
+        "enable_stime": "00:00",
+        "enable_stimes": [
+            "00:00"
+        ],
+        "enable_etime": "23:59",
+        "enable_etimes": [
+            "23:59"
+        ],
+        "enable_days_of_week": [
+            "1",
+            "2",
+            "3",
+            "4",
+            "5",
+            "6",
+            "0"
+        ],
+        "enable_days_of_weeks": [
+            [
+                "1",
+                "2",
+                "3",
+                "4",
+                "5",
+                "6",
+                "0"
+            ]
+        ],
+        "enable_in_bg": 0,
+        "notify_recovered": 1,
+        "notify_channels": [],
+        "notify_groups_obj": null,
+        "notify_groups": null,
+        "notify_repeat_step": 60,
+        "notify_max_number": 0,
+        "recover_duration": 0,
+        "callbacks": [],
+        "runbook_url": "",
+        "append_tags": [
+            "alertname=ProcessHighOpenFiles"
+        ],
+        "annotations": null,
+        "extra_config": null,
+        "create_at": 0,
+        "create_by": "",
+        "update_at": 0,
+        "update_by": "",
+        "uuid": 1717556328248638000
+    },
+    {
+        "id": 0,
+        "group_id": 0,
+        "cate": "prometheus",
+        "datasource_ids": [
+            0
+        ],
+        "cluster": "",
+        "name": "Process X is down - exporter",
+        "note": "",
+        "prod": "metric",
+        "algorithm": "",
+        "algo_params": null,
+        "delay": 0,
+        "severity": 1,
+        "severities": [
+            1
+        ],
+        "disabled": 1,
+        "prom_for_duration": 0,
+        "prom_ql": "",
+        "rule_config": {
+            "algo_params": null,
+            "inhibit": false,
+            "prom_ql": "",
+            "queries": [
+                {
+                    "prom_ql": "sum by (instance) (namedprocess_namegroup_num_procs{groupname=\"X\"})  == 0",
+                    "severity": 1
+                }
+            ],
+            "severity": 0
+        },
+        "prom_eval_interval": 15,
+        "enable_stime": "00:00",
+        "enable_stimes": [
+            "00:00"
+        ],
+        "enable_etime": "23:59",
+        "enable_etimes": [
+            "23:59"
+        ],
+        "enable_days_of_week": [
+            "1",
+            "2",
+            "3",
+            "4",
+            "5",
+            "6",
+            "0"
+        ],
+        "enable_days_of_weeks": [
+            [
+                "1",
+                "2",
+                "3",
+                "4",
+                "5",
+                "6",
+                "0"
+            ]
+        ],
+        "enable_in_bg": 0,
+        "notify_recovered": 1,
+        "notify_channels": [],
+        "notify_groups_obj": null,
+        "notify_groups": null,
+        "notify_repeat_step": 60,
+        "notify_max_number": 0,
+        "recover_duration": 0,
+        "callbacks": [],
+        "runbook_url": "",
+        "append_tags": [
+            "alertname=ProcessNotRunning"
+        ],
+        "annotations": null,
+        "extra_config": null,
+        "create_at": 0,
+        "create_by": "",
+        "update_at": 0,
+        "update_by": "",
+        "uuid": 1717556328249307000
+    },
+    {
+        "id": 0,
+        "group_id": 0,
+        "cate": "prometheus",
+        "datasource_ids": [
+            0
+        ],
+        "cluster": "",
+        "name": "Process X is restarted - exporter",
+        "note": "",
+        "prod": "metric",
+        "algorithm": "",
+        "algo_params": null,
+        "delay": 0,
+        "severity": 3,
+        "severities": [
+            3
+        ],
+        "disabled": 1,
+        "prom_for_duration": 0,
+        "prom_ql": "",
+        "rule_config": {
+            "algo_params": null,
+            "inhibit": false,
+            "prom_ql": "",
+            "queries": [
+                {
+                    "prom_ql": "namedprocess_namegroup_oldest_start_time_seconds{groupname=\"X\"} \u003e time() - 60 ",
+                    "severity": 3
+                }
+            ],
+            "severity": 0
+        },
+        "prom_eval_interval": 15,
+        "enable_stime": "00:00",
+        "enable_stimes": [
+            "00:00"
+        ],
+        "enable_etime": "23:59",
+        "enable_etimes": [
+            "23:59"
+        ],
+        "enable_days_of_week": [
+            "1",
+            "2",
+            "3",
+            "4",
+            "5",
+            "6",
+            "0"
+        ],
+        "enable_days_of_weeks": [
+            [
+                "1",
+                "2",
+                "3",
+                "4",
+                "5",
+                "6",
+                "0"
+            ]
+        ],
+        "enable_in_bg": 0,
+        "notify_recovered": 1,
+        "notify_channels": [],
+        "notify_groups_obj": null,
+        "notify_groups": null,
+        "notify_repeat_step": 60,
+        "notify_max_number": 0,
+        "recover_duration": 0,
+        "callbacks": [],
+        "runbook_url": "",
+        "append_tags": [
+            "alertname=ProcessRestarted"
+        ],
+        "annotations": null,
+        "extra_config": null,
+        "create_at": 0,
+        "create_by": "",
+        "update_at": 0,
+        "update_by": "",
+        "uuid": 1717556328249744000
+    }
+]
--- a/integrations/Process/alerts/procstat_by_categraf.json
+++ b/integrations/Process/alerts/procstat_by_categraf.json
@@ -0,0 +1,172 @@
+[
+    {
+        "id": 0,
+        "group_id": 0,
+        "cate": "prometheus",
+        "datasource_ids": [
+            0
+        ],
+        "cluster": "",
+        "name": "process handle limit is too low",
+        "note": "",
+        "prod": "metric",
+        "algorithm": "",
+        "algo_params": null,
+        "delay": 0,
+        "severity": 3,
+        "severities": [
+            3
+        ],
+        "disabled": 1,
+        "prom_for_duration": 60,
+        "prom_ql": "",
+        "rule_config": {
+            "algo_params": null,
+            "inhibit": false,
+            "prom_ql": "",
+            "queries": [
+                {
+                    "prom_ql": "procstat_rlimit_num_fds_soft \u003c 2048",
+                    "severity": 3
+                }
+            ],
+            "severity": 0
+        },
+        "prom_eval_interval": 15,
+        "enable_stime": "00:00",
+        "enable_stimes": [
+            "00:00"
+        ],
+        "enable_etime": "23:59",
+        "enable_etimes": [
+            "23:59"
+        ],
+        "enable_days_of_week": [
+            "1",
+            "2",
+            "3",
+            "4",
+            "5",
+            "6",
+            "0"
+        ],
+        "enable_days_of_weeks": [
+            [
+                "1",
+                "2",
+                "3",
+                "4",
+                "5",
+                "6",
+                "0"
+            ]
+        ],
+        "enable_in_bg": 0,
+        "notify_recovered": 1,
+        "notify_channels": [
+            "email",
+            "dingtalk",
+            "wecom"
+        ],
+        "notify_groups_obj": null,
+        "notify_groups": null,
+        "notify_repeat_step": 60,
+        "notify_max_number": 0,
+        "recover_duration": 0,
+        "callbacks": [],
+        "runbook_url": "",
+        "append_tags": [],
+        "annotations": null,
+        "extra_config": null,
+        "create_at": 0,
+        "create_by": "",
+        "update_at": 0,
+        "update_by": "",
+        "uuid": 1717556328251224000
+    },
+    {
+        "id": 0,
+        "group_id": 0,
+        "cate": "prometheus",
+        "datasource_ids": [
+            0
+        ],
+        "cluster": "",
+        "name": "there is a process count of 0, indicating that a certain process may have crashed",
+        "note": "",
+        "prod": "metric",
+        "algorithm": "",
+        "algo_params": null,
+        "delay": 0,
+        "severity": 1,
+        "severities": [
+            1
+        ],
+        "disabled": 1,
+        "prom_for_duration": 60,
+        "prom_ql": "",
+        "rule_config": {
+            "algo_params": null,
+            "inhibit": false,
+            "prom_ql": "",
+            "queries": [
+                {
+                    "prom_ql": "procstat_lookup_count == 0",
+                    "severity": 1
+                }
+            ],
+            "severity": 0
+        },
+        "prom_eval_interval": 15,
+        "enable_stime": "00:00",
+        "enable_stimes": [
+            "00:00"
+        ],
+        "enable_etime": "23:59",
+        "enable_etimes": [
+            "23:59"
+        ],
+        "enable_days_of_week": [
+            "1",
+            "2",
+            "3",
+            "4",
+            "5",
+            "6",
+            "0"
+        ],
+        "enable_days_of_weeks": [
+            [
+                "1",
+                "2",
+                "3",
+                "4",
+                "5",
+                "6",
+                "0"
+            ]
+        ],
+        "enable_in_bg": 0,
+        "notify_recovered": 1,
+        "notify_channels": [
+            "email",
+            "dingtalk",
+            "wecom"
+        ],
+        "notify_groups_obj": null,
+        "notify_groups": null,
+        "notify_repeat_step": 60,
+        "notify_max_number": 0,
+        "recover_duration": 0,
+        "callbacks": [],
+        "runbook_url": "",
+        "append_tags": [],
+        "annotations": null,
+        "extra_config": null,
+        "create_at": 0,
+        "create_by": "",
+        "update_at": 0,
+        "update_by": "",
+        "uuid": 1717556328254260000
+    }
+]
--- a/integrations/Process/dashboards/process_by_exporter.json
+++ b/integrations/Process/dashboards/process_by_exporter.json
--- a/integrations/Process/icon/process.png
+++ b/integrations/Process/icon/process.png
--- a/integrations/SpringBoot/dashboards/JVM(Actuator)2.0.json
+++ b/integrations/SpringBoot/dashboards/JVM(Actuator)2.0.json
--- a/integrations/SpringBoot/dashboards/JVM(Actuator)withapplicationname.json
+++ b/integrations/SpringBoot/dashboards/JVM(Actuator)withapplicationname.json
@@ -2085,6 +2085,7 @@
        ],
        "var": [
            {
+                "defaultValue": 2,
                "definition": "prometheus",
                "label": "datasource",
                "name": "datasource",
--- a/memsto/busi_group_cache.go
+++ b/memsto/busi_group_cache.go
@@ -60,18 +60,6 @@ func (c *BusiGroupCacheType) GetByBusiGroupId(id int64) *models.BusiGroup {
 	return c.ugs[id]
 }

-func (c *BusiGroupCacheType) GetNamesByBusiGroupIds(ids []int64) []string {
-	c.RLock()
-	defer c.RUnlock()
-	names := make([]string, 0, len(ids))
-	for _, id := range ids {
-		if ug, exists := c.ugs[id]; exists {
-			names = append(names, ug.Name)
-		}
-	}
-	return names
-}
-
 func (c *BusiGroupCacheType) SyncBusiGroups() {
 	err := c.syncBusiGroups()
 	if err != nil {
--- a/memsto/config_cval_cache.go
+++ b/memsto/config_cval_cache.go
@@ -1,150 +0,0 @@
-package memsto
-
-import (
-	"encoding/json"
-	"log"
-	"sync"
-	"time"
-
-	"github.com/ccfos/nightingale/v6/dumper"
-	"github.com/ccfos/nightingale/v6/models"
-	"github.com/ccfos/nightingale/v6/pkg/ctx"
-
-	"github.com/pkg/errors"
-	"github.com/toolkits/pkg/logger"
-)
-
-type CvalCache struct {
-	statTotal       int64
-	statLastUpdated int64
-	ctx             *ctx.Context
-	stats           *Stats
-
-	mu    sync.RWMutex
-	cvals map[string]string
-}
-
-func NewCvalCache(ctx *ctx.Context, stats *Stats) *CvalCache {
-	cvalCache := &CvalCache{
-		statTotal:       -1,
-		statLastUpdated: -1,
-		ctx:             ctx,
-		stats:           stats,
-		cvals:           make(map[string]string),
-	}
-	cvalCache.initSyncConfigs()
-	return cvalCache
-}
-
-func (c *CvalCache) initSyncConfigs() {
-	err := c.syncConfigs()
-	if err != nil {
-		log.Fatalln("failed to sync configs:", err)
-	}
-
-	go c.loopSyncConfigs()
-}
-
-func (c *CvalCache) loopSyncConfigs() {
-	duration := time.Duration(9000) * time.Millisecond
-	for {
-		time.Sleep(duration)
-		if err := c.syncConfigs(); err != nil {
-			logger.Warning("failed to sync configs:", err)
-		}
-	}
-}
-
-func (c *CvalCache) syncConfigs() error {
-	start := time.Now()
-
-	stat, err := models.ConfigCvalStatistics(c.ctx)
-	if err != nil {
-		dumper.PutSyncRecord("cvals", start.Unix(), -1, -1, "failed to query statistics: "+err.Error())
-		return errors.WithMessage(err, "failed to call ConfigCvalStatistics")
-	}
-
-	if !c.statChanged(stat.Total, stat.LastUpdated) {
-		c.stats.GaugeCronDuration.WithLabelValues("sync_cvals").Set(0)
-		c.stats.GaugeSyncNumber.WithLabelValues("sync_cvals").Set(0)
-		dumper.PutSyncRecord("cvals", start.Unix(), -1, -1, "not changed")
-		return nil
-	}
-
-	cvals, err := models.ConfigsGetAll(c.ctx)
-	if err != nil {
-		dumper.PutSyncRecord("cvals", start.Unix(), -1, -1, "failed to query records: "+err.Error())
-		return errors.WithMessage(err, "failed to call ConfigsGet")
-	}
-
-	c.Set(cvals, stat.Total, stat.LastUpdated)
-
-	ms := time.Since(start).Milliseconds()
-	c.stats.GaugeCronDuration.WithLabelValues("sync_cvals").Set(float64(ms))
-	c.stats.GaugeSyncNumber.WithLabelValues("sync_cvals").Set(float64(len(c.cvals)))
-
-	logger.Infof("timer: sync cvals done, cost: %dms", ms)
-	dumper.PutSyncRecord("cvals", start.Unix(), ms, len(c.cvals), "success")
-
-	return nil
-}
-
-func (c *CvalCache) statChanged(total int64, updated int64) bool {
-	if c.statTotal == total && c.statLastUpdated == updated {
-		return false
-	}
-	return true
-}
-
-func (c *CvalCache) Set(cvals []*models.Configs, total int64, updated int64) {
-	c.mu.Lock()
-	defer c.mu.Unlock()
-	c.statTotal = total
-	c.statLastUpdated = updated
-	for _, cfg := range cvals {
-		c.cvals[cfg.Ckey] = cfg.Cval
-	}
-}
-
-func (c *CvalCache) Get(ckey string) string {
-	c.mu.RLock()
-	defer c.mu.RUnlock()
-	return c.cvals[ckey]
-}
-
-func (c *CvalCache) GetLastUpdateTime() int64 {
-	c.mu.RLock()
-	defer c.mu.RUnlock()
-	return c.statLastUpdated
-}
-
-type SiteInfo struct {
-	PrintBodyPaths []string `json:"print_body_paths"`
-	PrintAccessLog bool     `json:"print_access_log"`
-}
-
-func (c *CvalCache) GetSiteInfo() *SiteInfo {
-	c.mu.RLock()
-	defer c.mu.RUnlock()
-
-	si := SiteInfo{}
-	if siteInfoStr := c.Get("site_info"); siteInfoStr != "" {
-		if err := json.Unmarshal([]byte(siteInfoStr), &si); err != nil {
-			logger.Errorf("Failed to unmarshal site info: %v", err)
-		}
-	}
-	return &si
-}
-
-func (c *CvalCache) PrintBodyPaths() map[string]struct{} {
-	printBodyPaths := c.GetSiteInfo().PrintBodyPaths
-	pbp := make(map[string]struct{}, len(printBodyPaths))
-	for _, p := range printBodyPaths {
-		pbp[p] = struct{}{}
-	}
-	return pbp
-}
-
-func (c *CvalCache) PrintAccessLog() bool {
-	return c.GetSiteInfo().PrintAccessLog
-}
--- a/memsto/datasource_cache.go
+++ b/memsto/datasource_cache.go
@@ -23,9 +23,7 @@ type DatasourceCacheType struct {
 	DatasourceFilter    func([]*models.Datasource, *models.User) []*models.Datasource

 	sync.RWMutex
-	ds          map[int64]*models.Datasource            // key: id value: datasource
-	CateToIDs   map[string]map[int64]*models.Datasource // key1: cate key2: id value: datasource
-	CateToNames map[string]map[string]int64             // key1: cate key2: name value: id
+	ds map[int64]*models.Datasource // key: id
 }

 func NewDatasourceCache(ctx *ctx.Context, stats *Stats) *DatasourceCacheType {
@@ -35,8 +33,6 @@ func NewDatasourceCache(ctx *ctx.Context, stats *Stats) *DatasourceCacheType {
 		ctx:                 ctx,
 		stats:               stats,
 		ds:                  make(map[int64]*models.Datasource),
-		CateToIDs:           make(map[string]map[int64]*models.Datasource),
-		CateToNames:         make(map[string]map[string]int64),
 		DatasourceCheckHook: func(ctx *gin.Context) bool { return false },
 		DatasourceFilter:    func(ds []*models.Datasource, user *models.User) []*models.Datasource { return ds },
 	}
@@ -44,12 +40,6 @@ func NewDatasourceCache(ctx *ctx.Context, stats *Stats) *DatasourceCacheType {
 	return ds
 }

-func (d *DatasourceCacheType) GetIDsByDsCateAndQueries(cate string, datasourceQueries []models.DatasourceQuery) []int64 {
-	d.Lock()
-	defer d.Unlock()
-	return models.GetDatasourceIDsByDatasourceQueries(datasourceQueries, d.CateToIDs[cate], d.CateToNames[cate])
-}
-
 func (d *DatasourceCacheType) StatChanged(total, lastUpdated int64) bool {
 	if d.statTotal == total && d.statLastUpdated == lastUpdated {
 		return false
@@ -59,22 +49,8 @@ func (d *DatasourceCacheType) StatChanged(total, lastUpdated int64) bool {
 }

 func (d *DatasourceCacheType) Set(ds map[int64]*models.Datasource, total, lastUpdated int64) {
-	cateToDs := make(map[string]map[int64]*models.Datasource)
-	cateToNames := make(map[string]map[string]int64)
-	for _, datasource := range ds {
-		if _, exists := cateToDs[datasource.PluginType]; !exists {
-			cateToDs[datasource.PluginType] = make(map[int64]*models.Datasource)
-		}
-		cateToDs[datasource.PluginType][datasource.Id] = datasource
-		if _, exists := cateToNames[datasource.PluginType]; !exists {
-			cateToNames[datasource.PluginType] = make(map[string]int64)
-		}
-		cateToNames[datasource.PluginType][datasource.Name] = datasource.Id
-	}
 	d.Lock()
-	d.CateToIDs = cateToDs
 	d.ds = ds
-	d.CateToNames = cateToNames
 	d.Unlock()

 	// only one goroutine used, so no need lock
@@ -123,20 +99,20 @@ func (d *DatasourceCacheType) syncDatasources() error {
 		return nil
 	}

-	ds, err := models.DatasourceGetMap(d.ctx)
+	m, err := models.DatasourceGetMap(d.ctx)
 	if err != nil {
 		dumper.PutSyncRecord("datasources", start.Unix(), -1, -1, "failed to query records: "+err.Error())
 		return errors.WithMessage(err, "failed to call DatasourceGetMap")
 	}

-	d.Set(ds, stat.Total, stat.LastUpdated)
+	d.Set(m, stat.Total, stat.LastUpdated)

 	ms := time.Since(start).Milliseconds()
 	d.stats.GaugeCronDuration.WithLabelValues("sync_datasources").Set(float64(ms))
-	d.stats.GaugeSyncNumber.WithLabelValues("sync_datasources").Set(float64(len(ds)))
+	d.stats.GaugeSyncNumber.WithLabelValues("sync_datasources").Set(float64(len(m)))

-	logger.Infof("timer: sync datasources done, cost: %dms, number: %d", ms, len(ds))
-	dumper.PutSyncRecord("datasources", start.Unix(), ms, len(ds), "success")
+	logger.Infof("timer: sync datasources done, cost: %dms, number: %d", ms, len(m))
+	dumper.PutSyncRecord("datasources", start.Unix(), ms, len(m), "success")

 	return nil
 }
--- a/memsto/target_cache.go
+++ b/memsto/target_cache.go
@@ -160,9 +160,8 @@ func (tc *TargetCacheType) syncTargets() error {
 	}

 	m := make(map[string]*models.Target)
-
-	metaMap := tc.GetHostMetas(lst)
-	if len(metaMap) > 0 {
+	if tc.ctx.IsCenter {
+		metaMap := tc.GetHostMetas(lst)
 		for i := 0; i < len(lst); i++ {
 			if meta, ok := metaMap[lst[i].Ident]; ok {
 				lst[i].FillMeta(meta)
--- a/models/alert_cur_event.go
+++ b/models/alert_cur_event.go
@@ -67,10 +67,6 @@ type AlertCurEvent struct {
 	Claimant           string            `json:"claimant" gorm:"-"`
 	SubRuleId          int64             `json:"sub_rule_id" gorm:"-"`
 	ExtraInfo          []string          `json:"extra_info" gorm:"-"`
-	Target             *Target           `json:"target" gorm:"-"`
-	RecoverConfig      RecoverConfig     `json:"recover_config" gorm:"-"`
-	RuleHash           string            `json:"rule_hash" gorm:"-"`
-	ExtraInfoMap       []map[string]string `json:"extra_info_map" gorm:"-"`
 }

 func (e *AlertCurEvent) TableName() string {
@@ -309,12 +305,8 @@ func (e *AlertCurEvent) DB2FE() error {
 	e.CallbacksJSON = strings.Fields(e.Callbacks)
 	e.TagsJSON = strings.Split(e.Tags, ",,")
 	e.OriginalTagsJSON = strings.Split(e.OriginalTags, ",,")
-	if err := json.Unmarshal([]byte(e.Annotations), &e.AnnotationsJSON); err != nil {
-		return err
-	}
-	if err := json.Unmarshal([]byte(e.RuleConfig), &e.RuleConfigJson); err != nil {
-		return err
-	}
+	json.Unmarshal([]byte(e.Annotations), &e.AnnotationsJSON)
+	json.Unmarshal([]byte(e.RuleConfig), &e.RuleConfigJson)
 	return nil
 }

@@ -345,46 +337,13 @@ func (e *AlertCurEvent) DB2Mem() {
 			continue
 		}

-		arr := strings.SplitN(pair, "=", 2)
+		arr := strings.Split(pair, "=")
 		if len(arr) != 2 {
 			continue
 		}

 		e.TagsMap[arr[0]] = arr[1]
 	}
-
-	// 解决之前数据库中 FirstTriggerTime 为 0 的情况
-	if e.FirstTriggerTime == 0 {
-		e.FirstTriggerTime = e.TriggerTime
-	}
-}
-
-func FillRuleConfigTplName(ctx *ctx.Context, ruleConfig string) (interface{}, bool) {
-	var config RuleConfig
-	err := json.Unmarshal([]byte(ruleConfig), &config)
-	if err != nil {
-		logger.Warningf("failed to unmarshal rule config: %v", err)
-		return nil, false
-	}
-
-	if len(config.TaskTpls) == 0 {
-		return nil, false
-	}
-
-	for i := 0; i < len(config.TaskTpls); i++ {
-		tpl, err := TaskTplGetById(ctx, config.TaskTpls[i].TplId)
-		if err != nil {
-			logger.Warningf("failed to get task tpl by id:%d, %v", config.TaskTpls[i].TplId, err)
-			return nil, false
-		}
-
-		if tpl == nil {
-			logger.Warningf("task tpl not found by id:%d", config.TaskTpls[i].TplId)
-			return nil, false
-		}
-		config.TaskTpls[i].TplName = tpl.Title
-	}
-	return config, true
 }

 // for webui
@@ -422,8 +381,7 @@ func (e *AlertCurEvent) FillNotifyGroups(ctx *ctx.Context, cache map[int64]*User
 	return nil
 }

-func AlertCurEventTotal(ctx *ctx.Context, prods []string, bgids []int64, stime, etime int64,
-	severity int, dsIds []int64, cates []string, ruleId int64, query string) (int64, error) {
+func AlertCurEventTotal(ctx *ctx.Context, prods []string, bgids []int64, stime, etime int64, severity int, dsIds []int64, cates []string, query string) (int64, error) {
 	session := DB(ctx).Model(&AlertCurEvent{})
 	if stime != 0 && etime != 0 {
 		session = session.Where("trigger_time between ? and ?", stime, etime)
@@ -448,10 +406,6 @@ func AlertCurEventTotal(ctx *ctx.Context, prods []string, bgids []int64, stime,
 		session = session.Where("cate in ?", cates)
 	}

-	if ruleId > 0 {
-		session = session.Where("rule_id = ?", ruleId)
-	}
-
 	if query != "" {
 		arr := strings.Fields(query)
 		for i := 0; i < len(arr); i++ {
@@ -463,9 +417,7 @@ func AlertCurEventTotal(ctx *ctx.Context, prods []string, bgids []int64, stime,
 	return Count(session)
 }

-func AlertCurEventsGet(ctx *ctx.Context, prods []string, bgids []int64, stime, etime int64,
-	severity int, dsIds []int64, cates []string, ruleId int64, query string, limit, offset int) (
-	[]AlertCurEvent, error) {
+func AlertCurEventGets(ctx *ctx.Context, prods []string, bgids []int64, stime, etime int64, severity int, dsIds []int64, cates []string, query string, limit, offset int) ([]AlertCurEvent, error) {
 	session := DB(ctx).Model(&AlertCurEvent{})
 	if stime != 0 && etime != 0 {
 		session = session.Where("trigger_time between ? and ?", stime, etime)
@@ -490,10 +442,6 @@ func AlertCurEventsGet(ctx *ctx.Context, prods []string, bgids []int64, stime, e
 		session = session.Where("cate in ?", cates)
 	}

-	if ruleId > 0 {
-		session = session.Where("rule_id = ?", ruleId)
-	}
-
 	if query != "" {
 		arr := strings.Fields(query)
 		for i := 0; i < len(arr); i++ {
@@ -514,26 +462,6 @@ func AlertCurEventsGet(ctx *ctx.Context, prods []string, bgids []int64, stime, e
 	return lst, err
 }

-func AlertCurEventCountByRuleId(ctx *ctx.Context, rids []int64, stime, etime int64) map[int64]int64 {
-	type Row struct {
-		RuleId int64
-		Cnt    int64
-	}
-	var rows []Row
-	err := DB(ctx).Model(&AlertCurEvent{}).Select("rule_id, count(*) as cnt").
-		Where("trigger_time between ? and ?", stime, etime).Group("rule_id").Find(&rows).Error
-	if err != nil {
-		logger.Errorf("Failed to count group by rule_id: %v", err)
-		return nil
-	}
-
-	curEventTotalByRid := make(map[int64]int64, len(rids))
-	for _, r := range rows {
-		curEventTotalByRid[r.RuleId] = r.Cnt
-	}
-	return curEventTotalByRid
-}
-
 func AlertCurEventDel(ctx *ctx.Context, ids []int64) error {
 	if len(ids) == 0 {
 		return nil
@@ -543,11 +471,6 @@ func AlertCurEventDel(ctx *ctx.Context, ids []int64) error {
 }

 func AlertCurEventDelByHash(ctx *ctx.Context, hash string) error {
-	if !ctx.IsCenter {
-		_, err := poster.GetByUrls[string](ctx, "/v1/n9e/alert-cur-events-del-by-hash?hash="+hash)
-		return err
-	}
-
 	return DB(ctx).Where("hash = ?", hash).Delete(&AlertCurEvent{}).Error
 }

@@ -666,8 +589,8 @@ func AlertCurEventGetMap(ctx *ctx.Context, cluster string) (map[int64]map[string
 	return ret, nil
 }

-func (e *AlertCurEvent) UpdateFieldsMap(ctx *ctx.Context, fields map[string]interface{}) error {
-	return DB(ctx).Model(e).Updates(fields).Error
+func (m *AlertCurEvent) UpdateFieldsMap(ctx *ctx.Context, fields map[string]interface{}) error {
+	return DB(ctx).Model(m).Updates(fields).Error
 }

 func AlertCurEventUpgradeToV6(ctx *ctx.Context, dsm map[string]Datasource) error {
--- a/models/alert_his_event.go
+++ b/models/alert_his_event.go
@@ -117,13 +117,7 @@ func (e *AlertHisEvent) FillNotifyGroups(ctx *ctx.Context, cache map[int64]*User
 	return nil
 }

-// func (e *AlertHisEvent) FillTaskTplName(ctx *ctx.Context, cache map[int64]*UserGroup) error {
-
-// }
-
-func AlertHisEventTotal(
-	ctx *ctx.Context, prods []string, bgids []int64, stime, etime int64, severity int,
-	recovered int, dsIds []int64, cates []string, ruleId int64, query string) (int64, error) {
+func AlertHisEventTotal(ctx *ctx.Context, prods []string, bgids []int64, stime, etime int64, severity int, recovered int, dsIds []int64, cates []string, query string) (int64, error) {
 	session := DB(ctx).Model(&AlertHisEvent{}).Where("last_eval_time between ? and ?", stime, etime)

 	if len(prods) > 0 {
@@ -150,10 +144,6 @@ func AlertHisEventTotal(
 		session = session.Where("cate in ?", cates)
 	}

-	if ruleId > 0 {
-		session = session.Where("rule_id = ?", ruleId)
-	}
-
 	if query != "" {
 		arr := strings.Fields(query)
 		for i := 0; i < len(arr); i++ {
@@ -165,9 +155,7 @@ func AlertHisEventTotal(
 	return Count(session)
 }

-func AlertHisEventGets(ctx *ctx.Context, prods []string, bgids []int64, stime, etime int64,
-	severity int, recovered int, dsIds []int64, cates []string, ruleId int64, query string,
-	limit, offset int) ([]AlertHisEvent, error) {
+func AlertHisEventGets(ctx *ctx.Context, prods []string, bgids []int64, stime, etime int64, severity int, recovered int, dsIds []int64, cates []string, query string, limit, offset int) ([]AlertHisEvent, error) {
 	session := DB(ctx).Where("last_eval_time between ? and ?", stime, etime)

 	if len(prods) != 0 {
@@ -194,10 +182,6 @@ func AlertHisEventGets(ctx *ctx.Context, prods []string, bgids []int64, stime, e
 		session = session.Where("cate in ?", cates)
 	}

-	if ruleId > 0 {
-		session = session.Where("rule_id = ?", ruleId)
-	}
-
 	if query != "" {
 		arr := strings.Fields(query)
 		for i := 0; i < len(arr); i++ {
--- a/models/alert_mute.go
+++ b/models/alert_mute.go
@@ -108,7 +108,7 @@ func AlertMuteGet(ctx *ctx.Context, where string, args ...interface{}) (*AlertMu
 	return lst[0], err
 }

-func AlertMuteGets(ctx *ctx.Context, prods []string, bgid int64, disabled int, query string) (lst []AlertMute, err error) {
+func AlertMuteGets(ctx *ctx.Context, prods []string, bgid int64, query string) (lst []AlertMute, err error) {
 	session := DB(ctx)

 	if bgid != -1 {
@@ -119,14 +119,6 @@ func AlertMuteGets(ctx *ctx.Context, prods []string, bgid int64, disabled int, q
 		session = session.Where("prod in (?)", prods)
 	}

-	if disabled != -1 {
-		if disabled == 0 {
-			session = session.Where("disabled = 0")
-		} else {
-			session = session.Where("disabled = 1")
-		}
-	}
-
 	if query != "" {
 		arr := strings.Fields(query)
 		for i := 0; i < len(arr); i++ {
@@ -295,9 +287,16 @@ func AlertMuteStatistics(ctx *ctx.Context) (*Statistics, error) {
 		return s, err
 	}

+	// clean expired first
+	buf := int64(30)
+	err := DB(ctx).Where("etime < ? and mute_time_type = 0", time.Now().Unix()-buf).Delete(new(AlertMute)).Error
+	if err != nil {
+		return nil, err
+	}
+
 	session := DB(ctx).Model(&AlertMute{}).Select("count(*) as total", "max(update_at) as last_updated")

-	err := session.Find(&stats).Error
+	err = session.Find(&stats).Error
 	if err != nil {
 		return nil, err
 	}
@@ -309,7 +308,7 @@ func AlertMuteGetsAll(ctx *ctx.Context) ([]*AlertMute, error) {
 	// get my cluster's mutes
 	var lst []*AlertMute
 	if !ctx.IsCenter {
-		lst, err := poster.GetByUrls[[]*AlertMute](ctx, "/v1/n9e/alert-mutes?disabled=0")
+		lst, err := poster.GetByUrls[[]*AlertMute](ctx, "/v1/n9e/alert-mutes")
 		if err != nil {
 			return nil, err
 		}
@@ -319,7 +318,7 @@ func AlertMuteGetsAll(ctx *ctx.Context) ([]*AlertMute, error) {
 		return lst, err
 	}

-	session := DB(ctx).Model(&AlertMute{}).Where("disabled = 0")
+	session := DB(ctx).Model(&AlertMute{})

 	err := session.Find(&lst).Error
 	if err != nil {
--- a/models/alert_rule.go
+++ b/models/alert_rule.go
@@ -11,9 +11,7 @@ import (
 	"github.com/ccfos/nightingale/v6/pkg/poster"
 	"github.com/ccfos/nightingale/v6/pushgw/pconf"

-	"github.com/jinzhu/copier"
 	"github.com/pkg/errors"
-	"github.com/tidwall/match"
 	"github.com/toolkits/pkg/logger"
 	"github.com/toolkits/pkg/str"
 )
@@ -24,103 +22,66 @@ const (
 	HOST   = "host"
 	LOKI   = "loki"

-	PROMETHEUS    = "prometheus"
-	TDENGINE      = "tdengine"
-	ELASTICSEARCH = "elasticsearch"
-)
-
-const (
-	AlertRuleEnabled  = 0
-	AlertRuleDisabled = 1
-
-	AlertRuleEnableInGlobalBG = 0
-	AlertRuleEnableInOneBG    = 1
-
-	AlertRuleNotNotifyRecovered = 0
-	AlertRuleNotifyRecovered    = 1
-
-	AlertRuleNotifyRepeatStep60Min = 60
-
-	AlertRuleRecoverDuration0Sec = 0
+	PROMETHEUS = "prometheus"
+	TDENGINE   = "tdengine"
 )

 type AlertRule struct {
 	Id                    int64                  `json:"id" gorm:"primaryKey"`
-	GroupId               int64                  `json:"group_id"` // busi group id
-	Cate                  string                 `json:"cate"`     // alert rule cate (prometheus|elasticsearch)
-	DatasourceIds         string                 `json:"-" gorm:"datasource_ids"`
-	DatasourceIdsJson     []int64                `json:"datasource_ids,omitempty" gorm:"-"`                                      // alert rule list page use this field
-	DatasourceQueries     []DatasourceQuery      `json:"datasource_queries" gorm:"datasource_queries;type:text;serializer:json"` // datasource queries
-	Cluster               string                 `json:"cluster"`                                                                // take effect by clusters, seperated by space
-	Name                  string                 `json:"name"`                                                                   // rule name
-	Note                  string                 `json:"note"`                                                                   // will sent in notify
-	Prod                  string                 `json:"prod"`                                                                   // product empty means n9e
-	Algorithm             string                 `json:"algorithm"`                                                              // algorithm (''|holtwinters), empty means threshold
-	AlgoParams            string                 `json:"-" gorm:"algo_params"`                                                   // params algorithm need
-	AlgoParamsJson        interface{}            `json:"algo_params" gorm:"-"`                                                   // for fe
-	Delay                 int                    `json:"delay"`                                                                  // Time (in seconds) to delay evaluation
-	Severity              int                    `json:"severity"`                                                               // 1: Emergency 2: Warning 3: Notice
-	Severities            []int                  `json:"severities" gorm:"-"`                                                    // 1: Emergency 2: Warning 3: Notice
-	Disabled              int                    `json:"disabled"`                                                               // 0: enabled, 1: disabled
-	PromForDuration       int                    `json:"prom_for_duration"`                                                      // prometheus for, unit:s
-	PromQl                string                 `json:"prom_ql"`                                                                // just one ql
-	RuleConfig            string                 `json:"-" gorm:"rule_config"`                                                   // rule config
-	RuleConfigJson        interface{}            `json:"rule_config" gorm:"-"`                                                   // rule config for fe
-	EventRelabelConfig    []*pconf.RelabelConfig `json:"event_relabel_config" gorm:"-"`                                          // event relabel config
-	PromEvalInterval      int                    `json:"prom_eval_interval"`                                                     // unit:s
-	EnableStime           string                 `json:"-"`                                                                      // split by space: "00:00 10:00 12:00"
-	EnableStimeJSON       string                 `json:"enable_stime" gorm:"-"`                                                  // for fe
-	EnableStimesJSON      []string               `json:"enable_stimes" gorm:"-"`                                                 // for fe
-	EnableEtime           string                 `json:"-"`                                                                      // split by space: "00:00 10:00 12:00"
-	EnableEtimeJSON       string                 `json:"enable_etime" gorm:"-"`                                                  // for fe
-	EnableEtimesJSON      []string               `json:"enable_etimes" gorm:"-"`                                                 // for fe
-	EnableDaysOfWeek      string                 `json:"-"`                                                                      // eg: "0 1 2 3 4 5 6 ; 0 1 2"
-	EnableDaysOfWeekJSON  []string               `json:"enable_days_of_week" gorm:"-"`                                           // for fe
-	EnableDaysOfWeeksJSON [][]string             `json:"enable_days_of_weeks" gorm:"-"`                                          // for fe
-	EnableInBG            int                    `json:"enable_in_bg"`                                                           // 0: global 1: enable one busi-group
-	NotifyRecovered       int                    `json:"notify_recovered"`                                                       // whether notify when recovery
-	NotifyChannels        string                 `json:"-"`                                                                      // split by space: sms voice email dingtalk wecom
-	NotifyChannelsJSON    []string               `json:"notify_channels" gorm:"-"`                                               // for fe
-	NotifyGroups          string                 `json:"-"`                                                                      // split by space: 233 43
-	NotifyGroupsObj       []UserGroup            `json:"notify_groups_obj" gorm:"-"`                                             // for fe
-	NotifyGroupsJSON      []string               `json:"notify_groups" gorm:"-"`                                                 // for fe
-	NotifyRepeatStep      int                    `json:"notify_repeat_step"`                                                     // notify repeat interval, unit: min
-	NotifyMaxNumber       int                    `json:"notify_max_number"`                                                      // notify: max number
-	RecoverDuration       int64                  `json:"recover_duration"`                                                       // unit: s
-	Callbacks             string                 `json:"-"`                                                                      // split by space: http://a.com/api/x http://a.com/api/y'
-	CallbacksJSON         []string               `json:"callbacks" gorm:"-"`                                                     // for fe
-	RunbookUrl            string                 `json:"runbook_url"`                                                            // sop url
-	AppendTags            string                 `json:"-"`                                                                      // split by space: service=n9e mod=api
-	AppendTagsJSON        []string               `json:"append_tags" gorm:"-"`                                                   // for fe
-	Annotations           string                 `json:"-"`                                                                      //
-	AnnotationsJSON       map[string]string      `json:"annotations" gorm:"-"`                                                   // for fe
-	ExtraConfig           string                 `json:"-" gorm:"extra_config"`                                                  // extra config
-	ExtraConfigJSON       interface{}            `json:"extra_config" gorm:"-"`                                                  // for fe
+	GroupId               int64                  `json:"group_id"`                      // busi group id
+	Cate                  string                 `json:"cate"`                          // alert rule cate (prometheus|elasticsearch)
+	DatasourceIds         string                 `json:"-" gorm:"datasource_ids"`       // datasource ids
+	DatasourceIdsJson     []int64                `json:"datasource_ids" gorm:"-"`       // for fe
+	Cluster               string                 `json:"cluster"`                       // take effect by clusters, seperated by space
+	Name                  string                 `json:"name"`                          // rule name
+	Note                  string                 `json:"note"`                          // will sent in notify
+	Prod                  string                 `json:"prod"`                          // product empty means n9e
+	Algorithm             string                 `json:"algorithm"`                     // algorithm (''|holtwinters), empty means threshold
+	AlgoParams            string                 `json:"-" gorm:"algo_params"`          // params algorithm need
+	AlgoParamsJson        interface{}            `json:"algo_params" gorm:"-"`          // for fe
+	Delay                 int                    `json:"delay"`                         // Time (in seconds) to delay evaluation
+	Severity              int                    `json:"severity"`                      // 1: Emergency 2: Warning 3: Notice
+	Severities            []int                  `json:"severities" gorm:"-"`           // 1: Emergency 2: Warning 3: Notice
+	Disabled              int                    `json:"disabled"`                      // 0: enabled, 1: disabled
+	PromForDuration       int                    `json:"prom_for_duration"`             // prometheus for, unit:s
+	PromQl                string                 `json:"prom_ql"`                       // just one ql
+	RuleConfig            string                 `json:"-" gorm:"rule_config"`          // rule config
+	RuleConfigJson        interface{}            `json:"rule_config" gorm:"-"`          // rule config for fe
+	EventRelabelConfig    []*pconf.RelabelConfig `json:"event_relabel_config" gorm:"-"` // event relabel config
+	PromEvalInterval      int                    `json:"prom_eval_interval"`            // unit:s
+	EnableStime           string                 `json:"-"`                             // split by space: "00:00 10:00 12:00"
+	EnableStimeJSON       string                 `json:"enable_stime" gorm:"-"`         // for fe
+	EnableStimesJSON      []string               `json:"enable_stimes" gorm:"-"`        // for fe
+	EnableEtime           string                 `json:"-"`                             // split by space: "00:00 10:00 12:00"
+	EnableEtimeJSON       string                 `json:"enable_etime" gorm:"-"`         // for fe
+	EnableEtimesJSON      []string               `json:"enable_etimes" gorm:"-"`        // for fe
+	EnableDaysOfWeek      string                 `json:"-"`                             // eg: "0 1 2 3 4 5 6 ; 0 1 2"
+	EnableDaysOfWeekJSON  []string               `json:"enable_days_of_week" gorm:"-"`  // for fe
+	EnableDaysOfWeeksJSON [][]string             `json:"enable_days_of_weeks" gorm:"-"` // for fe
+	EnableInBG            int                    `json:"enable_in_bg"`                  // 0: global 1: enable one busi-group
+	NotifyRecovered       int                    `json:"notify_recovered"`              // whether notify when recovery
+	NotifyChannels        string                 `json:"-"`                             // split by space: sms voice email dingtalk wecom
+	NotifyChannelsJSON    []string               `json:"notify_channels" gorm:"-"`      // for fe
+	NotifyGroups          string                 `json:"-"`                             // split by space: 233 43
+	NotifyGroupsObj       []UserGroup            `json:"notify_groups_obj" gorm:"-"`    // for fe
+	NotifyGroupsJSON      []string               `json:"notify_groups" gorm:"-"`        // for fe
+	NotifyRepeatStep      int                    `json:"notify_repeat_step"`            // notify repeat interval, unit: min
+	NotifyMaxNumber       int                    `json:"notify_max_number"`             // notify: max number
+	RecoverDuration       int64                  `json:"recover_duration"`              // unit: s
+	Callbacks             string                 `json:"-"`                             // split by space: http://a.com/api/x http://a.com/api/y'
+	CallbacksJSON         []string               `json:"callbacks" gorm:"-"`            // for fe
+	RunbookUrl            string                 `json:"runbook_url"`                   // sop url
+	AppendTags            string                 `json:"-"`                             // split by space: service=n9e mod=api
+	AppendTagsJSON        []string               `json:"append_tags" gorm:"-"`          // for fe
+	Annotations           string                 `json:"-"`                             //
+	AnnotationsJSON       map[string]string      `json:"annotations" gorm:"-"`          // for fe
+	ExtraConfig           string                 `json:"-" gorm:"extra_config"`         // extra config
+	ExtraConfigJSON       interface{}            `json:"extra_config" gorm:"-"`         // for fe
 	CreateAt              int64                  `json:"create_at"`
 	CreateBy              string                 `json:"create_by"`
 	UpdateAt              int64                  `json:"update_at"`
 	UpdateBy              string                 `json:"update_by"`
 	UUID                  int64                  `json:"uuid" gorm:"-"` // tpl identifier
-	CurEventCount         int64                  `json:"cur_event_count" gorm:"-"`
-	UpdateByNickname      string                 `json:"update_by_nickname" gorm:"-"` // for fe
-}
-
-type Tpl struct {
-	TplId   int64    `json:"tpl_id"`
-	TplName string   `json:"tpl_name"`
-	Host    []string `json:"host"`
-}
-
-type RuleConfig struct {
-	Version            string                 `json:"version,omitempty"`
-	EventRelabelConfig []*pconf.RelabelConfig `json:"event_relabel_config,omitempty"`
-	TaskTpls           []*Tpl                 `json:"task_tpls,omitempty"`
-	Queries            interface{}            `json:"queries,omitempty"`
-	Triggers           []Trigger              `json:"triggers,omitempty"`
-	Inhibit            bool                   `json:"inhibit,omitempty"`
-	PromQl             string                 `json:"prom_ql,omitempty"`
-	Severity           int                    `json:"severity,omitempty"`
-	AlgoParams         interface{}            `json:"algo_params,omitempty"`
 }

 type PromRuleConfig struct {
@@ -131,19 +92,6 @@ type PromRuleConfig struct {
 	AlgoParams interface{} `json:"algo_params"`
 }

-type RecoverJudge int
-
-const (
-	Origin             RecoverJudge = 0
-	RecoverWithoutData RecoverJudge = 1
-	RecoverOnCondition RecoverJudge = 2
-)
-
-type RecoverConfig struct {
-	JudgeType  RecoverJudge `json:"judge_type"`
-	RecoverExp string       `json:"recover_exp"`
-}
-
 type HostRuleConfig struct {
 	Queries  []HostQuery   `json:"queries"`
 	Triggers []HostTrigger `json:"triggers"`
@@ -151,9 +99,8 @@ type HostRuleConfig struct {
 }

 type PromQuery struct {
-	PromQl        string        `json:"prom_ql"`
-	Severity      int           `json:"severity"`
-	RecoverConfig RecoverConfig `json:"recover_config"`
+	PromQl   string `json:"prom_ql"`
+	Severity int    `json:"severity"`
 }

 type HostTrigger struct {
@@ -175,145 +122,6 @@ type Trigger struct {
 	Mode        int         `json:"mode"`
 	Exp         string      `json:"exp"`
 	Severity    int         `json:"severity"`
-
-	Type          string        `json:"type,omitempty"`
-	Duration      int           `json:"duration,omitempty"`
-	Percent       int           `json:"percent,omitempty"`
-	Joins         []Join        `json:"joins"`
-	JoinRef       string        `json:"join_ref"`
-	RecoverConfig RecoverConfig `json:"recover_config"`
-}
-
-type Join struct {
-	JoinType string   `json:"join_type"`
-	Ref      string   `json:"ref"`
-	On       []string `json:"on"`
-}
-
-var DataSourceQueryAll = DatasourceQuery{
-	MatchType: 2,
-	Op:        "in",
-	Values:    []interface{}{DatasourceIdAll},
-}
-
-type DatasourceQuery struct {
-	MatchType int           `json:"match_type"`
-	Op        string        `json:"op"`
-	Values    []interface{} `json:"values"`
-}
-
-// GetDatasourceIDsByDatasourceQueries 从 datasourceQueries 中获取 datasourceIDs
-// 查询分为精确\模糊匹配，逻辑有 in 与 not in
-// idMap 为当前 datasourceQueries 对应的数据源全集
-// nameMap 为所有 datasource 的 name 到 id 的映射，用于名称的模糊匹配
-func GetDatasourceIDsByDatasourceQueries[T any](datasourceQueries []DatasourceQuery, idMap map[int64]T, nameMap map[string]int64) []int64 {
-	if len(datasourceQueries) == 0 {
-		return nil
-	}
-
-	// 所有 query 取交集，初始集合为全集
-	curIDs := make(map[int64]struct{})
-	for id, _ := range idMap {
-		curIDs[id] = struct{}{}
-	}
-
-	for i := range datasourceQueries {
-		// 每次 query 都在 curIDs 的基础上得到 dsIDs
-		dsIDs := make(map[int64]struct{})
-		q := datasourceQueries[i]
-		if q.MatchType == 0 {
-			// 精确匹配转为 id 匹配
-			idValues := make([]int64, 0, len(q.Values))
-			for v := range q.Values {
-				var val int64
-				switch v := q.Values[v].(type) {
-				case int64:
-					val = v
-				case int:
-					val = int64(v)
-				case float64:
-					val = int64(v)
-				case float32:
-					val = int64(v)
-				case int8:
-					val = int64(v)
-				case int16:
-					val = int64(v)
-				case int32:
-					val = int64(v)
-				default:
-					continue
-				}
-				idValues = append(idValues, int64(val))
-			}
-
-			if q.Op == "in" {
-				if len(idValues) == 1 && idValues[0] == DatasourceIdAll {
-					for id := range curIDs {
-						dsIDs[id] = struct{}{}
-					}
-				} else {
-					for idx := range idValues {
-						if _, exist := curIDs[idValues[idx]]; exist {
-							dsIDs[idValues[idx]] = struct{}{}
-						}
-					}
-				}
-			} else if q.Op == "not in" {
-				for idx := range idValues {
-					delete(curIDs, idValues[idx])
-				}
-				dsIDs = curIDs
-			}
-		} else if q.MatchType == 1 {
-			// 模糊匹配使用 datasource name
-			if q.Op == "in" {
-				for dsName, dsID := range nameMap {
-					if _, exist := curIDs[dsID]; exist {
-						for idx := range q.Values {
-							if _, ok := q.Values[idx].(string); !ok {
-								continue
-							}
-
-							if match.Match(dsName, q.Values[idx].(string)) {
-								dsIDs[nameMap[dsName]] = struct{}{}
-							}
-						}
-					}
-				}
-			} else if q.Op == "not in" {
-				for dsName, _ := range nameMap {
-					for idx := range q.Values {
-						if _, ok := q.Values[idx].(string); !ok {
-							continue
-						}
-
-						if match.Match(dsName, q.Values[idx].(string)) {
-							delete(curIDs, nameMap[dsName])
-						}
-					}
-				}
-				dsIDs = curIDs
-			}
-		} else if q.MatchType == 2 {
-			// 全部数据源
-			for id := range curIDs {
-				dsIDs[id] = struct{}{}
-			}
-		}
-
-		curIDs = dsIDs
-		if len(curIDs) == 0 {
-			break
-		}
-	}
-
-	dsIds := make([]int64, 0, len(curIDs))
-	for c := range curIDs {
-		dsIds = append(dsIds, c)
-	}
-
-	return dsIds
 }

 func GetHostsQuery(queries []HostQuery) []map[string]interface{} {
@@ -324,10 +132,9 @@ func GetHostsQuery(queries []HostQuery) []map[string]interface{} {
 		case "group_ids":
 			ids := ParseInt64(q.Values)
 			if q.Op == "==" {
-				m["target_busi_group.group_id in (?)"] = ids
+				m["group_id in (?)"] = ids
 			} else {
-				m["target.ident not in (select target_ident "+
-					"from target_busi_group where group_id in (?))"] = ids
+				m["group_id not in (?)"] = ids
 			}
 		case "tags":
 			lst := []string{}
@@ -341,14 +148,12 @@ func GetHostsQuery(queries []HostQuery) []map[string]interface{} {
 				blank := " "
 				for _, tag := range lst {
 					m["tags like ?"+blank] = "%" + tag + "%"
-					m["host_tags like ?"+blank] = "%" + tag + "%"
 					blank += " "
 				}
 			} else {
 				blank := " "
 				for _, tag := range lst {
 					m["tags not like ?"+blank] = "%" + tag + "%"
-					m["host_tags not like ?"+blank] = "%" + tag + "%"
 					blank += " "
 				}
 			}
@@ -414,9 +219,9 @@ func (ar *AlertRule) Verify() error {
 		return fmt.Errorf("GroupId(%d) invalid", ar.GroupId)
 	}

-	//if IsAllDatasource(ar.DatasourceIdsJson) {
-	//	ar.DatasourceIdsJson = []int64{0}
-	//}
+	if IsAllDatasource(ar.DatasourceIdsJson) {
+		ar.DatasourceIdsJson = []int64{0}
+	}

 	if str.Dangerous(ar.Name) {
 		return errors.New("Name has invalid characters")
@@ -470,7 +275,7 @@ func (ar *AlertRule) Add(ctx *ctx.Context) error {
 		return err
 	}

-	exists, err := AlertRuleExists(ctx, 0, ar.GroupId, ar.Name)
+	exists, err := AlertRuleExists(ctx, 0, ar.GroupId, ar.DatasourceIdsJson, ar.Name)
 	if err != nil {
 		return err
 	}
@@ -488,7 +293,7 @@ func (ar *AlertRule) Add(ctx *ctx.Context) error {

 func (ar *AlertRule) Update(ctx *ctx.Context, arf AlertRule) error {
 	if ar.Name != arf.Name {
-		exists, err := AlertRuleExists(ctx, ar.Id, ar.GroupId, arf.Name)
+		exists, err := AlertRuleExists(ctx, ar.Id, ar.GroupId, ar.DatasourceIdsJson, arf.Name)
 		if err != nil {
 			return err
 		}
@@ -617,19 +422,6 @@ func (ar *AlertRule) UpdateColumn(ctx *ctx.Context, column string, value interfa
 		return DB(ctx).Model(ar).UpdateColumn("annotations", string(b)).Error
 	}

-	if column == "annotations" {
-		newAnnotations := value.(map[string]interface{})
-		ar.AnnotationsJSON = make(map[string]string)
-		for k, v := range newAnnotations {
-			ar.AnnotationsJSON[k] = v.(string)
-		}
-		b, err := json.Marshal(ar.AnnotationsJSON)
-		if err != nil {
-			return err
-		}
-		return DB(ctx).Model(ar).UpdateColumn("annotations", string(b)).Error
-	}
-
 	return DB(ctx).Model(ar).UpdateColumn(column, value).Error
 }

@@ -637,30 +429,11 @@ func (ar *AlertRule) UpdateFieldsMap(ctx *ctx.Context, fields map[string]interfa
 	return DB(ctx).Model(ar).Updates(fields).Error
 }

-func (ar *AlertRule) FillDatasourceQueries() error {
-	// 兼容旧逻辑，将 datasourceIds 转换为 datasourceQueries
-	if len(ar.DatasourceQueries) == 0 && len(ar.DatasourceIds) != 0 {
-		datasourceQueries := DatasourceQuery{
-			MatchType: 0,
-			Op:        "in",
-			Values:    make([]interface{}, 0),
-		}
-
-		var values []int
-		if ar.DatasourceIds != "" {
-			json.Unmarshal([]byte(ar.DatasourceIds), &values)
-
-		}
-
-		for i := range values {
-			if values[i] == 0 {
-				// 0 表示所有数据源
-				datasourceQueries.MatchType = 2
-				break
-			}
-			datasourceQueries.Values = append(datasourceQueries.Values, values[i])
-		}
-		ar.DatasourceQueries = []DatasourceQuery{datasourceQueries}
+// for v5 rule
+func (ar *AlertRule) FillDatasourceIds() error {
+	if ar.DatasourceIds != "" {
+		json.Unmarshal([]byte(ar.DatasourceIds), &ar.DatasourceIdsJson)
+		return nil
 	}
 	return nil
 }
@@ -779,6 +552,14 @@ func (ar *AlertRule) FE2DB() error {
 	}
 	ar.AlgoParams = string(algoParamsByte)

+	if len(ar.DatasourceIdsJson) > 0 {
+		idsByte, err := json.Marshal(ar.DatasourceIdsJson)
+		if err != nil {
+			return fmt.Errorf("marshal datasource_ids err:%v", err)
+		}
+		ar.DatasourceIds = string(idsByte)
+	}
+
 	if ar.RuleConfigJson == nil {
 		query := PromQuery{
 			PromQl:   ar.PromQl,
@@ -850,12 +631,8 @@ func (ar *AlertRule) DB2FE() error {
 	json.Unmarshal([]byte(ar.RuleConfig), &ruleConfig)
 	ar.EventRelabelConfig = ruleConfig.EventRelabelConfig

-	err := ar.FillDatasourceQueries()
-	if err != nil {
-		return err
-	}
-
-	return nil
+	err := ar.FillDatasourceIds()
+	return err
 }

 func AlertRuleDels(ctx *ctx.Context, ids []int64, bgid ...int64) error {
@@ -869,7 +646,7 @@ func AlertRuleDels(ctx *ctx.Context, ids []int64, bgid ...int64) error {
 			return ret.Error
 		}

-		// 说明确实删掉了，把相关的活跃告警也删了，这些告警永远都不会恢复了，而且策略都没了，说明没<EFBFBD><EFBFBD><EFBFBD>关心了
+		// 说明确实删掉了，把相关的活跃告警也删了，这些告警永远都不会恢复了，而且策略都没了，说明没人关心了
 		if ret.RowsAffected > 0 {
 			DB(ctx).Where("rule_id = ?", ids[i]).Delete(new(AlertCurEvent))
 		}
@@ -878,7 +655,7 @@ func AlertRuleDels(ctx *ctx.Context, ids []int64, bgid ...int64) error {
 	return nil
 }

-func AlertRuleExists(ctx *ctx.Context, id, groupId int64, name string) (bool, error) {
+func AlertRuleExists(ctx *ctx.Context, id, groupId int64, datasourceIds []int64, name string) (bool, error) {
 	session := DB(ctx).Where("id <> ? and group_id = ? and name = ?", id, groupId, name)

 	var lst []AlertRule
@@ -890,28 +667,18 @@ func AlertRuleExists(ctx *ctx.Context, id, groupId int64, name string) (bool, er
 		return false, nil
 	}

+	// match cluster
+	for _, r := range lst {
+		r.FillDatasourceIds()
+		for _, id := range r.DatasourceIdsJson {
+			if MatchDatasource(datasourceIds, id) {
+				return true, nil
+			}
+		}
+	}
 	return false, nil
 }

-func GetAlertRuleIdsByTaskId(ctx *ctx.Context, taskId int64) ([]int64, error) {
-	tpl := "%\"tpl_id\":" + fmt.Sprint(taskId) + "}%"
-	cb := "{ibex}/" + fmt.Sprint(taskId) + "%"
-	session := DB(ctx).Where("rule_config like ? or callbacks like ?", tpl, cb)
-
-	var lst []AlertRule
-	var ids []int64
-	err := session.Find(&lst).Error
-	if err != nil || len(lst) == 0 {
-		return ids, err
-	}
-
-	for i := 0; i < len(lst); i++ {
-		ids = append(ids, lst[i].Id)
-	}
-
-	return ids, nil
-}
-
 func AlertRuleGets(ctx *ctx.Context, groupId int64) ([]AlertRule, error) {
 	session := DB(ctx).Where("group_id=?", groupId).Order("name")

@@ -973,8 +740,7 @@ func AlertRuleGetsAll(ctx *ctx.Context) ([]*AlertRule, error) {
 	return lst, nil
 }

-func AlertRulesGetsBy(ctx *ctx.Context, prods []string, query, algorithm, cluster string,
-	cates []string, disabled int) ([]*AlertRule, error) {
+func AlertRulesGetsBy(ctx *ctx.Context, prods []string, query, algorithm, cluster string, cates []string, disabled int) ([]*AlertRule, error) {
 	session := DB(ctx)

 	if len(prods) > 0 {
@@ -1245,23 +1011,3 @@ func GetTargetsOfHostAlertRule(ctx *ctx.Context, engineName string) (map[string]

 	return m, nil
 }
-
-func (ar *AlertRule) Copy(ctx *ctx.Context) (*AlertRule, error) {
-	newAr := &AlertRule{}
-	err := copier.Copy(newAr, ar)
-	if err != nil {
-		logger.Errorf("copy alert rule failed, %v", err)
-	}
-	return newAr, err
-}
-
-func InsertAlertRule(ctx *ctx.Context, ars []*AlertRule) error {
-	if len(ars) == 0 {
-		return nil
-	}
-	return DB(ctx).Create(ars).Error
-}
-
-func (ar *AlertRule) Hash() string {
-	return str.MD5(fmt.Sprintf("%d_%s_%s", ar.Id, ar.DatasourceIds, ar.RuleConfig))
-}
--- a/models/board.go
+++ b/models/board.go
@@ -286,53 +286,3 @@ func BoardSetHide(ctx *ctx.Context, ids []int64) error {
 		return nil
 	})
 }
-
-func BoardGetsByBids(ctx *ctx.Context, bids []int64) ([]map[string]interface{}, error) {
-	var boards []Board
-	err := DB(ctx).Where("id IN ?", bids).Find(&boards).Error
-	if err != nil {
-		return nil, err
-	}
-
-	// 收集所有唯一的 group_id
-	groupIDs := make([]int64, 0)
-	groupIDSet := make(map[int64]struct{})
-	for _, board := range boards {
-		if _, exists := groupIDSet[board.GroupId]; !exists {
-			groupIDs = append(groupIDs, board.GroupId)
-			groupIDSet[board.GroupId] = struct{}{}
-		}
-	}
-
-	// 一次性查询所有需要的 BusiGroup
-	var busiGroups []BusiGroup
-	err = DB(ctx).Where("id IN ?", groupIDs).Find(&busiGroups).Error
-	if err != nil {
-		return nil, err
-	}
-
-	// 创建 group_id 到 BusiGroup 的映射
-	groupMap := make(map[int64]BusiGroup)
-	for _, bg := range busiGroups {
-		groupMap[bg.Id] = bg
-	}
-
-	result := make([]map[string]interface{}, 0, len(boards))
-	for _, board := range boards {
-		busiGroup, exists := groupMap[board.GroupId]
-		if !exists {
-			// 处理找不到对应 BusiGroup 的情况
-			continue
-		}
-
-		item := map[string]interface{}{
-			"busi_group_name": busiGroup.Name,
-			"busi_group_id":   busiGroup.Id,
-			"board_id":        board.Id,
-			"board_name":      board.Name,
-		}
-		result = append(result, item)
-	}
-
-	return result, nil
-}
--- a/models/builtin_component.go
+++ b/models/builtin_component.go
@@ -11,7 +11,7 @@ import (
 // BuiltinComponent represents a builtin component along with its metadata.
 type BuiltinComponent struct {
 	ID        uint64 `json:"id" gorm:"primaryKey;type:bigint;autoIncrement;comment:'unique identifier'"`
-	Ident     string `json:"ident" gorm:"type:varchar(191);not null;uniqueIndex:idx_ident,sort:asc;comment:'identifier of component'"`
+	Ident     string `json:"ident" gorm:"type:varchar(191);not null;index:idx_ident,sort:asc;comment:'identifier of component'"`
 	Logo      string `json:"logo" gorm:"type:varchar(191);not null;comment:'logo of component'"`
 	Readme    string `json:"readme" gorm:"type:text;not null;comment:'readme of component'"`
 	CreatedAt int64  `json:"created_at" gorm:"type:bigint;not null;default:0;comment:'create time'"`
--- a/models/builtin_metrics.go
+++ b/models/builtin_metrics.go
@@ -2,7 +2,6 @@ package models

 import (
 	"errors"
-	"fmt"
 	"strings"
 	"time"

@@ -218,10 +217,3 @@ func BuiltinMetricCollectors(ctx *ctx.Context, lang, typ, query string) ([]strin
 	err := session.Select("distinct(collector)").Pluck("collector", &collectors).Error
 	return collectors, err
 }
-
-func BuiltinMetricBatchUpdateColumn(ctx *ctx.Context, col, old, new, updatedBy string) error {
-	if old == new {
-		return nil
-	}
-	return DB(ctx).Model(&BuiltinMetric{}).Where(fmt.Sprintf("%s = ?", col), old).Updates(map[string]interface{}{col: new, "updated_by": updatedBy}).Error
-}
--- a/models/builtin_payload.go
+++ b/models/builtin_payload.go
@@ -9,19 +9,18 @@ import (
 )

 type BuiltinPayload struct {
-	ID          int64  `json:"id" gorm:"primaryKey;type:bigint;autoIncrement;comment:'unique identifier'"`
-	Type        string `json:"type" gorm:"type:varchar(191);not null;index:idx_type,sort:asc;comment:'type of payload'"`                // Alert Dashboard Collet
-	Component   string `json:"component" gorm:"type:varchar(191);not null;index:idx_component,sort:asc;comment:'component of payload'"` //
-	ComponentID uint64 `json:"component_id" gorm:"type:bigint;index:idx_component,sort:asc;comment:'component_id of payload'"`          // ComponentID which the payload belongs to
-	Cate        string `json:"cate" gorm:"type:varchar(191);not null;comment:'category of payload'"`                                    // categraf_v1 telegraf_v1
-	Name        string `json:"name" gorm:"type:varchar(191);not null;index:idx_buildinpayload_name,sort:asc;comment:'name of payload'"` //
-	Tags        string `json:"tags" gorm:"type:varchar(191);not null;default:'';comment:'tags of payload'"`                             // {"host":"
-	Content     string `json:"content" gorm:"type:longtext;not null;comment:'content of payload'"`
-	UUID        int64  `json:"uuid" gorm:"type:bigint;not null;index:idx_uuid;comment:'uuid of payload'"`
-	CreatedAt   int64  `json:"created_at" gorm:"type:bigint;not null;default:0;comment:'create time'"`
-	CreatedBy   string `json:"created_by" gorm:"type:varchar(191);not null;default:'';comment:'creator'"`
-	UpdatedAt   int64  `json:"updated_at" gorm:"type:bigint;not null;default:0;comment:'update time'"`
-	UpdatedBy   string `json:"updated_by" gorm:"type:varchar(191);not null;default:'';comment:'updater'"`
+	ID        int64  `json:"id" gorm:"primaryKey;type:bigint;autoIncrement;comment:'unique identifier'"`
+	Type      string `json:"type" gorm:"type:varchar(191);not null;index:idx_type,sort:asc;comment:'type of payload'"`                // Alert Dashboard Collet
+	Component string `json:"component" gorm:"type:varchar(191);not null;index:idx_component,sort:asc;comment:'component of payload'"` // Host MySQL Redis
+	Cate      string `json:"cate" gorm:"type:varchar(191);not null;comment:'category of payload'"`                                    // categraf_v1 telegraf_v1
+	Name      string `json:"name" gorm:"type:varchar(191);not null;index:idx_buildinpayload_name,sort:asc;comment:'name of payload'"`                //
+	Tags      string `json:"tags" gorm:"type:varchar(191);not null;default:'';comment:'tags of payload'"`                             // {"host":"
+	Content   string `json:"content" gorm:"type:longtext;not null;comment:'content of payload'"`
+	UUID      int64  `json:"uuid" gorm:"type:bigint;not null;index:idx_uuid;comment:'uuid of payload'"`
+	CreatedAt int64  `json:"created_at" gorm:"type:bigint;not null;default:0;comment:'create time'"`
+	CreatedBy string `json:"created_by" gorm:"type:varchar(191);not null;default:'';comment:'creator'"`
+	UpdatedAt int64  `json:"updated_at" gorm:"type:bigint;not null;default:0;comment:'update time'"`
+	UpdatedBy string `json:"updated_by" gorm:"type:varchar(191);not null;default:'';comment:'updater'"`
 }

 func (bp *BuiltinPayload) TableName() string {
@@ -34,8 +33,9 @@ func (bp *BuiltinPayload) Verify() error {
 		return errors.New("type is blank")
 	}

-	if bp.ComponentID == 0 {
-		return errors.New("component_id is blank")
+	bp.Component = strings.TrimSpace(bp.Component)
+	if bp.Component == "" {
+		return errors.New("component is blank")
 	}

 	if bp.Name == "" {
@@ -47,7 +47,7 @@ func (bp *BuiltinPayload) Verify() error {

 func BuiltinPayloadExists(ctx *ctx.Context, bp *BuiltinPayload) (bool, error) {
 	var count int64
-	err := DB(ctx).Model(bp).Where("type = ? AND component_id = ? AND name = ? AND cate = ?", bp.Type, bp.ComponentID, bp.Name, bp.Cate).Count(&count).Error
+	err := DB(ctx).Model(bp).Where("type = ? AND component = ? AND name = ? AND cate = ?", bp.Type, bp.Component, bp.Name, bp.Cate).Count(&count).Error
 	if err != nil {
 		return false, err
 	}
@@ -78,7 +78,7 @@ func (bp *BuiltinPayload) Update(ctx *ctx.Context, req BuiltinPayload) error {
 		return err
 	}

-	if bp.Type != req.Type || bp.ComponentID != req.ComponentID || bp.Name != req.Name {
+	if bp.Type != req.Type || bp.Component != req.Component || bp.Name != req.Name {
 		exists, err := BuiltinPayloadExists(ctx, &req)
 		if err != nil {
 			return err
@@ -117,13 +117,13 @@ func BuiltinPayloadGet(ctx *ctx.Context, where string, args ...interface{}) (*Bu
 	return &bp, nil
 }

-func BuiltinPayloadGets(ctx *ctx.Context, componentId uint64, typ, cate, query string) ([]*BuiltinPayload, error) {
+func BuiltinPayloadGets(ctx *ctx.Context, typ, component, cate, query string) ([]*BuiltinPayload, error) {
 	session := DB(ctx)
 	if typ != "" {
 		session = session.Where("type = ?", typ)
 	}
-	if componentId != 0 {
-		session = session.Where("component_id = ?", componentId)
+	if component != "" {
+		session = session.Where("component = ?", component)
 	}

 	if cate != "" {
@@ -144,9 +144,9 @@ func BuiltinPayloadGets(ctx *ctx.Context, componentId uint64, typ, cate, query s
 }

 // get cates of BuiltinPayload by type and component, return []string
-func BuiltinPayloadCates(ctx *ctx.Context, typ string, componentID uint64) ([]string, error) {
+func BuiltinPayloadCates(ctx *ctx.Context, typ, component string) ([]string, error) {
 	var cates []string
-	err := DB(ctx).Model(new(BuiltinPayload)).Where("type = ? and component_id = ?", typ, componentID).Distinct("cate").Pluck("cate", &cates).Error
+	err := DB(ctx).Model(new(BuiltinPayload)).Where("type = ? and component = ?", typ, component).Distinct("cate").Pluck("cate", &cates).Error
 	return cates, err
 }

@@ -163,37 +163,3 @@ func BuiltinPayloadComponents(ctx *ctx.Context, typ, cate string) (string, error
 	}
 	return components[0], nil
 }
-
-// InitBuiltinPayloads 兼容新旧 BuiltinPayload 格式
-func InitBuiltinPayloads(ctx *ctx.Context) error {
-	var lst []*BuiltinPayload
-
-	components, err := BuiltinComponentGets(ctx, "")
-	if err != nil {
-		return err
-	}
-
-	identToId := make(map[string]uint64)
-	for _, component := range components {
-		identToId[component.Ident] = component.ID
-	}
-
-	err = DB(ctx).Where("component_id = 0 or component_id is NULL").Find(&lst).Error
-	if err != nil {
-		return err
-	}
-
-	for _, bp := range lst {
-		componentId, ok := identToId[bp.Component]
-		if !ok {
-			continue
-		}
-		bp.ComponentID = componentId
-	}
-
-	if len(lst) == 0 {
-		return nil
-	}
-
-	return DB(ctx).Save(&lst).Error
-}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
ning	b057940134	add stats	2024-08-01 15:18:49 +08:00
ning	4500c4aba8	refactor callback	2024-08-01 15:12:03 +08:00
710leo	726e994d58	merge main	2024-07-30 15:58:31 +08:00
710leo	71c4c24f00	code refactor	2024-07-30 15:57:15 +08:00
710leo	d14a834149	webhook send batch	2024-07-30 15:47:25 +08:00
ning	5f895552a9	done	2024-07-26 12:54:28 +08:00
ning	1e3f62b92f	refactor	2024-07-25 17:46:19 +08:00