fix : add offset to es date_histogam (#2757 )

refactor: change eval for duration check
2026-03-03 14:38:55 +00:00 · 2025-07-03 19:42:33 +08:00 · 2025-06-30 15:11:34 +08:00 · 2025-06-30 15:11:17 +08:00 · 2025-06-17 20:45:16 +08:00
312 changed files with 3786 additions and 30346 deletions
--- a/.github/workflows/issue-translator.yml
+++ b/.github/workflows/issue-translator.yml
@@ -1,22 +0,0 @@
-name: 'Issue Translator'
-
-on:
-  issues:
-    types: [opened]
-
-jobs:
-  translate:
-    runs-on: ubuntu-latest
-    permissions:
-      issues: write
-      contents: read
-    steps:
-      - name: Translate Issues
-        uses: usthe/issues-translate-action@v2.7
-        with:
-          # 是否翻译 issue 标题
-          IS_MODIFY_TITLE: true
-          # GitHub Token
-          BOT_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          # 自定义翻译标注（可选）
-          # CUSTOM_BOT_NOTE: "Translation by bot"
--- a/.gitignore
+++ b/.gitignore
@@ -58,10 +58,6 @@ _test
 .idea
 .index
 .vscode
-.issue
-.issue/*
-.cursor
-.claude
 .DS_Store
 .cache-loader
 .payload
--- a/.typos.toml
+++ b/.typos.toml
@@ -1,41 +0,0 @@
-# Configuration for typos tool
-[files]
-extend-exclude = [
-    # Ignore auto-generated easyjson files
-    "*_easyjson.go",
-    # Ignore binary files
-    "*.gz",
-    "*.tar",
-    "n9e",
-    "n9e-*"
-]
-
-[default.extend-identifiers]
-# Didi is a company name (DiDi), not a typo
-Didi = "Didi"
-# datas is intentionally used as plural of data (slice variable)
-datas = "datas"
-# pendings is intentionally used as plural
-pendings = "pendings"
-pendingsUseByRecover = "pendingsUseByRecover"
-pendingsUseByRecoverMap = "pendingsUseByRecoverMap"
-# typs is intentionally used as shorthand for types (parameter name)
-typs = "typs"
-
-[default.extend-words]
-# Some false positives
-ba = "ba"
-# Specific corrections for ambiguous typos
-contigious = "contiguous"
-onw = "own"
-componet = "component"
-Patten = "Pattern"
-Requets = "Requests"
-Mis = "Miss"
-exporer = "exporter"
-soruce = "source"
-verison = "version"
-Configations = "Configurations"
-emmited = "emitted"
-Utlization = "Utilization"
-serie = "series"
--- a/README.md
+++ b/README.md
@@ -3,7 +3,7 @@
    <img src="doc/img/Nightingale_L_V.png" alt="nightingale - cloud native monitoring" width="100" /></a>
 </p>
 <p align="center">
-  <b>Open-Source Alerting Expert</b>
+  <b>开源告警管理专家</b>
 </p>

 <p align="center">
@@ -25,91 +25,94 @@



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

-## 🎯 What is Nightingale
+## 夜莺是什么

-Nightingale is an open-source monitoring project that focuses on alerting. Similar to Grafana, Nightingale also connects with various existing data sources. However, while Grafana emphasizes visualization, Nightingale places greater emphasis on the alerting engine, as well as the processing and distribution of alarms.
+夜莺监控（Nightingale）是一款侧重告警的监控类开源项目。类似 Grafana 的数据源集成方式，夜莺也是对接多种既有的数据源，不过 Grafana 侧重在可视化，夜莺是侧重在告警引擎、告警事件的处理和分发。

-> The Nightingale project was initially developed and open-sourced by DiDi.inc. On May 11, 2022, it was donated to the Open Source Development Committee of the China Computer Federation (CCF ODC).
+夜莺监控项目，最初由滴滴开发和开源，并于 2022 年 5 月 11 日，捐赠予中国计算机学会开源发展委员会（CCF ODC），为 CCF ODC 成立后接受捐赠的第一个开源项目。

-![](https://n9e.github.io/img/global/arch-bg.png)
+## 夜莺的工作逻辑

-## 💡 How Nightingale Works
+很多用户已经自行采集了指标、日志数据，此时就把存储库（VictoriaMetrics、ElasticSearch等）作为数据源接入夜莺，即可在夜莺里配置告警规则、通知规则，完成告警事件的生成和派发。

-Many users have already collected metrics and log data. In this case, you can connect your storage repositories (such as VictoriaMetrics, ElasticSearch, etc.) as data sources in Nightingale. This allows you to configure alerting rules and notification rules within Nightingale, enabling the generation and distribution of alarms.
+![夜莺产品架构](doc/img/readme/20240221152601.png)

-![Nightingale Product Architecture](doc/img/readme/20240221152601.png)
+夜莺项目本身不提供监控数据采集能力。推荐您使用 [Categraf](https://github.com/flashcatcloud/categraf) 作为采集器，可以和夜莺丝滑对接。

-Nightingale itself does not provide monitoring data collection capabilities. We recommend using [Categraf](https://github.com/flashcatcloud/categraf) as the collector, which integrates seamlessly with Nightingale.
+[Categraf](https://github.com/flashcatcloud/categraf) 可以采集操作系统、网络设备、各类中间件、数据库的监控数据，通过 Remote Write 协议推送给夜莺，夜莺把监控数据转存到时序库（如 Prometheus、VictoriaMetrics 等），并提供告警和可视化能力。

-[Categraf](https://github.com/flashcatcloud/categraf) can collect monitoring data from operating systems, network devices, various middleware, and databases. It pushes this data to Nightingale via the `Prometheus Remote Write` protocol. Nightingale then stores the monitoring data in a time-series database (such as Prometheus, VictoriaMetrics, etc.) and provides alerting and visualization capabilities.
+对于个别边缘机房，如果和中心夜莺服务端网络链路不好，希望提升告警可用性，夜莺也提供边缘机房告警引擎下沉部署模式，这个模式下，即便边缘和中心端网络割裂，告警功能也不受影响。

-For certain edge data centers with poor network connectivity to the central Nightingale server, we offer a distributed deployment mode for the alerting engine. In this mode, even if the network is disconnected, the alerting functionality remains unaffected.
+![边缘部署模式](doc/img/readme/20240222102119.png)

-![Edge Deployment Mode](doc/img/readme/multi-region-arch.png)
+> 上图中，机房A和中心机房的网络链路很好，所以直接由中心端的夜莺进程做告警引擎，机房B和中心机房的网络链路不好，所以在机房B部署了 `n9e-edge` 做告警引擎，对机房B的数据源做告警判定。

-> In the above diagram, Data Center A has a good network with the central data center, so it uses the Nightingale process in the central data center as the alerting engine. Data Center B has a poor network with the central data center, so it deploys `n9e-edge` as the alerting engine to handle alerting for its own data sources.
+## 告警降噪、升级、协同

-## 🔕 Alert Noise Reduction, Escalation, and Collaboration
+夜莺的侧重点是做告警引擎，即负责产生告警事件，并根据规则做灵活派发，内置支持 20 种通知媒介（电话、短信、邮件、钉钉、飞书、企微、Slack 等）。

-Nightingale focuses on being an alerting engine, responsible for generating alarms and flexibly distributing them based on rules. It supports 20 built-in notification medias (such as phone calls, SMS, email, DingTalk, Slack, etc.).
+如果您有更高级的需求，比如：

-If you have more advanced requirements, such as:
- Want to consolidate events from multiple monitoring systems into one platform for unified noise reduction, response handling, and data analysis.
- Want to support personnel scheduling, practice on-call culture, and support alert escalation (to avoid missing alerts) and collaborative handling.
+- 想要把公司的多套监控系统产生的事件聚拢到一个平台，统一做收敛降噪、响应处理、数据分析
+- 想要支持人员的排班，践行 On-call 文化，想要支持告警认领、升级（避免遗漏）、协同处理

-Then Nightingale is not suitable. It is recommended that you choose on-call products such as PagerDuty and FlashDuty. These products are simple and easy to use.
+那夜莺是不合适的，您需要的是 [PagerDuty](https://www.pagerduty.com/) 或 [FlashDuty](https://flashcat.cloud/product/flashcat-duty/) （产品易用，且有免费套餐）这样的 On-call 产品。

-## 🗨️ Communication Channels

- **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://n9e.github.io/).
+## 相关资料 & 交流渠道
+- 📚 [夜莺介绍PPT](https://mp.weixin.qq.com/s/Mkwx_46xrltSq8NLqAIYow) 对您了解夜莺各项关键特性会有帮助（PPT链接在文末）
+- 👉 [文档中心](https://flashcat.cloud/docs/) 为了更快的访问速度，站点托管在 [FlashcatCloud](https://flashcat.cloud)
+- ❤️ [报告 Bug](https://github.com/ccfos/nightingale/issues/new?assignees=&labels=&projects=&template=question.yml) 写清楚问题描述、复现步骤、截图等信息，更容易得到答案
+- 💡 前后端代码分离，前端代码仓库：[https://github.com/n9e/fe](https://github.com/n9e/fe)
+- 🎯 关注[这个公众号](https://gitlink.org.cn/UlricQin)了解更多夜莺动态和知识
+- 🌟 加我微信：`picobyte`（我已关闭好友验证）拉入微信群，备注：`夜莺互助群`，如果已经把夜莺上到生产环境，可联系我拉入资深监控用户群

-## 🔑 Key Features

-![Nightingale Alerting rules](doc/img/readme/alerting-rules-en.png)
+## 关键特性简介

- Nightingale supports alerting rules, mute rules, subscription rules, and notification rules. It natively supports 20 types of notification media and allows customization of message templates.  
- It supports event pipelines for Pipeline processing of alarms, facilitating automated integration with in-house systems. For example, it can append metadata to alarms or perform relabeling on events. 
- It introduces the concept of business groups and a permission system to manage various rules in a categorized manner.  
- Many databases and middleware come with built-in alert rules that can be directly imported and used. It also supports direct import of Prometheus alerting rules.  
- It supports alerting self-healing, which automatically triggers a script to execute predefined logic after an alarm is generated—such as cleaning up disk space or capturing the current system state.
+![夜莺告警规则](doc/img/readme/2025-05-23_18-43-37.png)

-![Nightingale Alarm Dashboard](doc/img/readme/active-events-en.png)
+- 夜莺支持告警规则、屏蔽规则、订阅规则、通知规则，内置支持 20 种通知媒介，支持消息模板自定义
+- 支持事件管道，对告警事件做 Pipeline 处理，方便和自有系统做自动化整合，比如给告警事件附加一些元信息，对事件做 relabel
+- 支持业务组概念，引入权限体系，分门别类管理各类规则
+- 很多数据库、中间件内置了告警规则，可以直接导入使用，也可以直接导入 Prometheus 的告警规则
+- 支持告警自愈，即告警之后自动触发一个脚本执行一些预定义的逻辑，比如清理一下磁盘、抓一下现场等

- Nightingale archives historical alarms and supports multi-dimensional query and statistics.  
- It supports flexible aggregation grouping, allowing a clear view of the distribution of alarms across the company.
+![夜莺事件大盘](doc/img/readme/2025-05-30_08-49-28.png)

-![Nightingale Integration Center](doc/img/readme/integration-components-en.png)
+- 夜莺存档了历史告警事件，支持多维度的查询和统计
+- 支持灵活的聚合分组，一目了然看到公司的告警事件分布情况

- Nightingale has built-in metric descriptions, dashboards, and alerting rules for common operating systems, middleware, and databases, which are contributed by the community with varying quality.  
- It directly receives data via multiple protocols such as Remote Write, OpenTSDB, Datadog, and Falcon, integrates with various Agents.  
- It supports data sources like Prometheus, ElasticSearch, Loki, ClickHouse, MySQL, Postgres, allowing alerting based on data from these sources.  
- Nightingale can be easily embedded into internal enterprise systems (e.g. Grafana, CMDB), and even supports configuring menu visibility for these embedded systems.
+![夜莺集成中心](doc/img/readme/2025-05-23_18-46-06.png)

-![Nightingale dashboards](doc/img/readme/dashboard-en.png)
+- 夜莺内置常用操作系统、中间件、数据库的的指标说明、仪表盘、告警规则，不过都是社区贡献的，整体也是参差不齐
+- 夜莺直接接收 Remote Write、OpenTSDB、Datadog、Falcon 等多种协议的数据，故而可以和各类 Agent 对接
+- 夜莺支持 Prometheus、ElasticSearch、Loki、TDEngine 等多种数据源，可以对其中的数据做告警
+- 夜莺可以很方便内嵌企业内部系统，比如 Grafana、CMDB 等，甚至可以配置这些内嵌系统的菜单可见性

- Nightingale supports dashboard functionality, including common chart types, and comes with pre-built dashboards. The image above is a screenshot of one of these dashboards.  
- If you are already accustomed to Grafana, it is recommended to continue using Grafana for visualization, as Grafana has deeper expertise in this area.  
- For machine-related monitoring data collected by Categraf, it is advisable to use Nightingale's built-in dashboards for viewing. This is because Categraf's metric naming follows Telegraf's convention, which differs from that of Node Exporter.  
- Due to Nightingale's concept of business groups (where machines can belong to different groups), there may be scenarios where you only want to view machines within the current business group on the dashboard. Thus, Nightingale's dashboards can be linked with business groups for interactive filtering.

-## 🌟 Stargazers over time
+![夜莺仪表盘](doc/img/readme/2025-05-23_18-49-02.png)

+- 夜莺支持仪表盘功能，支持常见的图表类型，也内置了一些仪表盘，上图是其中一个仪表盘的截图。
+- 如果你已经习惯了 Grafana，建议仍然使用 Grafana 看图。Grafana 在看图方面道行更深。
+- 机器相关的监控数据，如果是 Categraf 采集的，建议使用夜莺自带的仪表盘查看，因为 Categraf 的指标命名 Follow 的是 Telegraf 的命名方式，和 Node Exporter 不同
+- 因为夜莺有个业务组的概念，机器可以归属不同的业务组，有时在仪表盘里只想查看当前所属业务组的机器，所以夜莺的仪表盘可以和业务组联动
+
+## 广受关注
 [![Stargazers over time](https://api.star-history.com/svg?repos=ccfos/nightingale&type=Date)](https://star-history.com/#ccfos/nightingale&Date)

-## 🔥 Users
+## 感谢众多企业的信赖

-![User Logos](doc/img/readme/logos.png)
+![夜莺客户](doc/img/readme/logos.png)

-## 🤝 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
+## 社区共建
+- ❇️ 请阅读浏览[夜莺开源项目和社区治理架构草案](./doc/community-governance.md)，真诚欢迎每一位用户、开发者、公司以及组织，使用夜莺监控、积极反馈 Bug、提交功能需求、分享最佳实践，共建专业、活跃的夜莺开源社区。
+- ❤️ 夜莺贡献者
 <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/ccfos/nightingale/blob/main/LICENSE)
+## License
+- [Apache License V2.0](https://github.com/didi/nightingale/blob/main/LICENSE)
--- a/README_en.md
+++ b/README_en.md
@@ -0,0 +1,113 @@
+<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>
+</p>
+
+<p align="center">
+<a href="https://flashcat.cloud/docs/">
+  <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>
+<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>
+</p>
+
+
+
+[English](./README_en.md) | [中文](./README.md)
+
+## What is Nightingale
+
+Nightingale is an open-source project focused on alerting. Similar to Grafana's data source integration approach, Nightingale also connects with various existing data sources. However, while Grafana focuses on visualization, Nightingale focuses on alerting engines.
+
+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. 
+
+
+## Quick Start
+
+- 👉 [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).
+
+## Features
+
+- **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.
+
+
+## Screenshots
+
+You can switch languages and themes in the top right corner. We now support English, Simplified Chinese, and Traditional Chinese. 
+
+![18n switch](doc/img/readme/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](doc/img/readme/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](doc/img/readme/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](doc/img/readme/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](doc/img/readme/20240513103825.png)
+
+
+
+## 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:
+
+![Product Architecture](doc/img/readme/20240221152601.png)
+
+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.
+
+![Edge Deployment Mode](doc/img/readme/20240222102119.png)
+
+
+## Communication Channels
+
+- **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/).
+
+## Stargazers over time
+
+[![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
+<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)
--- a/README_zh.md
+++ b/README_zh.md
@@ -1,122 +0,0 @@
-<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>开源告警管理专家</b>
-</p>
-
-<p align="center">
-<a href="https://flashcat.cloud/docs/">
-  <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>
-<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>
-</p>
-
-
-
-[English](./README.md) | [中文](./README_zh.md)
-
-## 夜莺是什么
-
-夜莺 Nightingale 是一款开源云原生监控告警工具，是中国计算机学会接受捐赠并托管的第一个开源项目，在 GitHub 上有超过 12000 颗星，广受关注和使用。夜莺的统一告警引擎，可以对接 Prometheus、Elasticsearch、ClickHouse、Loki、MySQL 等多种数据源，提供全面的告警判定、丰富的事件处理和灵活的告警分发及通知能力。
-
-夜莺侧重于监控告警，类似于 Grafana 的数据源集成方式，夜莺也是对接多种既有的数据源，不过 Grafana 侧重于可视化，夜莺则是侧重于告警引擎、告警事件的处理和分发。
-
-> 夜莺监控项目，最初由滴滴开发和开源，并于 2022 年 5 月 11 日，捐赠予中国计算机学会开源发展技术委员会（CCF ODTC），为 CCF ODTC 成立后接受捐赠的第一个开源项目。
-
-![](https://n9e.github.io/img/global/arch-bg.png)
-
-## 夜莺的工作逻辑
-
-很多用户已经自行采集了指标、日志数据，此时就把存储库（VictoriaMetrics、ElasticSearch等）作为数据源接入夜莺，即可在夜莺里配置告警规则、通知规则，完成告警事件的生成和派发。
-
-![夜莺产品架构](doc/img/readme/20240221152601.png)
-
-夜莺项目本身不提供监控数据采集能力。推荐您使用 [Categraf](https://github.com/flashcatcloud/categraf) 作为采集器，可以和夜莺丝滑对接。
-
-[Categraf](https://github.com/flashcatcloud/categraf) 可以采集操作系统、网络设备、各类中间件、数据库的监控数据，通过 Remote Write 协议推送给夜莺，夜莺把监控数据转存到时序库（如 Prometheus、VictoriaMetrics 等），并提供告警和可视化能力。
-
-对于个别边缘机房，如果和中心夜莺服务端网络链路不好，希望提升告警可用性，夜莺也提供边缘机房告警引擎下沉部署模式，这个模式下，即便边缘和中心端网络割裂，告警功能也不受影响。
-
-![边缘部署模式](doc/img/readme/20240222102119.png)
-
-> 上图中，机房A和中心机房的网络链路很好，所以直接由中心端的夜莺进程做告警引擎，机房B和中心机房的网络链路不好，所以在机房B部署了 `n9e-edge` 做告警引擎，对机房B的数据源做告警判定。
-
-## 告警降噪、升级、协同
-
-夜莺的侧重点是做告警引擎，即负责产生告警事件，并根据规则做灵活派发，内置支持 20 种通知媒介（电话、短信、邮件、钉钉、飞书、企微、Slack 等）。
-
-如果您有更高级的需求，比如：
-
- 想要把公司的多套监控系统产生的事件聚拢到一个平台，统一做收敛降噪、响应处理、数据分析
- 想要支持人员的排班，践行 On-call 文化，想要支持告警认领、升级（避免遗漏）、协同处理
-
-那夜莺是不合适的，推荐您选用 [FlashDuty](https://flashcat.cloud/product/flashcat-duty/) 这样的 On-call 产品，产品简单易用，也有免费套餐。
-
-
-## 相关资料 & 交流渠道
- 📚 [夜莺介绍PPT](https://mp.weixin.qq.com/s/Mkwx_46xrltSq8NLqAIYow) 对您了解夜莺各项关键特性会有帮助（PPT链接在文末）
- 👉 [文档中心](https://flashcat.cloud/docs/) 为了更快的访问速度，站点托管在 [FlashcatCloud](https://flashcat.cloud)
- ❤️ [报告 Bug](https://github.com/ccfos/nightingale/issues/new?assignees=&labels=&projects=&template=question.yml) 写清楚问题描述、复现步骤、截图等信息，更容易得到答案
- 💡 前后端代码分离，前端代码仓库：[https://github.com/n9e/fe](https://github.com/n9e/fe)
- 🎯 关注[这个公众号](https://gitlink.org.cn/UlricQin)了解更多夜莺动态和知识
- 🌟 加我微信：`picobyte`（我已关闭好友验证）拉入微信群，备注：`夜莺互助群`，如果已经把夜莺上到生产环境，可联系我拉入资深监控用户群
-
-
-## 关键特性简介
-
-![夜莺告警规则](doc/img/readme/2025-05-23_18-43-37.png)
-
- 夜莺支持告警规则、屏蔽规则、订阅规则、通知规则，内置支持 20 种通知媒介，支持消息模板自定义
- 支持事件管道，对告警事件做 Pipeline 处理，方便和自有系统做自动化整合，比如给告警事件附加一些元信息，对事件做 relabel
- 支持业务组概念，引入权限体系，分门别类管理各类规则
- 很多数据库、中间件内置了告警规则，可以直接导入使用，也可以直接导入 Prometheus 的告警规则
- 支持告警自愈，即告警之后自动触发一个脚本执行一些预定义的逻辑，比如清理一下磁盘、抓一下现场等
-
-![夜莺事件大盘](doc/img/readme/2025-05-30_08-49-28.png)
-
- 夜莺存档了历史告警事件，支持多维度的查询和统计
- 支持灵活的聚合分组，一目了然看到公司的告警事件分布情况
-
-![夜莺集成中心](doc/img/readme/2025-05-23_18-46-06.png)
-
- 夜莺内置常用操作系统、中间件、数据库的的指标说明、仪表盘、告警规则，不过都是社区贡献的，整体也是参差不齐
- 夜莺直接接收 Remote Write、OpenTSDB、Datadog、Falcon 等多种协议的数据，故而可以和各类 Agent 对接
- 夜莺支持 Prometheus、ElasticSearch、Loki、TDEngine 等多种数据源，可以对其中的数据做告警
- 夜莺可以很方便内嵌企业内部系统，比如 Grafana、CMDB 等，甚至可以配置这些内嵌系统的菜单可见性
-
-
-![夜莺仪表盘](doc/img/readme/2025-05-23_18-49-02.png)
-
- 夜莺支持仪表盘功能，支持常见的图表类型，也内置了一些仪表盘，上图是其中一个仪表盘的截图。
- 如果你已经习惯了 Grafana，建议仍然使用 Grafana 看图。Grafana 在看图方面道行更深。
- 机器相关的监控数据，如果是 Categraf 采集的，建议使用夜莺自带的仪表盘查看，因为 Categraf 的指标命名 Follow 的是 Telegraf 的命名方式，和 Node Exporter 不同
- 因为夜莺有个业务组的概念，机器可以归属不同的业务组，有时在仪表盘里只想查看当前所属业务组的机器，所以夜莺的仪表盘可以和业务组联动
-
-## 广受关注
-[![Stargazers over time](https://api.star-history.com/svg?repos=ccfos/nightingale&type=Date)](https://star-history.com/#ccfos/nightingale&Date)
-
-## 感谢众多企业的信赖
-
-![夜莺客户](doc/img/readme/logos.png)
-
-## 社区共建
- ❇️ 请阅读浏览[夜莺开源项目和社区治理架构草案](./doc/community-governance.md)，真诚欢迎每一位用户、开发者、公司以及组织，使用夜莺监控、积极反馈 Bug、提交功能需求、分享最佳实践，共建专业、活跃的夜莺开源社区。
- ❤️ 夜莺贡献者
-<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/ccfos/nightingale/blob/main/LICENSE)
--- a/alert/alert.go
+++ b/alert/alert.go
@@ -75,7 +75,7 @@ func Initialize(configDir string, cryptoKey string) (func(), error) {

 	macros.RegisterMacro(macros.MacroInVain)
 	dscache.Init(ctx, false)
-	Start(config.Alert, config.Pushgw, syncStats, alertStats, externalProcessors, targetCache, busiGroupCache, alertMuteCache, alertRuleCache, notifyConfigCache, taskTplsCache, dsCache, ctx, promClients, userCache, userGroupCache, notifyRuleCache, notifyChannelCache, messageTemplateCache, configCvalCache)
+	Start(config.Alert, config.Pushgw, syncStats, alertStats, externalProcessors, targetCache, busiGroupCache, alertMuteCache, alertRuleCache, notifyConfigCache, taskTplsCache, dsCache, ctx, promClients, userCache, userGroupCache, notifyRuleCache, notifyChannelCache, messageTemplateCache)

 	r := httpx.GinEngine(config.Global.RunMode, config.HTTP,
 		configCvalCache.PrintBodyPaths, configCvalCache.PrintAccessLog)
@@ -98,7 +98,7 @@ func Initialize(configDir string, cryptoKey string) (func(), error) {

 func Start(alertc aconf.Alert, pushgwc pconf.Pushgw, syncStats *memsto.Stats, alertStats *astats.Stats, externalProcessors *process.ExternalProcessorsType, targetCache *memsto.TargetCacheType, busiGroupCache *memsto.BusiGroupCacheType,
 	alertMuteCache *memsto.AlertMuteCacheType, alertRuleCache *memsto.AlertRuleCacheType, notifyConfigCache *memsto.NotifyConfigCacheType, taskTplsCache *memsto.TaskTplCache, datasourceCache *memsto.DatasourceCacheType, ctx *ctx.Context,
-	promClients *prom.PromClientMap, userCache *memsto.UserCacheType, userGroupCache *memsto.UserGroupCacheType, notifyRuleCache *memsto.NotifyRuleCacheType, notifyChannelCache *memsto.NotifyChannelCacheType, messageTemplateCache *memsto.MessageTemplateCacheType, configCvalCache *memsto.CvalCache) {
+	promClients *prom.PromClientMap, userCache *memsto.UserCacheType, userGroupCache *memsto.UserGroupCacheType, notifyRuleCache *memsto.NotifyRuleCacheType, notifyChannelCache *memsto.NotifyChannelCacheType, messageTemplateCache *memsto.MessageTemplateCacheType) {
 	alertSubscribeCache := memsto.NewAlertSubscribeCache(ctx, syncStats)
 	recordingRuleCache := memsto.NewRecordingRuleCache(ctx, syncStats)
 	targetsOfAlertRulesCache := memsto.NewTargetOfAlertRuleCache(ctx, alertc.Heartbeat.EngineName, syncStats)
@@ -117,14 +117,14 @@ func Start(alertc aconf.Alert, pushgwc pconf.Pushgw, syncStats *memsto.Stats, al

 	eventProcessorCache := memsto.NewEventProcessorCache(ctx, syncStats)

-	dp := dispatch.NewDispatch(alertRuleCache, userCache, userGroupCache, alertSubscribeCache, targetCache, notifyConfigCache, taskTplsCache, notifyRuleCache, notifyChannelCache, messageTemplateCache, eventProcessorCache, configCvalCache, alertc.Alerting, ctx, alertStats)
-	consumer := dispatch.NewConsumer(alertc.Alerting, ctx, dp, promClients, alertMuteCache)
+	dp := dispatch.NewDispatch(alertRuleCache, userCache, userGroupCache, alertSubscribeCache, targetCache, notifyConfigCache, taskTplsCache, notifyRuleCache, notifyChannelCache, messageTemplateCache, eventProcessorCache, alertc.Alerting, ctx, alertStats)
+	consumer := dispatch.NewConsumer(alertc.Alerting, ctx, dp, promClients)

-	notifyRecordConsumer := sender.NewNotifyRecordConsumer(ctx)
+	notifyRecordComsumer := sender.NewNotifyRecordConsumer(ctx)

 	go dp.ReloadTpls()
 	go consumer.LoopConsume()
-	go notifyRecordConsumer.LoopConsume()
+	go notifyRecordComsumer.LoopConsume()

 	go queue.ReportQueueSize(alertStats)
 	go sender.ReportNotifyRecordQueueSize(alertStats)
--- a/alert/common/key.go
+++ b/alert/common/key.go
@@ -1,7 +1,6 @@
 package common

 import (
-	"encoding/json"
 	"fmt"
 	"strings"

@@ -14,20 +13,6 @@ func RuleKey(datasourceId, id int64) string {

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

-	dispatch       *Dispatch
-	promClients    *prom.PromClientMap
-	alertMuteCache *memsto.AlertMuteCacheType
+	dispatch    *Dispatch
+	promClients *prom.PromClientMap
 }

-type EventMuteHookFunc func(event *models.AlertCurEvent) bool
-
-var EventMuteHook EventMuteHookFunc = func(event *models.AlertCurEvent) bool { return false }
-
 func InitRegisterQueryFunc(promClients *prom.PromClientMap) {
 	tplx.RegisterQueryFunc(func(datasourceID int64, promql string) model.Value {
 		if promClients.IsNil(datasourceID) {
@@ -49,14 +43,12 @@ func InitRegisterQueryFunc(promClients *prom.PromClientMap) {
 }

 // 创建一个 Consumer 实例
-func NewConsumer(alerting aconf.Alerting, ctx *ctx.Context, dispatch *Dispatch, promClients *prom.PromClientMap, alertMuteCache *memsto.AlertMuteCacheType) *Consumer {
+func NewConsumer(alerting aconf.Alerting, ctx *ctx.Context, dispatch *Dispatch, promClients *prom.PromClientMap) *Consumer {
 	return &Consumer{
 		alerting:    alerting,
 		ctx:         ctx,
 		dispatch:    dispatch,
 		promClients: promClients,
-
-		alertMuteCache: alertMuteCache,
 	}
 }

@@ -118,6 +110,10 @@ func (e *Consumer) consumeOne(event *models.AlertCurEvent) {

 	e.persist(event)

+	if event.IsRecovered && event.NotifyRecovered == 0 {
+		return
+	}
+
 	e.dispatch.HandleEventNotify(event, false)
 }

--- a/alert/dispatch/dispatch.go
+++ b/alert/dispatch/dispatch.go
@@ -16,7 +16,6 @@ import (
 	"github.com/ccfos/nightingale/v6/alert/astats"
 	"github.com/ccfos/nightingale/v6/alert/common"
 	"github.com/ccfos/nightingale/v6/alert/pipeline"
-	"github.com/ccfos/nightingale/v6/alert/pipeline/engine"
 	"github.com/ccfos/nightingale/v6/alert/sender"
 	"github.com/ccfos/nightingale/v6/memsto"
 	"github.com/ccfos/nightingale/v6/models"
@@ -25,17 +24,6 @@ import (
 	"github.com/toolkits/pkg/logger"
 )

-var ShouldSkipNotify func(*ctx.Context, *models.AlertCurEvent, int64) bool
-var SendByNotifyRule func(*ctx.Context, *memsto.UserCacheType, *memsto.UserGroupCacheType, *memsto.NotifyChannelCacheType, *memsto.CvalCache,
-	[]*models.AlertCurEvent, int64, *models.NotifyConfig, *models.NotifyChannelConfig, *models.MessageTemplate)
-
-var EventProcessorCache *memsto.EventProcessorCacheType
-
-func init() {
-	ShouldSkipNotify = shouldSkipNotify
-	SendByNotifyRule = SendNotifyRuleMessage
-}
-
 type Dispatch struct {
 	alertRuleCache      *memsto.AlertRuleCacheType
 	userCache           *memsto.UserCacheType
@@ -44,7 +32,6 @@ type Dispatch struct {
 	targetCache         *memsto.TargetCacheType
 	notifyConfigCache   *memsto.NotifyConfigCacheType
 	taskTplsCache       *memsto.TaskTplCache
-	configCvalCache     *memsto.CvalCache

 	notifyRuleCache      *memsto.NotifyRuleCacheType
 	notifyChannelCache   *memsto.NotifyChannelCacheType
@@ -58,8 +45,9 @@ type Dispatch struct {
 	tpls             map[string]*template.Template
 	ExtraSenders     map[string]sender.Sender
 	BeforeSenderHook func(*models.AlertCurEvent) bool
-	ctx              *ctx.Context
-	Astats           *astats.Stats
+
+	ctx    *ctx.Context
+	Astats *astats.Stats

 	RwLock sync.RWMutex
 }
@@ -68,7 +56,7 @@ type Dispatch struct {
 func NewDispatch(alertRuleCache *memsto.AlertRuleCacheType, userCache *memsto.UserCacheType, userGroupCache *memsto.UserGroupCacheType,
 	alertSubscribeCache *memsto.AlertSubscribeCacheType, targetCache *memsto.TargetCacheType, notifyConfigCache *memsto.NotifyConfigCacheType,
 	taskTplsCache *memsto.TaskTplCache, notifyRuleCache *memsto.NotifyRuleCacheType, notifyChannelCache *memsto.NotifyChannelCacheType,
-	messageTemplateCache *memsto.MessageTemplateCacheType, eventProcessorCache *memsto.EventProcessorCacheType, configCvalCache *memsto.CvalCache, alerting aconf.Alerting, c *ctx.Context, astats *astats.Stats) *Dispatch {
+	messageTemplateCache *memsto.MessageTemplateCacheType, eventProcessorCache *memsto.EventProcessorCacheType, alerting aconf.Alerting, ctx *ctx.Context, astats *astats.Stats) *Dispatch {
 	notify := &Dispatch{
 		alertRuleCache:       alertRuleCache,
 		userCache:            userCache,
@@ -81,7 +69,6 @@ func NewDispatch(alertRuleCache *memsto.AlertRuleCacheType, userCache *memsto.Us
 		notifyChannelCache:   notifyChannelCache,
 		messageTemplateCache: messageTemplateCache,
 		eventProcessorCache:  eventProcessorCache,
-		configCvalCache:      configCvalCache,

 		alerting: alerting,

@@ -90,16 +77,11 @@ func NewDispatch(alertRuleCache *memsto.AlertRuleCacheType, userCache *memsto.Us
 		ExtraSenders:     make(map[string]sender.Sender),
 		BeforeSenderHook: func(*models.AlertCurEvent) bool { return true },

-		ctx:    c,
+		ctx:    ctx,
 		Astats: astats,
 	}

 	pipeline.Init()
-	EventProcessorCache = eventProcessorCache
-
-	// 设置通知记录回调函数
-	notifyChannelCache.SetNotifyRecordFunc(sender.NotifyRecord)
-
 	return notify
 }

@@ -180,23 +162,47 @@ func (e *Dispatch) HandleEventWithNotifyRule(eventOrigin *models.AlertCurEvent)
 			if !notifyRule.Enable {
 				continue
 			}
-			eventCopy.NotifyRuleId = notifyRuleId
-			eventCopy.NotifyRuleName = notifyRule.Name

-			eventCopy = HandleEventPipeline(notifyRule.PipelineConfigs, eventOrigin, eventCopy, e.eventProcessorCache, e.ctx, notifyRuleId, "notify_rule")
-			if ShouldSkipNotify(e.ctx, eventCopy, notifyRuleId) {
-				logger.Infof("notify_id: %d, event:%+v, should skip notify", notifyRuleId, eventCopy)
+			var processors []models.Processor
+			for _, pipelineConfig := range notifyRule.PipelineConfigs {
+				if !pipelineConfig.Enable {
+					continue
+				}
+
+				eventPipeline := e.eventProcessorCache.Get(pipelineConfig.PipelineId)
+				if eventPipeline == nil {
+					logger.Warningf("notify_id: %d, event:%+v, processor not found", notifyRuleId, eventCopy)
+					continue
+				}
+
+				if !pipelineApplicable(eventPipeline, eventCopy) {
+					logger.Debugf("notify_id: %d, event:%+v, pipeline_id: %d, not applicable", notifyRuleId, eventCopy, pipelineConfig.PipelineId)
+					continue
+				}
+
+				processors = append(processors, e.eventProcessorCache.GetProcessorsById(pipelineConfig.PipelineId)...)
+			}
+
+			for _, processor := range processors {
+				logger.Infof("before processor notify_id: %d, event:%+v, processor:%+v", notifyRuleId, eventCopy, processor)
+				eventCopy = processor.Process(e.ctx, eventCopy)
+				logger.Infof("after processor notify_id: %d, event:%+v, processor:%+v", notifyRuleId, eventCopy, processor)
+				if eventCopy == nil {
+					logger.Warningf("notify_id: %d, event:%+v, processor:%+v, event is nil", notifyRuleId, eventCopy, processor)
+					break
+				}
+			}
+
+			if eventCopy == nil {
+				// 如果 eventCopy 为 nil，说明 eventCopy 被 processor drop 掉了, 不再发送通知
 				continue
 			}

 			// notify
 			for i := range notifyRule.NotifyConfigs {
-				err := NotifyRuleMatchCheck(&notifyRule.NotifyConfigs[i], eventCopy)
-				if err != nil {
-					logger.Errorf("notify_id: %d, event:%+v, channel_id:%d, template_id: %d, notify_config:%+v, err:%v", notifyRuleId, eventCopy, notifyRule.NotifyConfigs[i].ChannelID, notifyRule.NotifyConfigs[i].TemplateID, notifyRule.NotifyConfigs[i], err)
+				if !NotifyRuleApplicable(&notifyRule.NotifyConfigs[i], eventCopy) {
 					continue
 				}
-
 				notifyChannel := e.notifyChannelCache.Get(notifyRule.NotifyConfigs[i].ChannelID)
 				messageTemplate := e.messageTemplateCache.Get(notifyRule.NotifyConfigs[i].TemplateID)
 				if notifyChannel == nil {
@@ -205,81 +211,22 @@ func (e *Dispatch) HandleEventWithNotifyRule(eventOrigin *models.AlertCurEvent)
 					continue
 				}

-				if notifyChannel.RequestType != "flashduty" && notifyChannel.RequestType != "pagerduty" && messageTemplate == nil {
+				if notifyChannel.RequestType != "flashduty" && messageTemplate == nil {
 					logger.Warningf("notify_id: %d, channel_name: %v, event:%+v, template_id: %d, message_template not found", notifyRuleId, notifyChannel.Ident, eventCopy, notifyRule.NotifyConfigs[i].TemplateID)
 					sender.NotifyRecord(e.ctx, []*models.AlertCurEvent{eventCopy}, notifyRuleId, notifyChannel.Name, "", "", errors.New("message_template not found"))

 					continue
 				}

-				go SendByNotifyRule(e.ctx, e.userCache, e.userGroupCache, e.notifyChannelCache, e.configCvalCache, []*models.AlertCurEvent{eventCopy}, notifyRuleId, &notifyRule.NotifyConfigs[i], notifyChannel, messageTemplate)
+				// todo go send
+				// todo 聚合 event
+				go e.sendV2([]*models.AlertCurEvent{eventCopy}, notifyRuleId, &notifyRule.NotifyConfigs[i], notifyChannel, messageTemplate)
 			}
 		}
 	}
 }

-func shouldSkipNotify(ctx *ctx.Context, event *models.AlertCurEvent, notifyRuleId int64) bool {
-	if event == nil {
-		// 如果 eventCopy 为 nil，说明 eventCopy 被 processor drop 掉了, 不再发送通知
-		return true
-	}
-
-	if event.IsRecovered && event.NotifyRecovered == 0 {
-		// 如果 eventCopy 是恢复事件，且 NotifyRecovered 为 0，则不发送通知
-		return true
-	}
-	return false
-}
-
-func HandleEventPipeline(pipelineConfigs []models.PipelineConfig, eventOrigin, event *models.AlertCurEvent, eventProcessorCache *memsto.EventProcessorCacheType, ctx *ctx.Context, id int64, from string) *models.AlertCurEvent {
-	workflowEngine := engine.NewWorkflowEngine(ctx)
-
-	for _, pipelineConfig := range pipelineConfigs {
-		if !pipelineConfig.Enable {
-			continue
-		}
-
-		eventPipeline := eventProcessorCache.Get(pipelineConfig.PipelineId)
-		if eventPipeline == nil {
-			logger.Warningf("processor_by_%s_id:%d pipeline_id:%d, event pipeline not found, event: %+v", from, id, pipelineConfig.PipelineId, event)
-			continue
-		}
-
-		if !PipelineApplicable(eventPipeline, event) {
-			logger.Debugf("processor_by_%s_id:%d pipeline_id:%d, event pipeline not applicable, event: %+v", from, id, pipelineConfig.PipelineId, event)
-			continue
-		}
-
-		// 统一使用工作流引擎执行（兼容线性模式和工作流模式）
-		triggerCtx := &models.WorkflowTriggerContext{
-			Mode:      models.TriggerModeEvent,
-			TriggerBy: from,
-		}
-
-		resultEvent, result, err := workflowEngine.Execute(eventPipeline, event, triggerCtx)
-		if err != nil {
-			logger.Errorf("processor_by_%s_id:%d pipeline_id:%d, pipeline execute error: %v", from, id, pipelineConfig.PipelineId, err)
-			continue
-		}
-
-		if resultEvent == nil {
-			logger.Infof("processor_by_%s_id:%d pipeline_id:%d, event dropped, event: %+v", from, id, pipelineConfig.PipelineId, eventOrigin)
-			if from == "notify_rule" {
-				sender.NotifyRecord(ctx, []*models.AlertCurEvent{eventOrigin}, id, "", "", result.Message, fmt.Errorf("processor_by_%s_id:%d pipeline_id:%d, drop by pipeline", from, id, pipelineConfig.PipelineId))
-			}
-			return nil
-		}
-
-		event = resultEvent
-		logger.Infof("processor_by_%s_id:%d pipeline_id:%d, pipeline executed, status:%s, message:%s", from, id, pipelineConfig.PipelineId, result.Status, result.Message)
-	}
-
-	event.FE2DB()
-	event.FillTagsMap()
-	return event
-}
-
-func PipelineApplicable(pipeline *models.EventPipeline, event *models.AlertCurEvent) bool {
+func pipelineApplicable(pipeline *models.EventPipeline, event *models.AlertCurEvent) bool {
 	if pipeline == nil {
 		return true
 	}
@@ -290,16 +237,13 @@ func PipelineApplicable(pipeline *models.EventPipeline, event *models.AlertCurEv

 	tagMatch := true
 	if len(pipeline.LabelFilters) > 0 {
-		// Deep copy to avoid concurrent map writes on cached objects
-		labelFiltersCopy := make([]models.TagFilter, len(pipeline.LabelFilters))
-		copy(labelFiltersCopy, pipeline.LabelFilters)
-		for i := range labelFiltersCopy {
-			if labelFiltersCopy[i].Func == "" {
-				labelFiltersCopy[i].Func = labelFiltersCopy[i].Op
+		for i := range pipeline.LabelFilters {
+			if pipeline.LabelFilters[i].Func == "" {
+				pipeline.LabelFilters[i].Func = pipeline.LabelFilters[i].Op
 			}
 		}

-		tagFilters, err := models.ParseTagFilter(labelFiltersCopy)
+		tagFilters, err := models.ParseTagFilter(pipeline.LabelFilters)
 		if err != nil {
 			logger.Errorf("pipeline applicable failed to parse tag filter: %v event:%+v pipeline:%+v", err, event, pipeline)
 			return false
@@ -309,11 +253,7 @@ func PipelineApplicable(pipeline *models.EventPipeline, event *models.AlertCurEv

 	attributesMatch := true
 	if len(pipeline.AttrFilters) > 0 {
-		// Deep copy to avoid concurrent map writes on cached objects
-		attrFiltersCopy := make([]models.TagFilter, len(pipeline.AttrFilters))
-		copy(attrFiltersCopy, pipeline.AttrFilters)
-
-		tagFilters, err := models.ParseTagFilter(attrFiltersCopy)
+		tagFilters, err := models.ParseTagFilter(pipeline.AttrFilters)
 		if err != nil {
 			logger.Errorf("pipeline applicable failed to parse tag filter: %v event:%+v pipeline:%+v err:%v", tagFilters, event, pipeline, err)
 			return false
@@ -325,7 +265,7 @@ func PipelineApplicable(pipeline *models.EventPipeline, event *models.AlertCurEv
 	return tagMatch && attributesMatch
 }

-func NotifyRuleMatchCheck(notifyConfig *models.NotifyConfig, event *models.AlertCurEvent) error {
+func NotifyRuleApplicable(notifyConfig *models.NotifyConfig, event *models.AlertCurEvent) bool {
 	tm := time.Unix(event.TriggerTime, 0)
 	triggerTime := tm.Format("15:04")
 	triggerWeek := int(tm.Weekday())
@@ -377,10 +317,6 @@ func NotifyRuleMatchCheck(notifyConfig *models.NotifyConfig, event *models.Alert
 		}
 	}

-	if !timeMatch {
-		return fmt.Errorf("event time not match time filter")
-	}
-
 	severityMatch := false
 	for i := range notifyConfig.Severities {
 		if notifyConfig.Severities[i] == event.Severity {
@@ -388,60 +324,39 @@ func NotifyRuleMatchCheck(notifyConfig *models.NotifyConfig, event *models.Alert
 		}
 	}

-	if !severityMatch {
-		return fmt.Errorf("event severity not match severity filter")
-	}
-
 	tagMatch := true
 	if len(notifyConfig.LabelKeys) > 0 {
-		// Deep copy to avoid concurrent map writes on cached objects
-		labelKeysCopy := make([]models.TagFilter, len(notifyConfig.LabelKeys))
-		copy(labelKeysCopy, notifyConfig.LabelKeys)
-		for i := range labelKeysCopy {
-			if labelKeysCopy[i].Func == "" {
-				labelKeysCopy[i].Func = labelKeysCopy[i].Op
+		for i := range notifyConfig.LabelKeys {
+			if notifyConfig.LabelKeys[i].Func == "" {
+				notifyConfig.LabelKeys[i].Func = notifyConfig.LabelKeys[i].Op
 			}
 		}

-		tagFilters, err := models.ParseTagFilter(labelKeysCopy)
+		tagFilters, err := models.ParseTagFilter(notifyConfig.LabelKeys)
 		if err != nil {
 			logger.Errorf("notify send failed to parse tag filter: %v event:%+v notify_config:%+v", err, event, notifyConfig)
-			return fmt.Errorf("failed to parse tag filter: %v", err)
+			return false
 		}
 		tagMatch = common.MatchTags(event.TagsMap, tagFilters)
 	}

-	if !tagMatch {
-		return fmt.Errorf("event tag not match tag filter")
-	}
-
 	attributesMatch := true
 	if len(notifyConfig.Attributes) > 0 {
-		// Deep copy to avoid concurrent map writes on cached objects
-		attributesCopy := make([]models.TagFilter, len(notifyConfig.Attributes))
-		copy(attributesCopy, notifyConfig.Attributes)
-
-		tagFilters, err := models.ParseTagFilter(attributesCopy)
+		tagFilters, err := models.ParseTagFilter(notifyConfig.Attributes)
 		if err != nil {
 			logger.Errorf("notify send failed to parse tag filter: %v event:%+v notify_config:%+v err:%v", tagFilters, event, notifyConfig, err)
-			return fmt.Errorf("failed to parse tag filter: %v", err)
+			return false
 		}

 		attributesMatch = common.MatchTags(event.JsonTagsAndValue(), tagFilters)
 	}
-
-	if !attributesMatch {
-		return fmt.Errorf("event attributes not match attributes filter")
-	}
-
 	logger.Infof("notify send timeMatch:%v severityMatch:%v tagMatch:%v attributesMatch:%v event:%+v notify_config:%+v", timeMatch, severityMatch, tagMatch, attributesMatch, event, notifyConfig)
-	return nil
+	return timeMatch && severityMatch && tagMatch && attributesMatch
 }

-func GetNotifyConfigParams(notifyConfig *models.NotifyConfig, contactKey string, userCache *memsto.UserCacheType, userGroupCache *memsto.UserGroupCacheType) ([]string, []int64, []string, map[string]string) {
+func GetNotifyConfigParams(notifyConfig *models.NotifyConfig, contactKey string, userCache *memsto.UserCacheType, userGroupCache *memsto.UserGroupCacheType) ([]string, []int64, map[string]string) {
 	customParams := make(map[string]string)
 	var flashDutyChannelIDs []int64
-	var pagerDutyRoutingKeys []string
 	var userInfoParams models.CustomParams

 	for key, value := range notifyConfig.Params {
@@ -459,26 +374,13 @@ func GetNotifyConfigParams(notifyConfig *models.NotifyConfig, contactKey string,
 					}
 				}
 			}
-		case "pagerduty_integration_keys", "pagerduty_integration_ids":
-			if key == "pagerduty_integration_ids" {
-				// 不处理ids，直接跳过，这个字段只给前端标记用
-				continue
-			}
-			if data, err := json.Marshal(value); err == nil {
-				var keys []string
-				if json.Unmarshal(data, &keys) == nil {
-					pagerDutyRoutingKeys = keys
-					break
-				}
-			}
 		default:
-			// 避免直接 value.(string) 导致 panic，支持多种类型并统一为字符串
 			customParams[key] = value.(string)
 		}
 	}

 	if len(userInfoParams.UserIDs) == 0 && len(userInfoParams.UserGroupIDs) == 0 {
-		return []string{}, flashDutyChannelIDs, pagerDutyRoutingKeys, customParams
+		return []string{}, flashDutyChannelIDs, customParams
 	}

 	userIds := make([]int64, 0)
@@ -514,20 +416,18 @@ func GetNotifyConfigParams(notifyConfig *models.NotifyConfig, contactKey string,
 		visited[user.Id] = true
 	}

-	return sendtos, flashDutyChannelIDs, pagerDutyRoutingKeys, customParams
+	return sendtos, flashDutyChannelIDs, customParams
 }

-func SendNotifyRuleMessage(ctx *ctx.Context, userCache *memsto.UserCacheType, userGroupCache *memsto.UserGroupCacheType, notifyChannelCache *memsto.NotifyChannelCacheType, configCvalCache *memsto.CvalCache,
-	events []*models.AlertCurEvent, notifyRuleId int64, notifyConfig *models.NotifyConfig, notifyChannel *models.NotifyChannelConfig, messageTemplate *models.MessageTemplate) {
+func (e *Dispatch) sendV2(events []*models.AlertCurEvent, notifyRuleId int64, notifyConfig *models.NotifyConfig, notifyChannel *models.NotifyChannelConfig, messageTemplate *models.MessageTemplate) {
 	if len(events) == 0 {
 		logger.Errorf("notify_id: %d events is empty", notifyRuleId)
 		return
 	}

-	siteInfo := configCvalCache.GetSiteInfo()
 	tplContent := make(map[string]interface{})
 	if notifyChannel.RequestType != "flashduty" {
-		tplContent = messageTemplate.RenderEvent(events, siteInfo.SiteUrl)
+		tplContent = messageTemplate.RenderEvent(events)
 	}

 	var contactKey string
@@ -535,7 +435,10 @@ func SendNotifyRuleMessage(ctx *ctx.Context, userCache *memsto.UserCacheType, us
 		contactKey = notifyChannel.ParamConfig.UserInfo.ContactKey
 	}

-	sendtos, flashDutyChannelIDs, pagerdutyRoutingKeys, customParams := GetNotifyConfigParams(notifyConfig, contactKey, userCache, userGroupCache)
+	sendtos, flashDutyChannelIDs, customParams := GetNotifyConfigParams(notifyConfig, contactKey, e.userCache, e.userGroupCache)
+
+	e.Astats.GaugeNotifyRecordQueueSize.Inc()
+	defer e.Astats.GaugeNotifyRecordQueueSize.Dec()

 	switch notifyChannel.RequestType {
 	case "flashduty":
@@ -544,51 +447,43 @@ func SendNotifyRuleMessage(ctx *ctx.Context, userCache *memsto.UserCacheType, us
 		}

 		for i := range flashDutyChannelIDs {
-			start := time.Now()
-			respBody, err := notifyChannel.SendFlashDuty(events, flashDutyChannelIDs[i], notifyChannelCache.GetHttpClient(notifyChannel.ID))
-			respBody = fmt.Sprintf("send_time: %s duration: %d ms %s", time.Now().Format("2006-01-02 15:04:05"), time.Since(start).Milliseconds(), respBody)
-			logger.Infof("duty_sender notify_id: %d, channel_name: %v, event:%+v, IntegrationUrl: %v dutychannel_id: %v, respBody: %v, err: %v", notifyRuleId, notifyChannel.Name, events[0], notifyChannel.RequestConfig.FlashDutyRequestConfig.IntegrationUrl, flashDutyChannelIDs[i], respBody, err)
-			sender.NotifyRecord(ctx, events, notifyRuleId, notifyChannel.Name, strconv.FormatInt(flashDutyChannelIDs[i], 10), respBody, err)
+			respBody, err := notifyChannel.SendFlashDuty(events, flashDutyChannelIDs[i], e.notifyChannelCache.GetHttpClient(notifyChannel.ID))
+			logger.Infof("notify_id: %d, channel_name: %v, event:%+v, IntegrationUrl: %v dutychannel_id: %v, respBody: %v, err: %v", notifyRuleId, notifyChannel.Name, events[0], notifyChannel.RequestConfig.FlashDutyRequestConfig.IntegrationUrl, flashDutyChannelIDs[i], respBody, err)
+			sender.NotifyRecord(e.ctx, events, notifyRuleId, notifyChannel.Name, strconv.FormatInt(flashDutyChannelIDs[i], 10), respBody, err)
 		}
-
-	case "pagerduty":
-		for _, routingKey := range pagerdutyRoutingKeys {
-			start := time.Now()
-			respBody, err := notifyChannel.SendPagerDuty(events, routingKey, siteInfo.SiteUrl, notifyChannelCache.GetHttpClient(notifyChannel.ID))
-			respBody = fmt.Sprintf("send_time: %s duration: %d ms %s", time.Now().Format("2006-01-02 15:04:05"), time.Since(start).Milliseconds(), respBody)
-			logger.Infof("pagerduty_sender notify_id: %d, channel_name: %v, event:%+v, respBody: %v, err: %v", notifyRuleId, notifyChannel.Name, events[0], respBody, err)
-			sender.NotifyRecord(ctx, events, notifyRuleId, notifyChannel.Name, "", respBody, err)
-		}
-
+		return
 	case "http":
-		// 使用队列模式处理 http 通知
-		// 创建通知任务
-		task := &memsto.NotifyTask{
-			Events:        events,
-			NotifyRuleId:  notifyRuleId,
-			NotifyChannel: notifyChannel,
-			TplContent:    tplContent,
-			CustomParams:  customParams,
-			Sendtos:       sendtos,
+		if e.notifyChannelCache.HttpConcurrencyAdd(notifyChannel.ID) {
+			defer e.notifyChannelCache.HttpConcurrencyDone(notifyChannel.ID)
+		}
+		if notifyChannel.RequestConfig == nil {
+			logger.Warningf("notify_id: %d, channel_name: %v, event:%+v, request config not found", notifyRuleId, notifyChannel.Name, events[0])
 		}

-		// 将任务加入队列
-		success := notifyChannelCache.EnqueueNotifyTask(task)
-		if !success {
-			logger.Errorf("failed to enqueue notify task for channel %d, notify_id: %d", notifyChannel.ID, notifyRuleId)
-			// 如果入队失败，记录错误通知
-			sender.NotifyRecord(ctx, events, notifyRuleId, notifyChannel.Name, getSendTarget(customParams, sendtos), "", errors.New("failed to enqueue notify task, queue is full"))
+		if notifyChannel.RequestConfig.HTTPRequestConfig == nil {
+			logger.Warningf("notify_id: %d, channel_name: %v, event:%+v, http request config not found", notifyRuleId, notifyChannel.Name, events[0])
+		}
+
+		if NeedBatchContacts(notifyChannel.RequestConfig.HTTPRequestConfig) || len(sendtos) == 0 {
+			resp, err := notifyChannel.SendHTTP(events, tplContent, customParams, sendtos, e.notifyChannelCache.GetHttpClient(notifyChannel.ID))
+			logger.Infof("notify_id: %d, channel_name: %v, event:%+v, tplContent:%s, customParams:%v, userInfo:%+v, respBody: %v, err: %v", notifyRuleId, notifyChannel.Name, events[0], tplContent, customParams, sendtos, resp, err)
+
+			sender.NotifyRecord(e.ctx, events, notifyRuleId, notifyChannel.Name, getSendTarget(customParams, sendtos), resp, err)
+		} else {
+			for i := range sendtos {
+				resp, err := notifyChannel.SendHTTP(events, tplContent, customParams, []string{sendtos[i]}, e.notifyChannelCache.GetHttpClient(notifyChannel.ID))
+				logger.Infof("notify_id: %d, channel_name: %v, event:%+v, tplContent:%s, customParams:%v, userInfo:%+v, respBody: %v, err: %v", notifyRuleId, notifyChannel.Name, events[0], tplContent, customParams, sendtos[i], resp, err)
+				sender.NotifyRecord(e.ctx, events, notifyRuleId, notifyChannel.Name, getSendTarget(customParams, []string{sendtos[i]}), resp, err)
+			}
 		}

 	case "smtp":
-		notifyChannel.SendEmail(notifyRuleId, events, tplContent, sendtos, notifyChannelCache.GetSmtpClient(notifyChannel.ID))
+		notifyChannel.SendEmail(notifyRuleId, events, tplContent, sendtos, e.notifyChannelCache.GetSmtpClient(notifyChannel.ID))

 	case "script":
-		start := time.Now()
 		target, res, err := notifyChannel.SendScript(events, tplContent, customParams, sendtos)
-		res = fmt.Sprintf("send_time: %s duration: %d ms %s", time.Now().Format("2006-01-02 15:04:05"), time.Since(start).Milliseconds(), res)
-		logger.Infof("script_sender notify_id: %d, channel_name: %v, event:%+v, tplContent:%s, customParams:%v, target:%s, res:%s, err:%v", notifyRuleId, notifyChannel.Name, events[0], tplContent, customParams, target, res, err)
-		sender.NotifyRecord(ctx, events, notifyRuleId, notifyChannel.Name, target, res, err)
+		logger.Infof("notify_id: %d, channel_name: %v, event:%+v, tplContent:%s, customParams:%v, target:%s, res:%s, err:%v", notifyRuleId, notifyChannel.Name, events[0], tplContent, customParams, target, res, err)
+		sender.NotifyRecord(e.ctx, events, notifyRuleId, notifyChannel.Name, target, res, err)
 	default:
 		logger.Warningf("notify_id: %d, channel_name: %v, event:%+v send type not found", notifyRuleId, notifyChannel.Name, events[0])
 	}
@@ -603,11 +498,6 @@ func NeedBatchContacts(requestConfig *models.HTTPRequestConfig) bool {
 // event: 告警/恢复事件
 // isSubscribe: 告警事件是否由subscribe的配置产生
 func (e *Dispatch) HandleEventNotify(event *models.AlertCurEvent, isSubscribe bool) {
-	go e.HandleEventWithNotifyRule(event)
-	if event.IsRecovered && event.NotifyRecovered == 0 {
-		return
-	}
-
 	rule := e.alertRuleCache.Get(event.RuleId)
 	if rule == nil {
 		return
@@ -640,6 +530,7 @@ func (e *Dispatch) HandleEventNotify(event *models.AlertCurEvent, isSubscribe bo
 		notifyTarget.AndMerge(handler(rule, event, notifyTarget, e))
 	}

+	go e.HandleEventWithNotifyRule(event)
 	go e.Send(rule, event, notifyTarget, isSubscribe)

 	// 如果是不是订阅规则出现的event, 则需要处理订阅规则的event
@@ -679,10 +570,6 @@ func (e *Dispatch) handleSub(sub *models.AlertSubscribe, event models.AlertCurEv
 		return
 	}

-	if !sub.MatchCate(event.Cate) {
-		return
-	}
-
 	if !common.MatchTags(event.TagsMap, sub.ITags) {
 		return
 	}
@@ -833,12 +720,12 @@ func (e *Dispatch) HandleIbex(rule *models.AlertRule, event *models.AlertCurEven

 		if len(t.Host) == 0 {
 			sender.CallIbex(e.ctx, t.TplId, event.TargetIdent,
-				e.taskTplsCache, e.targetCache, e.userCache, event, "")
+				e.taskTplsCache, e.targetCache, e.userCache, event)
 			continue
 		}
 		for _, host := range t.Host {
 			sender.CallIbex(e.ctx, t.TplId, host,
-				e.taskTplsCache, e.targetCache, e.userCache, event, "")
+				e.taskTplsCache, e.targetCache, e.userCache, event)
 		}
 	}
 }
--- a/alert/eval/alert_rule.go
+++ b/alert/eval/alert_rule.go
@@ -93,7 +93,7 @@ func (s *Scheduler) syncAlertRules() {
 		}

 		ruleType := rule.GetRuleType()
-		if rule.IsPrometheusRule() || rule.IsInnerRule() {
+		if rule.IsPrometheusRule() || rule.IsLokiRule() || rule.IsTdengineRule() || rule.IsClickHouseRule() || rule.IsElasticSearch() {
 			datasourceIds := s.datasourceCache.GetIDsByDsCateAndQueries(rule.Cate, rule.DatasourceQueries)
 			for _, dsId := range datasourceIds {
 				if !naming.DatasourceHashRing.IsHit(strconv.FormatInt(dsId, 10), fmt.Sprintf("%d", rule.Id), s.aconf.Heartbeat.Endpoint) {
--- a/alert/eval/eval.go
+++ b/alert/eval/eval.go
@@ -11,7 +11,6 @@ import (
 	"strconv"
 	"strings"
 	"sync"
-	"text/template"
 	"time"

 	"github.com/ccfos/nightingale/v6/alert/astats"
@@ -25,7 +24,6 @@ import (
 	"github.com/ccfos/nightingale/v6/pkg/poster"
 	promsdk "github.com/ccfos/nightingale/v6/pkg/prom"
 	promql2 "github.com/ccfos/nightingale/v6/pkg/promql"
-	"github.com/ccfos/nightingale/v6/pkg/tplx"
 	"github.com/ccfos/nightingale/v6/pkg/unit"
 	"github.com/ccfos/nightingale/v6/prom"
 	"github.com/prometheus/common/model"
@@ -62,7 +60,6 @@ const (
 	CHECK_QUERY     = "check_query_config"
 	GET_CLIENT      = "get_client"
 	QUERY_DATA      = "query_data"
-	EXEC_TEMPLATE   = "exec_template"
 )

 const (
@@ -147,24 +144,14 @@ func (arw *AlertRuleWorker) Start() {
 }

 func (arw *AlertRuleWorker) Eval() {
-	begin := time.Now()
-	var message string
-
-	defer func() {
-		if len(message) == 0 {
-			logger.Infof("rule_eval:%s finished, duration:%v", arw.Key(), time.Since(begin))
-		} else {
-			logger.Warningf("rule_eval:%s finished, duration:%v, message:%s", arw.Key(), time.Since(begin), message)
-		}
-	}()
-
+	logger.Infof("eval:%s started", arw.Key())
 	if arw.Processor.PromEvalInterval == 0 {
 		arw.Processor.PromEvalInterval = getPromEvalInterval(arw.Processor.ScheduleEntry.Schedule)
 	}

 	cachedRule := arw.Rule
 	if cachedRule == nil {
-		message = "rule not found"
+		// logger.Errorf("rule_eval:%s Rule not found", arw.Key())
 		return
 	}
 	arw.Processor.Stats.CounterRuleEval.WithLabelValues().Inc()
@@ -189,12 +176,12 @@ func (arw *AlertRuleWorker) Eval() {
 	}

 	if err != nil {
-		message = fmt.Sprintf("failed to get anomaly points: %v", err)
+		logger.Errorf("rule_eval:%s get anomaly point err:%s", arw.Key(), err.Error())
 		return
 	}

 	if arw.Processor == nil {
-		message = "processor is nil"
+		logger.Warningf("rule_eval:%s Processor is nil", arw.Key())
 		return
 	}

@@ -236,7 +223,7 @@ func (arw *AlertRuleWorker) Eval() {
 }

 func (arw *AlertRuleWorker) Stop() {
-	logger.Infof("rule_eval:%s stopped", arw.Key())
+	logger.Infof("rule_eval %s stopped", arw.Key())
 	close(arw.Quit)
 	c := arw.Scheduler.Stop()
 	<-c.Done()
@@ -288,7 +275,7 @@ func (arw *AlertRuleWorker) GetPromAnomalyPoint(ruleConfig string) ([]models.Ano
 			continue
 		}

-		if query.VarEnabled && strings.Contains(query.PromQl, "$") {
+		if query.VarEnabled {
 			var anomalyPoints []models.AnomalyPoint
 			if hasLabelLossAggregator(query) || notExactMatch(query) {
 				// 若有聚合函数或非精确匹配则需要先填充变量然后查询，这个方式效率较低
@@ -1079,15 +1066,15 @@ func exclude(reHashTagIndex1 map[uint64][][]uint64, reHashTagIndex2 map[uint64][

 func MakeSeriesMap(series []models.DataResp, seriesTagIndex map[uint64][]uint64, seriesStore map[uint64]models.DataResp) {
 	for i := 0; i < len(series); i++ {
-		seriesHash := hash.GetHash(series[i].Metric, series[i].Ref)
+		serieHash := hash.GetHash(series[i].Metric, series[i].Ref)
 		tagHash := hash.GetTagHash(series[i].Metric)
-		seriesStore[seriesHash] = series[i]
+		seriesStore[serieHash] = series[i]

 		// 将曲线按照相同的 tag 分组
 		if _, exists := seriesTagIndex[tagHash]; !exists {
 			seriesTagIndex[tagHash] = make([]uint64, 0)
 		}
-		seriesTagIndex[tagHash] = append(seriesTagIndex[tagHash], seriesHash)
+		seriesTagIndex[tagHash] = append(seriesTagIndex[tagHash], serieHash)
 	}
 }

@@ -1486,16 +1473,6 @@ func (arw *AlertRuleWorker) GetAnomalyPoint(rule *models.AlertRule, dsId int64)
 				return points, recoverPoints, fmt.Errorf("rule_eval:%d datasource:%d not exists", rule.Id, dsId)
 			}

-			if err = ExecuteQueryTemplate(rule.Cate, query, nil); err != nil {
-				logger.Warningf("rule_eval rid:%d execute query template error: %v", rule.Id, err)
-				arw.Processor.Stats.CounterRuleEvalErrorTotal.WithLabelValues(fmt.Sprintf("%v", arw.Processor.DatasourceId()), EXEC_TEMPLATE, arw.Processor.BusiGroupCache.GetNameByBusiGroupId(arw.Rule.GroupId), fmt.Sprintf("%v", arw.Rule.Id)).Inc()
-				arw.Processor.Stats.GaugeQuerySeriesCount.WithLabelValues(
-					fmt.Sprintf("%v", arw.Rule.Id),
-					fmt.Sprintf("%v", arw.Processor.DatasourceId()),
-					fmt.Sprintf("%v", i),
-				).Set(-3)
-			}
-
 			ctx := context.WithValue(context.Background(), "delay", int64(rule.Delay))
 			series, err := plug.QueryData(ctx, query)
 			arw.Processor.Stats.CounterQueryDataTotal.WithLabelValues(fmt.Sprintf("%d", arw.DatasourceId), fmt.Sprintf("%d", rule.Id)).Inc()
@@ -1520,15 +1497,15 @@ func (arw *AlertRuleWorker) GetAnomalyPoint(rule *models.AlertRule, dsId int64)
 			//  此条日志很重要，是告警判断的现场值
 			logger.Infof("rule_eval rid:%d req:%+v resp:%v", rule.Id, query, series)
 			for i := 0; i < len(series); i++ {
-				seriesHash := hash.GetHash(series[i].Metric, series[i].Ref)
+				serieHash := hash.GetHash(series[i].Metric, series[i].Ref)
 				tagHash := hash.GetTagHash(series[i].Metric)
-				seriesStore[seriesHash] = series[i]
+				seriesStore[serieHash] = series[i]

 				// 将曲线按照相同的 tag 分组
 				if _, exists := seriesTagIndex[tagHash]; !exists {
 					seriesTagIndex[tagHash] = make([]uint64, 0)
 				}
-				seriesTagIndex[tagHash] = append(seriesTagIndex[tagHash], seriesHash)
+				seriesTagIndex[tagHash] = append(seriesTagIndex[tagHash], serieHash)
 			}
 			ref, err := GetQueryRef(query)
 			if err != nil {
@@ -1562,8 +1539,8 @@ func (arw *AlertRuleWorker) GetAnomalyPoint(rule *models.AlertRule, dsId int64)
 					var ts int64
 					var sample models.DataResp
 					var value float64
-					for _, seriesHash := range seriesHash {
-						series, exists := seriesStore[seriesHash]
+					for _, serieHash := range seriesHash {
+						series, exists := seriesStore[serieHash]
 						if !exists {
 							logger.Warningf("rule_eval rid:%d series:%+v not found", rule.Id, series)
 							continue
@@ -1711,61 +1688,3 @@ func (arw *AlertRuleWorker) GetAnomalyPoint(rule *models.AlertRule, dsId int64)

 	return points, recoverPoints, nil
 }
-
-// ExecuteQueryTemplate 根据数据源类型对 Query 进行模板渲染处理
-// cate: 数据源类别，如 "mysql", "pgsql" 等
-// query: 查询对象，如果是数据库类型的数据源，会处理其中的 sql 字段
-// data: 模板数据对象，如果为 nil 则使用空结构体（不支持变量渲染），如果不为 nil 则使用传入的数据（支持变量渲染）
-func ExecuteQueryTemplate(cate string, query interface{}, data interface{}) error {
-	// 检查 query 是否是 map，且包含 sql 字段
-	queryMap, ok := query.(map[string]interface{})
-	if !ok {
-		return nil
-	}
-
-	sqlVal, exists := queryMap["sql"]
-	if !exists {
-		return nil
-	}
-
-	sqlStr, ok := sqlVal.(string)
-	if !ok {
-		return nil
-	}
-
-	// 调用 ExecuteSqlTemplate 处理 sql 字段
-	processedSQL, err := ExecuteSqlTemplate(sqlStr, data)
-	if err != nil {
-		return fmt.Errorf("execute sql template error: %w", err)
-	}
-
-	// 更新 query 中的 sql 字段
-	queryMap["sql"] = processedSQL
-	return nil
-}
-
-// ExecuteSqlTemplate 执行 query 中的 golang 模板语法函数
-// query: 要处理的 query 字符串
-// data: 模板数据对象，如果为 nil 则使用空结构体（不支持变量渲染），如果不为 nil 则使用传入的数据（支持变量渲染）
-func ExecuteSqlTemplate(query string, data interface{}) (string, error) {
-	if !strings.Contains(query, "{{") || !strings.Contains(query, "}}") {
-		return query, nil
-	}
-
-	tmpl, err := template.New("query").Funcs(tplx.TemplateFuncMap).Parse(query)
-	if err != nil {
-		return "", fmt.Errorf("query tmpl parse error: %w", err)
-	}
-
-	var buf strings.Builder
-	templateData := data
-	if templateData == nil {
-		templateData = struct{}{}
-	}
-
-	if err := tmpl.Execute(&buf, templateData); err != nil {
-		return "", fmt.Errorf("query tmpl execute error: %w", err)
-	}
-
-	return buf.String(), nil
-}
--- a/alert/mute/mute.go
+++ b/alert/mute/mute.go
@@ -1,7 +1,6 @@
 package mute

 import (
-	"slices"
 	"strconv"
 	"strings"
 	"time"
@@ -10,7 +9,6 @@ import (
 	"github.com/ccfos/nightingale/v6/memsto"
 	"github.com/ccfos/nightingale/v6/models"

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

@@ -137,8 +135,7 @@ func EventMuteStrategy(event *models.AlertCurEvent, alertMuteCache *memsto.Alert
 	}

 	for i := 0; i < len(mutes); i++ {
-		matched, _ := MatchMute(event, mutes[i])
-		if matched {
+		if MatchMute(event, mutes[i]) {
 			return true, mutes[i].Id
 		}
 	}
@@ -147,21 +144,27 @@ func EventMuteStrategy(event *models.AlertCurEvent, alertMuteCache *memsto.Alert
 }

 // MatchMute 如果传入了clock这个可选参数，就表示使用这个clock表示的时间，否则就从event的字段中取TriggerTime
-func MatchMute(event *models.AlertCurEvent, mute *models.AlertMute, clock ...int64) (bool, error) {
+func MatchMute(event *models.AlertCurEvent, mute *models.AlertMute, clock ...int64) bool {
 	if mute.Disabled == 1 {
-		return false, errors.New("mute is disabled")
+		return false
 	}

 	// 如果不是全局的，判断 匹配的 datasource id
 	if len(mute.DatasourceIdsJson) != 0 && mute.DatasourceIdsJson[0] != 0 && event.DatasourceId != 0 {
-		if !slices.Contains(mute.DatasourceIdsJson, event.DatasourceId) {
-			return false, errors.New("datasource id not match")
+		idm := make(map[int64]struct{}, len(mute.DatasourceIdsJson))
+		for i := 0; i < len(mute.DatasourceIdsJson); i++ {
+			idm[mute.DatasourceIdsJson[i]] = struct{}{}
+		}
+
+		// 判断 event.datasourceId 是否包含在 idm 中
+		if _, has := idm[event.DatasourceId]; !has {
+			return false
 		}
 	}

 	if mute.MuteTimeType == models.TimeRange {
 		if !mute.IsWithinTimeRange(event.TriggerTime) {
-			return false, errors.New("event trigger time not within mute time range")
+			return false
 		}
 	} else if mute.MuteTimeType == models.Periodic {
 		ts := event.TriggerTime
@@ -170,11 +173,11 @@ func MatchMute(event *models.AlertCurEvent, mute *models.AlertMute, clock ...int
 		}

 		if !mute.IsWithinPeriodicMute(ts) {
-			return false, errors.New("event trigger time not within periodic mute range")
+			return false
 		}
 	} else {
 		logger.Warningf("mute time type invalid, %d", mute.MuteTimeType)
-		return false, errors.New("mute time type invalid")
+		return false
 	}

 	var matchSeverity bool
@@ -190,14 +193,12 @@ func MatchMute(event *models.AlertCurEvent, mute *models.AlertMute, clock ...int
 	}

 	if !matchSeverity {
-		return false, errors.New("event severity not match mute severity")
+		return false
 	}

-	if len(mute.ITags) == 0 {
-		return true, nil
+	if mute.ITags == nil || len(mute.ITags) == 0 {
+		return true
 	}
-	if !common.MatchTags(event.TagsMap, mute.ITags) {
-		return false, errors.New("event tags not match mute tags")
-	}
-	return true, nil
+
+	return common.MatchTags(event.TagsMap, mute.ITags)
 }
--- a/alert/naming/heartbeat.go
+++ b/alert/naming/heartbeat.go
@@ -115,7 +115,7 @@ func (n *Naming) heartbeat() error {
 		newDatasource[datasourceIds[i]] = struct{}{}
 		servers, err := n.ActiveServers(datasourceIds[i])
 		if err != nil {
-			logger.Warningf("heartbeat %d get active server err:%v", datasourceIds[i], err)
+			logger.Warningf("hearbeat %d get active server err:%v", datasourceIds[i], err)
 			n.astats.CounterHeartbeatErrorTotal.WithLabelValues().Inc()
 			continue
 		}
@@ -148,7 +148,7 @@ func (n *Naming) heartbeat() error {

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

 import (
-	_ "github.com/ccfos/nightingale/v6/alert/pipeline/processor/aisummary"
 	_ "github.com/ccfos/nightingale/v6/alert/pipeline/processor/callback"
 	_ "github.com/ccfos/nightingale/v6/alert/pipeline/processor/eventdrop"
 	_ "github.com/ccfos/nightingale/v6/alert/pipeline/processor/eventupdate"
-	_ "github.com/ccfos/nightingale/v6/alert/pipeline/processor/logic"
 	_ "github.com/ccfos/nightingale/v6/alert/pipeline/processor/relabel"
 )

--- a/alert/pipeline/processor/aisummary/ai_summary.go
+++ b/alert/pipeline/processor/aisummary/ai_summary.go
@@ -1,246 +0,0 @@
-package aisummary
-
-import (
-	"bytes"
-	"crypto/tls"
-	"encoding/json"
-	"fmt"
-	"io"
-	"net/http"
-	"net/url"
-	"strconv"
-	"strings"
-	"text/template"
-	"time"
-
-	"github.com/ccfos/nightingale/v6/alert/pipeline/processor/callback"
-	"github.com/ccfos/nightingale/v6/alert/pipeline/processor/common"
-	"github.com/ccfos/nightingale/v6/models"
-	"github.com/ccfos/nightingale/v6/pkg/ctx"
-	"github.com/ccfos/nightingale/v6/pkg/tplx"
-)
-
-const (
-	HTTP_STATUS_SUCCESS_MAX = 299
-)
-
-// AISummaryConfig 配置结构体
-type AISummaryConfig struct {
-	callback.HTTPConfig
-	ModelName      string                 `json:"model_name"`
-	APIKey         string                 `json:"api_key"`
-	PromptTemplate string                 `json:"prompt_template"`
-	CustomParams   map[string]interface{} `json:"custom_params"`
-}
-
-type Message struct {
-	Role    string `json:"role"`
-	Content string `json:"content"`
-}
-
-type ChatCompletionResponse struct {
-	Choices []struct {
-		Message struct {
-			Content string `json:"content"`
-		} `json:"message"`
-	} `json:"choices"`
-}
-
-func init() {
-	models.RegisterProcessor("ai_summary", &AISummaryConfig{})
-}
-
-func (c *AISummaryConfig) Init(settings interface{}) (models.Processor, error) {
-	result, err := common.InitProcessor[*AISummaryConfig](settings)
-	return result, err
-}
-
-func (c *AISummaryConfig) Process(ctx *ctx.Context, wfCtx *models.WorkflowContext) (*models.WorkflowContext, string, error) {
-	event := wfCtx.Event
-	if c.Client == nil {
-		if err := c.initHTTPClient(); err != nil {
-			return wfCtx, "", fmt.Errorf("failed to initialize HTTP client: %v processor: %v", err, c)
-		}
-	}
-
-	// 准备告警事件信息
-	eventInfo, err := c.prepareEventInfo(wfCtx)
-	if err != nil {
-		return wfCtx, "", fmt.Errorf("failed to prepare event info: %v processor: %v", err, c)
-	}
-
-	// 调用AI模型生成总结
-	summary, err := c.generateAISummary(eventInfo)
-	if err != nil {
-		return wfCtx, "", fmt.Errorf("failed to generate AI summary: %v processor: %v", err, c)
-	}
-
-	// 将总结添加到annotations字段
-	if event.AnnotationsJSON == nil {
-		event.AnnotationsJSON = make(map[string]string)
-	}
-	event.AnnotationsJSON["ai_summary"] = summary
-
-	// 更新Annotations字段
-	b, err := json.Marshal(event.AnnotationsJSON)
-	if err != nil {
-		return wfCtx, "", fmt.Errorf("failed to marshal annotations: %v processor: %v", err, c)
-	}
-	event.Annotations = string(b)
-
-	return wfCtx, "", nil
-}
-
-func (c *AISummaryConfig) initHTTPClient() error {
-	transport := &http.Transport{
-		TLSClientConfig: &tls.Config{InsecureSkipVerify: c.SkipSSLVerify},
-	}
-
-	if c.Proxy != "" {
-		proxyURL, err := url.Parse(c.Proxy)
-		if err != nil {
-			return fmt.Errorf("failed to parse proxy url: %v", err)
-		}
-		transport.Proxy = http.ProxyURL(proxyURL)
-	}
-
-	c.Client = &http.Client{
-		Timeout:   time.Duration(c.Timeout) * time.Millisecond,
-		Transport: transport,
-	}
-	return nil
-}
-
-func (c *AISummaryConfig) prepareEventInfo(wfCtx *models.WorkflowContext) (string, error) {
-	var defs = []string{
-		"{{$event := .Event}}",
-		"{{$env := .Env}}",
-	}
-
-	text := strings.Join(append(defs, c.PromptTemplate), "")
-	t, err := template.New("prompt").Funcs(template.FuncMap(tplx.TemplateFuncMap)).Parse(text)
-	if err != nil {
-		return "", fmt.Errorf("failed to parse prompt template: %v", err)
-	}
-
-	var body bytes.Buffer
-	err = t.Execute(&body, wfCtx)
-	if err != nil {
-		return "", fmt.Errorf("failed to execute prompt template: %v", err)
-	}
-
-	return body.String(), nil
-}
-
-func (c *AISummaryConfig) generateAISummary(eventInfo string) (string, error) {
-	// 构建基础请求参数
-	reqParams := map[string]interface{}{
-		"model": c.ModelName,
-		"messages": []Message{
-			{
-				Role:    "user",
-				Content: eventInfo,
-			},
-		},
-	}
-
-	// 合并自定义参数
-	for k, v := range c.CustomParams {
-		converted, err := convertCustomParam(v)
-		if err != nil {
-			return "", fmt.Errorf("failed to convert custom param %s: %v", k, err)
-		}
-		reqParams[k] = converted
-	}
-
-	// 序列化请求体
-	jsonData, err := json.Marshal(reqParams)
-	if err != nil {
-		return "", fmt.Errorf("failed to marshal request body: %v", err)
-	}
-
-	// 创建HTTP请求
-	req, err := http.NewRequest("POST", c.URL, bytes.NewBuffer(jsonData))
-	if err != nil {
-		return "", fmt.Errorf("failed to create request: %v", err)
-	}
-
-	// 设置请求头
-	req.Header.Set("Authorization", "Bearer "+c.APIKey)
-	req.Header.Set("Content-Type", "application/json")
-	for k, v := range c.Headers {
-		req.Header.Set(k, v)
-	}
-
-	// 发送请求
-	resp, err := c.Client.Do(req)
-	if err != nil {
-		return "", fmt.Errorf("failed to send request: %v", err)
-	}
-	defer resp.Body.Close()
-
-	// 检查响应状态码
-	if resp.StatusCode > HTTP_STATUS_SUCCESS_MAX {
-		body, _ := io.ReadAll(resp.Body)
-		return "", fmt.Errorf("unexpected status code: %d, body: %s", resp.StatusCode, string(body))
-	}
-
-	// 读取响应
-	body, err := io.ReadAll(resp.Body)
-	if err != nil {
-		return "", fmt.Errorf("failed to read response body: %v", err)
-	}
-
-	// 解析响应
-	var chatResp ChatCompletionResponse
-	if err := json.Unmarshal(body, &chatResp); err != nil {
-		return "", fmt.Errorf("failed to unmarshal response: %v", err)
-	}
-
-	if len(chatResp.Choices) == 0 {
-		return "", fmt.Errorf("no response from AI model")
-	}
-
-	return chatResp.Choices[0].Message.Content, nil
-}
-
-// convertCustomParam 将前端传入的参数转换为正确的类型
-func convertCustomParam(value interface{}) (interface{}, error) {
-	if value == nil {
-		return nil, nil
-	}
-
-	// 如果是字符串，尝试转换为其他类型
-	if str, ok := value.(string); ok {
-		// 尝试转换为数字
-		if f, err := strconv.ParseFloat(str, 64); err == nil {
-			// 检查是否为整数
-			if f == float64(int64(f)) {
-				return int64(f), nil
-			}
-			return f, nil
-		}
-
-		// 尝试转换为布尔值
-		if b, err := strconv.ParseBool(str); err == nil {
-			return b, nil
-		}
-
-		// 尝试解析为JSON数组
-		if strings.HasPrefix(strings.TrimSpace(str), "[") {
-			var arr []interface{}
-			if err := json.Unmarshal([]byte(str), &arr); err == nil {
-				return arr, nil
-			}
-		}
-
-		// 尝试解析为JSON对象
-		if strings.HasPrefix(strings.TrimSpace(str), "{") {
-			var obj map[string]interface{}
-			if err := json.Unmarshal([]byte(str), &obj); err == nil {
-				return obj, nil
-			}
-		}
-	}
-	return value, nil
-}
--- a/alert/pipeline/processor/aisummary/ai_summary_test.go
+++ b/alert/pipeline/processor/aisummary/ai_summary_test.go
@@ -1,145 +0,0 @@
-package aisummary
-
-import (
-	"testing"
-
-	"github.com/ccfos/nightingale/v6/alert/pipeline/processor/callback"
-	"github.com/ccfos/nightingale/v6/models"
-	"github.com/ccfos/nightingale/v6/pkg/ctx"
-	"github.com/stretchr/testify/assert"
-)
-
-func TestAISummaryConfig_Process(t *testing.T) {
-	// 创建测试配置
-	config := &AISummaryConfig{
-		HTTPConfig: callback.HTTPConfig{
-			URL:           "https://generativelanguage.googleapis.com/v1beta/openai/chat/completions",
-			Timeout:       30000,
-			SkipSSLVerify: true,
-			Headers: map[string]string{
-				"Content-Type": "application/json",
-			},
-		},
-		ModelName:      "gemini-2.0-flash",
-		APIKey:         "*",
-		PromptTemplate: "告警规则：{{$event.RuleName}}\n严重程度：{{$event.Severity}}",
-		CustomParams: map[string]interface{}{
-			"temperature": 0.7,
-			"max_tokens":  2000,
-			"top_p":       0.9,
-		},
-	}
-
-	// 创建测试事件
-	event := &models.AlertCurEvent{
-		RuleName: "Test Rule",
-		Severity: 1,
-		TagsMap: map[string]string{
-			"host": "test-host",
-		},
-		AnnotationsJSON: map[string]string{
-			"description": "Test alert",
-		},
-	}
-
-	// 创建 WorkflowContext
-	wfCtx := &models.WorkflowContext{
-		Event: event,
-		Env:   map[string]string{},
-	}
-
-	// 测试模板处理
-	eventInfo, err := config.prepareEventInfo(wfCtx)
-	assert.NoError(t, err)
-	assert.Contains(t, eventInfo, "Test Rule")
-	assert.Contains(t, eventInfo, "1")
-
-	// 测试配置初始化
-	processor, err := config.Init(config)
-	assert.NoError(t, err)
-	assert.NotNil(t, processor)
-
-	// 测试处理函数
-	result, _, err := processor.Process(&ctx.Context{}, wfCtx)
-	assert.NoError(t, err)
-	assert.NotNil(t, result)
-	assert.NotEmpty(t, result.Event.AnnotationsJSON["ai_summary"])
-
-	// 展示处理结果
-	t.Log("\n=== 处理结果 ===")
-	t.Logf("告警规则: %s", result.Event.RuleName)
-	t.Logf("严重程度: %d", result.Event.Severity)
-	t.Logf("标签: %v", result.Event.TagsMap)
-	t.Logf("原始注释: %v", result.Event.AnnotationsJSON["description"])
-	t.Logf("AI总结: %s", result.Event.AnnotationsJSON["ai_summary"])
-}
-
-func TestConvertCustomParam(t *testing.T) {
-	tests := []struct {
-		name     string
-		input    interface{}
-		expected interface{}
-		hasError bool
-	}{
-		{
-			name:     "nil value",
-			input:    nil,
-			expected: nil,
-			hasError: false,
-		},
-		{
-			name:     "string number to int64",
-			input:    "123",
-			expected: int64(123),
-			hasError: false,
-		},
-		{
-			name:     "string float to float64",
-			input:    "123.45",
-			expected: 123.45,
-			hasError: false,
-		},
-		{
-			name:     "string boolean to bool",
-			input:    "true",
-			expected: true,
-			hasError: false,
-		},
-		{
-			name:     "string false to bool",
-			input:    "false",
-			expected: false,
-			hasError: false,
-		},
-		{
-			name:     "JSON array string to slice",
-			input:    `["a", "b", "c"]`,
-			expected: []interface{}{"a", "b", "c"},
-			hasError: false,
-		},
-		{
-			name:     "JSON object string to map",
-			input:    `{"key": "value", "num": 123}`,
-			expected: map[string]interface{}{"key": "value", "num": float64(123)},
-			hasError: false,
-		},
-		{
-			name:     "plain string remains string",
-			input:    "hello world",
-			expected: "hello world",
-			hasError: false,
-		},
-	}
-
-	for _, test := range tests {
-		t.Run(test.name, func(t *testing.T) {
-			converted, err := convertCustomParam(test.input)
-			if test.hasError {
-				assert.Error(t, err)
-				return
-			}
-			assert.NoError(t, err)
-			assert.Equal(t, test.expected, converted)
-		})
-	}
-}
--- a/alert/pipeline/processor/callback/callback.go
+++ b/alert/pipeline/processor/callback/callback.go
@@ -3,7 +3,6 @@ package callback
 import (
 	"crypto/tls"
 	"encoding/json"
-	"fmt"
 	"io"
 	"net/http"
 	"net/url"
@@ -20,7 +19,7 @@ type HTTPConfig struct {
 	URL           string            `json:"url"`
 	Method        string            `json:"method,omitempty"`
 	Body          string            `json:"body,omitempty"`
-	Headers       map[string]string `json:"header"`
+	Headers       map[string]string `json:"headers"`
 	AuthUsername  string            `json:"auth_username"`
 	AuthPassword  string            `json:"auth_password"`
 	Timeout       int               `json:"timeout"` // 单位:ms
@@ -43,8 +42,7 @@ func (c *CallbackConfig) Init(settings interface{}) (models.Processor, error) {
 	return result, err
 }

-func (c *CallbackConfig) Process(ctx *ctx.Context, wfCtx *models.WorkflowContext) (*models.WorkflowContext, string, error) {
-	event := wfCtx.Event
+func (c *CallbackConfig) Process(ctx *ctx.Context, event *models.AlertCurEvent) *models.AlertCurEvent {
 	if c.Client == nil {
 		transport := &http.Transport{
 			TLSClientConfig: &tls.Config{InsecureSkipVerify: c.SkipSSLVerify},
@@ -53,7 +51,7 @@ func (c *CallbackConfig) Process(ctx *ctx.Context, wfCtx *models.WorkflowContext
 		if c.Proxy != "" {
 			proxyURL, err := url.Parse(c.Proxy)
 			if err != nil {
-				return wfCtx, "", fmt.Errorf("failed to parse proxy url: %v processor: %v", err, c)
+				logger.Errorf("failed to parse proxy url: %v", err)
 			} else {
 				transport.Proxy = http.ProxyURL(proxyURL)
 			}
@@ -73,12 +71,14 @@ func (c *CallbackConfig) Process(ctx *ctx.Context, wfCtx *models.WorkflowContext

 	body, err := json.Marshal(event)
 	if err != nil {
-		return wfCtx, "", fmt.Errorf("failed to marshal event: %v processor: %v", err, c)
+		logger.Errorf("failed to marshal event: %v", err)
+		return event
 	}

 	req, err := http.NewRequest("POST", c.URL, strings.NewReader(string(body)))
 	if err != nil {
-		return wfCtx, "", fmt.Errorf("failed to create request: %v processor: %v", err, c)
+		logger.Errorf("failed to create request: %v event: %v", err, event)
+		return event
 	}

 	for k, v := range headers {
@@ -91,14 +91,16 @@ func (c *CallbackConfig) Process(ctx *ctx.Context, wfCtx *models.WorkflowContext

 	resp, err := c.Client.Do(req)
 	if err != nil {
-		return wfCtx, "", fmt.Errorf("failed to send request: %v processor: %v", err, c)
+		logger.Errorf("failed to send request: %v event: %v", err, event)
+		return event
 	}

 	b, err := io.ReadAll(resp.Body)
 	if err != nil {
-		return wfCtx, "", fmt.Errorf("failed to read response body: %v processor: %v", err, c)
+		logger.Errorf("failed to read response body: %v event: %v", err, event)
+		return event
 	}

-	logger.Debugf("callback processor response body: %s", string(b))
-	return wfCtx, "callback success", nil
+	logger.Infof("response body: %s", string(b))
+	return event
 }
--- a/alert/pipeline/processor/eventdrop/event_drop.go
+++ b/alert/pipeline/processor/eventdrop/event_drop.go
@@ -2,7 +2,6 @@ package eventdrop

 import (
 	"bytes"
-	"fmt"
 	"strings"
 	texttemplate "text/template"

@@ -26,37 +25,37 @@ func (c *EventDropConfig) Init(settings interface{}) (models.Processor, error) {
 	return result, err
 }

-func (c *EventDropConfig) Process(ctx *ctx.Context, wfCtx *models.WorkflowContext) (*models.WorkflowContext, string, error) {
+func (c *EventDropConfig) Process(ctx *ctx.Context, event *models.AlertCurEvent) *models.AlertCurEvent {
 	// 使用背景是可以根据此处理器，实现对事件进行更加灵活的过滤的逻辑
 	// 在标签过滤和属性过滤都不满足需求时可以使用
 	// 如果模板执行结果为 true，则删除该事件
-	event := wfCtx.Event

 	var defs = []string{
-		"{{ $event := .Event }}",
-		"{{ $labels := .Event.TagsMap }}",
-		"{{ $value := .Event.TriggerValue }}",
-		"{{ $env := .Env }}",
+		"{{ $event := . }}",
+		"{{ $labels := .TagsMap }}",
+		"{{ $value := .TriggerValue }}",
 	}

 	text := strings.Join(append(defs, c.Content), "")

 	tpl, err := texttemplate.New("eventdrop").Funcs(tplx.TemplateFuncMap).Parse(text)
 	if err != nil {
-		return wfCtx, "", fmt.Errorf("processor failed to parse template: %v processor: %v", err, c)
+		logger.Errorf("processor failed to parse template: %v event: %v", err, event)
+		return event
 	}

 	var body bytes.Buffer
-	if err = tpl.Execute(&body, wfCtx); err != nil {
-		return wfCtx, "", fmt.Errorf("processor failed to execute template: %v processor: %v", err, c)
+	if err = tpl.Execute(&body, event); err != nil {
+		logger.Errorf("processor failed to execute template: %v event: %v", err, event)
+		return event
 	}

 	result := strings.TrimSpace(body.String())
 	logger.Infof("processor eventdrop result: %v", result)
 	if result == "true" {
 		logger.Infof("processor eventdrop drop event: %v", event)
-		return nil, "drop event success", nil
+		return nil
 	}

-	return wfCtx, "drop event failed", nil
+	return event
 }
--- a/alert/pipeline/processor/eventupdate/event_update.go
+++ b/alert/pipeline/processor/eventupdate/event_update.go
@@ -3,7 +3,6 @@ package eventupdate
 import (
 	"crypto/tls"
 	"encoding/json"
-	"fmt"
 	"io"
 	"net/http"
 	"net/url"
@@ -31,8 +30,7 @@ func (c *EventUpdateConfig) Init(settings interface{}) (models.Processor, error)
 	return result, err
 }

-func (c *EventUpdateConfig) Process(ctx *ctx.Context, wfCtx *models.WorkflowContext) (*models.WorkflowContext, string, error) {
-	event := wfCtx.Event
+func (c *EventUpdateConfig) Process(ctx *ctx.Context, event *models.AlertCurEvent) *models.AlertCurEvent {
 	if c.Client == nil {
 		transport := &http.Transport{
 			TLSClientConfig: &tls.Config{InsecureSkipVerify: c.SkipSSLVerify},
@@ -41,7 +39,7 @@ func (c *EventUpdateConfig) Process(ctx *ctx.Context, wfCtx *models.WorkflowCont
 		if c.Proxy != "" {
 			proxyURL, err := url.Parse(c.Proxy)
 			if err != nil {
-				return wfCtx, "", fmt.Errorf("failed to parse proxy url: %v processor: %v", err, c)
+				logger.Errorf("failed to parse proxy url: %v", err)
 			} else {
 				transport.Proxy = http.ProxyURL(proxyURL)
 			}
@@ -61,12 +59,14 @@ func (c *EventUpdateConfig) Process(ctx *ctx.Context, wfCtx *models.WorkflowCont

 	body, err := json.Marshal(event)
 	if err != nil {
-		return wfCtx, "", fmt.Errorf("failed to marshal event: %v processor: %v", err, c)
+		logger.Errorf("failed to marshal event: %v", err)
+		return event
 	}

 	req, err := http.NewRequest("POST", c.URL, strings.NewReader(string(body)))
 	if err != nil {
-		return wfCtx, "", fmt.Errorf("failed to create request: %v processor: %v", err, c)
+		logger.Errorf("failed to create request: %v event: %v", err, event)
+		return event
 	}

 	for k, v := range headers {
@@ -79,19 +79,17 @@ func (c *EventUpdateConfig) Process(ctx *ctx.Context, wfCtx *models.WorkflowCont

 	resp, err := c.Client.Do(req)
 	if err != nil {
-		return wfCtx, "", fmt.Errorf("failed to send request: %v processor: %v", err, c)
+		logger.Errorf("failed to send request: %v event: %v", err, event)
+		return event
 	}

 	b, err := io.ReadAll(resp.Body)
 	if err != nil {
-		return nil, "", fmt.Errorf("failed to read response body: %v processor: %v", err, c)
+		logger.Errorf("failed to read response body: %v event: %v", err, event)
+		return event
 	}
-	logger.Debugf("event update processor response body: %s", string(b))
+	logger.Infof("response body: %s", string(b))

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

-func (r *RelabelConfig) Process(ctx *ctx.Context, wfCtx *models.WorkflowContext) (*models.WorkflowContext, string, error) {
+func (r *RelabelConfig) Process(ctx *ctx.Context, event *models.AlertCurEvent) *models.AlertCurEvent {
 	sourceLabels := make([]model.LabelName, len(r.SourceLabels))
 	for i := range r.SourceLabels {
 		sourceLabels[i] = model.LabelName(strings.ReplaceAll(r.SourceLabels[i], ".", REPLACE_DOT))
@@ -63,8 +63,8 @@ func (r *RelabelConfig) Process(ctx *ctx.Context, wfCtx *models.WorkflowContext)
 		},
 	}

-	EventRelabel(wfCtx.Event, relabelConfigs)
-	return wfCtx, "", nil
+	EventRelabel(event, relabelConfigs)
+	return event
 }

 func EventRelabel(event *models.AlertCurEvent, relabelConfigs []*pconf.RelabelConfig) {
--- a/alert/process/process.go
+++ b/alert/process/process.go
@@ -26,6 +26,8 @@ import (
 	"github.com/toolkits/pkg/str"
 )

+type EventMuteHookFunc func(event *models.AlertCurEvent) bool
+
 type ExternalProcessorsType struct {
 	ExternalLock sync.RWMutex
 	Processors   map[string]*Processor
@@ -74,6 +76,7 @@ type Processor struct {

 	HandleFireEventHook    HandleEventFunc
 	HandleRecoverEventHook HandleEventFunc
+	EventMuteHook          EventMuteHookFunc

 	ScheduleEntry    cron.Entry
 	PromEvalInterval int
@@ -118,6 +121,7 @@ func NewProcessor(engineName string, rule *models.AlertRule, datasourceId int64,

 		HandleFireEventHook:    func(event *models.AlertCurEvent) {},
 		HandleRecoverEventHook: func(event *models.AlertCurEvent) {},
+		EventMuteHook:          func(event *models.AlertCurEvent) bool { return false },
 	}

 	p.mayHandleGroup()
@@ -131,7 +135,7 @@ func (p *Processor) Handle(anomalyPoints []models.AnomalyPoint, from string, inh
 	p.inhibit = inhibit
 	cachedRule := p.alertRuleCache.Get(p.rule.Id)
 	if cachedRule == nil {
-		logger.Warningf("process handle error: rule not found %+v rule_id:%d maybe rule has been deleted", anomalyPoints, p.rule.Id)
+		logger.Errorf("rule not found %+v", anomalyPoints)
 		p.Stats.CounterRuleEvalErrorTotal.WithLabelValues(fmt.Sprintf("%v", p.DatasourceId()), "handle_event", p.BusiGroupCache.GetNameByBusiGroupId(p.rule.GroupId), fmt.Sprintf("%v", p.rule.Id)).Inc()
 		return
 	}
@@ -151,19 +155,9 @@ func (p *Processor) Handle(anomalyPoints []models.AnomalyPoint, from string, inh
 		// 如果 event 被 mute 了,本质也是 fire 的状态,这里无论如何都添加到 alertingKeys 中,防止 fire 的事件自动恢复了
 		hash := event.Hash
 		alertingKeys[hash] = struct{}{}
-
-		// event processor
-		eventCopy := event.DeepCopy()
-		event = dispatch.HandleEventPipeline(cachedRule.PipelineConfigs, eventCopy, event, dispatch.EventProcessorCache, p.ctx, cachedRule.Id, "alert_rule")
-		if event == nil {
-			logger.Infof("rule_eval:%s is muted drop by pipeline event:%v", p.Key(), eventCopy)
-			continue
-		}
-
-		// event mute
 		isMuted, detail, muteId := mute.IsMuted(cachedRule, event, p.TargetCache, p.alertMuteCache)
 		if isMuted {
-			logger.Infof("rule_eval:%s is muted, detail:%s event:%v", p.Key(), detail, event)
+			logger.Debugf("rule_eval:%s event:%v is muted, detail:%s", p.Key(), event, detail)
 			p.Stats.CounterMuteTotal.WithLabelValues(
 				fmt.Sprintf("%v", event.GroupName),
 				fmt.Sprintf("%v", p.rule.Id),
@@ -173,8 +167,8 @@ func (p *Processor) Handle(anomalyPoints []models.AnomalyPoint, from string, inh
 			continue
 		}

-		if dispatch.EventMuteHook(event) {
-			logger.Infof("rule_eval:%s is muted by hook event:%v", p.Key(), event)
+		if p.EventMuteHook(event) {
+			logger.Debugf("rule_eval:%s event:%v is muted by hook", p.Key(), event)
 			p.Stats.CounterMuteTotal.WithLabelValues(
 				fmt.Sprintf("%v", event.GroupName),
 				fmt.Sprintf("%v", p.rule.Id),
@@ -286,7 +280,7 @@ func Relabel(rule *models.AlertRule, event *models.AlertCurEvent) {

 	// need to keep the original label
 	event.OriginalTags = event.Tags
-	event.OriginalTagsJSON = event.TagsJSON
+	event.OriginalTagsJSON = make([]string, len(event.TagsJSON))

 	if len(rule.EventRelabelConfig) == 0 {
 		return
@@ -474,18 +468,16 @@ func (p *Processor) fireEvent(event *models.AlertCurEvent) {
 		return
 	}

-	message := "unknown"
-	defer func() {
-		logger.Infof("rule_eval:%s event-hash-%s %s", p.Key(), event.Hash, message)
-	}()
-
+	logger.Debugf("rule_eval:%s event:%+v fire", p.Key(), event)
 	if fired, has := p.fires.Get(event.Hash); has {
 		p.fires.UpdateLastEvalTime(event.Hash, event.LastEvalTime)
 		event.FirstTriggerTime = fired.FirstTriggerTime
 		p.HandleFireEventHook(event)

 		if cachedRule.NotifyRepeatStep == 0 {
-			message = "stalled, rule.notify_repeat_step is 0, no need to repeat notify"
+			logger.Debugf("rule_eval:%s event:%+v repeat is zero nothing to do", p.Key(), event)
+			// 说明不想重复通知，那就直接返回了，nothing to do
+			// do not need to send alert again
 			return
 		}

@@ -494,26 +486,21 @@ func (p *Processor) fireEvent(event *models.AlertCurEvent) {
 			if cachedRule.NotifyMaxNumber == 0 {
 				// 最大可以发送次数如果是0，表示不想限制最大发送次数，一直发即可
 				event.NotifyCurNumber = fired.NotifyCurNumber + 1
-				message = fmt.Sprintf("fired, notify_repeat_step_matched(%d >= %d + %d * 60) notify_max_number_ignore(#%d / %d)", event.LastEvalTime, fired.LastSentTime, cachedRule.NotifyRepeatStep, event.NotifyCurNumber, cachedRule.NotifyMaxNumber)
 				p.pushEventToQueue(event)
 			} else {
 				// 有最大发送次数的限制，就要看已经发了几次了，是否达到了最大发送次数
 				if fired.NotifyCurNumber >= cachedRule.NotifyMaxNumber {
-					message = fmt.Sprintf("stalled, notify_repeat_step_matched(%d >= %d + %d * 60) notify_max_number_not_matched(#%d / %d)", event.LastEvalTime, fired.LastSentTime, cachedRule.NotifyRepeatStep, fired.NotifyCurNumber, cachedRule.NotifyMaxNumber)
+					logger.Debugf("rule_eval:%s event:%+v reach max number", p.Key(), event)
 					return
 				} else {
 					event.NotifyCurNumber = fired.NotifyCurNumber + 1
-					message = fmt.Sprintf("fired, notify_repeat_step_matched(%d >= %d + %d * 60) notify_max_number_matched(#%d / %d)", event.LastEvalTime, fired.LastSentTime, cachedRule.NotifyRepeatStep, event.NotifyCurNumber, cachedRule.NotifyMaxNumber)
 					p.pushEventToQueue(event)
 				}
 			}
-		} else {
-			message = fmt.Sprintf("stalled, notify_repeat_step_not_matched(%d < %d + %d * 60)", event.LastEvalTime, fired.LastSentTime, cachedRule.NotifyRepeatStep)
 		}
 	} else {
 		event.NotifyCurNumber = 1
 		event.FirstTriggerTime = event.TriggerTime
-		message = fmt.Sprintf("fired, first_trigger_time: %d", event.FirstTriggerTime)
 		p.HandleFireEventHook(event)
 		p.pushEventToQueue(event)
 	}
@@ -591,9 +578,7 @@ func (p *Processor) fillTags(anomalyPoint models.AnomalyPoint) {
 	}

 	// handle rule tags
-	tags := p.rule.AppendTagsJSON
-	tags = append(tags, "rulename="+p.rule.Name)
-	for _, tag := range tags {
+	for _, tag := range p.rule.AppendTagsJSON {
 		arr := strings.SplitN(tag, "=", 2)

 		var defs = []string{
@@ -619,6 +604,8 @@ func (p *Processor) fillTags(anomalyPoint models.AnomalyPoint) {

 		tagsMap[arr[0]] = body.String()
 	}
+
+	tagsMap["rulename"] = p.rule.Name
 	p.tagsMap = tagsMap

 	// handle tagsArr
--- a/alert/router/router_event.go
+++ b/alert/router/router_event.go
@@ -25,7 +25,6 @@ func (rt *Router) pushEventToQueue(c *gin.Context) {
 	if event.RuleId == 0 {
 		ginx.Bomb(200, "event is illegal")
 	}
-	event.FE2DB()

 	event.TagsMap = make(map[string]string)
 	for i := 0; i < len(event.TagsJSON); i++ {
@@ -41,7 +40,7 @@ func (rt *Router) pushEventToQueue(c *gin.Context) {

 		event.TagsMap[arr[0]] = arr[1]
 	}
-	hit, _ := mute.EventMuteStrategy(event, rt.AlertMuteCache)
+	hit, _ :=  mute.EventMuteStrategy(event, rt.AlertMuteCache)
 	if hit {
 		logger.Infof("event_muted: rule_id=%d %s", event.RuleId, event.Hash)
 		ginx.NewRender(c).Message(nil)
--- a/alert/sender/callback.go
+++ b/alert/sender/callback.go
@@ -1,7 +1,6 @@
 package sender

 import (
-	"fmt"
 	"html/template"
 	"net/url"
 	"strings"
@@ -141,7 +140,7 @@ func doSendAndRecord(ctx *ctx.Context, url, token string, body interface{}, chan

 func NotifyRecord(ctx *ctx.Context, evts []*models.AlertCurEvent, notifyRuleID int64, channel, target, res string, err error) {
 	// 一个通知可能对应多个 event，都需要记录
-	notis := make([]*models.NotificationRecord, 0, len(evts))
+	notis := make([]*models.NotificaitonRecord, 0, len(evts))
 	for _, evt := range evts {
 		noti := models.NewNotificationRecord(evt, notifyRuleID, channel, target)
 		if err != nil {
@@ -167,13 +166,11 @@ func NotifyRecord(ctx *ctx.Context, evts []*models.AlertCurEvent, notifyRuleID i
 func doSend(url string, body interface{}, channel string, stats *astats.Stats) (string, error) {
 	stats.AlertNotifyTotal.WithLabelValues(channel).Inc()

-	start := time.Now()
 	res, code, err := poster.PostJSON(url, time.Second*5, body, 3)
-	res = []byte(fmt.Sprintf("duration: %d ms status_code:%d, response:%s", time.Since(start).Milliseconds(), code, string(res)))
 	if err != nil {
 		logger.Errorf("%s_sender: result=fail url=%s code=%d error=%v req:%v response=%s", channel, url, code, err, body, string(res))
 		stats.AlertNotifyErrorTotal.WithLabelValues(channel).Inc()
-		return string(res), err
+		return "", err
 	}

 	logger.Infof("%s_sender: result=succ url=%s code=%d req:%v response=%s", channel, url, code, body, string(res))
--- a/alert/sender/email.go
+++ b/alert/sender/email.go
@@ -141,7 +141,7 @@ func updateSmtp(ctx *ctx.Context, ncc *memsto.NotifyConfigCacheType) {
 func startEmailSender(ctx *ctx.Context, smtp aconf.SMTPConfig) {
 	conf := smtp
 	if conf.Host == "" || conf.Port == 0 {
-		logger.Debug("SMTP configurations invalid")
+		logger.Warning("SMTP configurations invalid")
 		<-mailQuit
 		return
 	}
--- a/alert/sender/ibex.go
+++ b/alert/sender/ibex.go
@@ -86,33 +86,30 @@ func (c *IbexCallBacker) handleIbex(ctx *ctx.Context, url string, event *models.
 		return
 	}

-	CallIbex(ctx, id, host, c.taskTplCache, c.targetCache, c.userCache, event, "")
+	CallIbex(ctx, id, host, c.taskTplCache, c.targetCache, c.userCache, event)
 }

 func CallIbex(ctx *ctx.Context, id int64, host string,
 	taskTplCache *memsto.TaskTplCache, targetCache *memsto.TargetCacheType,
-	userCache *memsto.UserCacheType, event *models.AlertCurEvent, args string) (int64, error) {
-	logger.Infof("event_callback_ibex: id: %d, host: %s, args: %s, event: %+v", id, host, args, event)
+	userCache *memsto.UserCacheType, event *models.AlertCurEvent) {
+	logger.Infof("event_callback_ibex: id: %d, host: %s, event: %+v", id, host, event)

 	tpl := taskTplCache.Get(id)
 	if tpl == nil {
-		err := fmt.Errorf("event_callback_ibex: no such tpl(%d), event: %+v", id, event)
-		logger.Errorf("%s", err)
-		return 0, err
+		logger.Errorf("event_callback_ibex: no such tpl(%d), event: %+v", id, event)
+		return
 	}
 	// check perm
 	// tpl.GroupId - host - account 三元组校验权限
-	can, err := CanDoIbex(tpl.UpdateBy, tpl, host, targetCache, userCache)
+	can, err := canDoIbex(tpl.UpdateBy, tpl, host, targetCache, userCache)
 	if err != nil {
-		err = fmt.Errorf("event_callback_ibex: check perm fail: %v, event: %+v", err, event)
-		logger.Errorf("%s", err)
-		return 0, err
+		logger.Errorf("event_callback_ibex: check perm fail: %v, event: %+v", err, event)
+		return
 	}

 	if !can {
-		err = fmt.Errorf("event_callback_ibex: user(%s) no permission, event: %+v", tpl.UpdateBy, event)
-		logger.Errorf("%s", err)
-		return 0, err
+		logger.Errorf("event_callback_ibex: user(%s) no permission, event: %+v", tpl.UpdateBy, event)
+		return
 	}

 	tagsMap := make(map[string]string)
@@ -136,16 +133,11 @@ func CallIbex(ctx *ctx.Context, id int64, host string,

 	tags, err := json.Marshal(tagsMap)
 	if err != nil {
-		err = fmt.Errorf("event_callback_ibex: failed to marshal tags to json: %v, event: %+v", tagsMap, event)
-		logger.Errorf("%s", err)
-		return 0, err
+		logger.Errorf("event_callback_ibex: failed to marshal tags to json: %v, event: %+v", tagsMap, event)
+		return
 	}

 	// call ibex
-	taskArgs := tpl.Args
-	if args != "" {
-		taskArgs = args
-	}
 	in := models.TaskForm{
 		Title:          tpl.Title + " FH: " + host,
 		Account:        tpl.Account,
@@ -154,7 +146,7 @@ func CallIbex(ctx *ctx.Context, id int64, host string,
 		Timeout:        tpl.Timeout,
 		Pause:          tpl.Pause,
 		Script:         tpl.Script,
-		Args:           taskArgs,
+		Args:           tpl.Args,
 		Stdin:          string(tags),
 		Action:         "start",
 		Creator:        tpl.UpdateBy,
@@ -164,9 +156,8 @@ func CallIbex(ctx *ctx.Context, id int64, host string,

 	id, err = TaskAdd(in, tpl.UpdateBy, ctx.IsCenter)
 	if err != nil {
-		err = fmt.Errorf("event_callback_ibex: call ibex fail: %v, event: %+v", err, event)
-		logger.Errorf("%s", err)
-		return 0, err
+		logger.Errorf("event_callback_ibex: call ibex fail: %v, event: %+v", err, event)
+		return
 	}

 	// write db
@@ -187,14 +178,11 @@ func CallIbex(ctx *ctx.Context, id int64, host string,
 	}

 	if err = record.Add(ctx); err != nil {
-		err = fmt.Errorf("event_callback_ibex: persist task_record fail: %v, event: %+v", err, event)
-		logger.Errorf("%s", err)
-		return id, err
+		logger.Errorf("event_callback_ibex: persist task_record fail: %v, event: %+v", err, event)
 	}
-	return id, nil
 }

-func CanDoIbex(username string, tpl *models.TaskTpl, host string, targetCache *memsto.TargetCacheType, userCache *memsto.UserCacheType) (bool, error) {
+func canDoIbex(username string, tpl *models.TaskTpl, host string, targetCache *memsto.TargetCacheType, userCache *memsto.UserCacheType) (bool, error) {
 	user := userCache.GetByUsername(username)
 	if user != nil && user.IsAdmin() {
 		return true, nil
--- a/alert/sender/notify_record_queue.go
+++ b/alert/sender/notify_record_queue.go
@@ -24,7 +24,7 @@ func ReportNotifyRecordQueueSize(stats *astats.Stats) {

 // 推送通知记录到队列
 // 若队列满 则返回 error
-func PushNotifyRecords(records []*models.NotificationRecord) error {
+func PushNotifyRecords(records []*models.NotificaitonRecord) error {
 	for _, record := range records {
 		if ok := NotifyRecordQueue.PushFront(record); !ok {
 			logger.Warningf("notify record queue is full, record: %+v", record)
@@ -59,16 +59,16 @@ func (c *NotifyRecordConsumer) LoopConsume() {
 		}

 		// 类型转换，不然 CreateInBatches 会报错
-		notis := make([]*models.NotificationRecord, 0, len(inotis))
+		notis := make([]*models.NotificaitonRecord, 0, len(inotis))
 		for _, inoti := range inotis {
-			notis = append(notis, inoti.(*models.NotificationRecord))
+			notis = append(notis, inoti.(*models.NotificaitonRecord))
 		}

 		c.consume(notis)
 	}
 }

-func (c *NotifyRecordConsumer) consume(notis []*models.NotificationRecord) {
+func (c *NotifyRecordConsumer) consume(notis []*models.NotificaitonRecord) {
 	if err := models.DB(c.ctx).CreateInBatches(notis, 100).Error; err != nil {
 		logger.Errorf("add notis:%v failed, err: %v", notis, err)
 	}
--- a/alert/sender/plugin.go
+++ b/alert/sender/plugin.go
@@ -35,7 +35,7 @@ func alertingCallScript(ctx *ctx.Context, stdinBytes []byte, notifyScript models

 	channel := "script"
 	stats.AlertNotifyTotal.WithLabelValues(channel).Inc()
-	fpath := ".notify_script"
+	fpath := ".notify_scriptt"
 	if config.Type == 1 {
 		fpath = config.Content
 	} else {
@@ -79,7 +79,6 @@ func alertingCallScript(ctx *ctx.Context, stdinBytes []byte, notifyScript models
 	cmd.Stdout = &buf
 	cmd.Stderr = &buf

-	start := time.Now()
 	err := startCmd(cmd)
 	if err != nil {
 		logger.Errorf("event_script_notify_fail: run cmd err: %v", err)
@@ -89,7 +88,6 @@ func alertingCallScript(ctx *ctx.Context, stdinBytes []byte, notifyScript models
 	err, isTimeout := sys.WrapTimeout(cmd, time.Duration(config.Timeout)*time.Second)

 	res := buf.String()
-	res = fmt.Sprintf("send_time: %s duration: %d ms %s", time.Now().Format("2006-01-02 15:04:05"), time.Since(start).Milliseconds(), res)

 	// 截断超出长度的输出
 	if len(res) > 512 {
--- a/alert/sender/webhook.go
+++ b/alert/sender/webhook.go
@@ -13,53 +13,10 @@ import (
 	"github.com/ccfos/nightingale/v6/alert/astats"
 	"github.com/ccfos/nightingale/v6/models"
 	"github.com/ccfos/nightingale/v6/pkg/ctx"
-	"github.com/ccfos/nightingale/v6/pkg/poster"

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

-// webhookClientCache 缓存 http.Client，避免每次请求都创建新的 Client 导致连接泄露
-var webhookClientCache sync.Map // key: clientKey (string), value: *http.Client
-
-// 相同配置的 webhook 会复用同一个 Client
-func getWebhookClient(webhook *models.Webhook) *http.Client {
-	clientKey := webhook.Hash()
-
-	if client, ok := webhookClientCache.Load(clientKey); ok {
-		return client.(*http.Client)
-	}
-
-	// 创建新的 Client
-	transport := &http.Transport{
-		TLSClientConfig:     &tls.Config{InsecureSkipVerify: webhook.SkipVerify},
-		MaxIdleConns:        100,
-		MaxIdleConnsPerHost: 10,
-		IdleConnTimeout:     90 * time.Second,
-	}
-
-	if poster.UseProxy(webhook.Url) {
-		transport.Proxy = http.ProxyFromEnvironment
-	}
-
-	timeout := webhook.Timeout
-	if timeout <= 0 {
-		timeout = 10
-	}
-
-	newClient := &http.Client{
-		Timeout:   time.Duration(timeout) * time.Second,
-		Transport: transport,
-	}
-
-	// 使用 LoadOrStore 确保并发安全，避免重复创建
-	actual, loaded := webhookClientCache.LoadOrStore(clientKey, newClient)
-	if loaded {
-		return actual.(*http.Client)
-	}
-
-	return newClient
-}
-
 func sendWebhook(webhook *models.Webhook, event interface{}, stats *astats.Stats) (bool, string, error) {
 	channel := "webhook"
 	if webhook.Type == models.RuleCallback {
@@ -80,7 +37,7 @@ func sendWebhook(webhook *models.Webhook, event interface{}, stats *astats.Stats

 	req, err := http.NewRequest("POST", conf.Url, bf)
 	if err != nil {
-		logger.Warningf("%s alertingWebhook failed to new request event:%s err:%v", channel, string(bs), err)
+		logger.Warningf("%s alertingWebhook failed to new reques event:%s err:%v", channel, string(bs), err)
 		return true, "", err
 	}

@@ -98,13 +55,25 @@ func sendWebhook(webhook *models.Webhook, event interface{}, stats *astats.Stats
 			req.Header.Set(conf.Headers[i], conf.Headers[i+1])
 		}
 	}
-	// 使用全局 Client 缓存，避免每次请求都创建新的 Client 导致连接泄露
-	client := getWebhookClient(conf)
+	insecureSkipVerify := false
+	if webhook != nil {
+		insecureSkipVerify = webhook.SkipVerify
+	}
+
+	if conf.Client == nil {
+		logger.Warningf("event_%s, event:%s, url: [%s], error: [%s]", channel, string(bs), conf.Url, "client is nil")
+		conf.Client = &http.Client{
+			Timeout: time.Duration(conf.Timeout) * time.Second,
+			Transport: &http.Transport{
+				TLSClientConfig: &tls.Config{InsecureSkipVerify: insecureSkipVerify},
+			},
+		}
+	}

 	stats.AlertNotifyTotal.WithLabelValues(channel).Inc()
 	var resp *http.Response
 	var body []byte
-	resp, err = client.Do(req)
+	resp, err = conf.Client.Do(req)

 	if err != nil {
 		stats.AlertNotifyErrorTotal.WithLabelValues(channel).Inc()
@@ -119,20 +88,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, fmt.Sprintf("status_code:%d, response:%s", resp.StatusCode, string(body)), fmt.Errorf("status code is 429")
+		return true, string(body), fmt.Errorf("status code is 429")
 	}

 	logger.Debugf("event_%s_succ, url: %s, response code: %d, body: %s event:%s", channel, conf.Url, resp.StatusCode, string(body), string(bs))
-	return false, fmt.Sprintf("status_code:%d, response:%s", resp.StatusCode, string(body)), nil
+	return false, string(body), nil
 }

 func SingleSendWebhooks(ctx *ctx.Context, webhooks map[string]*models.Webhook, event *models.AlertCurEvent, stats *astats.Stats) {
 	for _, conf := range webhooks {
 		retryCount := 0
 		for retryCount < 3 {
-			start := time.Now()
 			needRetry, res, err := sendWebhook(conf, event, stats)
-			res = fmt.Sprintf("send_time: %s duration: %d ms %s", time.Now().Format("2006-01-02 15:04:05"), time.Since(start).Milliseconds(), res)
 			NotifyRecord(ctx, []*models.AlertCurEvent{event}, 0, "webhook", conf.Url, res, err)
 			if !needRetry {
 				break
@@ -202,9 +169,7 @@ func StartConsumer(ctx *ctx.Context, queue *WebhookQueue, popSize int, webhook *

 			retryCount := 0
 			for retryCount < webhook.RetryCount {
-				start := time.Now()
 				needRetry, res, err := sendWebhook(webhook, events, stats)
-				res = fmt.Sprintf("send_time: %s duration: %d ms %s", time.Now().Format("2006-01-02 15:04:05"), time.Since(start).Milliseconds(), res)
 				go NotifyRecord(ctx, events, 0, "webhook", webhook.Url, res, err)
 				if !needRetry {
 					break
--- a/center/cconf/conf.go
+++ b/center/cconf/conf.go
@@ -1,10 +1,6 @@
 package cconf

-import (
-	"time"
-
-	"github.com/ccfos/nightingale/v6/pkg/httpx"
-)
+import "time"

 type Center struct {
 	Plugins                []Plugin
@@ -19,7 +15,6 @@ type Center struct {
 	EventHistoryGroupView  bool
 	CleanNotifyRecordDay   int
 	MigrateBusiGroupLabel  bool
-	RSA                    httpx.RSAConfig
 }

 type Plugin struct {
--- a/center/cconf/plugin.go
+++ b/center/cconf/plugin.go
@@ -31,34 +31,4 @@ var Plugins = []Plugin{
 		Type:     "ck",
 		TypeName: "ClickHouse",
 	},
-	{
-		Id:       6,
-		Category: "timeseries",
-		Type:     "mysql",
-		TypeName: "MySQL",
-	},
-	{
-		Id:       7,
-		Category: "timeseries",
-		Type:     "pgsql",
-		TypeName: "PostgreSQL",
-	},
-	{
-		Id:       8,
-		Category: "logging",
-		Type:     "doris",
-		TypeName: "Doris",
-	},
-	{
-		Id:       9,
-		Category: "logging",
-		Type:     "opensearch",
-		TypeName: "OpenSearch",
-	},
-	{
-		Id:       10,
-		Category: "logging",
-		Type:     "victorialogs",
-		TypeName: "VictoriaLogs",
-	},
 }
--- a/center/center.go
+++ b/center/center.go
@@ -2,13 +2,10 @@ package center

 import (
 	"context"
-	"encoding/json"
 	"fmt"

 	"github.com/ccfos/nightingale/v6/dscache"

-	"github.com/toolkits/pkg/logger"
-
 	"github.com/ccfos/nightingale/v6/alert"
 	"github.com/ccfos/nightingale/v6/alert/astats"
 	"github.com/ccfos/nightingale/v6/alert/dispatch"
@@ -99,9 +96,6 @@ func Initialize(configDir string, cryptoKey string) (func(), error) {
 		models.MigrateEP(ctx)
 	}

-	// 初始化 siteUrl，如果为空则设置默认值
-	InitSiteUrl(ctx, config.Alert.Heartbeat.IP, config.HTTP.Port)
-
 	configCache := memsto.NewConfigCache(ctx, syncStats, config.HTTP.RSA.RSAPrivateKey, config.HTTP.RSA.RSAPassWord)
 	busiGroupCache := memsto.NewBusiGroupCache(ctx, syncStats)
 	targetCache := memsto.NewTargetCache(ctx, syncStats, redis)
@@ -127,7 +121,7 @@ func Initialize(configDir string, cryptoKey string) (func(), error) {

 	macros.RegisterMacro(macros.MacroInVain)
 	dscache.Init(ctx, false)
-	alert.Start(config.Alert, config.Pushgw, syncStats, alertStats, externalProcessors, targetCache, busiGroupCache, alertMuteCache, alertRuleCache, notifyConfigCache, taskTplCache, dsCache, ctx, promClients, userCache, userGroupCache, notifyRuleCache, notifyChannelCache, messageTemplateCache, configCvalCache)
+	alert.Start(config.Alert, config.Pushgw, syncStats, alertStats, externalProcessors, targetCache, busiGroupCache, alertMuteCache, alertRuleCache, notifyConfigCache, taskTplCache, dsCache, ctx, promClients, userCache, userGroupCache, notifyRuleCache, notifyChannelCache, messageTemplateCache)

 	writers := writer.NewWriters(config.Pushgw)

@@ -165,67 +159,3 @@ func Initialize(configDir string, cryptoKey string) (func(), error) {
 		httpClean()
 	}, nil
 }
-
-// initSiteUrl 初始化 site_info 中的 site_url，如果为空则使用服务器IP和端口设置默认值
-func InitSiteUrl(ctx *ctx.Context, serverIP string, serverPort int) {
-	// 构造默认的 SiteUrl
-	defaultSiteUrl := fmt.Sprintf("http://%s:%d", serverIP, serverPort)
-
-	// 获取现有的 site_info 配置
-	siteInfoStr, err := models.ConfigsGet(ctx, "site_info")
-	if err != nil {
-		logger.Errorf("failed to get site_info config: %v", err)
-		return
-	}
-
-	// 如果 site_info 不存在，创建新的
-	if siteInfoStr == "" {
-		newSiteInfo := memsto.SiteInfo{
-			SiteUrl: defaultSiteUrl,
-		}
-		siteInfoBytes, err := json.Marshal(newSiteInfo)
-		if err != nil {
-			logger.Errorf("failed to marshal site_info: %v", err)
-			return
-		}
-
-		err = models.ConfigsSet(ctx, "site_info", string(siteInfoBytes))
-		if err != nil {
-			logger.Errorf("failed to set site_info: %v", err)
-			return
-		}
-
-		logger.Infof("initialized site_url with default value: %s", defaultSiteUrl)
-		return
-	}
-
-	// 检查现有的 site_info 中的 site_url 字段
-	var existingSiteInfo memsto.SiteInfo
-	err = json.Unmarshal([]byte(siteInfoStr), &existingSiteInfo)
-	if err != nil {
-		logger.Errorf("failed to unmarshal site_info: %v", err)
-		return
-	}
-
-	// 如果 site_url 已经有值，则不需要初始化
-	if existingSiteInfo.SiteUrl != "" {
-		return
-	}
-
-	// 设置 site_url
-	existingSiteInfo.SiteUrl = defaultSiteUrl
-
-	siteInfoBytes, err := json.Marshal(existingSiteInfo)
-	if err != nil {
-		logger.Errorf("failed to marshal updated site_info: %v", err)
-		return
-	}
-
-	err = models.ConfigsSet(ctx, "site_info", string(siteInfoBytes))
-	if err != nil {
-		logger.Errorf("failed to update site_info: %v", err)
-		return
-	}
-
-	logger.Infof("initialized site_url with default value: %s", defaultSiteUrl)
-}
--- a/center/integration/init.go
+++ b/center/integration/init.go
@@ -3,15 +3,11 @@ package integration
 import (
 	"encoding/json"
 	"path"
-	"sort"
 	"strings"
 	"time"

 	"github.com/ccfos/nightingale/v6/models"
 	"github.com/ccfos/nightingale/v6/pkg/ctx"
-
-	"github.com/pkg/errors"
-	"github.com/toolkits/pkg/container/set"
 	"github.com/toolkits/pkg/file"
 	"github.com/toolkits/pkg/logger"
 	"github.com/toolkits/pkg/runner"
@@ -19,18 +15,7 @@ import (

 const SYSTEM = "system"

-var BuiltinPayloadInFile *BuiltinPayloadInFileType
-
-type BuiltinPayloadInFileType struct {
-	Data      map[uint64]map[string]map[string][]*models.BuiltinPayload // map[component_id]map[type]map[cate][]*models.BuiltinPayload
-	IndexData map[int64]*models.BuiltinPayload                          // map[uuid]payload
-
-	BuiltinMetrics map[string]*models.BuiltinMetric
-}
-
 func Init(ctx *ctx.Context, builtinIntegrationsDir string) {
-	BuiltinPayloadInFile = NewBuiltinPayloadInFileType()
-
 	err := models.InitBuiltinPayloads(ctx)
 	if err != nil {
 		logger.Warning("init old builtinPayloads fail ", err)
@@ -124,13 +109,13 @@ func Init(ctx *ctx.Context, builtinIntegrationsDir string) {
 			component.ID = old.ID
 		}

-		// delete uuid is empty
+		// delete uuid is emtpy
 		err = models.DB(ctx).Exec("delete from builtin_payloads where uuid = 0 and type != 'collect' and (updated_by = 'system' or updated_by = '')").Error
 		if err != nil {
 			logger.Warning("delete builtin payloads fail ", err)
 		}

-		// delete builtin metrics uuid is empty
+		// delete builtin metrics uuid is emtpy
 		err = models.DB(ctx).Exec("delete from builtin_metrics where uuid = 0 and (updated_by = 'system' or updated_by = '')").Error
 		if err != nil {
 			logger.Warning("delete builtin metrics fail ", err)
@@ -161,10 +146,11 @@ func Init(ctx *ctx.Context, builtinIntegrationsDir string) {
 				}

 				newAlerts := []models.AlertRule{}
+				writeAlertFileFlag := false
 				for _, alert := range alerts {
 					if alert.UUID == 0 {
-						time.Sleep(time.Microsecond)
-						alert.UUID = time.Now().UnixMicro()
+						writeAlertFileFlag = true
+						alert.UUID = time.Now().UnixNano()
 					}

 					newAlerts = append(newAlerts, alert)
@@ -183,13 +169,47 @@ func Init(ctx *ctx.Context, builtinIntegrationsDir string) {
 						Tags:        alert.AppendTags,
 						Content:     string(content),
 						UUID:        alert.UUID,
-						ID:          alert.UUID,
-						CreatedBy:   SYSTEM,
-						UpdatedBy:   SYSTEM,
 					}
-					BuiltinPayloadInFile.AddBuiltinPayload(&builtinAlert)

+					old, err := models.BuiltinPayloadGet(ctx, "uuid = ?", alert.UUID)
+					if err != nil {
+						logger.Warning("get builtin alert fail ", builtinAlert, err)
+						continue
+					}
+
+					if old == nil {
+						err := builtinAlert.Add(ctx, SYSTEM)
+						if err != nil {
+							logger.Warning("add builtin alert fail ", builtinAlert, err)
+						}
+						continue
+					}
+
+					if old.UpdatedBy == SYSTEM {
+						old.ComponentID = component.ID
+						old.Content = string(content)
+						old.Name = alert.Name
+						old.Tags = alert.AppendTags
+						err = models.DB(ctx).Model(old).Select("*").Updates(old).Error
+						if err != nil {
+							logger.Warningf("update builtin alert:%+v fail %v", builtinAlert, err)
+						}
+					}
 				}
+
+				if writeAlertFileFlag {
+					bs, err = json.MarshalIndent(newAlerts, "", "    ")
+					if err != nil {
+						logger.Warning("marshal builtin alerts fail ", newAlerts, err)
+						continue
+					}
+
+					_, err = file.WriteBytes(fp, bs)
+					if err != nil {
+						logger.Warning("write builtin alerts file fail ", f, err)
+					}
+				}
+
 			}
 		}

@@ -239,14 +259,34 @@ func Init(ctx *ctx.Context, builtinIntegrationsDir string) {
 					Cate:        "",
 					Name:        dashboard.Name,
 					Tags:        dashboard.Tags,
-					Note:        dashboard.Note,
 					Content:     string(content),
 					UUID:        dashboard.UUID,
-					ID:          dashboard.UUID,
-					CreatedBy:   SYSTEM,
-					UpdatedBy:   SYSTEM,
 				}
-				BuiltinPayloadInFile.AddBuiltinPayload(&builtinDashboard)
+
+				old, err := models.BuiltinPayloadGet(ctx, "uuid = ?", dashboard.UUID)
+				if err != nil {
+					logger.Warning("get builtin alert fail ", builtinDashboard, err)
+					continue
+				}
+
+				if old == nil {
+					err := builtinDashboard.Add(ctx, SYSTEM)
+					if err != nil {
+						logger.Warning("add builtin alert fail ", builtinDashboard, err)
+					}
+					continue
+				}
+
+				if old.UpdatedBy == SYSTEM {
+					old.ComponentID = component.ID
+					old.Content = string(content)
+					old.Name = dashboard.Name
+					old.Tags = dashboard.Tags
+					err = models.DB(ctx).Model(old).Select("*").Updates(old).Error
+					if err != nil {
+						logger.Warningf("update builtin alert:%+v fail %v", builtinDashboard, err)
+					}
+				}
 			}
 		} else if err != nil {
 			logger.Warningf("read builtin component dash dir fail %s %v", component.Ident, err)
@@ -264,23 +304,64 @@ func Init(ctx *ctx.Context, builtinIntegrationsDir string) {
 				}

 				metrics := []models.BuiltinMetric{}
+				newMetrics := []models.BuiltinMetric{}
 				err = json.Unmarshal(bs, &metrics)
 				if err != nil {
 					logger.Warning("parse builtin component metrics file fail", f, err)
 					continue
 				}

+				writeMetricFileFlag := false
 				for _, metric := range metrics {
 					if metric.UUID == 0 {
-						time.Sleep(time.Microsecond)
-						metric.UUID = time.Now().UnixMicro()
+						writeMetricFileFlag = true
+						metric.UUID = time.Now().UnixNano()
 					}
-					metric.ID = metric.UUID
-					metric.CreatedBy = SYSTEM
-					metric.UpdatedBy = SYSTEM
+					newMetrics = append(newMetrics, metric)

-					BuiltinPayloadInFile.BuiltinMetrics[metric.Expression] = &metric
+					old, err := models.BuiltinMetricGet(ctx, "uuid = ?", metric.UUID)
+					if err != nil {
+						logger.Warning("get builtin metrics fail ", metric, err)
+						continue
+					}
+
+					if old == nil {
+						err := metric.Add(ctx, SYSTEM)
+						if err != nil {
+							logger.Warning("add builtin metrics fail ", metric, err)
+						}
+						continue
+					}
+
+					if old.UpdatedBy == SYSTEM {
+						old.Collector = metric.Collector
+						old.Typ = metric.Typ
+						old.Name = metric.Name
+						old.Unit = metric.Unit
+						old.Note = metric.Note
+						old.Lang = metric.Lang
+						old.Expression = metric.Expression
+
+						err = models.DB(ctx).Model(old).Select("*").Updates(old).Error
+						if err != nil {
+							logger.Warningf("update builtin metric:%+v fail %v", metric, err)
+						}
+					}
 				}
+
+				if writeMetricFileFlag {
+					bs, err = json.MarshalIndent(newMetrics, "", "    ")
+					if err != nil {
+						logger.Warning("marshal builtin metrics fail ", newMetrics, err)
+						continue
+					}
+
+					_, err = file.WriteBytes(fp, bs)
+					if err != nil {
+						logger.Warning("write builtin metrics file fail ", f, err)
+					}
+				}
+
 			}
 		} else if err != nil {
 			logger.Warningf("read builtin component metrics dir fail %s %v", component.Ident, err)
@@ -294,7 +375,6 @@ type BuiltinBoard struct {
 	Name       string      `json:"name"`
 	Ident      string      `json:"ident"`
 	Tags       string      `json:"tags"`
-	Note       string      `json:"note"`
 	CreateAt   int64       `json:"create_at"`
 	CreateBy   string      `json:"create_by"`
 	UpdateAt   int64       `json:"update_at"`
@@ -307,346 +387,3 @@ type BuiltinBoard struct {
 	Hide       int         `json:"hide"`     // 0: false, 1: true
 	UUID       int64       `json:"uuid"`
 }
-
-func NewBuiltinPayloadInFileType() *BuiltinPayloadInFileType {
-	return &BuiltinPayloadInFileType{
-		Data:           make(map[uint64]map[string]map[string][]*models.BuiltinPayload),
-		IndexData:      make(map[int64]*models.BuiltinPayload),
-		BuiltinMetrics: make(map[string]*models.BuiltinMetric),
-	}
-}
-
-func (b *BuiltinPayloadInFileType) AddBuiltinPayload(bp *models.BuiltinPayload) {
-	if _, exists := b.Data[bp.ComponentID]; !exists {
-		b.Data[bp.ComponentID] = make(map[string]map[string][]*models.BuiltinPayload)
-	}
-	bpInType := b.Data[bp.ComponentID]
-	if _, exists := bpInType[bp.Type]; !exists {
-		bpInType[bp.Type] = make(map[string][]*models.BuiltinPayload)
-	}
-	bpInCate := bpInType[bp.Type]
-	if _, exists := bpInCate[bp.Cate]; !exists {
-		bpInCate[bp.Cate] = make([]*models.BuiltinPayload, 0)
-	}
-	bpInCate[bp.Cate] = append(bpInCate[bp.Cate], bp)
-
-	b.IndexData[bp.UUID] = bp
-}
-
-func (b *BuiltinPayloadInFileType) GetComponentIdentByCate(typ, cate string) string {
-
-	for _, source := range b.Data {
-		if source == nil {
-			continue
-		}
-
-		typeMap, exists := source[typ]
-		if !exists {
-			continue
-		}
-
-		payloads, exists := typeMap[cate]
-		if !exists {
-			continue
-		}
-
-		if len(payloads) > 0 {
-			return payloads[0].Component
-		}
-	}
-	return ""
-}
-
-func (b *BuiltinPayloadInFileType) GetBuiltinPayload(typ, cate, query string, componentId uint64) ([]*models.BuiltinPayload, error) {
-
-	var result []*models.BuiltinPayload
-	source := b.Data[componentId]
-
-	if source == nil {
-		return nil, nil
-	}
-
-	typeMap, exists := source[typ]
-	if !exists {
-		return nil, nil
-	}
-
-	if cate != "" {
-		payloads, exists := typeMap[cate]
-		if !exists {
-			return nil, nil
-		}
-		result = append(result, filterByQuery(payloads, query)...)
-	} else {
-		for _, payloads := range typeMap {
-			result = append(result, filterByQuery(payloads, query)...)
-		}
-	}
-
-	if len(result) > 0 {
-		sort.Slice(result, func(i, j int) bool {
-			return result[i].Name < result[j].Name
-		})
-	}
-
-	return result, nil
-}
-
-func (b *BuiltinPayloadInFileType) GetBuiltinPayloadCates(typ string, componentId uint64) ([]string, error) {
-	var result []string
-	source := b.Data[componentId]
-	if source == nil {
-		return result, nil
-	}
-
-	typeData := source[typ]
-	if typeData == nil {
-		return result, nil
-	}
-	for cate := range typeData {
-		result = append(result, cate)
-	}
-
-	sort.Strings(result)
-	return result, nil
-}
-
-func filterByQuery(payloads []*models.BuiltinPayload, query string) []*models.BuiltinPayload {
-	if query == "" {
-		return payloads
-	}
-
-	queryLower := strings.ToLower(query)
-	var filtered []*models.BuiltinPayload
-	for _, p := range payloads {
-		if strings.Contains(strings.ToLower(p.Name), queryLower) || strings.Contains(strings.ToLower(p.Tags), queryLower) {
-			filtered = append(filtered, p)
-		}
-	}
-	return filtered
-}
-
-func (b *BuiltinPayloadInFileType) BuiltinMetricGets(metricsInDB []*models.BuiltinMetric, lang, collector, typ, query, unit string, limit, offset int) ([]*models.BuiltinMetric, int, error) {
-	var filteredMetrics []*models.BuiltinMetric
-	expressionSet := set.NewStringSet()
-	builtinMetricsByDB := convertBuiltinMetricByDB(metricsInDB)
-	builtinMetricsMap := make(map[string]*models.BuiltinMetric)
-
-	for expression, metric := range builtinMetricsByDB {
-		builtinMetricsMap[expression] = metric
-	}
-
-	for expression, metric := range b.BuiltinMetrics {
-		builtinMetricsMap[expression] = metric
-	}
-
-	for _, metric := range builtinMetricsMap {
-		if !applyFilter(metric, collector, typ, query, unit) {
-			continue
-		}
-
-		// Skip if expression is already in db cache
-		// NOTE: 忽略重复的expression，特别的，在旧版本中，用户可能已经创建了重复的metrics，需要覆盖掉ByFile中相同的Metrics
-		// NOTE: Ignore duplicate expressions, especially in the old version, users may have created duplicate metrics,
-		if expressionSet.Exists(metric.Expression) {
-			continue
-		}
-
-		// Add db expression in set.
-		expressionSet.Add(metric.Expression)
-
-		// Apply language
-		trans, err := getTranslationWithLanguage(metric, lang)
-		if err != nil {
-			logger.Errorf("Error getting translation for metric %s: %v", metric.Name, err)
-			continue // Skip if translation not found
-		}
-		metric.Name = trans.Name
-		metric.Note = trans.Note
-
-		filteredMetrics = append(filteredMetrics, metric)
-	}
-
-	// Sort metrics
-	sort.Slice(filteredMetrics, func(i, j int) bool {
-		if filteredMetrics[i].Collector != filteredMetrics[j].Collector {
-			return filteredMetrics[i].Collector < filteredMetrics[j].Collector
-		}
-		if filteredMetrics[i].Typ != filteredMetrics[j].Typ {
-			return filteredMetrics[i].Typ < filteredMetrics[j].Typ
-		}
-		return filteredMetrics[i].Expression < filteredMetrics[j].Expression
-	})
-
-	totalCount := len(filteredMetrics)
-
-	// Validate parameters
-	if offset < 0 {
-		offset = 0
-	}
-	if limit < 0 {
-		limit = 0
-	}
-
-	// Handle edge cases
-	if offset >= totalCount || limit == 0 {
-		return []*models.BuiltinMetric{}, totalCount, nil
-	}
-
-	// Apply pagination
-	end := offset + limit
-	if end > totalCount {
-		end = totalCount
-	}
-
-	return filteredMetrics[offset:end], totalCount, nil
-}
-
-func (b *BuiltinPayloadInFileType) BuiltinMetricTypes(lang, collector, query string) []string {
-	typeSet := set.NewStringSet()
-	for _, metric := range b.BuiltinMetrics {
-		if !applyFilter(metric, collector, "", query, "") {
-			continue
-		}
-
-		typeSet.Add(metric.Typ)
-	}
-
-	return typeSet.ToSlice()
-}
-
-func (b *BuiltinPayloadInFileType) BuiltinMetricCollectors(lang, typ, query string) []string {
-	collectorSet := set.NewStringSet()
-	for _, metric := range b.BuiltinMetrics {
-		if !applyFilter(metric, "", typ, query, "") {
-			continue
-		}
-
-		collectorSet.Add(metric.Collector)
-	}
-	return collectorSet.ToSlice()
-}
-
-func applyFilter(metric *models.BuiltinMetric, collector, typ, query, unit string) bool {
-	if collector != "" && collector != metric.Collector {
-		return false
-	}
-
-	if typ != "" && typ != metric.Typ {
-		return false
-	}
-
-	if unit != "" && !containsUnit(unit, metric.Unit) {
-		return false
-	}
-
-	if query != "" && !applyQueryFilter(metric, query) {
-		return false
-	}
-
-	return true
-}
-
-func containsUnit(unit, metricUnit string) bool {
-	us := strings.Split(unit, ",")
-	for _, u := range us {
-		if u == metricUnit {
-			return true
-		}
-	}
-	return false
-}
-
-func applyQueryFilter(metric *models.BuiltinMetric, query string) bool {
-	qs := strings.Split(query, " ")
-	for _, q := range qs {
-		if strings.HasPrefix(q, "-") {
-			q = strings.TrimPrefix(q, "-")
-			if strings.Contains(metric.Name, q) || strings.Contains(metric.Note, q) || strings.Contains(metric.Expression, q) {
-				return false
-			}
-		} else {
-			if !strings.Contains(metric.Name, q) && !strings.Contains(metric.Note, q) && !strings.Contains(metric.Expression, q) {
-				return false
-			}
-		}
-	}
-	return true
-}
-
-func getTranslationWithLanguage(bm *models.BuiltinMetric, lang string) (*models.Translation, error) {
-	var defaultTranslation *models.Translation
-	for _, t := range bm.Translation {
-		if t.Lang == lang {
-			return &t, nil
-		}
-
-		if t.Lang == "en_US" {
-			defaultTranslation = &t
-		}
-	}
-
-	if defaultTranslation != nil {
-		return defaultTranslation, nil
-	}
-
-	return nil, errors.Errorf("translation not found for metric %s", bm.Name)
-}
-
-func convertBuiltinMetricByDB(metricsInDB []*models.BuiltinMetric) map[string]*models.BuiltinMetric {
-	builtinMetricsByDB := make(map[string]*models.BuiltinMetric)
-	builtinMetricsByDBList := make(map[string][]*models.BuiltinMetric)
-
-	for _, metric := range metricsInDB {
-		builtinMetrics, ok := builtinMetricsByDBList[metric.Expression]
-		if !ok {
-			builtinMetrics = []*models.BuiltinMetric{}
-		}
-
-		builtinMetrics = append(builtinMetrics, metric)
-		builtinMetricsByDBList[metric.Expression] = builtinMetrics
-	}
-
-	for expression, builtinMetrics := range builtinMetricsByDBList {
-		if len(builtinMetrics) == 0 {
-			continue
-		}
-
-		// NOTE: 为兼容旧版本用户已经创建的 metrics，同时将修改 metrics 收敛到同一个记录上，
-		// 我们选择使用 expression 相同但是 id 最小的 metric 记录作为主要的 Metric。
-		sort.Slice(builtinMetrics, func(i, j int) bool {
-			return builtinMetrics[i].ID < builtinMetrics[j].ID
-		})
-
-		currentBuiltinMetric := builtinMetrics[0]
-		// User has no customized translation, so we can merge it
-		if len(currentBuiltinMetric.Translation) == 0 {
-			translationMap := make(map[string]models.Translation)
-			for _, bm := range builtinMetrics {
-				for _, t := range getDefaultTranslation(bm) {
-					translationMap[t.Lang] = t
-				}
-			}
-			currentBuiltinMetric.Translation = make([]models.Translation, 0, len(translationMap))
-			for _, t := range translationMap {
-				currentBuiltinMetric.Translation = append(currentBuiltinMetric.Translation, t)
-			}
-		}
-
-		builtinMetricsByDB[expression] = currentBuiltinMetric
-	}
-
-	return builtinMetricsByDB
-}
-
-func getDefaultTranslation(bm *models.BuiltinMetric) []models.Translation {
-	if len(bm.Translation) != 0 {
-		return bm.Translation
-	}
-
-	return []models.Translation{{
-		Lang: bm.Lang,
-		Name: bm.Name,
-		Note: bm.Note,
-	}}
-}
--- a/center/router/router.go
+++ b/center/router/router.go
@@ -177,7 +177,6 @@ func (rt *Router) Config(r *gin.Engine) {
 	pages := r.Group(pagesPrefix)
 	{

-		pages.DELETE("/datasource/series", rt.auth(), rt.admin(), rt.deleteDatasourceSeries)
 		if rt.Center.AnonymousAccess.PromQuerier {
 			pages.Any("/proxy/:id/*url", rt.dsProxy)
 			pages.POST("/query-range-batch", rt.promBatchQueryRange)
@@ -211,8 +210,8 @@ func (rt *Router) Config(r *gin.Engine) {
 			pages.GET("/datasource/brief", rt.auth(), rt.user(), rt.datasourceBriefs)
 			pages.POST("/datasource/query", rt.auth(), rt.user(), rt.datasourceQuery)

-			pages.POST("/ds-query", rt.auth(), rt.user(), rt.QueryData)
-			pages.POST("/logs-query", rt.auth(), rt.user(), rt.QueryLogV2)
+			pages.POST("/ds-query", rt.auth(), rt.QueryData)
+			pages.POST("/logs-query", rt.auth(), rt.QueryLogV2)

 			pages.POST("/tdengine-databases", rt.auth(), rt.tdengineDatabases)
 			pages.POST("/tdengine-tables", rt.auth(), rt.tdengineTables)
@@ -232,11 +231,6 @@ func (rt *Router) Config(r *gin.Engine) {
 			pages.POST("/log-query", rt.QueryLog)
 		}

-		// OpenSearch 专用接口
-		pages.POST("/os-indices", rt.QueryOSIndices)
-		pages.POST("/os-variable", rt.QueryOSVariable)
-		pages.POST("/os-fields", rt.QueryOSFields)
-
 		pages.GET("/sql-template", rt.QuerySqlTemplate)
 		pages.POST("/auth/login", rt.jwtMock(), rt.loginPost)
 		pages.POST("/auth/logout", rt.jwtMock(), rt.auth(), rt.user(), rt.logoutPost)
@@ -250,11 +244,9 @@ func (rt *Router) Config(r *gin.Engine) {
 		pages.GET("/auth/redirect", rt.loginRedirect)
 		pages.GET("/auth/redirect/cas", rt.loginRedirectCas)
 		pages.GET("/auth/redirect/oauth", rt.loginRedirectOAuth)
-		pages.GET("/auth/redirect/dingtalk", rt.loginRedirectDingTalk)
 		pages.GET("/auth/callback", rt.loginCallback)
 		pages.GET("/auth/callback/cas", rt.loginCallbackCas)
 		pages.GET("/auth/callback/oauth", rt.loginCallbackOAuth)
-		pages.GET("/auth/callback/dingtalk", rt.loginCallbackDingTalk)
 		pages.GET("/auth/perms", rt.allPerms)

 		pages.GET("/metrics/desc", rt.metricsDescGetFile)
@@ -262,7 +254,6 @@ func (rt *Router) Config(r *gin.Engine) {

 		pages.GET("/notify-channels", rt.notifyChannelsGets)
 		pages.GET("/contact-keys", rt.contactKeysGets)
-		pages.GET("/install-date", rt.installDateGet)

 		pages.GET("/self/perms", rt.auth(), rt.user(), rt.permsGets)
 		pages.GET("/self/profile", rt.auth(), rt.user(), rt.selfProfileGet)
@@ -318,7 +309,6 @@ func (rt *Router) Config(r *gin.Engine) {
 		pages.GET("/busi-groups/tags", rt.auth(), rt.user(), rt.busiGroupsGetTags)

 		pages.GET("/targets", rt.auth(), rt.user(), rt.targetGets)
-		pages.POST("/target-update", rt.auth(), rt.targetUpdate)
 		pages.GET("/target/extra-meta", rt.auth(), rt.user(), rt.targetExtendInfoByIdent)
 		pages.POST("/target/list", rt.auth(), rt.user(), rt.targetGetsByHostFilter)
 		pages.DELETE("/targets", rt.auth(), rt.user(), rt.perm("/targets/del"), rt.targetDel)
@@ -382,8 +372,6 @@ func (rt *Router) Config(r *gin.Engine) {
 		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.POST("/busi-groups/alert-rules/clones", rt.auth(), rt.user(), rt.perm("/alert-rules/add"), rt.batchAlertRuleClone)
-		pages.POST("/busi-group/alert-rules/notify-tryrun", rt.auth(), rt.user(), rt.perm("/alert-rules/add"), rt.alertRuleNotifyTryRun)
-		pages.POST("/busi-group/alert-rules/enable-tryrun", rt.auth(), rt.user(), rt.perm("/alert-rules/add"), rt.alertRuleEnableTryRun)

 		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)
@@ -409,18 +397,22 @@ func (rt *Router) Config(r *gin.Engine) {
 		pages.POST("/busi-group/:id/alert-subscribes", rt.auth(), rt.user(), rt.perm("/alert-subscribes/add"), rt.bgrw(), rt.alertSubscribeAdd)
 		pages.PUT("/busi-group/:id/alert-subscribes", rt.auth(), rt.user(), rt.perm("/alert-subscribes/put"), rt.bgrw(), rt.alertSubscribePut)
 		pages.DELETE("/busi-group/:id/alert-subscribes", rt.auth(), rt.user(), rt.perm("/alert-subscribes/del"), rt.bgrw(), rt.alertSubscribeDel)
-		pages.POST("/alert-subscribe/alert-subscribes-tryrun", rt.auth(), rt.user(), rt.perm("/alert-subscribes/add"), rt.alertSubscribeTryRun)

-		pages.GET("/alert-cur-event/:eid", rt.alertCurEventGet)
-		pages.GET("/alert-his-event/:eid", rt.alertHisEventGet)
-		pages.GET("/event-notify-records/:eid", rt.notificationRecordList)
+		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
 		pages.GET("/alert-cur-events/list", rt.auth(), rt.user(), rt.alertCurEventsList)
 		pages.GET("/alert-cur-events/card", rt.auth(), rt.user(), rt.alertCurEventsCard)
 		pages.POST("/alert-cur-events/card/details", rt.auth(), rt.alertCurEventsCardDetails)
 		pages.GET("/alert-his-events/list", rt.auth(), rt.user(), rt.alertHisEventsList)
-		pages.DELETE("/alert-his-events", rt.auth(), rt.admin(), rt.alertHisEventsDelete)
 		pages.DELETE("/alert-cur-events", rt.auth(), rt.user(), rt.perm("/alert-cur-events/del"), rt.alertCurEventDel)
 		pages.GET("/alert-cur-events/stats", rt.auth(), rt.alertCurEventsStatistics)

@@ -452,7 +444,7 @@ func (rt *Router) Config(r *gin.Engine) {
 		pages.POST("/datasource/status/update", rt.auth(), rt.admin(), rt.datasourceUpdataStatus)
 		pages.DELETE("/datasource/", rt.auth(), rt.admin(), rt.datasourceDel)

-		pages.GET("/roles", rt.auth(), rt.user(), rt.roleGets)
+		pages.GET("/roles", rt.auth(), rt.user(), rt.perm("/roles"), rt.roleGets)
 		pages.POST("/roles", rt.auth(), rt.user(), rt.perm("/roles/add"), rt.roleAdd)
 		pages.PUT("/roles", rt.auth(), rt.user(), rt.perm("/roles/put"), rt.rolePut)
 		pages.DELETE("/role/:id", rt.auth(), rt.user(), rt.perm("/roles/del"), rt.roleDel)
@@ -526,9 +518,10 @@ func (rt *Router) Config(r *gin.Engine) {
 		pages.GET("/builtin-payloads", rt.auth(), rt.user(), rt.builtinPayloadsGets)
 		pages.GET("/builtin-payloads/cates", rt.auth(), rt.user(), rt.builtinPayloadcatesGet)
 		pages.POST("/builtin-payloads", rt.auth(), rt.user(), rt.perm("/components/add"), rt.builtinPayloadsAdd)
+		pages.GET("/builtin-payload/:id", rt.auth(), rt.user(), rt.perm("/components"), rt.builtinPayloadGet)
 		pages.PUT("/builtin-payloads", rt.auth(), rt.user(), rt.perm("/components/put"), rt.builtinPayloadsPut)
 		pages.DELETE("/builtin-payloads", rt.auth(), rt.user(), rt.perm("/components/del"), rt.builtinPayloadsDel)
-		pages.GET("/builtin-payload", rt.auth(), rt.user(), rt.builtinPayloadsGetByUUID)
+		pages.GET("/builtin-payload", rt.auth(), rt.user(), rt.builtinPayloadsGetByUUIDOrID)

 		pages.POST("/message-templates", rt.auth(), rt.user(), rt.perm("/notification-templates/add"), rt.messageTemplatesAdd)
 		pages.DELETE("/message-templates", rt.auth(), rt.user(), rt.perm("/notification-templates/del"), rt.messageTemplatesDel)
@@ -546,9 +539,6 @@ func (rt *Router) Config(r *gin.Engine) {
 		pages.GET("/notify-rule/custom-params", rt.auth(), rt.user(), rt.perm("/notification-rules"), rt.notifyRuleCustomParamsGet)
 		pages.POST("/notify-rule/event-pipelines-tryrun", rt.auth(), rt.user(), rt.perm("/notification-rules/add"), rt.tryRunEventProcessorByNotifyRule)

-		pages.GET("/event-tagkeys", rt.auth(), rt.user(), rt.eventTagKeys)
-		pages.GET("/event-tagvalues", rt.auth(), rt.user(), rt.eventTagValues)
-
 		// 事件Pipeline相关路由
 		pages.GET("/event-pipelines", rt.auth(), rt.user(), rt.perm("/event-pipelines"), rt.eventPipelinesList)
 		pages.POST("/event-pipeline", rt.auth(), rt.user(), rt.perm("/event-pipelines/add"), rt.addEventPipeline)
@@ -558,19 +548,6 @@ func (rt *Router) Config(r *gin.Engine) {
 		pages.POST("/event-pipeline-tryrun", rt.auth(), rt.user(), rt.perm("/event-pipelines"), rt.tryRunEventPipeline)
 		pages.POST("/event-processor-tryrun", rt.auth(), rt.user(), rt.perm("/event-pipelines"), rt.tryRunEventProcessor)

-		// API 触发工作流
-		pages.POST("/event-pipeline/:id/trigger", rt.auth(), rt.user(), rt.perm("/event-pipelines"), rt.triggerEventPipelineByAPI)
-		// SSE 流式执行工作流
-		pages.POST("/event-pipeline/:id/stream", rt.auth(), rt.user(), rt.perm("/event-pipelines"), rt.streamEventPipeline)
-
-		// 事件Pipeline执行记录路由
-		pages.GET("/event-pipeline-executions", rt.auth(), rt.user(), rt.perm("/event-pipelines"), rt.listAllEventPipelineExecutions)
-		pages.GET("/event-pipeline/:id/executions", rt.auth(), rt.user(), rt.perm("/event-pipelines"), rt.listEventPipelineExecutions)
-		pages.GET("/event-pipeline/:id/execution/:exec_id", rt.auth(), rt.user(), rt.perm("/event-pipelines"), rt.getEventPipelineExecution)
-		pages.GET("/event-pipeline-execution/:exec_id", rt.auth(), rt.user(), rt.perm("/event-pipelines"), rt.getEventPipelineExecution)
-		pages.GET("/event-pipeline/:id/execution-stats", rt.auth(), rt.user(), rt.perm("/event-pipelines"), rt.getEventPipelineExecutionStats)
-		pages.POST("/event-pipeline-executions/clean", rt.auth(), rt.user(), rt.admin(), rt.cleanEventPipelineExecutions)
-
 		pages.POST("/notify-channel-configs", rt.auth(), rt.user(), rt.perm("/notification-channels/add"), rt.notifyChannelsAdd)
 		pages.DELETE("/notify-channel-configs", rt.auth(), rt.user(), rt.perm("/notification-channels/del"), rt.notifyChannelsDel)
 		pages.PUT("/notify-channel-config/:id", rt.auth(), rt.user(), rt.perm("/notification-channels/put"), rt.notifyChannelPut)
@@ -578,18 +555,8 @@ func (rt *Router) Config(r *gin.Engine) {
 		pages.GET("/notify-channel-configs", rt.auth(), rt.user(), rt.perm("/notification-channels"), rt.notifyChannelsGet)
 		pages.GET("/simplified-notify-channel-configs", rt.notifyChannelsGetForNormalUser)
 		pages.GET("/flashduty-channel-list/:id", rt.auth(), rt.user(), rt.flashDutyNotifyChannelsGet)
-		pages.GET("/pagerduty-integration-key/:id/:service_id/:integration_id", rt.auth(), rt.user(), rt.pagerDutyIntegrationKeyGet)
-		pages.GET("/pagerduty-service-list/:id", rt.auth(), rt.user(), rt.pagerDutyNotifyServicesGet)
 		pages.GET("/notify-channel-config", rt.auth(), rt.user(), rt.notifyChannelGetBy)
 		pages.GET("/notify-channel-config/idents", rt.notifyChannelIdentsGet)
-
-		// saved view 查询条件保存相关路由
-		pages.GET("/saved-views", rt.auth(), rt.user(), rt.savedViewGets)
-		pages.POST("/saved-views", rt.auth(), rt.user(), rt.savedViewAdd)
-		pages.PUT("/saved-view/:id", rt.auth(), rt.user(), rt.savedViewPut)
-		pages.DELETE("/saved-view/:id", rt.auth(), rt.user(), rt.savedViewDel)
-		pages.POST("/saved-view/:id/favorite", rt.auth(), rt.user(), rt.savedViewFavoriteAdd)
-		pages.DELETE("/saved-view/:id/favorite", rt.auth(), rt.user(), rt.savedViewFavoriteDel)
 	}

 	r.GET("/api/n9e/versions", func(c *gin.Context) {
@@ -646,7 +613,6 @@ func (rt *Router) Config(r *gin.Engine) {
 			service.GET("/busi-groups", rt.busiGroupGetsByService)

 			service.GET("/datasources", rt.datasourceGetsByService)
-			service.GET("/datasource-rsa-config", rt.datasourceRsaConfigGet)
 			service.GET("/datasource-ids", rt.getDatasourceIds)
 			service.POST("/server-heartbeat", rt.serverHeartbeat)
 			service.GET("/servers-active", rt.serversActive)
@@ -654,7 +620,6 @@ func (rt *Router) Config(r *gin.Engine) {
 			service.GET("/recording-rules", rt.recordingRuleGetsByService)

 			service.GET("/alert-mutes", rt.alertMuteGets)
-			service.GET("/active-alert-mutes", rt.activeAlertMuteGets)
 			service.POST("/alert-mutes", rt.alertMuteAddByService)
 			service.DELETE("/alert-mutes", rt.alertMuteDel)

@@ -703,16 +668,6 @@ func (rt *Router) Config(r *gin.Engine) {
 			service.GET("/message-templates", rt.messageTemplateGets)

 			service.GET("/event-pipelines", rt.eventPipelinesListByService)
-			service.POST("/event-pipeline/:id/trigger", rt.triggerEventPipelineByService)
-			service.POST("/event-pipeline/:id/stream", rt.streamEventPipelineByService)
-
-			// 手机号加密存储配置接口
-			service.POST("/users/phone/encrypt", rt.usersPhoneEncrypt)
-			service.POST("/users/phone/decrypt", rt.usersPhoneDecrypt)
-			service.POST("/users/phone/refresh-encryption-config", rt.usersPhoneDecryptRefresh)
-
-			service.GET("/builtin-components", rt.builtinComponentsGets)
-			service.GET("/builtin-payloads", rt.builtinPayloadsGets)
 		}
 	}

--- a/center/router/router_alert_cur_event.go
+++ b/center/router/router_alert_cur_event.go
@@ -13,7 +13,6 @@ import (

 	"github.com/gin-gonic/gin"
 	"github.com/toolkits/pkg/ginx"
-	"github.com/toolkits/pkg/logger"
 )

 func getUserGroupIds(ctx *gin.Context, rt *Router, myGroups bool) ([]int64, error) {
@@ -234,14 +233,6 @@ func (rt *Router) checkCurEventBusiGroupRWPermission(c *gin.Context, ids []int64
 func (rt *Router) alertCurEventGet(c *gin.Context) {
 	eid := ginx.UrlParamInt64(c, "eid")
 	event, err := GetCurEventDetail(rt.Ctx, eid)
-
-	hasPermission := HasPermission(rt.Ctx, c, "event", fmt.Sprintf("%d", eid), rt.Center.AnonymousAccess.AlertDetail)
-	if !hasPermission {
-		rt.auth()(c)
-		rt.user()(c)
-		rt.bgroCheck(c, event.GroupId)
-	}
-
 	ginx.NewRender(c).Data(event, err)
 }

@@ -264,11 +255,11 @@ func GetCurEventDetail(ctx *ctx.Context, eid int64) (*models.AlertCurEvent, erro
 	event.NotifyVersion, err = GetEventNotifyVersion(ctx, event.RuleId, event.NotifyRuleIds)
 	ginx.Dangerous(err)

-	event.NotifyRules, err = GetEventNotifyRuleNames(ctx, event.NotifyRuleIds)
+	event.NotifyRules, err = GetEventNorifyRuleNames(ctx, event.NotifyRuleIds)
 	return event, err
 }

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

 import (
 	"fmt"
-	"net/http"
 	"strings"
 	"time"

@@ -11,7 +10,6 @@ import (

 	"github.com/gin-gonic/gin"
 	"github.com/toolkits/pkg/ginx"
-	"github.com/toolkits/pkg/logger"
 	"golang.org/x/exp/slices"
 )

@@ -62,11 +60,11 @@ func (rt *Router) alertHisEventsList(c *gin.Context) {
 	ginx.Dangerous(err)

 	total, err := models.AlertHisEventTotal(rt.Ctx, prods, bgids, stime, etime, severity,
-		recovered, dsIds, cates, ruleId, query, []int64{})
+		recovered, dsIds, cates, ruleId, query)
 	ginx.Dangerous(err)

 	list, err := models.AlertHisEventGets(rt.Ctx, prods, bgids, stime, etime, severity, recovered,
-		dsIds, cates, ruleId, query, limit, ginx.Offset(c, limit), []int64{})
+		dsIds, cates, ruleId, query, limit, ginx.Offset(c, limit))
 	ginx.Dangerous(err)

 	cache := make(map[int64]*models.UserGroup)
@@ -80,67 +78,16 @@ func (rt *Router) alertHisEventsList(c *gin.Context) {
 	}, nil)
 }

-type alertHisEventsDeleteForm struct {
-	Severities []int `json:"severities"`
-	Timestamp  int64 `json:"timestamp" binding:"required"`
-}
-
-func (rt *Router) alertHisEventsDelete(c *gin.Context) {
-	var f alertHisEventsDeleteForm
-	ginx.BindJSON(c, &f)
-	// 校验
-	if f.Timestamp == 0 {
-		ginx.Bomb(http.StatusBadRequest, "timestamp parameter is required")
-		return
-	}
-
-	user := c.MustGet("user").(*models.User)
-
-	// 启动后台清理任务
-	go func() {
-		limit := 100
-		for {
-			n, err := models.AlertHisEventBatchDelete(rt.Ctx, f.Timestamp, f.Severities, limit)
-			if err != nil {
-				logger.Errorf("Failed to delete alert history events: operator=%s, timestamp=%d, severities=%v, error=%v",
-					user.Username, f.Timestamp, f.Severities, err)
-				break
-			}
-			logger.Debugf("Successfully deleted alert history events: operator=%s, timestamp=%d, severities=%v, deleted=%d",
-				user.Username, f.Timestamp, f.Severities, n)
-			if n < int64(limit) {
-				break // 已经删完
-			}
-
-			time.Sleep(100 * time.Millisecond) // 防止锁表
-		}
-	}()
-	ginx.NewRender(c).Data("Alert history events deletion started", nil)
-}
-
-var TransferEventToCur func(*ctx.Context, *models.AlertHisEvent) *models.AlertCurEvent
-
-func init() {
-	TransferEventToCur = transferEventToCur
-}
-
-func transferEventToCur(ctx *ctx.Context, event *models.AlertHisEvent) *models.AlertCurEvent {
-	cur := event.ToCur()
-	return cur
-}
-
 func (rt *Router) alertHisEventGet(c *gin.Context) {
 	eid := ginx.UrlParamInt64(c, "eid")
 	event, err := models.AlertHisEventGetById(rt.Ctx, eid)
 	ginx.Dangerous(err)
+
 	if event == nil {
 		ginx.Bomb(404, "No such alert event")
 	}

-	hasPermission := HasPermission(rt.Ctx, c, "event", fmt.Sprintf("%d", eid), rt.Center.AnonymousAccess.AlertDetail)
-	if !hasPermission {
-		rt.auth()(c)
-		rt.user()(c)
+	if !rt.Center.AnonymousAccess.AlertDetail && rt.Center.EventHistoryGroupView {
 		rt.bgroCheck(c, event.GroupId)
 	}

@@ -152,8 +99,8 @@ func (rt *Router) alertHisEventGet(c *gin.Context) {
 	event.NotifyVersion, err = GetEventNotifyVersion(rt.Ctx, event.RuleId, event.NotifyRuleIds)
 	ginx.Dangerous(err)

-	event.NotifyRules, err = GetEventNotifyRuleNames(rt.Ctx, event.NotifyRuleIds)
-	ginx.NewRender(c).Data(TransferEventToCur(rt.Ctx, event), err)
+	event.NotifyRules, err = GetEventNorifyRuleNames(rt.Ctx, event.NotifyRuleIds)
+	ginx.NewRender(c).Data(event, err)
 }

 func GetBusinessGroupIds(c *gin.Context, ctx *ctx.Context, onlySelfGroupView bool, myGroups bool) ([]int64, error) {
--- a/center/router/router_alert_rule.go
+++ b/center/router/router_alert_rule.go
@@ -11,7 +11,6 @@ import (

 	"gopkg.in/yaml.v2"

-	"github.com/ccfos/nightingale/v6/alert/mute"
 	"github.com/ccfos/nightingale/v6/models"
 	"github.com/ccfos/nightingale/v6/pkg/strx"
 	"github.com/ccfos/nightingale/v6/pushgw/pconf"
@@ -19,7 +18,6 @@ import (

 	"github.com/gin-gonic/gin"
 	"github.com/jinzhu/copier"
-	"github.com/pkg/errors"
 	"github.com/prometheus/prometheus/prompb"
 	"github.com/toolkits/pkg/ginx"
 	"github.com/toolkits/pkg/i18n"
@@ -35,12 +33,13 @@ func (rt *Router) alertRuleGets(c *gin.Context) {
 		cache := make(map[int64]*models.UserGroup)
 		for i := 0; i < len(ars); i++ {
 			ars[i].FillNotifyGroups(rt.Ctx, cache)
+			ars[i].FillSeverities()
 		}
 	}
 	ginx.NewRender(c).Data(ars, err)
 }

-func GetAlertCueEventTimeRange(c *gin.Context) (stime, etime int64) {
+func getAlertCueEventTimeRange(c *gin.Context) (stime, etime int64) {
 	stime = ginx.QueryInt64(c, "stime", 0)
 	etime = ginx.QueryInt64(c, "etime", 0)
 	if etime == 0 {
@@ -79,6 +78,7 @@ func (rt *Router) alertRuleGetsByGids(c *gin.Context) {
 		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)
@@ -88,7 +88,7 @@ func (rt *Router) alertRuleGetsByGids(c *gin.Context) {
 			names = append(names, ars[i].UpdateBy)
 		}

-		stime, etime := GetAlertCueEventTimeRange(c)
+		stime, etime := getAlertCueEventTimeRange(c)
 		cnt := models.AlertCurEventCountByRuleId(rt.Ctx, rids, stime, etime)
 		if cnt != nil {
 			for i := 0; i < len(ars); i++ {
@@ -157,120 +157,6 @@ func (rt *Router) alertRuleAddByFE(c *gin.Context) {
 	ginx.NewRender(c).Data(reterr, nil)
 }

-type AlertRuleTryRunForm struct {
-	EventId         int64            `json:"event_id" binding:"required"`
-	AlertRuleConfig models.AlertRule `json:"config" binding:"required"`
-}
-
-func (rt *Router) alertRuleNotifyTryRun(c *gin.Context) {
-	// check notify channels of old version
-	var f AlertRuleTryRunForm
-	ginx.BindJSON(c, &f)
-
-	hisEvent, err := models.AlertHisEventGetById(rt.Ctx, f.EventId)
-	ginx.Dangerous(err)
-
-	if hisEvent == nil {
-		ginx.Bomb(http.StatusNotFound, "event not found")
-	}
-
-	curEvent := *hisEvent.ToCur()
-	curEvent.SetTagsMap()
-
-	if f.AlertRuleConfig.NotifyVersion == 1 {
-		for _, id := range f.AlertRuleConfig.NotifyRuleIds {
-			notifyRule, err := models.GetNotifyRule(rt.Ctx, id)
-			ginx.Dangerous(err)
-			for _, notifyConfig := range notifyRule.NotifyConfigs {
-				_, err = SendNotifyChannelMessage(rt.Ctx, rt.UserCache, rt.UserGroupCache, notifyConfig, []*models.AlertCurEvent{&curEvent})
-				ginx.Dangerous(err)
-			}
-		}
-
-		ginx.NewRender(c).Data("notification test ok", nil)
-		return
-	}
-
-	if len(f.AlertRuleConfig.NotifyChannelsJSON) == 0 {
-		ginx.Bomb(http.StatusOK, "no notify channels selected")
-	}
-
-	if len(f.AlertRuleConfig.NotifyGroupsJSON) == 0 {
-		ginx.Bomb(http.StatusOK, "no notify groups selected")
-	}
-
-	ancs := make([]string, 0, len(curEvent.NotifyChannelsJSON))
-	ugids := f.AlertRuleConfig.NotifyGroupsJSON
-	ngids := make([]int64, 0)
-	for i := 0; i < len(ugids); i++ {
-		if gid, err := strconv.ParseInt(ugids[i], 10, 64); err == nil {
-			ngids = append(ngids, gid)
-		}
-	}
-	userGroups := rt.UserGroupCache.GetByUserGroupIds(ngids)
-	uids := make([]int64, 0)
-	for i := range userGroups {
-		uids = append(uids, userGroups[i].UserIds...)
-	}
-	users := rt.UserCache.GetByUserIds(uids)
-	for _, NotifyChannels := range curEvent.NotifyChannelsJSON {
-		flag := true
-		// ignore non-default channels
-		switch NotifyChannels {
-		case models.Dingtalk, models.Wecom, models.Feishu, models.Mm,
-			models.Telegram, models.Email, models.FeishuCard:
-			// do nothing
-		default:
-			continue
-		}
-		// default channels
-		for ui := range users {
-			if _, b := users[ui].ExtractToken(NotifyChannels); b {
-				flag = false
-				break
-			}
-		}
-		if flag {
-			ancs = append(ancs, NotifyChannels)
-		}
-	}
-	if len(ancs) > 0 {
-		ginx.Dangerous(errors.New(fmt.Sprintf("All users are missing notify channel configurations. Please check for missing tokens (each channel should be configured with at least one user). %v", ancs)))
-	}
-
-	ginx.NewRender(c).Data("notification test ok", nil)
-}
-
-func (rt *Router) alertRuleEnableTryRun(c *gin.Context) {
-	// check notify channels of old version
-	var f AlertRuleTryRunForm
-	ginx.BindJSON(c, &f)
-
-	hisEvent, err := models.AlertHisEventGetById(rt.Ctx, f.EventId)
-	ginx.Dangerous(err)
-
-	if hisEvent == nil {
-		ginx.Bomb(http.StatusNotFound, "event not found")
-	}
-
-	curEvent := *hisEvent.ToCur()
-	curEvent.SetTagsMap()
-
-	if f.AlertRuleConfig.Disabled == 1 {
-		ginx.Bomb(http.StatusOK, "rule is disabled")
-	}
-
-	if mute.TimeSpanMuteStrategy(&f.AlertRuleConfig, &curEvent) {
-		ginx.Bomb(http.StatusOK, "event is not match for period of time")
-	}
-
-	if mute.BgNotMatchMuteStrategy(&f.AlertRuleConfig, &curEvent, rt.TargetCache) {
-		ginx.Bomb(http.StatusOK, "event target busi group not match rule busi group")
-	}
-
-	ginx.NewRender(c).Data("event is effective", nil)
-}
-
 func (rt *Router) alertRuleAddByImport(c *gin.Context) {
 	username := c.MustGet("username").(string)

@@ -288,15 +174,6 @@ func (rt *Router) alertRuleAddByImport(c *gin.Context) {
 				models.DataSourceQueryAll,
 			}
 		}
-
-		// 将导入的规则统一转为新版本的通知规则配置
-		lst[i].NotifyVersion = 1
-		lst[i].NotifyChannelsJSON = []string{}
-		lst[i].NotifyGroupsJSON = []string{}
-		lst[i].NotifyChannels = ""
-		lst[i].NotifyGroups = ""
-		lst[i].Callbacks = ""
-		lst[i].CallbacksJSON = []string{}
 	}

 	bgid := ginx.UrlParamInt64(c, "id")
@@ -315,52 +192,19 @@ func (rt *Router) alertRuleAddByImportPromRule(c *gin.Context) {
 	var f promRuleForm
 	ginx.Dangerous(c.BindJSON(&f))

-	// 首先尝试解析带 groups 的格式
 	var pr struct {
 		Groups []models.PromRuleGroup `yaml:"groups"`
 	}
 	err := yaml.Unmarshal([]byte(f.Payload), &pr)
-
-	var groups []models.PromRuleGroup
-
-	if err != nil || len(pr.Groups) == 0 {
-		// 如果解析失败或没有 groups，尝试解析规则数组格式
-		var rules []models.PromRule
-		err = yaml.Unmarshal([]byte(f.Payload), &rules)
-		if err != nil {
-			// 最后尝试解析单个规则格式
-			var singleRule models.PromRule
-			err = yaml.Unmarshal([]byte(f.Payload), &singleRule)
-			if err != nil {
-				ginx.Bomb(http.StatusBadRequest, "invalid yaml format. err: %v", err)
-			}
-
-			// 验证单个规则是否有效
-			if singleRule.Alert == "" && singleRule.Record == "" {
-				ginx.Bomb(http.StatusBadRequest, "input yaml is empty or invalid")
-			}
-
-			rules = []models.PromRule{singleRule}
-		}
-
-		// 验证规则数组是否为空
-		if len(rules) == 0 {
-			ginx.Bomb(http.StatusBadRequest, "input yaml contains no rules")
-		}
-
-		// 将规则数组包装成 group
-		groups = []models.PromRuleGroup{
-			{
-				Name:  "imported_rules",
-				Rules: rules,
-			},
-		}
-	} else {
-		// 使用已解析的 groups
-		groups = pr.Groups
+	if err != nil {
+		ginx.Bomb(http.StatusBadRequest, "invalid yaml format, please use the example format. err: %v", err)
 	}

-	lst := models.DealPromGroup(groups, f.DatasourceQueries, f.Disabled)
+	if len(pr.Groups) == 0 {
+		ginx.Bomb(http.StatusBadRequest, "input yaml is empty")
+	}
+
+	lst := models.DealPromGroup(pr.Groups, f.DatasourceQueries, f.Disabled)
 	username := c.MustGet("username").(string)
 	bgid := ginx.UrlParamInt64(c, "id")
 	ginx.NewRender(c).Data(rt.alertRuleAdd(lst, username, bgid, c.GetHeader("X-Language")), nil)
@@ -505,8 +349,8 @@ func (rt *Router) alertRulePutFields(c *gin.Context) {
 		ginx.Bomb(http.StatusBadRequest, "fields empty")
 	}

-	updateBy := c.MustGet("username").(string)
-	updateAt := time.Now().Unix()
+	f.Fields["update_by"] = c.MustGet("username").(string)
+	f.Fields["update_at"] = time.Now().Unix()

 	for i := 0; i < len(f.Ids); i++ {
 		ar, err := models.AlertRuleGetById(rt.Ctx, f.Ids[i])
@@ -523,6 +367,7 @@ func (rt *Router) alertRulePutFields(c *gin.Context) {
 				b, err := json.Marshal(originRule)
 				ginx.Dangerous(err)
 				ginx.Dangerous(ar.UpdateFieldsMap(rt.Ctx, map[string]interface{}{"rule_config": string(b)}))
+				continue
 			}
 		}

@@ -535,6 +380,7 @@ func (rt *Router) alertRulePutFields(c *gin.Context) {
 				b, err := json.Marshal(ar.AnnotationsJSON)
 				ginx.Dangerous(err)
 				ginx.Dangerous(ar.UpdateFieldsMap(rt.Ctx, map[string]interface{}{"annotations": string(b)}))
+				continue
 			}
 		}

@@ -547,6 +393,7 @@ func (rt *Router) alertRulePutFields(c *gin.Context) {
 				b, err := json.Marshal(ar.AnnotationsJSON)
 				ginx.Dangerous(err)
 				ginx.Dangerous(ar.UpdateFieldsMap(rt.Ctx, map[string]interface{}{"annotations": string(b)}))
+				continue
 			}
 		}

@@ -556,6 +403,7 @@ func (rt *Router) alertRulePutFields(c *gin.Context) {
 				callback := callbacks.(string)
 				if !strings.Contains(ar.Callbacks, callback) {
 					ginx.Dangerous(ar.UpdateFieldsMap(rt.Ctx, map[string]interface{}{"callbacks": ar.Callbacks + " " + callback}))
+					continue
 				}
 			}
 		}
@@ -565,6 +413,7 @@ func (rt *Router) alertRulePutFields(c *gin.Context) {
 			if callbacks, has := f.Fields["callbacks"]; has {
 				callback := callbacks.(string)
 				ginx.Dangerous(ar.UpdateFieldsMap(rt.Ctx, map[string]interface{}{"callbacks": strings.ReplaceAll(ar.Callbacks, callback, "")}))
+				continue
 			}
 		}

@@ -574,6 +423,7 @@ func (rt *Router) alertRulePutFields(c *gin.Context) {
 				bytes, err := json.Marshal(datasourceQueries)
 				ginx.Dangerous(err)
 				ginx.Dangerous(ar.UpdateFieldsMap(rt.Ctx, map[string]interface{}{"datasource_queries": bytes}))
+				continue
 			}
 		}

@@ -589,12 +439,6 @@ func (rt *Router) alertRulePutFields(c *gin.Context) {
 				ginx.Dangerous(ar.UpdateColumn(rt.Ctx, k, v))
 			}
 		}
-
-		// 统一更新更新时间和更新人，只有更新时间变了，告警规则才会被引擎拉取
-		ginx.Dangerous(ar.UpdateFieldsMap(rt.Ctx, map[string]interface{}{
-			"update_by": updateBy,
-			"update_at": updateAt,
-		}))
 	}

 	ginx.NewRender(c).Message(nil)
--- a/center/router/router_alert_subscribe.go
+++ b/center/router/router_alert_subscribe.go
@@ -2,17 +2,13 @@ package router

 import (
 	"net/http"
-	"strconv"
-	"strings"
 	"time"

-	"github.com/ccfos/nightingale/v6/alert/common"
 	"github.com/ccfos/nightingale/v6/models"
 	"github.com/ccfos/nightingale/v6/pkg/strx"

 	"github.com/gin-gonic/gin"
 	"github.com/toolkits/pkg/ginx"
-	"github.com/toolkits/pkg/i18n"
 )

 // Return all, front-end search and paging
@@ -108,148 +104,6 @@ func (rt *Router) alertSubscribeAdd(c *gin.Context) {
 	ginx.NewRender(c).Message(f.Add(rt.Ctx))
 }

-type SubscribeTryRunForm struct {
-	EventId         int64                 `json:"event_id" binding:"required"`
-	SubscribeConfig models.AlertSubscribe `json:"config" binding:"required"`
-}
-
-func (rt *Router) alertSubscribeTryRun(c *gin.Context) {
-	var f SubscribeTryRunForm
-	ginx.BindJSON(c, &f)
-	ginx.Dangerous(f.SubscribeConfig.Verify())
-
-	hisEvent, err := models.AlertHisEventGetById(rt.Ctx, f.EventId)
-	ginx.Dangerous(err)
-
-	if hisEvent == nil {
-		ginx.Bomb(http.StatusNotFound, "event not found")
-	}
-
-	curEvent := *hisEvent.ToCur()
-	curEvent.SetTagsMap()
-
-	lang := c.GetHeader("X-Language")
-
-	// 先判断匹配条件
-	if !f.SubscribeConfig.MatchCluster(curEvent.DatasourceId) {
-		ginx.Bomb(http.StatusBadRequest, i18n.Sprintf(lang, "event datasource not match"))
-	}
-
-	if len(f.SubscribeConfig.RuleIds) != 0 {
-		match := false
-		for _, rid := range f.SubscribeConfig.RuleIds {
-			if rid == curEvent.RuleId {
-				match = true
-				break
-			}
-		}
-		if !match {
-			ginx.Bomb(http.StatusBadRequest, i18n.Sprintf(lang, "event rule id not match"))
-		}
-	}
-
-	// 匹配 tag
-	f.SubscribeConfig.Parse()
-	if !common.MatchTags(curEvent.TagsMap, f.SubscribeConfig.ITags) {
-		ginx.Bomb(http.StatusBadRequest, i18n.Sprintf(lang, "event tags not match"))
-	}
-
-	// 匹配group name
-	if !common.MatchGroupsName(curEvent.GroupName, f.SubscribeConfig.IBusiGroups) {
-		ginx.Bomb(http.StatusBadRequest, i18n.Sprintf(lang, "event group name not match"))
-	}
-
-	// 检查严重级别（Severity）匹配
-	if len(f.SubscribeConfig.SeveritiesJson) != 0 {
-		match := false
-		for _, s := range f.SubscribeConfig.SeveritiesJson {
-			if s == curEvent.Severity || s == 0 {
-				match = true
-				break
-			}
-		}
-		if !match {
-			ginx.Bomb(http.StatusBadRequest, i18n.Sprintf(lang, "event severity not match"))
-		}
-	}
-
-	// 新版本通知规则
-	if f.SubscribeConfig.NotifyVersion == 1 {
-		if len(f.SubscribeConfig.NotifyRuleIds) == 0 {
-			ginx.Bomb(http.StatusBadRequest, i18n.Sprintf(lang, "no notify rules selected"))
-		}
-
-		for _, id := range f.SubscribeConfig.NotifyRuleIds {
-			notifyRule, err := models.GetNotifyRule(rt.Ctx, id)
-			if err != nil {
-				ginx.Bomb(http.StatusNotFound, i18n.Sprintf(lang, "subscribe notify rule not found: %v", err))
-			}
-
-			for _, notifyConfig := range notifyRule.NotifyConfigs {
-				_, err = SendNotifyChannelMessage(rt.Ctx, rt.UserCache, rt.UserGroupCache, notifyConfig, []*models.AlertCurEvent{&curEvent})
-				if err != nil {
-					ginx.Bomb(http.StatusBadRequest, i18n.Sprintf(lang, "notify rule send error: %v", err))
-				}
-			}
-		}
-
-		ginx.NewRender(c).Data(i18n.Sprintf(lang, "event match subscribe and notification test ok"), nil)
-		return
-	}
-
-	// 旧版通知方式
-	f.SubscribeConfig.ModifyEvent(&curEvent)
-	if len(curEvent.NotifyChannelsJSON) == 0 {
-		ginx.Bomb(http.StatusBadRequest, i18n.Sprintf(lang, "no notify channels selected"))
-	}
-
-	if len(curEvent.NotifyGroupsJSON) == 0 {
-		ginx.Bomb(http.StatusOK, i18n.Sprintf(lang, "no notify groups selected"))
-	}
-
-	ancs := make([]string, 0, len(curEvent.NotifyChannelsJSON))
-	ugids := strings.Fields(f.SubscribeConfig.UserGroupIds)
-	ngids := make([]int64, 0)
-	for i := 0; i < len(ugids); i++ {
-		if gid, err := strconv.ParseInt(ugids[i], 10, 64); err == nil {
-			ngids = append(ngids, gid)
-		}
-	}
-
-	userGroups := rt.UserGroupCache.GetByUserGroupIds(ngids)
-	uids := make([]int64, 0)
-	for i := range userGroups {
-		uids = append(uids, userGroups[i].UserIds...)
-	}
-	users := rt.UserCache.GetByUserIds(uids)
-	for _, NotifyChannels := range curEvent.NotifyChannelsJSON {
-		flag := true
-		// ignore non-default channels
-		switch NotifyChannels {
-		case models.Dingtalk, models.Wecom, models.Feishu, models.Mm,
-			models.Telegram, models.Email, models.FeishuCard:
-			// do nothing
-		default:
-			continue
-		}
-		// default channels
-		for ui := range users {
-			if _, b := users[ui].ExtractToken(NotifyChannels); b {
-				flag = false
-				break
-			}
-		}
-		if flag {
-			ancs = append(ancs, NotifyChannels)
-		}
-	}
-	if len(ancs) > 0 {
-		ginx.Bomb(http.StatusBadRequest, i18n.Sprintf(lang, "all users missing notify channel configurations: %v", ancs))
-	}
-
-	ginx.NewRender(c).Data(i18n.Sprintf(lang, "event match subscribe and notify settings ok"), nil)
-}
-
 func (rt *Router) alertSubscribePut(c *gin.Context) {
 	var fs []models.AlertSubscribe
 	ginx.BindJSON(c, &fs)
@@ -288,7 +142,6 @@ func (rt *Router) alertSubscribePut(c *gin.Context) {
 			"busi_groups",
 			"note",
 			"notify_rule_ids",
-			"notify_version",
 		))
 	}

--- a/center/router/router_board.go
+++ b/center/router/router_board.go
@@ -17,7 +17,6 @@ type boardForm struct {
 	Name       string  `json:"name"`
 	Ident      string  `json:"ident"`
 	Tags       string  `json:"tags"`
-	Note       string  `json:"note"`
 	Configs    string  `json:"configs"`
 	Public     int     `json:"public"`
 	PublicCate int     `json:"public_cate"`
@@ -35,7 +34,6 @@ func (rt *Router) boardAdd(c *gin.Context) {
 		Name:     f.Name,
 		Ident:    f.Ident,
 		Tags:     f.Tags,
-		Note:     f.Note,
 		Configs:  f.Configs,
 		CreateBy: me.Username,
 		UpdateBy: me.Username,
@@ -117,10 +115,6 @@ func (rt *Router) boardPureGet(c *gin.Context) {
 		ginx.Bomb(http.StatusNotFound, "No such dashboard")
 	}

-	// 清除创建者和更新者信息
-	board.CreateBy = ""
-	board.UpdateBy = ""
-
 	ginx.NewRender(c).Data(board, nil)
 }

@@ -186,11 +180,10 @@ func (rt *Router) boardPut(c *gin.Context) {
 	bo.Name = f.Name
 	bo.Ident = f.Ident
 	bo.Tags = f.Tags
-	bo.Note = f.Note
 	bo.UpdateBy = me.Username
 	bo.UpdateAt = time.Now().Unix()

-	err = bo.Update(rt.Ctx, "name", "ident", "tags", "note", "update_by", "update_at")
+	err = bo.Update(rt.Ctx, "name", "ident", "tags", "update_by", "update_at")
 	ginx.NewRender(c).Data(bo, err)
 }

--- a/center/router/router_builtin_component.go
+++ b/center/router/router_builtin_component.go
--- a/center/router/router_builtin_metrics.go
+++ b/center/router/router_builtin_metrics.go
@@ -2,10 +2,8 @@ package router

 import (
 	"net/http"
-	"sort"
 	"time"

-	"github.com/ccfos/nightingale/v6/center/integration"
 	"github.com/ccfos/nightingale/v6/models"

 	"github.com/gin-gonic/gin"
@@ -31,7 +29,7 @@ func (rt *Router) builtinMetricsAdd(c *gin.Context) {
 	reterr := make(map[string]string)
 	for i := 0; i < count; i++ {
 		lst[i].Lang = lang
-		lst[i].UUID = time.Now().UnixMicro()
+		lst[i].UUID = time.Now().UnixNano()
 		if err := lst[i].Add(rt.Ctx, username); err != nil {
 			reterr[lst[i].Name] = i18n.Sprintf(c.GetHeader("X-Language"), err.Error())
 		}
@@ -50,12 +48,11 @@ func (rt *Router) builtinMetricsGets(c *gin.Context) {
 		lang = "zh_CN"
 	}

-	bmInDB, err := models.BuiltinMetricGets(rt.Ctx, "", collector, typ, query, unit)
+	bm, err := models.BuiltinMetricGets(rt.Ctx, lang, collector, typ, query, unit, limit, ginx.Offset(c, limit))
 	ginx.Dangerous(err)

-	bm, total, err := integration.BuiltinPayloadInFile.BuiltinMetricGets(bmInDB, lang, collector, typ, query, unit, limit, ginx.Offset(c, limit))
+	total, err := models.BuiltinMetricCount(rt.Ctx, lang, collector, typ, query, unit)
 	ginx.Dangerous(err)
-
 	ginx.NewRender(c).Data(gin.H{
 		"list":  bm,
 		"total": total,
@@ -103,26 +100,8 @@ func (rt *Router) builtinMetricsTypes(c *gin.Context) {
 	query := ginx.QueryStr(c, "query", "")
 	lang := c.GetHeader("X-Language")

-	metricTypeListInDB, err := models.BuiltinMetricTypes(rt.Ctx, lang, collector, query)
-	ginx.Dangerous(err)
-
-	metricTypeListInFile := integration.BuiltinPayloadInFile.BuiltinMetricTypes(lang, collector, query)
-
-	typeMap := make(map[string]struct{})
-	for _, metricType := range metricTypeListInDB {
-		typeMap[metricType] = struct{}{}
-	}
-	for _, metricType := range metricTypeListInFile {
-		typeMap[metricType] = struct{}{}
-	}
-
-	metricTypeList := make([]string, 0, len(typeMap))
-	for metricType := range typeMap {
-		metricTypeList = append(metricTypeList, metricType)
-	}
-	sort.Strings(metricTypeList)
-
-	ginx.NewRender(c).Data(metricTypeList, nil)
+	metricTypeList, err := models.BuiltinMetricTypes(rt.Ctx, lang, collector, query)
+	ginx.NewRender(c).Data(metricTypeList, err)
 }

 func (rt *Router) builtinMetricsCollectors(c *gin.Context) {
@@ -130,24 +109,5 @@ func (rt *Router) builtinMetricsCollectors(c *gin.Context) {
 	query := ginx.QueryStr(c, "query", "")
 	lang := c.GetHeader("X-Language")

-	collectorListInDB, err := models.BuiltinMetricCollectors(rt.Ctx, lang, typ, query)
-	ginx.Dangerous(err)
-
-	collectorListInFile := integration.BuiltinPayloadInFile.BuiltinMetricCollectors(lang, typ, query)
-
-	collectorMap := make(map[string]struct{})
-	for _, collector := range collectorListInDB {
-		collectorMap[collector] = struct{}{}
-	}
-	for _, collector := range collectorListInFile {
-		collectorMap[collector] = struct{}{}
-	}
-
-	collectorList := make([]string, 0, len(collectorMap))
-	for collector := range collectorMap {
-		collectorList = append(collectorList, collector)
-	}
-	sort.Strings(collectorList)
-
-	ginx.NewRender(c).Data(collectorList, nil)
+	ginx.NewRender(c).Data(models.BuiltinMetricCollectors(rt.Ctx, lang, typ, query))
 }
--- a/center/router/router_builtin_payload.go
+++ b/center/router/router_builtin_payload.go
@@ -7,7 +7,6 @@ import (
 	"time"

 	"github.com/BurntSushi/toml"
-	"github.com/ccfos/nightingale/v6/center/integration"
 	"github.com/ccfos/nightingale/v6/models"
 	"github.com/gin-gonic/gin"
 	"github.com/toolkits/pkg/ginx"
@@ -19,7 +18,6 @@ type Board struct {
 	Tags    string      `json:"tags"`
 	Configs interface{} `json:"configs"`
 	UUID    int64       `json:"uuid"`
-	Note    string      `json:"note"`
 }

 func (rt *Router) builtinPayloadsAdd(c *gin.Context) {
@@ -130,7 +128,6 @@ func (rt *Router) builtinPayloadsAdd(c *gin.Context) {
 						Name:        dashboard.Name,
 						Tags:        dashboard.Tags,
 						UUID:        dashboard.UUID,
-						Note:        dashboard.Note,
 						Content:     string(contentBytes),
 						CreatedBy:   username,
 						UpdatedBy:   username,
@@ -166,7 +163,6 @@ func (rt *Router) builtinPayloadsAdd(c *gin.Context) {
 				Name:        dashboard.Name,
 				Tags:        dashboard.Tags,
 				UUID:        dashboard.UUID,
-				Note:        dashboard.Note,
 				Content:     string(contentBytes),
 				CreatedBy:   username,
 				UpdatedBy:   username,
@@ -196,26 +192,13 @@ func (rt *Router) builtinPayloadsAdd(c *gin.Context) {

 func (rt *Router) builtinPayloadsGets(c *gin.Context) {
 	typ := ginx.QueryStr(c, "type", "")
-	if typ == "" {
-		ginx.Bomb(http.StatusBadRequest, "type is required")
-		return
-	}
 	ComponentID := ginx.QueryInt64(c, "component_id", 0)

 	cate := ginx.QueryStr(c, "cate", "")
 	query := ginx.QueryStr(c, "query", "")

 	lst, err := models.BuiltinPayloadGets(rt.Ctx, uint64(ComponentID), typ, cate, query)
-	ginx.Dangerous(err)
-
-	lstInFile, err := integration.BuiltinPayloadInFile.GetBuiltinPayload(typ, cate, query, uint64(ComponentID))
-	ginx.Dangerous(err)
-
-	if len(lstInFile) > 0 {
-		lst = append(lst, lstInFile...)
-	}
-
-	ginx.NewRender(c).Data(lst, nil)
+	ginx.NewRender(c).Data(lst, err)
 }

 func (rt *Router) builtinPayloadcatesGet(c *gin.Context) {
@@ -223,31 +206,21 @@ func (rt *Router) builtinPayloadcatesGet(c *gin.Context) {
 	ComponentID := ginx.QueryInt64(c, "component_id", 0)

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

-	catesInFile, err := integration.BuiltinPayloadInFile.GetBuiltinPayloadCates(typ, uint64(ComponentID))
-	ginx.Dangerous(err)
+func (rt *Router) builtinPayloadGet(c *gin.Context) {
+	id := ginx.UrlParamInt64(c, "id")

-	// 使用 map 进行去重
-	cateMap := make(map[string]bool)
-
-	// 添加数据库中的分类
-	for _, cate := range cates {
-		cateMap[cate] = true
+	bp, err := models.BuiltinPayloadGet(rt.Ctx, "id = ?", id)
+	if err != nil {
+		ginx.Bomb(http.StatusInternalServerError, err.Error())
+	}
+	if bp == nil {
+		ginx.Bomb(http.StatusNotFound, "builtin payload not found")
 	}

-	// 添加文件中的分类
-	for _, cate := range catesInFile {
-		cateMap[cate] = true
-	}
-
-	// 将去重后的结果转换回切片
-	result := make([]string, 0, len(cateMap))
-	for cate := range cateMap {
-		result = append(result, cate)
-	}
-
-	ginx.NewRender(c).Data(result, nil)
+	ginx.NewRender(c).Data(bp, nil)
 }

 func (rt *Router) builtinPayloadsPut(c *gin.Context) {
@@ -278,7 +251,6 @@ func (rt *Router) builtinPayloadsPut(c *gin.Context) {

 		req.Name = dashboard.Name
 		req.Tags = dashboard.Tags
-		req.Note = dashboard.Note
 	} else if req.Type == "collect" {
 		c := make(map[string]interface{})
 		if _, err := toml.Decode(req.Content, &c); err != nil {
@@ -301,15 +273,14 @@ func (rt *Router) builtinPayloadsDel(c *gin.Context) {
 	ginx.NewRender(c).Message(models.BuiltinPayloadDels(rt.Ctx, req.Ids))
 }

-func (rt *Router) builtinPayloadsGetByUUID(c *gin.Context) {
-	uuid := ginx.QueryInt64(c, "uuid")
-
-	bp, err := models.BuiltinPayloadGet(rt.Ctx, "uuid = ?", uuid)
-	ginx.Dangerous(err)
-
-	if bp != nil {
-		ginx.NewRender(c).Data(bp, nil)
-	} else {
-		ginx.NewRender(c).Data(integration.BuiltinPayloadInFile.IndexData[uuid], nil)
+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_datasource.go
+++ b/center/router/router_datasource.go
@@ -1,23 +1,17 @@
 package router

 import (
-	"context"
 	"crypto/tls"
-	"encoding/base64"
-	"encoding/json"
 	"fmt"
 	"io"
 	"net/http"
 	"net/url"
 	"strings"
-	"time"

-	"github.com/ccfos/nightingale/v6/datasource/opensearch"
-	"github.com/ccfos/nightingale/v6/dskit/clickhouse"
 	"github.com/ccfos/nightingale/v6/models"
+
 	"github.com/gin-gonic/gin"
 	"github.com/toolkits/pkg/ginx"
-	"github.com/toolkits/pkg/i18n"
 	"github.com/toolkits/pkg/logger"
 )

@@ -53,41 +47,9 @@ func (rt *Router) datasourceList(c *gin.Context) {
 func (rt *Router) datasourceGetsByService(c *gin.Context) {
 	typ := ginx.QueryStr(c, "typ", "")
 	lst, err := models.GetDatasourcesGetsBy(rt.Ctx, typ, "", "", "")
-
-	openRsa := rt.Center.RSA.OpenRSA
-	for _, item := range lst {
-		if err := item.Encrypt(openRsa, rt.HTTP.RSA.RSAPublicKey); err != nil {
-			logger.Errorf("datasource %+v encrypt failed: %v", item, err)
-			continue
-		}
-	}
 	ginx.NewRender(c).Data(lst, err)
 }

-func (rt *Router) datasourceRsaConfigGet(c *gin.Context) {
-	if rt.Center.RSA.OpenRSA {
-		publicKey := ""
-		privateKey := ""
-		if len(rt.HTTP.RSA.RSAPublicKey) > 0 {
-			publicKey = base64.StdEncoding.EncodeToString(rt.HTTP.RSA.RSAPublicKey)
-		}
-		if len(rt.HTTP.RSA.RSAPrivateKey) > 0 {
-			privateKey = base64.StdEncoding.EncodeToString(rt.HTTP.RSA.RSAPrivateKey)
-		}
-		logger.Debugf("OpenRSA=%v", rt.Center.RSA.OpenRSA)
-		ginx.NewRender(c).Data(models.RsaConfig{
-			OpenRSA:       rt.Center.RSA.OpenRSA,
-			RSAPublicKey:  publicKey,
-			RSAPrivateKey: privateKey,
-			RSAPassWord:   rt.HTTP.RSA.RSAPassWord,
-		}, nil)
-	} else {
-		ginx.NewRender(c).Data(models.RsaConfig{
-			OpenRSA: rt.Center.RSA.OpenRSA,
-		}, nil)
-	}
-}
-
 func (rt *Router) datasourceBriefs(c *gin.Context) {
 	var dss []*models.Datasource
 	list, err := models.GetDatasourcesGetsBy(rt.Ctx, "", "", "", "")
@@ -138,7 +100,7 @@ func (rt *Router) datasourceUpsert(c *gin.Context) {

 	if !req.ForceSave {
 		if req.PluginType == models.PROMETHEUS || req.PluginType == models.LOKI || req.PluginType == models.TDENGINE {
-			err = DatasourceCheck(c, req)
+			err = DatasourceCheck(req)
 			if err != nil {
 				Dangerous(c, err)
 				return
@@ -146,121 +108,6 @@ func (rt *Router) datasourceUpsert(c *gin.Context) {
 		}
 	}

-	for k, v := range req.SettingsJson {
-		if strings.Contains(k, "cluster_name") {
-			req.ClusterName = v.(string)
-			break
-		}
-	}
-
-	if req.PluginType == models.OPENSEARCH {
-		b, err := json.Marshal(req.SettingsJson)
-		if err != nil {
-			logger.Warningf("marshal settings fail: %v", err)
-			return
-		}
-
-		var os opensearch.OpenSearch
-		err = json.Unmarshal(b, &os)
-		if err != nil {
-			logger.Warningf("unmarshal settings fail: %v", err)
-			return
-		}
-
-		if len(os.Nodes) == 0 {
-			logger.Warningf("nodes empty, %+v", req)
-			return
-		}
-
-		req.HTTPJson = models.HTTP{
-			Timeout: os.Timeout,
-			Url:     os.Nodes[0],
-			Headers: os.Headers,
-			TLS: models.TLS{
-				SkipTlsVerify: os.TLS.SkipTlsVerify,
-			},
-		}
-
-		req.AuthJson = models.Auth{
-			BasicAuth:         os.Basic.Enable,
-			BasicAuthUser:     os.Basic.Username,
-			BasicAuthPassword: os.Basic.Password,
-		}
-	}
-
-	if req.PluginType == models.CLICKHOUSE {
-		b, err := json.Marshal(req.SettingsJson)
-		if err != nil {
-			logger.Warningf("marshal clickhouse settings failed: %v", err)
-			Dangerous(c, err)
-			return
-		}
-
-		var ckConfig clickhouse.Clickhouse
-		err = json.Unmarshal(b, &ckConfig)
-		if err != nil {
-			logger.Warningf("unmarshal clickhouse settings failed: %v", err)
-			Dangerous(c, err)
-			return
-		}
-		// 检查ckconfig的nodes不应该以http://或https://开头
-		for _, addr := range ckConfig.Nodes {
-			if strings.HasPrefix(addr, "http://") || strings.HasPrefix(addr, "https://") {
-				err = fmt.Errorf("clickhouse node address should not start with http:// or https:// : %s", addr)
-				logger.Warningf("clickhouse node address invalid: %v", err)
-				Dangerous(c, err)
-				return
-			}
-		}
-
-		// InitCli 会自动检测并选择 HTTP 或 Native 协议
-		err = ckConfig.InitCli()
-		if err != nil {
-			logger.Warningf("clickhouse connection failed: %v", err)
-			Dangerous(c, err)
-			return
-		}
-
-		// 执行 SHOW DATABASES 测试连通性
-		_, err = ckConfig.ShowDatabases(context.Background())
-		if err != nil {
-			logger.Warningf("clickhouse test query failed: %v", err)
-			Dangerous(c, err)
-			return
-		}
-	}
-
-	if req.PluginType == models.ELASTICSEARCH {
-		skipAuto := false
-		// 若用户输入了version（version字符串存在且不为空），则不自动获取
-		if req.SettingsJson != nil {
-			if v, ok := req.SettingsJson["version"]; ok {
-				switch vv := v.(type) {
-				case string:
-					if strings.TrimSpace(vv) != "" {
-						skipAuto = true
-					}
-				default:
-					if strings.TrimSpace(fmt.Sprint(vv)) != "" {
-						skipAuto = true
-					}
-				}
-			}
-		}
-
-		if !skipAuto {
-			version, err := getElasticsearchVersion(req, 10*time.Second)
-			if err != nil {
-				logger.Warningf("failed to get elasticsearch version: %v", err)
-			} else {
-				if req.SettingsJson == nil {
-					req.SettingsJson = make(map[string]interface{})
-				}
-				req.SettingsJson["version"] = version
-			}
-		}
-	}
-
 	if req.Id == 0 {
 		req.CreatedBy = username
 		req.Status = "enabled"
@@ -282,7 +129,7 @@ func (rt *Router) datasourceUpsert(c *gin.Context) {
 	Render(c, nil, err)
 }

-func DatasourceCheck(c *gin.Context, ds models.Datasource) error {
+func DatasourceCheck(ds models.Datasource) error {
 	if ds.PluginType == models.PROMETHEUS || ds.PluginType == models.LOKI || ds.PluginType == models.TDENGINE {
 		if ds.HTTPJson.Url == "" {
 			return fmt.Errorf("url is empty")
@@ -293,24 +140,19 @@ func DatasourceCheck(c *gin.Context, ds models.Datasource) error {
 		}
 	}

-	// 使用 TLS 配置（支持 mTLS）
-	tlsConfig, err := ds.HTTPJson.TLS.TLSConfig()
-	if err != nil {
-		return fmt.Errorf("failed to create TLS config: %v", err)
-	}
-
 	client := &http.Client{
 		Transport: &http.Transport{
-			TLSClientConfig: tlsConfig,
+			TLSClientConfig: &tls.Config{
+				InsecureSkipVerify: ds.HTTPJson.TLS.SkipTlsVerify,
+			},
 		},
 	}

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

 	if ds.PluginType == models.PROMETHEUS {
@@ -326,14 +168,14 @@ func DatasourceCheck(c *gin.Context, ds models.Datasource) error {
 		req, err = http.NewRequest("GET", fullURL, nil)
 		if err != nil {
 			logger.Errorf("Error creating request: %v", err)
-			return fmt.Errorf("request url:%s failed: %v", fullURL, err)
+			return fmt.Errorf("request url:%s failed", fullURL)
 		}
 	} else if ds.PluginType == models.TDENGINE {
 		fullURL = fmt.Sprintf("%s/rest/sql", ds.HTTPJson.Url)
 		req, err = http.NewRequest("POST", fullURL, strings.NewReader("show databases"))
 		if err != nil {
 			logger.Errorf("Error creating request: %v", err)
-			return fmt.Errorf("request url:%s failed: %v", fullURL, err)
+			return fmt.Errorf("request url:%s failed", fullURL)
 		}
 	}

@@ -345,11 +187,7 @@ func DatasourceCheck(c *gin.Context, ds models.Datasource) error {
 		req, err = http.NewRequest("GET", fullURL, nil)
 		if err != nil {
 			logger.Errorf("Error creating request: %v", err)
-			if !strings.Contains(ds.HTTPJson.Url, "/loki") {
-				lang := c.GetHeader("X-Language")
-				return fmt.Errorf(i18n.Sprintf(lang, "/loki suffix is miss, please add /loki to the url: %s", ds.HTTPJson.Url+"/loki"))
-			}
-			return fmt.Errorf("request url:%s failed: %v", fullURL, err)
+			return fmt.Errorf("request url:%s failed", fullURL)
 		}
 	}

@@ -364,16 +202,12 @@ func DatasourceCheck(c *gin.Context, ds models.Datasource) error {
 	resp, err := client.Do(req)
 	if err != nil {
 		logger.Errorf("Error making request: %v\n", err)
-		return fmt.Errorf("request url:%s failed: %v", fullURL, err)
+		return fmt.Errorf("request url:%s failed", fullURL)
 	}
 	defer resp.Body.Close()

 	if resp.StatusCode != 200 {
 		logger.Errorf("Error making request: %v\n", resp.StatusCode)
-		if resp.StatusCode == 404 && ds.PluginType == models.LOKI && !strings.Contains(ds.HTTPJson.Url, "/loki") {
-			lang := c.GetHeader("X-Language")
-			return fmt.Errorf(i18n.Sprintf(lang, "/loki suffix is miss, please add /loki to the url: %s", ds.HTTPJson.Url+"/loki"))
-		}
 		body, _ := io.ReadAll(resp.Body)
 		return fmt.Errorf("request url:%s failed code:%d body:%s", fullURL, resp.StatusCode, string(body))
 	}
@@ -459,82 +293,3 @@ func (rt *Router) datasourceQuery(c *gin.Context) {
 	}
 	ginx.NewRender(c).Data(req, err)
 }
-
-// getElasticsearchVersion 该函数尝试从提供的Elasticsearch数据源中获取版本号，遍历所有URL，
-// 直到成功获取版本号或所有URL均尝试失败为止。
-func getElasticsearchVersion(ds models.Datasource, timeout time.Duration) (string, error) {
-	client := &http.Client{
-		Timeout: timeout,
-		Transport: &http.Transport{
-			TLSClientConfig: &tls.Config{
-				InsecureSkipVerify: ds.HTTPJson.TLS.SkipTlsVerify,
-			},
-		},
-	}
-
-	urls := make([]string, 0)
-	if len(ds.HTTPJson.Urls) > 0 {
-		urls = append(urls, ds.HTTPJson.Urls...)
-	}
-	if ds.HTTPJson.Url != "" {
-		urls = append(urls, ds.HTTPJson.Url)
-	}
-	if len(urls) == 0 {
-		return "", fmt.Errorf("no url provided")
-	}
-
-	var lastErr error
-	for _, raw := range urls {
-		baseURL := strings.TrimRight(raw, "/") + "/"
-		req, err := http.NewRequest("GET", baseURL, nil)
-		if err != nil {
-			lastErr = err
-			continue
-		}
-
-		if ds.AuthJson.BasicAuthUser != "" {
-			req.SetBasicAuth(ds.AuthJson.BasicAuthUser, ds.AuthJson.BasicAuthPassword)
-		}
-
-		for k, v := range ds.HTTPJson.Headers {
-			req.Header.Set(k, v)
-		}
-
-		resp, err := client.Do(req)
-		if err != nil {
-			lastErr = err
-			continue
-		}
-
-		body, err := io.ReadAll(resp.Body)
-		resp.Body.Close()
-		if err != nil {
-			lastErr = err
-			continue
-		}
-
-		if resp.StatusCode != 200 {
-			lastErr = fmt.Errorf("request to %s failed with status: %d body:%s", baseURL, resp.StatusCode, string(body))
-			continue
-		}
-
-		var result map[string]interface{}
-		if err := json.Unmarshal(body, &result); err != nil {
-			lastErr = err
-			continue
-		}
-
-		if version, ok := result["version"].(map[string]interface{}); ok {
-			if number, ok := version["number"].(string); ok && number != "" {
-				return number, nil
-			}
-		}
-
-		lastErr = fmt.Errorf("version not found in response from %s", baseURL)
-	}
-
-	if lastErr != nil {
-		return "", lastErr
-	}
-	return "", fmt.Errorf("failed to get elasticsearch version")
-}
--- a/center/router/router_datasource_db.go
+++ b/center/router/router_datasource_db.go
@@ -60,8 +60,8 @@ func (rt *Router) ShowTables(c *gin.Context) {
 	}
 	switch plug.(type) {
 	case TableShower:
-		if len(f.Queries) > 0 {
-			database, ok := f.Queries[0].(string)
+		if len(f.Querys) > 0 {
+			database, ok := f.Querys[0].(string)
 			if ok {
 				tables, err = plug.(TableShower).ShowTables(c.Request.Context(), database)
 			}
@@ -90,8 +90,8 @@ func (rt *Router) DescribeTable(c *gin.Context) {
 	switch plug.(type) {
 	case TableDescriber:
 		client := plug.(TableDescriber)
-		if len(f.Queries) > 0 {
-			columns, err = client.DescribeTable(c.Request.Context(), f.Queries[0])
+		if len(f.Querys) > 0 {
+			columns, err = client.DescribeTable(c.Request.Context(), f.Querys[0])
 		}
 	default:
 		ginx.Bomb(200, "datasource not exists")
--- a/center/router/router_event_pipeline.go
+++ b/center/router/router_event_pipeline.go
@@ -1,18 +1,13 @@
 package router

 import (
-	"encoding/json"
-	"fmt"
 	"net/http"
 	"time"

-	"github.com/ccfos/nightingale/v6/alert/pipeline/engine"
 	"github.com/ccfos/nightingale/v6/models"

 	"github.com/gin-gonic/gin"
-	"github.com/google/uuid"
 	"github.com/toolkits/pkg/ginx"
-	"github.com/toolkits/pkg/i18n"
 	"github.com/toolkits/pkg/logger"
 )

@@ -32,8 +27,6 @@ func (rt *Router) eventPipelinesList(c *gin.Context) {
 		for _, tid := range pipeline.TeamIds {
 			pipeline.TeamNames = append(pipeline.TeamNames, ugMap[tid])
 		}
-		// 兼容处理：自动填充工作流字段
-		pipeline.FillWorkflowFields()
 	}

 	gids, err := models.MyGroupIdsMap(rt.Ctx, me.Id)
@@ -68,9 +61,6 @@ func (rt *Router) getEventPipeline(c *gin.Context) {
 	err = pipeline.FillTeamNames(rt.Ctx)
 	ginx.Dangerous(err)

-	// 兼容处理：自动填充工作流字段
-	pipeline.FillWorkflowFields()
-
 	ginx.NewRender(c).Data(pipeline, nil)
 }

@@ -141,9 +131,7 @@ func (rt *Router) tryRunEventPipeline(c *gin.Context) {
 	var f struct {
 		EventId        int64                `json:"event_id"`
 		PipelineConfig models.EventPipeline `json:"pipeline_config"`
-		EnvVariables   map[string]string    `json:"env_variables,omitempty"`
 	}
-
 	ginx.BindJSON(c, &f)

 	hisEvent, err := models.AlertHisEventGetById(rt.Ctx, f.EventId)
@@ -152,35 +140,18 @@ func (rt *Router) tryRunEventPipeline(c *gin.Context) {
 	}
 	event := hisEvent.ToCur()

-	lang := c.GetHeader("X-Language")
-	me := c.MustGet("user").(*models.User)
-
-	// 统一使用工作流引擎执行（兼容线性模式和工作流模式）
-	workflowEngine := engine.NewWorkflowEngine(rt.Ctx)
-
-	triggerCtx := &models.WorkflowTriggerContext{
-		Mode:         models.TriggerModeAPI,
-		TriggerBy:    me.Username,
-		EnvOverrides: f.EnvVariables,
+	for _, p := range f.PipelineConfig.ProcessorConfigs {
+		processor, err := models.GetProcessorByType(p.Typ, p.Config)
+		if err != nil {
+			ginx.Bomb(http.StatusBadRequest, "processor %+v type not found", p)
+		}
+		event = processor.Process(rt.Ctx, event)
+		if event == nil {
+			ginx.Bomb(http.StatusBadRequest, "event is nil")
+		}
 	}

-	resultEvent, result, err := workflowEngine.Execute(&f.PipelineConfig, event, triggerCtx)
-	if err != nil {
-		ginx.Bomb(http.StatusBadRequest, "pipeline execute error: %v", err)
-	}
-
-	m := map[string]interface{}{
-		"event":        resultEvent,
-		"result":       i18n.Sprintf(lang, result.Message),
-		"status":       result.Status,
-		"node_results": result.NodeResults,
-	}
-
-	if resultEvent == nil {
-		m["result"] = i18n.Sprintf(lang, "event is dropped")
-	}
-
-	ginx.NewRender(c).Data(m, nil)
+	ginx.NewRender(c).Data(event, nil)
 }

 // 测试事件处理器
@@ -199,22 +170,15 @@ func (rt *Router) tryRunEventProcessor(c *gin.Context) {

 	processor, err := models.GetProcessorByType(f.ProcessorConfig.Typ, f.ProcessorConfig.Config)
 	if err != nil {
-		ginx.Bomb(200, "get processor err: %+v", err)
+		ginx.Bomb(http.StatusBadRequest, "processor type not found")
 	}
-	wfCtx := &models.WorkflowContext{
-		Event: event,
-		Vars:  make(map[string]interface{}),
-	}
-	wfCtx, res, err := processor.Process(rt.Ctx, wfCtx)
-	if err != nil {
-		ginx.Bomb(200, "processor err: %+v", err)
+	event = processor.Process(rt.Ctx, event)
+	logger.Infof("processor %+v result: %+v", f.ProcessorConfig, event)
+	if event == nil {
+		ginx.Bomb(http.StatusBadRequest, "event is nil")
 	}

-	lang := c.GetHeader("X-Language")
-	ginx.NewRender(c).Data(map[string]interface{}{
-		"event":  wfCtx.Event,
-		"result": i18n.Sprintf(lang, res),
-	}, nil)
+	ginx.NewRender(c).Data(event, nil)
 }

 func (rt *Router) tryRunEventProcessorByNotifyRule(c *gin.Context) {
@@ -242,363 +206,23 @@ func (rt *Router) tryRunEventProcessorByNotifyRule(c *gin.Context) {
 		ginx.Bomb(http.StatusBadRequest, "processors not found")
 	}

-	wfCtx := &models.WorkflowContext{
-		Event: event,
-		Vars:  make(map[string]interface{}),
-	}
 	for _, pl := range pipelines {
 		for _, p := range pl.ProcessorConfigs {
 			processor, err := models.GetProcessorByType(p.Typ, p.Config)
 			if err != nil {
-				ginx.Bomb(http.StatusBadRequest, "get processor: %+v err: %+v", p, err)
+				ginx.Bomb(http.StatusBadRequest, "processor %+v type not found", p)
 			}
-
-			wfCtx, _, err = processor.Process(rt.Ctx, wfCtx)
-			if err != nil {
-				ginx.Bomb(http.StatusBadRequest, "processor: %+v err: %+v", p, err)
-			}
-			if wfCtx == nil || wfCtx.Event == nil {
-				lang := c.GetHeader("X-Language")
-				ginx.NewRender(c).Data(map[string]interface{}{
-					"event":  nil,
-					"result": i18n.Sprintf(lang, "event is dropped"),
-				}, nil)
-				return
+			event = processor.Process(rt.Ctx, event)
+			if event == nil {
+				ginx.Bomb(http.StatusBadRequest, "event is nil")
 			}
 		}
 	}

-	ginx.NewRender(c).Data(wfCtx.Event, nil)
+	ginx.NewRender(c).Data(event, nil)
 }

 func (rt *Router) eventPipelinesListByService(c *gin.Context) {
 	pipelines, err := models.ListEventPipelines(rt.Ctx)
 	ginx.NewRender(c).Data(pipelines, err)
 }
-
-type EventPipelineRequest struct {
-	// 事件数据（可选，如果不传则使用空事件）
-	Event *models.AlertCurEvent `json:"event,omitempty"`
-	// 环境变量覆盖
-	EnvOverrides map[string]string `json:"env_overrides,omitempty"`
-
-	Username string `json:"username,omitempty"`
-}
-
-// executePipelineTrigger 执行 Pipeline 触发的公共逻辑
-func (rt *Router) executePipelineTrigger(pipeline *models.EventPipeline, req *EventPipelineRequest, triggerBy string) (string, error) {
-	// 准备事件数据
-	var event *models.AlertCurEvent
-	if req.Event != nil {
-		event = req.Event
-	} else {
-		// 创建空事件
-		event = &models.AlertCurEvent{
-			TriggerTime: time.Now().Unix(),
-		}
-	}
-
-	// 校验必填环境变量
-	if err := pipeline.ValidateEnvVariables(req.EnvOverrides); err != nil {
-		return "", fmt.Errorf("env validation failed: %v", err)
-	}
-
-	// 生成执行ID
-	executionID := uuid.New().String()
-
-	// 创建触发上下文
-	triggerCtx := &models.WorkflowTriggerContext{
-		Mode:         models.TriggerModeAPI,
-		TriggerBy:    triggerBy,
-		EnvOverrides: req.EnvOverrides,
-		RequestID:    executionID,
-	}
-
-	// 异步执行工作流
-	go func() {
-		workflowEngine := engine.NewWorkflowEngine(rt.Ctx)
-		_, _, err := workflowEngine.Execute(pipeline, event, triggerCtx)
-		if err != nil {
-			logger.Errorf("async workflow execute error: pipeline_id=%d execution_id=%s err=%v",
-				pipeline.ID, executionID, err)
-		}
-	}()
-
-	return executionID, nil
-}
-
-// triggerEventPipelineByService Service 调用触发工作流执行
-func (rt *Router) triggerEventPipelineByService(c *gin.Context) {
-	pipelineID := ginx.UrlParamInt64(c, "id")
-	var f EventPipelineRequest
-	ginx.BindJSON(c, &f)
-
-	// 获取 Pipeline
-	pipeline, err := models.GetEventPipeline(rt.Ctx, pipelineID)
-	if err != nil {
-		ginx.Bomb(http.StatusNotFound, "pipeline not found: %v", err)
-	}
-
-	executionID, err := rt.executePipelineTrigger(pipeline, &f, f.Username)
-	if err != nil {
-		ginx.Bomb(http.StatusBadRequest, "%v", err)
-	}
-
-	ginx.NewRender(c).Data(gin.H{
-		"execution_id": executionID,
-		"message":      "workflow execution started",
-	}, nil)
-}
-
-// triggerEventPipelineByAPI API 触发工作流执行
-func (rt *Router) triggerEventPipelineByAPI(c *gin.Context) {
-	pipelineID := ginx.UrlParamInt64(c, "id")
-	var f EventPipelineRequest
-	ginx.BindJSON(c, &f)
-
-	// 获取 Pipeline
-	pipeline, err := models.GetEventPipeline(rt.Ctx, pipelineID)
-	if err != nil {
-		ginx.Bomb(http.StatusNotFound, "pipeline not found: %v", err)
-	}
-
-	// 检查权限
-	me := c.MustGet("user").(*models.User)
-	ginx.Dangerous(me.CheckGroupPermission(rt.Ctx, pipeline.TeamIds))
-
-	executionID, err := rt.executePipelineTrigger(pipeline, &f, me.Username)
-	if err != nil {
-		ginx.Bomb(http.StatusBadRequest, err.Error())
-	}
-
-	ginx.NewRender(c).Data(gin.H{
-		"execution_id": executionID,
-		"message":      "workflow execution started",
-	}, nil)
-}
-
-func (rt *Router) listAllEventPipelineExecutions(c *gin.Context) {
-	pipelineName := ginx.QueryStr(c, "pipeline_name", "")
-	mode := ginx.QueryStr(c, "mode", "")
-	status := ginx.QueryStr(c, "status", "")
-	limit := ginx.QueryInt(c, "limit", 20)
-	offset := ginx.QueryInt(c, "p", 1)
-
-	if limit <= 0 || limit > 1000 {
-		limit = 20
-	}
-	if offset <= 0 {
-		offset = 1
-	}
-
-	executions, total, err := models.ListAllEventPipelineExecutions(rt.Ctx, pipelineName, mode, status, limit, (offset-1)*limit)
-	ginx.Dangerous(err)
-
-	ginx.NewRender(c).Data(gin.H{
-		"list":  executions,
-		"total": total,
-	}, nil)
-}
-
-func (rt *Router) listEventPipelineExecutions(c *gin.Context) {
-	pipelineID := ginx.UrlParamInt64(c, "id")
-	mode := ginx.QueryStr(c, "mode", "")
-	status := ginx.QueryStr(c, "status", "")
-	limit := ginx.QueryInt(c, "limit", 20)
-	offset := ginx.QueryInt(c, "p", 1)
-
-	if limit <= 0 || limit > 1000 {
-		limit = 20
-	}
-	if offset <= 0 {
-		offset = 1
-	}
-
-	executions, total, err := models.ListEventPipelineExecutions(rt.Ctx, pipelineID, mode, status, limit, (offset-1)*limit)
-	ginx.Dangerous(err)
-
-	ginx.NewRender(c).Data(gin.H{
-		"list":  executions,
-		"total": total,
-	}, nil)
-}
-
-func (rt *Router) getEventPipelineExecution(c *gin.Context) {
-	execID := ginx.UrlParamStr(c, "exec_id")
-
-	detail, err := models.GetEventPipelineExecutionDetail(rt.Ctx, execID)
-	if err != nil {
-		ginx.Bomb(http.StatusNotFound, "execution not found: %v", err)
-	}
-
-	ginx.NewRender(c).Data(detail, nil)
-}
-
-func (rt *Router) getEventPipelineExecutionStats(c *gin.Context) {
-	pipelineID := ginx.UrlParamInt64(c, "id")
-
-	stats, err := models.GetEventPipelineExecutionStatistics(rt.Ctx, pipelineID)
-	ginx.Dangerous(err)
-
-	ginx.NewRender(c).Data(stats, nil)
-}
-
-func (rt *Router) cleanEventPipelineExecutions(c *gin.Context) {
-	var f struct {
-		BeforeDays int `json:"before_days"`
-	}
-	ginx.BindJSON(c, &f)
-
-	if f.BeforeDays <= 0 {
-		f.BeforeDays = 30
-	}
-
-	beforeTime := time.Now().AddDate(0, 0, -f.BeforeDays).Unix()
-	affected, err := models.DeleteEventPipelineExecutions(rt.Ctx, beforeTime)
-	ginx.Dangerous(err)
-
-	ginx.NewRender(c).Data(gin.H{
-		"deleted": affected,
-	}, nil)
-}
-
-func (rt *Router) streamEventPipeline(c *gin.Context) {
-	pipelineID := ginx.UrlParamInt64(c, "id")
-
-	var f EventPipelineRequest
-	ginx.BindJSON(c, &f)
-
-	pipeline, err := models.GetEventPipeline(rt.Ctx, pipelineID)
-	if err != nil {
-		ginx.Bomb(http.StatusNotFound, "pipeline not found: %v", err)
-	}
-
-	me := c.MustGet("user").(*models.User)
-	ginx.Dangerous(me.CheckGroupPermission(rt.Ctx, pipeline.TeamIds))
-
-	var event *models.AlertCurEvent
-	if f.Event != nil {
-		event = f.Event
-	} else {
-		event = &models.AlertCurEvent{
-			TriggerTime: time.Now().Unix(),
-		}
-	}
-
-	triggerCtx := &models.WorkflowTriggerContext{
-		Mode:         models.TriggerModeAPI,
-		TriggerBy:    me.Username,
-		EnvOverrides: f.EnvOverrides,
-		RequestID:    uuid.New().String(),
-		Stream:       true, // 流式端点强制启用流式输出
-	}
-
-	workflowEngine := engine.NewWorkflowEngine(rt.Ctx)
-	_, result, err := workflowEngine.Execute(pipeline, event, triggerCtx)
-	if err != nil {
-		ginx.Bomb(http.StatusInternalServerError, "execute failed: %v", err)
-	}
-
-	if result.Stream && result.StreamChan != nil {
-		rt.handleStreamResponse(c, result, triggerCtx.RequestID)
-		return
-	}
-
-	ginx.NewRender(c).Data(result, nil)
-}
-
-func (rt *Router) handleStreamResponse(c *gin.Context, result *models.WorkflowResult, requestID string) {
-	// 设置 SSE 响应头
-	c.Header("Content-Type", "text/event-stream")
-	c.Header("Cache-Control", "no-cache")
-	c.Header("Connection", "keep-alive")
-	c.Header("X-Accel-Buffering", "no") // 禁用 nginx 缓冲
-	c.Header("X-Request-ID", requestID)
-
-	flusher, ok := c.Writer.(http.Flusher)
-	if !ok {
-		ginx.Bomb(http.StatusInternalServerError, "streaming not supported")
-		return
-	}
-
-	// 发送初始连接成功消息
-	initData := fmt.Sprintf(`{"type":"connected","request_id":"%s","timestamp":%d}`, requestID, time.Now().UnixMilli())
-	fmt.Fprintf(c.Writer, "data: %s\n\n", initData)
-	flusher.Flush()
-
-	// 从 channel 读取并发送 SSE
-	timeout := time.After(30 * time.Minute) // 最长流式输出时间
-	for {
-		select {
-		case chunk, ok := <-result.StreamChan:
-			if !ok {
-				// channel 关闭，发送结束标记
-				return
-			}
-
-			data, err := json.Marshal(chunk)
-			if err != nil {
-				logger.Errorf("stream: failed to marshal chunk: %v", err)
-				continue
-			}
-
-			fmt.Fprintf(c.Writer, "data: %s\n\n", data)
-			flusher.Flush()
-
-			if chunk.Done {
-				return
-			}
-
-		case <-c.Request.Context().Done():
-			// 客户端断开连接
-			logger.Infof("stream: client disconnected, request_id=%s", requestID)
-			return
-		case <-timeout:
-			logger.Errorf("stream: timeout, request_id=%s", requestID)
-			return
-		}
-	}
-}
-
-func (rt *Router) streamEventPipelineByService(c *gin.Context) {
-	pipelineID := ginx.UrlParamInt64(c, "id")
-
-	var f EventPipelineRequest
-	ginx.BindJSON(c, &f)
-
-	pipeline, err := models.GetEventPipeline(rt.Ctx, pipelineID)
-	if err != nil {
-		ginx.Bomb(http.StatusNotFound, "pipeline not found: %v", err)
-	}
-
-	var event *models.AlertCurEvent
-	if f.Event != nil {
-		event = f.Event
-	} else {
-		event = &models.AlertCurEvent{
-			TriggerTime: time.Now().Unix(),
-		}
-	}
-
-	triggerCtx := &models.WorkflowTriggerContext{
-		Mode:         models.TriggerModeAPI,
-		TriggerBy:    f.Username,
-		EnvOverrides: f.EnvOverrides,
-		RequestID:    uuid.New().String(),
-		Stream:       true, // 流式端点强制启用流式输出
-	}
-
-	workflowEngine := engine.NewWorkflowEngine(rt.Ctx)
-	_, result, err := workflowEngine.Execute(pipeline, event, triggerCtx)
-	if err != nil {
-		ginx.Bomb(http.StatusInternalServerError, "execute failed: %v", err)
-	}
-
-	// 检查是否是流式输出
-	if result.Stream && result.StreamChan != nil {
-		rt.handleStreamResponse(c, result, triggerCtx.RequestID)
-		return
-	}
-
-	ginx.NewRender(c).Data(result, nil)
-}
--- a/center/router/router_funcs.go
+++ b/center/router/router_funcs.go
@@ -128,12 +128,6 @@ func UserGroup(ctx *ctx.Context, id int64) *models.UserGroup {
 		ginx.Bomb(http.StatusNotFound, "No such UserGroup")
 	}

-	bgids, err := models.BusiGroupIds(ctx, []int64{id})
-	ginx.Dangerous(err)
-
-	obj.BusiGroups, err = models.BusiGroupGetByIds(ctx, bgids)
-	ginx.Dangerous(err)
-
 	return obj
 }

@@ -179,38 +173,3 @@ func Username(c *gin.Context) string {
 	}
 	return username
 }
-
-func HasPermission(ctx *ctx.Context, c *gin.Context, sourceType, sourceId string, isAnonymousAccess bool) bool {
-	if sourceType == "event" && isAnonymousAccess {
-		return true
-	}
-
-	// 尝试从请求中获取 __token 参数
-	token := ginx.QueryStr(c, "__token", "")
-
-	// 如果有 __token 参数，验证其合法性
-	if token != "" {
-		return ValidateSourceToken(ctx, sourceType, sourceId, token)
-	}
-
-	return false
-}
-
-func ValidateSourceToken(ctx *ctx.Context, sourceType, sourceId, token string) bool {
-	if token == "" {
-		return false
-	}
-
-	// 根据源类型、源ID和令牌获取源令牌记录
-	sourceToken, err := models.GetSourceTokenBySource(ctx, sourceType, sourceId, token)
-	if err != nil {
-		return false
-	}
-
-	// 检查令牌是否过期
-	if sourceToken.IsExpired() {
-		return false
-	}
-
-	return true
-}
--- a/center/router/router_login.go
+++ b/center/router/router_login.go
@@ -2,16 +2,13 @@ package router

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

 	"github.com/ccfos/nightingale/v6/models"
 	"github.com/ccfos/nightingale/v6/pkg/cas"
-	"github.com/ccfos/nightingale/v6/pkg/dingtalk"
 	"github.com/ccfos/nightingale/v6/pkg/ldapx"
 	"github.com/ccfos/nightingale/v6/pkg/oauth2x"
 	"github.com/ccfos/nightingale/v6/pkg/oidcx"
@@ -20,10 +17,8 @@ import (
 	"github.com/dgrijalva/jwt-go"
 	"github.com/gin-gonic/gin"
 	"github.com/pelletier/go-toml/v2"
-	"github.com/pkg/errors"
 	"github.com/toolkits/pkg/ginx"
 	"github.com/toolkits/pkg/logger"
-	"gorm.io/gorm"
 )

 type loginForm struct {
@@ -112,20 +107,9 @@ func (rt *Router) logoutPost(c *gin.Context) {

 	var logoutAddr string
 	user := c.MustGet("user").(*models.User)
-
-	// 获取用户的 id_token
-	idToken, err := rt.fetchIdToken(c.Request.Context(), user.Id)
-	if err != nil {
-		logger.Debugf("fetch id_token failed: %v, user_id: %d", err, user.Id)
-		idToken = "" // 如果获取失败，使用空字符串
-	}
-
-	// 删除 id_token
-	rt.deleteIdToken(c.Request.Context(), user.Id)
-
 	switch user.Belong {
 	case "oidc":
-		logoutAddr = rt.Sso.OIDC.GetSsoLogoutAddr(idToken)
+		logoutAddr = rt.Sso.OIDC.GetSsoLogoutAddr()
 	case "cas":
 		logoutAddr = rt.Sso.CAS.GetSsoLogoutAddr()
 	case "oauth2":
@@ -215,14 +199,6 @@ func (rt *Router) refreshPost(c *gin.Context) {
 		ginx.Dangerous(err)
 		ginx.Dangerous(rt.createAuth(c.Request.Context(), userIdentity, ts))

-		// 延长 id_token 的过期时间，使其与新的 refresh token 生命周期保持一致
-		// 注意：这里不会获取新的 id_token，只是延长 Redis 中现有 id_token 的 TTL
-		if idToken, err := rt.fetchIdToken(c.Request.Context(), userid); err == nil && idToken != "" {
-			if err := rt.saveIdToken(c.Request.Context(), userid, idToken); err != nil {
-				logger.Debugf("refresh id_token ttl failed: %v, user_id: %d", err, userid)
-			}
-		}
-
 		ginx.NewRender(c).Data(gin.H{
 			"access_token":  ts.AccessToken,
 			"refresh_token": ts.RefreshToken,
@@ -310,13 +286,6 @@ func (rt *Router) loginCallback(c *gin.Context) {
 	ginx.Dangerous(err)
 	ginx.Dangerous(rt.createAuth(c.Request.Context(), userIdentity, ts))

-	// 保存 id_token 到 Redis，用于登出时使用
-	if ret.IdToken != "" {
-		if err := rt.saveIdToken(c.Request.Context(), user.Id, ret.IdToken); err != nil {
-			logger.Errorf("save id_token failed: %v, user_id: %d", err, user.Id)
-		}
-	}
-
 	redirect := "/"
 	if ret.Redirect != "/login" {
 		redirect = ret.Redirect
@@ -444,81 +413,6 @@ func (rt *Router) loginRedirectOAuth(c *gin.Context) {
 	ginx.NewRender(c).Data(redirect, err)
 }

-func (rt *Router) loginRedirectDingTalk(c *gin.Context) {
-	redirect := ginx.QueryStr(c, "redirect", "/")
-
-	v, exists := c.Get("userid")
-	if exists {
-		userid := v.(int64)
-		user, err := models.UserGetById(rt.Ctx, userid)
-		ginx.Dangerous(err)
-		if user == nil {
-			ginx.Bomb(200, "user not found")
-		}
-
-		if user.Username != "" { // already login
-			ginx.NewRender(c).Data(redirect, nil)
-			return
-		}
-	}
-
-	if !rt.Sso.DingTalk.Enable {
-		ginx.NewRender(c).Data("", nil)
-		return
-	}
-
-	redirect, err := rt.Sso.DingTalk.Authorize(rt.Redis, redirect)
-	ginx.Dangerous(err)
-
-	ginx.NewRender(c).Data(redirect, err)
-}
-
-func (rt *Router) loginCallbackDingTalk(c *gin.Context) {
-	code := ginx.QueryStr(c, "code", "")
-	state := ginx.QueryStr(c, "state", "")
-
-	ret, err := rt.Sso.DingTalk.Callback(rt.Redis, c.Request.Context(), code, state)
-	if err != nil {
-		logger.Errorf("sso_callback DingTalk fail. code:%s, state:%s, get ret: %+v. error: %v", code, state, ret, err)
-		ginx.NewRender(c).Data(CallbackOutput{}, err)
-		return
-	}
-
-	user, err := models.UserGet(rt.Ctx, "username=?", ret.Username)
-	ginx.Dangerous(err)
-
-	if user != nil {
-		if rt.Sso.DingTalk.DingTalkConfig.CoverAttributes {
-			updatedFields := user.UpdateSsoFields(dingtalk.SsoTypeName, ret.Nickname, ret.Phone, ret.Email)
-			ginx.Dangerous(user.Update(rt.Ctx, "update_at", updatedFields...))
-		}
-	} else {
-		user = new(models.User)
-		user.FullSsoFields(dingtalk.SsoTypeName, ret.Username, ret.Nickname, ret.Phone, ret.Email, rt.Sso.DingTalk.DingTalkConfig.DefaultRoles)
-		// create user from dingtalk
-		ginx.Dangerous(user.Add(rt.Ctx))
-	}
-
-	// set user login state
-	userIdentity := fmt.Sprintf("%d-%s", user.Id, user.Username)
-	ts, err := rt.createTokens(rt.HTTP.JWTAuth.SigningKey, userIdentity)
-	ginx.Dangerous(err)
-	ginx.Dangerous(rt.createAuth(c.Request.Context(), userIdentity, ts))
-
-	redirect := "/"
-	if ret.Redirect != "/login" {
-		redirect = ret.Redirect
-	}
-
-	ginx.NewRender(c).Data(CallbackOutput{
-		Redirect:     redirect,
-		User:         user,
-		AccessToken:  ts.AccessToken,
-		RefreshToken: ts.RefreshToken,
-	}, nil)
-
-}
-
 func (rt *Router) loginCallbackOAuth(c *gin.Context) {
 	code := ginx.QueryStr(c, "code", "")
 	state := ginx.QueryStr(c, "state", "")
@@ -565,14 +459,13 @@ func (rt *Router) loginCallbackOAuth(c *gin.Context) {
 }

 type SsoConfigOutput struct {
-	OidcDisplayName     string `json:"oidcDisplayName"`
-	CasDisplayName      string `json:"casDisplayName"`
-	OauthDisplayName    string `json:"oauthDisplayName"`
-	DingTalkDisplayName string `json:"dingTalkDisplayName"`
+	OidcDisplayName  string `json:"oidcDisplayName"`
+	CasDisplayName   string `json:"casDisplayName"`
+	OauthDisplayName string `json:"oauthDisplayName"`
 }

 func (rt *Router) ssoConfigNameGet(c *gin.Context) {
-	var oidcDisplayName, casDisplayName, oauthDisplayName, dingTalkDisplayName string
+	var oidcDisplayName, casDisplayName, oauthDisplayName string
 	if rt.Sso.OIDC != nil {
 		oidcDisplayName = rt.Sso.OIDC.GetDisplayName()
 	}
@@ -585,85 +478,23 @@ func (rt *Router) ssoConfigNameGet(c *gin.Context) {
 		oauthDisplayName = rt.Sso.OAuth2.GetDisplayName()
 	}

-	if rt.Sso.DingTalk != nil {
-		dingTalkDisplayName = rt.Sso.DingTalk.GetDisplayName()
-	}
-
 	ginx.NewRender(c).Data(SsoConfigOutput{
-		OidcDisplayName:     oidcDisplayName,
-		CasDisplayName:      casDisplayName,
-		OauthDisplayName:    oauthDisplayName,
-		DingTalkDisplayName: dingTalkDisplayName,
+		OidcDisplayName:  oidcDisplayName,
+		CasDisplayName:   casDisplayName,
+		OauthDisplayName: oauthDisplayName,
 	}, nil)
 }

 func (rt *Router) ssoConfigGets(c *gin.Context) {
-	var ssoConfigs []models.SsoConfig
-	lst, err := models.SsoConfigGets(rt.Ctx)
-	ginx.Dangerous(err)
-	if len(lst) == 0 {
-		ginx.NewRender(c).Data(ssoConfigs, nil)
-		return
-	}
-
-	// TODO: dingTalkExist 为了兼容当前前端配置, 后期单点登陆统一调整后不在预先设置默认内容
-	dingTalkExist := false
-	for _, config := range lst {
-		var ssoReqConfig models.SsoConfig
-		ssoReqConfig.Id = config.Id
-		ssoReqConfig.Name = config.Name
-		ssoReqConfig.UpdateAt = config.UpdateAt
-		switch config.Name {
-		case dingtalk.SsoTypeName:
-			dingTalkExist = true
-			err := json.Unmarshal([]byte(config.Content), &ssoReqConfig.SettingJson)
-			ginx.Dangerous(err)
-		default:
-			ssoReqConfig.Content = config.Content
-		}
-
-		ssoConfigs = append(ssoConfigs, ssoReqConfig)
-	}
-	// TODO: dingTalkExist 为了兼容当前前端配置, 后期单点登陆统一调整后不在预先设置默认内容
-	if !dingTalkExist {
-		var ssoConfig models.SsoConfig
-		ssoConfig.Name = dingtalk.SsoTypeName
-		ssoConfigs = append(ssoConfigs, ssoConfig)
-	}
-
-	ginx.NewRender(c).Data(ssoConfigs, nil)
+	ginx.NewRender(c).Data(models.SsoConfigGets(rt.Ctx))
 }

 func (rt *Router) ssoConfigUpdate(c *gin.Context) {
 	var f models.SsoConfig
-	var ssoConfig models.SsoConfig
-	ginx.BindJSON(c, &ssoConfig)
+	ginx.BindJSON(c, &f)

-	switch ssoConfig.Name {
-	case dingtalk.SsoTypeName:
-		f.Name = ssoConfig.Name
-		setting, err := json.Marshal(ssoConfig.SettingJson)
-		ginx.Dangerous(err)
-		f.Content = string(setting)
-		f.UpdateAt = time.Now().Unix()
-		sso, err := f.Query(rt.Ctx)
-		if !errors.Is(err, gorm.ErrRecordNotFound) {
-			ginx.Dangerous(err)
-		}
-		if errors.Is(err, gorm.ErrRecordNotFound) {
-			err = f.Create(rt.Ctx)
-		} else {
-			f.Id = sso.Id
-			err = f.Update(rt.Ctx)
-		}
-		ginx.Dangerous(err)
-	default:
-		f.Id = ssoConfig.Id
-		f.Name = ssoConfig.Name
-		f.Content = ssoConfig.Content
-		err := f.Update(rt.Ctx)
-		ginx.Dangerous(err)
-	}
+	err := f.Update(rt.Ctx)
+	ginx.Dangerous(err)

 	switch f.Name {
 	case "LDAP":
@@ -687,14 +518,6 @@ func (rt *Router) ssoConfigUpdate(c *gin.Context) {
 		err := toml.Unmarshal([]byte(f.Content), &config)
 		ginx.Dangerous(err)
 		rt.Sso.OAuth2.Reload(config)
-	case dingtalk.SsoTypeName:
-		var config dingtalk.Config
-		err := json.Unmarshal([]byte(f.Content), &config)
-		ginx.Dangerous(err)
-		if rt.Sso.DingTalk == nil {
-			rt.Sso.DingTalk = dingtalk.New(config)
-		}
-		rt.Sso.DingTalk.Reload(config)
 	}

 	ginx.NewRender(c).Message(nil)
--- a/center/router/router_message_template.go
+++ b/center/router/router_message_template.go
@@ -12,9 +12,7 @@ import (
 	"github.com/ccfos/nightingale/v6/pkg/slice"
 	"github.com/ccfos/nightingale/v6/pkg/strx"
 	"github.com/ccfos/nightingale/v6/pkg/tplx"
-
 	"github.com/gin-gonic/gin"
-	"github.com/google/uuid"
 	"github.com/toolkits/pkg/ginx"
 )

@@ -32,9 +30,6 @@ func (rt *Router) messageTemplatesAdd(c *gin.Context) {
 	ginx.Dangerous(err)
 	now := time.Now().Unix()
 	for _, tpl := range lst {
-		// 生成一个唯一的标识符，以后也不允许修改，前端不需要传这个参数
-		tpl.Ident = uuid.New().String()
-
 		ginx.Dangerous(tpl.Verify())
 		if !isAdmin && !slice.HaveIntersection(gids, tpl.UserGroupIds) {
 			ginx.Bomb(http.StatusForbidden, "forbidden")
@@ -193,9 +188,10 @@ func (rt *Router) eventsMessage(c *gin.Context) {
 		events[i] = he.ToCur()
 	}

-	renderData := make(map[string]interface{})
-	renderData["events"] = events
-	defs := models.GetDefs(renderData)
+	var defs = []string{
+		"{{$events := .}}",
+		"{{$event := index . 0}}",
+	}
 	ret := make(map[string]string, len(req.Tpl.Content))
 	for k, v := range req.Tpl.Content {
 		text := strings.Join(append(defs, v), "")
@@ -206,7 +202,7 @@ func (rt *Router) eventsMessage(c *gin.Context) {
 		}

 		var buf bytes.Buffer
-		err = tpl.Execute(&buf, renderData)
+		err = tpl.Execute(&buf, events)
 		if err != nil {
 			ret[k] = err.Error()
 			continue
--- a/center/router/router_mute.go
+++ b/center/router/router_mute.go
@@ -1,6 +1,7 @@
 package router

 import (
+	"math"
 	"net/http"
 	"strings"
 	"time"
@@ -12,16 +13,12 @@ import (

 	"github.com/gin-gonic/gin"
 	"github.com/toolkits/pkg/ginx"
-	"github.com/toolkits/pkg/i18n"
 )

 // Return all, front-end search and paging
 func (rt *Router) alertMuteGetsByBG(c *gin.Context) {
 	bgid := ginx.UrlParamInt64(c, "id")
-	prods := strings.Fields(ginx.QueryStr(c, "prods", ""))
-	query := ginx.QueryStr(c, "query", "")
-	expired := ginx.QueryInt(c, "expired", -1)
-	lst, err := models.AlertMuteGets(rt.Ctx, prods, bgid, -1, expired, query)
+	lst, err := models.AlertMuteGetsByBG(rt.Ctx, bgid)

 	ginx.NewRender(c).Data(lst, err)
 }
@@ -56,17 +53,11 @@ func (rt *Router) alertMuteGets(c *gin.Context) {
 	bgid := ginx.QueryInt64(c, "bgid", -1)
 	query := ginx.QueryStr(c, "query", "")
 	disabled := ginx.QueryInt(c, "disabled", -1)
-	expired := ginx.QueryInt(c, "expired", -1)
-	lst, err := models.AlertMuteGets(rt.Ctx, prods, bgid, disabled, expired, query)
+	lst, err := models.AlertMuteGets(rt.Ctx, prods, bgid, disabled, query)

 	ginx.NewRender(c).Data(lst, err)
 }

-func (rt *Router) activeAlertMuteGets(c *gin.Context) {
-	lst, err := models.AlertMuteGetsAll(rt.Ctx)
-	ginx.NewRender(c).Data(lst, err)
-}
-
 func (rt *Router) alertMuteAdd(c *gin.Context) {

 	var f models.AlertMute
@@ -76,21 +67,18 @@ func (rt *Router) alertMuteAdd(c *gin.Context) {
 	f.CreateBy = username
 	f.UpdateBy = username
 	f.GroupId = ginx.UrlParamInt64(c, "id")
-
-	ginx.Dangerous(f.Add(rt.Ctx))
-	ginx.NewRender(c).Data(f.Id, nil)
+	ginx.NewRender(c).Message(f.Add(rt.Ctx))
 }

 type MuteTestForm struct {
-	EventId       int64            `json:"event_id" binding:"required"`
-	AlertMute     models.AlertMute `json:"config" binding:"required"`
-	PassTimeCheck bool             `json:"pass_time_check"`
+	EventId   int64            `json:"event_id" binding:"required"`
+	AlertMute models.AlertMute `json:"mute_config" binding:"required"`
 }

 func (rt *Router) alertMuteTryRun(c *gin.Context) {
+
 	var f MuteTestForm
 	ginx.BindJSON(c, &f)
-	ginx.Dangerous(f.AlertMute.Verify())

 	hisEvent, err := models.AlertHisEventGetById(rt.Ctx, f.EventId)
 	ginx.Dangerous(err)
@@ -102,30 +90,18 @@ func (rt *Router) alertMuteTryRun(c *gin.Context) {
 	curEvent := *hisEvent.ToCur()
 	curEvent.SetTagsMap()

-	if f.PassTimeCheck {
-		f.AlertMute.MuteTimeType = models.Periodic
-		f.AlertMute.PeriodicMutesJson = []models.PeriodicMute{
-			{
-				EnableDaysOfWeek: "0 1 2 3 4 5 6",
-				EnableStime:      "00:00",
-				EnableEtime:      "00:00",
-			},
-		}
-	}
+	// 绕过时间范围检查：设置时间范围为全量（0 到 int64 最大值），仅验证其他匹配条件（如标签、策略类型等）
+	f.AlertMute.MuteTimeType = models.TimeRange
+	f.AlertMute.Btime = 0             // 最小可能值（如 Unix 时间戳起点）
+	f.AlertMute.Etime = math.MaxInt64 // 最大可能值（int64 上限）

-	match, err := mute.MatchMute(&curEvent, &f.AlertMute)
-	if err != nil {
-		// 对错误信息进行 i18n 翻译
-		translatedErr := i18n.Sprintf(c.GetHeader("X-Language"), err.Error())
-		ginx.Bomb(http.StatusBadRequest, translatedErr)
-	}
-
-	if !match {
-		ginx.NewRender(c).Data("event not match mute", nil)
+	if !mute.MatchMute(&curEvent, &f.AlertMute) {
+		ginx.NewRender(c).Data("not match", nil)
 		return
 	}

-	ginx.NewRender(c).Data("event match mute", nil)
+	ginx.NewRender(c).Data("mute test match", nil)
+
 }

 // Preview events (alert_cur_event) that match the mute strategy based on the following criteria:
--- a/center/router/router_mw.go
+++ b/center/router/router_mw.go
@@ -453,30 +453,6 @@ func (rt *Router) wrapJwtKey(key string) string {
 	return rt.HTTP.JWTAuth.RedisKeyPrefix + key
 }

-func (rt *Router) wrapIdTokenKey(userId int64) string {
-	return fmt.Sprintf("n9e_id_token_%d", userId)
-}
-
-// saveIdToken 保存用户的 id_token 到 Redis
-func (rt *Router) saveIdToken(ctx context.Context, userId int64, idToken string) error {
-	if idToken == "" {
-		return nil
-	}
-	// id_token 的过期时间应该与 RefreshToken 保持一致，确保在整个会话期间都可用于登出
-	expiration := time.Minute * time.Duration(rt.HTTP.JWTAuth.RefreshExpired)
-	return rt.Redis.Set(ctx, rt.wrapIdTokenKey(userId), idToken, expiration).Err()
-}
-
-// fetchIdToken 从 Redis 获取用户的 id_token
-func (rt *Router) fetchIdToken(ctx context.Context, userId int64) (string, error) {
-	return rt.Redis.Get(ctx, rt.wrapIdTokenKey(userId)).Result()
-}
-
-// deleteIdToken 从 Redis 删除用户的 id_token
-func (rt *Router) deleteIdToken(ctx context.Context, userId int64) error {
-	return rt.Redis.Del(ctx, rt.wrapIdTokenKey(userId)).Err()
-}
-
 type TokenDetails struct {
 	AccessToken  string
 	RefreshToken string
--- a/center/router/router_notification_record.go
+++ b/center/router/router_notification_record.go
@@ -33,7 +33,7 @@ type Record struct {

 // notificationRecordAdd
 func (rt *Router) notificationRecordAdd(c *gin.Context) {
-	var req []*models.NotificationRecord
+	var req []*models.NotificaitonRecord
 	ginx.BindJSON(c, &req)
 	err := sender.PushNotifyRecords(req)
 	ginx.Dangerous(err, 429)
@@ -43,14 +43,14 @@ func (rt *Router) notificationRecordAdd(c *gin.Context) {

 func (rt *Router) notificationRecordList(c *gin.Context) {
 	eid := ginx.UrlParamInt64(c, "eid")
-	lst, err := models.NotificationRecordsGetByEventId(rt.Ctx, eid)
+	lst, err := models.NotificaitonRecordsGetByEventId(rt.Ctx, eid)
 	ginx.Dangerous(err)

 	response := buildNotificationResponse(rt.Ctx, lst)
 	ginx.NewRender(c).Data(response, nil)
 }

-func buildNotificationResponse(ctx *ctx.Context, nl []*models.NotificationRecord) NotificationResponse {
+func buildNotificationResponse(ctx *ctx.Context, nl []*models.NotificaitonRecord) NotificationResponse {
 	response := NotificationResponse{
 		SubRules: []SubRule{},
 		Notifies: make(map[string][]Record),
--- a/center/router/router_notify_channel.go
+++ b/center/router/router_notify_channel.go
@@ -162,6 +162,21 @@ func (rt *Router) notifyChannelIdentsGet(c *gin.Context) {
 	ginx.NewRender(c).Data(lst, nil)
 }

+type flushDutyChannelsResponse struct {
+	Error struct {
+		Code    string `json:"code"`
+		Message string `json:"message"`
+	} `json:"error"`
+	Data struct {
+		Items []struct {
+			ChannelID   int    `json:"channel_id"`
+			ChannelName string `json:"channel_name"`
+			Status      string `json:"status"`
+		} `json:"items"`
+		Total int `json:"total"`
+	} `json:"data"`
+}
+
 func (rt *Router) flashDutyNotifyChannelsGet(c *gin.Context) {
 	cid := ginx.UrlParamInt64(c, "id")
 	nc, err := models.NotifyChannelGet(rt.Ctx, "id = ?", cid)
@@ -181,31 +196,18 @@ func (rt *Router) flashDutyNotifyChannelsGet(c *gin.Context) {
 		jsonData = []byte(fmt.Sprintf(`{"member_name":"%s","email":"%s","phone":"%s"}`, me.Username, me.Email, me.Phone))
 	}

-	items, err := getFlashDutyChannels(nc.RequestConfig.FlashDutyRequestConfig.IntegrationUrl, jsonData, time.Duration(nc.RequestConfig.FlashDutyRequestConfig.Timeout)*time.Millisecond)
+	items, err := getFlashDutyChannels(nc.RequestConfig.FlashDutyRequestConfig.IntegrationUrl, jsonData)
 	ginx.Dangerous(err)

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

-type flushDutyChannelsResponse struct {
-	Error struct {
-		Code    string `json:"code"`
-		Message string `json:"message"`
-	} `json:"error"`
-	Data struct {
-		Items []FlashDutyChannel `json:"items"`
-		Total int                `json:"total"`
-	} `json:"data"`
-}
-
-type FlashDutyChannel struct {
+// getFlashDutyChannels 从FlashDuty API获取频道列表
+func getFlashDutyChannels(integrationUrl string, jsonData []byte) ([]struct {
 	ChannelID   int    `json:"channel_id"`
 	ChannelName string `json:"channel_name"`
 	Status      string `json:"status"`
-}
-
-// getFlashDutyChannels 从FlashDuty API获取频道列表
-func getFlashDutyChannels(integrationUrl string, jsonData []byte, timeout time.Duration) ([]FlashDutyChannel, error) {
+}, error) {
 	// 解析URL，提取baseUrl和参数
 	baseUrl, integrationKey, err := parseIntegrationUrl(integrationUrl)
 	if err != nil {
@@ -225,9 +227,7 @@ func getFlashDutyChannels(integrationUrl string, jsonData []byte, timeout time.D
 	}

 	req.Header.Set("Content-Type", "application/json")
-	httpResp, err := (&http.Client{
-		Timeout: timeout,
-	}).Do(req)
+	httpResp, err := (&http.Client{}).Do(req)
 	if err != nil {
 		return nil, err
 	}
@@ -266,149 +266,3 @@ func parseIntegrationUrl(urlStr string) (baseUrl string, integrationKey string,

 	return host, integrationKey, nil
 }
-
-func (rt *Router) pagerDutyNotifyServicesGet(c *gin.Context) {
-	cid := ginx.UrlParamInt64(c, "id")
-	nc, err := models.NotifyChannelGet(rt.Ctx, "id = ?", cid)
-	ginx.Dangerous(err)
-	if err != nil || nc == nil {
-		ginx.Bomb(http.StatusNotFound, "notify channel not found")
-	}
-
-	items, err := getPagerDutyServices(nc.RequestConfig.PagerDutyRequestConfig.ApiKey, time.Duration(nc.RequestConfig.PagerDutyRequestConfig.Timeout)*time.Millisecond)
-	if err != nil {
-		ginx.Bomb(http.StatusInternalServerError, fmt.Sprintf("failed to get pagerduty services: %v", err))
-	}
-	// 服务: []集成，扁平化为服务-集成
-	var flattenedItems []map[string]string
-	for _, svc := range items {
-		for _, integ := range svc.Integrations {
-			flattenedItems = append(flattenedItems, map[string]string{
-				"service_id":          svc.ID,
-				"service_name":        svc.Name,
-				"integration_summary": integ.Summary,
-				"integration_id":      integ.ID,
-				"integration_url":     integ.Self,
-			})
-		}
-	}
-
-	ginx.NewRender(c).Data(flattenedItems, nil)
-}
-
-func (rt *Router) pagerDutyIntegrationKeyGet(c *gin.Context) {
-	serviceId := ginx.UrlParamStr(c, "service_id")
-	integrationId := ginx.UrlParamStr(c, "integration_id")
-	cid := ginx.UrlParamInt64(c, "id")
-	nc, err := models.NotifyChannelGet(rt.Ctx, "id = ?", cid)
-	ginx.Dangerous(err)
-	if err != nil || nc == nil {
-		ginx.Bomb(http.StatusNotFound, "notify channel not found")
-	}
-
-	integrationUrl := fmt.Sprintf("https://api.pagerduty.com/services/%s/integrations/%s", serviceId, integrationId)
-	integrationKey, err := getPagerDutyIntegrationKey(integrationUrl, nc.RequestConfig.PagerDutyRequestConfig.ApiKey, time.Duration(nc.RequestConfig.PagerDutyRequestConfig.Timeout)*time.Millisecond)
-	if err != nil {
-		ginx.Bomb(http.StatusInternalServerError, fmt.Sprintf("failed to get pagerduty integration key: %v", err))
-	}
-
-	ginx.NewRender(c).Data(map[string]string{
-		"integration_key": integrationKey,
-	}, nil)
-}
-
-type PagerDutyIntegration struct {
-	ID             string `json:"id"`
-	IntegrationKey string `json:"integration_key"`
-	Self           string `json:"self"` // integration 的 API URL
-	Summary        string `json:"summary"`
-}
-
-type PagerDutyService struct {
-	Name         string                 `json:"name"`
-	ID           string                 `json:"id"`
-	Integrations []PagerDutyIntegration `json:"integrations"`
-}
-
-// getPagerDutyServices 从 PagerDuty API 分页获取所有服务及其集成信息
-func getPagerDutyServices(apiKey string, timeout time.Duration) ([]PagerDutyService, error) {
-	const limit = 100 // 每页最大数量
-	var offset uint   // 分页偏移量
-	var allServices []PagerDutyService
-
-	for {
-		// 构建带分页参数的 URL
-		url := fmt.Sprintf("https://api.pagerduty.com/services?limit=%d&offset=%d", limit, offset)
-
-		req, err := http.NewRequest("GET", url, nil)
-		if err != nil {
-			return nil, err
-		}
-		req.Header.Set("Authorization", fmt.Sprintf("Token token=%s", apiKey))
-		req.Header.Set("Accept", "application/vnd.pagerduty+json;version=2")
-
-		httpResp, err := (&http.Client{Timeout: timeout}).Do(req)
-		if err != nil {
-			return nil, err
-		}
-
-		body, err := io.ReadAll(httpResp.Body)
-		httpResp.Body.Close()
-		if err != nil {
-			return nil, err
-		}
-
-		// 定义包含分页信息的响应结构
-		var serviceRes struct {
-			Services []PagerDutyService `json:"services"`
-			More     bool               `json:"more"` // 是否还有更多数据
-			Limit    uint               `json:"limit"`
-			Offset   uint               `json:"offset"`
-		}
-
-		if err := json.Unmarshal(body, &serviceRes); err != nil {
-			return nil, err
-		}
-		allServices = append(allServices, serviceRes.Services...)
-		// 判断是否还有更多数据
-		if !serviceRes.More || len(serviceRes.Services) < int(limit) {
-			break
-		}
-		offset += limit // 准备请求下一页
-	}
-
-	return allServices, nil
-}
-
-// getPagerDutyIntegrationKey 通过 integration 的 API URL 获取 integration key
-func getPagerDutyIntegrationKey(integrationUrl, apiKey string, timeout time.Duration) (string, error) {
-	req, err := http.NewRequest("GET", integrationUrl, nil)
-	if err != nil {
-		return "", err
-	}
-	req.Header.Set("Authorization", fmt.Sprintf("Token token=%s", apiKey))
-
-	httpResp, err := (&http.Client{
-		Timeout: timeout,
-	}).Do(req)
-	if err != nil {
-		return "", err
-	}
-	defer httpResp.Body.Close()
-	body, err := io.ReadAll(httpResp.Body)
-	if err != nil {
-		return "", err
-	}
-
-	var integRes struct {
-		Integration struct {
-			IntegrationKey string `json:"integration_key"`
-		} `json:"integration"`
-	}
-
-	if err := json.Unmarshal(body, &integRes); err != nil {
-		return "", err
-	}
-
-	return integRes.Integration.IntegrationKey, nil
-}
--- a/center/router/router_notify_channel_test.go
+++ b/center/router/router_notify_channel_test.go
@@ -11,7 +11,7 @@ func TestGetFlashDutyChannels(t *testing.T) {
 	jsonData := []byte(`{}`)

 	// 调用被测试的函数
-	channels, err := getFlashDutyChannels(integrationUrl, jsonData, 5000)
+	channels, err := getFlashDutyChannels(integrationUrl, jsonData)

 	fmt.Println(channels, err)
 }
--- a/center/router/router_notify_config.go
+++ b/center/router/router_notify_config.go
@@ -162,7 +162,7 @@ func (rt *Router) notifyConfigPut(c *gin.Context) {
 		ginx.Bomb(200, "key %s can not modify", f.Ckey)
 	}
 	username := c.MustGet("username").(string)
-	//insert or update built-in config
+	//insert or update build-in config
 	ginx.Dangerous(models.ConfigsSetWithUname(rt.Ctx, f.Ckey, f.Cval, username))
 	if f.Ckey == models.SMTP {
 		// 重置邮件发送器
@@ -219,8 +219,8 @@ func (rt *Router) notifyChannelConfigGets(c *gin.Context) {
 	id := ginx.QueryInt64(c, "id", 0)
 	name := ginx.QueryStr(c, "name", "")
 	ident := ginx.QueryStr(c, "ident", "")
-	enabled := ginx.QueryInt(c, "enabled", -1)
+	eabled := ginx.QueryInt(c, "eabled", -1)

-	notifyChannels, err := models.NotifyChannelGets(rt.Ctx, id, name, ident, enabled)
+	notifyChannels, err := models.NotifyChannelGets(rt.Ctx, id, name, ident, eabled)
 	ginx.NewRender(c).Data(notifyChannels, err)
 }
--- a/center/router/router_notify_rule.go
+++ b/center/router/router_notify_rule.go
@@ -6,12 +6,11 @@ import (
 	"time"

 	"github.com/ccfos/nightingale/v6/alert/dispatch"
-	"github.com/ccfos/nightingale/v6/memsto"
 	"github.com/ccfos/nightingale/v6/models"
-	"github.com/ccfos/nightingale/v6/pkg/ctx"
 	"github.com/ccfos/nightingale/v6/pkg/slice"

 	"github.com/gin-gonic/gin"
+	"github.com/pkg/errors"
 	"github.com/toolkits/pkg/ginx"
 	"github.com/toolkits/pkg/logger"
 )
@@ -153,138 +152,100 @@ func (rt *Router) notifyTest(c *gin.Context) {
 	for _, he := range hisEvents {
 		event := he.ToCur()
 		event.SetTagsMap()
-		if err := dispatch.NotifyRuleMatchCheck(&f.NotifyConfig, event); err != nil {
-			ginx.Bomb(http.StatusBadRequest, err.Error())
+		if dispatch.NotifyRuleApplicable(&f.NotifyConfig, event) {
+			events = append(events, event)
 		}
-
-		events = append(events, event)
 	}

-	resp, err := SendNotifyChannelMessage(rt.Ctx, rt.UserCache, rt.UserGroupCache, f.NotifyConfig, events)
-	if resp == "" {
-		resp = "success"
-	}
-	ginx.NewRender(c).Data(resp, err)
-}
-
-func SendNotifyChannelMessage(ctx *ctx.Context, userCache *memsto.UserCacheType, userGroup *memsto.UserGroupCacheType, notifyConfig models.NotifyConfig, events []*models.AlertCurEvent) (string, error) {
-	notifyChannels, err := models.NotifyChannelGets(ctx, notifyConfig.ChannelID, "", "", -1)
-	if err != nil {
-		return "", fmt.Errorf("failed to get notify channels: %v", err)
+	if len(events) == 0 {
+		ginx.Bomb(http.StatusBadRequest, "not events applicable")
 	}

+	notifyChannels, err := models.NotifyChannelGets(rt.Ctx, f.NotifyConfig.ChannelID, "", "", -1)
+	ginx.Dangerous(err)
 	if len(notifyChannels) == 0 {
-		return "", fmt.Errorf("notify channel not found")
+		ginx.Bomb(http.StatusBadRequest, "notify channel not found")
 	}

 	notifyChannel := notifyChannels[0]
-	if !notifyChannel.Enable {
-		return "", fmt.Errorf("notify channel not enabled, please enable it first")
-	}

-	// 获取站点URL用于模板渲染
-	siteUrl, _ := models.ConfigsGetSiteUrl(ctx)
-	if siteUrl == "" {
-		siteUrl = "http://127.0.0.1:17000"
+	if !notifyChannel.Enable {
+		ginx.Bomb(http.StatusBadRequest, "notify channel not enabled, please enable it first")
 	}

 	tplContent := make(map[string]interface{})
-	if notifyChannel.RequestType != "flashduty" {
-		messageTemplates, err := models.MessageTemplateGets(ctx, notifyConfig.TemplateID, "", "")
-		if err != nil {
-			return "", fmt.Errorf("failed to get message templates: %v", err)
-		}
-
+	if notifyChannel.RequestType != "flashtudy" {
+		messageTemplates, err := models.MessageTemplateGets(rt.Ctx, f.NotifyConfig.TemplateID, "", "")
+		ginx.Dangerous(err)
 		if len(messageTemplates) == 0 {
-			return "", fmt.Errorf("message template not found")
+			ginx.Bomb(http.StatusBadRequest, "message template not found")
 		}
-		tplContent = messageTemplates[0].RenderEvent(events, siteUrl)
+		tplContent = messageTemplates[0].RenderEvent(events)
 	}
+
 	var contactKey string
 	if notifyChannel.ParamConfig != nil && notifyChannel.ParamConfig.UserInfo != nil {
 		contactKey = notifyChannel.ParamConfig.UserInfo.ContactKey
 	}

-	sendtos, flashDutyChannelIDs, pagerDutyRoutingKeys, customParams := dispatch.GetNotifyConfigParams(&notifyConfig, contactKey, userCache, userGroup)
+	sendtos, flashDutyChannelIDs, customParams := dispatch.GetNotifyConfigParams(&f.NotifyConfig, contactKey, rt.UserCache, rt.UserGroupCache)

 	var resp string
 	switch notifyChannel.RequestType {
 	case "flashduty":
 		client, err := models.GetHTTPClient(notifyChannel)
-		if err != nil {
-			return "", fmt.Errorf("failed to get http client: %v", err)
-		}
+		ginx.Dangerous(err)

 		for i := range flashDutyChannelIDs {
 			resp, err = notifyChannel.SendFlashDuty(events, flashDutyChannelIDs[i], client)
 			if err != nil {
-				return "", fmt.Errorf("failed to send flashduty notify: %v", err)
+				break
 			}
 		}
 		logger.Infof("channel_name: %v, event:%+v, tplContent:%s, customParams:%v, respBody: %v, err: %v", notifyChannel.Name, events[0], tplContent, customParams, resp, err)
-		return resp, nil
-	case "pagerduty":
-		client, err := models.GetHTTPClient(notifyChannel)
-		if err != nil {
-			return "", fmt.Errorf("failed to get http client: %v", err)
-		}
-
-		for _, routingKey := range pagerDutyRoutingKeys {
-			resp, err = notifyChannel.SendPagerDuty(events, routingKey, siteUrl, client)
-			if err != nil {
-				return "", fmt.Errorf("failed to send pagerduty notify: %v", err)
-			}
-		}
-		logger.Infof("channel_name: %v, event:%+v, tplContent:%s, customParams:%v, respBody: %v, err: %v", notifyChannel.Name, events[0], tplContent, customParams, resp, err)
-		return resp, nil
+		ginx.NewRender(c).Data(resp, err)
 	case "http":
 		client, err := models.GetHTTPClient(notifyChannel)
-		if err != nil {
-			return "", fmt.Errorf("failed to get http client: %v", err)
-		}
+		ginx.Dangerous(err)

 		if notifyChannel.RequestConfig == nil {
-			return "", fmt.Errorf("request config is nil")
+			ginx.Bomb(http.StatusBadRequest, "request config not found")
 		}

 		if notifyChannel.RequestConfig.HTTPRequestConfig == nil {
-			return "", fmt.Errorf("http request config is nil")
+			ginx.Bomb(http.StatusBadRequest, "http request config not found")
 		}

 		if dispatch.NeedBatchContacts(notifyChannel.RequestConfig.HTTPRequestConfig) || len(sendtos) == 0 {
 			resp, err = notifyChannel.SendHTTP(events, tplContent, customParams, sendtos, client)
 			logger.Infof("channel_name: %v, event:%+v, sendtos:%+v, tplContent:%s, customParams:%v, respBody: %v, err: %v", notifyChannel.Name, events[0], sendtos, tplContent, customParams, resp, err)
 			if err != nil {
-				return "", fmt.Errorf("failed to send http notify: %v", err)
+				logger.Errorf("failed to send http notify: %v", err)
 			}
-			return resp, nil
+			ginx.NewRender(c).Data(resp, err)
 		} else {
 			for i := range sendtos {
 				resp, err = notifyChannel.SendHTTP(events, tplContent, customParams, []string{sendtos[i]}, client)
 				logger.Infof("channel_name: %v, event:%+v,  tplContent:%s, customParams:%v, sendto:%+v, respBody: %v, err: %v", notifyChannel.Name, events[0], tplContent, customParams, sendtos[i], resp, err)
 				if err != nil {
-					return "", fmt.Errorf("failed to send http notify: %v", err)
+					logger.Errorf("failed to send http notify: %v", err)
+					ginx.NewRender(c).Message(err)
+					return
 				}
 			}
-			return resp, nil
+			ginx.NewRender(c).Message(err)
 		}

 	case "smtp":
-		if len(sendtos) == 0 {
-			return "", fmt.Errorf("no valid email address in the user and team")
-		}
 		err := notifyChannel.SendEmailNow(events, tplContent, sendtos)
-		if err != nil {
-			return "", fmt.Errorf("failed to send email notify: %v", err)
-		}
-		return resp, nil
+		ginx.NewRender(c).Message(err)
 	case "script":
 		resp, _, err := notifyChannel.SendScript(events, tplContent, customParams, sendtos)
 		logger.Infof("channel_name: %v, event:%+v, tplContent:%s, customParams:%v, respBody: %v, err: %v", notifyChannel.Name, events[0], tplContent, customParams, resp, err)
-		return resp, err
+		ginx.NewRender(c).Data(resp, err)
 	default:
 		logger.Errorf("unsupported request type: %v", notifyChannel.RequestType)
-		return "", fmt.Errorf("unsupported request type")
+		ginx.NewRender(c).Message(errors.New("unsupported request type"))
 	}
 }

@@ -338,8 +299,8 @@ func (rt *Router) notifyRuleCustomParamsGet(c *gin.Context) {
 			filterKey := ""
 			for key, value := range nc.Params {
 				// 找到在通知媒介中的自定义变量配置项，进行 cname 转换
-				cname, exists := keyMap[key]
-				if exists {
+				cname, exsits := keyMap[key]
+				if exsits {
 					list = append(list, paramList{
 						Name:  key,
 						CName: cname,
--- a/center/router/router_opensearch.go
+++ b/center/router/router_opensearch.go
@@ -1,58 +0,0 @@
-package router
-
-import (
-	"github.com/ccfos/nightingale/v6/datasource/opensearch"
-	"github.com/ccfos/nightingale/v6/dscache"
-
-	"github.com/gin-gonic/gin"
-	"github.com/toolkits/pkg/ginx"
-	"github.com/toolkits/pkg/logger"
-)
-
-func (rt *Router) QueryOSIndices(c *gin.Context) {
-	var f IndexReq
-	ginx.BindJSON(c, &f)
-
-	plug, exists := dscache.DsCache.Get(f.Cate, f.DatasourceId)
-	if !exists {
-		logger.Warningf("cluster:%d not exists", f.DatasourceId)
-		ginx.Bomb(200, "cluster not exists")
-	}
-
-	indices, err := plug.(*opensearch.OpenSearch).QueryIndices()
-	ginx.Dangerous(err)
-
-	ginx.NewRender(c).Data(indices, nil)
-}
-
-func (rt *Router) QueryOSFields(c *gin.Context) {
-	var f IndexReq
-	ginx.BindJSON(c, &f)
-
-	plug, exists := dscache.DsCache.Get(f.Cate, f.DatasourceId)
-	if !exists {
-		logger.Warningf("cluster:%d not exists", f.DatasourceId)
-		ginx.Bomb(200, "cluster not exists")
-	}
-
-	fields, err := plug.(*opensearch.OpenSearch).QueryFields([]string{f.Index})
-	ginx.Dangerous(err)
-
-	ginx.NewRender(c).Data(fields, nil)
-}
-
-func (rt *Router) QueryOSVariable(c *gin.Context) {
-	var f FieldValueReq
-	ginx.BindJSON(c, &f)
-
-	plug, exists := dscache.DsCache.Get(f.Cate, f.DatasourceId)
-	if !exists {
-		logger.Warningf("cluster:%d not exists", f.DatasourceId)
-		ginx.Bomb(200, "cluster not exists")
-	}
-
-	fields, err := plug.(*opensearch.OpenSearch).QueryFieldValue([]string{f.Index}, f.Query.Field, f.Query.Query)
-	ginx.Dangerous(err)
-
-	ginx.NewRender(c).Data(fields, nil)
-}
--- a/center/router/router_proxy.go
+++ b/center/router/router_proxy.go
@@ -2,24 +2,21 @@ package router

 import (
 	"context"
+	"crypto/tls"
 	"fmt"
 	"net"
 	"net/http"
 	"net/http/httputil"
-	"regexp"
-	"strconv"
 	"strings"
 	"sync"
 	"time"

-	"github.com/ccfos/nightingale/v6/pkg/poster"
 	pkgprom "github.com/ccfos/nightingale/v6/pkg/prom"
 	"github.com/ccfos/nightingale/v6/prom"
 	"github.com/gin-gonic/gin"
 	"github.com/prometheus/common/model"
 	"github.com/toolkits/pkg/ginx"
 	"github.com/toolkits/pkg/logger"
-	"github.com/toolkits/pkg/net/httplib"
 )

 type QueryFormItem struct {
@@ -147,8 +144,6 @@ func (rt *Router) dsProxy(c *gin.Context) {

 		if ds.AuthJson.BasicAuthUser != "" {
 			req.SetBasicAuth(ds.AuthJson.BasicAuthUser, ds.AuthJson.BasicAuthPassword)
-		} else {
-			req.Header.Del("Authorization")
 		}

 		headerCount := len(ds.HTTPJson.Headers)
@@ -168,15 +163,8 @@ func (rt *Router) dsProxy(c *gin.Context) {

 	transport, has := transportGet(dsId, ds.UpdatedAt)
 	if !has {
-		// 使用 TLS 配置（支持 mTLS）
-		tlsConfig, err := ds.HTTPJson.TLS.TLSConfig()
-		if err != nil {
-			c.String(http.StatusInternalServerError, "failed to create TLS config: %s", err.Error())
-			return
-		}
-
 		transport = &http.Transport{
-			TLSClientConfig: tlsConfig,
+			TLSClientConfig: &tls.Config{InsecureSkipVerify: ds.HTTPJson.TLS.SkipTlsVerify},
 			Proxy:           http.ProxyFromEnvironment,
 			DialContext: (&net.Dialer{
 				Timeout: time.Duration(ds.HTTPJson.DialTimeout) * time.Millisecond,
@@ -247,94 +235,3 @@ func transportPut(dsid, updatedat int64, tran http.RoundTripper) {
 	updatedAts[dsid] = updatedat
 	transportsLock.Unlock()
 }
-
-const (
-	DatasourceTypePrometheus      = "Prometheus"
-	DatasourceTypeVictoriaMetrics = "VictoriaMetrics"
-)
-
-type deleteDatasourceSeriesForm struct {
-	DatasourceID int64    `json:"datasource_id"`
-	Match        []string `json:"match"`
-	Start        string   `json:"start"`
-	End          string   `json:"end"`
-}
-
-func (rt *Router) deleteDatasourceSeries(c *gin.Context) {
-	var ddsf deleteDatasourceSeriesForm
-	ginx.BindJSON(c, &ddsf)
-	ds := rt.DatasourceCache.GetById(ddsf.DatasourceID)
-
-	if ds == nil {
-		ginx.Bomb(http.StatusBadRequest, "no such datasource")
-		return
-	}
-
-	// Get datasource type, now only support prometheus and victoriametrics
-	datasourceType, ok := ds.SettingsJson["prometheus.tsdb_type"]
-	if !ok {
-		ginx.Bomb(http.StatusBadRequest, "datasource type not found, please check your datasource settings")
-		return
-	}
-
-	target, err := ds.HTTPJson.ParseUrl()
-	if err != nil {
-		ginx.Bomb(http.StatusInternalServerError, "invalid urls: %s", ds.HTTPJson.GetUrls())
-		return
-	}
-
-	timeout := time.Duration(ds.HTTPJson.DialTimeout) * time.Millisecond
-	matchQueries := make([]string, 0)
-	for _, match := range ddsf.Match {
-		matchQueries = append(matchQueries, fmt.Sprintf("match[]=%s", match))
-	}
-	matchQuery := strings.Join(matchQueries, "&")
-
-	switch datasourceType {
-	case DatasourceTypePrometheus:
-		// Prometheus delete api need POST method
-		// https://prometheus.io/docs/prometheus/latest/querying/api/#delete-series
-		url := fmt.Sprintf("http://%s/api/v1/admin/tsdb/delete_series?%s&start=%s&end=%s", target.Host, matchQuery, ddsf.Start, ddsf.End)
-		go func() {
-			resp, _, err := poster.PostJSON(url, timeout, nil)
-			if err != nil {
-				logger.Errorf("delete series error datasource_id: %d, datasource_name: %s, match: %s, start: %s, end: %s, err: %v",
-					ddsf.DatasourceID, ds.Name, ddsf.Match, ddsf.Start, ddsf.End, err)
-				return
-			}
-			logger.Infof("delete datasource series datasource_id: %d, datasource_name: %s, match: %s, start: %s, end: %s, respBody: %s",
-				ddsf.DatasourceID, ds.Name, ddsf.Match, ddsf.Start, ddsf.End, string(resp))
-		}()
-	case DatasourceTypeVictoriaMetrics:
-		// Delete API doesn’t support the deletion of specific time ranges.
-		// Refer: https://docs.victoriametrics.com/victoriametrics/single-server-victoriametrics/#how-to-delete-time-series
-		var url string
-		// Check VictoriaMetrics is single node or cluster
-		// Cluster will have /select/<accountID>/prometheus pattern
-		re := regexp.MustCompile(`/select/(\d+)/prometheus`)
-		matches := re.FindStringSubmatch(ds.HTTPJson.Url)
-		if len(matches) > 0 && matches[1] != "" {
-			accountID, err := strconv.Atoi(matches[1])
-			if err != nil {
-				ginx.Bomb(http.StatusInternalServerError, "invalid accountID: %s", matches[1])
-			}
-			url = fmt.Sprintf("http://%s/delete/%d/prometheus/api/v1/admin/tsdb/delete_series?%s", target.Host, accountID, matchQuery)
-		} else {
-			url = fmt.Sprintf("http://%s/api/v1/admin/tsdb/delete_series?%s", target.Host, matchQuery)
-		}
-		go func() {
-			resp, err := httplib.Get(url).SetTimeout(timeout).Response()
-			if err != nil {
-				logger.Errorf("delete series failed | datasource_id: %d, datasource_name: %s, match: %s, start: %s, end: %s, err: %v",
-					ddsf.DatasourceID, ds.Name, ddsf.Match, ddsf.Start, ddsf.End, err)
-				return
-			}
-			logger.Infof("sending delete series request | datasource_id: %d, datasource_name: %s, match: %s, start: %s, end: %s, respBody: %s",
-				ddsf.DatasourceID, ds.Name, ddsf.Match, ddsf.Start, ddsf.End, resp.Body)
-		}()
-	default:
-		ginx.Bomb(http.StatusBadRequest, "not support delete series yet")
-	}
-
-	ginx.NewRender(c).Data(nil, nil)
-}
--- a/center/router/router_query.go
+++ b/center/router/router_query.go
@@ -5,7 +5,6 @@ import (
 	"sort"
 	"sync"

-	"github.com/ccfos/nightingale/v6/alert/eval"
 	"github.com/ccfos/nightingale/v6/dscache"
 	"github.com/ccfos/nightingale/v6/models"
 	"github.com/gin-gonic/gin"
@@ -13,9 +12,7 @@ import (
 	"github.com/toolkits/pkg/logger"
 )

-type CheckDsPermFunc func(c *gin.Context, dsId int64, cate string, q interface{}) bool
-
-var CheckDsPerm CheckDsPermFunc = func(c *gin.Context, dsId int64, cate string, q interface{}) bool {
+func CheckDsPerm(c *gin.Context, dsId int64, cate string, q interface{}) bool {
 	// todo: 后续需要根据 cate 判断是否需要权限
 	return true
 }
@@ -59,13 +56,6 @@ func QueryLogBatchConcurrently(anonymousAccess bool, ctx *gin.Context, f QueryFr
 			return LogResp{}, fmt.Errorf("cluster not exists")
 		}

-		// 根据数据源类型对 Query 进行模板渲染处理
-		err := eval.ExecuteQueryTemplate(q.DsCate, q.Query, nil)
-		if err != nil {
-			logger.Warningf("query template execute error: %v", err)
-			return LogResp{}, fmt.Errorf("query template execute error: %v", err)
-		}
-
 		wg.Add(1)
 		go func(query Query) {
 			defer wg.Done()
@@ -122,7 +112,7 @@ func QueryDataConcurrently(anonymousAccess bool, ctx *gin.Context, f models.Quer
 	var wg sync.WaitGroup
 	var errs []error

-	for _, q := range f.Queries {
+	for _, q := range f.Querys {
 		if !anonymousAccess && !CheckDsPerm(ctx, f.DatasourceId, f.Cate, q) {
 			return nil, fmt.Errorf("forbidden")
 		}
@@ -137,7 +127,7 @@ func QueryDataConcurrently(anonymousAccess bool, ctx *gin.Context, f models.Quer
 		go func(query interface{}) {
 			defer wg.Done()

-			data, err := plug.QueryData(ctx.Request.Context(), query)
+			datas, err := plug.QueryData(ctx.Request.Context(), query)
 			if err != nil {
 				logger.Warningf("query data error: req:%+v err:%v", query, err)
 				mu.Lock()
@@ -146,9 +136,9 @@ func QueryDataConcurrently(anonymousAccess bool, ctx *gin.Context, f models.Quer
 				return
 			}

-			logger.Debugf("query data: req:%+v resp:%+v", query, data)
+			logger.Debugf("query data: req:%+v resp:%+v", query, datas)
 			mu.Lock()
-			resp = append(resp, data...)
+			resp = append(resp, datas...)
 			mu.Unlock()
 		}(q)
 	}
@@ -193,7 +183,7 @@ func QueryLogConcurrently(anonymousAccess bool, ctx *gin.Context, f models.Query
 	var wg sync.WaitGroup
 	var errs []error

-	for _, q := range f.Queries {
+	for _, q := range f.Querys {
 		if !anonymousAccess && !CheckDsPerm(ctx, f.DatasourceId, f.Cate, q) {
 			return LogResp{}, fmt.Errorf("forbidden")
 		}
@@ -252,7 +242,7 @@ func (rt *Router) QueryLog(c *gin.Context) {
 	ginx.BindJSON(c, &f)

 	var resp []interface{}
-	for _, q := range f.Queries {
+	for _, q := range f.Querys {
 		if !rt.Center.AnonymousAccess.PromQuerier && !CheckDsPerm(c, f.DatasourceId, f.Cate, q) {
 			ginx.Bomb(200, "forbidden")
 		}
--- a/center/router/router_recording_rule.go
+++ b/center/router/router_recording_rule.go
@@ -149,12 +149,6 @@ func (rt *Router) recordingRulePutFields(c *gin.Context) {
 		f.Fields["datasource_queries"] = string(bytes)
 	}

-	if datasourceIds, ok := f.Fields["datasource_ids"]; ok {
-		bytes, err := json.Marshal(datasourceIds)
-		ginx.Dangerous(err)
-		f.Fields["datasource_ids"] = string(bytes)
-	}
-
 	for i := 0; i < len(f.Ids); i++ {
 		ar, err := models.RecordingRuleGetById(rt.Ctx, f.Ids[i])
 		ginx.Dangerous(err)
--- a/center/router/router_saved_view.go
+++ b/center/router/router_saved_view.go
@@ -1,144 +0,0 @@
-package router
-
-import (
-	"net/http"
-
-	"github.com/ccfos/nightingale/v6/models"
-	"github.com/ccfos/nightingale/v6/pkg/slice"
-
-	"github.com/gin-gonic/gin"
-	"github.com/toolkits/pkg/ginx"
-)
-
-func (rt *Router) savedViewGets(c *gin.Context) {
-	page := ginx.QueryStr(c, "page", "")
-
-	me := c.MustGet("user").(*models.User)
-
-	lst, err := models.SavedViewGets(rt.Ctx, page)
-	if err != nil {
-		ginx.NewRender(c).Data(nil, err)
-		return
-	}
-
-	userGids, err := models.MyGroupIds(rt.Ctx, me.Id)
-	if err != nil {
-		ginx.NewRender(c).Data(nil, err)
-		return
-	}
-
-	favoriteMap, err := models.SavedViewFavoriteGetByUserId(rt.Ctx, me.Id)
-	if err != nil {
-		ginx.NewRender(c).Data(nil, err)
-		return
-	}
-
-	favoriteViews := make([]models.SavedView, 0)
-	normalViews := make([]models.SavedView, 0)
-
-	for _, view := range lst {
-		visible := view.CreateBy == me.Username ||
-			view.PublicCate == 2 ||
-			(view.PublicCate == 1 && slice.HaveIntersection[int64](userGids, view.Gids))
-
-		if !visible {
-			continue
-		}
-
-		view.IsFavorite = favoriteMap[view.Id]
-
-		// 收藏的排前面
-		if view.IsFavorite {
-			favoriteViews = append(favoriteViews, view)
-		} else {
-			normalViews = append(normalViews, view)
-		}
-	}
-
-	ginx.NewRender(c).Data(append(favoriteViews, normalViews...), nil)
-}
-
-func (rt *Router) savedViewAdd(c *gin.Context) {
-	var f models.SavedView
-	ginx.BindJSON(c, &f)
-
-	me := c.MustGet("user").(*models.User)
-	f.Id = 0
-	f.CreateBy = me.Username
-	f.UpdateBy = me.Username
-
-	err := models.SavedViewAdd(rt.Ctx, &f)
-	ginx.NewRender(c).Data(f.Id, err)
-}
-
-func (rt *Router) savedViewPut(c *gin.Context) {
-	id := ginx.UrlParamInt64(c, "id")
-
-	view, err := models.SavedViewGetById(rt.Ctx, id)
-	if err != nil {
-		ginx.NewRender(c).Data(nil, err)
-		return
-	}
-	if view == nil {
-		ginx.NewRender(c, http.StatusNotFound).Message("saved view not found")
-		return
-	}
-
-	me := c.MustGet("user").(*models.User)
-	// 只有创建者可以更新
-	if view.CreateBy != me.Username && !me.IsAdmin() {
-		ginx.NewRender(c, http.StatusForbidden).Message("forbidden")
-		return
-	}
-
-	var f models.SavedView
-	ginx.BindJSON(c, &f)
-
-	view.Name = f.Name
-	view.Filter = f.Filter
-	view.PublicCate = f.PublicCate
-	view.Gids = f.Gids
-
-	err = models.SavedViewUpdate(rt.Ctx, view, me.Username)
-	ginx.NewRender(c).Message(err)
-}
-
-func (rt *Router) savedViewDel(c *gin.Context) {
-	id := ginx.UrlParamInt64(c, "id")
-
-	view, err := models.SavedViewGetById(rt.Ctx, id)
-	if err != nil {
-		ginx.NewRender(c).Data(nil, err)
-		return
-	}
-	if view == nil {
-		ginx.NewRender(c, http.StatusNotFound).Message("saved view not found")
-		return
-	}
-
-	me := c.MustGet("user").(*models.User)
-	// 只有创建者或管理员可以删除
-	if view.CreateBy != me.Username && !me.IsAdmin() {
-		ginx.NewRender(c, http.StatusForbidden).Message("forbidden")
-		return
-	}
-
-	err = models.SavedViewDel(rt.Ctx, id)
-	ginx.NewRender(c).Message(err)
-}
-
-func (rt *Router) savedViewFavoriteAdd(c *gin.Context) {
-	id := ginx.UrlParamInt64(c, "id")
-	me := c.MustGet("user").(*models.User)
-
-	err := models.UserViewFavoriteAdd(rt.Ctx, id, me.Id)
-	ginx.NewRender(c).Message(err)
-}
-
-func (rt *Router) savedViewFavoriteDel(c *gin.Context) {
-	id := ginx.UrlParamInt64(c, "id")
-	me := c.MustGet("user").(*models.User)
-
-	err := models.UserViewFavoriteDel(rt.Ctx, id, me.Id)
-	ginx.NewRender(c).Message(err)
-}
--- a/center/router/router_target.go
+++ b/center/router/router_target.go
@@ -11,7 +11,6 @@ import (
 	"github.com/ccfos/nightingale/v6/models"
 	"github.com/ccfos/nightingale/v6/pkg/ctx"
 	"github.com/ccfos/nightingale/v6/pkg/strx"
-	"github.com/ccfos/nightingale/v6/pushgw/idents"
 	"github.com/ccfos/nightingale/v6/storage"

 	"github.com/gin-gonic/gin"
@@ -602,10 +601,3 @@ func (rt *Router) targetsOfHostQuery(c *gin.Context) {

 	ginx.NewRender(c).Data(lst, nil)
 }
-
-func (rt *Router) targetUpdate(c *gin.Context) {
-	var f idents.TargetUpdate
-	ginx.BindJSON(c, &f)
-
-	ginx.NewRender(c).Message(rt.IdentSet.UpdateTargets(f.Lst, f.Now))
-}
--- a/center/router/router_tdengine.go
+++ b/center/router/router_tdengine.go
@@ -2,14 +2,13 @@ package router

 import (
 	"fmt"
-	"net/http"
-
 	"github.com/ccfos/nightingale/v6/center/cconf"
 	"github.com/ccfos/nightingale/v6/datasource/tdengine"
 	"github.com/ccfos/nightingale/v6/dscache"
 	"github.com/ccfos/nightingale/v6/models"
 	"github.com/gin-gonic/gin"
 	"github.com/toolkits/pkg/ginx"
+	"net/http"
 )

 type databasesQueryForm struct {
--- a/center/router/router_user.go
+++ b/center/router/router_user.go
@@ -1,7 +1,6 @@
 package router

 import (
-	"fmt"
 	"net/http"
 	"strings"

@@ -13,7 +12,6 @@ import (
 	"github.com/gin-gonic/gin"
 	"github.com/toolkits/pkg/ginx"
 	"github.com/toolkits/pkg/logger"
-	"gorm.io/gorm"
 )

 func (rt *Router) userBusiGroupsGets(c *gin.Context) {
@@ -235,239 +233,5 @@ func (rt *Router) userDel(c *gin.Context) {
 		return
 	}

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

 import (
-	"encoding/json"
 	"fmt"
 	"log"
 	"time"
@@ -11,7 +10,6 @@ import (
 	"github.com/ccfos/nightingale/v6/models"
 	"github.com/ccfos/nightingale/v6/pkg/cas"
 	"github.com/ccfos/nightingale/v6/pkg/ctx"
-	"github.com/ccfos/nightingale/v6/pkg/dingtalk"
 	"github.com/ccfos/nightingale/v6/pkg/ldapx"
 	"github.com/ccfos/nightingale/v6/pkg/oauth2x"
 	"github.com/ccfos/nightingale/v6/pkg/oidcx"
@@ -26,7 +24,6 @@ type SsoClient struct {
 	LDAP                 *ldapx.SsoClient
 	CAS                  *cas.SsoClient
 	OAuth2               *oauth2x.SsoClient
-	DingTalk             *dingtalk.SsoClient
 	LastUpdateTime       int64
 	configCache          *memsto.ConfigCache
 	configLastUpdateTime int64
@@ -196,13 +193,6 @@ func Init(center cconf.Center, ctx *ctx.Context, configCache *memsto.ConfigCache
 				log.Fatalln("init oauth2 failed:", err)
 			}
 			ssoClient.OAuth2 = oauth2x.New(config)
-		case dingtalk.SsoTypeName:
-			var config dingtalk.Config
-			err := json.Unmarshal([]byte(cfg.Content), &config)
-			if err != nil {
-				log.Fatalf("init %s failed: %s", dingtalk.SsoTypeName, err)
-			}
-			ssoClient.DingTalk = dingtalk.New(config)
 		}
 	}

@@ -228,9 +218,7 @@ func (s *SsoClient) reload(ctx *ctx.Context) error {
 		return err
 	}
 	userVariableMap := s.configCache.Get()
-	ssoConfigMap := make(map[string]models.SsoConfig, 0)
 	for _, cfg := range configs {
-		ssoConfigMap[cfg.Name] = cfg
 		cfg.Content = tplx.ReplaceTemplateUseText(cfg.Name, cfg.Content, userVariableMap)
 		switch cfg.Name {
 		case "LDAP":
@@ -271,26 +259,9 @@ func (s *SsoClient) reload(ctx *ctx.Context) error {
 				continue
 			}
 			s.OAuth2.Reload(config)
-
 		}
 	}

-	if dingTalkConfig, ok := ssoConfigMap[dingtalk.SsoTypeName]; ok {
-		var config dingtalk.Config
-		err := json.Unmarshal([]byte(dingTalkConfig.Content), &config)
-		if err != nil {
-			logger.Warningf("reload %s failed: %s", dingtalk.SsoTypeName, err)
-		} else {
-			if s.DingTalk != nil {
-				s.DingTalk.Reload(config)
-			} else {
-				s.DingTalk = dingtalk.New(config)
-			}
-		}
-	} else {
-		s.DingTalk = nil
-	}
-
 	s.LastUpdateTime = lastUpdateTime
 	s.configLastUpdateTime = lastCacheUpdateTime
 	return nil
--- a/cli/upgrade/upgrade.go
+++ b/cli/upgrade/upgrade.go
@@ -37,7 +37,7 @@ func Upgrade(configFile string) error {
 			}
 		}

-		authJson := models.Auth{
+		authJosn := models.Auth{
 			BasicAuthUser:     cluster.BasicAuthUser,
 			BasicAuthPassword: cluster.BasicAuthPass,
 		}
@@ -53,18 +53,18 @@ func Upgrade(configFile string) error {
 			Headers:             header,
 		}

-		datasource := models.Datasource{
+		datasrouce := models.Datasource{
 			PluginId:       1,
 			PluginType:     "prometheus",
 			PluginTypeName: "Prometheus Like",
 			Name:           cluster.Name,
 			HTTPJson:       httpJson,
-			AuthJson:       authJson,
+			AuthJson:       authJosn,
 			ClusterName:    "default",
 			Status:         "enabled",
 		}

-		err = datasource.Add(ctx)
+		err = datasrouce.Add(ctx)
 		if err != nil {
 			logger.Errorf("add datasource %s error: %v", cluster.Name, err)
 		}
--- a/cmd/edge/edge.go
+++ b/cmd/edge/edge.go
@@ -85,7 +85,7 @@ func Initialize(configDir string, cryptoKey string) (func(), error) {
 		externalProcessors := process.NewExternalProcessors()

 		alert.Start(config.Alert, config.Pushgw, syncStats, alertStats, externalProcessors, targetCache, busiGroupCache, alertMuteCache,
-			alertRuleCache, notifyConfigCache, taskTplsCache, dsCache, ctx, promClients, userCache, userGroupCache, notifyRuleCache, notifyChannelCache, messageTemplateCache, configCvalCache)
+			alertRuleCache, notifyConfigCache, taskTplsCache, dsCache, ctx, promClients, userCache, userGroupCache, notifyRuleCache, notifyChannelCache, messageTemplateCache)

 		alertrtRouter := alertrt.New(config.HTTP, config.Alert, alertMuteCache, targetCache, busiGroupCache, alertStats, ctx, externalProcessors)

--- a/conf/crypto.go
+++ b/conf/crypto.go
@@ -14,13 +14,6 @@ func decryptConfig(config *ConfigType, cryptoKey string) error {

 	config.DB.DSN = decryptDsn

-	decryptRedisPwd, err := secu.DealWithDecrypt(config.Redis.Password, cryptoKey)
-	if err != nil {
-		return fmt.Errorf("failed to decrypt the redis password: %s", err)
-	}
-
-	config.Redis.Password = decryptRedisPwd
-
 	for k := range config.HTTP.APIForService.BasicAuth {
 		decryptPwd, err := secu.DealWithDecrypt(config.HTTP.APIForService.BasicAuth[k], cryptoKey)
 		if err != nil {
--- a/cron/clean_notify_record.go
+++ b/cron/clean_notify_record.go
@@ -12,7 +12,7 @@ import (

 func cleanNotifyRecord(ctx *ctx.Context, day int) {
 	lastWeek := time.Now().Unix() - 86400*int64(day)
-	err := models.DB(ctx).Model(&models.NotificationRecord{}).Where("created_at < ?", lastWeek).Delete(&models.NotificationRecord{}).Error
+	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)
 	}
--- a/datasource/commons/eslike/eslike.go
+++ b/datasource/commons/eslike/eslike.go
@@ -10,26 +10,14 @@ import (

 	"github.com/araddon/dateparse"
 	"github.com/bitly/go-simplejson"
+	"github.com/ccfos/nightingale/v6/memsto"
+	"github.com/ccfos/nightingale/v6/models"
 	"github.com/mitchellh/mapstructure"
 	"github.com/olivere/elastic/v7"
 	"github.com/prometheus/common/model"
 	"github.com/toolkits/pkg/logger"
-
-	"github.com/ccfos/nightingale/v6/memsto"
-	"github.com/ccfos/nightingale/v6/models"
 )

-type FixedField string
-
-const (
-	FieldIndex FixedField = "_index"
-	FieldId    FixedField = "_id"
-)
-
-// LabelSeparator 用于分隔多个标签的分隔符
-// 使用 ASCII 控制字符 Record Separator (0x1E)，避免与用户数据中的 "--" 冲突
-const LabelSeparator = "\x1e"
-
 type Query struct {
 	Ref            string     `json:"ref" mapstructure:"ref"`
 	IndexType      string     `json:"index_type" mapstructure:"index_type"` // 普通索引:index 索引模式:index_pattern
@@ -49,18 +37,6 @@ type Query struct {

 	Timeout  int `json:"timeout" mapstructure:"timeout"`
 	MaxShard int `json:"max_shard" mapstructure:"max_shard"`
-
-	SearchAfter *SearchAfter `json:"search_after" mapstructure:"search_after"`
-}
-
-type SortField struct {
-	Field     string `json:"field" mapstructure:"field"`
-	Ascending bool   `json:"ascending" mapstructure:"ascending"`
-}
-
-type SearchAfter struct {
-	SortFields  []SortField   `json:"sort_fields" mapstructure:"sort_fields"`   // 指定排序字段, 一般是timestamp:desc, _index:asc, _id:asc 三者组合，构成唯一的排序字段
-	SearchAfter []interface{} `json:"search_after" mapstructure:"search_after"` // 指定排序字段的搜索值，搜索值必须和sort_fields的顺序一致，为上一次查询的最后一条日志的值
 }

 type MetricAggr struct {
@@ -88,9 +64,9 @@ type QueryFieldsFunc func(indices []string) ([]string, error)
 type GroupByCate string

 const (
-	Filters   GroupByCate = "filters"
-	Histogram GroupByCate = "histogram"
-	Terms     GroupByCate = "terms"
+	Filters  GroupByCate = "filters"
+	Histgram GroupByCate = "histgram"
+	Terms    GroupByCate = "terms"
 )

 // 参数
@@ -132,7 +108,7 @@ func TransferData(metric, ref string, m map[string][][]float64) []models.DataRes
 		}

 		data.Metric["__name__"] = model.LabelValue(metric)
-		labels := strings.Split(k, LabelSeparator)
+		labels := strings.Split(k, "--")
 		for _, label := range labels {
 			arr := strings.SplitN(label, "=", 2)
 			if len(arr) == 2 {
@@ -182,7 +158,7 @@ func getUnixTs(timeStr string) int64 {
 	return parsedTime.UnixMilli()
 }

-func GetBuckets(labelKey string, keys []string, arr []interface{}, metrics *MetricPtr, labels string, ts int64, f string) {
+func GetBuckts(labelKey string, keys []string, arr []interface{}, metrics *MetricPtr, labels string, ts int64, f string) {
 	var err error
 	bucketsKey := ""
 	if len(keys) > 0 {
@@ -201,7 +177,7 @@ func GetBuckets(labelKey string, keys []string, arr []interface{}, metrics *Metr
 		case json.Number, string:
 			if !getTs {
 				if labels != "" {
-					newlabels = fmt.Sprintf("%s%s%s=%v", labels, LabelSeparator, labelKey, keyValue)
+					newlabels = fmt.Sprintf("%s--%s=%v", labels, labelKey, keyValue)
 				} else {
 					newlabels = fmt.Sprintf("%s=%v", labelKey, keyValue)
 				}
@@ -230,9 +206,9 @@ func GetBuckets(labelKey string, keys []string, arr []interface{}, metrics *Metr
 		nextBucketsArr, exists := innerBuckets.(map[string]interface{})["buckets"]
 		if exists {
 			if len(keys[1:]) >= 1 {
-				GetBuckets(bucketsKey, keys[1:], nextBucketsArr.([]interface{}), metrics, newlabels, ts, f)
+				GetBuckts(bucketsKey, keys[1:], nextBucketsArr.([]interface{}), metrics, newlabels, ts, f)
 			} else {
-				GetBuckets(bucketsKey, []string{}, nextBucketsArr.([]interface{}), metrics, newlabels, ts, f)
+				GetBuckts(bucketsKey, []string{}, nextBucketsArr.([]interface{}), metrics, newlabels, ts, f)
 			}
 		} else {

@@ -295,10 +271,7 @@ func MakeLogQuery(ctx context.Context, query interface{}, eventTags []string, st
 	}

 	for i := 0; i < len(eventTags); i++ {
-		arr := strings.SplitN(eventTags[i], "=", 2)
-		if len(arr) == 2 {
-			eventTags[i] = fmt.Sprintf("%s:%s", arr[0], strconv.Quote(arr[1]))
-		}
+		eventTags[i] = strings.Replace(eventTags[i], "=", ":", 1)
 	}

 	if len(eventTags) > 0 {
@@ -322,10 +295,7 @@ func MakeTSQuery(ctx context.Context, query interface{}, eventTags []string, sta
 	}

 	for i := 0; i < len(eventTags); i++ {
-		arr := strings.SplitN(eventTags[i], "=", 2)
-		if len(arr) == 2 {
-			eventTags[i] = fmt.Sprintf("%s:%s", arr[0], strconv.Quote(arr[1]))
-		}
+		eventTags[i] = strings.Replace(eventTags[i], "=", ":", 1)
 	}

 	if len(eventTags) > 0 {
@@ -409,7 +379,7 @@ func QueryData(ctx context.Context, queryParam interface{}, cliTimeout int64, ve
 	}

 	q.Gte(time.Unix(start, 0).UnixMilli())
-	q.Lt(time.Unix(end, 0).UnixMilli())
+	q.Lte(time.Unix(end, 0).UnixMilli())
 	q.Format("epoch_millis")

 	field := param.MetricAggr.Field
@@ -445,32 +415,10 @@ func QueryData(ctx context.Context, queryParam interface{}, cliTimeout int64, ve
 		Field(param.DateField).
 		MinDocCount(1)

-	versionParts := strings.Split(version, ".")
-	major := 0
-	if len(versionParts) > 0 {
-		if m, err := strconv.Atoi(versionParts[0]); err == nil {
-			major = m
-		}
-	}
-	minor := 0
-	if len(versionParts) > 1 {
-		if m, err := strconv.Atoi(versionParts[1]); err == nil {
-			minor = m
-		}
-	}
-
-	if major >= 7 {
+	if strings.HasPrefix(version, "7") {
 		// 添加偏移量，使第一个分桶bucket的左边界对齐为 start 时间
 		offset := (start % param.Interval) - param.Interval
-
-		// 使用 fixed_interval 的条件：ES 7.2+ 或者任何 major > 7（例如 ES8）
-		if (major > 7) || (major == 7 && minor >= 2) {
-			// ES 7.2+ 以及 ES8+ 使用 fixed_interval
-			tsAggr.FixedInterval(fmt.Sprintf("%ds", param.Interval)).Offset(fmt.Sprintf("%ds", offset))
-		} else {
-			// 7.0-7.1 使用 interval（带 offset）
-			tsAggr.Interval(fmt.Sprintf("%ds", param.Interval)).Offset(fmt.Sprintf("%ds", offset))
-		}
+		tsAggr.FixedInterval(fmt.Sprintf("%ds", param.Interval)).Offset(fmt.Sprintf("%ds", offset))
 	} else {
 		// 兼容 7.0 以下的版本
 		// OpenSearch 也使用这个字段
@@ -497,7 +445,7 @@ func QueryData(ctx context.Context, queryParam interface{}, cliTimeout int64, ve
 			} else {
 				groupByAggregation = elastic.NewTermsAggregation().Field(groupBy.Field).OrderByKeyDesc().Size(groupBy.Size).MinDocCount(int(groupBy.MinDocCount))
 			}
-		case Histogram:
+		case Histgram:
 			if param.MetricAggr.Func != "count" {
 				groupByAggregation = elastic.NewHistogramAggregation().Field(groupBy.Field).Interval(float64(groupBy.Interval)).SubAggregation(field, aggr)
 			} else {
@@ -527,7 +475,7 @@ func QueryData(ctx context.Context, queryParam interface{}, cliTimeout int64, ve
 			switch groupBy.Cate {
 			case Terms:
 				groupByAggregation = elastic.NewTermsAggregation().Field(groupBy.Field).SubAggregation(groupBys[i-1].Field, groupByAggregation).OrderByKeyDesc().Size(groupBy.Size).MinDocCount(int(groupBy.MinDocCount))
-			case Histogram:
+			case Histgram:
 				groupByAggregation = elastic.NewHistogramAggregation().Field(groupBy.Field).Interval(float64(groupBy.Interval)).SubAggregation(groupBys[i-1].Field, groupByAggregation)
 			case Filters:
 				for _, filterParam := range groupBy.Params {
@@ -588,7 +536,7 @@ func QueryData(ctx context.Context, queryParam interface{}, cliTimeout int64, ve

 	metrics := &MetricPtr{Data: make(map[string][][]float64)}

-	GetBuckets("", keys, bucketsData, metrics, "", 0, param.MetricAggr.Func)
+	GetBuckts("", keys, bucketsData, metrics, "", 0, param.MetricAggr.Func)

 	items, err := TransferData(fmt.Sprintf("%s_%s", field, param.MetricAggr.Func), param.Ref, metrics.Data), nil

@@ -636,8 +584,8 @@ func QueryLog(ctx context.Context, queryParam interface{}, timeout int64, versio
 	now := time.Now().Unix()
 	var start, end int64
 	if param.End != 0 && param.Start != 0 {
-		end = param.End
-		start = param.Start
+		end = param.End - param.End%param.Interval
+		start = param.Start - param.Start%param.Interval
 	} else {
 		end = now
 		start = end - param.Interval
@@ -645,7 +593,7 @@ func QueryLog(ctx context.Context, queryParam interface{}, timeout int64, versio

 	q := elastic.NewRangeQuery(param.DateField)
 	q.Gte(time.Unix(start, 0).UnixMilli())
-	q.Lt(time.Unix(end, 0).UnixMilli())
+	q.Lte(time.Unix(end, 0).UnixMilli())
 	q.Format("epoch_millis")

 	queryString := GetQueryString(param.Filter, q)
@@ -657,27 +605,14 @@ func QueryLog(ctx context.Context, queryParam interface{}, timeout int64, versio
 	if param.MaxShard < 1 {
 		param.MaxShard = maxShard
 	}
-	// from+size 分页方式获取日志，受es 的max_result_window参数限制，默认最多返回1w条日志, 可以使用search_after方式获取更多日志
+
 	source := elastic.NewSearchSource().
 		TrackTotalHits(true).
 		Query(queryString).
-		Size(param.Limit)
-	// 是否使用search_after方式
-	if param.SearchAfter != nil {
-		// 设置默认排序字段
-		if len(param.SearchAfter.SortFields) == 0 {
-			source = source.Sort(param.DateField, param.Ascending).Sort(string(FieldIndex), true).Sort(string(FieldId), true)
-		} else {
-			for _, field := range param.SearchAfter.SortFields {
-				source = source.Sort(field.Field, field.Ascending)
-			}
-		}
-		if len(param.SearchAfter.SearchAfter) > 0 {
-			source = source.SearchAfter(param.SearchAfter.SearchAfter...)
-		}
-	} else {
-		source = source.From(param.P).Sort(param.DateField, param.Ascending)
-	}
+		From(param.P).
+		Size(param.Limit).
+		Sort(param.DateField, param.Ascending)
+
 	result, err := search(ctx, indexArr, source, param.Timeout, param.MaxShard)
 	if err != nil {
 		logger.Warningf("query data error:%v", err)
@@ -699,7 +634,7 @@ func QueryLog(ctx context.Context, queryParam interface{}, timeout int64, versio
 			var x map[string]interface{}
 			err := json.Unmarshal(result.Hits.Hits[i].Source, &x)
 			if err != nil {
-				logger.Warningf("Unmarshal source error:%v", err)
+				logger.Warningf("Unmarshal soruce error:%v", err)
 				continue
 			}

--- a/datasource/datasource.go
+++ b/datasource/datasource.go
@@ -53,32 +53,11 @@ func init() {
 		PluginType:     "ck",
 		PluginTypeName: "ClickHouse",
 	}
-
-	DatasourceTypes[5] = DatasourceType{
-		Id:             5,
-		Category:       "timeseries",
-		PluginType:     "mysql",
-		PluginTypeName: "MySQL",
-	}
-
-	DatasourceTypes[6] = DatasourceType{
-		Id:             6,
-		Category:       "timeseries",
-		PluginType:     "pgsql",
-		PluginTypeName: "PostgreSQL",
-	}
-
-	DatasourceTypes[7] = DatasourceType{
-		Id:             7,
-		Category:       "logging",
-		PluginType:     "victorialogs",
-		PluginTypeName: "VictoriaLogs",
-	}
 }

-type NewDatasourceFn func(settings map[string]interface{}) (Datasource, error)
+type NewDatasrouceFn func(settings map[string]interface{}) (Datasource, error)

-var datasourceRegister = map[string]NewDatasourceFn{}
+var datasourceRegister = map[string]NewDatasrouceFn{}

 type Datasource interface {
 	Init(settings map[string]interface{}) (Datasource, error) // 初始化配置
--- a/datasource/doris/doris.go
+++ b/datasource/doris/doris.go
@@ -1,261 +0,0 @@
-package doris
-
-import (
-	"context"
-	"fmt"
-	"strings"
-	"time"
-
-	"github.com/ccfos/nightingale/v6/datasource"
-	"github.com/ccfos/nightingale/v6/dskit/doris"
-	"github.com/ccfos/nightingale/v6/dskit/types"
-	"github.com/ccfos/nightingale/v6/models"
-	"github.com/ccfos/nightingale/v6/pkg/macros"
-
-	"github.com/mitchellh/mapstructure"
-	"github.com/toolkits/pkg/logger"
-)
-
-const (
-	DorisType = "doris"
-)
-
-func init() {
-	datasource.RegisterDatasource(DorisType, new(Doris))
-}
-
-type Doris struct {
-	doris.Doris `json:",inline" mapstructure:",squash"`
-}
-
-type QueryParam struct {
-	Ref        string          `json:"ref" mapstructure:"ref"`
-	Database   string          `json:"database" mapstructure:"database"`
-	Table      string          `json:"table" mapstructure:"table"`
-	SQL        string          `json:"sql" mapstructure:"sql"`
-	Keys       datasource.Keys `json:"keys" mapstructure:"keys"`
-	Limit      int             `json:"limit" mapstructure:"limit"`
-	From       int64           `json:"from" mapstructure:"from"`
-	To         int64           `json:"to" mapstructure:"to"`
-	TimeField  string          `json:"time_field" mapstructure:"time_field"`
-	TimeFormat string          `json:"time_format" mapstructure:"time_format"`
-	Interval   int64           `json:"interval" mapstructure:"interval"` // 查询时间间隔（秒）
-	Offset     int             `json:"offset" mapstructure:"offset"`     // 延迟计算，不在使用通用配置delay
-}
-
-func (d *Doris) InitClient() error {
-	if len(d.Addr) == 0 {
-		return fmt.Errorf("not found doris addr, please check datasource config")
-	}
-	if _, err := d.NewConn(context.TODO(), ""); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (d *Doris) Init(settings map[string]interface{}) (datasource.Datasource, error) {
-	newest := new(Doris)
-	err := mapstructure.Decode(settings, newest)
-	return newest, err
-}
-
-func (d *Doris) Validate(ctx context.Context) error {
-	if len(d.Addr) == 0 || len(strings.TrimSpace(d.Addr)) == 0 {
-		return fmt.Errorf("doris addr is invalid, please check datasource setting")
-	}
-
-	if len(strings.TrimSpace(d.User)) == 0 {
-		return fmt.Errorf("doris user is invalid, please check datasource setting")
-	}
-
-	return nil
-}
-
-// Equal compares whether two objects are the same, used for caching
-func (d *Doris) Equal(p datasource.Datasource) bool {
-	newest, ok := p.(*Doris)
-	if !ok {
-		logger.Errorf("unexpected plugin type, expected is doris")
-		return false
-	}
-
-	// only compare first shard
-	if d.Addr != newest.Addr {
-		return false
-	}
-
-	if d.User != newest.User {
-		return false
-	}
-
-	if d.Password != newest.Password {
-		return false
-	}
-
-	if d.EnableWrite != newest.EnableWrite {
-		return false
-	}
-
-	if d.FeAddr != newest.FeAddr {
-		return false
-	}
-
-	if d.MaxQueryRows != newest.MaxQueryRows {
-		return false
-	}
-
-	if d.Timeout != newest.Timeout {
-		return false
-	}
-
-	if d.MaxIdleConns != newest.MaxIdleConns {
-		return false
-	}
-
-	if d.MaxOpenConns != newest.MaxOpenConns {
-		return false
-	}
-
-	if d.ConnMaxLifetime != newest.ConnMaxLifetime {
-		return false
-	}
-
-	if d.ClusterName != newest.ClusterName {
-		return false
-	}
-
-	return true
-}
-
-func (d *Doris) MakeLogQuery(ctx context.Context, query interface{}, eventTags []string, start, end int64) (interface{}, error) {
-	return nil, nil
-}
-
-func (d *Doris) MakeTSQuery(ctx context.Context, query interface{}, eventTags []string, start, end int64) (interface{}, error) {
-	return nil, nil
-}
-
-func (d *Doris) QueryMapData(ctx context.Context, query interface{}) ([]map[string]string, error) {
-	return nil, nil
-}
-
-func (d *Doris) QueryData(ctx context.Context, query interface{}) ([]models.DataResp, error) {
-	dorisQueryParam := new(QueryParam)
-	if err := mapstructure.Decode(query, dorisQueryParam); err != nil {
-		return nil, err
-	}
-
-	if dorisQueryParam.Keys.ValueKey == "" {
-		return nil, fmt.Errorf("valueKey is required")
-	}
-
-	// 设置默认 interval
-	if dorisQueryParam.Interval == 0 {
-		dorisQueryParam.Interval = 60
-	}
-
-	// 计算时间范围
-	now := time.Now().Unix()
-	var start, end int64
-	if dorisQueryParam.To != 0 && dorisQueryParam.From != 0 {
-		end = dorisQueryParam.To
-		start = dorisQueryParam.From
-	} else {
-		end = now
-		start = end - dorisQueryParam.Interval
-	}
-
-	if dorisQueryParam.Offset != 0 {
-		end -= int64(dorisQueryParam.Offset)
-		start -= int64(dorisQueryParam.Offset)
-	}
-
-	dorisQueryParam.From = start
-	dorisQueryParam.To = end
-
-	if strings.Contains(dorisQueryParam.SQL, "$__") {
-		var err error
-		dorisQueryParam.SQL, err = macros.Macro(dorisQueryParam.SQL, dorisQueryParam.From, dorisQueryParam.To)
-		if err != nil {
-			return nil, err
-		}
-	}
-
-	items, err := d.QueryTimeseries(context.TODO(), &doris.QueryParam{
-		Database: dorisQueryParam.Database,
-		Sql:      dorisQueryParam.SQL,
-		Keys: types.Keys{
-			ValueKey: dorisQueryParam.Keys.ValueKey,
-			LabelKey: dorisQueryParam.Keys.LabelKey,
-			TimeKey:  dorisQueryParam.Keys.TimeKey,
-			Offset:   dorisQueryParam.Offset,
-		},
-	})
-	if err != nil {
-		logger.Warningf("query:%+v get data err:%v", dorisQueryParam, err)
-		return []models.DataResp{}, err
-	}
-	data := make([]models.DataResp, 0)
-	for i := range items {
-		data = append(data, models.DataResp{
-			Ref:    dorisQueryParam.Ref,
-			Metric: items[i].Metric,
-			Values: items[i].Values,
-		})
-	}
-
-	// parse resp to time series data
-	logger.Infof("req:%+v keys:%+v \n data:%v", dorisQueryParam, dorisQueryParam.Keys, data)
-
-	return data, nil
-}
-
-func (d *Doris) QueryLog(ctx context.Context, query interface{}) ([]interface{}, int64, error) {
-	dorisQueryParam := new(QueryParam)
-	if err := mapstructure.Decode(query, dorisQueryParam); err != nil {
-		return nil, 0, err
-	}
-
-	// 记录规则预览场景下，只传了interval, 没有传From和To
-	now := time.Now().Unix()
-	if dorisQueryParam.To == 0 && dorisQueryParam.From == 0 && dorisQueryParam.Interval != 0 {
-		dorisQueryParam.To = now
-		dorisQueryParam.From = now - dorisQueryParam.Interval
-	}
-
-	if dorisQueryParam.Offset != 0 {
-		dorisQueryParam.To -= int64(dorisQueryParam.Offset)
-		dorisQueryParam.From -= int64(dorisQueryParam.Offset)
-	}
-
-	if strings.Contains(dorisQueryParam.SQL, "$__") {
-		var err error
-		dorisQueryParam.SQL, err = macros.Macro(dorisQueryParam.SQL, dorisQueryParam.From, dorisQueryParam.To)
-		if err != nil {
-			return nil, 0, err
-		}
-	}
-
-	items, err := d.QueryLogs(ctx, &doris.QueryParam{
-		Database: dorisQueryParam.Database,
-		Sql:      dorisQueryParam.SQL,
-	})
-	if err != nil {
-		logger.Warningf("query:%+v get data err:%v", dorisQueryParam, err)
-		return []interface{}{}, 0, err
-	}
-	logs := make([]interface{}, 0)
-	for i := range items {
-		logs = append(logs, items[i])
-	}
-
-	return logs, int64(len(logs)), nil
-}
-
-func (d *Doris) DescribeTable(ctx context.Context, query interface{}) ([]*types.ColumnProperty, error) {
-	dorisQueryParam := new(QueryParam)
-	if err := mapstructure.Decode(query, dorisQueryParam); err != nil {
-		return nil, err
-	}
-	return d.DescTable(ctx, dorisQueryParam.Database, dorisQueryParam.Table)
-}
--- a/datasource/es/es.go
+++ b/datasource/es/es.go
@@ -106,10 +106,6 @@ func (e *Elasticsearch) InitClient() error {
 	options = append(options, elastic.SetHealthcheck(false))

 	e.Client, err = elastic.NewClient(options...)
-	if err != nil {
-		return err
-	}
-
 	return err
 }

@@ -171,6 +167,10 @@ func (e *Elasticsearch) Validate(ctx context.Context) (err error) {
 		e.Timeout = 60000
 	}

+	if !strings.HasPrefix(e.Version, "6") && !strings.HasPrefix(e.Version, "7") {
+		return fmt.Errorf("version must be 6.0+ or 7.0+")
+	}
+
 	return nil
 }

@@ -183,6 +183,7 @@ func (e *Elasticsearch) MakeTSQuery(ctx context.Context, query interface{}, even
 }

 func (e *Elasticsearch) QueryData(ctx context.Context, queryParam interface{}) ([]models.DataResp, error) {
+
 	search := func(ctx context.Context, indices []string, source interface{}, timeout int, maxShard int) (*elastic.SearchResult, error) {
 		return e.Client.Search().
 			Index(indices...).
@@ -192,6 +193,7 @@ func (e *Elasticsearch) QueryData(ctx context.Context, queryParam interface{}) (
 			MaxConcurrentShardRequests(maxShard).
 			Do(ctx)
 	}
+
 	return eslike.QueryData(ctx, queryParam, e.Timeout, e.Version, search)
 }

@@ -201,9 +203,9 @@ func (e *Elasticsearch) QueryIndices() ([]string, error) {
 	return result, err
 }

-func (e *Elasticsearch) QueryFields(indexes []string) ([]string, error) {
+func (e *Elasticsearch) QueryFields(indexs []string) ([]string, error) {
 	var fields []string
-	result, err := elastic.NewGetFieldMappingService(e.Client).Index(indexes...).IgnoreUnavailable(true).Do(context.Background())
+	result, err := elastic.NewGetFieldMappingService(e.Client).Index(indexs...).IgnoreUnavailable(true).Do(context.Background())
 	if err != nil {
 		return fields, err
 	}
@@ -221,7 +223,7 @@ func (e *Elasticsearch) QueryFields(indexes []string) ([]string, error) {
 							continue
 						}

-						if _, exists := fieldMap[kk]; !exists {
+						if _, exsits := fieldMap[kk]; !exsits {
 							fieldMap[kk] = struct{}{}
 							fields = append(fields, kk)
 						}
@@ -233,7 +235,7 @@ func (e *Elasticsearch) QueryFields(indexes []string) ([]string, error) {
 						continue
 					}

-					if _, exists := fieldMap[k]; !exists {
+					if _, exsits := fieldMap[k]; !exsits {
 						fieldMap[k] = struct{}{}
 						fields = append(fields, k)
 					}
@@ -273,11 +275,11 @@ func (e *Elasticsearch) QueryLog(ctx context.Context, queryParam interface{}) ([
 	return eslike.QueryLog(ctx, queryParam, e.Timeout, e.Version, e.MaxShard, search)
 }

-func (e *Elasticsearch) QueryFieldValue(indexes []string, field string, query string) ([]string, error) {
+func (e *Elasticsearch) QueryFieldValue(indexs []string, field string, query string) ([]string, error) {
 	var values []string
 	search := e.Client.Search().
 		IgnoreUnavailable(true).
-		Index(indexes...).
+		Index(indexs...).
 		Size(0)

 	if query != "" {
@@ -397,9 +399,6 @@ func (e *Elasticsearch) QueryMapData(ctx context.Context, query interface{}) ([]

 			// 将处理好的 map 添加到 m 切片中
 			result = append(result, mItem)
-			if param.Limit > 0 {
-				continue
-			}

 			// 只取第一条数据
 			break
--- a/datasource/mysql/mysql.go
+++ b/datasource/mysql/mysql.go
@@ -1,227 +0,0 @@
-package mysql
-
-import (
-	"context"
-	"fmt"
-	"strings"
-	"time"
-
-	"github.com/ccfos/nightingale/v6/datasource"
-	"github.com/ccfos/nightingale/v6/dskit/mysql"
-	"github.com/ccfos/nightingale/v6/dskit/sqlbase"
-	"github.com/ccfos/nightingale/v6/dskit/types"
-	"github.com/ccfos/nightingale/v6/models"
-	"github.com/ccfos/nightingale/v6/pkg/macros"
-
-	"github.com/mitchellh/mapstructure"
-	"github.com/toolkits/pkg/logger"
-)
-
-const (
-	MySQLType = "mysql"
-)
-
-func init() {
-	datasource.RegisterDatasource(MySQLType, new(MySQL))
-}
-
-type MySQL struct {
-	mysql.MySQL `json:",inline" mapstructure:",squash"`
-}
-
-type QueryParam struct {
-	Ref      string          `json:"ref" mapstructure:"ref"`
-	Database string          `json:"database" mapstructure:"database"`
-	Table    string          `json:"table" mapstructure:"table"`
-	SQL      string          `json:"sql" mapstructure:"sql"`
-	Keys     datasource.Keys `json:"keys" mapstructure:"keys"`
-	From     int64           `json:"from" mapstructure:"from"`
-	To       int64           `json:"to" mapstructure:"to"`
-}
-
-func (m *MySQL) InitClient() error {
-	if len(m.Shards) == 0 {
-		return fmt.Errorf("not found mysql addr, please check datasource config")
-	}
-	if _, err := m.NewConn(context.TODO(), ""); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (m *MySQL) Init(settings map[string]interface{}) (datasource.Datasource, error) {
-	newest := new(MySQL)
-	err := mapstructure.Decode(settings, newest)
-	return newest, err
-}
-
-func (m *MySQL) Validate(ctx context.Context) error {
-	if len(m.Shards) == 0 || len(strings.TrimSpace(m.Shards[0].Addr)) == 0 {
-		return fmt.Errorf("mysql addr is invalid, please check datasource setting")
-	}
-
-	if len(strings.TrimSpace(m.Shards[0].User)) == 0 {
-		return fmt.Errorf("mysql user is invalid, please check datasource setting")
-	}
-
-	return nil
-}
-
-// Equal compares whether two objects are the same, used for caching
-func (m *MySQL) Equal(p datasource.Datasource) bool {
-	newest, ok := p.(*MySQL)
-	if !ok {
-		logger.Errorf("unexpected plugin type, expected is mysql")
-		return false
-	}
-
-	if len(m.Shards) == 0 || len(newest.Shards) == 0 {
-		return false
-	}
-
-	oldShard := m.Shards[0]
-	newShard := newest.Shards[0]
-
-	if oldShard.Addr != newShard.Addr {
-		return false
-	}
-
-	if oldShard.User != newShard.User {
-		return false
-	}
-
-	if oldShard.Password != newShard.Password {
-		return false
-	}
-
-	if oldShard.MaxQueryRows != newShard.MaxQueryRows {
-		return false
-	}
-
-	if oldShard.Timeout != newShard.Timeout {
-		return false
-	}
-
-	if oldShard.MaxIdleConns != newShard.MaxIdleConns {
-		return false
-	}
-
-	if oldShard.MaxOpenConns != newShard.MaxOpenConns {
-		return false
-	}
-
-	if oldShard.ConnMaxLifetime != newShard.ConnMaxLifetime {
-		return false
-	}
-
-	return true
-}
-
-func (m *MySQL) MakeLogQuery(ctx context.Context, query interface{}, eventTags []string, start, end int64) (interface{}, error) {
-	return nil, nil
-}
-
-func (m *MySQL) MakeTSQuery(ctx context.Context, query interface{}, eventTags []string, start, end int64) (interface{}, error) {
-	return nil, nil
-}
-
-func (m *MySQL) QueryMapData(ctx context.Context, query interface{}) ([]map[string]string, error) {
-	return nil, nil
-}
-
-func (m *MySQL) QueryData(ctx context.Context, query interface{}) ([]models.DataResp, error) {
-	mysqlQueryParam := new(QueryParam)
-	if err := mapstructure.Decode(query, mysqlQueryParam); err != nil {
-		return nil, err
-	}
-
-	if strings.Contains(mysqlQueryParam.SQL, "$__") {
-		var err error
-		mysqlQueryParam.SQL, err = macros.Macro(mysqlQueryParam.SQL, mysqlQueryParam.From, mysqlQueryParam.To)
-		if err != nil {
-			return nil, err
-		}
-	}
-
-	if mysqlQueryParam.Keys.ValueKey == "" {
-		return nil, fmt.Errorf("valueKey is required")
-	}
-
-	timeout := m.Shards[0].Timeout
-	if timeout == 0 {
-		timeout = 60
-	}
-
-	timeoutCtx, cancel := context.WithTimeout(ctx, time.Duration(timeout)*time.Second)
-	defer cancel()
-
-	items, err := m.QueryTimeseries(timeoutCtx, &sqlbase.QueryParam{
-		Sql: mysqlQueryParam.SQL,
-		Keys: types.Keys{
-			ValueKey: mysqlQueryParam.Keys.ValueKey,
-			LabelKey: mysqlQueryParam.Keys.LabelKey,
-			TimeKey:  mysqlQueryParam.Keys.TimeKey,
-		},
-	})
-
-	if err != nil {
-		logger.Warningf("query:%+v get data err:%v", mysqlQueryParam, err)
-		return []models.DataResp{}, err
-	}
-	data := make([]models.DataResp, 0)
-	for i := range items {
-		data = append(data, models.DataResp{
-			Ref:    mysqlQueryParam.Ref,
-			Metric: items[i].Metric,
-			Values: items[i].Values,
-		})
-	}
-
-	return data, nil
-}
-
-func (m *MySQL) QueryLog(ctx context.Context, query interface{}) ([]interface{}, int64, error) {
-	mysqlQueryParam := new(QueryParam)
-	if err := mapstructure.Decode(query, mysqlQueryParam); err != nil {
-		return nil, 0, err
-	}
-
-	if strings.Contains(mysqlQueryParam.SQL, "$__") {
-		var err error
-		mysqlQueryParam.SQL, err = macros.Macro(mysqlQueryParam.SQL, mysqlQueryParam.From, mysqlQueryParam.To)
-		if err != nil {
-			return nil, 0, err
-		}
-	}
-
-	timeout := m.Shards[0].Timeout
-	if timeout == 0 {
-		timeout = 60
-	}
-
-	timeoutCtx, cancel := context.WithTimeout(ctx, time.Duration(timeout)*time.Second)
-	defer cancel()
-
-	items, err := m.Query(timeoutCtx, &sqlbase.QueryParam{
-		Sql: mysqlQueryParam.SQL,
-	})
-
-	if err != nil {
-		logger.Warningf("query:%+v get data err:%v", mysqlQueryParam, err)
-		return []interface{}{}, 0, err
-	}
-	logs := make([]interface{}, 0)
-	for i := range items {
-		logs = append(logs, items[i])
-	}
-
-	return logs, 0, nil
-}
-
-func (m *MySQL) DescribeTable(ctx context.Context, query interface{}) ([]*types.ColumnProperty, error) {
-	mysqlQueryParam := new(QueryParam)
-	if err := mapstructure.Decode(query, mysqlQueryParam); err != nil {
-		return nil, err
-	}
-	return m.DescTable(ctx, mysqlQueryParam.Database, mysqlQueryParam.Table)
-}
--- a/datasource/opensearch/opensearch.go
+++ b/datasource/opensearch/opensearch.go
@@ -1,401 +0,0 @@
-package opensearch
-
-import (
-	"bytes"
-	"context"
-	"encoding/json"
-	"fmt"
-	"io"
-	"net"
-	"net/http"
-	"net/url"
-	"reflect"
-	"regexp"
-	"sort"
-	"strings"
-	"time"
-
-	"github.com/ccfos/nightingale/v6/datasource"
-	"github.com/ccfos/nightingale/v6/datasource/commons/eslike"
-	"github.com/ccfos/nightingale/v6/models"
-	"github.com/ccfos/nightingale/v6/pkg/tlsx"
-
-	"github.com/mitchellh/mapstructure"
-	"github.com/olivere/elastic/v7"
-	oscliv2 "github.com/opensearch-project/opensearch-go/v2"
-	osapiv2 "github.com/opensearch-project/opensearch-go/v2/opensearchapi"
-)
-
-const (
-	OpenSearchType = "opensearch"
-)
-
-type OpenSearch struct {
-	Addr        string            `json:"os.addr" mapstructure:"os.addr"`
-	Nodes       []string          `json:"os.nodes" mapstructure:"os.nodes"`
-	Timeout     int64             `json:"os.timeout" mapstructure:"os.timeout"` // millis
-	Basic       BasicAuth         `json:"os.basic" mapstructure:"os.basic"`
-	TLS         TLS               `json:"os.tls" mapstructure:"os.tls"`
-	Version     string            `json:"os.version" mapstructure:"os.version"`
-	Headers     map[string]string `json:"os.headers" mapstructure:"os.headers"`
-	MinInterval int               `json:"os.min_interval" mapstructure:"os.min_interval"` // seconds
-	MaxShard    int               `json:"os.max_shard" mapstructure:"os.max_shard"`
-	ClusterName string            `json:"os.cluster_name" mapstructure:"os.cluster_name"`
-	Client      *oscliv2.Client   `json:"os.client" mapstructure:"os.client"`
-}
-
-type TLS struct {
-	SkipTlsVerify bool `json:"os.tls.skip_tls_verify" mapstructure:"os.tls.skip_tls_verify"`
-}
-
-type BasicAuth struct {
-	Enable   bool   `json:"os.auth.enable" mapstructure:"os.auth.enable"`
-	Username string `json:"os.user" mapstructure:"os.user"`
-	Password string `json:"os.password" mapstructure:"os.password"`
-}
-
-func init() {
-	datasource.RegisterDatasource(OpenSearchType, new(OpenSearch))
-}
-
-func (os *OpenSearch) Init(settings map[string]interface{}) (datasource.Datasource, error) {
-	newest := new(OpenSearch)
-	err := mapstructure.Decode(settings, newest)
-	return newest, err
-}
-
-func (os *OpenSearch) InitClient() error {
-	transport := &http.Transport{
-		Proxy: http.ProxyFromEnvironment,
-		DialContext: (&net.Dialer{
-			Timeout: time.Duration(os.Timeout) * time.Millisecond,
-		}).DialContext,
-		ResponseHeaderTimeout: time.Duration(os.Timeout) * time.Millisecond,
-	}
-
-	if len(os.Nodes) > 0 {
-		os.Addr = os.Nodes[0]
-	}
-
-	if strings.Contains(os.Addr, "https") {
-		tlsConfig := tlsx.ClientConfig{
-			InsecureSkipVerify: os.TLS.SkipTlsVerify,
-			UseTLS:             true,
-		}
-		cfg, err := tlsConfig.TLSConfig()
-		if err != nil {
-			return err
-		}
-		transport.TLSClientConfig = cfg
-	}
-
-	headers := http.Header{}
-	for k, v := range os.Headers {
-		headers[k] = []string{v}
-	}
-
-	options := oscliv2.Config{
-		Addresses: os.Nodes,
-		Transport: transport,
-		Header:    headers,
-	}
-
-	// 只要有用户名就添加认证，不依赖 Enable 字段
-	if os.Basic.Username != "" {
-		options.Username = os.Basic.Username
-		options.Password = os.Basic.Password
-	}
-
-	var err = error(nil)
-	os.Client, err = oscliv2.NewClient(options)
-
-	return err
-}
-
-func (os *OpenSearch) Equal(other datasource.Datasource) bool {
-	sort.Strings(os.Nodes)
-	sort.Strings(other.(*OpenSearch).Nodes)
-
-	if strings.Join(os.Nodes, ",") != strings.Join(other.(*OpenSearch).Nodes, ",") {
-		return false
-	}
-
-	if os.Basic.Username != other.(*OpenSearch).Basic.Username {
-		return false
-	}
-
-	if os.Basic.Password != other.(*OpenSearch).Basic.Password {
-		return false
-	}
-
-	if os.TLS.SkipTlsVerify != other.(*OpenSearch).TLS.SkipTlsVerify {
-		return false
-	}
-
-	if os.Timeout != other.(*OpenSearch).Timeout {
-		return false
-	}
-
-	if !reflect.DeepEqual(os.Headers, other.(*OpenSearch).Headers) {
-		return false
-	}
-
-	return true
-}
-
-func (os *OpenSearch) Validate(ctx context.Context) (err error) {
-	if len(os.Nodes) == 0 {
-		return fmt.Errorf("need a valid addr")
-	}
-
-	for _, addr := range os.Nodes {
-		_, err = url.Parse(addr)
-		if err != nil {
-			return fmt.Errorf("parse addr error: %v", err)
-		}
-	}
-
-	// 如果提供了用户名，必须同时提供密码
-	if len(os.Basic.Username) > 0 && len(os.Basic.Password) == 0 {
-		return fmt.Errorf("password is required when username is provided")
-	}
-
-	if os.MaxShard == 0 {
-		os.MaxShard = 5
-	}
-
-	if os.MinInterval < 10 {
-		os.MinInterval = 10
-	}
-
-	if os.Timeout == 0 {
-		os.Timeout = 6000
-	}
-
-	if !strings.HasPrefix(os.Version, "2") {
-		return fmt.Errorf("version must be 2.0+")
-	}
-
-	return nil
-}
-
-func (os *OpenSearch) MakeLogQuery(ctx context.Context, query interface{}, eventTags []string, start, end int64) (interface{}, error) {
-	return eslike.MakeLogQuery(ctx, query, eventTags, start, end)
-}
-
-func (os *OpenSearch) MakeTSQuery(ctx context.Context, query interface{}, eventTags []string, start, end int64) (interface{}, error) {
-	return eslike.MakeTSQuery(ctx, query, eventTags, start, end)
-}
-
-func search(ctx context.Context, indices []string, source interface{}, timeout int, cli *oscliv2.Client) (*elastic.SearchResult, error) {
-	var body *bytes.Buffer = nil
-	if source != nil {
-		body = new(bytes.Buffer)
-		err := json.NewEncoder(body).Encode(source)
-		if err != nil {
-			return nil, err
-		}
-	}
-
-	req := osapiv2.SearchRequest{
-		Index: indices,
-		Body:  body,
-	}
-
-	if timeout > 0 {
-		req.Timeout = time.Second * time.Duration(timeout)
-	}
-
-	resp, err := req.Do(ctx, cli)
-	if err != nil {
-		return nil, err
-	}
-	defer resp.Body.Close()
-
-	if resp.StatusCode < 200 || resp.StatusCode >= 300 {
-		return nil, fmt.Errorf("opensearch response not 2xx, resp is %v", resp)
-	}
-
-	bs, err := io.ReadAll(resp.Body)
-	if err != nil {
-		return nil, err
-	}
-
-	result := new(elastic.SearchResult)
-	err = json.Unmarshal(bs, &result)
-	if err != nil {
-		return nil, err
-	}
-
-	return result, nil
-}
-
-func (os *OpenSearch) QueryData(ctx context.Context, queryParam interface{}) ([]models.DataResp, error) {
-
-	search := func(ctx context.Context, indices []string, source interface{}, timeout int, maxShard int) (*elastic.SearchResult, error) {
-		return search(ctx, indices, source, timeout, os.Client)
-	}
-
-	return eslike.QueryData(ctx, queryParam, os.Timeout, os.Version, search)
-}
-
-func (os *OpenSearch) QueryIndices() ([]string, error) {
-
-	cir := osapiv2.CatIndicesRequest{
-		Format: "json",
-	}
-
-	rsp, err := cir.Do(context.Background(), os.Client)
-	if err != nil {
-		return nil, err
-	}
-	defer rsp.Body.Close()
-
-	bs, err := io.ReadAll(rsp.Body)
-	if err != nil {
-		return nil, err
-	}
-
-	resp := make([]struct {
-		Index string `json:"index"`
-	}, 0)
-
-	err = json.Unmarshal(bs, &resp)
-	if err != nil {
-		return nil, err
-	}
-
-	var ret []string
-	for _, k := range resp {
-		ret = append(ret, k.Index)
-	}
-
-	return ret, nil
-}
-
-func (os *OpenSearch) QueryFields(indices []string) ([]string, error) {
-
-	var fields []string
-	mappingRequest := osapiv2.IndicesGetMappingRequest{
-		Index: indices,
-	}
-
-	resp, err := mappingRequest.Do(context.Background(), os.Client)
-	if err != nil {
-		return fields, err
-	}
-	defer resp.Body.Close()
-	bs, err := io.ReadAll(resp.Body)
-	if err != nil {
-		return fields, err
-	}
-
-	result := map[string]interface{}{}
-
-	err = json.Unmarshal(bs, &result)
-	if err != nil {
-		return fields, err
-	}
-
-	idx := ""
-	if len(indices) > 0 {
-		idx = indices[0]
-	}
-
-	mappingIndex := ""
-	indexReg, _ := regexp.Compile(idx)
-	for key, value := range result {
-		mappings, ok := value.(map[string]interface{})
-		if !ok {
-			continue
-		}
-		if len(mappings) == 0 {
-			continue
-		}
-		if key == idx || strings.Contains(key, idx) ||
-			(indexReg != nil && indexReg.MatchString(key)) {
-			mappingIndex = key
-			break
-		}
-	}
-
-	if len(mappingIndex) == 0 {
-		return fields, nil
-	}
-
-	fields = propertyMappingRange(result[mappingIndex], 1)
-
-	sort.Strings(fields)
-	return fields, nil
-}
-
-func propertyMappingRange(v interface{}, depth int) (fields []string) {
-	mapping, ok := v.(map[string]interface{})
-	if !ok {
-		return
-	}
-	if len(mapping) == 0 {
-		return
-	}
-	for key, value := range mapping {
-		if reflect.TypeOf(value).Kind() == reflect.Map {
-			valueMap := value.(map[string]interface{})
-			if prop, found := valueMap["properties"]; found {
-				subFields := propertyMappingRange(prop, depth+1)
-				for i := range subFields {
-					if depth == 1 {
-						fields = append(fields, subFields[i])
-					} else {
-						fields = append(fields, key+"."+subFields[i])
-					}
-				}
-			} else if typ, found := valueMap["type"]; found {
-				if eslike.HitFilter(typ.(string)) {
-					continue
-				}
-				fields = append(fields, key)
-			}
-		}
-	}
-	return
-}
-
-func (os *OpenSearch) QueryLog(ctx context.Context, queryParam interface{}) ([]interface{}, int64, error) {
-
-	search := func(ctx context.Context, indices []string, source interface{}, timeout int, maxShard int) (*elastic.SearchResult, error) {
-		return search(ctx, indices, source, timeout, os.Client)
-	}
-
-	return eslike.QueryLog(ctx, queryParam, os.Timeout, os.Version, 0, search)
-}
-
-func (os *OpenSearch) QueryFieldValue(indexes []string, field string, query string) ([]string, error) {
-	var values []string
-	source := elastic.NewSearchSource().
-		Size(0)
-
-	if query != "" {
-		source = source.Query(elastic.NewBoolQuery().Must(elastic.NewQueryStringQuery(query)))
-	}
-	source = source.Aggregation("distinct", elastic.NewTermsAggregation().Field(field).Size(10000))
-
-	result, err := search(context.Background(), indexes, source, 0, os.Client)
-	if err != nil {
-		return values, err
-	}
-
-	agg, found := result.Aggregations.Terms("distinct")
-	if !found {
-		return values, nil
-	}
-
-	for _, bucket := range agg.Buckets {
-		values = append(values, bucket.Key.(string))
-	}
-
-	return values, nil
-}
-
-func (os *OpenSearch) QueryMapData(ctx context.Context, query interface{}) ([]map[string]string, error) {
-	return nil, nil
-}
--- a/datasource/postgresql/postgresql.go
+++ b/datasource/postgresql/postgresql.go
@@ -1,358 +0,0 @@
-package postgresql
-
-import (
-	"context"
-	"fmt"
-	"regexp"
-	"strings"
-	"time"
-
-	"github.com/ccfos/nightingale/v6/datasource"
-	"github.com/ccfos/nightingale/v6/pkg/macros"
-
-	"github.com/ccfos/nightingale/v6/dskit/postgres"
-	"github.com/ccfos/nightingale/v6/dskit/sqlbase"
-	"github.com/ccfos/nightingale/v6/dskit/types"
-	"github.com/ccfos/nightingale/v6/models"
-	"github.com/mitchellh/mapstructure"
-	"github.com/toolkits/pkg/logger"
-)
-
-const (
-	PostgreSQLType = "pgsql"
-)
-
-var (
-	regx = `(?i)from\s+((?:"[^"]+"|[a-zA-Z0-9_]+))\.((?:"[^"]+"|[a-zA-Z0-9_]+))\.((?:"[^"]+"|[a-zA-Z0-9_]+))`
-)
-
-func init() {
-	datasource.RegisterDatasource(PostgreSQLType, new(PostgreSQL))
-}
-
-type PostgreSQL struct {
-	Shards []*postgres.PostgreSQL `json:"pgsql.shards" mapstructure:"pgsql.shards"`
-}
-
-type QueryParam struct {
-	Ref      string          `json:"ref" mapstructure:"ref"`
-	Database string          `json:"database" mapstructure:"database"`
-	Table    string          `json:"table" mapstructure:"table"`
-	SQL      string          `json:"sql" mapstructure:"sql"`
-	Keys     datasource.Keys `json:"keys" mapstructure:"keys"`
-	From     int64           `json:"from" mapstructure:"from"`
-	To       int64           `json:"to" mapstructure:"to"`
-}
-
-func (p *PostgreSQL) InitClient() error {
-	if len(p.Shards) == 0 {
-		return fmt.Errorf("not found postgresql addr, please check datasource config")
-	}
-	for _, shard := range p.Shards {
-		if db, err := shard.NewConn(context.TODO(), "postgres"); err != nil {
-			defer sqlbase.CloseDB(db)
-			return err
-		}
-	}
-	return nil
-}
-
-func (p *PostgreSQL) Init(settings map[string]interface{}) (datasource.Datasource, error) {
-	newest := new(PostgreSQL)
-	err := mapstructure.Decode(settings, newest)
-	return newest, err
-}
-
-func (p *PostgreSQL) Validate(ctx context.Context) error {
-	if len(p.Shards) == 0 || len(strings.TrimSpace(p.Shards[0].Addr)) == 0 {
-		return fmt.Errorf("postgresql addr is invalid, please check datasource setting")
-	}
-
-	if len(strings.TrimSpace(p.Shards[0].User)) == 0 {
-		return fmt.Errorf("postgresql user is invalid, please check datasource setting")
-	}
-
-	return nil
-}
-
-// Equal compares whether two objects are the same, used for caching
-func (p *PostgreSQL) Equal(d datasource.Datasource) bool {
-	newest, ok := d.(*PostgreSQL)
-	if !ok {
-		logger.Errorf("unexpected plugin type, expected is postgresql")
-		return false
-	}
-
-	if len(p.Shards) == 0 || len(newest.Shards) == 0 {
-		return false
-	}
-
-	oldShard := p.Shards[0]
-	newShard := newest.Shards[0]
-
-	if oldShard.Addr != newShard.Addr {
-		return false
-	}
-
-	if oldShard.User != newShard.User {
-		return false
-	}
-
-	if oldShard.Password != newShard.Password {
-		return false
-	}
-
-	if oldShard.MaxQueryRows != newShard.MaxQueryRows {
-		return false
-	}
-
-	if oldShard.Timeout != newShard.Timeout {
-		return false
-	}
-
-	if oldShard.MaxIdleConns != newShard.MaxIdleConns {
-		return false
-	}
-
-	if oldShard.MaxOpenConns != newShard.MaxOpenConns {
-		return false
-	}
-
-	if oldShard.ConnMaxLifetime != newShard.ConnMaxLifetime {
-		return false
-	}
-
-	return true
-}
-
-func (p *PostgreSQL) ShowDatabases(ctx context.Context) ([]string, error) {
-	return p.Shards[0].ShowDatabases(ctx, "")
-}
-
-func (p *PostgreSQL) ShowTables(ctx context.Context, database string) ([]string, error) {
-	p.Shards[0].DB = database
-	rets, err := p.Shards[0].ShowTables(ctx, "")
-	if err != nil {
-		return nil, err
-	}
-	tables := make([]string, 0, len(rets))
-	for scheme, tabs := range rets {
-		for _, tab := range tabs {
-			tables = append(tables, scheme+"."+tab)
-		}
-	}
-	return tables, nil
-}
-
-func (p *PostgreSQL) MakeLogQuery(ctx context.Context, query interface{}, eventTags []string, start, end int64) (interface{}, error) {
-	return nil, nil
-}
-
-func (p *PostgreSQL) MakeTSQuery(ctx context.Context, query interface{}, eventTags []string, start, end int64) (interface{}, error) {
-	return nil, nil
-}
-
-func (p *PostgreSQL) QueryMapData(ctx context.Context, query interface{}) ([]map[string]string, error) {
-	return nil, nil
-}
-
-func (p *PostgreSQL) QueryData(ctx context.Context, query interface{}) ([]models.DataResp, error) {
-	postgresqlQueryParam := new(QueryParam)
-	if err := mapstructure.Decode(query, postgresqlQueryParam); err != nil {
-		return nil, err
-	}
-
-	postgresqlQueryParam.SQL = formatSQLDatabaseNameWithRegex(postgresqlQueryParam.SQL)
-	if strings.Contains(postgresqlQueryParam.SQL, "$__") {
-		var err error
-		postgresqlQueryParam.SQL, err = macros.Macro(postgresqlQueryParam.SQL, postgresqlQueryParam.From, postgresqlQueryParam.To)
-		if err != nil {
-			return nil, err
-		}
-	}
-	if postgresqlQueryParam.Database != "" {
-		p.Shards[0].DB = postgresqlQueryParam.Database
-	} else {
-		db, err := parseDBName(postgresqlQueryParam.SQL)
-		if err != nil {
-			return nil, err
-		}
-		p.Shards[0].DB = db
-	}
-
-	timeout := p.Shards[0].Timeout
-	if timeout == 0 {
-		timeout = 60
-	}
-	timeoutCtx, cancel := context.WithTimeout(ctx, time.Duration(timeout)*time.Second)
-	defer cancel()
-
-	items, err := p.Shards[0].QueryTimeseries(timeoutCtx, &sqlbase.QueryParam{
-		Sql: postgresqlQueryParam.SQL,
-		Keys: types.Keys{
-			ValueKey: postgresqlQueryParam.Keys.ValueKey,
-			LabelKey: postgresqlQueryParam.Keys.LabelKey,
-			TimeKey:  postgresqlQueryParam.Keys.TimeKey,
-		},
-	})
-
-	if err != nil {
-		logger.Warningf("query:%+v get data err:%v", postgresqlQueryParam, err)
-		return []models.DataResp{}, err
-	}
-	data := make([]models.DataResp, 0)
-	for i := range items {
-		data = append(data, models.DataResp{
-			Ref:    postgresqlQueryParam.Ref,
-			Metric: items[i].Metric,
-			Values: items[i].Values,
-		})
-	}
-
-	// parse resp to time series data
-	logger.Infof("req:%+v keys:%+v \n data:%v", postgresqlQueryParam, postgresqlQueryParam.Keys, data)
-
-	return data, nil
-}
-
-func (p *PostgreSQL) QueryLog(ctx context.Context, query interface{}) ([]interface{}, int64, error) {
-	postgresqlQueryParam := new(QueryParam)
-	if err := mapstructure.Decode(query, postgresqlQueryParam); err != nil {
-		return nil, 0, err
-	}
-	if postgresqlQueryParam.Database != "" {
-		p.Shards[0].DB = postgresqlQueryParam.Database
-	} else {
-		db, err := parseDBName(postgresqlQueryParam.SQL)
-		if err != nil {
-			return nil, 0, err
-		}
-		p.Shards[0].DB = db
-	}
-
-	postgresqlQueryParam.SQL = formatSQLDatabaseNameWithRegex(postgresqlQueryParam.SQL)
-	if strings.Contains(postgresqlQueryParam.SQL, "$__") {
-		var err error
-		postgresqlQueryParam.SQL, err = macros.Macro(postgresqlQueryParam.SQL, postgresqlQueryParam.From, postgresqlQueryParam.To)
-		if err != nil {
-			return nil, 0, err
-		}
-	}
-
-	timeout := p.Shards[0].Timeout
-	if timeout == 0 {
-		timeout = 60
-	}
-	timeoutCtx, cancel := context.WithTimeout(ctx, time.Duration(timeout)*time.Second)
-	defer cancel()
-	items, err := p.Shards[0].Query(timeoutCtx, &sqlbase.QueryParam{
-		Sql: postgresqlQueryParam.SQL,
-	})
-	if err != nil {
-		logger.Warningf("query:%+v get data err:%v", postgresqlQueryParam, err)
-		return []interface{}{}, 0, err
-	}
-	logs := make([]interface{}, 0)
-	for i := range items {
-		logs = append(logs, items[i])
-	}
-
-	return logs, 0, nil
-}
-
-func (p *PostgreSQL) DescribeTable(ctx context.Context, query interface{}) ([]*types.ColumnProperty, error) {
-	postgresqlQueryParam := new(QueryParam)
-	if err := mapstructure.Decode(query, postgresqlQueryParam); err != nil {
-		return nil, err
-	}
-	p.Shards[0].DB = postgresqlQueryParam.Database
-	pairs := strings.Split(postgresqlQueryParam.Table, ".") // format: scheme.table_name
-	scheme := ""
-	table := postgresqlQueryParam.Table
-	if len(pairs) == 2 {
-		scheme = pairs[0]
-		table = pairs[1]
-	}
-	return p.Shards[0].DescTable(ctx, scheme, table)
-}
-
-func parseDBName(sql string) (db string, err error) {
-	re := regexp.MustCompile(regx)
-	matches := re.FindStringSubmatch(sql)
-	if len(matches) != 4 {
-		return "", fmt.Errorf("no valid table name in format database.schema.table found")
-	}
-	return strings.Trim(matches[1], `"`), nil
-}
-
-// formatSQLDatabaseNameWithRegex 只对 dbname.scheme.tabname 格式进行数据库名称格式化，转为 "dbname".scheme.tabname
-// 在pgsql中，大小写是通过"" 双引号括起来区分的,默认pg都是转为小写的，所以这里转为 "dbname".scheme."tabname"
-func formatSQLDatabaseNameWithRegex(sql string) string {
-	// 匹配 from dbname.scheme.table_name 的模式
-	// 使用捕获组来精确匹配数据库名称，确保后面跟着scheme和table
-	re := regexp.MustCompile(`(?i)\bfrom\s+([a-zA-Z_][a-zA-Z0-9_]*)\s*\.\s*([a-zA-Z_][a-zA-Z0-9_]*)\s*\.\s*([a-zA-Z_][a-zA-Z0-9_]*)`)
-
-	return re.ReplaceAllString(sql, `from "$1"."$2"."$3"`)
-}
-
-func extractColumns(sql string) ([]string, error) {
-	// 将 SQL 转换为小写以简化匹配
-	sql = strings.ToLower(sql)
-
-	// 匹配 SELECT 和 FROM 之间的内容
-	re := regexp.MustCompile(`select\s+(.*?)\s+from`)
-	matches := re.FindStringSubmatch(sql)
-
-	if len(matches) < 2 {
-		return nil, fmt.Errorf("no columns found or invalid SQL syntax")
-	}
-
-	// 提取列部分
-	columnsString := matches[1]
-
-	// 分割列
-	columns := splitColumns(columnsString)
-
-	// 清理每个列名
-	for i, col := range columns {
-		columns[i] = strings.TrimSpace(col)
-	}
-
-	return columns, nil
-}
-
-func splitColumns(columnsString string) []string {
-	var columns []string
-	var currentColumn strings.Builder
-	parenthesesCount := 0
-	inQuotes := false
-
-	for _, char := range columnsString {
-		switch char {
-		case '(':
-			parenthesesCount++
-			currentColumn.WriteRune(char)
-		case ')':
-			parenthesesCount--
-			currentColumn.WriteRune(char)
-		case '\'', '"':
-			inQuotes = !inQuotes
-			currentColumn.WriteRune(char)
-		case ',':
-			if parenthesesCount == 0 && !inQuotes {
-				columns = append(columns, currentColumn.String())
-				currentColumn.Reset()
-			} else {
-				currentColumn.WriteRune(char)
-			}
-		default:
-			currentColumn.WriteRune(char)
-		}
-	}
-
-	if currentColumn.Len() > 0 {
-		columns = append(columns, currentColumn.String())
-	}
-
-	return columns
-}
--- a/datasource/victorialogs/victorialogs.go
+++ b/datasource/victorialogs/victorialogs.go
@@ -1,339 +0,0 @@
-package victorialogs
-
-import (
-	"context"
-	"fmt"
-	"net/url"
-	"reflect"
-	"strconv"
-	"time"
-
-	"github.com/ccfos/nightingale/v6/datasource"
-	"github.com/ccfos/nightingale/v6/dskit/victorialogs"
-	"github.com/ccfos/nightingale/v6/models"
-
-	"github.com/mitchellh/mapstructure"
-	"github.com/prometheus/common/model"
-)
-
-const (
-	VictoriaLogsType = "victorialogs"
-)
-
-// VictoriaLogs 数据源实现
-type VictoriaLogs struct {
-	victorialogs.VictoriaLogs `json:",inline" mapstructure:",squash"`
-}
-
-// Query 查询参数
-type Query struct {
-	Query string `json:"query" mapstructure:"query"` // LogsQL 查询语句
-	Start int64  `json:"start" mapstructure:"start"` // 开始时间（秒）
-	End   int64  `json:"end" mapstructure:"end"`     // 结束时间（秒）
-	Time  int64  `json:"time" mapstructure:"time"`   // 单点时间（秒）- 用于告警
-	Step  string `json:"step" mapstructure:"step"`   // 步长，如 "1m", "5m"
-	Limit int    `json:"limit" mapstructure:"limit"` // 限制返回数量
-	Ref   string `json:"ref" mapstructure:"ref"`     // 变量引用名（如 A、B）
-}
-
-// IsInstantQuery 判断是否为即时查询（告警场景）
-func (q *Query) IsInstantQuery() bool {
-	return q.Time > 0 || (q.Start >= 0 && q.Start == q.End)
-}
-
-func init() {
-	datasource.RegisterDatasource(VictoriaLogsType, new(VictoriaLogs))
-}
-
-// Init 初始化配置
-func (vl *VictoriaLogs) Init(settings map[string]interface{}) (datasource.Datasource, error) {
-	newest := new(VictoriaLogs)
-	err := mapstructure.Decode(settings, newest)
-	return newest, err
-}
-
-// InitClient 初始化客户端
-func (vl *VictoriaLogs) InitClient() error {
-	if err := vl.InitHTTPClient(); err != nil {
-		return fmt.Errorf("failed to init victorialogs http client: %w", err)
-	}
-
-	return nil
-}
-
-// Validate 参数验证
-func (vl *VictoriaLogs) Validate(ctx context.Context) error {
-	if vl.VictorialogsAddr == "" {
-		return fmt.Errorf("victorialogs.addr is required")
-	}
-
-	// 验证 URL 格式
-	_, err := url.Parse(vl.VictorialogsAddr)
-	if err != nil {
-		return fmt.Errorf("invalid victorialogs.addr: %w", err)
-	}
-
-	// 必须同时提供用户名和密码
-	if (vl.VictorialogsBasic.VictorialogsUser != "" && vl.VictorialogsBasic.VictorialogsPass == "") ||
-		(vl.VictorialogsBasic.VictorialogsUser == "" && vl.VictorialogsBasic.VictorialogsPass != "") {
-		return fmt.Errorf("both username and password must be provided")
-	}
-
-	// 设置默认值
-	if vl.Timeout == 0 {
-		vl.Timeout = 10000 // 默认 10 秒
-	}
-
-	if vl.MaxQueryRows == 0 {
-		vl.MaxQueryRows = 1000
-	}
-
-	return nil
-}
-
-// Equal 验证是否相等
-func (vl *VictoriaLogs) Equal(other datasource.Datasource) bool {
-	o, ok := other.(*VictoriaLogs)
-	if !ok {
-		return false
-	}
-
-	return vl.VictorialogsAddr == o.VictorialogsAddr &&
-		vl.VictorialogsBasic.VictorialogsUser == o.VictorialogsBasic.VictorialogsUser &&
-		vl.VictorialogsBasic.VictorialogsPass == o.VictorialogsBasic.VictorialogsPass &&
-		vl.VictorialogsTls.SkipTlsVerify == o.VictorialogsTls.SkipTlsVerify &&
-		vl.Timeout == o.Timeout &&
-		reflect.DeepEqual(vl.Headers, o.Headers)
-}
-
-// QueryLog 日志查询
-func (vl *VictoriaLogs) QueryLog(ctx context.Context, queryParam interface{}) ([]interface{}, int64, error) {
-	param := new(Query)
-	if err := mapstructure.Decode(queryParam, param); err != nil {
-		return nil, 0, fmt.Errorf("decode query param failed: %w", err)
-	}
-
-	logs, err := vl.Query(ctx, param.Query, param.Start, param.End, param.Limit)
-	if err != nil {
-		return nil, 0, err
-	}
-
-	// 转换为 interface{} 数组
-	result := make([]interface{}, len(logs))
-	for i, log := range logs {
-		result[i] = log
-	}
-
-	// 调用 HitsLogs 获取真实的 total
-	total, err := vl.HitsLogs(ctx, param.Query, param.Start, param.End)
-	if err != nil {
-		// 如果获取 total 失败，使用当前结果数量
-		total = int64(len(logs))
-	}
-
-	return result, total, nil
-}
-
-// QueryData 指标数据查询
-func (vl *VictoriaLogs) QueryData(ctx context.Context, queryParam interface{}) ([]models.DataResp, error) {
-	param := new(Query)
-	if err := mapstructure.Decode(queryParam, param); err != nil {
-		return nil, fmt.Errorf("decode query param failed: %w", err)
-	}
-
-	// 判断使用哪个 API
-	if param.IsInstantQuery() {
-		return vl.queryDataInstant(ctx, param)
-	}
-	return vl.queryDataRange(ctx, param)
-}
-
-// queryDataInstant 告警场景，调用 /select/logsql/stats_query
-func (vl *VictoriaLogs) queryDataInstant(ctx context.Context, param *Query) ([]models.DataResp, error) {
-	queryTime := param.Time
-	if queryTime == 0 {
-		queryTime = param.End // 如果没有 time，使用 end 作为查询时间点
-	}
-	if queryTime == 0 {
-		queryTime = time.Now().Unix()
-	}
-
-	result, err := vl.StatsQuery(ctx, param.Query, queryTime)
-	if err != nil {
-		return nil, err
-	}
-
-	return convertPrometheusInstantToDataResp(result, param.Ref), nil
-}
-
-// queryDataRange 看图场景，调用 /select/logsql/stats_query_range
-func (vl *VictoriaLogs) queryDataRange(ctx context.Context, param *Query) ([]models.DataResp, error) {
-	step := param.Step
-	if step == "" {
-		// 根据时间范围计算合适的步长
-		duration := param.End - param.Start
-		if duration <= 3600 {
-			step = "1m" // 1 小时内，1 分钟步长
-		} else if duration <= 86400 {
-			step = "5m" // 1 天内，5 分钟步长
-		} else {
-			step = "1h" // 超过 1 天，1 小时步长
-		}
-	}
-
-	result, err := vl.StatsQueryRange(ctx, param.Query, param.Start, param.End, step)
-	if err != nil {
-		return nil, err
-	}
-
-	return convertPrometheusRangeToDataResp(result, param.Ref), nil
-}
-
-// convertPrometheusInstantToDataResp 将 Prometheus Instant Query 格式转换为 DataResp
-func convertPrometheusInstantToDataResp(resp *victorialogs.PrometheusResponse, ref string) []models.DataResp {
-	var dataResps []models.DataResp
-
-	for _, item := range resp.Data.Result {
-		dataResp := models.DataResp{
-			Ref: ref,
-		}
-
-		// 转换 Metric
-		dataResp.Metric = make(model.Metric)
-		for k, v := range item.Metric {
-			dataResp.Metric[model.LabelName(k)] = model.LabelValue(v)
-		}
-
-		if len(item.Value) == 2 {
-			// [timestamp, value]
-			timestamp := item.Value[0].(float64)
-			value, _ := strconv.ParseFloat(item.Value[1].(string), 64)
-
-			dataResp.Values = [][]float64{
-				{timestamp, value},
-			}
-		}
-
-		dataResps = append(dataResps, dataResp)
-	}
-
-	return dataResps
-}
-
-// convertPrometheusRangeToDataResp 将 Prometheus Range Query 格式转换为 DataResp
-func convertPrometheusRangeToDataResp(resp *victorialogs.PrometheusResponse, ref string) []models.DataResp {
-	var dataResps []models.DataResp
-
-	for _, item := range resp.Data.Result {
-		dataResp := models.DataResp{
-			Ref: ref,
-		}
-
-		// 转换 Metric
-		dataResp.Metric = make(model.Metric)
-		for k, v := range item.Metric {
-			dataResp.Metric[model.LabelName(k)] = model.LabelValue(v)
-		}
-
-		var values [][]float64
-		for _, v := range item.Values {
-			if len(v) == 2 {
-				timestamp := v[0].(float64)
-				value, _ := strconv.ParseFloat(v[1].(string), 64)
-
-				values = append(values, []float64{timestamp, value})
-			}
-		}
-
-		dataResp.Values = values
-		dataResps = append(dataResps, dataResp)
-	}
-
-	return dataResps
-}
-
-// MakeLogQuery 构造日志查询参数
-func (vl *VictoriaLogs) MakeLogQuery(ctx context.Context, query interface{}, eventTags []string, start, end int64) (interface{}, error) {
-	q := &Query{
-		Start: start,
-		End:   end,
-		Limit: 1000,
-	}
-
-	// 如果 query 是字符串，直接使用
-	if queryStr, ok := query.(string); ok {
-		q.Query = queryStr
-	} else if queryMap, ok := query.(map[string]interface{}); ok {
-		// 如果是 map，尝试提取 query 字段
-		if qStr, exists := queryMap["query"]; exists {
-			q.Query = fmt.Sprintf("%v", qStr)
-		}
-		if limit, exists := queryMap["limit"]; exists {
-			if limitInt, ok := limit.(int); ok {
-				q.Limit = limitInt
-			} else if limitFloat, ok := limit.(float64); ok {
-				q.Limit = int(limitFloat)
-			}
-		}
-	}
-
-	return q, nil
-}
-
-// MakeTSQuery 构造时序查询参数
-func (vl *VictoriaLogs) MakeTSQuery(ctx context.Context, query interface{}, eventTags []string, start, end int64) (interface{}, error) {
-	q := &Query{
-		Start: start,
-		End:   end,
-	}
-
-	// 如果 query 是字符串，直接使用
-	if queryStr, ok := query.(string); ok {
-		q.Query = queryStr
-	} else if queryMap, ok := query.(map[string]interface{}); ok {
-		// 如果是 map，提取相关字段
-		if qStr, exists := queryMap["query"]; exists {
-			q.Query = fmt.Sprintf("%v", qStr)
-		}
-		if step, exists := queryMap["step"]; exists {
-			q.Step = fmt.Sprintf("%v", step)
-		}
-	}
-
-	return q, nil
-}
-
-// QueryMapData 用于告警事件生成时获取额外数据
-func (vl *VictoriaLogs) QueryMapData(ctx context.Context, query interface{}) ([]map[string]string, error) {
-	param := new(Query)
-	if err := mapstructure.Decode(query, param); err != nil {
-		return nil, err
-	}
-
-	// 扩大查询范围，解决时间滞后问题
-	if param.End > 0 && param.Start > 0 {
-		param.Start = param.Start - 30
-	}
-
-	// 限制只取 1 条
-	param.Limit = 1
-
-	logs, _, err := vl.QueryLog(ctx, param)
-	if err != nil {
-		return nil, err
-	}
-
-	var result []map[string]string
-	for _, log := range logs {
-		if logMap, ok := log.(map[string]interface{}); ok {
-			strMap := make(map[string]string)
-			for k, v := range logMap {
-				strMap[k] = fmt.Sprintf("%v", v)
-			}
-			result = append(result, strMap)
-			break // 只取第一条
-		}
-	}
-
-	return result, nil
-}
--- a/doc/README.bak.md
+++ b/doc/README.bak.md
@@ -120,7 +120,7 @@ Url = "http://127.0.0.1:9090/api/v1/write"
 - 补充和完善文档 => [n9e.github.io](https://n9e.github.io/)
 - 分享您在使用夜莺监控过程中的最佳实践和经验心得 => [文章分享](https://flashcat.cloud/docs/content/flashcat-monitor/nightingale/share/)
 - 提交产品建议 =》 [github issue](https://github.com/ccfos/nightingale/issues/new?assignees=&labels=kind%2Ffeature&template=enhancement.md)
- 提交代码，让夜莺监控更快、更稳、更好用 => [github pull request](https://github.com/ccfos/nightingale/pulls)
+- 提交代码，让夜莺监控更快、更稳、更好用 => [github pull request](https://github.com/didi/nightingale/pulls)

 **尊重、认可和记录每一位贡献者的工作**是夜莺开源社区的第一指导原则，我们提倡**高效的提问**，这既是对开发者时间的尊重，也是对整个社区知识沉淀的贡献：
 - 提问之前请先查阅 [FAQ](https://www.gitlink.org.cn/ccfos/nightingale/wiki/faq) 
@@ -140,7 +140,7 @@ Url = "http://127.0.0.1:9090/api/v1/write"
 </a>

 ## License
-[Apache License V2.0](https://github.com/ccfos/nightingale/blob/main/LICENSE)
+[Apache License V2.0](https://github.com/didi/nightingale/blob/main/LICENSE)

 ## 加入交流群

--- a/doc/img/readme/active-events-en.png
+++ b/doc/img/readme/active-events-en.png
--- a/doc/img/readme/alerting-rules-en.png
+++ b/doc/img/readme/alerting-rules-en.png
--- a/doc/img/readme/dashboard-en.png
+++ b/doc/img/readme/dashboard-en.png
--- a/doc/img/readme/integration-components-en.png
+++ b/doc/img/readme/integration-components-en.png
--- a/doc/img/readme/multi-region-arch.png
+++ b/doc/img/readme/multi-region-arch.png
--- a/doc/server-dash.json
+++ b/doc/server-dash.json
@@ -138,7 +138,7 @@
                    "drawStyle": "lines",
                    "lineInterpolation": "smooth",
                    "fillOpacity": 0.5,
-                    "stack": "normal"
+                    "stack": "noraml"
                },
                "version": "2.0.0",
                "type": "timeseries",
@@ -214,7 +214,7 @@
                    "drawStyle": "lines",
                    "lineInterpolation": "smooth",
                    "fillOpacity": 0.5,
-                    "stack": "normal"
+                    "stack": "noraml"
                },
                "version": "2.0.0",
                "type": "timeseries",
--- a/docker/Dockerfile.goreleaser
+++ b/docker/Dockerfile.goreleaser
@@ -5,7 +5,7 @@ WORKDIR /app
 ADD n9e /app/
 ADD etc /app/etc/
 ADD integrations /app/integrations/
-RUN pip install requests Jinja2
+RUN pip install requests

 EXPOSE 17000

--- a/docker/compose-bridge/docker-compose.yaml
+++ b/docker/compose-bridge/docker-compose.yaml
@@ -87,8 +87,8 @@ services:
      - mysql
      - redis
      - victoriametrics
-    command:
-      - /app/n9e
+    command: >
+      sh -c "/app/n9e"

  categraf:
    image: "flashcatcloud/categraf:latest"
--- a/docker/compose-bridge/etc-categraf/input.mysql/mysql.toml
+++ b/docker/compose-bridge/etc-categraf/input.mysql/mysql.toml
@@ -34,7 +34,7 @@ labels = { instance="docker-compose-mysql" }
 # insecure_skip_verify = true

 #[[instances.queries]]
-# measurement = "lock_wait"
+# mesurement = "lock_wait"
 # metric_fields = [ "total" ]
 # timeout = "3s"
 # request = '''
--- a/docker/compose-bridge/etc-nightingale/config.toml
+++ b/docker/compose-bridge/etc-nightingale/config.toml
@@ -89,6 +89,8 @@ MaxLifetime = 7200
 MaxOpenConns = 150
 # max idle connections
 MaxIdleConns = 50
+# enable auto migrate or not
+# EnableAutoMigrate = false

 [Redis]
 # address, ip:port or ip1:port,ip2:port for cluster and sentinel(SentinelAddrs)
--- a/docker/compose-bridge/etc-nightingale/metrics.yaml
+++ b/docker/compose-bridge/etc-nightingale/metrics.yaml
@@ -53,7 +53,7 @@ zh:
  mem_huge_page_size: 每个大页的大小
  mem_huge_pages_free: 池中尚未分配的 HugePages 数量
  mem_huge_pages_total: 预留HugePages的总个数
-  mem_inactive: 空闲的内存数(包括free和available的内存)
+  mem_inactive: 空闲的内存数(包括free和avalible的内存)
  mem_low_free: 未被使用的低位大小
  mem_low_total: 低位内存总大小,低位可以达到高位内存一样的作用，而且它还能够被内核用来记录一些自己的数据结构
  mem_mapped: 设备和文件等映射的大小
@@ -105,8 +105,8 @@ zh:
  netstat_udp_mem: UDP套接字内存Page使用量
  netstat_udplite_inuse: 正在使用的 udp lite 数量
  netstat_raw_inuse: 正在使用的 raw socket 数量
-  netstat_frag_inuse: ip fragment 数量
-  netstat_frag_memory: ip fragment 已经分配的内存(byte）
+  netstat_frag_inuse: ip fragement 数量
+  netstat_frag_memory: ip fragement 已经分配的内存(byte）

  #[ping]
  ping_percent_packet_loss: ping数据包丢失百分比(%)
@@ -143,7 +143,7 @@ zh:
  nginx_active: 当前nginx正在处理的活动连接数,等于Reading/Writing/Waiting总和
  nginx_handled: 自nginx启动起,处理过的客户端连接总数
  nginx_reading: 正在读取HTTP请求头部的连接总数
-  nginx_requests: 自nginx启动起,处理过的客户端请求总数,由于存在HTTP Keep-Alive请求,该值会大于handled值
+  nginx_requests: 自nginx启动起,处理过的客户端请求总数,由于存在HTTP Krrp-Alive请求,该值会大于handled值
  nginx_upstream_check_fall: upstream_check模块检测到后端失败的次数
  nginx_upstream_check_rise: upstream_check模块对后端的检测次数
  nginx_upstream_check_status_code: 后端upstream的状态,up为1,down为0
@@ -327,7 +327,7 @@ en:
  mem_huge_page_size: "The size of each big page"
  mem_huge_pages_free: "The number of Huge Pages in the pool that have not been allocated"
  mem_huge_pages_total: "Reserve the total number of Huge Pages"
-  mem_inactive: "Free memory (including the memory of free and available)"
+  mem_inactive: "Free memory (including the memory of free and avalible)"
  mem_low_free: "Unused low size"
  mem_low_total: "The total size of the low memory memory can achieve the same role of high memory, and it can be used by the kernel to record some of its own data structure"
  mem_mapped: "The size of the mapping of equipment and files"
@@ -369,7 +369,7 @@ en:
  netstat_tcp_time_wait: "Time _ WAIT status network link number"
  netstat_udp_socket: "Number of network links in UDP status"

-  processes_blocked: "The number of processes in the unreproducible sleep state('U','D','L')"
+  processes_blocked: "The number of processes in the unreprudible sleep state('U','D','L')"
  processes_dead: "Number of processes in recycling('X')"
  processes_idle: "Number of idle processes hanging('I')"
  processes_paging: "Number of paging processes('P')"
@@ -397,7 +397,7 @@ en:
  nginx_active: "The current number of activity connections that Nginx is being processed is equal to Reading/Writing/Waiting"
  nginx_handled: "Starting from Nginx, the total number of client connections that have been processed"
  nginx_reading: "Reading the total number of connections on the http request header"
-  nginx_requests: "Since nginx is started, the total number of client requests processed, due to the existence of HTTP Keep-Alive requests, this value will be greater than the handled value"
+  nginx_requests: "Since nginx is started, the total number of client requests processed, due to the existence of HTTP Krrp - Alive requests, this value will be greater than the handled value"
  nginx_upstream_check_fall: "UPStream_CHECK module detects the number of back -end failures"
  nginx_upstream_check_rise: "UPSTREAM _ Check module to detect the number of back -end"
  nginx_upstream_check_status_code: "The state of the backstream is 1, and the down is 0"
@@ -663,7 +663,7 @@ en:
  # vmalloc已分配的内存，虚拟地址空间上的连续的内存
  node_memory_VmallocUsed_bytes: Amount of vmalloc area which is used
  # vmalloc区可用的连续最大快的大小，通过此指标可以知道vmalloc可分配连续内存的最大值
-  node_memory_VmallocChunk_bytes: Largest contiguous block of vmalloc area which is free
+  node_memory_VmallocChunk_bytes: Largest contigious block of vmalloc area which is free
  # 内存的硬件故障删除掉的内存页的总大小
  node_memory_HardwareCorrupted_bytes: Amount of RAM that the kernel identified as corrupted / not working
  # 用于在虚拟和物理内存地址之间映射的内存
@@ -700,7 +700,7 @@ en:
  # 匿名页内存大小
  node_memory_AnonPages_bytes: Memory in user pages not backed by files
  # 被关联的内存页大小
-  node_memory_Mapped_bytes: Used memory in mapped pages files which have been mapped, such as libraries
+  node_memory_Mapped_bytes: Used memory in mapped pages files which have been mmaped, such as libraries
  # file-backed内存页缓存大小
  node_memory_Cached_bytes: Parked file data (file content) cache
  # 系统中有多少匿名页曾经被swap-out、现在又被swap-in并且swap-in之后页面中的内容一直没发生变化
--- a/docker/compose-host-network-metric-log/docker-compose.yaml
+++ b/docker/compose-host-network-metric-log/docker-compose.yaml
@@ -59,8 +59,8 @@ services:
      - mysql
      - redis
      - prometheus
-    command:
-      - /app/n9e
+    command: >
+      sh -c "/app/n9e"

  categraf:
    image: "flashcatcloud/categraf:latest"
--- a/docker/compose-host-network-metric-log/etc-categraf/logs.toml
+++ b/docker/compose-host-network-metric-log/etc-categraf/logs.toml
@@ -1,5 +1,5 @@
 [logs]
-## just a placeholder
+## just a placholder
 api_key = "ef4ahfbwzwwtlwfpbertgq1i6mq0ab1q"
 ## enable log collect or not
 enable = true
--- a/docker/compose-host-network-metric-log/etc-nightingale/config.toml
+++ b/docker/compose-host-network-metric-log/etc-nightingale/config.toml
@@ -86,6 +86,8 @@ MaxLifetime = 7200
 MaxOpenConns = 150
 # max idle connections
 MaxIdleConns = 50
+# enable auto migrate or not
+# EnableAutoMigrate = false

 [Redis]
 # address, ip:port or ip1:port,ip2:port for cluster and sentinel(SentinelAddrs)
--- a/docker/compose-host-network-metric-log/etc-nightingale/metrics.yaml
+++ b/docker/compose-host-network-metric-log/etc-nightingale/metrics.yaml
@@ -53,7 +53,7 @@ zh:
  mem_huge_page_size: 每个大页的大小
  mem_huge_pages_free: 池中尚未分配的 HugePages 数量
  mem_huge_pages_total: 预留HugePages的总个数
-  mem_inactive: 空闲的内存数(包括free和available的内存)
+  mem_inactive: 空闲的内存数(包括free和avalible的内存)
  mem_low_free: 未被使用的低位大小
  mem_low_total: 低位内存总大小,低位可以达到高位内存一样的作用，而且它还能够被内核用来记录一些自己的数据结构
  mem_mapped: 设备和文件等映射的大小
@@ -105,8 +105,8 @@ zh:
  netstat_udp_mem: UDP套接字内存Page使用量
  netstat_udplite_inuse: 正在使用的 udp lite 数量
  netstat_raw_inuse: 正在使用的 raw socket 数量
-  netstat_frag_inuse: ip fragment 数量
-  netstat_frag_memory: ip fragment 已经分配的内存(byte）
+  netstat_frag_inuse: ip fragement 数量
+  netstat_frag_memory: ip fragement 已经分配的内存(byte）

  #[ping]
  ping_percent_packet_loss: ping数据包丢失百分比(%)
@@ -143,7 +143,7 @@ zh:
  nginx_active: 当前nginx正在处理的活动连接数,等于Reading/Writing/Waiting总和
  nginx_handled: 自nginx启动起,处理过的客户端连接总数
  nginx_reading: 正在读取HTTP请求头部的连接总数
-  nginx_requests: 自nginx启动起,处理过的客户端请求总数,由于存在HTTP Keep-Alive请求,该值会大于handled值
+  nginx_requests: 自nginx启动起,处理过的客户端请求总数,由于存在HTTP Krrp-Alive请求,该值会大于handled值
  nginx_upstream_check_fall: upstream_check模块检测到后端失败的次数
  nginx_upstream_check_rise: upstream_check模块对后端的检测次数
  nginx_upstream_check_status_code: 后端upstream的状态,up为1,down为0
@@ -327,7 +327,7 @@ en:
  mem_huge_page_size: "The size of each big page"
  mem_huge_pages_free: "The number of Huge Pages in the pool that have not been allocated"
  mem_huge_pages_total: "Reserve the total number of Huge Pages"
-  mem_inactive: "Free memory (including the memory of free and available)"
+  mem_inactive: "Free memory (including the memory of free and avalible)"
  mem_low_free: "Unused low size"
  mem_low_total: "The total size of the low memory memory can achieve the same role of high memory, and it can be used by the kernel to record some of its own data structure"
  mem_mapped: "The size of the mapping of equipment and files"
@@ -369,7 +369,7 @@ en:
  netstat_tcp_time_wait: "Time _ WAIT status network link number"
  netstat_udp_socket: "Number of network links in UDP status"

-  processes_blocked: "The number of processes in the unreproducible sleep state('U','D','L')"
+  processes_blocked: "The number of processes in the unreprudible sleep state('U','D','L')"
  processes_dead: "Number of processes in recycling('X')"
  processes_idle: "Number of idle processes hanging('I')"
  processes_paging: "Number of paging processes('P')"
@@ -397,7 +397,7 @@ en:
  nginx_active: "The current number of activity connections that Nginx is being processed is equal to Reading/Writing/Waiting"
  nginx_handled: "Starting from Nginx, the total number of client connections that have been processed"
  nginx_reading: "Reading the total number of connections on the http request header"
-  nginx_requests: "Since nginx is started, the total number of client requests processed, due to the existence of HTTP Keep-Alive requests, this value will be greater than the handled value"
+  nginx_requests: "Since nginx is started, the total number of client requests processed, due to the existence of HTTP Krrp - Alive requests, this value will be greater than the handled value"
  nginx_upstream_check_fall: "UPStream_CHECK module detects the number of back -end failures"
  nginx_upstream_check_rise: "UPSTREAM _ Check module to detect the number of back -end"
  nginx_upstream_check_status_code: "The state of the backstream is 1, and the down is 0"
@@ -663,7 +663,7 @@ en:
  # vmalloc已分配的内存，虚拟地址空间上的连续的内存
  node_memory_VmallocUsed_bytes: Amount of vmalloc area which is used
  # vmalloc区可用的连续最大快的大小，通过此指标可以知道vmalloc可分配连续内存的最大值
-  node_memory_VmallocChunk_bytes: Largest contiguous block of vmalloc area which is free
+  node_memory_VmallocChunk_bytes: Largest contigious block of vmalloc area which is free
  # 内存的硬件故障删除掉的内存页的总大小
  node_memory_HardwareCorrupted_bytes: Amount of RAM that the kernel identified as corrupted / not working
  # 用于在虚拟和物理内存地址之间映射的内存
@@ -700,7 +700,7 @@ en:
  # 匿名页内存大小
  node_memory_AnonPages_bytes: Memory in user pages not backed by files
  # 被关联的内存页大小
-  node_memory_Mapped_bytes: Used memory in mapped pages files which have been mapped, such as libraries
+  node_memory_Mapped_bytes: Used memory in mapped pages files which have been mmaped, such as libraries
  # file-backed内存页缓存大小
  node_memory_Cached_bytes: Parked file data (file content) cache
  # 系统中有多少匿名页曾经被swap-out、现在又被swap-in并且swap-in之后页面中的内容一直没发生变化
--- a/docker/compose-host-network/docker-compose.yaml
+++ b/docker/compose-host-network/docker-compose.yaml
@@ -58,8 +58,8 @@ services:
      - mysql
      - redis
      - prometheus
-    command:
-      - /app/n9e
+    command: >
+      sh -c "/app/n9e"

  categraf:
    image: "flashcatcloud/categraf:latest"
--- a/docker/compose-host-network/etc-nightingale/config.toml
+++ b/docker/compose-host-network/etc-nightingale/config.toml
@@ -86,6 +86,8 @@ MaxLifetime = 7200
 MaxOpenConns = 150
 # max idle connections
 MaxIdleConns = 50
+# enable auto migrate or not
+# EnableAutoMigrate = false

 [Redis]
 # address, ip:port or ip1:port,ip2:port for cluster and sentinel(SentinelAddrs)
--- a/docker/compose-host-network/etc-nightingale/metrics.yaml
+++ b/docker/compose-host-network/etc-nightingale/metrics.yaml
@@ -53,7 +53,7 @@ zh:
  mem_huge_page_size: 每个大页的大小
  mem_huge_pages_free: 池中尚未分配的 HugePages 数量
  mem_huge_pages_total: 预留HugePages的总个数
-  mem_inactive: 空闲的内存数(包括free和available的内存)
+  mem_inactive: 空闲的内存数(包括free和avalible的内存)
  mem_low_free: 未被使用的低位大小
  mem_low_total: 低位内存总大小,低位可以达到高位内存一样的作用，而且它还能够被内核用来记录一些自己的数据结构
  mem_mapped: 设备和文件等映射的大小
@@ -105,8 +105,8 @@ zh:
  netstat_udp_mem: UDP套接字内存Page使用量
  netstat_udplite_inuse: 正在使用的 udp lite 数量
  netstat_raw_inuse: 正在使用的 raw socket 数量
-  netstat_frag_inuse: ip fragment 数量
-  netstat_frag_memory: ip fragment 已经分配的内存(byte）
+  netstat_frag_inuse: ip fragement 数量
+  netstat_frag_memory: ip fragement 已经分配的内存(byte）

  #[ping]
  ping_percent_packet_loss: ping数据包丢失百分比(%)
@@ -143,7 +143,7 @@ zh:
  nginx_active: 当前nginx正在处理的活动连接数,等于Reading/Writing/Waiting总和
  nginx_handled: 自nginx启动起,处理过的客户端连接总数
  nginx_reading: 正在读取HTTP请求头部的连接总数
-  nginx_requests: 自nginx启动起,处理过的客户端请求总数,由于存在HTTP Keep-Alive请求,该值会大于handled值
+  nginx_requests: 自nginx启动起,处理过的客户端请求总数,由于存在HTTP Krrp-Alive请求,该值会大于handled值
  nginx_upstream_check_fall: upstream_check模块检测到后端失败的次数
  nginx_upstream_check_rise: upstream_check模块对后端的检测次数
  nginx_upstream_check_status_code: 后端upstream的状态,up为1,down为0
@@ -327,7 +327,7 @@ en:
  mem_huge_page_size: "The size of each big page"
  mem_huge_pages_free: "The number of Huge Pages in the pool that have not been allocated"
  mem_huge_pages_total: "Reserve the total number of Huge Pages"
-  mem_inactive: "Free memory (including the memory of free and available)"
+  mem_inactive: "Free memory (including the memory of free and avalible)"
  mem_low_free: "Unused low size"
  mem_low_total: "The total size of the low memory memory can achieve the same role of high memory, and it can be used by the kernel to record some of its own data structure"
  mem_mapped: "The size of the mapping of equipment and files"
@@ -369,7 +369,7 @@ en:
  netstat_tcp_time_wait: "Time _ WAIT status network link number"
  netstat_udp_socket: "Number of network links in UDP status"

-  processes_blocked: "The number of processes in the unreproducible sleep state('U','D','L')"
+  processes_blocked: "The number of processes in the unreprudible sleep state('U','D','L')"
  processes_dead: "Number of processes in recycling('X')"
  processes_idle: "Number of idle processes hanging('I')"
  processes_paging: "Number of paging processes('P')"
@@ -397,7 +397,7 @@ en:
  nginx_active: "The current number of activity connections that Nginx is being processed is equal to Reading/Writing/Waiting"
  nginx_handled: "Starting from Nginx, the total number of client connections that have been processed"
  nginx_reading: "Reading the total number of connections on the http request header"
-  nginx_requests: "Since nginx is started, the total number of client requests processed, due to the existence of HTTP Keep-Alive requests, this value will be greater than the handled value"
+  nginx_requests: "Since nginx is started, the total number of client requests processed, due to the existence of HTTP Krrp - Alive requests, this value will be greater than the handled value"
  nginx_upstream_check_fall: "UPStream_CHECK module detects the number of back -end failures"
  nginx_upstream_check_rise: "UPSTREAM _ Check module to detect the number of back -end"
  nginx_upstream_check_status_code: "The state of the backstream is 1, and the down is 0"
@@ -663,7 +663,7 @@ en:
  # vmalloc已分配的内存，虚拟地址空间上的连续的内存
  node_memory_VmallocUsed_bytes: Amount of vmalloc area which is used
  # vmalloc区可用的连续最大快的大小，通过此指标可以知道vmalloc可分配连续内存的最大值
-  node_memory_VmallocChunk_bytes: Largest contiguous block of vmalloc area which is free
+  node_memory_VmallocChunk_bytes: Largest contigious block of vmalloc area which is free
  # 内存的硬件故障删除掉的内存页的总大小
  node_memory_HardwareCorrupted_bytes: Amount of RAM that the kernel identified as corrupted / not working
  # 用于在虚拟和物理内存地址之间映射的内存
@@ -700,7 +700,7 @@ en:
  # 匿名页内存大小
  node_memory_AnonPages_bytes: Memory in user pages not backed by files
  # 被关联的内存页大小
-  node_memory_Mapped_bytes: Used memory in mapped pages files which have been mapped, such as libraries
+  node_memory_Mapped_bytes: Used memory in mapped pages files which have been mmaped, such as libraries
  # file-backed内存页缓存大小
  node_memory_Cached_bytes: Parked file data (file content) cache
  # 系统中有多少匿名页曾经被swap-out、现在又被swap-in并且swap-in之后页面中的内容一直没发生变化
--- a/docker/compose-postgres/docker-compose.yaml
+++ b/docker/compose-postgres/docker-compose.yaml
@@ -74,8 +74,8 @@ services:
      - postgres:postgres
      - redis:redis
      - victoriametrics:victoriametrics
-    command:
-      - /app/n9e
+    command: >
+      sh -c "/app/n9e"

  categraf:
    image: "flashcatcloud/categraf:latest"
--- a/docker/compose-postgres/initsql_for_postgres/a-n9e-for-Postgres.sql
+++ b/docker/compose-postgres/initsql_for_postgres/a-n9e-for-Postgres.sql
@@ -204,12 +204,10 @@ CREATE TABLE board (
    public smallint not null default 0 ,
    built_in smallint not null default 0 ,
    hide smallint not null default 0 ,
-    public_cate bigint NOT NULL DEFAULT 0,
    create_at bigint not null default 0,
    create_by varchar(64) not null default '',
    update_at bigint not null default 0,
    update_by varchar(64) not null default '',
-    note varchar(1024) not null default '',
    PRIMARY KEY (id),
    UNIQUE (group_id, name)
 ) ;
@@ -219,8 +217,6 @@ COMMENT ON COLUMN board.tags IS 'split by space';
 COMMENT ON COLUMN board.public IS '0:false 1:true';
 COMMENT ON COLUMN board.built_in IS '0:false 1:true';
 COMMENT ON COLUMN board.hide IS '0:false 1:true';
-COMMENT ON COLUMN board.public_cate IS '0 anonymous 1 login 2 busi';
-COMMENT ON COLUMN board.note IS 'note';


 -- for dashboard new version
@@ -433,31 +429,43 @@ CREATE TABLE target (
    ident varchar(191) not null,
    note varchar(255) not null default '',
    tags varchar(512) not null default '',
-    host_tags text,
    host_ip varchar(15) default '',
    agent_version varchar(255) default '',
    engine_name varchar(255) default '',
-    os varchar(31) default '',
    update_at bigint not null default 0,
    PRIMARY KEY (id),
    UNIQUE (ident)
 );

 CREATE INDEX ON target (group_id);
-CREATE INDEX idx_host_ip ON target (host_ip);
-CREATE INDEX idx_agent_version ON target (agent_version);
-CREATE INDEX idx_engine_name ON target (engine_name);
-CREATE INDEX idx_os ON target (os);

 COMMENT ON COLUMN target.group_id IS 'busi group id';
 COMMENT ON COLUMN target.ident IS 'target id';
 COMMENT ON COLUMN target.note IS 'append to alert event as field';
 COMMENT ON COLUMN target.tags IS 'append to series data as tags, split by space, append external space at suffix';
-COMMENT ON COLUMN target.host_tags IS 'global labels set in conf file';
 COMMENT ON COLUMN target.host_ip IS 'IPv4 string';
 COMMENT ON COLUMN target.agent_version IS 'agent version';
 COMMENT ON COLUMN target.engine_name IS 'engine_name';
-COMMENT ON COLUMN target.os IS 'os type';
+-- case1: target_idents; case2: target_tags
+-- CREATE TABLE collect_rule (
+--     id bigserial,
+--     group_id bigint not null default 0 comment 'busi group id',
+--     cluster varchar(128) not null,
+--     target_idents varchar(512) not null default '' comment 'ident list, split by space',
+--     target_tags varchar(512) not null default '' comment 'filter targets by tags, split by space',
+--     name varchar(191) not null default '',
+--     note varchar(255) not null default '',
+--     step int not null,
+--     type varchar(64) not null comment 'e.g. port proc log plugin',
+--     data text not null,
+--     append_tags varchar(255) not null default '' comment 'split by space: e.g. mod=n9e dept=cloud',
+--     create_at bigint not null default 0,
+--     create_by varchar(64) not null default '',
+--     update_at bigint not null default 0,
+--     update_by varchar(64) not null default '',
+--     PRIMARY KEY (id),
+--     KEY (group_id, type, name)
+-- ) ;

 CREATE TABLE metric_view (
    id bigserial,
@@ -726,7 +734,6 @@ CREATE TABLE datasource
 (
    id serial,
    name varchar(191) not null default '',
-    identifier varchar(255) not null default '',
    description varchar(255) not null default '',
    category varchar(255) not null default '',
    plugin_id int  not null default 0,
@@ -744,8 +751,8 @@ CREATE TABLE datasource
    updated_by varchar(64) not null default '',
    UNIQUE (name),
    PRIMARY KEY (id)
-) ;
-
+) ; 
+  
 CREATE TABLE builtin_cate (
    id bigserial,
    name varchar(191) not null,
@@ -788,12 +795,10 @@ CREATE TABLE es_index_pattern (
    create_by varchar(64) default '',
    update_at bigint default '0',
    update_by varchar(64) default '',
-    note varchar(4096) not null default '',
    PRIMARY KEY (id),
    UNIQUE (datasource_id, name)
 ) ;
 COMMENT ON COLUMN es_index_pattern.datasource_id IS 'datasource id';
-COMMENT ON COLUMN es_index_pattern.note IS 'description of metric in Chinese';

 CREATE TABLE builtin_metrics (
  id bigserial,
@@ -804,14 +809,10 @@ CREATE TABLE builtin_metrics (
  lang varchar(191) NOT NULL DEFAULT '',
  note varchar(4096) NOT NULL,
  expression varchar(4096) NOT NULL,
-  expression_type varchar(32) NOT NULL DEFAULT 'promql',
-  metric_type varchar(191) NOT NULL DEFAULT '',
-  extra_fields text,
  created_at bigint NOT NULL DEFAULT 0,
  created_by varchar(191) NOT NULL DEFAULT '',
  updated_at bigint NOT NULL DEFAULT 0,
  updated_by varchar(191) NOT NULL DEFAULT '',
-  uuid BIGINT NOT NULL DEFAULT 0,
  PRIMARY KEY (id),
  UNIQUE (lang, collector, typ, name)
 );
@@ -829,14 +830,10 @@ COMMENT ON COLUMN builtin_metrics.unit IS 'unit of metric';
 COMMENT ON COLUMN builtin_metrics.lang IS 'language of metric';
 COMMENT ON COLUMN builtin_metrics.note IS 'description of metric in Chinese';
 COMMENT ON COLUMN builtin_metrics.expression IS 'expression of metric';
-COMMENT ON COLUMN builtin_metrics.expression_type IS 'expression type: metric_name or promql';
-COMMENT ON COLUMN builtin_metrics.metric_type IS 'metric type like counter/gauge';
-COMMENT ON COLUMN builtin_metrics.extra_fields IS 'custom extra fields';
 COMMENT ON COLUMN builtin_metrics.created_at IS 'create time';
 COMMENT ON COLUMN builtin_metrics.created_by IS 'creator';
 COMMENT ON COLUMN builtin_metrics.updated_at IS 'update time';
 COMMENT ON COLUMN builtin_metrics.updated_by IS 'updater';
-COMMENT ON COLUMN builtin_metrics.uuid IS 'unique identifier';

 CREATE TABLE metric_filter (
  id BIGSERIAL PRIMARY KEY,
@@ -881,7 +878,6 @@ CREATE TABLE builtin_payloads (
  name VARCHAR(191) NOT NULL,
  tags VARCHAR(191) NOT NULL DEFAULT '',
  content TEXT NOT NULL,
-  note VARCHAR(1024) NOT NULL DEFAULT '',
  created_at BIGINT NOT NULL DEFAULT 0,
  created_by VARCHAR(191) NOT NULL DEFAULT '',
  updated_at BIGINT NOT NULL DEFAULT 0,
@@ -920,115 +916,3 @@ CREATE TABLE source_token (
 );

 CREATE INDEX idx_source_token_type_id_token ON source_token (source_type, source_id, token);
-
-CREATE TABLE notification_record (
-    id BIGSERIAL PRIMARY KEY,
-    notify_rule_id BIGINT NOT NULL DEFAULT 0,
-    event_id bigint NOT NULL,
-    sub_id bigint DEFAULT NULL,
-    channel varchar(255) NOT NULL,
-    status bigint DEFAULT NULL,
-    target varchar(1024) NOT NULL,
-    details varchar(2048) DEFAULT '',
-    created_at bigint NOT NULL
-);
-
-CREATE INDEX idx_evt ON notification_record (event_id);
-
-COMMENT ON COLUMN notification_record.event_id IS 'event history id';
-COMMENT ON COLUMN notification_record.sub_id IS 'subscribed rule id';
-COMMENT ON COLUMN notification_record.channel IS 'notification channel name';
-COMMENT ON COLUMN notification_record.status IS 'notification status';
-COMMENT ON COLUMN notification_record.target IS 'notification target';
-COMMENT ON COLUMN notification_record.details IS 'notification other info';
-COMMENT ON COLUMN notification_record.created_at IS 'create time';
-
-CREATE TABLE target_busi_group (
-    id BIGSERIAL PRIMARY KEY,
-    target_ident varchar(191) NOT NULL,
-    group_id bigint NOT NULL,
-    update_at bigint NOT NULL
-);
-
-CREATE UNIQUE INDEX idx_target_group ON target_busi_group (target_ident, group_id);
-
-CREATE TABLE user_token (
-    id BIGSERIAL PRIMARY KEY,
-    username varchar(255) NOT NULL DEFAULT '',
-    token_name varchar(255) NOT NULL DEFAULT '',
-    token varchar(255) NOT NULL DEFAULT '',
-    create_at bigint NOT NULL DEFAULT 0,
-    last_used bigint NOT NULL DEFAULT 0
-);
-
-CREATE TABLE notify_rule (
-    id bigserial PRIMARY KEY,
-    name varchar(255) NOT NULL,
-    description text,
-    enable boolean DEFAULT false,
-    user_group_ids varchar(255) NOT NULL DEFAULT '',
-    notify_configs text,
-    pipeline_configs text,
-    create_at bigint NOT NULL DEFAULT 0,
-    create_by varchar(64) NOT NULL DEFAULT '',
-    update_at bigint NOT NULL DEFAULT 0,
-    update_by varchar(64) NOT NULL DEFAULT ''
-);
-
-CREATE TABLE notify_channel (
-    id bigserial PRIMARY KEY,
-    name varchar(255) NOT NULL,
-    ident varchar(255) NOT NULL,
-    description text,
-    enable boolean DEFAULT false,
-    param_config text,
-    request_type varchar(50) NOT NULL,
-    request_config text,
-    weight int NOT NULL DEFAULT 0,
-    create_at bigint NOT NULL DEFAULT 0,
-    create_by varchar(64) NOT NULL DEFAULT '',
-    update_at bigint NOT NULL DEFAULT 0,
-    update_by varchar(64) NOT NULL DEFAULT ''
-);
-
-CREATE TABLE message_template (
-    id bigserial PRIMARY KEY,
-    name varchar(64) NOT NULL,
-    ident varchar(64) NOT NULL,
-    content text,
-    user_group_ids varchar(64),
-    notify_channel_ident varchar(64) NOT NULL DEFAULT '',
-    private int NOT NULL DEFAULT 0,
-    weight int NOT NULL DEFAULT 0,
-    create_at bigint NOT NULL DEFAULT 0,
-    create_by varchar(64) NOT NULL DEFAULT '',
-    update_at bigint NOT NULL DEFAULT 0,
-    update_by varchar(64) NOT NULL DEFAULT ''
-);
-
-CREATE TABLE event_pipeline (
-    id bigserial PRIMARY KEY,
-    name varchar(128) NOT NULL,
-    team_ids text,
-    description varchar(255) NOT NULL DEFAULT '',
-    filter_enable smallint NOT NULL DEFAULT 0,
-    label_filters text,
-    attribute_filters text,
-    processors text,
-    create_at bigint NOT NULL DEFAULT 0,
-    create_by varchar(64) NOT NULL DEFAULT '',
-    update_at bigint NOT NULL DEFAULT 0,
-    update_by varchar(64) NOT NULL DEFAULT ''
-);
-
-CREATE TABLE embedded_product (
-    id bigserial PRIMARY KEY,
-    name varchar(255) DEFAULT NULL,
-    url varchar(255) DEFAULT NULL,
-    is_private boolean DEFAULT NULL,
-    team_ids varchar(255),
-    create_at bigint NOT NULL DEFAULT 0,
-    create_by varchar(64) NOT NULL DEFAULT '',
-    update_at bigint NOT NULL DEFAULT 0,
-    update_by varchar(64) NOT NULL DEFAULT ''
-);
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
smx_Morgan	af97aae3f2	fix : add offset to es date_histogam (#2757 )	2025-07-03 19:42:33 +08:00
ning	73d1500a1c	refactor: change eval for duration check	2025-06-30 15:11:34 +08:00
ning	0691e499a2	refactor: change eval for duration check	2025-06-30 15:11:17 +08:00
Yening Qin	91a3d7bd4c	fix: api for agent auth (#2748 )	2025-06-17 20:45:16 +08:00