refactor

code refactor
2026-03-06 07:59:14 +00:00 · 2024-05-24 12:13:17 +08:00 · 2024-05-22 10:47:37 +08:00 · 2024-05-22 10:34:34 +08:00
388 changed files with 88998 additions and 129985 deletions
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -0,0 +1,67 @@
+name: Bug Report
+description: Report a bug encountered while running Nightingale
+labels: ["kind/bug"]
+
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for taking time to fill out this bug report! 
+        The more detailed the form is filled in, the easier the problem will be solved.
+  - type: textarea
+    id: config
+    attributes:
+      label: Your config.toml
+      description: Place config in the toml code section. This will be automatically formatted into toml, so no need for backticks.
+      render: toml
+    validations:
+      required: true
+  - type: textarea
+    id: logs
+    attributes:
+      label: Relevant logs
+      description: categraf | telegraf | n9e | prometheus | chrome request/response ...
+      render: text
+    validations:
+      required: true
+  - type: input
+    id: system-info
+    attributes:
+      label: System info
+      description: Include nightingale version, operating system, and other relevant details
+      placeholder: ex. n9e 5.9.2, n9e-fe 5.5.0, categraf 0.1.0, Ubuntu 20.04, Docker 20.10.8
+    validations:
+      required: true
+  - type: textarea
+    id: reproduce
+    attributes:
+      label: Steps to reproduce
+      description: Describe the steps to reproduce the bug.
+      value: |
+        1.
+        2.
+        3.
+        ...
+    validations:
+      required: true
+  - type: textarea
+    id: expected-behavior
+    attributes:
+      label: Expected behavior
+      description: Describe what you expected to happen when you performed the above steps.
+    validations:
+      required: true
+  - type: textarea
+    id: actual-behavior
+    attributes:
+      label: Actual behavior
+      description: Describe what actually happened when you performed the above steps.
+    validations:
+      required: true
+  - type: textarea
+    id: additional-info
+    attributes:
+      label: Additional info
+      description: Include gist of relevant config, logs, etc.
+    validations:
+      required: false
--- a/.github/ISSUE_TEMPLATE/question.yml
+++ b/.github/ISSUE_TEMPLATE/question.yml
@@ -1,33 +0,0 @@
-name: Bug Report & Usage Question
-description: Reporting a bug or asking a question about how to use Nightingale 
-labels: []
-
-body:
-  - type: markdown
-    attributes:
-      value: |
-        The more detailed the form is filled in, the easier the problem will be solved.
-        提供的信息越详细，问题解决的可能性就越大。另外, 提问之前请先搜索历史 issue (包括 close 的), 以免重复提问。
-  - type: textarea
-    id: question
-    attributes:
-      label: Question and Steps to reproduce
-      description: Describe your question and steps to reproduce the bug. 描述问题以及复现步骤
-    validations:
-      required: true
-  - type: textarea
-    id: logs
-    attributes:
-      label: Relevant logs and configurations
-      description: Relevant logs and configurations. 报错日志（[查看方法](https://flashcat.cloud/docs/content/flashcat-monitor/nightingale-v6/faq/how-to-check-logs/)）以及各个相关组件的配置信息
-      render: text
-    validations:
-      required: true
-  - type: textarea
-    id: system-info
-    attributes:
-      label: Version
-      description: Include nightingale version, operating system, and other relevant details. 请告知夜莺的版本、操作系统的版本、CPU架构等信息
-    validations:
-      required: true
- 
--- a/.github/workflows/n9e.yml
+++ b/.github/workflows/n9e.yml
@@ -26,8 +26,7 @@ jobs:
      - name: Run GoReleaser
        uses: goreleaser/goreleaser-action@v3
        with:
-          distribution: goreleaser
-          version: '~> v1'
+          version: latest
          args: release --rm-dist
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
--- a/README.md
+++ b/README.md
@@ -29,15 +29,15 @@

 ## 夜莺 Nightingale 是什么

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

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


 ## 快速开始
- 👉 [文档中心](https://flashcat.cloud/docs/) | [下载中心](https://flashcat.cloud/download/nightingale/)
- ❤️ [报告 Bug](https://github.com/ccfos/nightingale/issues/new?assignees=&labels=&projects=&template=question.yml)
- ℹ️ 为了提供更快速的访问体验，上述文档和下载站点托管于 [FlashcatCloud](https://flashcat.cloud)
+- 👉[文档中心](https://flashcat.cloud/docs/) | [下载中心](https://flashcat.cloud/download/nightingale/)
+- ❤️[报告 Bug](https://github.com/ccfos/nightingale/issues/new?assignees=&labels=kind%2Fbug&projects=&template=bug_report.yml)
+- ℹ️为了提供更快速的访问体验，上述文档和下载站点托管于 [FlashcatCloud](https://flashcat.cloud)

 ## 功能特点

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

 ## 截图演示

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

 ![即时查询](https://download.flashcat.cloud/ulric/20240513103305.png)
@@ -83,22 +78,19 @@

 ![边缘部署模式](https://download.flashcat.cloud/ulric/20240222102119.png)

-
 ## 交流渠道
 - 报告Bug，优先推荐提交[夜莺GitHub Issue](https://github.com/ccfos/nightingale/issues/new?assignees=&labels=kind%2Fbug&projects=&template=bug_report.yml)
 - 推荐完整浏览[夜莺文档站点](https://flashcat.cloud/docs/content/flashcat-monitor/nightingale-v7/introduction/)，了解更多信息
 - 推荐搜索关注夜莺公众号，第一时间获取社区动态：`夜莺监控Nightingale`
- 日常问题交流：
-  - QQ群：730841964
-  - [加入微信群](https://download.flashcat.cloud/ulric/20240830175821.png)
+- 日常答疑、技术分享、用户之间的交流，统一使用知识星球，大伙可以免费加入交流，[入口在这里](https://download.flashcat.cloud/ulric/20240319095409.png)

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


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

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

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

-## What is Nightingale

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

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


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

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

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

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


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

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

 ## Architecture

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

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

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

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


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

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

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

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

 ## License
- [Apache License V2.0](https://github.com/didi/nightingale/blob/main/LICENSE)
+[Apache License V2.0](https://github.com/didi/nightingale/blob/main/LICENSE)
--- a/alert/aconf/conf.go
+++ b/alert/aconf/conf.go
@@ -32,7 +32,6 @@ type Alerting struct {
 	Timeout           int64
 	TemplatesDir      string
 	NotifyConcurrency int
-	WebhookBatchSend  bool
 }

 type CallPlugin struct {
--- a/alert/alert.go
+++ b/alert/alert.go
@@ -53,7 +53,7 @@ func Initialize(configDir string, cryptoKey string) (func(), error) {
 	alertStats := astats.NewSyncStats()

 	configCache := memsto.NewConfigCache(ctx, syncStats, nil, "")
-	targetCache := memsto.NewTargetCache(ctx, syncStats, redis)
+	targetCache := memsto.NewTargetCache(ctx, syncStats, nil)
 	busiGroupCache := memsto.NewBusiGroupCache(ctx, syncStats)
 	alertMuteCache := memsto.NewAlertMuteCache(ctx, syncStats)
 	alertRuleCache := memsto.NewAlertRuleCache(ctx, syncStats)
@@ -106,11 +106,11 @@ func Start(alertc aconf.Alert, pushgwc pconf.Pushgw, syncStats *memsto.Stats, al
 		busiGroupCache, alertMuteCache, datasourceCache, promClients, tdendgineClients, naming, ctx, alertStats)

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

 	go dp.ReloadTpls()
 	go consumer.LoopConsume()

 	go queue.ReportQueueSize(alertStats)
-	go sender.InitEmailSender(ctx, notifyConfigCache)
+	go sender.InitEmailSender(notifyConfigCache)
 }
--- a/alert/common/key.go
+++ b/alert/common/key.go
@@ -2,7 +2,6 @@ package common

 import (
 	"fmt"
-	"strings"

 	"github.com/ccfos/nightingale/v6/models"
 )
@@ -35,9 +34,9 @@ func MatchGroupsName(groupName string, groupFilter []models.TagFilter) bool {
 func matchTag(value string, filter models.TagFilter) bool {
 	switch filter.Func {
 	case "==":
-		return strings.TrimSpace(filter.Value) == strings.TrimSpace(value)
+		return filter.Value == value
 	case "!=":
-		return strings.TrimSpace(filter.Value) != strings.TrimSpace(value)
+		return filter.Value != value
 	case "in":
 		_, has := filter.Vset[value]
 		return has
--- a/alert/dispatch/consume.go
+++ b/alert/dispatch/consume.go
@@ -1,19 +1,14 @@
 package dispatch

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

 	"github.com/ccfos/nightingale/v6/alert/aconf"
-	"github.com/ccfos/nightingale/v6/alert/common"
 	"github.com/ccfos/nightingale/v6/alert/queue"
 	"github.com/ccfos/nightingale/v6/models"
 	"github.com/ccfos/nightingale/v6/pkg/ctx"
 	"github.com/ccfos/nightingale/v6/pkg/poster"
-	promsdk "github.com/ccfos/nightingale/v6/pkg/prom"
-	"github.com/ccfos/nightingale/v6/prom"

 	"github.com/toolkits/pkg/concurrent/semaphore"
 	"github.com/toolkits/pkg/logger"
@@ -23,17 +18,15 @@ type Consumer struct {
 	alerting aconf.Alerting
 	ctx      *ctx.Context

-	dispatch    *Dispatch
-	promClients *prom.PromClientMap
+	dispatch *Dispatch
 }

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

@@ -80,19 +73,17 @@ func (e *Consumer) consumeOne(event *models.AlertCurEvent) {
 		event.RuleName = fmt.Sprintf("failed to parse rule name: %v", err)
 	}

+	if err := event.ParseRule("rule_note"); err != nil {
+		logger.Warningf("ruleid:%d failed to parse rule note: %v", event.RuleId, err)
+		event.RuleNote = fmt.Sprintf("failed to parse rule note: %v", err)
+	}
+
 	if err := event.ParseRule("annotations"); err != nil {
 		logger.Warningf("ruleid:%d failed to parse annotations: %v", event.RuleId, err)
 		event.Annotations = fmt.Sprintf("failed to parse annotations: %v", err)
 		event.AnnotationsJSON["error"] = event.Annotations
 	}

-	e.queryRecoveryVal(event)
-
-	if err := event.ParseRule("rule_note"); err != nil {
-		logger.Warningf("ruleid:%d failed to parse rule note: %v", event.RuleId, err)
-		event.RuleNote = fmt.Sprintf("failed to parse rule note: %v", err)
-	}
-
 	e.persist(event)

 	if event.IsRecovered && event.NotifyRecovered == 0 {
@@ -124,68 +115,3 @@ func (e *Consumer) persist(event *models.AlertCurEvent) {
 		e.dispatch.Astats.CounterRuleEvalErrorTotal.WithLabelValues(fmt.Sprintf("%v", event.DatasourceId), "persist_event").Inc()
 	}
 }
-
-func (e *Consumer) queryRecoveryVal(event *models.AlertCurEvent) {
-	if !event.IsRecovered {
-		return
-	}
-
-	// If the event is a recovery event, execute the recovery_promql query
-	promql, ok := event.AnnotationsJSON["recovery_promql"]
-	if !ok {
-		return
-	}
-
-	promql = strings.TrimSpace(promql)
-	if promql == "" {
-		logger.Warningf("rule_eval:%s promql is blank", getKey(event))
-		return
-	}
-
-	if e.promClients.IsNil(event.DatasourceId) {
-		logger.Warningf("rule_eval:%s error reader client is nil", getKey(event))
-		return
-	}
-
-	readerClient := e.promClients.GetCli(event.DatasourceId)
-
-	var warnings promsdk.Warnings
-	value, warnings, err := readerClient.Query(e.ctx.Ctx, promql, time.Now())
-	if err != nil {
-		logger.Errorf("rule_eval:%s promql:%s, error:%v", getKey(event), promql, err)
-		event.AnnotationsJSON["recovery_promql_error"] = fmt.Sprintf("promql:%s error:%v", promql, err)
-
-		b, err := json.Marshal(event.AnnotationsJSON)
-		if err != nil {
-			event.AnnotationsJSON = make(map[string]string)
-			event.AnnotationsJSON["error"] = fmt.Sprintf("failed to parse annotations: %v", err)
-		} else {
-			event.Annotations = string(b)
-		}
-		return
-	}
-
-	if len(warnings) > 0 {
-		logger.Errorf("rule_eval:%s promql:%s, warnings:%v", getKey(event), promql, warnings)
-	}
-
-	anomalyPoints := common.ConvertAnomalyPoints(value)
-	if len(anomalyPoints) == 0 {
-		logger.Warningf("rule_eval:%s promql:%s, result is empty", getKey(event), promql)
-		event.AnnotationsJSON["recovery_promql_error"] = fmt.Sprintf("promql:%s error:%s", promql, "result is empty")
-	} else {
-		event.AnnotationsJSON["recovery_value"] = fmt.Sprintf("%v", anomalyPoints[0].Value)
-	}
-
-	b, err := json.Marshal(event.AnnotationsJSON)
-	if err != nil {
-		event.AnnotationsJSON = make(map[string]string)
-		event.AnnotationsJSON["error"] = fmt.Sprintf("failed to parse annotations: %v", err)
-	} else {
-		event.Annotations = string(b)
-	}
-}
-
-func getKey(event *models.AlertCurEvent) string {
-	return common.RuleKey(event.DatasourceId, event.RuleId)
-}
--- a/alert/dispatch/dispatch.go
+++ b/alert/dispatch/dispatch.go
@@ -4,9 +4,7 @@ import (
 	"bytes"
 	"encoding/json"
 	"html/template"
-	"net/url"
 	"strconv"
-	"strings"
 	"sync"
 	"time"

@@ -33,7 +31,6 @@ type Dispatch struct {
 	alerting aconf.Alerting

 	Senders          map[string]sender.Sender
-	CallBacks        map[string]sender.CallBacker
 	tpls             map[string]*template.Template
 	ExtraSenders     map[string]sender.Sender
 	BeforeSenderHook func(*models.AlertCurEvent) bool
@@ -100,21 +97,6 @@ func (e *Dispatch) relaodTpls() error {
 		models.Mm:         sender.NewSender(models.Mm, tmpTpls),
 		models.Telegram:   sender.NewSender(models.Telegram, tmpTpls),
 		models.FeishuCard: sender.NewSender(models.FeishuCard, tmpTpls),
-		models.Lark:       sender.NewSender(models.Lark, tmpTpls),
-		models.LarkCard:   sender.NewSender(models.LarkCard, tmpTpls),
-	}
-
-	// domain -> Callback()
-	callbacks := map[string]sender.CallBacker{
-		models.DingtalkDomain:   sender.NewCallBacker(models.DingtalkDomain, e.targetCache, e.userCache, e.taskTplsCache, tmpTpls),
-		models.WecomDomain:      sender.NewCallBacker(models.WecomDomain, e.targetCache, e.userCache, e.taskTplsCache, tmpTpls),
-		models.FeishuDomain:     sender.NewCallBacker(models.FeishuDomain, e.targetCache, e.userCache, e.taskTplsCache, tmpTpls),
-		models.TelegramDomain:   sender.NewCallBacker(models.TelegramDomain, e.targetCache, e.userCache, e.taskTplsCache, tmpTpls),
-		models.FeishuCardDomain: sender.NewCallBacker(models.FeishuCardDomain, e.targetCache, e.userCache, e.taskTplsCache, tmpTpls),
-		models.IbexDomain:       sender.NewCallBacker(models.IbexDomain, e.targetCache, e.userCache, e.taskTplsCache, tmpTpls),
-		models.LarkDomain:       sender.NewCallBacker(models.LarkDomain, e.targetCache, e.userCache, e.taskTplsCache, tmpTpls),
-		models.DefaultDomain:    sender.NewCallBacker(models.DefaultDomain, e.targetCache, e.userCache, e.taskTplsCache, tmpTpls),
-		models.LarkCardDomain:   sender.NewCallBacker(models.LarkCardDomain, e.targetCache, e.userCache, e.taskTplsCache, tmpTpls),
 	}

 	e.RwLock.RLock()
@@ -126,7 +108,6 @@ func (e *Dispatch) relaodTpls() error {
 	e.RwLock.Lock()
 	e.tpls = tmpTpls
 	e.Senders = senders
-	e.CallBacks = callbacks
 	e.RwLock.Unlock()
 	return nil
 }
@@ -167,7 +148,7 @@ func (e *Dispatch) HandleEventNotify(event *models.AlertCurEvent, isSubscribe bo
 	}

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

 	// 如果是不是订阅规则出现的event, 则需要处理订阅规则的event
 	if !isSubscribe {
@@ -238,12 +219,11 @@ func (e *Dispatch) handleSub(sub *models.AlertSubscribe, event models.AlertCurEv
 	e.HandleEventNotify(&event, true)
 }

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

 	// handle event callbacks
-	e.SendCallbacks(rule, notifyTarget, event)
+	sender.SendCallbacks(e.ctx, notifyTarget.ToCallbackList(), event, e.targetCache, e.userCache, e.taskTplsCache, e.Astats)

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

 	// handle plugin call
-	go sender.MayPluginNotify(e.ctx, e.genNoticeBytes(event), e.notifyConfigCache.
-		GetNotifyScript(), e.Astats, event)
-
-	if !isSubscribe {
-		// handle ibex callbacks
-		e.HandleIbex(rule, event)
-	}
-}
-
-func (e *Dispatch) SendCallbacks(rule *models.AlertRule, notifyTarget *NotifyTarget, event *models.AlertCurEvent) {
-
-	uids := notifyTarget.ToUidList()
-	urls := notifyTarget.ToCallbackList()
-	for _, urlStr := range urls {
-		if len(urlStr) == 0 {
-			continue
-		}
-
-		cbCtx := sender.BuildCallBackContext(e.ctx, urlStr, rule, []*models.AlertCurEvent{event}, uids, e.userCache, e.alerting.WebhookBatchSend, e.Astats)
-
-		if strings.HasPrefix(urlStr, "${ibex}") {
-			e.CallBacks[models.IbexDomain].CallBack(cbCtx)
-			continue
-		}
-
-		if !(strings.HasPrefix(urlStr, "http://") || strings.HasPrefix(urlStr, "https://")) {
-			cbCtx.CallBackURL = "http://" + urlStr
-		}
-
-		parsedURL, err := url.Parse(urlStr)
-		if err != nil {
-			logger.Errorf("SendCallbacks: failed to url.Parse(urlStr=%s): %v", urlStr, err)
-			continue
-		}
-
-		// process feishu card
-		if parsedURL.Host == models.FeishuDomain && parsedURL.Query().Get("card") == "1" {
-			e.CallBacks[models.FeishuCardDomain].CallBack(cbCtx)
-			continue
-		}
-
-		// process lark card
-		if parsedURL.Host == models.LarkDomain && parsedURL.Query().Get("card") == "1" {
-			e.CallBacks[models.LarkCardDomain].CallBack(cbCtx)
-			continue
-		}
-
-		callBacker, ok := e.CallBacks[parsedURL.Host]
-		if ok {
-			callBacker.CallBack(cbCtx)
-		} else {
-			e.CallBacks[models.DefaultDomain].CallBack(cbCtx)
-		}
-	}
-}
-
-func (e *Dispatch) HandleIbex(rule *models.AlertRule, event *models.AlertCurEvent) {
-	// 解析 RuleConfig 字段
-	var ruleConfig struct {
-		TaskTpls []*models.Tpl `json:"task_tpls"`
-	}
-	json.Unmarshal([]byte(rule.RuleConfig), &ruleConfig)
-
-	for _, t := range ruleConfig.TaskTpls {
-		if t.TplId == 0 {
-			continue
-		}
-
-		if len(t.Host) == 0 {
-			sender.CallIbex(e.ctx, t.TplId, event.TargetIdent,
-				e.taskTplsCache, e.targetCache, e.userCache, event)
-			continue
-		}
-		for _, host := range t.Host {
-			sender.CallIbex(e.ctx, t.TplId, host,
-				e.taskTplsCache, e.targetCache, e.userCache, event)
-		}
-	}
+	go sender.MayPluginNotify(e.genNoticeBytes(event), e.notifyConfigCache.GetNotifyScript(), e.Astats)
 }

 type Notice struct {
--- a/alert/dispatch/notify_target.go
+++ b/alert/dispatch/notify_target.go
@@ -79,35 +79,11 @@ func (s *NotifyTarget) ToCallbackList() []string {
 func (s *NotifyTarget) ToWebhookList() []*models.Webhook {
 	webhooks := make([]*models.Webhook, 0, len(s.webhooks))
 	for _, wh := range s.webhooks {
-		if wh.Batch == 0 {
-			wh.Batch = 1000
-		}
-
-		if wh.Timeout == 0 {
-			wh.Timeout = 10
-		}
-
-		if wh.RetryCount == 0 {
-			wh.RetryCount = 10
-		}
-
-		if wh.RetryInterval == 0 {
-			wh.RetryInterval = 10
-		}
-
 		webhooks = append(webhooks, wh)
 	}
 	return webhooks
 }

-func (s *NotifyTarget) ToUidList() []int64 {
-	uids := make([]int64, len(s.userMap))
-	for uid, _ := range s.userMap {
-		uids = append(uids, uid)
-	}
-	return uids
-}
-
 // Dispatch 抽象由告警事件到信息接收者的路由策略
 // rule: 告警规则
 // event: 告警事件
--- a/alert/eval/eval.go
+++ b/alert/eval/eval.go
@@ -46,14 +46,6 @@ const (
 	QUERY_DATA      = "query_data"
 )

-type JoinType string
-
-const (
-	Left  JoinType = "left"
-	Right JoinType = "right"
-	Inner JoinType = "inner"
-)
-
 func NewAlertRuleWorker(rule *models.AlertRule, datasourceId int64, processor *process.Processor, promClients *prom.PromClientMap, tdengineClients *tdengine.TdengineClientMap, ctx *ctx.Context) *AlertRuleWorker {
 	arw := &AlertRuleWorker{
 		datasourceId: datasourceId,
@@ -151,22 +143,19 @@ func (arw *AlertRuleWorker) Eval() {
 			if p.Severity > point.Severity {
 				hash := process.Hash(cachedRule.Id, arw.processor.DatasourceId(), p)
 				arw.processor.DeleteProcessEvent(hash)
-				models.AlertCurEventDelByHash(arw.ctx, hash)

 				pointsMap[tagHash] = point
 			}
 		}

-		now := time.Now().Unix()
 		for _, point := range pointsMap {
 			str := fmt.Sprintf("%v", point.Value)
-			arw.processor.RecoverSingle(process.Hash(cachedRule.Id, arw.processor.DatasourceId(), point), now, &str)
+			arw.processor.RecoverSingle(process.Hash(cachedRule.Id, arw.processor.DatasourceId(), point), point.Timestamp, &str)
 		}
 	} else {
-		now := time.Now().Unix()
 		for _, point := range recoverPoints {
 			str := fmt.Sprintf("%v", point.Value)
-			arw.processor.RecoverSingle(process.Hash(cachedRule.Id, arw.processor.DatasourceId(), point), now, &str)
+			arw.processor.RecoverSingle(process.Hash(cachedRule.Id, arw.processor.DatasourceId(), point), point.Timestamp, &str)
 		}
 	}

@@ -230,6 +219,7 @@ func (arw *AlertRuleWorker) GetPromAnomalyPoint(ruleConfig string) []common.Anom
 			logger.Errorf("rule_eval:%s promql:%s, warnings:%v", arw.Key(), promql, warnings)
 			arw.processor.Stats.CounterQueryDataErrorTotal.WithLabelValues(fmt.Sprintf("%d", arw.datasourceId)).Inc()
 			arw.processor.Stats.CounterRuleEvalErrorTotal.WithLabelValues(fmt.Sprintf("%v", arw.processor.DatasourceId()), QUERY_DATA).Inc()
+			continue
 		}

 		logger.Debugf("rule_eval:%s query:%+v, value:%v", arw.Key(), query, value)
@@ -266,12 +256,9 @@ func (arw *AlertRuleWorker) GetTdengineAnomalyPoint(rule *models.AlertRule, dsId
 	arw.inhibit = ruleQuery.Inhibit
 	if len(ruleQuery.Queries) > 0 {
 		seriesStore := make(map[uint64]models.DataResp)
-		// 将不同查询的 hash 索引分组存放
-		seriesTagIndexes := make([]map[uint64][]uint64, 0)
+		seriesTagIndex := make(map[uint64][]uint64)

 		for _, query := range ruleQuery.Queries {
-			seriesTagIndex := make(map[uint64][]uint64)
-
 			arw.processor.Stats.CounterQueryDataTotal.WithLabelValues(fmt.Sprintf("%d", arw.datasourceId)).Inc()
 			cli := arw.tdengineClients.GetCli(dsId)
 			if cli == nil {
@@ -289,13 +276,13 @@ func (arw *AlertRuleWorker) GetTdengineAnomalyPoint(rule *models.AlertRule, dsId
 				arw.processor.Stats.CounterRuleEvalErrorTotal.WithLabelValues(fmt.Sprintf("%v", arw.processor.DatasourceId()), QUERY_DATA).Inc()
 				continue
 			}
+
 			//  此条日志很重要，是告警判断的现场值
 			logger.Debugf("rule_eval rid:%d req:%+v resp:%+v", rule.Id, query, series)
 			MakeSeriesMap(series, seriesTagIndex, seriesStore)
-			seriesTagIndexes = append(seriesTagIndexes, seriesTagIndex)
 		}

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

 	return points, recoverPoints
@@ -359,7 +346,7 @@ func (arw *AlertRuleWorker) GetHostAnomalyPoint(ruleConfig string) []common.Anom
 					missTargets = append(missTargets, ident)
 				}
 			}
-			logger.Debugf("rule_eval:%s missTargets:%v", arw.Key(), missTargets)
+
 			targets := arw.processor.TargetCache.Gets(missTargets)
 			for _, target := range targets {
 				m := make(map[string]string)
@@ -397,6 +384,7 @@ func (arw *AlertRuleWorker) GetHostAnomalyPoint(ruleConfig string) []common.Anom
 					// means this target is not collect by categraf, do not check offset
 					continue
 				}
+
 				if target, exists := targetMap[ident]; exists {
 					if now-target.UpdateAt > 120 {
 						// means this target is not a active host, do not check offset
@@ -410,7 +398,6 @@ func (arw *AlertRuleWorker) GetHostAnomalyPoint(ruleConfig string) []common.Anom
 				}
 			}

-			logger.Debugf("rule_eval:%s offsetIdents:%v", arw.Key(), offsetIdents)
 			for host, offset := range offsetIdents {
 				m := make(map[string]string)
 				target, exists := arw.processor.TargetCache.Get(host)
@@ -445,7 +432,7 @@ func (arw *AlertRuleWorker) GetHostAnomalyPoint(ruleConfig string) []common.Anom
 					missTargets = append(missTargets, ident)
 				}
 			}
-			logger.Debugf("rule_eval:%s missTargets:%v", arw.Key(), missTargets)
+
 			pct := float64(len(missTargets)) / float64(len(idents)) * 100
 			if pct >= float64(trigger.Percent) {
 				lst = append(lst, common.NewAnomalyPoint(trigger.Type, nil, now, pct, trigger.Severity))
@@ -455,76 +442,17 @@ func (arw *AlertRuleWorker) GetHostAnomalyPoint(ruleConfig string) []common.Anom
 	return lst
 }

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

-	if len(ruleQuery.Triggers) == 0 {
-		return points, recoverPoints
-	}
-
 	for _, trigger := range ruleQuery.Triggers {
-		// seriesTagIndex 的 key 仅做分组使用，value 为每组 series 的 hash
-		seriesTagIndex := make(map[uint64][]uint64)
-
-		if len(trigger.Joins) == 0 {
-			// 没有 join 条件，走原逻辑
-			last := seriesTagIndexes[0]
-			for i := 1; i < len(seriesTagIndexes); i++ {
-				last = originalJoin(last, seriesTagIndexes[i])
-			}
-			seriesTagIndex = last
-		} else {
-			// 有 join 条件，按条件依次合并
-			if len(seriesTagIndexes) != len(trigger.Joins)+1 {
-				logger.Errorf("rule_eval rid:%d queries' count: %d not match join condition's count: %d", ruleId, len(seriesTagIndexes), len(trigger.Joins))
-				continue
-			}
-
-			last := seriesTagIndexes[0]
-			lastRehashed := rehashSet(last, seriesStore, trigger.Joins[0].On)
-			for i := range trigger.Joins {
-				cur := seriesTagIndexes[i+1]
-				switch trigger.Joins[i].JoinType {
-				case "original":
-					last = originalJoin(last, cur)
-				case "none":
-					last = noneJoin(last, cur)
-				case "cartesian":
-					last = cartesianJoin(last, cur)
-				case "inner_join":
-					curRehashed := rehashSet(cur, seriesStore, trigger.Joins[i].On)
-					lastRehashed = onJoin(lastRehashed, curRehashed, Inner)
-					last = flatten(lastRehashed)
-				case "left_join":
-					curRehashed := rehashSet(cur, seriesStore, trigger.Joins[i].On)
-					lastRehashed = onJoin(lastRehashed, curRehashed, Left)
-					last = flatten(lastRehashed)
-				case "right_join":
-					curRehashed := rehashSet(cur, seriesStore, trigger.Joins[i].On)
-					lastRehashed = onJoin(curRehashed, lastRehashed, Right)
-					last = flatten(lastRehashed)
-				case "left_exclude":
-					curRehashed := rehashSet(cur, seriesStore, trigger.Joins[i].On)
-					lastRehashed = exclude(lastRehashed, curRehashed)
-					last = flatten(lastRehashed)
-				case "right_exclude":
-					curRehashed := rehashSet(cur, seriesStore, trigger.Joins[i].On)
-					lastRehashed = exclude(curRehashed, lastRehashed)
-					last = flatten(lastRehashed)
-				default:
-					logger.Warningf("rule_eval rid:%d join type:%s not support", ruleId, trigger.Joins[i].JoinType)
-				}
-			}
-			seriesTagIndex = last
-		}
-
 		for _, seriesHash := range seriesTagIndex {
 			sort.Slice(seriesHash, func(i, j int) bool {
 				return seriesHash[i] < seriesHash[j]
 			})

-			m := make(map[string]interface{})
+			m := make(map[string]float64)
 			var ts int64
 			var sample models.DataResp
 			var value float64
@@ -589,143 +517,6 @@ func GetAnomalyPoint(ruleId int64, ruleQuery models.RuleQuery, seriesTagIndexes
 	return points, recoverPoints
 }

-func flatten(rehashed map[uint64][][]uint64) map[uint64][]uint64 {
-	seriesTagIndex := make(map[uint64][]uint64)
-	var i uint64
-	for _, HashTagIndex := range rehashed {
-		for u := range HashTagIndex {
-			seriesTagIndex[i] = HashTagIndex[u]
-			i++
-		}
-	}
-	return seriesTagIndex
-}
-
-// onJoin 组合两个经过 rehash 之后的集合
-// 如查询 A，经过 on data_base rehash 分组后
-// [[A1{data_base=1, table=alert}，A2{data_base=1, table=alert}]，[A5{data_base=1, table=board}]]
-// [[A3{data_base=2, table=board}]，[A4{data_base=2, table=alert}]]
-// 查询 B，经过 on data_base rehash 分组后
-// [[B1{data_base=1, table=alert}]]
-// [[B2{data_base=2, table=alert}]]
-// 内联得到
-// [[A1{data_base=1, table=alert}，A2{data_base=1, table=alert}，B1{data_base=1, table=alert}]，[A5{data_base=1, table=board}，[B1{data_base=1, table=alert}]]
-// [[A3{data_base=2, table=board}，B2{data_base=2, table=alert}]，[A4{data_base=2, table=alert}，B2{data_base=2, table=alert}]]
-func onJoin(reHashTagIndex1 map[uint64][][]uint64, reHashTagIndex2 map[uint64][][]uint64, joinType JoinType) map[uint64][][]uint64 {
-	reHashTagIndex := make(map[uint64][][]uint64)
-	for rehash, _ := range reHashTagIndex1 {
-		if _, ok := reHashTagIndex2[rehash]; ok {
-			// 若有 rehash 相同的记录，两两合并
-			for i1 := range reHashTagIndex1[rehash] {
-				for i2 := range reHashTagIndex2[rehash] {
-					reHashTagIndex[rehash] = append(reHashTagIndex[rehash], mergeNewArray(reHashTagIndex1[rehash][i1], reHashTagIndex2[rehash][i2]))
-				}
-			}
-		} else {
-			// 合并方式不为 inner 时，需要保留 reHashTagIndex1 中未匹配的记录
-			if joinType != Inner {
-				reHashTagIndex[rehash] = reHashTagIndex1[rehash]
-			}
-		}
-	}
-	return reHashTagIndex
-}
-
-// rehashSet 重新 hash 分组
-// 如当前查询 A 有五条记录
-// A1{data_base=1, table=alert}
-// A2{data_base=1, table=alert}
-// A3{data_base=2, table=board}
-// A4{data_base=2, table=alert}
-// A5{data_base=1, table=board}
-// 经过预处理（按曲线分组，此步已在进入 GetAnomalyPoint 函数前完成）后，分为 4 组，
-// [A1{data_base=1, table=alert}，A2{data_base=1, table=alert}]
-// [A3{data_base=2, table=board}]
-// [A4{data_base=2, table=alert}]
-// [A5{data_base=1, table=board}]
-// 若 rehashSet 按 data_base 重新分组，此时会得到按 rehash 值分的二维数组，即不会将 rehash 值相同的记录完全合并
-// [[A1{data_base=1, table=alert}，A2{data_base=1, table=alert}]，[A5{data_base=1, table=board}]]
-// [[A3{data_base=2, table=board}]，[A4{data_base=2, table=alert}]]
-func rehashSet(seriesTagIndex1 map[uint64][]uint64, seriesStore map[uint64]models.DataResp, on []string) map[uint64][][]uint64 {
-	reHashTagIndex := make(map[uint64][][]uint64)
-	for _, seriesHashes := range seriesTagIndex1 {
-		if len(seriesHashes) == 0 {
-			continue
-		}
-		series, exists := seriesStore[seriesHashes[0]]
-		if !exists {
-			continue
-		}
-		rehash := hash.GetTargetTagHash(series.Metric, on)
-		if _, ok := reHashTagIndex[rehash]; !ok {
-			reHashTagIndex[rehash] = make([][]uint64, 0)
-		}
-		reHashTagIndex[rehash] = append(reHashTagIndex[rehash], seriesHashes)
-	}
-	return reHashTagIndex
-}
-
-// 笛卡尔积，查询的结果两两合并
-func cartesianJoin(seriesTagIndex1 map[uint64][]uint64, seriesTagIndex2 map[uint64][]uint64) map[uint64][]uint64 {
-	var index uint64
-	seriesTagIndex := make(map[uint64][]uint64)
-	for _, seriesHashes1 := range seriesTagIndex1 {
-		for _, seriesHashes2 := range seriesTagIndex2 {
-			seriesTagIndex[index] = mergeNewArray(seriesHashes1, seriesHashes2)
-			index++
-		}
-	}
-	return seriesTagIndex
-}
-
-// noneJoin 直接拼接
-func noneJoin(seriesTagIndex1 map[uint64][]uint64, seriesTagIndex2 map[uint64][]uint64) map[uint64][]uint64 {
-	seriesTagIndex := make(map[uint64][]uint64)
-	var index uint64
-	for _, seriesHashes := range seriesTagIndex1 {
-		seriesTagIndex[index] = seriesHashes
-		index++
-	}
-	for _, seriesHashes := range seriesTagIndex2 {
-		seriesTagIndex[index] = seriesHashes
-		index++
-	}
-	return seriesTagIndex
-}
-
-// originalJoin 原始分组方案，key 相同，即标签全部相同分为一组
-func originalJoin(seriesTagIndex1 map[uint64][]uint64, seriesTagIndex2 map[uint64][]uint64) map[uint64][]uint64 {
-	seriesTagIndex := make(map[uint64][]uint64)
-	for tagHash, seriesHashes := range seriesTagIndex1 {
-		if _, ok := seriesTagIndex[tagHash]; !ok {
-			seriesTagIndex[tagHash] = mergeNewArray(seriesHashes)
-		} else {
-			seriesTagIndex[tagHash] = append(seriesTagIndex[tagHash], seriesHashes...)
-		}
-	}
-
-	for tagHash, seriesHashes := range seriesTagIndex2 {
-		if _, ok := seriesTagIndex[tagHash]; !ok {
-			seriesTagIndex[tagHash] = mergeNewArray(seriesHashes)
-		} else {
-			seriesTagIndex[tagHash] = append(seriesTagIndex[tagHash], seriesHashes...)
-		}
-	}
-
-	return seriesTagIndex
-}
-
-// exclude 左斥，留下在 reHashTagIndex1 中，但不在 reHashTagIndex2 中的记录
-func exclude(reHashTagIndex1 map[uint64][][]uint64, reHashTagIndex2 map[uint64][][]uint64) map[uint64][][]uint64 {
-	reHashTagIndex := make(map[uint64][][]uint64)
-	for rehash, _ := range reHashTagIndex1 {
-		if _, ok := reHashTagIndex2[rehash]; !ok {
-			reHashTagIndex[rehash] = reHashTagIndex1[rehash]
-		}
-	}
-	return reHashTagIndex
-}
-
 func MakeSeriesMap(series []models.DataResp, seriesTagIndex map[uint64][]uint64, seriesStore map[uint64]models.DataResp) {
 	for i := 0; i < len(series); i++ {
 		serieHash := hash.GetHash(series[i].Metric, series[i].Ref)
@@ -739,11 +530,3 @@ func MakeSeriesMap(series []models.DataResp, seriesTagIndex map[uint64][]uint64,
 		seriesTagIndex[tagHash] = append(seriesTagIndex[tagHash], serieHash)
 	}
 }
-
-func mergeNewArray(arg ...[]uint64) []uint64 {
-	res := make([]uint64, 0)
-	for _, a := range arg {
-		res = append(res, a...)
-	}
-	return res
-}
--- a/alert/eval/eval_test.go
+++ b/alert/eval/eval_test.go
@@ -1,271 +0,0 @@
-package eval
-
-import (
-	"reflect"
-	"testing"
-
-	"golang.org/x/exp/slices"
-)
-
-var (
-	reHashTagIndex1 = map[uint64][][]uint64{
-		1: {
-			{1, 2}, {3, 4},
-		},
-		2: {
-			{5, 6}, {7, 8},
-		},
-	}
-	reHashTagIndex2 = map[uint64][][]uint64{
-		1: {
-			{9, 10}, {11, 12},
-		},
-		3: {
-			{13, 14}, {15, 16},
-		},
-	}
-	seriesTagIndex1 = map[uint64][]uint64{
-		1: {1, 2, 3, 4},
-		2: {5, 6, 7, 8},
-	}
-	seriesTagIndex2 = map[uint64][]uint64{
-		1: {9, 10, 11, 12},
-		3: {13, 14, 15, 16},
-	}
-)
-
-func Test_originalJoin(t *testing.T) {
-	type args struct {
-		seriesTagIndex1 map[uint64][]uint64
-		seriesTagIndex2 map[uint64][]uint64
-	}
-	tests := []struct {
-		name string
-		args args
-		want map[uint64][]uint64
-	}{
-		{
-			name: "original join",
-			args: args{
-				seriesTagIndex1: map[uint64][]uint64{
-					1: {1, 2, 3, 4},
-					2: {5, 6, 7, 8},
-				},
-				seriesTagIndex2: map[uint64][]uint64{
-					1: {9, 10, 11, 12},
-					3: {13, 14, 15, 16},
-				},
-			},
-			want: map[uint64][]uint64{
-				1: {1, 2, 3, 4, 9, 10, 11, 12},
-				2: {5, 6, 7, 8},
-				3: {13, 14, 15, 16},
-			},
-		},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			if got := originalJoin(tt.args.seriesTagIndex1, tt.args.seriesTagIndex2); !reflect.DeepEqual(got, tt.want) {
-				t.Errorf("originalJoin() = %v, want %v", got, tt.want)
-			}
-		})
-	}
-}
-
-func Test_exclude(t *testing.T) {
-	type args struct {
-		reHashTagIndex1 map[uint64][][]uint64
-		reHashTagIndex2 map[uint64][][]uint64
-	}
-	tests := []struct {
-		name string
-		args args
-		want map[uint64][]uint64
-	}{
-		{
-			name: "left exclude",
-			args: args{
-				reHashTagIndex1: reHashTagIndex1,
-				reHashTagIndex2: reHashTagIndex2,
-			},
-			want: map[uint64][]uint64{
-				0: {5, 6},
-				1: {7, 8},
-			},
-		},
-		{
-			name: "right exclude",
-			args: args{
-				reHashTagIndex1: reHashTagIndex2,
-				reHashTagIndex2: reHashTagIndex1,
-			},
-			want: map[uint64][]uint64{
-				3: {13, 14},
-				4: {15, 16},
-			},
-		},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			if got := exclude(tt.args.reHashTagIndex1, tt.args.reHashTagIndex2); !allValueDeepEqual(flatten(got), tt.want) {
-				t.Errorf("exclude() = %v, want %v", got, tt.want)
-			}
-		})
-	}
-}
-
-func Test_noneJoin(t *testing.T) {
-	type args struct {
-		seriesTagIndex1 map[uint64][]uint64
-		seriesTagIndex2 map[uint64][]uint64
-	}
-	tests := []struct {
-		name string
-		args args
-		want map[uint64][]uint64
-	}{
-		{
-			name: "none join, direct splicing",
-			args: args{
-				seriesTagIndex1: seriesTagIndex1,
-				seriesTagIndex2: seriesTagIndex2,
-			},
-			want: map[uint64][]uint64{
-				0: {1, 2, 3, 4},
-				1: {5, 6, 7, 8},
-				2: {9, 10, 11, 12},
-				3: {13, 14, 15, 16},
-			},
-		},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			if got := noneJoin(tt.args.seriesTagIndex1, tt.args.seriesTagIndex2); !allValueDeepEqual(got, tt.want) {
-				t.Errorf("noneJoin() = %v, want %v", got, tt.want)
-			}
-		})
-	}
-}
-
-func Test_cartesianJoin(t *testing.T) {
-	type args struct {
-		seriesTagIndex1 map[uint64][]uint64
-		seriesTagIndex2 map[uint64][]uint64
-	}
-	tests := []struct {
-		name string
-		args args
-		want map[uint64][]uint64
-	}{
-		{
-			name: "cartesian join",
-			args: args{
-				seriesTagIndex1: seriesTagIndex1,
-				seriesTagIndex2: seriesTagIndex2,
-			},
-			want: map[uint64][]uint64{
-				0: {1, 2, 3, 4, 9, 10, 11, 12},
-				1: {5, 6, 7, 8, 9, 10, 11, 12},
-				2: {5, 6, 7, 8, 13, 14, 15, 16},
-				3: {1, 2, 3, 4, 13, 14, 15, 16},
-			},
-		},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			if got := cartesianJoin(tt.args.seriesTagIndex1, tt.args.seriesTagIndex2); !allValueDeepEqual(got, tt.want) {
-				t.Errorf("cartesianJoin() = %v, want %v", got, tt.want)
-			}
-		})
-	}
-}
-
-func Test_onJoin(t *testing.T) {
-	type args struct {
-		reHashTagIndex1 map[uint64][][]uint64
-		reHashTagIndex2 map[uint64][][]uint64
-		joinType        JoinType
-	}
-	tests := []struct {
-		name string
-		args args
-		want map[uint64][]uint64
-	}{
-		{
-			name: "left join",
-			args: args{
-				reHashTagIndex1: reHashTagIndex1,
-				reHashTagIndex2: reHashTagIndex2,
-				joinType:        Left,
-			},
-			want: map[uint64][]uint64{
-				1: {1, 2, 9, 10},
-				2: {3, 4, 9, 10},
-				3: {1, 2, 11, 12},
-				4: {3, 4, 11, 12},
-				5: {5, 6},
-				6: {7, 8},
-			},
-		},
-		{
-			name: "right join",
-			args: args{
-				reHashTagIndex1: reHashTagIndex2,
-				reHashTagIndex2: reHashTagIndex1,
-				joinType:        Right,
-			},
-			want: map[uint64][]uint64{
-				1: {1, 2, 9, 10},
-				2: {3, 4, 9, 10},
-				3: {1, 2, 11, 12},
-				4: {3, 4, 11, 12},
-				5: {13, 14},
-				6: {15, 16},
-			},
-		},
-
-		{
-			name: "inner join",
-			args: args{
-				reHashTagIndex1: reHashTagIndex1,
-				reHashTagIndex2: reHashTagIndex2,
-				joinType:        Inner,
-			},
-			want: map[uint64][]uint64{
-				1: {1, 2, 9, 10},
-				2: {3, 4, 9, 10},
-				3: {1, 2, 11, 12},
-				4: {3, 4, 11, 12},
-			},
-		},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			if got := onJoin(tt.args.reHashTagIndex1, tt.args.reHashTagIndex2, tt.args.joinType); !allValueDeepEqual(flatten(got), tt.want) {
-				t.Errorf("onJoin() = %v, want %v", got, tt.want)
-			}
-		})
-	}
-}
-
-// allValueDeepEqual 判断 map 的 value 是否相同，不考虑 key
-func allValueDeepEqual(got, want map[uint64][]uint64) bool {
-	if len(got) != len(want) {
-		return false
-	}
-	for _, v1 := range got {
-		curEqual := false
-		slices.Sort(v1)
-		for _, v2 := range want {
-			slices.Sort(v2)
-			if reflect.DeepEqual(v1, v2) {
-				curEqual = true
-				break
-			}
-		}
-		if !curEqual {
-			return false
-		}
-	}
-	return true
-}
--- a/alert/mute/mute.go
+++ b/alert/mute/mute.go
@@ -12,28 +12,28 @@ import (
 	"github.com/toolkits/pkg/logger"
 )

-func IsMuted(rule *models.AlertRule, event *models.AlertCurEvent, targetCache *memsto.TargetCacheType, alertMuteCache *memsto.AlertMuteCacheType) (bool, string) {
+func IsMuted(rule *models.AlertRule, event *models.AlertCurEvent, targetCache *memsto.TargetCacheType, alertMuteCache *memsto.AlertMuteCacheType) bool {
 	if rule.Disabled == 1 {
-		return true, "rule disabled"
+		return true
 	}

 	if TimeSpanMuteStrategy(rule, event) {
-		return true, "rule is not effective for period of time"
+		return true
 	}

 	if IdentNotExistsMuteStrategy(rule, event, targetCache) {
-		return true, "ident not exists mute"
+		return true
 	}

 	if BgNotMatchMuteStrategy(rule, event, targetCache) {
-		return true, "bg not match mute"
+		return true
 	}

 	if EventMuteStrategy(event, alertMuteCache) {
-		return true, "match mute rule"
+		return true
 	}

-	return false, ""
+	return false
 }

 // TimeSpanMuteStrategy 根据规则配置的告警生效时间段过滤,如果产生的告警不在规则配置的告警生效时间段内,则不告警,即被mute
--- a/alert/naming/heartbeat.go
+++ b/alert/naming/heartbeat.go
@@ -79,25 +79,48 @@ func (n *Naming) loopHeartbeat() {

 func (n *Naming) heartbeat() error {
 	var datasourceIds []int64
+	var myDatasourceIds []int64
 	var err error

-	// 在页面上维护实例和集群的对应关系
-	datasourceIds, err = models.GetDatasourceIdsByEngineName(n.ctx, n.heartbeatConfig.EngineName)
-	if err != nil {
-		return err
+	// 如果是中心机房的 leader 机器，沟通全量的数据源的 hash ring，给智能告警模块使用
+
+	if n.IamLeader() {
+		datasources, err := models.GetDatasources(n.ctx)
+		if err != nil {
+			logger.Warningf("get datasources err:%v", err)
+			return err
+		}
+		for i := 0; i < len(datasources); i++ {
+			datasourceIds = append(datasourceIds, datasources[i].Id)
+		}
+
+		myDatasourceIds, err = models.GetDatasourceIdsByEngineName(n.ctx, n.heartbeatConfig.EngineName)
+		if err != nil {
+			logger.Warningf("get datasource ids by engine name err:%v", err)
+			return err
+		}
+	} else {
+		// 在页面上维护实例和集群的对应关系
+		datasourceIds, err = models.GetDatasourceIdsByEngineName(n.ctx, n.heartbeatConfig.EngineName)
+		if err != nil {
+			return err
+		}
+
+		myDatasourceIds = datasourceIds
 	}

-	if len(datasourceIds) == 0 {
+	// 上报心跳
+	if len(myDatasourceIds) == 0 {
 		err := models.AlertingEngineHeartbeatWithCluster(n.ctx, n.heartbeatConfig.Endpoint, n.heartbeatConfig.EngineName, 0)
 		if err != nil {
 			logger.Warningf("heartbeat with cluster %s err:%v", "", err)
 			n.astats.CounterHeartbeatErrorTotal.WithLabelValues().Inc()
 		}
 	} else {
-		for i := 0; i < len(datasourceIds); i++ {
-			err := models.AlertingEngineHeartbeatWithCluster(n.ctx, n.heartbeatConfig.Endpoint, n.heartbeatConfig.EngineName, datasourceIds[i])
+		for i := 0; i < len(myDatasourceIds); i++ {
+			err := models.AlertingEngineHeartbeatWithCluster(n.ctx, n.heartbeatConfig.Endpoint, n.heartbeatConfig.EngineName, myDatasourceIds[i])
 			if err != nil {
-				logger.Warningf("heartbeat with cluster %d err:%v", datasourceIds[i], err)
+				logger.Warningf("heartbeat with cluster %d err:%v", myDatasourceIds[i], err)
 				n.astats.CounterHeartbeatErrorTotal.WithLabelValues().Inc()
 			}
 		}
--- a/alert/process/process.go
+++ b/alert/process/process.go
@@ -18,9 +18,6 @@ import (
 	"github.com/ccfos/nightingale/v6/models"
 	"github.com/ccfos/nightingale/v6/pkg/ctx"
 	"github.com/ccfos/nightingale/v6/pkg/tplx"
-	"github.com/ccfos/nightingale/v6/pushgw/writer"
-
-	"github.com/prometheus/prometheus/prompb"
 	"github.com/toolkits/pkg/logger"
 	"github.com/toolkits/pkg/str"
 )
@@ -53,11 +50,10 @@ type Processor struct {
 	datasourceId int64
 	EngineName   string

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

 	tagsMap    map[string]string
 	tagsArr    []string
@@ -149,10 +145,9 @@ func (p *Processor) Handle(anomalyPoints []common.AnomalyPoint, from string, inh
 		// 如果 event 被 mute 了,本质也是 fire 的状态,这里无论如何都添加到 alertingKeys 中,防止 fire 的事件自动恢复了
 		hash := event.Hash
 		alertingKeys[hash] = struct{}{}
-		isMuted, detail := mute.IsMuted(cachedRule, event, p.TargetCache, p.alertMuteCache)
-		if isMuted {
+		if mute.IsMuted(cachedRule, event, p.TargetCache, p.alertMuteCache) {
 			p.Stats.CounterMuteTotal.WithLabelValues(event.GroupName).Inc()
-			logger.Debugf("rule_eval:%s event:%v is muted, detail:%s", p.Key(), event, detail)
+			logger.Debugf("rule_eval:%s event:%v is muted", p.Key(), event)
 			continue
 		}

@@ -212,14 +207,6 @@ func (p *Processor) BuildEvent(anomalyPoint common.AnomalyPoint, from string, no
 	event.ExtraConfig = p.rule.ExtraConfigJSON
 	event.PromQl = anomalyPoint.Query

-	if p.target != "" {
-		if pt, exist := p.TargetCache.Get(p.target); exist {
-			event.Target = pt
-		} else {
-			logger.Infof("Target[ident: %s] doesn't exist in cache.", p.target)
-		}
-	}
-
 	if event.TriggerValues != "" && strings.Count(event.TriggerValues, "$") > 1 {
 		// TriggerValues 有多个变量，将多个变量都放到 TriggerValue 中
 		event.TriggerValue = event.TriggerValues
@@ -230,57 +217,9 @@ func (p *Processor) BuildEvent(anomalyPoint common.AnomalyPoint, from string, no
 	} else {
 		event.LastEvalTime = event.TriggerTime
 	}
-
-	// 生成事件之后，立马进程 relabel 处理
-	Relabel(p.rule, event)
 	return event
 }

-func Relabel(rule *models.AlertRule, event *models.AlertCurEvent) {
-	if rule == nil {
-		return
-	}
-
-	if len(rule.EventRelabelConfig) == 0 {
-		return
-	}
-
-	// need to keep the original label
-	event.OriginalTags = event.Tags
-	event.OriginalTagsJSON = make([]string, len(event.TagsJSON))
-
-	labels := make([]prompb.Label, len(event.TagsJSON))
-	for i, tag := range event.TagsJSON {
-		label := strings.SplitN(tag, "=", 2)
-		event.OriginalTagsJSON[i] = tag
-		labels[i] = prompb.Label{Name: label[0], Value: label[1]}
-	}
-
-	for i := 0; i < len(rule.EventRelabelConfig); i++ {
-		if rule.EventRelabelConfig[i].Replacement == "" {
-			rule.EventRelabelConfig[i].Replacement = "$1"
-		}
-
-		if rule.EventRelabelConfig[i].Separator == "" {
-			rule.EventRelabelConfig[i].Separator = ";"
-		}
-
-		if rule.EventRelabelConfig[i].Regex == "" {
-			rule.EventRelabelConfig[i].Regex = "(.*)"
-		}
-	}
-
-	// relabel process
-	relabels := writer.Process(labels, rule.EventRelabelConfig...)
-	event.TagsJSON = make([]string, len(relabels))
-	event.TagsMap = make(map[string]string, len(relabels))
-	for i, label := range relabels {
-		event.TagsJSON[i] = fmt.Sprintf("%s=%s", label.Name, label.Value)
-		event.TagsMap[label.Name] = label.Value
-	}
-	event.Tags = strings.Join(event.TagsJSON, ",,")
-}
-
 func (p *Processor) HandleRecover(alertingKeys map[string]struct{}, now int64, inhibit bool) {
 	for _, hash := range p.pendings.Keys() {
 		if _, has := alertingKeys[hash]; has {
@@ -331,7 +270,6 @@ func (p *Processor) HandleRecoverEvent(hashArr []string, now int64, inhibit bool
 			// hash 对应的恢复事件的被抑制了，把之前的事件删除
 			p.fires.Delete(e.Hash)
 			p.pendings.Delete(e.Hash)
-			models.AlertCurEventDelByHash(p.ctx, e.Hash)
 			eventMap[event.Tags] = *event
 		}
 	}
@@ -351,22 +289,11 @@ func (p *Processor) RecoverSingle(hash string, now int64, value *string, values
 	if !has {
 		return
 	}
-
 	// 如果配置了留观时长，就不能立马恢复了
-	if cachedRule.RecoverDuration > 0 {
-		lastPendingEvent, has := p.pendingsUseByRecover.Get(hash)
-		if !has {
-			// 说明没有产生过异常点，就不需要恢复了
-			logger.Debugf("rule_eval:%s event:%v do not has pending event, not recover", p.Key(), event)
-			return
-		}
-
-		if now-lastPendingEvent.LastEvalTime < cachedRule.RecoverDuration {
-			logger.Debugf("rule_eval:%s event:%v not recover", p.Key(), event)
-			return
-		}
+	if cachedRule.RecoverDuration > 0 && now-event.LastEvalTime < cachedRule.RecoverDuration {
+		logger.Debugf("rule_eval:%s event:%v not recover", p.Key(), event)
+		return
 	}
-
 	if value != nil {
 		event.TriggerValue = *value
 		if len(values) > 0 {
@@ -378,7 +305,6 @@ func (p *Processor) RecoverSingle(hash string, now int64, value *string, values
 	// 我确实无法分辨，是prom中有值但是未满足阈值所以没返回，还是prom中确实丢了一些点导致没有数据可以返回，尴尬
 	p.fires.Delete(hash)
 	p.pendings.Delete(hash)
-	p.pendingsUseByRecover.Delete(hash)

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

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

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

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

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

 		event.DB2Mem()
 		fireMap[event.Hash] = event
-		e := *event
-		pendingsUseByRecoverMap[event.Hash] = &e
 	}

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

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

 func labelMapToArr(m map[string]string) []string {
--- a/alert/record/prom_rule.go
+++ b/alert/record/prom_rule.go
@@ -10,7 +10,6 @@ import (
 	"github.com/ccfos/nightingale/v6/models"
 	"github.com/ccfos/nightingale/v6/prom"
 	"github.com/ccfos/nightingale/v6/pushgw/writer"
-	"github.com/robfig/cron/v3"

 	"github.com/toolkits/pkg/logger"
 	"github.com/toolkits/pkg/str"
@@ -20,35 +19,19 @@ type RecordRuleContext struct {
 	datasourceId int64
 	quit         chan struct{}

-	scheduler   *cron.Cron
 	rule        *models.RecordingRule
 	promClients *prom.PromClientMap
 	stats       *astats.Stats
 }

 func NewRecordRuleContext(rule *models.RecordingRule, datasourceId int64, promClients *prom.PromClientMap, writers *writer.WritersType, stats *astats.Stats) *RecordRuleContext {
-	rrc := &RecordRuleContext{
+	return &RecordRuleContext{
 		datasourceId: datasourceId,
 		quit:         make(chan struct{}),
 		rule:         rule,
 		promClients:  promClients,
 		stats:        stats,
 	}
-
-	if rule.CronPattern == "" && rule.PromEvalInterval != 0 {
-		rule.CronPattern = fmt.Sprintf("@every %ds", rule.PromEvalInterval)
-	}
-
-	rrc.scheduler = cron.New(cron.WithSeconds())
-	_, err := rrc.scheduler.AddFunc(rule.CronPattern, func() {
-		rrc.Eval()
-	})
-
-	if err != nil {
-		logger.Errorf("add cron pattern error: %v", err)
-	}
-
-	return rrc
 }

 func (rrc *RecordRuleContext) Key() string {
@@ -56,12 +39,11 @@ func (rrc *RecordRuleContext) Key() string {
 }

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

@@ -69,7 +51,23 @@ func (rrc *RecordRuleContext) Prepare() {}

 func (rrc *RecordRuleContext) Start() {
 	logger.Infof("eval:%s started", rrc.Key())
-	rrc.scheduler.Start()
+	interval := rrc.rule.PromEvalInterval
+	if interval <= 0 {
+		interval = 10
+	}
+
+	ticker := time.NewTicker(time.Duration(interval) * time.Second)
+	go func() {
+		defer ticker.Stop()
+		for {
+			select {
+			case <-rrc.quit:
+				return
+			case <-ticker.C:
+				rrc.Eval()
+			}
+		}
+	}()
 }

 func (rrc *RecordRuleContext) Eval() {
@@ -111,8 +109,5 @@ func (rrc *RecordRuleContext) Eval() {

 func (rrc *RecordRuleContext) Stop() {
 	logger.Infof("%s stopped", rrc.Key())
-
-	c := rrc.scheduler.Stop()
-	<-c.Done()
 	close(rrc.quit)
 }
--- a/alert/sender/callback.go
+++ b/alert/sender/callback.go
@@ -1,8 +1,9 @@
 package sender

 import (
-	"html/template"
-	"net/url"
+	"encoding/json"
+	"fmt"
+	"strconv"
 	"strings"
 	"time"

@@ -12,175 +13,38 @@ import (
 	"github.com/ccfos/nightingale/v6/pkg/ctx"
 	"github.com/ccfos/nightingale/v6/pkg/poster"

+	imodels "github.com/flashcatcloud/ibex/src/models"
+	"github.com/flashcatcloud/ibex/src/storage"
 	"github.com/toolkits/pkg/logger"
 )

-type (
-	// CallBacker 进行回调的接口
-	CallBacker interface {
-		CallBack(ctx CallBackContext)
-	}
-
-	// CallBackContext 回调时所需的上下文
-	CallBackContext struct {
-		Ctx         *ctx.Context
-		CallBackURL string
-		Users       []*models.User
-		Rule        *models.AlertRule
-		Events      []*models.AlertCurEvent
-		Stats       *astats.Stats
-		BatchSend   bool
-	}
-
-	DefaultCallBacker struct{}
-)
-
-func BuildCallBackContext(ctx *ctx.Context, callBackURL string, rule *models.AlertRule, events []*models.AlertCurEvent,
-	uids []int64, userCache *memsto.UserCacheType, batchSend bool, stats *astats.Stats) CallBackContext {
-	users := userCache.GetByUserIds(uids)
-
-	newCallBackUrl, _ := events[0].ParseURL(callBackURL)
-	return CallBackContext{
-		Ctx:         ctx,
-		CallBackURL: newCallBackUrl,
-		Rule:        rule,
-		Events:      events,
-		Users:       users,
-		BatchSend:   batchSend,
-		Stats:       stats,
-	}
-}
-
-func ExtractAtsParams(rawURL string) []string {
-	ans := make([]string, 0, 1)
-	parsedURL, err := url.Parse(rawURL)
-	if err != nil {
-		logger.Errorf("ExtractAtsParams(url=%s), err: %v", rawURL, err)
-		return ans
-	}
-
-	queryParams := parsedURL.Query()
-	atParam := queryParams.Get("ats")
-	if atParam == "" {
-		return ans
-	}
-
-	// Split the atParam by comma and return the result as a slice
-	return strings.Split(atParam, ",")
-}
-
-func NewCallBacker(
-	key string,
-	targetCache *memsto.TargetCacheType,
-	userCache *memsto.UserCacheType,
-	taskTplCache *memsto.TaskTplCache,
-	tpls map[string]*template.Template,
-) CallBacker {
-
-	switch key {
-	case models.IbexDomain: // Distribute to Ibex
-		return &IbexCallBacker{
-			targetCache:  targetCache,
-			userCache:    userCache,
-			taskTplCache: taskTplCache,
-		}
-	case models.DefaultDomain: // default callback
-		return &DefaultCallBacker{}
-	case models.DingtalkDomain:
-		return &DingtalkSender{tpl: tpls[models.Dingtalk]}
-	case models.WecomDomain:
-		return &WecomSender{tpl: tpls[models.Wecom]}
-	case models.FeishuDomain:
-		return &FeishuSender{tpl: tpls[models.Feishu]}
-	case models.FeishuCardDomain:
-		return &FeishuCardSender{tpl: tpls[models.FeishuCard]}
-	//case models.Mm:
-	//	return &MmSender{tpl: tpls[models.Mm]}
-	case models.TelegramDomain:
-		return &TelegramSender{tpl: tpls[models.Telegram]}
-	case models.LarkDomain:
-		return &LarkSender{tpl: tpls[models.Lark]}
-	case models.LarkCardDomain:
-		return &LarkCardSender{tpl: tpls[models.LarkCard]}
-	}
-
-	return nil
-}
-
-func (c *DefaultCallBacker) CallBack(ctx CallBackContext) {
-	if len(ctx.CallBackURL) == 0 || len(ctx.Events) == 0 {
-		return
-	}
-
-	event := ctx.Events[0]
-
-	if ctx.BatchSend {
-		webhookConf := &models.Webhook{
-			Type:          models.RuleCallback,
-			Enable:        true,
-			Url:           ctx.CallBackURL,
-			Timeout:       5,
-			RetryCount:    3,
-			RetryInterval: 10,
-			Batch:         1000,
+func SendCallbacks(ctx *ctx.Context, urls []string, event *models.AlertCurEvent, targetCache *memsto.TargetCacheType, userCache *memsto.UserCacheType,
+	taskTplCache *memsto.TaskTplCache, stats *astats.Stats) {
+	for _, url := range urls {
+		if url == "" {
+			continue
 		}

-		PushCallbackEvent(ctx.Ctx, webhookConf, event, ctx.Stats)
-		return
-	}
+		if strings.HasPrefix(url, "${ibex}") {
+			if !event.IsRecovered {
+				handleIbex(ctx, url, event, targetCache, userCache, taskTplCache)
+			}
+			continue
+		}

-	ctx.Stats.AlertNotifyTotal.WithLabelValues("rule_callback").Inc()
-	resp, code, err := poster.PostJSON(ctx.CallBackURL, 5*time.Second, event, 3)
-	if err != nil {
-		logger.Errorf("event_callback_fail(rule_id=%d url=%s), event:%+v, resp: %s, err: %v, code: %d",
-			event.RuleId, ctx.CallBackURL, event, string(resp), err, code)
-		ctx.Stats.AlertNotifyErrorTotal.WithLabelValues("rule_callback").Inc()
-	} else {
-		logger.Infof("event_callback_succ(rule_id=%d url=%s), event:%+v, resp: %s, code: %d",
-			event.RuleId, ctx.CallBackURL, event, string(resp), code)
-	}
-}
+		if !(strings.HasPrefix(url, "http://") || strings.HasPrefix(url, "https://")) {
+			url = "http://" + url
+		}

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

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

-func PushCallbackEvent(ctx *ctx.Context, webhook *models.Webhook, event *models.AlertCurEvent, stats *astats.Stats) {
-	CallbackEventQueueLock.RLock()
-	queue := CallbackEventQueue[webhook.Url]
-	CallbackEventQueueLock.RUnlock()
+func handleIbex(ctx *ctx.Context, url string, event *models.AlertCurEvent, targetCache *memsto.TargetCacheType, userCache *memsto.UserCacheType,
+	taskTplCache *memsto.TaskTplCache) {
+	if imodels.DB() == nil {
+		logger.Warning("event_callback_ibex: db is nil")
+		return
+	}

-	if queue == nil {
-		queue = &WebhookQueue{
-			list:    NewSafeListLimited(QueueMaxSize),
-			closeCh: make(chan struct{}),
+	arr := strings.Split(url, "/")
+
+	var idstr string
+	var host string
+
+	if len(arr) > 1 {
+		idstr = arr[1]
+	}
+
+	if len(arr) > 2 {
+		host = arr[2]
+	}
+
+	id, err := strconv.ParseInt(idstr, 10, 64)
+	if err != nil {
+		logger.Errorf("event_callback_ibex: failed to parse url: %s", url)
+		return
+	}
+
+	if host == "" {
+		// 用户在callback url中没有传入host，就从event中解析
+		host = event.TargetIdent
+	}
+
+	if host == "" {
+		logger.Error("event_callback_ibex: failed to get host")
+		return
+	}
+
+	tpl := taskTplCache.Get(id)
+	if tpl == nil {
+		logger.Errorf("event_callback_ibex: no such tpl(%d)", id)
+		return
+	}
+
+	// check perm
+	// tpl.GroupId - host - account 三元组校验权限
+	can, err := canDoIbex(tpl.UpdateBy, tpl, host, targetCache, userCache)
+	if err != nil {
+		logger.Errorf("event_callback_ibex: check perm fail: %v", err)
+		return
+	}
+
+	if !can {
+		logger.Errorf("event_callback_ibex: user(%s) no permission", tpl.UpdateBy)
+		return
+	}
+
+	tagsMap := make(map[string]string)
+	for i := 0; i < len(event.TagsJSON); i++ {
+		pair := strings.TrimSpace(event.TagsJSON[i])
+		if pair == "" {
+			continue
 		}

-		CallbackEventQueueLock.Lock()
-		CallbackEventQueue[webhook.Url] = queue
-		CallbackEventQueueLock.Unlock()
+		arr := strings.Split(pair, "=")
+		if len(arr) != 2 {
+			continue
+		}

-		StartConsumer(ctx, queue, webhook.Batch, webhook, stats)
+		tagsMap[arr[0]] = arr[1]
+	}
+	// 附加告警级别  告警触发值标签
+	tagsMap["alert_severity"] = strconv.Itoa(event.Severity)
+	tagsMap["alert_trigger_value"] = event.TriggerValue
+
+	tags, err := json.Marshal(tagsMap)
+	if err != nil {
+		logger.Errorf("event_callback_ibex: failed to marshal tags to json: %v", tagsMap)
+		return
 	}

-	succ := queue.list.PushFront(event)
-	if !succ {
-		logger.Warningf("Write channel(%s) full, current channel size: %d event:%v", webhook.Url, queue.list.Len(), event)
+	// call ibex
+	in := models.TaskForm{
+		Title:          tpl.Title + " FH: " + host,
+		Account:        tpl.Account,
+		Batch:          tpl.Batch,
+		Tolerance:      tpl.Tolerance,
+		Timeout:        tpl.Timeout,
+		Pause:          tpl.Pause,
+		Script:         tpl.Script,
+		Args:           tpl.Args,
+		Stdin:          string(tags),
+		Action:         "start",
+		Creator:        tpl.UpdateBy,
+		Hosts:          []string{host},
+		AlertTriggered: true,
+	}
+
+	id, err = TaskAdd(in, tpl.UpdateBy, ctx.IsCenter)
+	if err != nil {
+		logger.Errorf("event_callback_ibex: call ibex fail: %v", err)
+		return
+	}
+
+	// write db
+	record := models.TaskRecord{
+		Id:        id,
+		EventId:   event.Id,
+		GroupId:   tpl.GroupId,
+		Title:     in.Title,
+		Account:   in.Account,
+		Batch:     in.Batch,
+		Tolerance: in.Tolerance,
+		Timeout:   in.Timeout,
+		Pause:     in.Pause,
+		Script:    in.Script,
+		Args:      in.Args,
+		CreateAt:  time.Now().Unix(),
+		CreateBy:  in.Creator,
+	}
+
+	if err = record.Add(ctx); err != nil {
+		logger.Errorf("event_callback_ibex: persist task_record fail: %v", err)
 	}
 }
+
+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
+	}
+
+	target, has := targetCache.Get(host)
+	if !has {
+		return false, nil
+	}
+
+	return target.GroupId == tpl.GroupId, nil
+}
+
+func TaskAdd(f models.TaskForm, authUser string, isCenter bool) (int64, error) {
+	hosts := cleanHosts(f.Hosts)
+	if len(hosts) == 0 {
+		return 0, fmt.Errorf("arg(hosts) empty")
+	}
+
+	taskMeta := &imodels.TaskMeta{
+		Title:     f.Title,
+		Account:   f.Account,
+		Batch:     f.Batch,
+		Tolerance: f.Tolerance,
+		Timeout:   f.Timeout,
+		Pause:     f.Pause,
+		Script:    f.Script,
+		Args:      f.Args,
+		Stdin:     f.Stdin,
+		Creator:   f.Creator,
+	}
+
+	err := taskMeta.CleanFields()
+	if err != nil {
+		return 0, err
+	}
+
+	taskMeta.HandleFH(hosts[0])
+
+	// 任务类型分为"告警规则触发"和"n9e center用户下发"两种；
+	// 边缘机房"告警规则触发"的任务不需要规划，并且它可能是失联的，无法使用db资源，所以放入redis缓存中，直接下发给agentd执行
+	if !isCenter && f.AlertTriggered {
+		if err := taskMeta.Create(); err != nil {
+			// 当网络不连通时，生成唯一的id，防止边缘机房中不同任务的id相同；
+			// 方法是，redis自增id去防止同一个机房的不同n9e edge生成的id相同；
+			// 但没法防止不同边缘机房生成同样的id，所以，生成id的数据不会上报存入数据库，只用于闭环执行。
+			taskMeta.Id, err = storage.IdGet()
+			if err != nil {
+				return 0, err
+			}
+		}
+
+		taskHost := imodels.TaskHost{
+			Id:     taskMeta.Id,
+			Host:   hosts[0],
+			Status: "running",
+		}
+		if err = taskHost.Create(); err != nil {
+			logger.Warningf("task_add_fail: authUser=%s title=%s err=%s", authUser, taskMeta.Title, err.Error())
+		}
+
+		// 缓存任务元信息和待下发的任务
+		err = taskMeta.Cache(hosts[0])
+		if err != nil {
+			return 0, err
+		}
+
+	} else {
+		// 如果是中心机房，还是保持之前的逻辑
+		err = taskMeta.Save(hosts, f.Action)
+		if err != nil {
+			return 0, err
+		}
+	}
+
+	logger.Infof("task_add_succ: authUser=%s title=%s", authUser, taskMeta.Title)
+	return taskMeta.Id, nil
+}
+
+func cleanHosts(formHosts []string) []string {
+	cnt := len(formHosts)
+	arr := make([]string, 0, cnt)
+	for i := 0; i < cnt; i++ {
+		item := strings.TrimSpace(formHosts[i])
+		if item == "" {
+			continue
+		}
+
+		if strings.HasPrefix(item, "#") {
+			continue
+		}
+
+		arr = append(arr, item)
+	}
+
+	return arr
+}
--- a/alert/sender/dingtalk.go
+++ b/alert/sender/dingtalk.go
@@ -3,8 +3,13 @@ package sender
 import (
 	"html/template"
 	"strings"
+	"time"

+	"github.com/ccfos/nightingale/v6/alert/astats"
 	"github.com/ccfos/nightingale/v6/models"
+	"github.com/ccfos/nightingale/v6/pkg/poster"
+
+	"github.com/toolkits/pkg/logger"
 )

 type dingtalkMarkdown struct {
@@ -23,10 +28,6 @@ type dingtalk struct {
 	At       dingtalkAt       `json:"at"`
 }

-var (
-	_ CallBacker = (*DingtalkSender)(nil)
-)
-
 type DingtalkSender struct {
 	tpl *template.Template
 }
@@ -36,13 +37,13 @@ func (ds *DingtalkSender) Send(ctx MessageContext) {
 		return
 	}

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

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

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

-func (ds *DingtalkSender) CallBack(ctx CallBackContext) {
-	if len(ctx.Events) == 0 || len(ctx.CallBackURL) == 0 {
-		return
-	}
-
-	body := dingtalk{
-		Msgtype: "markdown",
-		Markdown: dingtalkMarkdown{
-			Title: ctx.Events[0].RuleName,
-		},
-	}
-
-	ats := ExtractAtsParams(ctx.CallBackURL)
-	message := BuildTplMessage(models.Dingtalk, ds.tpl, ctx.Events)
-
-	if len(ats) > 0 {
-		body.Markdown.Text = message + "\n@" + strings.Join(ats, "@")
-		body.At = dingtalkAt{
-			AtMobiles: ats,
-			IsAtAll:   false,
-		}
-	} else {
-		// NoAt in url
-		body.Markdown.Text = message
-	}
-
-	doSendAndRecord(ctx.Ctx, ctx.CallBackURL, ctx.CallBackURL, body,
-		"callback", ctx.Stats, ctx.Events[0])
-
-	ctx.Stats.AlertNotifyTotal.WithLabelValues("rule_callback").Inc()
-}
-
 // extract urls and ats from Users
-func (ds *DingtalkSender) extract(users []*models.User) ([]string, []string, []string) {
+func (ds *DingtalkSender) extract(users []*models.User) ([]string, []string) {
 	urls := make([]string, 0, len(users))
 	ats := make([]string, 0, len(users))
-	tokens := make([]string, 0, len(users))

 	for _, user := range users {
 		if user.Phone != "" {
@@ -119,8 +87,19 @@ func (ds *DingtalkSender) extract(users []*models.User) ([]string, []string, []s
 				url = "https://oapi.dingtalk.com/robot/send?access_token=" + token
 			}
 			urls = append(urls, url)
-			tokens = append(tokens, token)
 		}
 	}
-	return urls, ats, tokens
+	return urls, ats
+}
+
+func doSend(url string, body interface{}, channel string, stats *astats.Stats) {
+	stats.AlertNotifyTotal.WithLabelValues(channel).Inc()
+
+	res, code, err := poster.PostJSON(url, time.Second*5, body, 3)
+	if err != nil {
+		logger.Errorf("%s_sender: result=fail url=%s code=%d error=%v req:%v response=%s", channel, url, code, err, body, string(res))
+		stats.AlertNotifyErrorTotal.WithLabelValues(channel).Inc()
+	} else {
+		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
@@ -9,14 +9,13 @@ import (
 	"github.com/ccfos/nightingale/v6/alert/aconf"
 	"github.com/ccfos/nightingale/v6/memsto"
 	"github.com/ccfos/nightingale/v6/models"
-	"github.com/ccfos/nightingale/v6/pkg/ctx"

 	"github.com/toolkits/pkg/logger"

 	"gopkg.in/gomail.v2"
 )

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

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

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

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

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

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

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

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

 var mailQuit = make(chan struct{})

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

 var smtpConfig aconf.SMTPConfig

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

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

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

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

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

 			size++
--- a/alert/sender/feishu.go
+++ b/alert/sender/feishu.go
@@ -1,7 +1,6 @@
 package sender

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

@@ -23,49 +22,17 @@ type feishu struct {
 	At      feishuAt      `json:"at"`
 }

-var (
-	_ CallBacker = (*FeishuSender)(nil)
-)
-
 type FeishuSender struct {
 	tpl *template.Template
 }

-func (fs *FeishuSender) CallBack(ctx CallBackContext) {
-	if len(ctx.Events) == 0 || len(ctx.CallBackURL) == 0 {
-		return
-	}
-
-	ats := ExtractAtsParams(ctx.CallBackURL)
-	message := BuildTplMessage(models.Feishu, fs.tpl, ctx.Events)
-
-	if len(ats) > 0 {
-		atTags := ""
-		for _, at := range ats {
-			atTags += fmt.Sprintf("<at user_id=\"%s\"></at> ", at)
-		}
-		message = atTags + message
-	}
-
-	body := feishu{
-		Msgtype: "text",
-		Content: feishuContent{
-			Text: message,
-		},
-	}
-
-	doSendAndRecord(ctx.Ctx, ctx.CallBackURL, ctx.CallBackURL, body, "callback",
-		ctx.Stats, ctx.Events[0])
-	ctx.Stats.AlertNotifyTotal.WithLabelValues("rule_callback").Inc()
-}
-
 func (fs *FeishuSender) Send(ctx MessageContext) {
 	if len(ctx.Users) == 0 || len(ctx.Events) == 0 {
 		return
 	}
-	urls, ats, tokens := fs.extract(ctx.Users)
+	urls, ats := fs.extract(ctx.Users)
 	message := BuildTplMessage(models.Feishu, fs.tpl, ctx.Events)
-	for i, url := range urls {
+	for _, url := range urls {
 		body := feishu{
 			Msgtype: "text",
 			Content: feishuContent{
@@ -78,14 +45,13 @@ func (fs *FeishuSender) Send(ctx MessageContext) {
 				IsAtAll:   false,
 			}
 		}
-		doSendAndRecord(ctx.Ctx, url, tokens[i], body, models.Feishu, ctx.Stats, ctx.Events[0])
+		doSend(url, body, models.Feishu, ctx.Stats)
 	}
 }

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

 	for _, user := range users {
 		if user.Phone != "" {
@@ -97,8 +63,7 @@ func (fs *FeishuSender) extract(users []*models.User) ([]string, []string, []str
 				url = "https://open.feishu.cn/open-apis/bot/v2/hook/" + token
 			}
 			urls = append(urls, url)
-			tokens = append(tokens, token)
 		}
 	}
-	return urls, ats, tokens
+	return urls, ats
 }
--- a/alert/sender/feishucard.go
+++ b/alert/sender/feishucard.go
@@ -3,7 +3,6 @@ package sender
 import (
 	"fmt"
 	"html/template"
-	"net/url"
 	"strings"

 	"github.com/ccfos/nightingale/v6/models"
@@ -92,57 +91,11 @@ var (
 	}
 )

-func (fs *FeishuCardSender) CallBack(ctx CallBackContext) {
-	if len(ctx.Events) == 0 || len(ctx.CallBackURL) == 0 {
-		return
-	}
-
-	ats := ExtractAtsParams(ctx.CallBackURL)
-	message := BuildTplMessage(models.FeishuCard, fs.tpl, ctx.Events)
-
-	if len(ats) > 0 {
-		atTags := ""
-		for _, at := range ats {
-			if strings.Contains(at, "@") {
-				atTags += fmt.Sprintf("<at email=\"%s\" ></at>", at)
-			} else {
-				atTags += fmt.Sprintf("<at id=\"%s\" ></at>", at)
-			}
-		}
-		message = atTags + message
-	}
-
-	color := "red"
-	lowerUnicode := strings.ToLower(message)
-	if strings.Count(lowerUnicode, Recovered) > 0 && strings.Count(lowerUnicode, Triggered) > 0 {
-		color = "orange"
-	} else if strings.Count(lowerUnicode, Recovered) > 0 {
-		color = "green"
-	}
-
-	SendTitle := fmt.Sprintf("🔔 %s", ctx.Events[0].RuleName)
-	body.Card.Header.Title.Content = SendTitle
-	body.Card.Header.Template = color
-	body.Card.Elements[0].Text.Content = message
-	body.Card.Elements[2].Elements[0].Content = SendTitle
-
-	// This is to be compatible with the feishucard interface, if with query string parameters, the request will fail
-	// Remove query parameters from the URL,
-	parsedURL, err := url.Parse(ctx.CallBackURL)
-	if err != nil {
-		return
-	}
-	parsedURL.RawQuery = ""
-
-	doSendAndRecord(ctx.Ctx, parsedURL.String(), parsedURL.String(), body, "callback",
-		ctx.Stats, ctx.Events[0])
-}
-
 func (fs *FeishuCardSender) Send(ctx MessageContext) {
 	if len(ctx.Users) == 0 || len(ctx.Events) == 0 {
 		return
 	}
-	urls, tokens := fs.extract(ctx.Users)
+	urls, _ := fs.extract(ctx.Users)
 	message := BuildTplMessage(models.FeishuCard, fs.tpl, ctx.Events)
 	color := "red"
 	lowerUnicode := strings.ToLower(message)
@@ -157,15 +110,14 @@ func (fs *FeishuCardSender) Send(ctx MessageContext) {
 	body.Card.Header.Template = color
 	body.Card.Elements[0].Text.Content = message
 	body.Card.Elements[2].Elements[0].Content = SendTitle
-	for i, url := range urls {
-		doSendAndRecord(ctx.Ctx, url, tokens[i], body, models.FeishuCard,
-			ctx.Stats, ctx.Events[0])
+	for _, url := range urls {
+		doSend(url, body, models.FeishuCard, ctx.Stats)
 	}
 }

 func (fs *FeishuCardSender) extract(users []*models.User) ([]string, []string) {
 	urls := make([]string, 0, len(users))
-	tokens := make([]string, 0, len(users))
+	ats := make([]string, 0)
 	for i := range users {
 		if token, has := users[i].ExtractToken(models.FeishuCard); has {
 			url := token
@@ -173,8 +125,7 @@ func (fs *FeishuCardSender) extract(users []*models.User) ([]string, []string) {
 				url = "https://open.feishu.cn/open-apis/bot/v2/hook/" + strings.TrimSpace(token)
 			}
 			urls = append(urls, url)
-			tokens = append(tokens, token)
 		}
 	}
-	return urls, tokens
+	return urls, ats
 }
--- a/alert/sender/ibex.go
+++ b/alert/sender/ibex.go
@@ -1,270 +0,0 @@
-// @Author: Ciusyan 6/5/24
-
-package sender
-
-import (
-	"encoding/json"
-	"fmt"
-	"strconv"
-	"strings"
-	"time"
-
-	"github.com/ccfos/nightingale/v6/memsto"
-	"github.com/ccfos/nightingale/v6/models"
-	"github.com/ccfos/nightingale/v6/pkg/ctx"
-	imodels "github.com/flashcatcloud/ibex/src/models"
-	"github.com/flashcatcloud/ibex/src/storage"
-
-	"github.com/toolkits/pkg/logger"
-)
-
-var (
-	_ CallBacker = (*IbexCallBacker)(nil)
-)
-
-type IbexCallBacker struct {
-	targetCache  *memsto.TargetCacheType
-	userCache    *memsto.UserCacheType
-	taskTplCache *memsto.TaskTplCache
-}
-
-func (c *IbexCallBacker) CallBack(ctx CallBackContext) {
-	if len(ctx.CallBackURL) == 0 || len(ctx.Events) == 0 {
-		return
-	}
-
-	event := ctx.Events[0]
-
-	if event.IsRecovered {
-		return
-	}
-
-	c.handleIbex(ctx.Ctx, ctx.CallBackURL, event)
-}
-
-func (c *IbexCallBacker) handleIbex(ctx *ctx.Context, url string, event *models.AlertCurEvent) {
-	if imodels.DB() == nil && ctx.IsCenter {
-		logger.Warning("event_callback_ibex: db is nil")
-		return
-	}
-
-	arr := strings.Split(url, "/")
-
-	var idstr string
-	var host string
-
-	if len(arr) > 1 {
-		idstr = arr[1]
-	}
-
-	if len(arr) > 2 {
-		host = arr[2]
-	}
-
-	id, err := strconv.ParseInt(idstr, 10, 64)
-	if err != nil {
-		logger.Errorf("event_callback_ibex: failed to parse url: %s", url)
-		return
-	}
-
-	if host == "" {
-		// 用户在callback url中没有传入host，就从event中解析
-		host = event.TargetIdent
-	}
-
-	if host == "" {
-		logger.Error("event_callback_ibex: failed to get host")
-		return
-	}
-
-	CallIbex(ctx, id, host, c.taskTplCache, c.targetCache, c.userCache, event)
-}
-
-func CallIbex(ctx *ctx.Context, id int64, host string,
-	taskTplCache *memsto.TaskTplCache, targetCache *memsto.TargetCacheType,
-	userCache *memsto.UserCacheType, event *models.AlertCurEvent) {
-	tpl := taskTplCache.Get(id)
-	if tpl == nil {
-		logger.Errorf("event_callback_ibex: no such tpl(%d)", id)
-		return
-	}
-	// check perm
-	// tpl.GroupId - host - account 三元组校验权限
-	can, err := canDoIbex(tpl.UpdateBy, tpl, host, targetCache, userCache)
-	if err != nil {
-		logger.Errorf("event_callback_ibex: check perm fail: %v", err)
-		return
-	}
-
-	if !can {
-		logger.Errorf("event_callback_ibex: user(%s) no permission", tpl.UpdateBy)
-		return
-	}
-
-	tagsMap := make(map[string]string)
-	for i := 0; i < len(event.TagsJSON); i++ {
-		pair := strings.TrimSpace(event.TagsJSON[i])
-		if pair == "" {
-			continue
-		}
-
-		arr := strings.Split(pair, "=")
-		if len(arr) != 2 {
-			continue
-		}
-
-		tagsMap[arr[0]] = arr[1]
-	}
-	// 附加告警级别  告警触发值标签
-	tagsMap["alert_severity"] = strconv.Itoa(event.Severity)
-	tagsMap["alert_trigger_value"] = event.TriggerValue
-
-	tags, err := json.Marshal(tagsMap)
-	if err != nil {
-		logger.Errorf("event_callback_ibex: failed to marshal tags to json: %v", tagsMap)
-		return
-	}
-
-	// call ibex
-	in := models.TaskForm{
-		Title:          tpl.Title + " FH: " + host,
-		Account:        tpl.Account,
-		Batch:          tpl.Batch,
-		Tolerance:      tpl.Tolerance,
-		Timeout:        tpl.Timeout,
-		Pause:          tpl.Pause,
-		Script:         tpl.Script,
-		Args:           tpl.Args,
-		Stdin:          string(tags),
-		Action:         "start",
-		Creator:        tpl.UpdateBy,
-		Hosts:          []string{host},
-		AlertTriggered: true,
-	}
-
-	id, err = TaskAdd(in, tpl.UpdateBy, ctx.IsCenter)
-	if err != nil {
-		logger.Errorf("event_callback_ibex: call ibex fail: %v", err)
-		return
-	}
-
-	// write db
-	record := models.TaskRecord{
-		Id:        id,
-		EventId:   event.Id,
-		GroupId:   tpl.GroupId,
-		Title:     in.Title,
-		Account:   in.Account,
-		Batch:     in.Batch,
-		Tolerance: in.Tolerance,
-		Timeout:   in.Timeout,
-		Pause:     in.Pause,
-		Script:    in.Script,
-		Args:      in.Args,
-		CreateAt:  time.Now().Unix(),
-		CreateBy:  in.Creator,
-	}
-
-	if err = record.Add(ctx); err != nil {
-		logger.Errorf("event_callback_ibex: persist task_record fail: %v", err)
-	}
-}
-
-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
-	}
-
-	target, has := targetCache.Get(host)
-	if !has {
-		return false, nil
-	}
-
-	return target.GroupId == tpl.GroupId, nil
-}
-
-func TaskAdd(f models.TaskForm, authUser string, isCenter bool) (int64, error) {
-	hosts := cleanHosts(f.Hosts)
-	if len(hosts) == 0 {
-		return 0, fmt.Errorf("arg(hosts) empty")
-	}
-
-	taskMeta := &imodels.TaskMeta{
-		Title:     f.Title,
-		Account:   f.Account,
-		Batch:     f.Batch,
-		Tolerance: f.Tolerance,
-		Timeout:   f.Timeout,
-		Pause:     f.Pause,
-		Script:    f.Script,
-		Args:      f.Args,
-		Stdin:     f.Stdin,
-		Creator:   f.Creator,
-	}
-
-	err := taskMeta.CleanFields()
-	if err != nil {
-		return 0, err
-	}
-
-	taskMeta.HandleFH(hosts[0])
-
-	// 任务类型分为"告警规则触发"和"n9e center用户下发"两种；
-	// 边缘机房"告警规则触发"的任务不需要规划，并且它可能是失联的，无法使用db资源，所以放入redis缓存中，直接下发给agentd执行
-	if !isCenter && f.AlertTriggered {
-		if err := taskMeta.Create(); err != nil {
-			// 当网络不连通时，生成唯一的id，防止边缘机房中不同任务的id相同；
-			// 方法是，redis自增id去防止同一个机房的不同n9e edge生成的id相同；
-			// 但没法防止不同边缘机房生成同样的id，所以，生成id的数据不会上报存入数据库，只用于闭环执行。
-			taskMeta.Id, err = storage.IdGet()
-			if err != nil {
-				return 0, err
-			}
-		}
-
-		taskHost := imodels.TaskHost{
-			Id:     taskMeta.Id,
-			Host:   hosts[0],
-			Status: "running",
-		}
-		if err = taskHost.Create(); err != nil {
-			logger.Warningf("task_add_fail: authUser=%s title=%s err=%s", authUser, taskMeta.Title, err.Error())
-		}
-
-		// 缓存任务元信息和待下发的任务
-		err = taskMeta.Cache(hosts[0])
-		if err != nil {
-			return 0, err
-		}
-
-	} else {
-		// 如果是中心机房，还是保持之前的逻辑
-		err = taskMeta.Save(hosts, f.Action)
-		if err != nil {
-			return 0, err
-		}
-	}
-
-	logger.Infof("task_add_succ: authUser=%s title=%s", authUser, taskMeta.Title)
-	return taskMeta.Id, nil
-}
-
-func cleanHosts(formHosts []string) []string {
-	cnt := len(formHosts)
-	arr := make([]string, 0, cnt)
-	for i := 0; i < cnt; i++ {
-		item := strings.TrimSpace(formHosts[i])
-		if item == "" {
-			continue
-		}
-
-		if strings.HasPrefix(item, "#") {
-			continue
-		}
-
-		arr = append(arr, item)
-	}
-
-	return arr
-}
--- a/alert/sender/lark.go
+++ b/alert/sender/lark.go
@@ -1,65 +0,0 @@
-package sender
-
-import (
-	"html/template"
-	"strings"
-
-	"github.com/ccfos/nightingale/v6/models"
-)
-
-var (
-	_ CallBacker = (*LarkSender)(nil)
-)
-
-type LarkSender struct {
-	tpl *template.Template
-}
-
-func (lk *LarkSender) CallBack(ctx CallBackContext) {
-	if len(ctx.Events) == 0 || len(ctx.CallBackURL) == 0 {
-		return
-	}
-
-	body := feishu{
-		Msgtype: "text",
-		Content: feishuContent{
-			Text: BuildTplMessage(models.Lark, lk.tpl, ctx.Events),
-		},
-	}
-
-	doSendAndRecord(ctx.Ctx, ctx.CallBackURL, ctx.CallBackURL, body, "callback",
-		ctx.Stats, ctx.Events[0])
-	ctx.Stats.AlertNotifyTotal.WithLabelValues("rule_callback").Inc()
-}
-
-func (lk *LarkSender) Send(ctx MessageContext) {
-	if len(ctx.Users) == 0 || len(ctx.Events) == 0 {
-		return
-	}
-	urls := lk.extract(ctx.Users)
-	message := BuildTplMessage(models.Lark, lk.tpl, ctx.Events)
-	for _, url := range urls {
-		body := feishu{
-			Msgtype: "text",
-			Content: feishuContent{
-				Text: message,
-			},
-		}
-		doSend(url, body, models.Lark, ctx.Stats)
-	}
-}
-
-func (lk *LarkSender) extract(users []*models.User) []string {
-	urls := make([]string, 0, len(users))
-
-	for _, user := range users {
-		if token, has := user.ExtractToken(models.Lark); has {
-			url := token
-			if !strings.HasPrefix(token, "https://") && !strings.HasPrefix(token, "http://") {
-				url = "https://open.larksuite.com/open-apis/bot/v2/hook/" + token
-			}
-			urls = append(urls, url)
-		}
-	}
-	return urls
-}
--- a/alert/sender/larkcard.go
+++ b/alert/sender/larkcard.go
@@ -1,99 +0,0 @@
-package sender
-
-import (
-	"fmt"
-	"html/template"
-	"net/url"
-	"strings"
-
-	"github.com/ccfos/nightingale/v6/models"
-)
-
-type LarkCardSender struct {
-	tpl *template.Template
-}
-
-func (fs *LarkCardSender) CallBack(ctx CallBackContext) {
-	if len(ctx.Events) == 0 || len(ctx.CallBackURL) == 0 {
-		return
-	}
-
-	ats := ExtractAtsParams(ctx.CallBackURL)
-	message := BuildTplMessage(models.LarkCard, fs.tpl, ctx.Events)
-
-	if len(ats) > 0 {
-		atTags := ""
-		for _, at := range ats {
-			if strings.Contains(at, "@") {
-				atTags += fmt.Sprintf("<at email=\"%s\" ></at>", at)
-			} else {
-				atTags += fmt.Sprintf("<at id=\"%s\" ></at>", at)
-			}
-		}
-		message = atTags + message
-	}
-
-	color := "red"
-	lowerUnicode := strings.ToLower(message)
-	if strings.Count(lowerUnicode, Recovered) > 0 && strings.Count(lowerUnicode, Triggered) > 0 {
-		color = "orange"
-	} else if strings.Count(lowerUnicode, Recovered) > 0 {
-		color = "green"
-	}
-
-	SendTitle := fmt.Sprintf("🔔 %s", ctx.Events[0].RuleName)
-	body.Card.Header.Title.Content = SendTitle
-	body.Card.Header.Template = color
-	body.Card.Elements[0].Text.Content = message
-	body.Card.Elements[2].Elements[0].Content = SendTitle
-
-	// This is to be compatible with the Larkcard interface, if with query string parameters, the request will fail
-	// Remove query parameters from the URL,
-	parsedURL, err := url.Parse(ctx.CallBackURL)
-	if err != nil {
-		return
-	}
-	parsedURL.RawQuery = ""
-
-	doSendAndRecord(ctx.Ctx, ctx.CallBackURL, ctx.CallBackURL, body, "callback",
-		ctx.Stats, ctx.Events[0])
-}
-
-func (fs *LarkCardSender) Send(ctx MessageContext) {
-	if len(ctx.Users) == 0 || len(ctx.Events) == 0 {
-		return
-	}
-	urls, _ := fs.extract(ctx.Users)
-	message := BuildTplMessage(models.LarkCard, fs.tpl, ctx.Events)
-	color := "red"
-	lowerUnicode := strings.ToLower(message)
-	if strings.Count(lowerUnicode, Recovered) > 0 && strings.Count(lowerUnicode, Triggered) > 0 {
-		color = "orange"
-	} else if strings.Count(lowerUnicode, Recovered) > 0 {
-		color = "green"
-	}
-
-	SendTitle := fmt.Sprintf("🔔 %s", ctx.Events[0].RuleName)
-	body.Card.Header.Title.Content = SendTitle
-	body.Card.Header.Template = color
-	body.Card.Elements[0].Text.Content = message
-	body.Card.Elements[2].Elements[0].Content = SendTitle
-	for _, url := range urls {
-		doSend(url, body, models.LarkCard, ctx.Stats)
-	}
-}
-
-func (fs *LarkCardSender) extract(users []*models.User) ([]string, []string) {
-	urls := make([]string, 0, len(users))
-	ats := make([]string, 0)
-	for i := range users {
-		if token, has := users[i].ExtractToken(models.Lark); has {
-			url := token
-			if !strings.HasPrefix(token, "https://") && !strings.HasPrefix(token, "http://") {
-				url = "https://open.larksuite.com/open-apis/bot/v2/hook/" + strings.TrimSpace(token)
-			}
-			urls = append(urls, url)
-		}
-	}
-	return urls, ats
-}
--- a/alert/sender/mm.go
+++ b/alert/sender/mm.go
@@ -7,7 +7,6 @@ import (

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

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

-	SendMM(ctx.Ctx, MatterMostMessage{
+	SendMM(MatterMostMessage{
 		Text:   message,
 		Tokens: urls,
 		Stats:  ctx.Stats,
-	}, ctx.Events[0])
-}
-
-func (ms *MmSender) CallBack(ctx CallBackContext) {
-	if len(ctx.Events) == 0 || len(ctx.CallBackURL) == 0 {
-		return
-	}
-	message := BuildTplMessage(models.Mm, ms.tpl, ctx.Events)
-
-	SendMM(ctx.Ctx, MatterMostMessage{
-		Text:   message,
-		Tokens: []string{ctx.CallBackURL},
-		Stats:  ctx.Stats,
-	}, ctx.Events[0])
-
-	ctx.Stats.AlertNotifyTotal.WithLabelValues("rule_callback").Inc()
+	})
 }

 func (ms *MmSender) extract(users []*models.User) []string {
@@ -71,7 +55,7 @@ func (ms *MmSender) extract(users []*models.User) []string {
 	return tokens
 }

-func SendMM(ctx *ctx.Context, message MatterMostMessage, event *models.AlertCurEvent) {
+func SendMM(message MatterMostMessage) {
 	for i := 0; i < len(message.Tokens); i++ {
 		u, err := url.Parse(message.Tokens[i])
 		if err != nil {
@@ -104,7 +88,7 @@ func SendMM(ctx *ctx.Context, message MatterMostMessage, event *models.AlertCurE
 				Username: username,
 				Text:     txt + message.Text,
 			}
-			doSendAndRecord(ctx, ur, message.Tokens[i], body, models.Mm, message.Stats, event)
+			doSend(ur, body, models.Mm, message.Stats)
 		}
 	}
 }
--- a/alert/sender/plugin.go
+++ b/alert/sender/plugin.go
@@ -2,30 +2,26 @@ package sender

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

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

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

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

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

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

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

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

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

@@ -43,23 +41,17 @@ func NewSender(key string, tpls map[string]*template.Template, smtp ...aconf.SMT
 		return &MmSender{tpl: tpls[models.Mm]}
 	case models.Telegram:
 		return &TelegramSender{tpl: tpls[models.Telegram]}
-	case models.Lark:
-		return &LarkSender{tpl: tpls[models.Lark]}
-	case models.LarkCard:
-		return &LarkCardSender{tpl: tpls[models.LarkCard]}
 	}
 	return nil
 }

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

--- a/alert/sender/telegram.go
+++ b/alert/sender/telegram.go
@@ -6,7 +6,6 @@ import (

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

 	"github.com/toolkits/pkg/logger"
 )
@@ -22,29 +21,10 @@ type telegram struct {
 	Text      string `json:"text"`
 }

-var (
-	_ CallBacker = (*TelegramSender)(nil)
-)
-
 type TelegramSender struct {
 	tpl *template.Template
 }

-func (ts *TelegramSender) CallBack(ctx CallBackContext) {
-	if len(ctx.Events) == 0 || len(ctx.CallBackURL) == 0 {
-		return
-	}
-
-	message := BuildTplMessage(models.Telegram, ts.tpl, ctx.Events)
-	SendTelegram(ctx.Ctx, TelegramMessage{
-		Text:   message,
-		Tokens: []string{ctx.CallBackURL},
-		Stats:  ctx.Stats,
-	}, ctx.Events[0])
-
-	ctx.Stats.AlertNotifyTotal.WithLabelValues("rule_callback").Inc()
-}
-
 func (ts *TelegramSender) Send(ctx MessageContext) {
 	if len(ctx.Users) == 0 || len(ctx.Events) == 0 {
 		return
@@ -52,11 +32,11 @@ func (ts *TelegramSender) Send(ctx MessageContext) {
 	tokens := ts.extract(ctx.Users)
 	message := BuildTplMessage(models.Telegram, ts.tpl, ctx.Events)

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

 func (ts *TelegramSender) extract(users []*models.User) []string {
@@ -69,7 +49,7 @@ func (ts *TelegramSender) extract(users []*models.User) []string {
 	return tokens
 }

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

-		doSendAndRecord(ctx, url, message.Tokens[i], body, models.Telegram, message.Stats, event)
+		doSend(url, body, models.Telegram, message.Stats)
 	}
 }
--- a/alert/sender/webhook.go
+++ b/alert/sender/webhook.go
@@ -2,184 +2,70 @@ package sender

 import (
 	"bytes"
-	"crypto/tls"
 	"encoding/json"
-	"fmt"
 	"io"
 	"net/http"
-	"sync"
 	"time"

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

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

-func sendWebhook(webhook *models.Webhook, event interface{}, stats *astats.Stats) (bool, string, error) {
-	channel := "webhook"
-	if webhook.Type == models.RuleCallback {
-		channel = "callback"
-	}
-
-	conf := webhook
-	if conf.Url == "" || !conf.Enable {
-		return false, "", nil
-	}
-	bs, err := json.Marshal(event)
-	if err != nil {
-		logger.Errorf("%s alertingWebhook failed to marshal event:%+v err:%v", channel, event, err)
-		return false, "", err
-	}
-
-	bf := bytes.NewBuffer(bs)
-
-	req, err := http.NewRequest("POST", conf.Url, bf)
-	if err != nil {
-		logger.Warningf("%s alertingWebhook failed to new reques event:%s err:%v", channel, string(bs), err)
-		return true, "", err
-	}
-
-	req.Header.Set("Content-Type", "application/json")
-	if conf.BasicAuthUser != "" && conf.BasicAuthPass != "" {
-		req.SetBasicAuth(conf.BasicAuthUser, conf.BasicAuthPass)
-	}
-
-	if len(conf.Headers) > 0 && len(conf.Headers)%2 == 0 {
-		for i := 0; i < len(conf.Headers); i += 2 {
-			if conf.Headers[i] == "host" || conf.Headers[i] == "Host" {
-				req.Host = conf.Headers[i+1]
-				continue
-			}
-			req.Header.Set(conf.Headers[i], conf.Headers[i+1])
-		}
-	}
-	insecureSkipVerify := false
-	if webhook != nil {
-		insecureSkipVerify = webhook.SkipVerify
-	}
-	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)
-
-	if err != nil {
-		stats.AlertNotifyErrorTotal.WithLabelValues(channel).Inc()
-		logger.Errorf("event_%s_fail, event:%s, url: [%s], error: [%s]", channel, string(bs), conf.Url, err)
-		return true, "", err
-	}
-
-	if resp.Body != nil {
-		defer resp.Body.Close()
-		body, _ = io.ReadAll(resp.Body)
-	}
-
-	if resp.StatusCode == 429 {
-		logger.Errorf("event_%s_fail, url: %s, response code: %d, body: %s event:%s", channel, conf.Url, resp.StatusCode, string(body), string(bs))
-		return true, string(body), fmt.Errorf("status code is 429")
-	}
-
-	logger.Debugf("event_%s_succ, url: %s, response code: %d, body: %s event:%s", channel, conf.Url, resp.StatusCode, string(body), string(bs))
-	return false, string(body), nil
-}
-
-func SingleSendWebhooks(ctx *ctx.Context, webhooks []*models.Webhook, event *models.AlertCurEvent, stats *astats.Stats) {
+func SendWebhooks(webhooks []*models.Webhook, event *models.AlertCurEvent, stats *astats.Stats) {
 	for _, conf := range webhooks {
-		retryCount := 0
-		for retryCount < 3 {
-			needRetry, res, err := sendWebhook(conf, event, stats)
-			NotifyRecord(ctx, event, "webhook", conf.Url, res, err)
-			if !needRetry {
-				break
-			}
-			retryCount++
-			time.Sleep(time.Minute * 1 * time.Duration(retryCount))
+		if conf.Url == "" || !conf.Enable {
+			continue
 		}
-	}
-}
-
-func BatchSendWebhooks(ctx *ctx.Context, webhooks []*models.Webhook, event *models.AlertCurEvent, stats *astats.Stats) {
-	for _, conf := range webhooks {
-		logger.Infof("push event:%+v to queue:%v", event, conf)
-		PushEvent(ctx, conf, event, stats)
-	}
-}
-
-var EventQueue = make(map[string]*WebhookQueue)
-var CallbackEventQueue = make(map[string]*WebhookQueue)
-var CallbackEventQueueLock sync.RWMutex
-var EventQueueLock sync.RWMutex
-
-const QueueMaxSize = 100000
-
-type WebhookQueue struct {
-	list    *SafeListLimited
-	closeCh chan struct{}
-}
-
-func PushEvent(ctx *ctx.Context, webhook *models.Webhook, event *models.AlertCurEvent, stats *astats.Stats) {
-	EventQueueLock.RLock()
-	queue := EventQueue[webhook.Url]
-	EventQueueLock.RUnlock()
-
-	if queue == nil {
-		queue = &WebhookQueue{
-			list:    NewSafeListLimited(QueueMaxSize),
-			closeCh: make(chan struct{}),
+		bs, err := json.Marshal(event)
+		if err != nil {
+			continue
 		}

-		EventQueueLock.Lock()
-		EventQueue[webhook.Url] = queue
-		EventQueueLock.Unlock()
+		bf := bytes.NewBuffer(bs)

-		StartConsumer(ctx, queue, webhook.Batch, webhook, stats)
-	}
+		req, err := http.NewRequest("POST", conf.Url, bf)
+		if err != nil {
+			logger.Warning("alertingWebhook failed to new request", err)
+			continue
+		}

-	succ := queue.list.PushFront(event)
-	if !succ {
-		stats.AlertNotifyErrorTotal.WithLabelValues("push_event_queue").Inc()
-		logger.Warningf("Write channel(%s) full, current channel size: %d event:%v", webhook.Url, queue.list.Len(), event)
-	}
-}
+		req.Header.Set("Content-Type", "application/json")
+		if conf.BasicAuthUser != "" && conf.BasicAuthPass != "" {
+			req.SetBasicAuth(conf.BasicAuthUser, conf.BasicAuthPass)
+		}

-func StartConsumer(ctx *ctx.Context, queue *WebhookQueue, popSize int, webhook *models.Webhook, stats *astats.Stats) {
-	for {
-		select {
-		case <-queue.closeCh:
-			logger.Infof("event queue:%v closed", queue)
-			return
-		default:
-			events := queue.list.PopBack(popSize)
-			if len(events) == 0 {
-				time.Sleep(time.Millisecond * 400)
-				continue
-			}
-
-			retryCount := 0
-			for retryCount < webhook.RetryCount {
-				needRetry, res, err := sendWebhook(webhook, events, stats)
-				if !needRetry {
-					break
+		if len(conf.Headers) > 0 && len(conf.Headers)%2 == 0 {
+			for i := 0; i < len(conf.Headers); i += 2 {
+				if conf.Headers[i] == "host" || conf.Headers[i] == "Host" {
+					req.Host = conf.Headers[i+1]
+					continue
 				}
-				go RecordEvents(ctx, webhook, events, stats, res, err)
-				retryCount++
-				time.Sleep(time.Second * time.Duration(webhook.RetryInterval) * time.Duration(retryCount))
+				req.Header.Set(conf.Headers[i], conf.Headers[i+1])
 			}
 		}
-	}
-}

-func RecordEvents(ctx *ctx.Context, webhook *models.Webhook, events []*models.AlertCurEvent, stats *astats.Stats, res string, err error) {
-	for _, event := range events {
-		time.Sleep(time.Millisecond * 10)
-		NotifyRecord(ctx, event, "webhook", webhook.Url, res, err)
+		// todo add skip verify
+		client := http.Client{
+			Timeout: time.Duration(conf.Timeout) * time.Second,
+		}
+
+		stats.AlertNotifyTotal.WithLabelValues("webhook").Inc()
+		var resp *http.Response
+		resp, err = client.Do(req)
+		if err != nil {
+			stats.AlertNotifyErrorTotal.WithLabelValues("webhook").Inc()
+			logger.Errorf("event_webhook_fail, ruleId: [%d], eventId: [%d], url: [%s], error: [%s]", event.RuleId, event.Id, conf.Url, err)
+			continue
+		}
+
+		var body []byte
+		if resp.Body != nil {
+			defer resp.Body.Close()
+			body, _ = io.ReadAll(resp.Body)
+		}
+
+		logger.Debugf("event_webhook_succ, url: %s, response code: %d, body: %s event:%+v", conf.Url, resp.StatusCode, string(body), event)
 	}
 }
--- a/alert/sender/webhook_queue.go
+++ b/alert/sender/webhook_queue.go
@@ -1,111 +0,0 @@
-package sender
-
-import (
-	"container/list"
-	"sync"
-
-	"github.com/ccfos/nightingale/v6/models"
-)
-
-type SafeList struct {
-	sync.RWMutex
-	L *list.List
-}
-
-func NewSafeList() *SafeList {
-	return &SafeList{L: list.New()}
-}
-
-func (sl *SafeList) PushFront(v interface{}) *list.Element {
-	sl.Lock()
-	e := sl.L.PushFront(v)
-	sl.Unlock()
-	return e
-}
-
-func (sl *SafeList) PushFrontBatch(vs []interface{}) {
-	sl.Lock()
-	for _, item := range vs {
-		sl.L.PushFront(item)
-	}
-	sl.Unlock()
-}
-
-func (sl *SafeList) PopBack(max int) []*models.AlertCurEvent {
-	sl.Lock()
-
-	count := sl.L.Len()
-	if count == 0 {
-		sl.Unlock()
-		return []*models.AlertCurEvent{}
-	}
-
-	if count > max {
-		count = max
-	}
-
-	items := make([]*models.AlertCurEvent, 0, count)
-	for i := 0; i < count; i++ {
-		item := sl.L.Remove(sl.L.Back())
-		sample, ok := item.(*models.AlertCurEvent)
-		if ok {
-			items = append(items, sample)
-		}
-	}
-
-	sl.Unlock()
-	return items
-}
-
-func (sl *SafeList) RemoveAll() {
-	sl.Lock()
-	sl.L.Init()
-	sl.Unlock()
-}
-
-func (sl *SafeList) Len() int {
-	sl.RLock()
-	size := sl.L.Len()
-	sl.RUnlock()
-	return size
-}
-
-// SafeList with Limited Size
-type SafeListLimited struct {
-	maxSize int
-	SL      *SafeList
-}
-
-func NewSafeListLimited(maxSize int) *SafeListLimited {
-	return &SafeListLimited{SL: NewSafeList(), maxSize: maxSize}
-}
-
-func (sll *SafeListLimited) PopBack(max int) []*models.AlertCurEvent {
-	return sll.SL.PopBack(max)
-}
-
-func (sll *SafeListLimited) PushFront(v interface{}) bool {
-	if sll.SL.Len() >= sll.maxSize {
-		return false
-	}
-
-	sll.SL.PushFront(v)
-	return true
-}
-
-func (sll *SafeListLimited) PushFrontBatch(vs []interface{}) bool {
-	if sll.SL.Len() >= sll.maxSize {
-		return false
-	}
-
-	sll.SL.PushFrontBatch(vs)
-	return true
-}
-
-func (sll *SafeListLimited) RemoveAll() {
-	sll.SL.RemoveAll()
-}
-
-func (sll *SafeListLimited) Len() int {
-	return sll.SL.Len()
-}
--- a/alert/sender/wecom.go
+++ b/alert/sender/wecom.go
@@ -16,52 +16,29 @@ type wecom struct {
 	Markdown wecomMarkdown `json:"markdown"`
 }

-var (
-	_ CallBacker = (*WecomSender)(nil)
-)
-
 type WecomSender struct {
 	tpl *template.Template
 }

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

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

 type Plugin struct {
--- a/center/cconf/metric.go
+++ b/center/cconf/metric.go
@@ -18,28 +18,20 @@ var MetricDesc MetricDescType
 // GetMetricDesc , if metric is not registered, empty string will be returned
 func GetMetricDesc(lang, metric string) string {
 	var m map[string]string
-
-	switch lang {
-	case "en":
-		m = MetricDesc.En
-	default:
+	if lang == "zh" {
 		m = MetricDesc.Zh
+	} else {
+		m = MetricDesc.En
 	}
-
 	if m != nil {
-		if desc, ok := m[metric]; ok {
+		if desc, has := m[metric]; has {
 			return desc
 		}
 	}

-	if MetricDesc.CommonDesc != nil {
-		if desc, ok := MetricDesc.CommonDesc[metric]; ok {
-			return desc
-		}
-	}
-
-	return ""
+	return MetricDesc.CommonDesc[metric]
 }
+
 func LoadMetricsYaml(configDir, metricsYamlFile string) error {
 	fp := metricsYamlFile
 	if fp == "" {
--- a/center/cconf/ops.go
+++ b/center/cconf/ops.go
@@ -76,9 +76,7 @@ ops:
    - "/dashboards/add"
    - "/dashboards/put"
    - "/dashboards/del"
-    - "/embedded-dashboards/put"
-    - "/embedded-dashboards"
-    - "/public-dashboards"
+    - "/dashboards-built-in"

 - name: alert
  cname: 告警规则
@@ -87,7 +85,7 @@ ops:
    - "/alert-rules/add"
    - "/alert-rules/put"
    - "/alert-rules/del"
-
+    - "/alert-rules-built-in"
 - name: alert-mutes
  cname: 告警静默管理
  ops:
@@ -182,14 +180,6 @@ ops:
    - "/builtin-metrics/put"
    - "/builtin-metrics/del"

- name: built-in-components
-  cname: 模版中心
-  ops:
-    - "/built-in-components"
-    - "/built-in-components/add"
-    - "/built-in-components/put"
-    - "/built-in-components/del"
-
 - name: system
  cname: 系统信息
  ops:
--- a/center/center.go
+++ b/center/center.go
@@ -16,7 +16,6 @@ import (
 	centerrt "github.com/ccfos/nightingale/v6/center/router"
 	"github.com/ccfos/nightingale/v6/center/sso"
 	"github.com/ccfos/nightingale/v6/conf"
-	"github.com/ccfos/nightingale/v6/cron"
 	"github.com/ccfos/nightingale/v6/dumper"
 	"github.com/ccfos/nightingale/v6/memsto"
 	"github.com/ccfos/nightingale/v6/models"
@@ -65,8 +64,6 @@ func Initialize(configDir string, cryptoKey string) (func(), error) {
 	migrate.Migrate(db)
 	models.InitRoot(ctx)

-	config.HTTP.JWTAuth.SigningKey = models.InitJWTSigningKey(ctx)
-
 	err = rsa.InitRSAConfig(ctx, &config.HTTP.RSA)
 	if err != nil {
 		return nil, err
@@ -107,10 +104,8 @@ func Initialize(configDir string, cryptoKey string) (func(), error) {

 	go version.GetGithubVersion()

-	go cron.CleanNotifyRecord(ctx, config.Center.CleanNotifyRecordDay)
-
 	alertrtRouter := alertrt.New(config.HTTP, config.Alert, alertMuteCache, targetCache, busiGroupCache, alertStats, ctx, externalProcessors)
-	centerRouter := centerrt.New(config.HTTP, config.Center, config.Alert, config.Ibex, cconf.Operations, dsCache, notifyConfigCache, promClients, tdengineClients,
+	centerRouter := centerrt.New(config.HTTP, config.Center, config.Alert, cconf.Operations, dsCache, notifyConfigCache, promClients, tdengineClients,
 		redis, sso, ctx, metas, idents, targetCache, userCache, userGroupCache)
 	pushgwRouter := pushgwrt.New(config.HTTP, config.Pushgw, config.Alert, targetCache, busiGroupCache, idents, metas, writers, ctx)

--- a/center/integration/init.go
+++ b/center/integration/init.go
@@ -4,24 +4,16 @@ import (
 	"encoding/json"
 	"path"
 	"strings"
-	"time"

 	"github.com/ccfos/nightingale/v6/models"
 	"github.com/ccfos/nightingale/v6/pkg/ctx"
 	"github.com/toolkits/pkg/file"
+	"github.com/toolkits/pkg/ginx"
 	"github.com/toolkits/pkg/logger"
 	"github.com/toolkits/pkg/runner"
 )

-const SYSTEM = "system"
-
 func Init(ctx *ctx.Context, builtinIntegrationsDir string) {
-	err := models.InitBuiltinPayloads(ctx)
-	if err != nil {
-		logger.Warning("init old builtinPayloads fail ", err)
-		return
-	}
-
 	fp := builtinIntegrationsDir
 	if fp == "" {
 		fp = path.Join(runner.Cwd, "integrations")
@@ -29,10 +21,7 @@ func Init(ctx *ctx.Context, builtinIntegrationsDir string) {

 	// var fileList []string
 	dirList, err := file.DirsUnder(fp)
-	if err != nil {
-		logger.Warning("read builtin component dir fail ", err)
-		return
-	}
+	ginx.Dangerous(err)

 	for _, dir := range dirList {
 		// components icon
@@ -56,8 +45,7 @@ func Init(ctx *ctx.Context, builtinIntegrationsDir string) {
 			var readmeFile string
 			for _, file := range files {
 				if strings.HasSuffix(strings.ToLower(file), "md") {
-					readmeFile = componentDir + "/markdown/" + file
-					break
+					readmeFile = file
 				}
 			}
 			if readmeFile != "" {
@@ -69,48 +57,11 @@ func Init(ctx *ctx.Context, builtinIntegrationsDir string) {

 		exists, _ := models.BuiltinComponentExists(ctx, &component)
 		if !exists {
-			err = component.Add(ctx, SYSTEM)
+			err = component.Add(ctx, "system")
 			if err != nil {
 				logger.Warning("add builtin component fail ", component, err)
 				continue
 			}
-		} else {
-			old, err := models.BuiltinComponentGet(ctx, "ident = ?", component.Ident)
-			if err != nil {
-				logger.Warning("get builtin component fail ", component, err)
-				continue
-			}
-
-			if old == nil {
-				logger.Warning("get builtin component nil ", component)
-				continue
-			}
-
-			if old.UpdatedBy == SYSTEM {
-				now := time.Now().Unix()
-				old.CreatedAt = now
-				old.UpdatedAt = now
-				old.Readme = component.Readme
-				old.UpdatedBy = SYSTEM
-
-				err = models.DB(ctx).Model(old).Select("*").Updates(old).Error
-				if err != nil {
-					logger.Warning("update builtin component fail ", old, err)
-				}
-			}
-			component.ID = old.ID
-		}
-
-		// 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 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)
 		}

 		// alerts
@@ -131,15 +82,7 @@ func Init(ctx *ctx.Context, builtinIntegrationsDir string) {
 					continue
 				}

-				newAlerts := []models.AlertRule{}
-				writeAlertFileFlag := false
 				for _, alert := range alerts {
-					if alert.UUID == 0 {
-						writeAlertFileFlag = true
-						alert.UUID = time.Now().UnixNano()
-					}
-
-					newAlerts = append(newAlerts, alert)
 					content, err := json.Marshal(alert)
 					if err != nil {
 						logger.Warning("marshal builtin alert fail ", alert, err)
@@ -148,54 +91,29 @@ func Init(ctx *ctx.Context, builtinIntegrationsDir string) {

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

-					old, err := models.BuiltinPayloadGet(ctx, "uuid = ?", alert.UUID)
+					exists, err := models.BuiltinPayloadExists(ctx, &builtinAlert)
 					if err != nil {
-						logger.Warning("get builtin alert fail ", builtinAlert, err)
+						logger.Warning("check builtin alert exists fail ", builtinAlert, err)
 						continue
 					}

-					if old == nil {
-						err := builtinAlert.Add(ctx, SYSTEM)
-						if err != nil {
-							logger.Warning("add builtin alert fail ", builtinAlert, err)
-						}
+					if exists {
 						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)
-						}
+					err = builtinAlert.Add(ctx, "system")
+					if err != nil {
+						logger.Warningf("add builtin alert:%+v fail %v", builtinAlert, err)
+						continue
 					}
 				}
-
-				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)
-					}
-				}
-
 			}
 		}

@@ -217,21 +135,6 @@ func Init(ctx *ctx.Context, builtinIntegrationsDir string) {
 					continue
 				}

-				if dashboard.UUID == 0 {
-					dashboard.UUID = time.Now().UnixNano()
-					// 补全文件中的 uuid
-					bs, err = json.MarshalIndent(dashboard, "", "    ")
-					if err != nil {
-						logger.Warning("marshal builtin dashboard fail ", dashboard, err)
-						continue
-					}
-
-					_, err = file.WriteBytes(fp, bs)
-					if err != nil {
-						logger.Warning("write builtin dashboard file fail ", f, err)
-					}
-				}
-
 				content, err := json.Marshal(dashboard)
 				if err != nil {
 					logger.Warning("marshal builtin dashboard fail ", dashboard, err)
@@ -239,38 +142,27 @@ func Init(ctx *ctx.Context, builtinIntegrationsDir string) {
 				}

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

-				old, err := models.BuiltinPayloadGet(ctx, "uuid = ?", dashboard.UUID)
+				exists, err := models.BuiltinPayloadExists(ctx, &builtinDashboard)
 				if err != nil {
-					logger.Warning("get builtin alert fail ", builtinDashboard, err)
+					logger.Warning("check builtin dashboard exists fail ", builtinDashboard, err)
 					continue
 				}

-				if old == nil {
-					err := builtinDashboard.Add(ctx, SYSTEM)
-					if err != nil {
-						logger.Warning("add builtin alert fail ", builtinDashboard, err)
-					}
+				if exists {
 					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)
-					}
+				err = builtinDashboard.Add(ctx, "system")
+				if err != nil {
+					logger.Warning("add builtin dashboard fail ", builtinDashboard, err)
+					continue
 				}
 			}
 		} else if err != nil {
@@ -289,64 +181,27 @@ 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 {
-						writeMetricFileFlag = true
-						metric.UUID = time.Now().UnixNano()
-					}
-					newMetrics = append(newMetrics, metric)
-
-					old, err := models.BuiltinMetricGet(ctx, "uuid = ?", metric.UUID)
+					exists, err := models.BuiltinMetricExists(ctx, &metric)
 					if err != nil {
-						logger.Warning("get builtin metrics fail ", metric, err)
+						logger.Warning("check builtin metric exists fail", metric, err)
 						continue
 					}
-
-					if old == nil {
-						err := metric.Add(ctx, SYSTEM)
-						if err != nil {
-							logger.Warning("add builtin metrics fail ", metric, err)
-						}
+					if exists {
 						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)
-						}
+					err = metric.Add(ctx, "system")
+					if err != nil {
+						logger.Warning("add builtin metric fail", metric, err)
+						continue
 					}
 				}
-
-				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)
@@ -370,5 +225,4 @@ type BuiltinBoard struct {
 	Bgids      []int64     `json:"bgids" gorm:"-"`
 	BuiltIn    int         `json:"built_in"` // 0: false, 1: true
 	Hide       int         `json:"hide"`     // 0: false, 1: true
-	UUID       int64       `json:"uuid"`
 }
--- a/center/router/router.go
+++ b/center/router/router.go
@@ -13,7 +13,6 @@ import (
 	"github.com/ccfos/nightingale/v6/center/cstats"
 	"github.com/ccfos/nightingale/v6/center/metas"
 	"github.com/ccfos/nightingale/v6/center/sso"
-	"github.com/ccfos/nightingale/v6/conf"
 	_ "github.com/ccfos/nightingale/v6/front/statik"
 	"github.com/ccfos/nightingale/v6/memsto"
 	"github.com/ccfos/nightingale/v6/pkg/aop"
@@ -35,7 +34,6 @@ import (
 type Router struct {
 	HTTP              httpx.Config
 	Center            cconf.Center
-	Ibex              conf.Ibex
 	Alert             aconf.Alert
 	Operations        cconf.Operation
 	DatasourceCache   *memsto.DatasourceCacheType
@@ -50,15 +48,13 @@ type Router struct {
 	UserCache         *memsto.UserCacheType
 	UserGroupCache    *memsto.UserGroupCacheType
 	Ctx               *ctx.Context
-	HeartbeatHook     HeartbeatHookFunc
 }

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

@@ -96,9 +91,7 @@ func languageDetector(i18NHeaderKey string) gin.HandlerFunc {
 		if headerKey != "" {
 			lang := c.GetHeader(headerKey)
 			if lang != "" {
-				if strings.HasPrefix(lang, "zh_HK") {
-					c.Request.Header.Set("X-Language", "zh_HK")
-				} else if strings.HasPrefix(lang, "zh") {
+				if strings.HasPrefix(lang, "zh") {
 					c.Request.Header.Set("X-Language", "zh_CN")
 				} else if strings.HasPrefix(lang, "en") {
 					c.Request.Header.Set("X-Language", "en")
@@ -119,7 +112,7 @@ func (rt *Router) configNoRoute(r *gin.Engine, fs *http.FileSystem) {
 		suffix := arr[len(arr)-1]

 		switch suffix {
-		case "png", "jpeg", "jpg", "svg", "ico", "gif", "css", "js", "html", "htm", "gz", "zip", "map", "ttf", "md":
+		case "png", "jpeg", "jpg", "svg", "ico", "gif", "css", "js", "html", "htm", "gz", "zip", "map", "ttf":
 			if !rt.Center.UseFileAssets {
 				c.FileFromFS(c.Request.URL.Path, *fs)
 			} else {
@@ -281,14 +274,13 @@ func (rt *Router) Config(r *gin.Engine) {
 		pages.POST("/builtin-cate-favorite", rt.auth(), rt.user(), rt.builtinCateFavoriteAdd)
 		pages.DELETE("/builtin-cate-favorite/:name", rt.auth(), rt.user(), rt.builtinCateFavoriteDel)

+		pages.GET("/builtin-boards", rt.builtinBoardGets)
+		pages.GET("/builtin-board/:name", rt.builtinBoardGet)
+		pages.GET("/dashboards/builtin/list", rt.builtinBoardGets)
+		pages.GET("/builtin-boards-cates", rt.auth(), rt.user(), rt.builtinBoardCateGets)
+		pages.POST("/builtin-boards-detail", rt.auth(), rt.user(), rt.builtinBoardDetailGets)
 		pages.GET("/integrations/icon/:cate/:name", rt.builtinIcon)
-
-		// pages.GET("/builtin-boards", rt.builtinBoardGets)
-		// pages.GET("/builtin-board/:name", rt.builtinBoardGet)
-		// pages.GET("/dashboards/builtin/list", rt.builtinBoardGets)
-		// pages.GET("/builtin-boards-cates", rt.auth(), rt.user(), rt.builtinBoardCateGets)
-		// pages.POST("/builtin-boards-detail", rt.auth(), rt.user(), rt.builtinBoardDetailGets)
-		// pages.GET("/integrations/makedown/:cate", rt.builtinMarkdown)
+		pages.GET("/integrations/makedown/:cate", rt.builtinMarkdown)

 		pages.GET("/busi-groups/public-boards", rt.auth(), rt.user(), rt.perm("/dashboards"), rt.publicBoardGets)
 		pages.GET("/busi-groups/boards", rt.auth(), rt.user(), rt.perm("/dashboards"), rt.boardGetsByGids)
@@ -307,24 +299,19 @@ func (rt *Router) Config(r *gin.Engine) {
 		pages.GET("/share-charts", rt.chartShareGets)
 		pages.POST("/share-charts", rt.auth(), rt.chartShareAdd)

-		// pages.GET("/alert-rules/builtin/alerts-cates", rt.auth(), rt.user(), rt.builtinAlertCateGets)
-		// pages.GET("/alert-rules/builtin/list", rt.auth(), rt.user(), rt.builtinAlertRules)
+		pages.GET("/alert-rules/builtin/alerts-cates", rt.auth(), rt.user(), rt.builtinAlertCateGets)
+		pages.GET("/alert-rules/builtin/list", rt.auth(), rt.user(), rt.builtinAlertRules)
 		pages.GET("/alert-rules/callbacks", rt.auth(), rt.user(), rt.alertRuleCallbacks)

 		pages.GET("/busi-groups/alert-rules", rt.auth(), rt.user(), rt.perm("/alert-rules"), rt.alertRuleGetsByGids)
 		pages.GET("/busi-group/:id/alert-rules", rt.auth(), rt.user(), rt.perm("/alert-rules"), rt.alertRuleGets)
 		pages.POST("/busi-group/:id/alert-rules", rt.auth(), rt.user(), rt.perm("/alert-rules/add"), rt.bgrw(), rt.alertRuleAddByFE)
 		pages.POST("/busi-group/:id/alert-rules/import", rt.auth(), rt.user(), rt.perm("/alert-rules/add"), rt.bgrw(), rt.alertRuleAddByImport)
-		pages.POST("/busi-group/:id/alert-rules/import-prom-rule", rt.auth(),
-			rt.user(), rt.perm("/alert-rules/add"), rt.bgrw(), rt.alertRuleAddByImportPromRule)
 		pages.DELETE("/busi-group/:id/alert-rules", rt.auth(), rt.user(), rt.perm("/alert-rules/del"), rt.bgrw(), rt.alertRuleDel)
 		pages.PUT("/busi-group/:id/alert-rules/fields", rt.auth(), rt.user(), rt.perm("/alert-rules/put"), rt.bgrw(), rt.alertRulePutFields)
 		pages.PUT("/busi-group/:id/alert-rule/:arid", rt.auth(), rt.user(), rt.perm("/alert-rules/put"), rt.alertRulePutByFE)
 		pages.GET("/alert-rule/:arid", rt.auth(), rt.user(), rt.perm("/alert-rules"), rt.alertRuleGet)
-		pages.GET("/alert-rule/:arid/pure", rt.auth(), rt.user(), rt.perm("/alert-rules"), rt.alertRulePureGet)
 		pages.PUT("/busi-group/alert-rule/validate", rt.auth(), rt.user(), rt.perm("/alert-rules/put"), rt.alertRuleValidation)
-		pages.POST("/relabel-test", rt.auth(), rt.user(), rt.relabelTest)
-		pages.POST("/busi-group/:id/alert-rules/clone", rt.auth(), rt.user(), rt.perm("/alert-rules/add"), rt.bgrw(), rt.cloneToMachine)

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

 		// 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.GET("/alert-cur-events/list", rt.auth(), rt.alertCurEventsList)
+		pages.GET("/alert-cur-events/card", rt.auth(), 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.GET("/alert-his-events/list", rt.auth(), rt.alertHisEventsList)
 		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)

@@ -386,8 +371,8 @@ func (rt *Router) Config(r *gin.Engine) {
 		pages.GET("/busi-group/:id/tasks", rt.auth(), rt.user(), rt.perm("/job-tasks"), rt.bgro(), rt.taskGets)
 		pages.POST("/busi-group/:id/tasks", rt.auth(), rt.user(), rt.perm("/job-tasks/add"), rt.bgrw(), rt.taskAdd)

-		pages.GET("/servers", rt.auth(), rt.user(), rt.serversGet)
-		pages.GET("/server-clusters", rt.auth(), rt.user(), rt.serverClustersGet)
+		pages.GET("/servers", rt.auth(), rt.user(), rt.perm("/help/servers"), rt.serversGet)
+		pages.GET("/server-clusters", rt.auth(), rt.user(), rt.perm("/help/servers"), rt.serverClustersGet)

 		pages.POST("/datasource/list", rt.auth(), rt.user(), rt.datasourceList)
 		pages.POST("/datasource/plugin/list", rt.auth(), rt.pluginList)
@@ -437,9 +422,6 @@ func (rt *Router) Config(r *gin.Engine) {
 		pages.PUT("/es-index-pattern", rt.auth(), rt.admin(), rt.esIndexPatternPut)
 		pages.DELETE("/es-index-pattern", rt.auth(), rt.admin(), rt.esIndexPatternDel)

-		pages.GET("/embedded-dashboards", rt.auth(), rt.user(), rt.perm("/embedded-dashboards"), rt.embeddedDashboardsGet)
-		pages.PUT("/embedded-dashboards", rt.auth(), rt.user(), rt.perm("/embedded-dashboards/put"), rt.embeddedDashboardsPut)
-
 		pages.GET("/user-variable-configs", rt.auth(), rt.user(), rt.perm("/help/variable-configs"), rt.userVariableConfigGets)
 		pages.POST("/user-variable-config", rt.auth(), rt.user(), rt.perm("/help/variable-configs"), rt.userVariableConfigAdd)
 		pages.PUT("/user-variable-config/:id", rt.auth(), rt.user(), rt.perm("/help/variable-configs"), rt.userVariableConfigPut)
@@ -452,17 +434,16 @@ func (rt *Router) Config(r *gin.Engine) {
 		// for admin api
 		pages.GET("/user/busi-groups", rt.auth(), rt.admin(), rt.userBusiGroupsGets)

-		pages.GET("/builtin-components", rt.auth(), rt.user(), rt.builtinComponentsGets)
-		pages.POST("/builtin-components", rt.auth(), rt.user(), rt.perm("/built-in-components/add"), rt.builtinComponentsAdd)
-		pages.PUT("/builtin-components", rt.auth(), rt.user(), rt.perm("/built-in-components/put"), rt.builtinComponentsPut)
-		pages.DELETE("/builtin-components", rt.auth(), rt.user(), rt.perm("/built-in-components/del"), rt.builtinComponentsDel)
+		pages.POST("/builtin-components", rt.auth(), rt.user(), rt.perm("/builtin-components/add"), rt.builtinComponentsAdd)
+		pages.GET("/builtin-components", rt.auth(), rt.user(), rt.perm("/builtin-components"), rt.builtinComponentsGets)
+		pages.PUT("/builtin-components", rt.auth(), rt.user(), rt.perm("/builtin-components/put"), rt.builtinComponentsPut)
+		pages.DELETE("/builtin-components", rt.auth(), rt.user(), rt.perm("/builtin-components/del"), rt.builtinComponentsDel)

-		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("/built-in-components/add"), rt.builtinPayloadsAdd)
-		pages.GET("/builtin-payload/:id", rt.auth(), rt.user(), rt.perm("/built-in-components"), rt.builtinPayloadGet)
-		pages.PUT("/builtin-payloads", rt.auth(), rt.user(), rt.perm("/built-in-components/put"), rt.builtinPayloadsPut)
-		pages.DELETE("/builtin-payloads", rt.auth(), rt.user(), rt.perm("/built-in-components/del"), rt.builtinPayloadsDel)
+		pages.POST("/builtin-payloads", rt.auth(), rt.user(), rt.perm("/builtin-payloads/add"), rt.builtinPayloadsAdd)
+		pages.GET("/builtin-payloads", rt.auth(), rt.user(), rt.perm("/builtin-payloads"), rt.builtinPayloadsGets)
+		pages.GET("/builtin-payload/:id", rt.auth(), rt.user(), rt.perm("/builtin-payloads"), rt.builtinPayloadGet)
+		pages.PUT("/builtin-payloads", rt.auth(), rt.user(), rt.perm("/builtin-payloads/put"), rt.builtinPayloadsPut)
+		pages.DELETE("/builtin-payloads", rt.auth(), rt.user(), rt.perm("/builtin-payloads/del"), rt.builtinPayloadsDel)
 	}

 	r.GET("/api/n9e/versions", func(c *gin.Context) {
@@ -496,14 +477,10 @@ func (rt *Router) Config(r *gin.Engine) {
 			service.GET("/user-group-members", rt.userGroupMemberGetsByService)

 			service.GET("/targets", rt.targetGetsByService)
-			service.GET("/target/extra-meta", rt.targetExtendInfoByIdent)
-			service.POST("/target/list", rt.targetGetsByHostFilter)
-			service.DELETE("/targets", rt.targetDelByService)
 			service.GET("/targets/tags", rt.targetGetTags)
 			service.POST("/targets/tags", rt.targetBindTagsByService)
 			service.DELETE("/targets/tags", rt.targetUnbindTagsByService)
 			service.PUT("/targets/note", rt.targetUpdateNoteByService)
-			service.PUT("/targets/bgid", rt.targetUpdateBgidByService)

 			service.POST("/alert-rules", rt.alertRuleAddByService)
 			service.POST("/alert-rule-add", rt.alertRuleAddOneByService)
@@ -556,9 +533,6 @@ func (rt *Router) Config(r *gin.Engine) {

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

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

--- a/center/router/router_alert_cur_event.go
+++ b/center/router/router_alert_cur_event.go
@@ -43,6 +43,7 @@ func (rt *Router) alertCurEventsCard(c *gin.Context) {
 	stime, etime := getTimeRange(c)
 	severity := ginx.QueryInt(c, "severity", -1)
 	query := ginx.QueryStr(c, "query", "")
+	busiGroupId := ginx.QueryInt64(c, "bgid", 0)
 	dsIds := queryDatasourceIds(c)
 	rules := parseAggrRules(c)

@@ -61,11 +62,8 @@ func (rt *Router) alertCurEventsCard(c *gin.Context) {
 		cates = strings.Split(cate, ",")
 	}

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

 	cardmap := make(map[string]*AlertCard)
@@ -144,6 +142,7 @@ func (rt *Router) alertCurEventsList(c *gin.Context) {
 	severity := ginx.QueryInt(c, "severity", -1)
 	query := ginx.QueryStr(c, "query", "")
 	limit := ginx.QueryInt(c, "limit", 20)
+	busiGroupId := ginx.QueryInt64(c, "bgid", 0)
 	dsIds := queryDatasourceIds(c)

 	prod := ginx.QueryStr(c, "prods", "")
@@ -162,13 +161,10 @@ func (rt *Router) alertCurEventsList(c *gin.Context) {
 		cates = strings.Split(cate, ",")
 	}

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

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

 	cache := make(map[int64]*models.UserGroup)
@@ -218,16 +214,6 @@ func (rt *Router) alertCurEventGet(c *gin.Context) {
 		ginx.Bomb(404, "No such active event")
 	}

-	if !rt.Center.AnonymousAccess.AlertDetail && rt.Center.EventHistoryGroupView {
-		rt.bgroCheck(c, event.GroupId)
-	}
-
-	ruleConfig, needReset := models.FillRuleConfigTplName(rt.Ctx, event.RuleConfig)
-	if needReset {
-		event.RuleConfigJson = ruleConfig
-	}
-
-	event.LastEvalTime = event.TriggerTime
 	ginx.NewRender(c).Data(event, nil)
 }

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

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

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

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

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

 func getTimeRange(c *gin.Context) (stime, etime int64) {
@@ -36,6 +33,7 @@ func (rt *Router) alertHisEventsList(c *gin.Context) {
 	recovered := ginx.QueryInt(c, "is_recovered", -1)
 	query := ginx.QueryStr(c, "query", "")
 	limit := ginx.QueryInt(c, "limit", 20)
+	busiGroupId := ginx.QueryInt64(c, "bgid", 0)
 	dsIds := queryDatasourceIds(c)

 	prod := ginx.QueryStr(c, "prods", "")
@@ -54,13 +52,10 @@ func (rt *Router) alertHisEventsList(c *gin.Context) {
 		cates = strings.Split(cate, ",")
 	}

-	bgids, err := GetBusinessGroupIds(c, rt.Ctx, rt.Center.EventHistoryGroupView)
+	total, err := models.AlertHisEventTotal(rt.Ctx, prods, busiGroupId, stime, etime, severity, recovered, dsIds, cates, query)
 	ginx.Dangerous(err)

-	total, err := models.AlertHisEventTotal(rt.Ctx, prods, bgids, stime, etime, severity, recovered, dsIds, cates, query)
-	ginx.Dangerous(err)
-
-	list, err := models.AlertHisEventGets(rt.Ctx, prods, bgids, stime, etime, severity, recovered, dsIds, cates, query, limit, ginx.Offset(c, limit))
+	list, err := models.AlertHisEventGets(rt.Ctx, prods, busiGroupId, stime, etime, severity, recovered, dsIds, cates, query, limit, ginx.Offset(c, limit))
 	ginx.Dangerous(err)

 	cache := make(map[int64]*models.UserGroup)
@@ -83,55 +78,5 @@ func (rt *Router) alertHisEventGet(c *gin.Context) {
 		ginx.Bomb(404, "No such alert event")
 	}

-	if !rt.Center.AnonymousAccess.AlertDetail && rt.Center.EventHistoryGroupView {
-		rt.bgroCheck(c, event.GroupId)
-	}
-
-	ruleConfig, needReset := models.FillRuleConfigTplName(rt.Ctx, event.RuleConfig)
-	if needReset {
-		event.RuleConfigJson = ruleConfig
-	}
-
 	ginx.NewRender(c).Data(event, err)
 }
-
-func GetBusinessGroupIds(c *gin.Context, ctx *ctx.Context, eventHistoryGroupView bool) ([]int64, error) {
-	bgid := ginx.QueryInt64(c, "bgid", 0)
-	var bgids []int64
-
-	if !eventHistoryGroupView || strings.HasPrefix(c.Request.URL.Path, "/v1") {
-		if bgid > 0 {
-			return []int64{bgid}, nil
-		}
-		return bgids, nil
-	}
-
-	user := c.MustGet("user").(*models.User)
-	if user.IsAdmin() {
-		if bgid > 0 {
-			return []int64{bgid}, nil
-		}
-		return bgids, nil
-	}
-
-	bussGroupIds, err := models.MyBusiGroupIds(ctx, user.Id)
-	if err != nil {
-		return nil, err
-	}
-
-	if len(bussGroupIds) == 0 {
-		// 如果没查到用户属于任何业务组，需要返回一个0，否则会导致查询到全部告警历史
-		return []int64{0}, nil
-	}
-
-	if bgid > 0 && !slices.Contains(bussGroupIds, bgid) {
-		return nil, fmt.Errorf("business group ID not allowed")
-	}
-
-	if bgid > 0 {
-		// Pass filter parameters, priority to use
-		return []int64{bgid}, nil
-	}
-
-	return bussGroupIds, nil
-}
--- a/center/router/router_alert_rule.go
+++ b/center/router/router_alert_rule.go
@@ -1,23 +1,14 @@
 package router

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

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

 	"github.com/gin-gonic/gin"
-	"github.com/jinzhu/copier"
-	"github.com/prometheus/prometheus/prompb"
 	"github.com/toolkits/pkg/ginx"
 	"github.com/toolkits/pkg/i18n"
 	"github.com/toolkits/pkg/str"
@@ -51,7 +42,7 @@ func (rt *Router) alertRuleGetsByGids(c *gin.Context) {
 			ginx.Dangerous(err)

 			if len(gids) == 0 {
-				ginx.NewRender(c).Data([]int{}, nil)
+				ginx.Bomb(http.StatusForbidden, "forbidden")
 				return
 			}
 		}
@@ -130,34 +121,6 @@ func (rt *Router) alertRuleAddByImport(c *gin.Context) {
 	ginx.NewRender(c).Data(reterr, nil)
 }

-type promRuleForm struct {
-	Payload       string  `json:"payload" binding:"required"`
-	DatasourceIds []int64 `json:"datasource_ids" binding:"required"`
-	Disabled      int     `json:"disabled" binding:"gte=0,lte=1"`
-}
-
-func (rt *Router) alertRuleAddByImportPromRule(c *gin.Context) {
-	var f promRuleForm
-	ginx.Dangerous(c.BindJSON(&f))
-
-	var pr struct {
-		Groups []models.PromRuleGroup `yaml:"groups"`
-	}
-	err := yaml.Unmarshal([]byte(f.Payload), &pr)
-	if err != nil {
-		ginx.Bomb(http.StatusBadRequest, "invalid yaml format, please use the example format. err: %v", err)
-	}
-
-	if len(pr.Groups) == 0 {
-		ginx.Bomb(http.StatusBadRequest, "input yaml is empty")
-	}
-
-	lst := models.DealPromGroup(pr.Groups, f.DatasourceIds, f.Disabled)
-	username := c.MustGet("username").(string)
-	bgid := ginx.UrlParamInt64(c, "id")
-	ginx.NewRender(c).Data(rt.alertRuleAdd(lst, username, bgid, c.GetHeader("X-Language")), nil)
-}
-
 func (rt *Router) alertRuleAddByService(c *gin.Context) {
 	var lst []models.AlertRule
 	ginx.BindJSON(c, &lst)
@@ -308,43 +271,6 @@ func (rt *Router) alertRulePutFields(c *gin.Context) {
 			continue
 		}

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

-func (rt *Router) alertRulePureGet(c *gin.Context) {
-	arid := ginx.UrlParamInt64(c, "arid")
-
-	ar, err := models.AlertRuleGetById(rt.Ctx, arid)
-	ginx.Dangerous(err)
-
-	if ar == nil {
-		ginx.NewRender(c, http.StatusNotFound).Message("No such AlertRule")
-		return
-	}
-
-	ginx.NewRender(c).Data(ar, err)
-}
-
 // pre validation before save rule
 func (rt *Router) alertRuleValidation(c *gin.Context) {
 	var f models.AlertRule //new
@@ -476,138 +388,3 @@ func (rt *Router) alertRuleCallbacks(c *gin.Context) {

 	ginx.NewRender(c).Data(callbacks, nil)
 }
-
-type alertRuleTestForm struct {
-	Configs []*pconf.RelabelConfig `json:"configs"`
-	Tags    []string               `json:"tags"`
-}
-
-func (rt *Router) relabelTest(c *gin.Context) {
-	var f alertRuleTestForm
-	ginx.BindJSON(c, &f)
-
-	if len(f.Tags) == 0 || len(f.Configs) == 0 {
-		ginx.Bomb(http.StatusBadRequest, "relabel config is empty")
-	}
-
-	labels := make([]prompb.Label, len(f.Tags))
-	for i, tag := range f.Tags {
-		label := strings.Split(tag, "=")
-		if len(label) != 2 {
-			ginx.Bomb(http.StatusBadRequest, "tag:%s format error", tag)
-		}
-
-		labels[i] = prompb.Label{Name: label[0], Value: label[1]}
-	}
-
-	for i := 0; i < len(f.Configs); i++ {
-		if f.Configs[i].Replacement == "" {
-			f.Configs[i].Replacement = "$1"
-		}
-
-		if f.Configs[i].Separator == "" {
-			f.Configs[i].Separator = ";"
-		}
-
-		if f.Configs[i].Regex == "" {
-			f.Configs[i].Regex = "(.*)"
-		}
-	}
-
-	relabels := writer.Process(labels, f.Configs...)
-
-	var tags []string
-	for _, label := range relabels {
-		tags = append(tags, fmt.Sprintf("%s=%s", label.Name, label.Value))
-	}
-
-	ginx.NewRender(c).Data(tags, nil)
-}
-
-type identListForm struct {
-	Ids       []int64  `json:"ids"`
-	IdentList []string `json:"ident_list"`
-}
-
-func containsIdentOperator(s string) bool {
-	pattern := `ident\s*(!=|!~|=~)`
-	matched, err := regexp.MatchString(pattern, s)
-	if err != nil {
-		return false
-	}
-	return matched
-}
-
-func (rt *Router) cloneToMachine(c *gin.Context) {
-	var f identListForm
-	ginx.BindJSON(c, &f)
-
-	if len(f.IdentList) == 0 {
-		ginx.Bomb(http.StatusBadRequest, "ident_list is empty")
-	}
-
-	alertRules, err := models.AlertRuleGetsByIds(rt.Ctx, f.Ids)
-	ginx.Dangerous(err)
-
-	re := regexp.MustCompile(`ident\s*=\s*\\".*?\\"`)
-
-	user := c.MustGet("username").(string)
-	now := time.Now().Unix()
-
-	newRules := make([]*models.AlertRule, 0)
-
-	reterr := make(map[string]map[string]string)
-
-	for i := range alertRules {
-		errMsg := make(map[string]string)
-
-		if alertRules[i].Cate != "prometheus" {
-			errMsg["all"] = "Only Prometheus rule can be cloned to machines"
-			reterr[alertRules[i].Name] = errMsg
-			continue
-		}
-
-		if containsIdentOperator(alertRules[i].RuleConfig) {
-			errMsg["all"] = "promql is missing ident"
-			reterr[alertRules[i].Name] = errMsg
-			continue
-		}
-
-		for j := range f.IdentList {
-			alertRules[i].RuleConfig = re.ReplaceAllString(alertRules[i].RuleConfig, fmt.Sprintf(`ident=\"%s\"`, f.IdentList[j]))
-
-			newRule := &models.AlertRule{}
-			if err := copier.Copy(newRule, alertRules[i]); err != nil {
-				errMsg[f.IdentList[j]] = fmt.Sprintf("fail to clone rule, err: %s", err)
-				continue
-			}
-
-			newRule.Id = 0
-			newRule.Name = alertRules[i].Name + "_" + f.IdentList[j]
-			newRule.CreateBy = user
-			newRule.UpdateBy = user
-			newRule.UpdateAt = now
-			newRule.CreateAt = now
-			newRule.RuleConfig = alertRules[i].RuleConfig
-
-			exist, err := models.AlertRuleExists(rt.Ctx, 0, newRule.GroupId, newRule.DatasourceIdsJson, newRule.Name)
-			if err != nil {
-				errMsg[f.IdentList[j]] = err.Error()
-				continue
-			}
-
-			if exist {
-				errMsg[f.IdentList[j]] = fmt.Sprintf("rule already exists, ruleName: %s", newRule.Name)
-				continue
-			}
-
-			newRules = append(newRules, newRule)
-		}
-
-		if len(errMsg) > 0 {
-			reterr[alertRules[i].Name] = errMsg
-		}
-	}
-
-	ginx.NewRender(c).Data(reterr, models.InsertAlertRule(rt.Ctx, newRules))
-}
--- a/center/router/router_alert_subscribe.go
+++ b/center/router/router_alert_subscribe.go
@@ -44,7 +44,7 @@ func (rt *Router) alertSubscribeGetsByGids(c *gin.Context) {
 			ginx.Dangerous(err)

 			if len(gids) == 0 {
-				ginx.NewRender(c).Data([]int{}, nil)
+				ginx.Bomb(http.StatusForbidden, "forbidden")
 				return
 			}
 		}
--- a/center/router/router_board.go
+++ b/center/router/router_board.go
@@ -272,7 +272,7 @@ func (rt *Router) boardGetsByGids(c *gin.Context) {
 			ginx.Dangerous(err)

 			if len(gids) == 0 {
-				ginx.NewRender(c).Data([]int{}, nil)
+				ginx.Bomb(http.StatusForbidden, "forbidden")
 				return
 			}
 		}
--- a/center/router/router_builtin_componet.go
+++ b/center/router/router_builtin_componet.go
@@ -4,15 +4,10 @@ import (
 	"net/http"

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

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

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

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

 func (rt *Router) builtinComponentsDel(c *gin.Context) {
--- a/center/router/router_builtin_metrics.go
+++ b/center/router/router_builtin_metrics.go
@@ -2,13 +2,11 @@ package router

 import (
 	"net/http"
-	"time"

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

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

 // single or import
@@ -29,9 +27,8 @@ 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().UnixNano()
 		if err := lst[i].Add(rt.Ctx, username); err != nil {
-			reterr[lst[i].Name] = i18n.Sprintf(c.GetHeader("X-Language"), err.Error())
+			reterr[lst[i].Name] = err.Error()
 		}
 	}
 	ginx.NewRender(c).Data(reterr, nil)
--- a/center/router/router_builtin_payload.go
+++ b/center/router/router_builtin_payload.go
@@ -1,25 +1,13 @@
 package router

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

-	"github.com/BurntSushi/toml"
 	"github.com/ccfos/nightingale/v6/models"
 	"github.com/gin-gonic/gin"
 	"github.com/toolkits/pkg/ginx"
-	"github.com/toolkits/pkg/i18n"
 )

-type Board struct {
-	Name    string      `json:"name"`
-	Tags    string      `json:"tags"`
-	Configs interface{} `json:"configs"`
-	UUID    int64       `json:"uuid"`
-}
-
 func (rt *Router) builtinPayloadsAdd(c *gin.Context) {
 	var lst []models.BuiltinPayload
 	ginx.BindJSON(c, &lst)
@@ -33,146 +21,9 @@ func (rt *Router) builtinPayloadsAdd(c *gin.Context) {

 	reterr := make(map[string]string)
 	for i := 0; i < count; i++ {
-		if lst[i].Type == "alert" {
-			if strings.HasPrefix(strings.TrimSpace(lst[i].Content), "[") {
-				// 处理多个告警规则模板的情况
-				alertRules := []models.AlertRule{}
-				if err := json.Unmarshal([]byte(lst[i].Content), &alertRules); err != nil {
-					reterr[lst[i].Name] = err.Error()
-				}
-
-				for _, rule := range alertRules {
-					if rule.UUID == 0 {
-						rule.UUID = time.Now().UnixNano()
-					}
-
-					contentBytes, err := json.Marshal(rule)
-					if err != nil {
-						reterr[rule.Name] = err.Error()
-						continue
-					}
-
-					bp := models.BuiltinPayload{
-						Type:        lst[i].Type,
-						ComponentID: lst[i].ComponentID,
-						Cate:        lst[i].Cate,
-						Name:        rule.Name,
-						Tags:        rule.AppendTags,
-						UUID:        rule.UUID,
-						Content:     string(contentBytes),
-						CreatedBy:   username,
-						UpdatedBy:   username,
-					}
-
-					if err := bp.Add(rt.Ctx, username); err != nil {
-						reterr[bp.Name] = i18n.Sprintf(c.GetHeader("X-Language"), err.Error())
-					}
-				}
-				continue
-			}
-
-			alertRule := models.AlertRule{}
-			if err := json.Unmarshal([]byte(lst[i].Content), &alertRule); err != nil {
-				reterr[lst[i].Name] = err.Error()
-				continue
-			}
-
-			if alertRule.UUID == 0 {
-				alertRule.UUID = time.Now().UnixNano()
-			}
-
-			bp := models.BuiltinPayload{
-				Type:        lst[i].Type,
-				ComponentID: lst[i].ComponentID,
-				Cate:        lst[i].Cate,
-				Name:        alertRule.Name,
-				Tags:        alertRule.AppendTags,
-				UUID:        alertRule.UUID,
-				Content:     lst[i].Content,
-				CreatedBy:   username,
-				UpdatedBy:   username,
-			}
-
-			if err := bp.Add(rt.Ctx, username); err != nil {
-				reterr[bp.Name] = i18n.Sprintf(c.GetHeader("X-Language"), err.Error())
-			}
-		} else if lst[i].Type == "dashboard" {
-			if strings.HasPrefix(strings.TrimSpace(lst[i].Content), "[") {
-				// 处理多个告警规则模板的情况
-				dashboards := []Board{}
-				if err := json.Unmarshal([]byte(lst[i].Content), &dashboards); err != nil {
-					reterr[lst[i].Name] = err.Error()
-				}
-
-				for _, dashboard := range dashboards {
-					if dashboard.UUID == 0 {
-						dashboard.UUID = time.Now().UnixNano()
-					}
-
-					contentBytes, err := json.Marshal(dashboard)
-					if err != nil {
-						reterr[dashboard.Name] = err.Error()
-						continue
-					}
-
-					bp := models.BuiltinPayload{
-						Type:        lst[i].Type,
-						ComponentID: lst[i].ComponentID,
-						Cate:        lst[i].Cate,
-						Name:        dashboard.Name,
-						Tags:        dashboard.Tags,
-						UUID:        dashboard.UUID,
-						Content:     string(contentBytes),
-						CreatedBy:   username,
-						UpdatedBy:   username,
-					}
-
-					if err := bp.Add(rt.Ctx, username); err != nil {
-						reterr[bp.Name] = i18n.Sprintf(c.GetHeader("X-Language"), err.Error())
-					}
-				}
-				continue
-			}
-
-			dashboard := Board{}
-			if err := json.Unmarshal([]byte(lst[i].Content), &dashboard); err != nil {
-				reterr[lst[i].Name] = i18n.Sprintf(c.GetHeader("X-Language"), err.Error())
-				continue
-			}
-
-			if dashboard.UUID == 0 {
-				dashboard.UUID = time.Now().UnixNano()
-			}
-
-			bp := models.BuiltinPayload{
-				Type:        lst[i].Type,
-				ComponentID: lst[i].ComponentID,
-				Cate:        lst[i].Cate,
-				Name:        dashboard.Name,
-				Tags:        dashboard.Tags,
-				UUID:        dashboard.UUID,
-				Content:     lst[i].Content,
-				CreatedBy:   username,
-				UpdatedBy:   username,
-			}
-
-			if err := bp.Add(rt.Ctx, username); err != nil {
-				reterr[bp.Name] = i18n.Sprintf(c.GetHeader("X-Language"), err.Error())
-			}
-		} else {
-			if lst[i].Type == "collect" {
-				c := make(map[string]interface{})
-				if _, err := toml.Decode(lst[i].Content, &c); err != nil {
-					reterr[lst[i].Name] = err.Error()
-					continue
-				}
-			}
-
-			if err := lst[i].Add(rt.Ctx, username); err != nil {
-				reterr[lst[i].Name] = i18n.Sprintf(c.GetHeader("X-Language"), err.Error())
-			}
+		if err := lst[i].Add(rt.Ctx, username); err != nil {
+			reterr[lst[i].Name] = err.Error()
 		}
-
 	}

 	ginx.NewRender(c).Data(reterr, nil)
@@ -180,21 +31,22 @@ func (rt *Router) builtinPayloadsAdd(c *gin.Context) {

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

-	lst, err := models.BuiltinPayloadGets(rt.Ctx, uint64(ComponentID), typ, cate, query)
-	ginx.NewRender(c).Data(lst, err)
-}
+	lst, err := models.BuiltinPayloadGets(rt.Ctx, typ, component, cate, name, limit, ginx.Offset(c, limit))
+	ginx.Dangerous(err)
+	m := make(map[string][]*models.BuiltinPayload)
+	for _, v := range lst {
+		if _, ok := m[v.Cate]; !ok {
+			m[v.Cate] = make([]*models.BuiltinPayload, 0)
+		}
+		m[v.Cate] = append(m[v.Cate], v)
+	}

-func (rt *Router) builtinPayloadcatesGet(c *gin.Context) {
-	typ := ginx.QueryStr(c, "type", "")
-	ComponentID := ginx.QueryInt64(c, "component_id", 0)
-
-	cates, err := models.BuiltinPayloadCates(rt.Ctx, typ, uint64(ComponentID))
-	ginx.NewRender(c).Data(cates, err)
+	ginx.NewRender(c).Data(m, nil)
 }

 func (rt *Router) builtinPayloadGet(c *gin.Context) {
@@ -223,29 +75,6 @@ func (rt *Router) builtinPayloadsPut(c *gin.Context) {
 		return
 	}

-	if req.Type == "alert" {
-		alertRule := models.AlertRule{}
-		if err := json.Unmarshal([]byte(req.Content), &alertRule); err != nil {
-			ginx.Bomb(http.StatusBadRequest, err.Error())
-		}
-
-		req.Name = alertRule.Name
-		req.Tags = alertRule.AppendTags
-	} else if req.Type == "dashboard" {
-		dashboard := Board{}
-		if err := json.Unmarshal([]byte(req.Content), &dashboard); err != nil {
-			ginx.Bomb(http.StatusBadRequest, err.Error())
-		}
-
-		req.Name = dashboard.Name
-		req.Tags = dashboard.Tags
-	} else if req.Type == "collect" {
-		c := make(map[string]interface{})
-		if _, err := toml.Decode(req.Content, &c); err != nil {
-			ginx.Bomb(http.StatusBadRequest, err.Error())
-		}
-	}
-
 	username := Username(c)
 	req.UpdatedBy = username

--- a/center/router/router_configs.go
+++ b/center/router/router_configs.go
@@ -1,16 +1,13 @@
 package router

 import (
-	"time"
-
 	"github.com/ccfos/nightingale/v6/models"
+	"time"

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

-const EMBEDDEDDASHBOARD = "embedded-dashboards"
-
 func (rt *Router) configsGet(c *gin.Context) {
 	prefix := ginx.QueryStr(c, "prefix", "")
 	limit := ginx.QueryInt(c, "limit", 10)
@@ -36,18 +33,6 @@ func (rt *Router) configPutByKey(c *gin.Context) {
 	ginx.NewRender(c).Message(models.ConfigsSetWithUname(rt.Ctx, f.Ckey, f.Cval, username))
 }

-func (rt *Router) embeddedDashboardsGet(c *gin.Context) {
-	config, err := models.ConfigsGet(rt.Ctx, EMBEDDEDDASHBOARD)
-	ginx.NewRender(c).Data(config, err)
-}
-
-func (rt *Router) embeddedDashboardsPut(c *gin.Context) {
-	var f models.Configs
-	ginx.BindJSON(c, &f)
-	username := c.MustGet("username").(string)
-	ginx.NewRender(c).Message(models.ConfigsSetWithUname(rt.Ctx, EMBEDDEDDASHBOARD, f.Cval, username))
-}
-
 func (rt *Router) configsDel(c *gin.Context) {
 	var f idsForm
 	ginx.BindJSON(c, &f)
--- a/center/router/router_funcs.go
+++ b/center/router/router_funcs.go
@@ -65,23 +65,6 @@ func queryDatasourceIds(c *gin.Context) []int64 {
 	return ids
 }

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

-	"github.com/ccfos/nightingale/v6/center/metas"
-	"github.com/ccfos/nightingale/v6/memsto"
 	"github.com/ccfos/nightingale/v6/models"
-	"github.com/ccfos/nightingale/v6/pkg/ctx"
-	"github.com/ccfos/nightingale/v6/pushgw/idents"

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

-type HeartbeatHookFunc func(ident string) map[string]interface{}
-
 func (rt *Router) heartbeat(c *gin.Context) {
-	req, err := HandleHeartbeat(c, rt.Ctx, rt.Alert.Heartbeat.EngineName, rt.MetaSet, rt.IdentSet, rt.TargetCache)
-	ginx.Dangerous(err)
-
-	m := rt.HeartbeatHook(req.Hostname)
-	ginx.NewRender(c).Data(m, err)
-}
-
-func HandleHeartbeat(c *gin.Context, ctx *ctx.Context, engineName string, metaSet *metas.Set, identSet *idents.Set, targetCache *memsto.TargetCacheType) (models.HostMeta, error) {
 	var bs []byte
 	var err error
 	var r *gzip.Reader
@@ -39,7 +24,7 @@ func HandleHeartbeat(c *gin.Context, ctx *ctx.Context, engineName string, metaSe
 		r, err = gzip.NewReader(c.Request.Body)
 		if err != nil {
 			c.String(400, err.Error())
-			return req, err
+			return
 		}
 		defer r.Close()
 		bs, err = ioutil.ReadAll(r)
@@ -47,19 +32,11 @@ func HandleHeartbeat(c *gin.Context, ctx *ctx.Context, engineName string, metaSe
 	} else {
 		defer c.Request.Body.Close()
 		bs, err = ioutil.ReadAll(c.Request.Body)
-		if err != nil {
-			return req, err
-		}
+		ginx.Dangerous(err)
 	}

 	err = json.Unmarshal(bs, &req)
-	if err != nil {
-		return req, err
-	}
-
-	if req.Hostname == "" {
-		return req, errors.New("hostname is required")
-	}
+	ginx.Dangerous(err)

 	// maybe from pushgw
 	if req.Offset == 0 {
@@ -71,100 +48,51 @@ func HandleHeartbeat(c *gin.Context, ctx *ctx.Context, engineName string, metaSe
 	}

 	if req.EngineName == "" {
-		req.EngineName = engineName
+		req.EngineName = rt.Alert.Heartbeat.EngineName
 	}

-	metaSet.Set(req.Hostname, req)
+	rt.MetaSet.Set(req.Hostname, req)
 	var items = make(map[string]struct{})
 	items[req.Hostname] = struct{}{}
-	identSet.MSet(items)
+	rt.IdentSet.MSet(items)

-	if target, has := targetCache.Get(req.Hostname); has && target != nil {
+	if target, has := rt.TargetCache.Get(req.Hostname); has && target != nil {
 		gid := ginx.QueryInt64(c, "gid", 0)
 		hostIp := strings.TrimSpace(req.HostIp)

-		newTarget := models.Target{}
-		targetNeedUpdate := false
+		filed := make(map[string]interface{})
 		if gid != 0 && gid != target.GroupId {
-			newTarget.GroupId = gid
-			targetNeedUpdate = true
+			filed["group_id"] = gid
 		}

 		if hostIp != "" && hostIp != target.HostIp {
-			newTarget.HostIp = hostIp
-			targetNeedUpdate = true
+			filed["host_ip"] = hostIp
 		}

-		hostTagsMap := target.GetHostTagsMap()
-		hostTagNeedUpdate := false
-		if len(hostTagsMap) != len(req.GlobalLabels) {
-			hostTagNeedUpdate = true
-		} else {
-			for k, v := range req.GlobalLabels {
-				if v == "" {
-					continue
-				}
-
-				if tagv, ok := hostTagsMap[k]; !ok || tagv != v {
-					hostTagNeedUpdate = true
-					break
-				}
-			}
-		}
-
-		if hostTagNeedUpdate {
+		if len(req.GlobalLabels) > 0 {
 			lst := []string{}
 			for k, v := range req.GlobalLabels {
 				lst = append(lst, k+"="+v)
 			}
 			sort.Strings(lst)
-			newTarget.HostTags = lst
-			targetNeedUpdate = true
-		}
-
-		userTagsMap := target.GetTagsMap()
-		userTagNeedUpdate := false
-		userTags := []string{}
-		for k, v := range userTagsMap {
-			if v == "" {
-				continue
+			labels := strings.Join(lst, " ")
+			if target.Tags != labels {
+				filed["tags"] = labels
 			}
-
-			if _, ok := req.GlobalLabels[k]; !ok {
-				userTags = append(userTags, k+"="+v)
-			} else { // 该key在hostTags中已经存在
-				userTagNeedUpdate = true
-			}
-		}
-
-		if userTagNeedUpdate {
-			newTarget.Tags = strings.Join(userTags, " ") + " "
-			targetNeedUpdate = true
 		}

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

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

-	return req, nil
+	ginx.NewRender(c).Message(err)
 }
--- a/center/router/router_login.go
+++ b/center/router/router_login.go
@@ -55,12 +55,12 @@ func (rt *Router) loginPost(c *gin.Context) {
 	var err error
 	lc := rt.Sso.LDAP.Copy()
 	if lc.Enable {
-		user, err = ldapx.LdapLogin(rt.Ctx, f.Username, authPassWord, lc.DefaultRoles, lc.DefaultTeams, lc)
+		user, err = ldapx.LdapLogin(rt.Ctx, f.Username, authPassWord, lc.DefaultRoles, lc)
 		if err != nil {
 			logger.Debugf("ldap login failed: %v username: %s", err, f.Username)
 			var errLoginInN9e error
 			// to use n9e as the minimum guarantee for login
-			if user, errLoginInN9e = models.PassLogin(rt.Ctx, rt.Redis, f.Username, authPassWord); errLoginInN9e != nil {
+			if user, errLoginInN9e = models.PassLogin(rt.Ctx, f.Username, authPassWord); errLoginInN9e != nil {
 				ginx.NewRender(c).Message("ldap login failed: %v; n9e login failed: %v", err, errLoginInN9e)
 				return
 			}
@@ -68,7 +68,7 @@ func (rt *Router) loginPost(c *gin.Context) {
 			user.RolesLst = strings.Fields(user.Roles)
 		}
 	} else {
-		user, err = models.PassLogin(rt.Ctx, rt.Redis, f.Username, authPassWord)
+		user, err = models.PassLogin(rt.Ctx, f.Username, authPassWord)
 		ginx.Dangerous(err)
 	}

@@ -262,15 +262,6 @@ func (rt *Router) loginCallback(c *gin.Context) {
 		user.FullSsoFields("oidc", ret.Username, ret.Nickname, ret.Phone, ret.Email, rt.Sso.OIDC.DefaultRoles)
 		// create user from oidc
 		ginx.Dangerous(user.Add(rt.Ctx))
-
-		if len(rt.Sso.OIDC.DefaultTeams) > 0 {
-			for _, gid := range rt.Sso.OIDC.DefaultTeams {
-				err = models.UserGroupMemberAdd(rt.Ctx, gid, user.Id)
-				if err != nil {
-					logger.Errorf("user:%v UserGroupMemberAdd: %s", user, err)
-				}
-			}
-		}
 	}

 	// set user login state
--- a/center/router/router_mute.go
+++ b/center/router/router_mute.go
@@ -35,7 +35,7 @@ func (rt *Router) alertMuteGetsByGids(c *gin.Context) {
 			ginx.Dangerous(err)

 			if len(gids) == 0 {
-				ginx.NewRender(c).Data([]int{}, nil)
+				ginx.Bomb(http.StatusForbidden, "forbidden")
 				return
 			}
 		}
@@ -95,8 +95,7 @@ func (rt *Router) alertMuteAddByService(c *gin.Context) {
 	var f models.AlertMute
 	ginx.BindJSON(c, &f)

-	err := f.Add(rt.Ctx)
-	ginx.NewRender(c).Data(f.Id, err)
+	ginx.NewRender(c).Message(f.Add(rt.Ctx))
 }

 func (rt *Router) alertMuteDel(c *gin.Context) {
--- a/center/router/router_mw.go
+++ b/center/router/router_mw.go
@@ -143,8 +143,6 @@ func (rt *Router) user() gin.HandlerFunc {

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

-	channels := []string{models.Dingtalk, models.Wecom, models.Feishu, models.Mm, models.Telegram,
-		models.Email, models.Lark, models.LarkCard}
+	channels := []string{models.Dingtalk, models.Wecom, models.Feishu, models.Mm, models.Telegram, models.Email}

 	m := make(map[string]struct{})
 	for _, v := range notifyChannels {
@@ -127,8 +126,7 @@ func (rt *Router) notifyContactPuts(c *gin.Context) {
 	var notifyContacts []models.NotifyContact
 	ginx.BindJSON(c, &notifyContacts)

-	keys := []string{models.DingtalkKey, models.WecomKey, models.FeishuKey, models.MmKey,
-		models.TelegramKey, models.LarkKey}
+	keys := []string{models.DingtalkKey, models.WecomKey, models.FeishuKey, models.MmKey, models.TelegramKey}

 	m := make(map[string]struct{})
 	for _, v := range notifyContacts {
@@ -182,7 +180,7 @@ func (rt *Router) notifyConfigPut(c *gin.Context) {

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

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

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

 			if len(gids) == 0 {
-				ginx.NewRender(c).Data([]int{}, nil)
+				ginx.Bomb(http.StatusForbidden, "forbidden")
 				return
 			}
 		}
--- a/center/router/router_self.go
+++ b/center/router/router_self.go
@@ -4,11 +4,9 @@ import (
 	"github.com/ccfos/nightingale/v6/models"
 	"github.com/ccfos/nightingale/v6/pkg/flashduty"
 	"github.com/ccfos/nightingale/v6/pkg/ormx"
-	"github.com/ccfos/nightingale/v6/pkg/secu"

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

 func (rt *Router) selfProfileGet(c *gin.Context) {
@@ -60,25 +58,5 @@ func (rt *Router) selfPasswordPut(c *gin.Context) {
 	var f selfPasswordForm
 	ginx.BindJSON(c, &f)
 	user := c.MustGet("user").(*models.User)
-
-	newPassWord := f.NewPass
-	oldPassWord := f.OldPass
-	if rt.HTTP.RSA.OpenRSA {
-		var err error
-		newPassWord, err = secu.Decrypt(f.NewPass, rt.HTTP.RSA.RSAPrivateKey, rt.HTTP.RSA.RSAPassWord)
-		if err != nil {
-			logger.Errorf("RSA Decrypt failed: %v username: %s", err, user.Username)
-			ginx.NewRender(c).Message(err)
-			return
-		}
-
-		oldPassWord, err = secu.Decrypt(f.OldPass, rt.HTTP.RSA.RSAPrivateKey, rt.HTTP.RSA.RSAPassWord)
-		if err != nil {
-			logger.Errorf("RSA Decrypt failed: %v username: %s", err, user.Username)
-			ginx.NewRender(c).Message(err)
-			return
-		}
-	}
-
-	ginx.NewRender(c).Message(user.ChangePassword(rt.Ctx, oldPassWord, newPassWord))
+	ginx.NewRender(c).Message(user.ChangePassword(rt.Ctx, f.OldPass, f.NewPass))
 }
--- a/center/router/router_target.go
+++ b/center/router/router_target.go
@@ -49,11 +49,6 @@ func (rt *Router) targetGets(c *gin.Context) {
 	downtime := ginx.QueryInt64(c, "downtime", 0)
 	dsIds := queryDatasourceIds(c)

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

-	list, err := models.TargetGets(rt.Ctx, limit,
-		ginx.Offset(c, limit), order, desc, options...)
+	list, err := models.TargetGets(rt.Ctx, bgids, dsIds, query, downtime, limit, ginx.Offset(c, limit))
 	ginx.Dangerous(err)

 	if err == nil {
@@ -160,250 +148,178 @@ func (rt *Router) targetGetsByService(c *gin.Context) {
 func (rt *Router) targetGetTags(c *gin.Context) {
 	idents := ginx.QueryStr(c, "idents", "")
 	idents = strings.ReplaceAll(idents, ",", " ")
-	ignoreHostTag := ginx.QueryBool(c, "ignore_host_tag", false)
-	lst, err := models.TargetGetTags(rt.Ctx, strings.Fields(idents), ignoreHostTag)
+	lst, err := models.TargetGetTags(rt.Ctx, strings.Fields(idents))
 	ginx.NewRender(c).Data(lst, err)
 }

 type targetTagsForm struct {
-	Idents  []string `json:"idents" binding:"required_without=HostIps"`
-	HostIps []string `json:"host_ips" binding:"required_without=Idents"`
-	Tags    []string `json:"tags" binding:"required"`
+	Idents []string `json:"idents" binding:"required"`
+	Tags   []string `json:"tags" binding:"required"`
 }

 func (rt *Router) targetBindTagsByFE(c *gin.Context) {
 	var f targetTagsForm
-	var err error
-	var failedResults = make(map[string]string)
 	ginx.BindJSON(c, &f)

-	if len(f.Idents) == 0 && len(f.HostIps) == 0 {
-		ginx.Bomb(http.StatusBadRequest, "idents or host_ips must be provided")
-	}
-	// Acquire idents by idents and hostIps
-	failedResults, f.Idents, err = models.TargetsGetIdentsByIdentsAndHostIps(rt.Ctx, f.Idents, f.HostIps)
-	if err != nil {
-		ginx.Bomb(http.StatusBadRequest, err.Error())
+	if len(f.Idents) == 0 {
+		ginx.Bomb(http.StatusBadRequest, "idents empty")
 	}

 	rt.checkTargetPerm(c, f.Idents)

-	ginx.NewRender(c).Data(rt.targetBindTags(f, failedResults))
+	ginx.NewRender(c).Message(rt.targetBindTags(f))
 }

 func (rt *Router) targetBindTagsByService(c *gin.Context) {
 	var f targetTagsForm
-	var err error
-	var failedResults = make(map[string]string)
 	ginx.BindJSON(c, &f)

-	if len(f.Idents) == 0 && len(f.HostIps) == 0 {
-		ginx.Bomb(http.StatusBadRequest, "idents or host_ips must be provided")
-	}
-	// Acquire idents by idents and hostIps
-	failedResults, f.Idents, err = models.TargetsGetIdentsByIdentsAndHostIps(rt.Ctx, f.Idents, f.HostIps)
-	if err != nil {
-		ginx.Bomb(http.StatusBadRequest, err.Error())
+	if len(f.Idents) == 0 {
+		ginx.Bomb(http.StatusBadRequest, "idents empty")
 	}

-	ginx.NewRender(c).Data(rt.targetBindTags(f, failedResults))
+	ginx.NewRender(c).Message(rt.targetBindTags(f))
 }

-func (rt *Router) targetBindTags(f targetTagsForm, failedIdents map[string]string) (map[string]string, error) {
-	// 1. Check tags
-	if err := rt.validateTags(f.Tags); err != nil {
-		return nil, err
-	}
-
-	// 2. Acquire targets by idents
-	targets, err := models.TargetsGetByIdents(rt.Ctx, f.Idents)
-	if err != nil {
-		return nil, err
-	}
-
-	// 3. Add tags to targets
-	for _, target := range targets {
-		if err = rt.addTagsToTarget(target, f.Tags); err != nil {
-			failedIdents[target.Ident] = err.Error()
-		}
-	}
-
-	return failedIdents, nil
-}
-
-func (rt *Router) validateTags(tags []string) error {
-	for _, tag := range tags {
-		arr := strings.Split(tag, "=")
+func (rt *Router) targetBindTags(f targetTagsForm) error {
+	for i := 0; i < len(f.Tags); i++ {
+		arr := strings.Split(f.Tags[i], "=")
 		if len(arr) != 2 {
-			return fmt.Errorf("invalid tag format: %s (expected format: key=value)", tag)
+			return fmt.Errorf("invalid tag(%s)", f.Tags[i])
 		}

-		key, value := strings.TrimSpace(arr[0]), strings.TrimSpace(arr[1])
-		if key == "" {
-			return fmt.Errorf("invalid tag: key is empty in tag %s", tag)
-		}
-		if value == "" {
-			return fmt.Errorf("invalid tag: value is empty in tag %s", tag)
+		if strings.TrimSpace(arr[0]) == "" || strings.TrimSpace(arr[1]) == "" {
+			return fmt.Errorf("invalid tag(%s)", f.Tags[i])
 		}

-		if strings.Contains(key, ".") {
-			return fmt.Errorf("invalid tag key: %s (key cannot contain '.')", key)
+		if strings.IndexByte(arr[0], '.') != -1 {
+			return fmt.Errorf("invalid tagkey(%s): cannot contains . ", arr[0])
 		}

-		if strings.Contains(key, "-") {
-			return fmt.Errorf("invalid tag key: %s (key cannot contain '-')", key)
+		if strings.IndexByte(arr[0], '-') != -1 {
+			return fmt.Errorf("invalid tagkey(%s): cannot contains -", arr[0])
 		}

-		if !model.LabelNameRE.MatchString(key) {
-			return fmt.Errorf("invalid tag key: %s "+
-				"(key must start with a letter or underscore, followed by letters, digits, or underscores)", key)
+		if !model.LabelNameRE.MatchString(arr[0]) {
+			return fmt.Errorf("invalid tagkey(%s)", arr[0])
 		}
 	}

+	for i := 0; i < len(f.Idents); i++ {
+		target, err := models.TargetGetByIdent(rt.Ctx, f.Idents[i])
+		if err != nil {
+			return err
+		}
+
+		if target == nil {
+			continue
+		}
+
+		// 不能有同key的标签，否则附到时序数据上会产生覆盖，让人困惑
+		for j := 0; j < len(f.Tags); j++ {
+			tagkey := strings.Split(f.Tags[j], "=")[0]
+			tagkeyPrefix := tagkey + "="
+			if strings.HasPrefix(target.Tags, tagkeyPrefix) {
+				return fmt.Errorf("duplicate tagkey(%s)", tagkey)
+			}
+		}
+
+		err = target.AddTags(rt.Ctx, f.Tags)
+		if err != nil {
+			return err
+		}
+	}
 	return nil
 }

-func (rt *Router) addTagsToTarget(target *models.Target, tags []string) error {
-	hostTagsMap := target.GetHostTagsMap()
-	for _, tag := range tags {
-		tagKey := strings.Split(tag, "=")[0]
-		if _, ok := hostTagsMap[tagKey]; ok ||
-			strings.Contains(target.Tags, tagKey+"=") {
-			return fmt.Errorf("duplicate tagkey(%s)", tagKey)
-		}
-	}
-
-	return target.AddTags(rt.Ctx, tags)
-}
-
 func (rt *Router) targetUnbindTagsByFE(c *gin.Context) {
 	var f targetTagsForm
-	var err error
-	var failedResults = make(map[string]string)
 	ginx.BindJSON(c, &f)

-	if len(f.Idents) == 0 && len(f.HostIps) == 0 {
-		ginx.Bomb(http.StatusBadRequest, "idents or host_ips must be provided")
-	}
-	// Acquire idents by idents and hostIps
-	failedResults, f.Idents, err = models.TargetsGetIdentsByIdentsAndHostIps(rt.Ctx, f.Idents, f.HostIps)
-	if err != nil {
-		ginx.Bomb(http.StatusBadRequest, err.Error())
+	if len(f.Idents) == 0 {
+		ginx.Bomb(http.StatusBadRequest, "idents empty")
 	}

 	rt.checkTargetPerm(c, f.Idents)

-	ginx.NewRender(c).Data(rt.targetUnbindTags(f, failedResults))
+	ginx.NewRender(c).Message(rt.targetUnbindTags(f))
 }

 func (rt *Router) targetUnbindTagsByService(c *gin.Context) {
 	var f targetTagsForm
-	var err error
-	var failedResults = make(map[string]string)
 	ginx.BindJSON(c, &f)

-	if len(f.Idents) == 0 && len(f.HostIps) == 0 {
-		ginx.Bomb(http.StatusBadRequest, "idents or host_ips must be provided")
-	}
-	// Acquire idents by idents and hostIps
-	failedResults, f.Idents, err = models.TargetsGetIdentsByIdentsAndHostIps(rt.Ctx, f.Idents, f.HostIps)
-	if err != nil {
-		ginx.Bomb(http.StatusBadRequest, err.Error())
+	if len(f.Idents) == 0 {
+		ginx.Bomb(http.StatusBadRequest, "idents empty")
 	}

-	ginx.NewRender(c).Data(rt.targetUnbindTags(f, failedResults))
+	ginx.NewRender(c).Message(rt.targetUnbindTags(f))
 }

-func (rt *Router) targetUnbindTags(f targetTagsForm, failedIdents map[string]string) (map[string]string, error) {
-	// 1. Acquire targets by idents
-	targets, err := models.TargetsGetByIdents(rt.Ctx, f.Idents)
-	if err != nil {
-		return nil, err
-	}
-
-	// 2. Remove tags from targets
-	for _, target := range targets {
-		err = target.DelTags(rt.Ctx, f.Tags)
+func (rt *Router) targetUnbindTags(f targetTagsForm) error {
+	for i := 0; i < len(f.Idents); i++ {
+		target, err := models.TargetGetByIdent(rt.Ctx, f.Idents[i])
 		if err != nil {
-			failedIdents[target.Ident] = err.Error()
+			return err
+		}
+
+		if target == nil {
 			continue
 		}
-	}

-	return failedIdents, nil
+		err = target.DelTags(rt.Ctx, f.Tags)
+		if err != nil {
+			return err
+		}
+	}
+	return nil
 }

 type targetNoteForm struct {
-	Idents  []string `json:"idents" binding:"required_without=HostIps"`
-	HostIps []string `json:"host_ips" binding:"required_without=Idents"`
-	Note    string   `json:"note"`
+	Idents []string `json:"idents" binding:"required"`
+	Note   string   `json:"note"`
 }

 func (rt *Router) targetUpdateNote(c *gin.Context) {
 	var f targetNoteForm
-	var err error
-	var failedResults = make(map[string]string)
 	ginx.BindJSON(c, &f)

-	if len(f.Idents) == 0 && len(f.HostIps) == 0 {
-		ginx.Bomb(http.StatusBadRequest, "idents or host_ips must be provided")
-	}
-
-	// Acquire idents by idents and hostIps
-	failedResults, f.Idents, err = models.TargetsGetIdentsByIdentsAndHostIps(rt.Ctx, f.Idents, f.HostIps)
-	if err != nil {
-		ginx.Bomb(http.StatusBadRequest, err.Error())
+	if len(f.Idents) == 0 {
+		ginx.Bomb(http.StatusBadRequest, "idents empty")
 	}

 	rt.checkTargetPerm(c, f.Idents)

-	ginx.NewRender(c).Data(failedResults, models.TargetUpdateNote(rt.Ctx, f.Idents, f.Note))
+	ginx.NewRender(c).Message(models.TargetUpdateNote(rt.Ctx, f.Idents, f.Note))
 }

 func (rt *Router) targetUpdateNoteByService(c *gin.Context) {
 	var f targetNoteForm
-	var err error
-	var failedResults = make(map[string]string)
 	ginx.BindJSON(c, &f)

-	if len(f.Idents) == 0 && len(f.HostIps) == 0 {
-		ginx.Bomb(http.StatusBadRequest, "idents or host_ips must be provided")
+	if len(f.Idents) == 0 {
+		ginx.Bomb(http.StatusBadRequest, "idents empty")
 	}

-	// Acquire idents by idents and hostIps
-	failedResults, f.Idents, err = models.TargetsGetIdentsByIdentsAndHostIps(rt.Ctx, f.Idents, f.HostIps)
-	if err != nil {
-		ginx.Bomb(http.StatusBadRequest, err.Error())
-	}
-
-	ginx.NewRender(c).Data(failedResults, models.TargetUpdateNote(rt.Ctx, f.Idents, f.Note))
+	ginx.NewRender(c).Message(models.TargetUpdateNote(rt.Ctx, f.Idents, f.Note))
 }

 type targetBgidForm struct {
-	Idents  []string `json:"idents" binding:"required_without=HostIps"`
-	HostIps []string `json:"host_ips" binding:"required_without=Idents"`
-	Bgid    int64    `json:"bgid"`
+	Idents []string `json:"idents" binding:"required"`
+	Bgid   int64    `json:"bgid"`
 }

 func (rt *Router) targetUpdateBgid(c *gin.Context) {
 	var f targetBgidForm
-	var err error
-	var failedResults = make(map[string]string)
 	ginx.BindJSON(c, &f)

-	if len(f.Idents) == 0 && len(f.HostIps) == 0 {
-		ginx.Bomb(http.StatusBadRequest, "idents or host_ips must be provided")
-	}
-
-	// Acquire idents by idents and hostIps
-	failedResults, f.Idents, err = models.TargetsGetIdentsByIdentsAndHostIps(rt.Ctx, f.Idents, f.HostIps)
-	if err != nil {
-		ginx.Bomb(http.StatusBadRequest, err.Error())
+	if len(f.Idents) == 0 {
+		ginx.Bomb(http.StatusBadRequest, "idents empty")
 	}

 	user := c.MustGet("user").(*models.User)
 	if user.IsAdmin() {
-		ginx.NewRender(c).Data(failedResults, models.TargetUpdateBgid(rt.Ctx, f.Idents, f.Bgid, false))
+		ginx.NewRender(c).Message(models.TargetUpdateBgid(rt.Ctx, f.Idents, f.Bgid, false))
 		return
 	}

@@ -445,69 +361,24 @@ func (rt *Router) targetUpdateBgid(c *gin.Context) {
 		ginx.Bomb(http.StatusBadRequest, "invalid bgid")
 	}

-	ginx.NewRender(c).Data(failedResults, models.TargetUpdateBgid(rt.Ctx, f.Idents, f.Bgid, false))
-}
-
-func (rt *Router) targetUpdateBgidByService(c *gin.Context) {
-	var f targetBgidForm
-	var err error
-	var failedResults = make(map[string]string)
-	ginx.BindJSON(c, &f)
-
-	if len(f.Idents) == 0 && len(f.HostIps) == 0 {
-		ginx.Bomb(http.StatusBadRequest, "idents or host_ips must be provided")
-	}
-
-	// Acquire idents by idents and hostIps
-	failedResults, f.Idents, err = models.TargetsGetIdentsByIdentsAndHostIps(rt.Ctx, f.Idents, f.HostIps)
-	if err != nil {
-		ginx.Bomb(http.StatusBadRequest, err.Error())
-	}
-
-	ginx.NewRender(c).Data(failedResults, models.TargetUpdateBgid(rt.Ctx, f.Idents, f.Bgid, false))
+	ginx.NewRender(c).Message(models.TargetUpdateBgid(rt.Ctx, f.Idents, f.Bgid, false))
 }

 type identsForm struct {
-	Idents  []string `json:"idents" binding:"required_without=HostIps"`
-	HostIps []string `json:"host_ips" binding:"required_without=Idents"`
+	Idents []string `json:"idents" binding:"required"`
 }

 func (rt *Router) targetDel(c *gin.Context) {
 	var f identsForm
-	var err error
-	var failedResults = make(map[string]string)
 	ginx.BindJSON(c, &f)

-	if len(f.Idents) == 0 && len(f.HostIps) == 0 {
-		ginx.Bomb(http.StatusBadRequest, "idents or host_ips must be provided")
+	if len(f.Idents) == 0 {
+		ginx.Bomb(http.StatusBadRequest, "idents empty")
 	}

-	// Acquire idents by idents and hostIps
-	failedResults, f.Idents, err = models.TargetsGetIdentsByIdentsAndHostIps(rt.Ctx, f.Idents, f.HostIps)
-	if err != nil {
-		ginx.Bomb(http.StatusBadRequest, err.Error())
-	}
+	rt.checkTargetPerm(c, f.Idents)

-	ginx.NewRender(c).Data(failedResults, models.TargetDel(rt.Ctx, f.Idents))
-}
-
-func (rt *Router) targetDelByService(c *gin.Context) {
-	var f identsForm
-	var err error
-	var failedResults = make(map[string]string)
-	ginx.BindJSON(c, &f)
-
-	if len(f.Idents) == 0 && len(f.HostIps) == 0 {
-		ginx.Bomb(http.StatusBadRequest, "idents or host_ips must be provided")
-	}
-
-	// Acquire idents by idents and hostIps
-	failedResults, f.Idents, err = models.TargetsGetIdentsByIdentsAndHostIps(rt.Ctx, f.Idents, f.HostIps)
-	if err != nil {
-		ginx.Bomb(http.StatusBadRequest, err.Error())
-	}
-
-	ginx.NewRender(c).Data(failedResults, models.TargetDel(rt.Ctx, f.Idents))
+	ginx.NewRender(c).Message(models.TargetDel(rt.Ctx, f.Idents))
 }

 func (rt *Router) checkTargetPerm(c *gin.Context, idents []string) {
--- a/center/router/router_task.go
+++ b/center/router/router_task.go
@@ -1,6 +1,7 @@
 package router

 import (
+	"net/http"
 	"time"

 	"github.com/ccfos/nightingale/v6/alert/sender"
@@ -8,7 +9,6 @@ import (

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

@@ -53,7 +53,7 @@ func (rt *Router) taskGetsByGids(c *gin.Context) {
 			ginx.Dangerous(err)

 			if len(gids) == 0 {
-				ginx.NewRender(c).Data([]int{}, nil)
+				ginx.Bomb(http.StatusForbidden, "forbidden")
 				return
 			}
 		}
@@ -105,11 +105,6 @@ func (rt *Router) taskRecordAdd(c *gin.Context) {
 }

 func (rt *Router) taskAdd(c *gin.Context) {
-	if !rt.Ibex.Enable {
-		ginx.Bomb(400, i18n.Sprintf(c.GetHeader("X-Language"), "This functionality has not been enabled. Please contact the system administrator to activate it."))
-		return
-	}
-
 	var f models.TaskForm
 	ginx.BindJSON(c, &f)

--- a/center/router/router_task_tpl.go
+++ b/center/router/router_task_tpl.go
@@ -10,7 +10,6 @@ import (

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

@@ -48,7 +47,7 @@ func (rt *Router) taskTplGetsByGids(c *gin.Context) {
 			ginx.Dangerous(err)

 			if len(gids) == 0 {
-				ginx.NewRender(c).Data([]int{}, nil)
+				ginx.Bomb(http.StatusForbidden, "forbidden")
 				return
 			}
 		}
@@ -119,11 +118,6 @@ type taskTplForm struct {
 }

 func (rt *Router) taskTplAdd(c *gin.Context) {
-	if !rt.Ibex.Enable {
-		ginx.Bomb(400, i18n.Sprintf(c.GetHeader("X-Language"), "This functionality has not been enabled. Please contact the system administrator to activate it."))
-		return
-	}
-
 	var f taskTplForm
 	ginx.BindJSON(c, &f)

@@ -196,13 +190,6 @@ func (rt *Router) taskTplDel(c *gin.Context) {
 		return
 	}

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

--- a/center/router/router_user.go
+++ b/center/router/router_user.go
@@ -7,11 +7,9 @@ import (
 	"github.com/ccfos/nightingale/v6/models"
 	"github.com/ccfos/nightingale/v6/pkg/flashduty"
 	"github.com/ccfos/nightingale/v6/pkg/ormx"
-	"github.com/ccfos/nightingale/v6/pkg/secu"

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

 func (rt *Router) userBusiGroupsGets(c *gin.Context) {
@@ -42,17 +40,13 @@ func (rt *Router) userFindAll(c *gin.Context) {
 }

 func (rt *Router) userGets(c *gin.Context) {
-	stime, etime := getTimeRange(c)
 	limit := ginx.QueryInt(c, "limit", 20)
 	query := ginx.QueryStr(c, "query", "")
-	order := ginx.QueryStr(c, "order", "username")
-	desc := ginx.QueryBool(c, "desc", false)

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

-	list, err := models.UserGets(rt.Ctx, query, limit, ginx.Offset(c, limit), stime, etime, order, desc)
+	list, err := models.UserGets(rt.Ctx, query, limit, ginx.Offset(c, limit))
 	ginx.Dangerous(err)

 	user := c.MustGet("user").(*models.User)
@@ -79,18 +73,7 @@ func (rt *Router) userAddPost(c *gin.Context) {
 	var f userAddForm
 	ginx.BindJSON(c, &f)

-	authPassWord := f.Password
-	if rt.HTTP.RSA.OpenRSA {
-		decPassWord, err := secu.Decrypt(f.Password, rt.HTTP.RSA.RSAPrivateKey, rt.HTTP.RSA.RSAPassWord)
-		if err != nil {
-			logger.Errorf("RSA Decrypt failed: %v username: %s", err, f.Username)
-			ginx.NewRender(c).Message(err)
-			return
-		}
-		authPassWord = decPassWord
-	}
-
-	password, err := models.CryptoPass(rt.Ctx, authPassWord)
+	password, err := models.CryptoPass(rt.Ctx, f.Password)
 	ginx.Dangerous(err)

 	if len(f.Roles) == 0 {
@@ -191,18 +174,7 @@ func (rt *Router) userPasswordPut(c *gin.Context) {

 	target := User(rt.Ctx, ginx.UrlParamInt64(c, "id"))

-	authPassWord := f.Password
-	if rt.HTTP.RSA.OpenRSA {
-		decPassWord, err := secu.Decrypt(f.Password, rt.HTTP.RSA.RSAPrivateKey, rt.HTTP.RSA.RSAPassWord)
-		if err != nil {
-			logger.Errorf("RSA Decrypt failed: %v username: %s", err, target.Username)
-			ginx.NewRender(c).Message(err)
-			return
-		}
-		authPassWord = decPassWord
-	}
-
-	cryptoPass, err := models.CryptoPass(rt.Ctx, authPassWord)
+	cryptoPass, err := models.CryptoPass(rt.Ctx, f.Password)
 	ginx.Dangerous(err)

 	ginx.NewRender(c).Message(target.UpdatePassword(rt.Ctx, cryptoPass, c.MustGet("username").(string)))
--- a/center/router/router_user_group.go
+++ b/center/router/router_user_group.go
@@ -10,7 +10,6 @@ import (
 	"github.com/gin-gonic/gin"
 	"github.com/toolkits/pkg/ginx"
 	"github.com/toolkits/pkg/logger"
-	"github.com/toolkits/pkg/str"
 )

 func (rt *Router) checkBusiGroupPerm(c *gin.Context) {
@@ -32,36 +31,8 @@ func (rt *Router) userGroupGets(c *gin.Context) {
 }

 func (rt *Router) userGroupGetsByService(c *gin.Context) {
-	ids := str.IdsInt64(ginx.QueryStr(c, "ids", ""))
-
-	if len(ids) == 0 {
-		lst, err := models.UserGroupGetAll(rt.Ctx)
-		ginx.Dangerous(err)
-		for i := 0; i < len(lst); i++ {
-			ids, err := models.MemberIds(rt.Ctx, lst[i].Id)
-			ginx.Dangerous(err)
-
-			lst[i].Users, err = models.UserGetsByIds(rt.Ctx, ids)
-			ginx.Dangerous(err)
-		}
-		ginx.NewRender(c).Data(lst, err)
-		return
-	}
-
-	lst := make([]models.UserGroup, 0)
-	for _, id := range ids {
-		ug := UserGroup(rt.Ctx, id)
-
-		ids, err := models.MemberIds(rt.Ctx, ug.Id)
-		ginx.Dangerous(err)
-
-		ug.Users, err = models.UserGetsByIds(rt.Ctx, ids)
-		ginx.Dangerous(err)
-
-		lst = append(lst, *ug)
-	}
-
-	ginx.NewRender(c).Data(lst, nil)
+	lst, err := models.UserGroupGetAll(rt.Ctx)
+	ginx.NewRender(c).Data(lst, err)
 }

 // user group member get by service
--- a/center/sso/init.go
+++ b/center/sso/init.go
@@ -1,7 +1,6 @@
 package sso

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

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

 	syncStats := memsto.NewSyncStats()

-	targetCache := memsto.NewTargetCache(ctx, syncStats, redis)
+	targetCache := memsto.NewTargetCache(ctx, syncStats, nil)
 	busiGroupCache := memsto.NewBusiGroupCache(ctx, syncStats)
 	idents := idents.New(ctx, redis)
 	metas := metas.New(redis)
--- a/cron/clean_notify_record.go
+++ b/cron/clean_notify_record.go
@@ -1,41 +0,0 @@
-package cron
-
-import (
-	"time"
-
-	"github.com/ccfos/nightingale/v6/models"
-	"github.com/ccfos/nightingale/v6/pkg/ctx"
-
-	"github.com/robfig/cron/v3"
-	"github.com/toolkits/pkg/logger"
-)
-
-func cleanNotifyRecord(ctx *ctx.Context, day int) {
-	lastWeek := time.Now().Unix() - 86400*int64(day)
-	err := models.DB(ctx).Model(&models.NotificaitonRecord{}).Where("created_at < ?", lastWeek).Delete(&models.NotificaitonRecord{}).Error
-	if err != nil {
-		logger.Errorf("Failed to clean notify record: %v", err)
-	}
-
-}
-
-// 每天凌晨1点执行清理任务
-func CleanNotifyRecord(ctx *ctx.Context, day int) {
-	c := cron.New()
-	if day < 1 {
-		day = 7
-	}
-
-	// 使用cron表达式设置每天凌晨1点执行
-	_, err := c.AddFunc("0 1 * * *", func() {
-		cleanNotifyRecord(ctx, day)
-	})
-
-	if err != nil {
-		logger.Errorf("Failed to add clean notify record cron job: %v", err)
-		return
-	}
-
-	// 启动cron任务
-	c.Start()
-}
--- a/docker/compose-bridge/etc-nightingale/config.toml
+++ b/docker/compose-bridge/etc-nightingale/config.toml
@@ -55,6 +55,8 @@ Enable = true
 user001 = "ccc26da7b9aba533cbb263a36c07dcc5"

 [HTTP.JWTAuth]
+# signing key
+SigningKey = "5b94a0fd640fe2765af826acfe42d151"
 # unit: min
 AccessExpired = 1500
 # unit: min
--- a/docker/compose-host-network-metric-log/etc-nightingale/config.toml
+++ b/docker/compose-host-network-metric-log/etc-nightingale/config.toml
@@ -55,6 +55,8 @@ Enable = true
 user001 = "ccc26da7b9aba533cbb263a36c07dcc5"

 [HTTP.JWTAuth]
+# signing key
+SigningKey = "5b94a0fd640fe2765af826acfe42d151"
 # unit: min
 AccessExpired = 1500
 # unit: min
--- a/docker/compose-host-network/etc-nightingale/config.toml
+++ b/docker/compose-host-network/etc-nightingale/config.toml
@@ -55,6 +55,8 @@ Enable = true
 user001 = "ccc26da7b9aba533cbb263a36c07dcc5"

 [HTTP.JWTAuth]
+# signing key
+SigningKey = "5b94a0fd640fe2765af826acfe42d151"
 # unit: min
 AccessExpired = 1500
 # unit: min
--- a/docker/compose-postgres/categraf/conf/config.toml
+++ b/docker/compose-postgres/categraf/conf/config.toml
@@ -78,6 +78,6 @@ enable = true
 ## ibex flush interval
 interval = "1000ms"
 ## n9e ibex server rpc address
-servers = ["nightingale:20090"]
+servers = ["ibex:20090"]
 ## temp script dir
 meta_dir = "./meta"
--- a/docker/compose-postgres/initsql_for_postgres/a-n9e-for-Postgres.sql
+++ b/docker/compose-postgres/initsql_for_postgres/a-n9e-for-Postgres.sql
@@ -8,9 +8,8 @@ CREATE TABLE users (
    portrait varchar(255) not null default '',
    roles varchar(255) not null,
    contacts varchar(1024),
-    maintainer int not null default 0,
+    maintainer boolean not null default false,
    belong varchar(16) not null default '',
-    last_active_time 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,
@@ -60,8 +59,8 @@ CREATE TABLE configs (
    ckey varchar(191) not null,
    cval text not null default '',
    note varchar(1024) not null default '',
-    external int not null default 0,
-    encrypted int not null default 0,
+    external boolean not null default false,
+    encrypted boolean not null default false,
    create_at bigint not null default 0,
    create_by varchar(64) not null default '',
    update_at bigint not null default 0,
@@ -378,7 +377,7 @@ COMMENT ON COLUMN alert_mute.disabled IS '0:enabled 1:disabled';
 CREATE TABLE alert_subscribe (
    id bigserial,
    name varchar(255) not null default '',
-    disabled int not null default 0,
+    disabled boolean not null default false,
    group_id bigint not null default 0,
    prod varchar(255) not null default '',
    cate varchar(128) not null,
@@ -397,7 +396,7 @@ CREATE TABLE alert_subscribe (
    rule_ids VARCHAR(1024) DEFAULT '',
    webhooks text not null,
    extra_config text not null,
-    redefine_webhooks int default 0,
+    redefine_webhooks boolean default false,
    for_duration bigint not null default 0,
    create_at bigint not null default 0,
    create_by varchar(64) not null default '',
@@ -561,7 +560,7 @@ CREATE TABLE alert_cur_event (
    target_note varchar(191) not null default '' ,
    first_trigger_time bigint,
    trigger_time bigint not null,
-    trigger_value varchar(2048) not null,
+    trigger_value varchar(255) not null,
    annotations text not null ,
    rule_config text not null ,
    tags varchar(1024) not null default '' ,
@@ -621,7 +620,7 @@ CREATE TABLE alert_his_event (
    target_note varchar(191) not null default '' ,
    first_trigger_time bigint,
    trigger_time bigint not null,
-    trigger_value varchar(2048) not null,
+    trigger_value varchar(255) not null,
    recover_time bigint not null default 0,
    last_eval_time bigint not null default 0 ,
    tags varchar(1024) not null default '' ,
@@ -744,7 +743,7 @@ CREATE TABLE datasource
    status varchar(255) not null default '',
    http varchar(4096) not null default '',
    auth varchar(8192) not null default '',
-    is_default boolean not null default false,
+    is_default smallint not null default 0,
    created_at bigint not null default 0,
    created_by varchar(64) not null default '',
    updated_at bigint not null default 0,
@@ -832,57 +831,4 @@ COMMENT ON COLUMN builtin_metrics.expression IS 'expression of metric';
 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';
-
-CREATE TABLE metric_filter (
-  id BIGSERIAL PRIMARY KEY,
-  name VARCHAR(191) NOT NULL,
-  configs VARCHAR(4096) NOT NULL,
-  groups_perm TEXT,
-  create_at BIGINT NOT NULL DEFAULT 0,
-  create_by VARCHAR(191) NOT NULL DEFAULT '',
-  update_at BIGINT NOT NULL DEFAULT 0,
-  update_by VARCHAR(191) NOT NULL DEFAULT ''
-);
-
-CREATE INDEX idx_metric_filter_name ON metric_filter (name);
-
-CREATE TABLE board_busigroup (
-  busi_group_id BIGINT NOT NULL DEFAULT 0,
-  board_id BIGINT NOT NULL DEFAULT 0,
-  PRIMARY KEY (busi_group_id, board_id)
-);
-
-
-CREATE TABLE builtin_components (
-  id BIGSERIAL PRIMARY KEY,
-  ident VARCHAR(191) NOT NULL,
-  logo VARCHAR(191) NOT NULL,
-  readme TEXT NOT NULL,
-  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 ''
-);
-
-CREATE INDEX idx_ident ON builtin_components (ident);
-
-CREATE TABLE builtin_payloads (
-  id BIGSERIAL PRIMARY KEY,
-  type VARCHAR(191) NOT NULL,
-  uuid BIGINT NOT NULL DEFAULT 0,
-  component VARCHAR(191) NOT NULL,
-  cate VARCHAR(191) NOT NULL,
-  name VARCHAR(191) NOT NULL,
-  tags VARCHAR(191) NOT NULL DEFAULT '',
-  content TEXT NOT NULL,
-  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 ''
-);
-
-CREATE INDEX idx_component ON builtin_payloads (component);
-CREATE INDEX idx_builtin_payloads_name ON builtin_payloads (name);
-CREATE INDEX idx_cate ON builtin_payloads (cate);
-CREATE INDEX idx_type ON builtin_payloads (type);
+COMMENT ON COLUMN builtin_metrics.updated_by IS 'updater';
--- a/docker/compose-postgres/n9eetc_pg/config.toml
+++ b/docker/compose-postgres/n9eetc_pg/config.toml
@@ -55,6 +55,8 @@ Enable = true
 user001 = "ccc26da7b9aba533cbb263a36c07dcc5"

 [HTTP.JWTAuth]
+# signing key
+SigningKey = "5b94a0fd640fe2765af826acfe42d151"
 # unit: min
 AccessExpired = 1500
 # unit: min
--- a/docker/compose-postgres/n9eetc_pg/template/dingtalk.tpl
+++ b/docker/compose-postgres/n9eetc_pg/template/dingtalk.tpl
@@ -1,25 +1,11 @@
-#### {{if .IsRecovered}}<font color="#008800">💚{{.RuleName}}</font>{{else}}<font color="#FF0000">💔{{.RuleName}}</font>{{end}}
+#### {{if .IsRecovered}}<font color="#008800">S{{.Severity}} - Recovered - {{.RuleName}}</font>{{else}}<font color="#FF0000">S{{.Severity}} - Triggered - {{.RuleName}}</font>{{end}}

 ---
-{{$time_duration := sub now.Unix .FirstTriggerTime }}{{if .IsRecovered}}{{$time_duration = sub .LastEvalTime .FirstTriggerTime }}{{end}}
- **告警级别**: {{.Severity}}级
-{{- if .RuleNote}}
- **规则备注**: {{.RuleNote}}
-{{- end}}
-{{- if not .IsRecovered}}
- **当次触发时值**: {{.TriggerValue}}
- **当次触发时间**: {{timeformat .TriggerTime}}
- **告警持续时长**: {{humanizeDurationInterface $time_duration}}
-{{- else}}
-{{- if .AnnotationsJSON.recovery_value}}
- **恢复时值**: {{formatDecimal .AnnotationsJSON.recovery_value 4}}
-{{- end}}
- **恢复时间**: {{timeformat .LastEvalTime}}
- **告警持续时长**: {{humanizeDurationInterface $time_duration}}
-{{- end}}
- **告警事件标签**:
-{{- range $key, $val := .TagsMap}}
-{{- if ne $key "rulename" }}
-  - `{{$key}}`: `{{$val}}`
-{{- end}}
-{{- end}}
+
+- **规则标题**: {{.RuleName}}{{if .RuleNote}}
+- **规则备注**: {{.RuleNote}}{{end}}
+- **监控指标**: {{.TagsJSON}}
+- {{if .IsRecovered}}**恢复时间**：{{timeformat .LastEvalTime}}{{else}}**触发时间**: {{timeformat .TriggerTime}}
+- **触发时值**: {{.TriggerValue}}{{end}}
+- **发送时间**: {{timestamp}}
+
--- a/docker/initsql/a-n9e.sql
+++ b/docker/initsql/a-n9e.sql
@@ -1,6 +1,6 @@
 set names utf8mb4;

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

@@ -16,7 +16,6 @@ CREATE TABLE `users` (
    `contacts` varchar(1024) comment 'json e.g. {wecom:xx, dingtalk_robot_token:yy}',
    `maintainer` tinyint(1) not null default 0,
    `belong` varchar(16) not null default '' comment 'belong',
-    `last_active_time` 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,
@@ -366,7 +365,6 @@ CREATE TABLE `target` (
    `host_ip` varchar(15) default '' COMMENT 'IPv4 string',
    `agent_version` varchar(255) default '' COMMENT 'agent version',
    `engine_name` varchar(255) default '' COMMENT 'engine_name',
-    `os` VARCHAR(31) DEFAULT '' COMMENT 'os type',
    `update_at` bigint not null default 0,
    PRIMARY KEY (`id`),
    UNIQUE KEY (`ident`),
@@ -398,7 +396,6 @@ CREATE TABLE `recording_rule` (
    `disabled` tinyint(1) not null default 0 comment '0:enabled 1:disabled',
    `prom_ql` varchar(8192) not null comment 'promql',
    `prom_eval_interval` int not null comment 'evaluate interval',
-    `cron_pattern` varchar(255) default '' comment 'cron pattern',
    `append_tags` varchar(255) default '' comment 'split by space: service=n9e mod=api',
    `query_configs` text not null comment 'query configs',
    `create_at` bigint default '0',
@@ -442,7 +439,7 @@ CREATE TABLE `alert_cur_event` (
    `prom_for_duration` int not null comment 'prometheus for, unit:s',
    `prom_ql` varchar(8192) not null comment 'promql',
    `prom_eval_interval` int not null comment 'evaluate interval',
-    `callbacks` varchar(2048) not null default '' comment 'split by space: http://a.com/api/x http://a.com/api/y',
+    `callbacks` varchar(255) not null default '' comment 'split by space: http://a.com/api/x http://a.com/api/y',
    `runbook_url` varchar(255),
    `notify_recovered` tinyint(1) not null comment 'whether notify when recovery',
    `notify_channels` varchar(255) not null default '' comment 'split by space: sms voice email dingtalk wecom',
@@ -453,11 +450,10 @@ CREATE TABLE `alert_cur_event` (
    `target_note` varchar(191) not null default '' comment 'target note',
    `first_trigger_time` bigint,
    `trigger_time` bigint not null,
-    `trigger_value` text not null,
+    `trigger_value` varchar(255) not null,
    `annotations` text not null comment 'annotations',
    `rule_config` text not null comment 'annotations',
    `tags` varchar(1024) not null default '' comment 'merge data_tags rule_tags, split by ,,',
-    `original_tags` text comment 'labels key=val,,k2=v2',
    PRIMARY KEY (`id`),
    KEY (`hash`),
    KEY (`rule_id`),
@@ -483,7 +479,7 @@ CREATE TABLE `alert_his_event` (
    `prom_for_duration` int not null comment 'prometheus for, unit:s',
    `prom_ql` varchar(8192) not null comment 'promql',
    `prom_eval_interval` int not null comment 'evaluate interval',
-    `callbacks` varchar(2048) not null default '' comment 'split by space: http://a.com/api/x http://a.com/api/y',
+    `callbacks` varchar(255) not null default '' comment 'split by space: http://a.com/api/x http://a.com/api/y',
    `runbook_url` varchar(255),
    `notify_recovered` tinyint(1) not null comment 'whether notify when recovery',
    `notify_channels` varchar(255) not null default '' comment 'split by space: sms voice email dingtalk wecom',
@@ -493,11 +489,10 @@ CREATE TABLE `alert_his_event` (
    `target_note` varchar(191) not null default '' comment 'target note',
    `first_trigger_time` bigint,
    `trigger_time` bigint not null,
-    `trigger_value` text not null,
+    `trigger_value` varchar(255) not null,
    `recover_time` bigint not null default 0,
    `last_eval_time` bigint not null default 0 comment 'for time filter',
    `tags` varchar(1024) not null default '' comment 'merge data_tags rule_tags, split by ,,',
-    `original_tags` text comment 'labels key=val,,k2=v2',
    `annotations` text not null comment 'annotations',
    `rule_config` text not null comment 'annotations',
    PRIMARY KEY (`id`),
@@ -507,59 +502,6 @@ CREATE TABLE `alert_his_event` (
    KEY (`trigger_time`, `group_id`)
 ) ENGINE=InnoDB DEFAULT CHARSET = utf8mb4;

-CREATE TABLE `board_busigroup` (
-  `busi_group_id` bigint(20) NOT NULL DEFAULT '0' COMMENT 'busi group id',
-  `board_id` bigint(20) NOT NULL DEFAULT '0' COMMENT 'board id',
-  PRIMARY KEY (`busi_group_id`, `board_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
-
-CREATE TABLE `builtin_components` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '''unique identifier''',
-  `ident` varchar(191) NOT NULL COMMENT '''identifier of component''',
-  `logo` varchar(191) NOT NULL COMMENT '''logo of component''',
-  `readme` text NOT NULL COMMENT '''readme of component''',
-  `created_at` bigint(20) NOT NULL DEFAULT 0 COMMENT '''create time''',
-  `created_by` varchar(191) NOT NULL DEFAULT '' COMMENT '''creator''',
-  `updated_at` bigint(20) NOT NULL DEFAULT 0 COMMENT '''update time''',
-  `updated_by` varchar(191) NOT NULL DEFAULT '' COMMENT '''updater''',
-  PRIMARY KEY (`id`),
-  KEY `idx_ident` (`ident`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
-
-CREATE TABLE `builtin_payloads` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '''unique identifier''',
-  `component_id` bigint(20) NOT NULL DEFAULT 0 COMMENT 'component_id',
-  `uuid` bigint(20) NOT NULL COMMENT '''uuid of payload''',
-  `type` varchar(191) NOT NULL COMMENT '''type of payload''',
-  `component` varchar(191) NOT NULL COMMENT '''component of payload''',
-  `cate` varchar(191) NOT NULL COMMENT '''category of payload''',
-  `name` varchar(191) NOT NULL COMMENT '''name of payload''',
-  `tags` varchar(191) NOT NULL DEFAULT '' COMMENT '''tags of payload''',
-  `content` longtext NOT NULL COMMENT '''content of payload''',
-  `created_at` bigint(20) NOT NULL DEFAULT 0 COMMENT '''create time''',
-  `created_by` varchar(191) NOT NULL DEFAULT '' COMMENT '''creator''',
-  `updated_at` bigint(20) NOT NULL DEFAULT 0 COMMENT '''update time''',
-  `updated_by` varchar(191) NOT NULL DEFAULT '' COMMENT '''updater''',
-  PRIMARY KEY (`id`),
-  KEY `idx_component` (`component`),
-  KEY `idx_name` (`name`),
-  KEY `idx_cate` (`cate`),
-  KEY `idx_uuid` (`uuid`),
-  KEY `idx_type` (`type`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
-
-CREATE TABLE notification_record (
-    `id` BIGINT PRIMARY KEY AUTO_INCREMENT,
-    `event_id` BIGINT NOT NULL,
-    `sub_id` BIGINT NOT NULL,
-    `channel` VARCHAR(255) NOT NULL,
-    `status` TINYINT NOT NULL DEFAULT 0,
-    `target` VARCHAR(1024) NOT NULL,
-    `details` VARCHAR(2048),
-    `created_at` BIGINT NOT NULL,
-    INDEX idx_evt (event_id)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
-
 CREATE TABLE `task_tpl`
 (
    `id`        int unsigned NOT NULL AUTO_INCREMENT,
--- a/docker/migratesql/migrate.sql
+++ b/docker/migratesql/migrate.sql
@@ -31,79 +31,4 @@ CREATE TABLE `metric_filter` (
  `update_by` varchar(191) NOT NULL DEFAULT '' COMMENT 'updater',
  PRIMARY KEY (`id`),
  KEY `idx_name` (`name`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
-
-
-CREATE TABLE `board_busigroup` (
-  `busi_group_id` bigint(20) NOT NULL DEFAULT '0' COMMENT 'busi group id',
-  `board_id` bigint(20) NOT NULL DEFAULT '0' COMMENT 'board id',
-  PRIMARY KEY (`busi_group_id`, `board_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
-
-/* v7.0.0-beta.6 */
-CREATE TABLE `builtin_components` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '''unique identifier''',
-  `ident` varchar(191) NOT NULL COMMENT '''identifier of component''',
-  `logo` varchar(191) NOT NULL COMMENT '''logo of component''',
-  `readme` text NOT NULL COMMENT '''readme of component''',
-  `created_at` bigint(20) NOT NULL DEFAULT 0 COMMENT '''create time''',
-  `created_by` varchar(191) NOT NULL DEFAULT '' COMMENT '''creator''',
-  `updated_at` bigint(20) NOT NULL DEFAULT 0 COMMENT '''update time''',
-  `updated_by` varchar(191) NOT NULL DEFAULT '' COMMENT '''updater''',
-  PRIMARY KEY (`id`),
-  KEY `idx_ident` (`ident`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
-
-CREATE TABLE `builtin_payloads` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '''unique identifier''',
-  `uuid` bigint(20) NOT NULL COMMENT '''uuid of payload''',
-  `type` varchar(191) NOT NULL COMMENT '''type of payload''',
-  `component` varchar(191) NOT NULL COMMENT '''component of payload''',
-  `cate` varchar(191) NOT NULL COMMENT '''category of payload''',
-  `name` varchar(191) NOT NULL COMMENT '''name of payload''',
-  `tags` varchar(191) NOT NULL DEFAULT '' COMMENT '''tags of payload''',
-  `content` longtext NOT NULL COMMENT '''content of payload''',
-  `created_at` bigint(20) NOT NULL DEFAULT 0 COMMENT '''create time''',
-  `created_by` varchar(191) NOT NULL DEFAULT '' COMMENT '''creator''',
-  `updated_at` bigint(20) NOT NULL DEFAULT 0 COMMENT '''update time''',
-  `updated_by` varchar(191) NOT NULL DEFAULT '' COMMENT '''updater''',
-  PRIMARY KEY (`id`),
-  KEY `idx_component` (`component`),
-  KEY `idx_name` (`name`),
-  KEY `idx_cate` (`cate`),
-  KEY `idx_uuid` (`uuid`),
-  KEY `idx_type` (`type`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
-
-/* v7.0.0-beta.7 */
-ALTER TABLE users ADD COLUMN last_active_time BIGINT NOT NULL DEFAULT 0;
-
-/* v7.0.0-beta.13 */
-ALTER TABLE recording_rule ADD COLUMN cron_pattern VARCHAR(255) DEFAULT '' COMMENT 'cron pattern';
-
-/* v7.0.0-beta.14 */
-ALTER TABLE alert_cur_event ADD COLUMN original_tags TEXT COMMENT 'labels key=val,,k2=v2';
-ALTER TABLE alert_his_event ADD COLUMN original_tags TEXT COMMENT 'labels key=val,,k2=v2';
-
-/* v7.1.0 */
-ALTER TABLE target ADD COLUMN os VARCHAR(31) DEFAULT '' COMMENT 'os type';
-
-/* v7.2.0 */
-CREATE TABLE notification_record (
-    `id` BIGINT PRIMARY KEY AUTO_INCREMENT,
-    `event_id` BIGINT NOT NULL,
-    `sub_id` BIGINT NOT NULL,
-    `channel` VARCHAR(255) NOT NULL,
-    `status` TINYINT NOT NULL DEFAULT 0,
-    `target` VARCHAR(1024) NOT NULL,
-    `details` VARCHAR(2048),
-    `created_at` BIGINT NOT NULL,
-    INDEX idx_evt (event_id)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
-
-
-/* v7.3.0 2024-08-26 */
-ALTER TABLE `target` ADD COLUMN `host_tags` TEXT COMMENT 'global labels set in conf file';
-
-/* v7.4.0 2024-08-28 */
-ALTER TABLE `builtin_payloads` ADD COLUMN `component_id` bigint(20) NOT NULL DEFAULT 0 COMMENT 'component_id';
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
--- a/docker/sqlite.sql
+++ b/docker/sqlite.sql
--- a/etc/config.toml
+++ b/etc/config.toml
@@ -55,6 +55,8 @@ Enable = true
 user001 = "ccc26da7b9aba533cbb263a36c07dcc5"

 [HTTP.JWTAuth]
+# signing key
+SigningKey = "5b94a0fd640fe2765af826acfe42d151"
 # unit: min
 AccessExpired = 1500
 # unit: min
@@ -75,11 +77,10 @@ OpenRSA = false
 [DB]
 # postgres: host=%s port=%s user=%s dbname=%s password=%s sslmode=%s
 # postgres: DSN="host=127.0.0.1 port=5432 user=root dbname=n9e_v6 password=1234 sslmode=disable"
-# sqlite: DSN="/path/to/filename.db"
-DSN = "root:1234@tcp(127.0.0.1:3306)/n9e_v6?charset=utf8mb4&parseTime=True&loc=Local&allowNativePasswords=true"
+DSN="root:1234@tcp(127.0.0.1:3306)/n9e_v6?charset=utf8mb4&parseTime=True&loc=Local&allowNativePasswords=true"
 # enable debug mode or not
 Debug = false
-# mysql postgres sqlite
+# mysql postgres
 DBType = "mysql"
 # unit: s
 MaxLifetime = 7200
--- a/front/statik/statik.go
+++ b/front/statik/statik.go
--- a/go.mod
+++ b/go.mod
@@ -8,7 +8,7 @@ require (
 	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc
 	github.com/dgrijalva/jwt-go v3.2.0+incompatible
 	github.com/expr-lang/expr v1.16.1
-	github.com/flashcatcloud/ibex v1.3.5
+	github.com/flashcatcloud/ibex v1.3.3
 	github.com/gin-contrib/pprof v1.4.0
 	github.com/gin-gonic/gin v1.9.1
 	github.com/go-ldap/ldap/v3 v3.4.4
@@ -18,7 +18,6 @@ require (
 	github.com/golang/snappy v0.0.4
 	github.com/google/uuid v1.3.0
 	github.com/hashicorp/go-version v1.6.0
-	github.com/jinzhu/copier v0.4.0
 	github.com/json-iterator/go v1.1.12
 	github.com/koding/multiconfig v0.0.0-20171124222453-69c27309b2d7
 	github.com/mailru/easyjson v0.7.7
@@ -34,14 +33,12 @@ require (
 	github.com/spaolacci/murmur3 v1.1.0
 	github.com/tidwall/gjson v1.14.0
 	github.com/toolkits/pkg v1.3.6
-	golang.org/x/exp v0.0.0-20230713183714-613f0c0eb8a1
 	golang.org/x/oauth2 v0.10.0
 	gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df
 	gopkg.in/yaml.v2 v2.4.0
 	gorm.io/driver/mysql v1.4.4
 	gorm.io/driver/postgres v1.4.5
-	gorm.io/driver/sqlite v1.5.5
-	gorm.io/gorm v1.25.7-0.20240204074919-46816ad31dde
+	gorm.io/gorm v1.24.2
 )

 require (
@@ -79,14 +76,12 @@ require (
 	github.com/josharian/intern v1.0.0 // indirect
 	github.com/klauspost/cpuid/v2 v2.2.4 // indirect
 	github.com/leodido/go-urn v1.2.4 // indirect
-	github.com/mattn/go-sqlite3 v1.14.17 // indirect
 	github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
 	github.com/pquerna/cachecontrol v0.1.0 // indirect
 	github.com/prometheus/client_model v0.4.0 // indirect
 	github.com/prometheus/procfs v0.11.0 // indirect
-	github.com/robfig/cron/v3 v3.0.1
 	github.com/tidwall/match v1.1.1 // indirect
 	github.com/tidwall/pretty v1.2.0 // indirect
 	github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
@@ -95,10 +90,11 @@ require (
 	go.uber.org/automaxprocs v1.5.2 // indirect
 	golang.org/x/arch v0.3.0 // indirect
 	golang.org/x/crypto v0.21.0 // indirect
-	golang.org/x/image v0.18.0 // indirect
+	golang.org/x/exp v0.0.0-20230713183714-613f0c0eb8a1 // indirect
+	golang.org/x/image v0.13.0 // indirect
 	golang.org/x/net v0.23.0 // indirect
 	golang.org/x/sys v0.18.0 // indirect
-	golang.org/x/text v0.16.0 // indirect
+	golang.org/x/text v0.14.0 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
 	google.golang.org/protobuf v1.33.0 // indirect
 	gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc // indirect
--- a/go.sum
+++ b/go.sum
@@ -47,8 +47,8 @@ github.com/fatih/camelcase v1.0.0 h1:hxNvNX/xYBp0ovncs8WyWZrOrpBNub/JfaMvbURyft8
 github.com/fatih/camelcase v1.0.0/go.mod h1:yN2Sb0lFhZJUdVvtELVWefmrXpuZESvPmqwoZc+/fpc=
 github.com/fatih/structs v1.1.0 h1:Q7juDM0QtcnhCpeyLGQKyg4TOIghuNXrkL32pHAUMxo=
 github.com/fatih/structs v1.1.0/go.mod h1:9NiDSp5zOcgEDl+j00MP/WkGVPOlPRLejGD8Ga6PJ7M=
-github.com/flashcatcloud/ibex v1.3.5 h1:8GOOf5+aJT0TP/MC6izz7CO5JKJSdKVFBwL0vQp93Nc=
-github.com/flashcatcloud/ibex v1.3.5/go.mod h1:T8hbMUySK2q6cXUaYp0AUVeKkU9Od2LjzwmB5lmTRBM=
+github.com/flashcatcloud/ibex v1.3.3 h1:1Bxk5sgpsq4+e9bMchucGttg8Sw4KEpZy9tctFfj/cE=
+github.com/flashcatcloud/ibex v1.3.3/go.mod h1:T8hbMUySK2q6cXUaYp0AUVeKkU9Od2LjzwmB5lmTRBM=
 github.com/gabriel-vasile/mimetype v1.4.2 h1:w5qFW6JKBz9Y393Y4q372O9A7cUSequkh1Q7OhCmWKU=
 github.com/gabriel-vasile/mimetype v1.4.2/go.mod h1:zApsH/mKG4w07erKIaJPFiX0Tsq9BFQgN3qGY5GnNgA=
 github.com/garyburd/redigo v1.6.2/go.mod h1:NR3MbYisc3/PwhQ00EMzDiPmrwpPxAn5GI05/YaO1SY=
@@ -160,8 +160,6 @@ github.com/jackc/puddle v0.0.0-20190413234325-e4ced69a3a2b/go.mod h1:m4B5Dj62Y0f
 github.com/jackc/puddle v0.0.0-20190608224051-11cab39313c9/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk=
 github.com/jackc/puddle v1.1.3/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk=
 github.com/jackc/puddle v1.3.0/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk=
-github.com/jinzhu/copier v0.4.0 h1:w3ciUoD19shMCRargcpm0cm91ytaBhDvuRpz1ODO/U8=
-github.com/jinzhu/copier v0.4.0/go.mod h1:DfbEm0FYsaqBcKcFuvmOZb218JkPGtvSHsKg8S8hyyg=
 github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD/E=
 github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc=
 github.com/jinzhu/now v1.1.4/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8=
@@ -211,8 +209,6 @@ github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Ky
 github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94=
 github.com/mattn/go-isatty v0.0.19 h1:JITubQf0MOLdlGRuRq+jtsDlekdYPia9ZFsB8h/APPA=
 github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
-github.com/mattn/go-sqlite3 v1.14.17 h1:mCRHCLDUBXgpKAqIKsaAaAsrAlbkeomtRFKXh2L6YIM=
-github.com/mattn/go-sqlite3 v1.14.17/go.mod h1:2eHXhiwb8IkHr+BDWZGa96P6+rkvnG63S2DGjv9HUNg=
 github.com/matttproud/golang_protobuf_extensions v1.0.4 h1:mmDVorXM7PCGKw94cs5zkfA9PSy5pEvNWRP0ET0TIVo=
 github.com/matttproud/golang_protobuf_extensions v1.0.4/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4=
 github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
@@ -252,8 +248,6 @@ github.com/rakyll/statik v0.1.7 h1:OF3QCZUuyPxuGEP7B4ypUa7sB/iHtqOTDYZXGM8KOdQ=
 github.com/rakyll/statik v0.1.7/go.mod h1:AlZONWzMtEnMs7W4e/1LURLiI49pIMmp6V9Unghqrcc=
 github.com/redis/go-redis/v9 v9.0.2 h1:BA426Zqe/7r56kCcvxYLWe1mkaz71LKF77GwgFzSxfE=
 github.com/redis/go-redis/v9 v9.0.2/go.mod h1:/xDTe9EF1LM61hek62Poq2nzQSGj0xSrEtEHbBQevps=
-github.com/robfig/cron/v3 v3.0.1 h1:WdRxkvbJztn8LMz/QEvLN5sBU+xKpSqwwUO1Pjr4qDs=
-github.com/robfig/cron/v3 v3.0.1/go.mod h1:eQICP3HwyT7UooqI/z+Ov+PtYAWygg1TEWWzGIFLtro=
 github.com/robfig/go-cache v0.0.0-20130306151617-9fc39e0dbf62/go.mod h1:65XQgovT59RWatovFwnwocoUxiI/eENTnOY5GK3STuY=
 github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
 github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc=
@@ -344,9 +338,8 @@ golang.org/x/crypto v0.21.0 h1:X31++rzVUdKhX5sWmSOFZxx8UW/ldWx55cbf08iNAMA=
 golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOMs=
 golang.org/x/exp v0.0.0-20230713183714-613f0c0eb8a1 h1:MGwJjxBy0HJshjDNfLsYO8xppfqWlA5ZT9OhtUUhTNw=
 golang.org/x/exp v0.0.0-20230713183714-613f0c0eb8a1/go.mod h1:FXUEEKJgO7OQYeo8N01OfiKP8RXMtf6e8aTskBGqWdc=
+golang.org/x/image v0.13.0 h1:3cge/F/QTkNLauhf2QoE9zp+7sr+ZcL4HnoZmdwg9sg=
 golang.org/x/image v0.13.0/go.mod h1:6mmbMOeV28HuMTgA6OSRkdXKYw/t5W9Uwn2Yv1r3Yxk=
-golang.org/x/image v0.18.0 h1:jGzIakQa/ZXI1I0Fxvaa9W7yP25TqT6cHIHn+6CqvSQ=
-golang.org/x/image v0.18.0/go.mod h1:4yyo5vMFQjVjUcVk4jEQcU9MGy/rulF5WvUILseCM2E=
 golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
 golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc=
 golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
@@ -377,7 +370,7 @@ golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJ
 golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M=
+golang.org/x/sync v0.3.0 h1:ftCYgMx6zT/asHUrPw8BLLscYtGznsLAnjq5RH9P66E=
 golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -419,8 +412,8 @@ golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
 golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
 golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
 golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
-golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4=
-golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI=
+golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
+golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190425163242-31fd60d6bfdc/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
@@ -471,11 +464,9 @@ gorm.io/driver/mysql v1.4.4 h1:MX0K9Qvy0Na4o7qSC/YI7XxqUw5KDw01umqgID+svdQ=
 gorm.io/driver/mysql v1.4.4/go.mod h1:BCg8cKI+R0j/rZRQxeKis/forqRwRSYOR8OM3Wo6hOM=
 gorm.io/driver/postgres v1.4.5 h1:mTeXTTtHAgnS9PgmhN2YeUbazYpLhUI1doLnw42XUZc=
 gorm.io/driver/postgres v1.4.5/go.mod h1:GKNQYSJ14qvWkvPwXljMGehpKrhlDNsqYRr5HnYGncg=
-gorm.io/driver/sqlite v1.5.5 h1:7MDMtUZhV065SilG62E0MquljeArQZNfJnjd9i9gx3E=
-gorm.io/driver/sqlite v1.5.5/go.mod h1:6NgQ7sQWAIFsPrJJl1lSNSu2TABh0ZZ/zm5fosATavE=
 gorm.io/gorm v1.23.8/go.mod h1:l2lP/RyAtc1ynaTjFksBde/O8v9oOGIApu2/xRitmZk=
 gorm.io/gorm v1.24.1-0.20221019064659-5dd2bb482755/go.mod h1:DVrVomtaYTbqs7gB/x2uVvqnXzv0nqjB396B8cG4dBA=
-gorm.io/gorm v1.25.7-0.20240204074919-46816ad31dde h1:9DShaph9qhkIYw7QF91I/ynrr4cOO2PZra2PFD7Mfeg=
-gorm.io/gorm v1.25.7-0.20240204074919-46816ad31dde/go.mod h1:hbnx/Oo0ChWMn1BIhpy1oYozzpM15i4YPuHDmfYtwg8=
+gorm.io/gorm v1.24.2 h1:9wR6CFD+G8nOusLdvkZelOEhpJVwwHzpQOUM+REd6U0=
+gorm.io/gorm v1.24.2/go.mod h1:DVrVomtaYTbqs7gB/x2uVvqnXzv0nqjB396B8cG4dBA=
 honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
 rsc.io/pdf v0.1.1/go.mod h1:n8OzWcQ6Sp37PL01nO98y4iUCRdTGarVfzxY20ICaU4=
--- a/integrations/AMD_ROCm_SMI/collect/amd_rocm_smi/rocm.toml
+++ b/integrations/AMD_ROCm_SMI/collect/amd_rocm_smi/rocm.toml
--- a/integrations/AliYun/collect/aliyun/cloud.toml
+++ b/integrations/AliYun/collect/aliyun/cloud.toml
--- a/integrations/AliYun/dashboards/arms-api.json
+++ b/integrations/AliYun/dashboards/arms-api.json
--- a/integrations/AliYun/dashboards/arms-application.json
+++ b/integrations/AliYun/dashboards/arms-application.json
--- a/integrations/AliYun/dashboards/arms-db.json
+++ b/integrations/AliYun/dashboards/arms-db.json
@@ -1,292 +1,280 @@
 {
-    "id": 0,
-    "group_id": 0,
    "name": "ARMS-DB",
-    "ident": "",
    "tags": "ARMS",
-    "create_at": 0,
-    "create_by": "",
-    "update_at": 0,
-    "update_by": "",
+    "ident": "",
    "configs": {
+        "version": "3.0.0",
        "links": [],
-        "panels": [
-            {
-                "collapsed": true,
-                "id": "bd8c0aac-06df-4b2d-9456-cad8e7389499",
-                "layout": {
-                    "h": 1,
-                    "i": "bd8c0aac-06df-4b2d-9456-cad8e7389499",
-                    "w": 24,
-                    "x": 0,
-                    "y": 0
-                },
-                "name": "概览(DB级别)",
-                "panels": [],
-                "type": "row",
-                "version": "3.0.0"
-            },
-            {
-                "custom": {
-                    "drawStyle": "lines",
-                    "fillOpacity": 0.3,
-                    "gradientMode": "opacity",
-                    "lineInterpolation": "linear",
-                    "lineWidth": 2,
-                    "stack": "off",
-                    "version": "3.0.0"
-                },
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${datasource}",
-                "id": "8d2da301-e5e8-4b2f-9b31-59aa0835c312",
-                "layout": {
-                    "h": 8,
-                    "i": "8d2da301-e5e8-4b2f-9b31-59aa0835c312",
-                    "w": 12,
-                    "x": 0,
-                    "y": 1
-                },
-                "links": [],
-                "maxPerRow": 4,
-                "name": "请求数/每分钟",
-                "options": {
-                    "legend": {
-                        "displayMode": "hidden"
-                    },
-                    "thresholds": {
-                        "steps": [
-                            {
-                                "color": "#634CD9",
-                                "type": "base",
-                                "value": null
-                            }
-                        ]
-                    },
-                    "tooltip": {
-                        "mode": "all",
-                        "sort": "none"
-                    }
-                },
-                "targets": [
-                    {
-                        "expr": "sum by (callType) (sum_over_time(arms_db_requests_count{endpoint=\"${instance}\",destId=~\"${db}\"}[1m]))",
-                        "legend": "{{callType}}入口",
-                        "refId": "B"
-                    }
-                ],
-                "type": "timeseries",
-                "version": "3.0.0"
-            },
-            {
-                "custom": {
-                    "drawStyle": "lines",
-                    "fillOpacity": 0.3,
-                    "gradientMode": "opacity",
-                    "lineInterpolation": "linear",
-                    "lineWidth": 2,
-                    "stack": "off",
-                    "version": "3.0.0"
-                },
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${datasource}",
-                "id": "ab2b0969-50e7-4e4b-962a-58be133e6aef",
-                "layout": {
-                    "h": 8,
-                    "i": "ab2b0969-50e7-4e4b-962a-58be133e6aef",
-                    "w": 12,
-                    "x": 12,
-                    "y": 1
-                },
-                "links": [],
-                "maxPerRow": 4,
-                "name": "响应时间/每分钟",
-                "options": {
-                    "legend": {
-                        "displayMode": "hidden"
-                    },
-                    "thresholds": {
-                        "steps": [
-                            {
-                                "color": "#634CD9",
-                                "type": "base",
-                                "value": null
-                            }
-                        ]
-                    },
-                    "tooltip": {
-                        "mode": "all",
-                        "sort": "none"
-                    }
-                },
-                "targets": [
-                    {
-                        "expr": "sum by (callType) (sum_over_time(arms_db_requests_seconds{endpoint=\"$instance\",destId=~\"^$db$\"}[1m]))/sum by (callType) (sum_over_time(arms_db_requests_count{endpoint=\"$instance\",destId=~\"^$db$\"}[1m]))",
-                        "legend": "{{callType}}入口",
-                        "refId": "A"
-                    }
-                ],
-                "type": "timeseries",
-                "version": "3.0.0"
-            },
-            {
-                "custom": {
-                    "drawStyle": "lines",
-                    "fillOpacity": 0.3,
-                    "gradientMode": "opacity",
-                    "lineInterpolation": "linear",
-                    "lineWidth": 2,
-                    "stack": "off",
-                    "version": "3.0.0"
-                },
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${datasource}",
-                "id": "6bd5d219-0a94-4f90-b2e0-93ed3eeca9f0",
-                "layout": {
-                    "h": 8,
-                    "i": "6bd5d219-0a94-4f90-b2e0-93ed3eeca9f0",
-                    "w": 12,
-                    "x": 0,
-                    "y": 9
-                },
-                "links": [],
-                "maxPerRow": 4,
-                "name": "错误数/每分钟",
-                "options": {
-                    "legend": {
-                        "displayMode": "hidden"
-                    },
-                    "thresholds": {
-                        "steps": [
-                            {
-                                "color": "#634CD9",
-                                "type": "base",
-                                "value": null
-                            }
-                        ]
-                    },
-                    "tooltip": {
-                        "mode": "all",
-                        "sort": "none"
-                    }
-                },
-                "targets": [
-                    {
-                        "expr": "sum by (callType) (sum_over_time(arms_db_requests_error_count{endpoint=\"$instance\",destId=~\"$db\"}[1m]))",
-                        "legend": "{{callType}}入口",
-                        "refId": "A"
-                    }
-                ],
-                "type": "timeseries",
-                "version": "3.0.0"
-            },
-            {
-                "custom": {
-                    "drawStyle": "lines",
-                    "fillOpacity": 0.3,
-                    "gradientMode": "opacity",
-                    "lineInterpolation": "linear",
-                    "lineWidth": 2,
-                    "stack": "off",
-                    "version": "3.0.0"
-                },
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${datasource}",
-                "description": "针对所有SQL的聚和指标",
-                "id": "d9093b86-5796-471a-a28c-fe1d8daf1721",
-                "layout": {
-                    "h": 8,
-                    "i": "d9093b86-5796-471a-a28c-fe1d8daf1721",
-                    "w": 12,
-                    "x": 12,
-                    "y": 9
-                },
-                "links": [],
-                "maxPerRow": 4,
-                "name": "性能一览/每分钟",
-                "options": {
-                    "legend": {
-                        "displayMode": "hidden"
-                    },
-                    "thresholds": {
-                        "steps": [
-                            {
-                                "color": "#634CD9",
-                                "type": "base",
-                                "value": null
-                            }
-                        ]
-                    },
-                    "tooltip": {
-                        "mode": "all",
-                        "sort": "none"
-                    }
-                },
-                "targets": [
-                    {
-                        "expr": "sum(sum_over_time(arms_db_requests_count{endpoint=\"$instance\",destId=~\"$db\"}[1m]))",
-                        "legend": "请求次数",
-                        "refId": "A"
-                    },
-                    {
-                        "expr": "sum(sum_over_time(arms_db_requests_seconds{endpoint=\"$instance\",destId=~\"$db\"}[1m]))/sum(sum_over_time(arms_db_requests_count{endpoint=\"$instance\",destId=~\"$db\"}[1m]))",
-                        "legend": "平均耗时",
-                        "refId": "B"
-                    }
-                ],
-                "type": "timeseries",
-                "version": "3.0.0"
-            }
-        ],
        "var": [
            {
-                "definition": "prometheus",
                "name": "datasource",
-                "type": "datasource"
+                "type": "datasource",
+                "definition": "prometheus"
            },
            {
-                "allOption": false,
-                "datasource": {
-                    "cate": "prometheus",
-                    "value": "${datasource}"
-                },
-                "definition": "label_values(arms_system_cpu_idle,service)",
-                "multi": false,
+                "type": "query",
                "name": "service",
-                "reg": "",
-                "type": "query"
-            },
-            {
+                "definition": "label_values(arms_system_cpu_idle,service)",
                "allOption": false,
+                "multi": false,
+                "reg": "",
                "datasource": {
                    "cate": "prometheus",
                    "value": "${datasource}"
-                },
-                "definition": "label_values(arms_db_requests_count{service=\"$service\"},endpoint)",
-                "multi": false,
-                "name": "instance",
-                "reg": "",
-                "type": "query"
+                }
            },
            {
-                "allOption": true,
-                "allValue": ".*",
+                "type": "query",
+                "name": "instance",
+                "definition": "label_values(arms_db_requests_count{service=\"$service\"},endpoint)",
+                "allOption": false,
+                "multi": false,
+                "reg": "",
                "datasource": {
                    "cate": "prometheus",
                    "value": "${datasource}"
-                },
-                "definition": "label_values(arms_db_requests_count{endpoint=\"${instance}\"},destId)",
-                "multi": false,
+                }
+            },
+            {
+                "type": "query",
                "name": "db",
+                "definition": "label_values(arms_db_requests_count{endpoint=\"${instance}\"},destId)",
+                "allValue": ".*",
+                "allOption": true,
+                "multi": false,
                "reg": "",
-                "type": "query"
+                "datasource": {
+                    "cate": "prometheus",
+                    "value": "${datasource}"
+                }
            }
        ],
-        "version": "3.0.0"
-    },
-    "public": 0,
-    "public_cate": 0,
-    "bgids": null,
-    "built_in": 0,
-    "hide": 0,
-    "uuid": 1717556327092680000
-}
+        "panels": [
+            {
+                "version": "3.0.0",
+                "id": "bd8c0aac-06df-4b2d-9456-cad8e7389499",
+                "type": "row",
+                "name": "概览(DB级别)",
+                "collapsed": true,
+                "layout": {
+                    "h": 1,
+                    "w": 24,
+                    "x": 0,
+                    "y": 0,
+                    "i": "bd8c0aac-06df-4b2d-9456-cad8e7389499"
+                },
+                "panels": []
+            },
+            {
+                "version": "3.0.0",
+                "id": "8d2da301-e5e8-4b2f-9b31-59aa0835c312",
+                "type": "timeseries",
+                "name": "请求数/每分钟",
+                "links": [],
+                "layout": {
+                    "h": 8,
+                    "w": 12,
+                    "x": 0,
+                    "y": 1,
+                    "i": "8d2da301-e5e8-4b2f-9b31-59aa0835c312"
+                },
+                "targets": [
+                    {
+                        "refId": "B",
+                        "expr": "sum by (callType) (sum_over_time(arms_db_requests_count{endpoint=\"${instance}\",destId=~\"${db}\"}[1m]))",
+                        "legend": "{{callType}}入口"
+                    }
+                ],
+                "options": {
+                    "tooltip": {
+                        "mode": "all",
+                        "sort": "none"
+                    },
+                    "legend": {
+                        "displayMode": "hidden"
+                    },
+                    "thresholds": {
+                        "steps": [
+                            {
+                                "color": "#634CD9",
+                                "value": null,
+                                "type": "base"
+                            }
+                        ]
+                    }
+                },
+                "custom": {
+                    "version": "3.0.0",
+                    "drawStyle": "lines",
+                    "lineInterpolation": "linear",
+                    "fillOpacity": 0.3,
+                    "stack": "off",
+                    "lineWidth": 2,
+                    "gradientMode": "opacity"
+                },
+                "maxPerRow": 4,
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}"
+            },
+            {
+                "version": "3.0.0",
+                "id": "ab2b0969-50e7-4e4b-962a-58be133e6aef",
+                "type": "timeseries",
+                "name": "响应时间/每分钟",
+                "links": [],
+                "layout": {
+                    "h": 8,
+                    "w": 12,
+                    "x": 12,
+                    "y": 1,
+                    "i": "ab2b0969-50e7-4e4b-962a-58be133e6aef"
+                },
+                "targets": [
+                    {
+                        "refId": "A",
+                        "expr": "sum by (callType) (sum_over_time(arms_db_requests_seconds{endpoint=\"$instance\",destId=~\"^$db$\"}[1m]))/sum by (callType) (sum_over_time(arms_db_requests_count{endpoint=\"$instance\",destId=~\"^$db$\"}[1m]))",
+                        "legend": "{{callType}}入口"
+                    }
+                ],
+                "options": {
+                    "tooltip": {
+                        "mode": "all",
+                        "sort": "none"
+                    },
+                    "legend": {
+                        "displayMode": "hidden"
+                    },
+                    "thresholds": {
+                        "steps": [
+                            {
+                                "color": "#634CD9",
+                                "value": null,
+                                "type": "base"
+                            }
+                        ]
+                    }
+                },
+                "custom": {
+                    "version": "3.0.0",
+                    "drawStyle": "lines",
+                    "lineInterpolation": "linear",
+                    "fillOpacity": 0.3,
+                    "stack": "off",
+                    "lineWidth": 2,
+                    "gradientMode": "opacity"
+                },
+                "maxPerRow": 4,
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}"
+            },
+            {
+                "version": "3.0.0",
+                "id": "6bd5d219-0a94-4f90-b2e0-93ed3eeca9f0",
+                "type": "timeseries",
+                "name": "错误数/每分钟",
+                "links": [],
+                "layout": {
+                    "h": 8,
+                    "w": 12,
+                    "x": 0,
+                    "y": 9,
+                    "i": "6bd5d219-0a94-4f90-b2e0-93ed3eeca9f0"
+                },
+                "targets": [
+                    {
+                        "refId": "A",
+                        "expr": "sum by (callType) (sum_over_time(arms_db_requests_error_count{endpoint=\"$instance\",destId=~\"$db\"}[1m]))",
+                        "legend": "{{callType}}入口"
+                    }
+                ],
+                "options": {
+                    "tooltip": {
+                        "mode": "all",
+                        "sort": "none"
+                    },
+                    "legend": {
+                        "displayMode": "hidden"
+                    },
+                    "thresholds": {
+                        "steps": [
+                            {
+                                "color": "#634CD9",
+                                "value": null,
+                                "type": "base"
+                            }
+                        ]
+                    }
+                },
+                "custom": {
+                    "version": "3.0.0",
+                    "drawStyle": "lines",
+                    "lineInterpolation": "linear",
+                    "fillOpacity": 0.3,
+                    "stack": "off",
+                    "lineWidth": 2,
+                    "gradientMode": "opacity"
+                },
+                "maxPerRow": 4,
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}"
+            },
+            {
+                "version": "3.0.0",
+                "id": "d9093b86-5796-471a-a28c-fe1d8daf1721",
+                "type": "timeseries",
+                "name": "性能一览/每分钟",
+                "description": "针对所有SQL的聚和指标",
+                "links": [],
+                "layout": {
+                    "h": 8,
+                    "w": 12,
+                    "x": 12,
+                    "y": 9,
+                    "i": "d9093b86-5796-471a-a28c-fe1d8daf1721"
+                },
+                "targets": [
+                    {
+                        "refId": "A",
+                        "expr": "sum(sum_over_time(arms_db_requests_count{endpoint=\"$instance\",destId=~\"$db\"}[1m]))",
+                        "legend": "请求次数"
+                    },
+                    {
+                        "refId": "B",
+                        "expr": "sum(sum_over_time(arms_db_requests_seconds{endpoint=\"$instance\",destId=~\"$db\"}[1m]))/sum(sum_over_time(arms_db_requests_count{endpoint=\"$instance\",destId=~\"$db\"}[1m]))",
+                        "legend": "平均耗时"
+                    }
+                ],
+                "options": {
+                    "tooltip": {
+                        "mode": "all",
+                        "sort": "none"
+                    },
+                    "legend": {
+                        "displayMode": "hidden"
+                    },
+                    "thresholds": {
+                        "steps": [
+                            {
+                                "color": "#634CD9",
+                                "value": null,
+                                "type": "base"
+                            }
+                        ]
+                    }
+                },
+                "custom": {
+                    "version": "3.0.0",
+                    "drawStyle": "lines",
+                    "lineInterpolation": "linear",
+                    "fillOpacity": 0.3,
+                    "stack": "off",
+                    "lineWidth": 2,
+                    "gradientMode": "opacity"
+                },
+                "maxPerRow": 4,
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}"
+            }
+        ]
+    }
+}
--- a/integrations/AliYun/dashboards/arms-jvm-service.json
+++ b/integrations/AliYun/dashboards/arms-jvm-service.json
@@ -1,13 +1,7 @@
 {
-    "id": 0,
-    "group_id": 0,
    "name": "阿里云 ARMS-JVM-SERVICE",
-    "ident": "",
    "tags": "JVM ARMS",
-    "create_at": 0,
-    "create_by": "",
-    "update_at": 0,
-    "update_by": "",
+    "ident": "",
    "configs": {
        "panels": [
            {
@@ -776,14 +770,14 @@
                "type": "datasource"
            },
            {
+                "name": "service",
+                "label": "service",
+                "type": "query",
                "datasource": {
                    "cate": "prometheus",
                    "value": "${prom}"
                },
-                "definition": "label_values(arms_jvm_buffer_pool_count, service)",
-                "label": "service",
-                "name": "service",
-                "type": "query"
+                "definition": "label_values(arms_jvm_buffer_pool_count, service)"
            },
            {
                "datasource": {
@@ -797,11 +791,5 @@
            }
        ],
        "version": "3.0.0"
-    },
-    "public": 0,
-    "public_cate": 0,
-    "bgids": null,
-    "built_in": 0,
-    "hide": 0,
-    "uuid": 1717556327094704000
-}
+    }
+}
--- a/integrations/AliYun/dashboards/arms-machine.json
+++ b/integrations/AliYun/dashboards/arms-machine.json
@@ -1,441 +1,429 @@
 {
-    "id": 0,
-    "group_id": 0,
    "name": "ARMS-Machine",
-    "ident": "",
    "tags": "ARMS",
-    "create_at": 0,
-    "create_by": "",
-    "update_at": 0,
-    "update_by": "",
+    "ident": "",
    "configs": {
+        "version": "3.0.0",
        "links": [],
-        "panels": [
-            {
-                "collapsed": true,
-                "id": "8865eacb-f0f6-45fa-912a-8494907c48d6",
-                "layout": {
-                    "h": 1,
-                    "i": "8865eacb-f0f6-45fa-912a-8494907c48d6",
-                    "w": 24,
-                    "x": 0,
-                    "y": 0
-                },
-                "name": "系统信息",
-                "panels": [],
-                "type": "row",
-                "version": "3.0.0"
-            },
-            {
-                "custom": {
-                    "drawStyle": "lines",
-                    "fillOpacity": 0.3,
-                    "gradientMode": "opacity",
-                    "lineInterpolation": "linear",
-                    "lineWidth": 2,
-                    "stack": "off",
-                    "version": "3.0.0"
-                },
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${datasource}",
-                "id": "7fd3186b-6190-44c7-ad05-1c81993f27c9",
-                "layout": {
-                    "h": 9,
-                    "i": "7fd3186b-6190-44c7-ad05-1c81993f27c9",
-                    "w": 24,
-                    "x": 0,
-                    "y": 1
-                },
-                "links": [],
-                "maxPerRow": 4,
-                "name": "CPU",
-                "options": {
-                    "legend": {
-                        "displayMode": "hidden"
-                    },
-                    "thresholds": {
-                        "steps": [
-                            {
-                                "color": "#634CD9",
-                                "type": "base",
-                                "value": null
-                            }
-                        ]
-                    },
-                    "tooltip": {
-                        "mode": "all",
-                        "sort": "none"
-                    }
-                },
-                "targets": [
-                    {
-                        "expr": "max(arms_system_cpu_system{host=~\"$host\"})",
-                        "legend": "系统CPU使用率",
-                        "refId": "A"
-                    },
-                    {
-                        "expr": "max(arms_system_cpu_io_wait{host=~\"$host\"})",
-                        "legend": "等待IO完成的CPU使用率",
-                        "refId": "B"
-                    },
-                    {
-                        "expr": "max(arms_system_cpu_user{host=~\"$host\"})",
-                        "legend": "用户CPU使用率",
-                        "refId": "C"
-                    },
-                    {
-                        "expr": "max(arms_system_cpu_system{host=\"$host\"})+max(arms_system_cpu_io_wait{host=~\"$host\"})+max(arms_system_cpu_user{host=\"$host\"})",
-                        "legend": "总和",
-                        "refId": "D"
-                    }
-                ],
-                "type": "timeseries",
-                "version": "3.0.0"
-            },
-            {
-                "custom": {
-                    "drawStyle": "lines",
-                    "fillOpacity": 0.3,
-                    "gradientMode": "opacity",
-                    "lineInterpolation": "linear",
-                    "lineWidth": 2,
-                    "stack": "off",
-                    "version": "3.0.0"
-                },
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${datasource}",
-                "id": "60fc127b-b565-40de-9346-860062d5ea58",
-                "layout": {
-                    "h": 9,
-                    "i": "60fc127b-b565-40de-9346-860062d5ea58",
-                    "w": 24,
-                    "x": 0,
-                    "y": 10
-                },
-                "links": [],
-                "maxPerRow": 4,
-                "name": "内存",
-                "options": {
-                    "legend": {
-                        "displayMode": "hidden"
-                    },
-                    "thresholds": {
-                        "steps": [
-                            {
-                                "color": "#634CD9",
-                                "type": "base",
-                                "value": null
-                            }
-                        ]
-                    },
-                    "tooltip": {
-                        "mode": "all",
-                        "sort": "none"
-                    }
-                },
-                "targets": [
-                    {
-                        "expr": "max(arms_system_mem_used_bytes{host=\"$host\"})",
-                        "legend": "系统的已经使用的内存",
-                        "refId": "A"
-                    },
-                    {
-                        "expr": "max(arms_system_mem_total_bytes{host=\"$host\"})",
-                        "legend": "总和",
-                        "refId": "C"
-                    },
-                    {
-                        "expr": "max(arms_system_mem_buffers_bytes{host=\"$host\"})",
-                        "legend": "系统的BufferCache的内存数",
-                        "refId": "D"
-                    },
-                    {
-                        "expr": "max(arms_system_mem_cached_bytes{host=\"$host\"})",
-                        "legend": "系统的PageCache里的内存数",
-                        "refId": "E"
-                    },
-                    {
-                        "expr": "max(arms_system_mem_free_bytes{host=\"$host\"})",
-                        "legend": "系统的空闲内存",
-                        "refId": "B"
-                    }
-                ],
-                "type": "timeseries",
-                "version": "3.0.0"
-            },
-            {
-                "custom": {
-                    "drawStyle": "lines",
-                    "fillOpacity": 0.3,
-                    "gradientMode": "opacity",
-                    "lineInterpolation": "linear",
-                    "lineWidth": 2,
-                    "stack": "off",
-                    "version": "3.0.0"
-                },
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${datasource}",
-                "id": "5229fd8c-3e26-44e6-a091-145c3caef46f",
-                "layout": {
-                    "h": 9,
-                    "i": "5229fd8c-3e26-44e6-a091-145c3caef46f",
-                    "w": 24,
-                    "x": 0,
-                    "y": 19
-                },
-                "links": [],
-                "maxPerRow": 4,
-                "name": "负载",
-                "options": {
-                    "legend": {
-                        "displayMode": "hidden"
-                    },
-                    "thresholds": {
-                        "steps": [
-                            {
-                                "color": "#634CD9",
-                                "type": "base",
-                                "value": null
-                            }
-                        ]
-                    },
-                    "tooltip": {
-                        "mode": "all",
-                        "sort": "none"
-                    }
-                },
-                "targets": [
-                    {
-                        "expr": "max(arms_system_load{host=\"$host\"})",
-                        "legend": "负载",
-                        "refId": "A"
-                    }
-                ],
-                "type": "timeseries",
-                "version": "3.0.0"
-            },
-            {
-                "custom": {
-                    "drawStyle": "lines",
-                    "fillOpacity": 0.3,
-                    "gradientMode": "opacity",
-                    "lineInterpolation": "linear",
-                    "lineWidth": 2,
-                    "stack": "off",
-                    "version": "3.0.0"
-                },
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${datasource}",
-                "id": "60872e48-5445-4ee1-b0a2-19be72b6f737",
-                "layout": {
-                    "h": 9,
-                    "i": "60872e48-5445-4ee1-b0a2-19be72b6f737",
-                    "w": 24,
-                    "x": 0,
-                    "y": 28
-                },
-                "links": [],
-                "maxPerRow": 4,
-                "name": "磁盘",
-                "options": {
-                    "legend": {
-                        "displayMode": "hidden"
-                    },
-                    "thresholds": {
-                        "steps": [
-                            {
-                                "color": "#634CD9",
-                                "type": "base",
-                                "value": null
-                            }
-                        ]
-                    },
-                    "tooltip": {
-                        "mode": "all",
-                        "sort": "none"
-                    }
-                },
-                "targets": [
-                    {
-                        "expr": "max(arms_system_disk_free_bytes{host=\"$host\"})",
-                        "legend": "可用磁盘容量",
-                        "refId": "A"
-                    },
-                    {
-                        "expr": "max(arms_system_disk_total_bytes{host=\"$host\"})",
-                        "legend": "总磁盘容量",
-                        "refId": "B"
-                    },
-                    {
-                        "expr": "max(arms_system_disk_total_bytes{host=~\"$host\"})-max(arms_system_disk_free_bytes{host=~\"$host\"})",
-                        "legend": "已使用磁盘容量",
-                        "refId": "C"
-                    }
-                ],
-                "type": "timeseries",
-                "version": "3.0.0"
-            },
-            {
-                "custom": {
-                    "drawStyle": "lines",
-                    "fillOpacity": 0.3,
-                    "gradientMode": "opacity",
-                    "lineInterpolation": "linear",
-                    "lineWidth": 2,
-                    "stack": "off",
-                    "version": "3.0.0"
-                },
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${datasource}",
-                "id": "517cc410-c4a0-4923-a902-3c102f06cd0c",
-                "layout": {
-                    "h": 9,
-                    "i": "517cc410-c4a0-4923-a902-3c102f06cd0c",
-                    "w": 24,
-                    "x": 0,
-                    "y": 37
-                },
-                "links": [],
-                "maxPerRow": 4,
-                "name": "网络流量(Byte)/每分钟",
-                "options": {
-                    "legend": {
-                        "displayMode": "hidden"
-                    },
-                    "thresholds": {
-                        "steps": [
-                            {
-                                "color": "#634CD9",
-                                "type": "base",
-                                "value": null
-                            }
-                        ]
-                    },
-                    "tooltip": {
-                        "mode": "all",
-                        "sort": "none"
-                    }
-                },
-                "targets": [
-                    {
-                        "expr": "max(max_over_time(arms_system_net_in_bytes{host=~\"$host\"}[1m]))",
-                        "legend": "网络接收的字节数",
-                        "refId": "A"
-                    },
-                    {
-                        "expr": "max(max_over_time(arms_system_net_out_bytes{host=~\"$host\"}[1m]))",
-                        "legend": "网络发送的字节数",
-                        "refId": "B"
-                    }
-                ],
-                "type": "timeseries",
-                "version": "3.0.0"
-            },
-            {
-                "custom": {
-                    "drawStyle": "lines",
-                    "fillOpacity": 0.3,
-                    "gradientMode": "opacity",
-                    "lineInterpolation": "linear",
-                    "lineWidth": 2,
-                    "stack": "off",
-                    "version": "3.0.0"
-                },
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${datasource}",
-                "id": "752d89ce-1136-4ddf-b4b9-1a232a8840db",
-                "layout": {
-                    "h": 9,
-                    "i": "752d89ce-1136-4ddf-b4b9-1a232a8840db",
-                    "w": 24,
-                    "x": 0,
-                    "y": 46
-                },
-                "links": [],
-                "maxPerRow": 4,
-                "name": "网络数据包(个)/每分钟",
-                "options": {
-                    "legend": {
-                        "displayMode": "hidden"
-                    },
-                    "thresholds": {
-                        "steps": [
-                            {
-                                "color": "#634CD9",
-                                "type": "base",
-                                "value": null
-                            }
-                        ]
-                    },
-                    "tooltip": {
-                        "mode": "all",
-                        "sort": "none"
-                    }
-                },
-                "targets": [
-                    {
-                        "expr": "max(max_over_time(arms_system_net_in_packets{host=~\"$host\"}[1m]))",
-                        "legend": "网络接收的报文数",
-                        "refId": "A"
-                    },
-                    {
-                        "expr": "max(max_over_time(arms_system_net_out_packets{host=~\"$host\"}[1m]))",
-                        "legend": "网络发送的报文数",
-                        "refId": "C"
-                    },
-                    {
-                        "expr": "max(max_over_time(arms_system_net_in_errs{host=~\"$host\"}[1m]))",
-                        "legend": "网络接收的错误数",
-                        "refId": "D"
-                    },
-                    {
-                        "expr": "max(max_over_time(arms_system_net_out_errs{host=~\"$host\"}[1m]))",
-                        "legend": "网络丢弃报文数",
-                        "refId": "E"
-                    }
-                ],
-                "type": "timeseries",
-                "version": "3.0.0"
-            }
-        ],
        "var": [
            {
-                "definition": "prometheus",
                "name": "datasource",
-                "type": "datasource"
+                "type": "datasource",
+                "definition": "prometheus"
            },
            {
-                "allOption": false,
-                "datasource": {
-                    "cate": "prometheus",
-                    "value": "${datasource}"
-                },
-                "definition": "label_values(arms_system_cpu_idle,service)",
-                "multi": false,
+                "type": "query",
                "name": "service",
-                "reg": "",
-                "type": "query"
-            },
-            {
+                "definition": "label_values(arms_system_cpu_idle,service)",
                "allOption": false,
-                "allValue": "*",
+                "multi": false,
+                "reg": "",
                "datasource": {
                    "cate": "prometheus",
                    "value": "${datasource}"
-                },
-                "definition": "label_values(arms_system_cpu_idle{service=\"$service\"},host)",
-                "multi": false,
+                }
+            },
+            {
+                "type": "query",
                "name": "host",
+                "definition": "label_values(arms_system_cpu_idle{service=\"$service\"},host)",
+                "allValue": "*",
+                "allOption": false,
+                "multi": false,
                "reg": "",
-                "type": "query"
+                "datasource": {
+                    "cate": "prometheus",
+                    "value": "${datasource}"
+                }
            }
        ],
-        "version": "3.0.0"
-    },
-    "public": 0,
-    "public_cate": 0,
-    "bgids": null,
-    "built_in": 0,
-    "hide": 0,
-    "uuid": 1717556327098444000
-}
+        "panels": [
+            {
+                "version": "3.0.0",
+                "id": "8865eacb-f0f6-45fa-912a-8494907c48d6",
+                "type": "row",
+                "name": "系统信息",
+                "collapsed": true,
+                "layout": {
+                    "h": 1,
+                    "w": 24,
+                    "x": 0,
+                    "y": 0,
+                    "i": "8865eacb-f0f6-45fa-912a-8494907c48d6"
+                },
+                "panels": []
+            },
+            {
+                "version": "3.0.0",
+                "id": "7fd3186b-6190-44c7-ad05-1c81993f27c9",
+                "type": "timeseries",
+                "name": "CPU",
+                "links": [],
+                "layout": {
+                    "h": 9,
+                    "w": 24,
+                    "x": 0,
+                    "y": 1,
+                    "i": "7fd3186b-6190-44c7-ad05-1c81993f27c9"
+                },
+                "targets": [
+                    {
+                        "refId": "A",
+                        "expr": "max(arms_system_cpu_system{host=~\"$host\"})",
+                        "legend": "系统CPU使用率"
+                    },
+                    {
+                        "refId": "B",
+                        "expr": "max(arms_system_cpu_io_wait{host=~\"$host\"})",
+                        "legend": "等待IO完成的CPU使用率"
+                    },
+                    {
+                        "refId": "C",
+                        "expr": "max(arms_system_cpu_user{host=~\"$host\"})",
+                        "legend": "用户CPU使用率"
+                    },
+                    {
+                        "refId": "D",
+                        "expr": "max(arms_system_cpu_system{host=\"$host\"})+max(arms_system_cpu_io_wait{host=~\"$host\"})+max(arms_system_cpu_user{host=\"$host\"})",
+                        "legend": "总和"
+                    }
+                ],
+                "options": {
+                    "tooltip": {
+                        "mode": "all",
+                        "sort": "none"
+                    },
+                    "legend": {
+                        "displayMode": "hidden"
+                    },
+                    "thresholds": {
+                        "steps": [
+                            {
+                                "color": "#634CD9",
+                                "value": null,
+                                "type": "base"
+                            }
+                        ]
+                    }
+                },
+                "custom": {
+                    "version": "3.0.0",
+                    "drawStyle": "lines",
+                    "lineInterpolation": "linear",
+                    "fillOpacity": 0.3,
+                    "stack": "off",
+                    "lineWidth": 2,
+                    "gradientMode": "opacity"
+                },
+                "maxPerRow": 4,
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}"
+            },
+            {
+                "version": "3.0.0",
+                "id": "60fc127b-b565-40de-9346-860062d5ea58",
+                "type": "timeseries",
+                "name": "内存",
+                "links": [],
+                "layout": {
+                    "h": 9,
+                    "w": 24,
+                    "x": 0,
+                    "y": 10,
+                    "i": "60fc127b-b565-40de-9346-860062d5ea58"
+                },
+                "targets": [
+                    {
+                        "refId": "A",
+                        "expr": "max(arms_system_mem_used_bytes{host=\"$host\"})",
+                        "legend": "系统的已经使用的内存"
+                    },
+                    {
+                        "refId": "C",
+                        "expr": "max(arms_system_mem_total_bytes{host=\"$host\"})",
+                        "legend": "总和"
+                    },
+                    {
+                        "refId": "D",
+                        "expr": "max(arms_system_mem_buffers_bytes{host=\"$host\"})",
+                        "legend": "系统的BufferCache的内存数"
+                    },
+                    {
+                        "refId": "E",
+                        "expr": "max(arms_system_mem_cached_bytes{host=\"$host\"})",
+                        "legend": "系统的PageCache里的内存数"
+                    },
+                    {
+                        "refId": "B",
+                        "expr": "max(arms_system_mem_free_bytes{host=\"$host\"})",
+                        "legend": "系统的空闲内存"
+                    }
+                ],
+                "options": {
+                    "tooltip": {
+                        "mode": "all",
+                        "sort": "none"
+                    },
+                    "legend": {
+                        "displayMode": "hidden"
+                    },
+                    "thresholds": {
+                        "steps": [
+                            {
+                                "color": "#634CD9",
+                                "value": null,
+                                "type": "base"
+                            }
+                        ]
+                    }
+                },
+                "custom": {
+                    "version": "3.0.0",
+                    "drawStyle": "lines",
+                    "lineInterpolation": "linear",
+                    "fillOpacity": 0.3,
+                    "stack": "off",
+                    "lineWidth": 2,
+                    "gradientMode": "opacity"
+                },
+                "maxPerRow": 4,
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}"
+            },
+            {
+                "version": "3.0.0",
+                "id": "5229fd8c-3e26-44e6-a091-145c3caef46f",
+                "type": "timeseries",
+                "name": "负载",
+                "links": [],
+                "layout": {
+                    "h": 9,
+                    "w": 24,
+                    "x": 0,
+                    "y": 19,
+                    "i": "5229fd8c-3e26-44e6-a091-145c3caef46f"
+                },
+                "targets": [
+                    {
+                        "refId": "A",
+                        "expr": "max(arms_system_load{host=\"$host\"})",
+                        "legend": "负载"
+                    }
+                ],
+                "options": {
+                    "tooltip": {
+                        "mode": "all",
+                        "sort": "none"
+                    },
+                    "legend": {
+                        "displayMode": "hidden"
+                    },
+                    "thresholds": {
+                        "steps": [
+                            {
+                                "color": "#634CD9",
+                                "value": null,
+                                "type": "base"
+                            }
+                        ]
+                    }
+                },
+                "custom": {
+                    "version": "3.0.0",
+                    "drawStyle": "lines",
+                    "lineInterpolation": "linear",
+                    "fillOpacity": 0.3,
+                    "stack": "off",
+                    "lineWidth": 2,
+                    "gradientMode": "opacity"
+                },
+                "maxPerRow": 4,
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}"
+            },
+            {
+                "version": "3.0.0",
+                "id": "60872e48-5445-4ee1-b0a2-19be72b6f737",
+                "type": "timeseries",
+                "name": "磁盘",
+                "links": [],
+                "layout": {
+                    "h": 9,
+                    "w": 24,
+                    "x": 0,
+                    "y": 28,
+                    "i": "60872e48-5445-4ee1-b0a2-19be72b6f737"
+                },
+                "targets": [
+                    {
+                        "refId": "A",
+                        "expr": "max(arms_system_disk_free_bytes{host=\"$host\"})",
+                        "legend": "可用磁盘容量"
+                    },
+                    {
+                        "refId": "B",
+                        "expr": "max(arms_system_disk_total_bytes{host=\"$host\"})",
+                        "legend": "总磁盘容量"
+                    },
+                    {
+                        "refId": "C",
+                        "expr": "max(arms_system_disk_total_bytes{host=~\"$host\"})-max(arms_system_disk_free_bytes{host=~\"$host\"})",
+                        "legend": "已使用磁盘容量"
+                    }
+                ],
+                "options": {
+                    "tooltip": {
+                        "mode": "all",
+                        "sort": "none"
+                    },
+                    "legend": {
+                        "displayMode": "hidden"
+                    },
+                    "thresholds": {
+                        "steps": [
+                            {
+                                "color": "#634CD9",
+                                "value": null,
+                                "type": "base"
+                            }
+                        ]
+                    }
+                },
+                "custom": {
+                    "version": "3.0.0",
+                    "drawStyle": "lines",
+                    "lineInterpolation": "linear",
+                    "fillOpacity": 0.3,
+                    "stack": "off",
+                    "lineWidth": 2,
+                    "gradientMode": "opacity"
+                },
+                "maxPerRow": 4,
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}"
+            },
+            {
+                "version": "3.0.0",
+                "id": "517cc410-c4a0-4923-a902-3c102f06cd0c",
+                "type": "timeseries",
+                "name": "网络流量(Byte)/每分钟",
+                "links": [],
+                "layout": {
+                    "h": 9,
+                    "w": 24,
+                    "x": 0,
+                    "y": 37,
+                    "i": "517cc410-c4a0-4923-a902-3c102f06cd0c"
+                },
+                "targets": [
+                    {
+                        "refId": "A",
+                        "expr": "max(max_over_time(arms_system_net_in_bytes{host=~\"$host\"}[1m]))",
+                        "legend": "网络接收的字节数"
+                    },
+                    {
+                        "refId": "B",
+                        "expr": "max(max_over_time(arms_system_net_out_bytes{host=~\"$host\"}[1m]))",
+                        "legend": "网络发送的字节数"
+                    }
+                ],
+                "options": {
+                    "tooltip": {
+                        "mode": "all",
+                        "sort": "none"
+                    },
+                    "legend": {
+                        "displayMode": "hidden"
+                    },
+                    "thresholds": {
+                        "steps": [
+                            {
+                                "color": "#634CD9",
+                                "value": null,
+                                "type": "base"
+                            }
+                        ]
+                    }
+                },
+                "custom": {
+                    "version": "3.0.0",
+                    "drawStyle": "lines",
+                    "lineInterpolation": "linear",
+                    "fillOpacity": 0.3,
+                    "stack": "off",
+                    "lineWidth": 2,
+                    "gradientMode": "opacity"
+                },
+                "maxPerRow": 4,
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}"
+            },
+            {
+                "version": "3.0.0",
+                "id": "752d89ce-1136-4ddf-b4b9-1a232a8840db",
+                "type": "timeseries",
+                "name": "网络数据包(个)/每分钟",
+                "links": [],
+                "layout": {
+                    "h": 9,
+                    "w": 24,
+                    "x": 0,
+                    "y": 46,
+                    "i": "752d89ce-1136-4ddf-b4b9-1a232a8840db"
+                },
+                "targets": [
+                    {
+                        "refId": "A",
+                        "expr": "max(max_over_time(arms_system_net_in_packets{host=~\"$host\"}[1m]))",
+                        "legend": "网络接收的报文数"
+                    },
+                    {
+                        "refId": "C",
+                        "expr": "max(max_over_time(arms_system_net_out_packets{host=~\"$host\"}[1m]))",
+                        "legend": "网络发送的报文数"
+                    },
+                    {
+                        "refId": "D",
+                        "expr": "max(max_over_time(arms_system_net_in_errs{host=~\"$host\"}[1m]))",
+                        "legend": "网络接收的错误数"
+                    },
+                    {
+                        "refId": "E",
+                        "expr": "max(max_over_time(arms_system_net_out_errs{host=~\"$host\"}[1m]))",
+                        "legend": "网络丢弃报文数"
+                    }
+                ],
+                "options": {
+                    "tooltip": {
+                        "mode": "all",
+                        "sort": "none"
+                    },
+                    "legend": {
+                        "displayMode": "hidden"
+                    },
+                    "thresholds": {
+                        "steps": [
+                            {
+                                "color": "#634CD9",
+                                "value": null,
+                                "type": "base"
+                            }
+                        ]
+                    }
+                },
+                "custom": {
+                    "version": "3.0.0",
+                    "drawStyle": "lines",
+                    "lineInterpolation": "linear",
+                    "fillOpacity": 0.3,
+                    "stack": "off",
+                    "lineWidth": 2,
+                    "gradientMode": "opacity"
+                },
+                "maxPerRow": 4,
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}"
+            }
+        ]
+    }
+}
--- a/integrations/AliYun/dashboards/arms_jvm.json
+++ b/integrations/AliYun/dashboards/arms_jvm.json
--- a/integrations/AliYun/dashboards/cdn.json
+++ b/integrations/AliYun/dashboards/cdn.json
@@ -1,364 +1,352 @@
 {
-    "id": 0,
-    "group_id": 0,
-    "name": "阿里云CDN",
-    "ident": "",
-    "tags": "CDN",
-    "create_at": 0,
-    "create_by": "",
-    "update_at": 0,
-    "update_by": "",
-    "configs": {
-        "panels": [
-            {
-                "custom": {
-                    "drawStyle": "lines",
-                    "fillOpacity": 0.3,
-                    "gradientMode": "opacity",
-                    "lineInterpolation": "smooth",
-                    "lineWidth": 2,
-                    "scaleDistribution": {
-                        "type": "linear"
-                    },
-                    "spanNulls": true,
-                    "stack": "off"
-                },
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${datasource}",
-                "id": "0430c7e9-7372-45e3-9bb2-c5939baf6bfa",
-                "layout": {
-                    "h": 4,
-                    "i": "0430c7e9-7372-45e3-9bb2-c5939baf6bfa",
-                    "isResizable": true,
-                    "w": 8,
-                    "x": 0,
-                    "y": 0
-                },
-                "maxPerRow": 4,
-                "name": "网络带宽(bits/s)",
-                "options": {
-                    "legend": {
-                        "displayMode": "hidden"
-                    },
-                    "standardOptions": {},
-                    "thresholds": {
-                        "steps": [
-                            {
-                                "color": "#634CD9",
-                                "type": "base",
-                                "value": null
-                            }
-                        ]
-                    },
-                    "tooltip": {
-                        "mode": "all",
-                        "sort": "none"
-                    }
-                },
-                "targets": [
-                    {
-                        "expr": "aliyun_acs_cdn_bps_isp_value{instance_id=\"$instance_id\"}",
-                        "legend": "峰值 {{instance_id}",
-                        "refId": "A"
-                    },
-                    {
-                        "expr": "aliyun_acs_cdn_internet_out_average{instance_id=\"$instance_id\"}",
-                        "legend": "均值 {{instance_id}}",
-                        "refId": "B"
-                    }
-                ],
-                "transformations": [
-                    {
-                        "id": "organize",
-                        "options": {}
-                    }
-                ],
-                "type": "timeseries",
-                "version": "3.0.0"
-            },
-            {
-                "custom": {
-                    "drawStyle": "lines",
-                    "fillOpacity": 0.3,
-                    "gradientMode": "opacity",
-                    "lineInterpolation": "smooth",
-                    "lineWidth": 2,
-                    "scaleDistribution": {
-                        "type": "linear"
-                    },
-                    "spanNulls": false,
-                    "stack": "off"
-                },
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${datasource}",
-                "id": "b438ae81-3dfc-4ed8-b66f-262a4b507e4b",
-                "layout": {
-                    "h": 4,
-                    "i": "b438ae81-3dfc-4ed8-b66f-262a4b507e4b",
-                    "isResizable": true,
-                    "w": 8,
-                    "x": 8,
-                    "y": 0
-                },
-                "maxPerRow": 4,
-                "name": "下行流量(bytes)",
-                "options": {
-                    "legend": {
-                        "displayMode": "hidden"
-                    },
-                    "standardOptions": {},
-                    "thresholds": {
-                        "steps": [
-                            {
-                                "color": "#634CD9",
-                                "type": "base",
-                                "value": null
-                            }
-                        ]
-                    },
-                    "tooltip": {
-                        "mode": "all",
-                        "sort": "none"
-                    }
-                },
-                "targets": [
-                    {
-                        "expr": "aliyun_acs_cdn_internet_out_isp_value{instance_id=\"$instance_id\"}",
-                        "legend": "{{instance_id}}",
-                        "refId": "A"
-                    }
-                ],
-                "transformations": [
-                    {
-                        "id": "organize",
-                        "options": {}
-                    }
-                ],
-                "type": "timeseries",
-                "version": "3.0.0"
-            },
-            {
-                "custom": {
-                    "drawStyle": "lines",
-                    "fillOpacity": 0.3,
-                    "gradientMode": "opacity",
-                    "lineInterpolation": "smooth",
-                    "lineWidth": 2,
-                    "scaleDistribution": {
-                        "type": "linear"
-                    },
-                    "spanNulls": false,
-                    "stack": "off"
-                },
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${datasource}",
-                "id": "af0874c7-3123-437a-93bc-448f6de8b43b",
-                "layout": {
-                    "h": 4,
-                    "i": "c6e41c04-d591-4117-bdf1-5dc6e1f4c084",
-                    "isResizable": true,
-                    "w": 8,
-                    "x": 16,
-                    "y": 0
-                },
-                "maxPerRow": 4,
-                "name": "每秒访问次数(个)",
-                "options": {
-                    "legend": {
-                        "displayMode": "hidden"
-                    },
-                    "standardOptions": {},
-                    "thresholds": {
-                        "steps": [
-                            {
-                                "color": "#634CD9",
-                                "type": "base",
-                                "value": null
-                            }
-                        ]
-                    },
-                    "tooltip": {
-                        "mode": "all",
-                        "sort": "none"
-                    }
-                },
-                "targets": [
-                    {
-                        "expr": "aliyun_acs_cdn_qps_isp_value{instance_id=\"$instance_id\"}",
-                        "legend": "{{instance_id}}",
-                        "refId": "A"
-                    }
-                ],
-                "transformations": [
-                    {
-                        "id": "organize",
-                        "options": {}
-                    }
-                ],
-                "type": "timeseries",
-                "version": "3.0.0"
-            },
-            {
-                "custom": {
-                    "drawStyle": "lines",
-                    "fillOpacity": 0.3,
-                    "gradientMode": "opacity",
-                    "lineInterpolation": "smooth",
-                    "lineWidth": 2,
-                    "scaleDistribution": {
-                        "type": "linear"
-                    },
-                    "spanNulls": true,
-                    "stack": "off"
-                },
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${datasource}",
-                "id": "ec8fcf96-1691-4e45-9a5f-2f183021b434",
-                "layout": {
-                    "h": 4,
-                    "i": "ec8fcf96-1691-4e45-9a5f-2f183021b434",
-                    "isResizable": true,
-                    "w": 8,
-                    "x": 0,
-                    "y": 4
-                },
-                "maxPerRow": 4,
-                "name": "边缘状态码4XX占比(%)",
-                "options": {
-                    "legend": {
-                        "displayMode": "hidden"
-                    },
-                    "standardOptions": {
-                        "util": "percent"
-                    },
-                    "thresholds": {
-                        "steps": [
-                            {
-                                "color": "#634CD9",
-                                "type": "base",
-                                "value": null
-                            }
-                        ]
-                    },
-                    "tooltip": {
-                        "mode": "all",
-                        "sort": "none"
-                    }
-                },
-                "targets": [
-                    {
-                        "expr": "aliyun_acs_cdn_code4xx_isp_value{instance_id=\"$instance_id\"}",
-                        "legend": "峰值{{instance_id}}",
-                        "refId": "A"
-                    },
-                    {
-                        "expr": "aliyun_acs_cdn_bps_average{instance_id=\"$instance_id\"}",
-                        "legend": "均值 {{instance_id}}",
-                        "refId": "B"
-                    }
-                ],
-                "transformations": [
-                    {
-                        "id": "organize",
-                        "options": {}
-                    }
-                ],
-                "type": "timeseries",
-                "version": "3.0.0"
-            },
-            {
-                "custom": {
-                    "drawStyle": "lines",
-                    "fillOpacity": 0.3,
-                    "gradientMode": "opacity",
-                    "lineInterpolation": "smooth",
-                    "lineWidth": 2,
-                    "scaleDistribution": {
-                        "type": "linear"
-                    },
-                    "spanNulls": true,
-                    "stack": "off"
-                },
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${datasource}",
-                "id": "25b6e3fa-f6dd-4452-8025-3c7d9a9a592c",
-                "layout": {
-                    "h": 4,
-                    "i": "e884b781-1bd4-476c-a807-a68a6417764e",
-                    "isResizable": true,
-                    "w": 8,
-                    "x": 8,
-                    "y": 4
-                },
-                "maxPerRow": 4,
-                "name": "边缘状态码5XX占比(%)",
-                "options": {
-                    "legend": {
-                        "displayMode": "hidden"
-                    },
-                    "standardOptions": {
-                        "util": "percent"
-                    },
-                    "thresholds": {
-                        "steps": [
-                            {
-                                "color": "#634CD9",
-                                "type": "base",
-                                "value": null
-                            }
-                        ]
-                    },
-                    "tooltip": {
-                        "mode": "all",
-                        "sort": "none"
-                    }
-                },
-                "targets": [
-                    {
-                        "expr": "aliyun_acs_cdn_code5xx_isp_value{instance_id=\"$instance_id\"}",
-                        "legend": "峰值{{instance_id}}",
-                        "refId": "A"
-                    },
-                    {
-                        "expr": "aliyun_acs_cdn_bps_average{instance_id=\"$instance_id\"}",
-                        "legend": "均值 {{instance_id}}",
-                        "refId": "B"
-                    }
-                ],
-                "transformations": [
-                    {
-                        "id": "organize",
-                        "options": {}
-                    }
-                ],
-                "type": "timeseries",
-                "version": "3.0.0"
-            }
+  "name": "阿里云CDN",
+  "tags": "CDN",
+  "ident": "",
+  "configs": {
+    "var": [
+      {
+        "name": "datasource",
+        "label": "datasource",
+        "type": "datasource",
+        "definition": "prometheus"
+      },
+      {
+        "name": "instance_id",
+        "label": "instance_id",
+        "type": "query",
+        "datasource": {
+          "cate": "prometheus",
+          "value": "${datasource}"
+        },
+        "definition": "label_values(aliyun_acs_cdn_qps_isp_value, instance_id)"
+      }
+    ],
+    "panels": [
+      {
+        "type": "timeseries",
+        "id": "0430c7e9-7372-45e3-9bb2-c5939baf6bfa",
+        "layout": {
+          "h": 4,
+          "w": 8,
+          "x": 0,
+          "y": 0,
+          "i": "0430c7e9-7372-45e3-9bb2-c5939baf6bfa",
+          "isResizable": true
+        },
+        "version": "3.0.0",
+        "datasourceCate": "prometheus",
+        "datasourceValue": "${datasource}",
+        "targets": [
+          {
+            "refId": "A",
+            "expr": "aliyun_acs_cdn_bps_isp_value{instance_id=\"$instance_id\"}",
+            "legend": "峰值 {{instance_id}"
+          },
+          {
+            "expr": "aliyun_acs_cdn_internet_out_average{instance_id=\"$instance_id\"}",
+            "refId": "B",
+            "legend": "均值 {{instance_id}}"
+          }
        ],
-        "var": [
-            {
-                "definition": "prometheus",
-                "label": "datasource",
-                "name": "datasource",
-                "type": "datasource"
-            },
-            {
-                "datasource": {
-                    "cate": "prometheus",
-                    "value": "${datasource}"
-                },
-                "definition": "label_values(aliyun_acs_cdn_qps_isp_value, instance_id)",
-                "label": "instance_id",
-                "name": "instance_id",
-                "type": "query"
-            }
+        "transformations": [
+          {
+            "id": "organize",
+            "options": {}
+          }
        ],
-        "version": "3.0.0"
-    },
-    "public": 0,
-    "public_cate": 0,
-    "bgids": null,
-    "built_in": 0,
-    "hide": 0,
-    "uuid": 1717556327104499000
-}
+        "name": "网络带宽(bits/s)",
+        "maxPerRow": 4,
+        "options": {
+          "tooltip": {
+            "mode": "all",
+            "sort": "none"
+          },
+          "legend": {
+            "displayMode": "hidden"
+          },
+          "standardOptions": {},
+          "thresholds": {
+            "steps": [
+              {
+                "color": "#634CD9",
+                "value": null,
+                "type": "base"
+              }
+            ]
+          }
+        },
+        "custom": {
+          "drawStyle": "lines",
+          "lineInterpolation": "smooth",
+          "spanNulls": true,
+          "lineWidth": 2,
+          "fillOpacity": 0.3,
+          "gradientMode": "opacity",
+          "stack": "off",
+          "scaleDistribution": {
+            "type": "linear"
+          }
+        }
+      },
+      {
+        "type": "timeseries",
+        "id": "b438ae81-3dfc-4ed8-b66f-262a4b507e4b",
+        "layout": {
+          "h": 4,
+          "w": 8,
+          "x": 8,
+          "y": 0,
+          "i": "b438ae81-3dfc-4ed8-b66f-262a4b507e4b",
+          "isResizable": true
+        },
+        "version": "3.0.0",
+        "datasourceCate": "prometheus",
+        "datasourceValue": "${datasource}",
+        "targets": [
+          {
+            "refId": "A",
+            "expr": "aliyun_acs_cdn_internet_out_isp_value{instance_id=\"$instance_id\"}",
+            "legend": "{{instance_id}}"
+          }
+        ],
+        "transformations": [
+          {
+            "id": "organize",
+            "options": {}
+          }
+        ],
+        "name": "下行流量(bytes)",
+        "maxPerRow": 4,
+        "options": {
+          "tooltip": {
+            "mode": "all",
+            "sort": "none"
+          },
+          "legend": {
+            "displayMode": "hidden"
+          },
+          "standardOptions": {},
+          "thresholds": {
+            "steps": [
+              {
+                "color": "#634CD9",
+                "value": null,
+                "type": "base"
+              }
+            ]
+          }
+        },
+        "custom": {
+          "drawStyle": "lines",
+          "lineInterpolation": "smooth",
+          "spanNulls": false,
+          "lineWidth": 2,
+          "fillOpacity": 0.3,
+          "gradientMode": "opacity",
+          "stack": "off",
+          "scaleDistribution": {
+            "type": "linear"
+          }
+        }
+      },
+      {
+        "type": "timeseries",
+        "id": "af0874c7-3123-437a-93bc-448f6de8b43b",
+        "layout": {
+          "h": 4,
+          "w": 8,
+          "x": 16,
+          "y": 0,
+          "i": "c6e41c04-d591-4117-bdf1-5dc6e1f4c084",
+          "isResizable": true
+        },
+        "version": "3.0.0",
+        "datasourceCate": "prometheus",
+        "datasourceValue": "${datasource}",
+        "targets": [
+          {
+            "refId": "A",
+            "expr": "aliyun_acs_cdn_qps_isp_value{instance_id=\"$instance_id\"}",
+            "legend": "{{instance_id}}"
+          }
+        ],
+        "transformations": [
+          {
+            "id": "organize",
+            "options": {}
+          }
+        ],
+        "name": "每秒访问次数(个)",
+        "maxPerRow": 4,
+        "options": {
+          "tooltip": {
+            "mode": "all",
+            "sort": "none"
+          },
+          "legend": {
+            "displayMode": "hidden"
+          },
+          "standardOptions": {},
+          "thresholds": {
+            "steps": [
+              {
+                "color": "#634CD9",
+                "value": null,
+                "type": "base"
+              }
+            ]
+          }
+        },
+        "custom": {
+          "drawStyle": "lines",
+          "lineInterpolation": "smooth",
+          "spanNulls": false,
+          "lineWidth": 2,
+          "fillOpacity": 0.3,
+          "gradientMode": "opacity",
+          "stack": "off",
+          "scaleDistribution": {
+            "type": "linear"
+          }
+        }
+      },
+      {
+        "type": "timeseries",
+        "id": "ec8fcf96-1691-4e45-9a5f-2f183021b434",
+        "layout": {
+          "h": 4,
+          "w": 8,
+          "x": 0,
+          "y": 4,
+          "i": "ec8fcf96-1691-4e45-9a5f-2f183021b434",
+          "isResizable": true
+        },
+        "version": "3.0.0",
+        "datasourceCate": "prometheus",
+        "datasourceValue": "${datasource}",
+        "targets": [
+          {
+            "refId": "A",
+            "expr": "aliyun_acs_cdn_code4xx_isp_value{instance_id=\"$instance_id\"}",
+            "legend": "峰值{{instance_id}}"
+          },
+          {
+            "expr": "aliyun_acs_cdn_bps_average{instance_id=\"$instance_id\"}",
+            "refId": "B",
+            "legend": "均值 {{instance_id}}"
+          }
+        ],
+        "transformations": [
+          {
+            "id": "organize",
+            "options": {}
+          }
+        ],
+        "name": "边缘状态码4XX占比(%)",
+        "maxPerRow": 4,
+        "options": {
+          "tooltip": {
+            "mode": "all",
+            "sort": "none"
+          },
+          "legend": {
+            "displayMode": "hidden"
+          },
+          "standardOptions": {
+            "util": "percent"
+          },
+          "thresholds": {
+            "steps": [
+              {
+                "color": "#634CD9",
+                "value": null,
+                "type": "base"
+              }
+            ]
+          }
+        },
+        "custom": {
+          "drawStyle": "lines",
+          "lineInterpolation": "smooth",
+          "spanNulls": true,
+          "lineWidth": 2,
+          "fillOpacity": 0.3,
+          "gradientMode": "opacity",
+          "stack": "off",
+          "scaleDistribution": {
+            "type": "linear"
+          }
+        }
+      },
+      {
+        "type": "timeseries",
+        "id": "25b6e3fa-f6dd-4452-8025-3c7d9a9a592c",
+        "layout": {
+          "h": 4,
+          "w": 8,
+          "x": 8,
+          "y": 4,
+          "i": "e884b781-1bd4-476c-a807-a68a6417764e",
+          "isResizable": true
+        },
+        "version": "3.0.0",
+        "datasourceCate": "prometheus",
+        "datasourceValue": "${datasource}",
+        "targets": [
+          {
+            "refId": "A",
+            "expr": "aliyun_acs_cdn_code5xx_isp_value{instance_id=\"$instance_id\"}",
+            "legend": "峰值{{instance_id}}"
+          },
+          {
+            "expr": "aliyun_acs_cdn_bps_average{instance_id=\"$instance_id\"}",
+            "refId": "B",
+            "legend": "均值 {{instance_id}}"
+          }
+        ],
+        "transformations": [
+          {
+            "id": "organize",
+            "options": {}
+          }
+        ],
+        "name": "边缘状态码5XX占比(%)",
+        "maxPerRow": 4,
+        "options": {
+          "tooltip": {
+            "mode": "all",
+            "sort": "none"
+          },
+          "legend": {
+            "displayMode": "hidden"
+          },
+          "standardOptions": {
+            "util": "percent"
+          },
+          "thresholds": {
+            "steps": [
+              {
+                "color": "#634CD9",
+                "value": null,
+                "type": "base"
+              }
+            ]
+          }
+        },
+        "custom": {
+          "drawStyle": "lines",
+          "lineInterpolation": "smooth",
+          "spanNulls": true,
+          "lineWidth": 2,
+          "fillOpacity": 0.3,
+          "gradientMode": "opacity",
+          "stack": "off",
+          "scaleDistribution": {
+            "type": "linear"
+          }
+        }
+      }
+    ],
+    "version": "3.0.0"
+  }
+}
--- a/integrations/AliYun/dashboards/ecs.json
+++ b/integrations/AliYun/dashboards/ecs.json
@@ -1,336 +1,324 @@
 {
-    "id": 0,
-    "group_id": 0,
-    "name": "阿里云ECS",
-    "ident": "",
-    "tags": "",
-    "create_at": 0,
-    "create_by": "",
-    "update_at": 0,
-    "update_by": "",
-    "configs": {
-        "panels": [
-            {
-                "custom": {
-                    "drawStyle": "lines",
-                    "fillOpacity": 0.3,
-                    "gradientMode": "opacity",
-                    "lineInterpolation": "smooth",
-                    "lineWidth": 2,
-                    "scaleDistribution": {
-                        "type": "linear"
-                    },
-                    "spanNulls": false,
-                    "stack": "off"
-                },
-                "datasourceCate": "prometheus",
-                "datasourceName": "Default",
-                "datasourceValue": "${datasource}",
-                "id": "8606d5ad-c3c7-4b1d-86bf-474d3302ee17",
-                "layout": {
-                    "h": 4,
-                    "i": "8606d5ad-c3c7-4b1d-86bf-474d3302ee17",
-                    "isResizable": true,
-                    "w": 12,
-                    "x": 0,
-                    "y": 0
-                },
-                "maxPerRow": 4,
-                "name": "CPU平均使用率",
-                "options": {
-                    "legend": {
-                        "displayMode": "hidden"
-                    },
-                    "standardOptions": {},
-                    "thresholds": {
-                        "steps": [
-                            {
-                                "color": "#634CD9",
-                                "type": "base",
-                                "value": null
-                            }
-                        ]
-                    },
-                    "tooltip": {
-                        "mode": "all",
-                        "sort": "none"
-                    }
-                },
-                "targets": [
-                    {
-                        "expr": "sum(aliyun_acs_ecs_dashboard_cpu_utilization_average{ident=~\"$ident\"}) by (ident,instance_id)",
-                        "refId": "A"
-                    }
-                ],
-                "type": "timeseries",
-                "version": "2.0.0"
-            },
-            {
-                "custom": {
-                    "drawStyle": "lines",
-                    "fillOpacity": 0.3,
-                    "gradientMode": "opacity",
-                    "lineInterpolation": "smooth",
-                    "lineWidth": 2,
-                    "scaleDistribution": {
-                        "type": "linear"
-                    },
-                    "spanNulls": false,
-                    "stack": "off"
-                },
-                "datasourceCate": "prometheus",
-                "datasourceName": "Default",
-                "datasourceValue": "${datasource}",
-                "id": "c7034fe3-5521-4867-a8bd-429767cc03a2",
-                "layout": {
-                    "h": 4,
-                    "i": "55404296-0bd9-409d-aeaf-e9c7cceea0dd",
-                    "isResizable": true,
-                    "w": 12,
-                    "x": 12,
-                    "y": 0
-                },
-                "maxPerRow": 4,
-                "name": "内存平均使用率",
-                "options": {
-                    "legend": {
-                        "displayMode": "hidden"
-                    },
-                    "standardOptions": {},
-                    "thresholds": {
-                        "steps": [
-                            {
-                                "color": "#634CD9",
-                                "type": "base",
-                                "value": null
-                            }
-                        ]
-                    },
-                    "tooltip": {
-                        "mode": "all",
-                        "sort": "none"
-                    }
-                },
-                "targets": [
-                    {
-                        "expr": "sum(aliyun_acs_ecs_dashboard_memory_usedutilization_average{ident=~\"$ident\"}) by (ident,instance_id)",
-                        "refId": "A"
-                    }
-                ],
-                "type": "timeseries",
-                "version": "2.0.0"
-            },
-            {
-                "custom": {
-                    "drawStyle": "lines",
-                    "fillOpacity": 0.3,
-                    "gradientMode": "opacity",
-                    "lineInterpolation": "smooth",
-                    "lineWidth": 2,
-                    "scaleDistribution": {
-                        "type": "linear"
-                    },
-                    "spanNulls": false,
-                    "stack": "off"
-                },
-                "datasourceCate": "prometheus",
-                "datasourceName": "Default",
-                "datasourceValue": "${datasource}",
-                "id": "e4c11925-b359-4edb-9269-4bdd4d230224",
-                "layout": {
-                    "h": 4,
-                    "i": "0c7b3a5a-ef12-4349-be9b-7a245bf01418",
-                    "isResizable": true,
-                    "w": 12,
-                    "x": 0,
-                    "y": 4
-                },
-                "maxPerRow": 4,
-                "name": "系统负载[5m]",
-                "options": {
-                    "legend": {
-                        "displayMode": "hidden"
-                    },
-                    "standardOptions": {
-                        "util": "percent"
-                    },
-                    "thresholds": {
-                        "steps": [
-                            {
-                                "color": "#634CD9",
-                                "type": "base",
-                                "value": null
-                            }
-                        ]
-                    },
-                    "tooltip": {
-                        "mode": "all",
-                        "sort": "none"
-                    }
-                },
-                "targets": [
-                    {
-                        "expr": "sum(aliyun_acs_ecs_dashboard_load_5m_average{ident=~\"$ident\"}) by (ident,instance_id)",
-                        "legend": "{{ident}} {{instance_id}} 5分钟负载",
-                        "refId": "B"
-                    }
-                ],
-                "type": "timeseries",
-                "version": "2.0.0"
-            },
-            {
-                "custom": {
-                    "drawStyle": "lines",
-                    "fillOpacity": 0.3,
-                    "gradientMode": "opacity",
-                    "lineInterpolation": "smooth",
-                    "lineWidth": 2,
-                    "scaleDistribution": {
-                        "type": "linear"
-                    },
-                    "spanNulls": false,
-                    "stack": "off"
-                },
-                "datasourceCate": "prometheus",
-                "datasourceName": "Default",
-                "datasourceValue": "${datasource}",
-                "id": "388d4da6-eb1f-48f1-955d-37579809dfec",
-                "layout": {
-                    "h": 4,
-                    "i": "5abea3d2-ea82-4bdb-a4f0-4dd1316c0377",
-                    "isResizable": true,
-                    "w": 12,
-                    "x": 12,
-                    "y": 5
-                },
-                "maxPerRow": 4,
-                "name": "磁盘平均使用率",
-                "options": {
-                    "legend": {
-                        "displayMode": "hidden"
-                    },
-                    "standardOptions": {
-                        "util": "percent"
-                    },
-                    "thresholds": {
-                        "steps": [
-                            {
-                                "color": "#634CD9",
-                                "type": "base",
-                                "value": null
-                            }
-                        ]
-                    },
-                    "tooltip": {
-                        "mode": "all",
-                        "sort": "none"
-                    }
-                },
-                "targets": [
-                    {
-                        "expr": "sum(aliyun_acs_ecs_dashboard_diskusage_utilization_average{ident=~\"$ident\"}) by (ident,instance_id)",
-                        "refId": "A"
-                    }
-                ],
-                "type": "timeseries",
-                "version": "2.0.0"
-            },
-            {
-                "custom": {
-                    "drawStyle": "lines",
-                    "fillOpacity": 0.3,
-                    "gradientMode": "opacity",
-                    "lineInterpolation": "smooth",
-                    "lineWidth": 2,
-                    "scaleDistribution": {
-                        "type": "linear"
-                    },
-                    "spanNulls": false,
-                    "stack": "off"
-                },
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${datasource}",
-                "id": "f8d19cc9-0168-4c13-b9a9-c7980eced974",
-                "layout": {
-                    "h": 4,
-                    "i": "f8d19cc9-0168-4c13-b9a9-c7980eced974",
-                    "w": 12,
-                    "x": 0,
-                    "y": 9
-                },
-                "maxPerRow": 4,
-                "name": "网络流量",
-                "options": {
-                    "legend": {
-                        "displayMode": "hidden"
-                    },
-                    "standardOptions": {
-                        "util": "bitsSI"
-                    },
-                    "thresholds": {
-                        "steps": [
-                            {
-                                "color": "#634CD9",
-                                "type": "base",
-                                "value": null
-                            }
-                        ]
-                    },
-                    "tooltip": {
-                        "mode": "all",
-                        "sort": "none"
-                    }
-                },
-                "targets": [
-                    {
-                        "expr": "sum(aliyun_acs_ecs_dashboard_intranet_in_average{ident=~\"$ident\"}) by (ident,instance_id)",
-                        "legend": "主机：{{ident}} 实例ID: {{instance_id}} 入流量",
-                        "refId": "A",
-                        "step": 300,
-                        "time": {
-                            "end": "now",
-                            "start": "now-5m"
-                        }
-                    },
-                    {
-                        "expr": "sum(aliyun_acs_ecs_dashboard_intranet_out_average{ident=~\"$ident\"}) by (ident,instance_id)",
-                        "legend": "主机：{{ident}} 实例ID: {{instance_id}} 出流量",
-                        "refId": "B",
-                        "step": 300,
-                        "time": {
-                            "end": "now",
-                            "start": "now-5m"
-                        }
-                    }
-                ],
-                "type": "timeseries",
-                "version": "2.0.0"
-            }
+  "name": "阿里云ECS",
+  "tags": "",
+  "ident": "",
+  "configs": {
+    "panels": [
+      {
+        "custom": {
+          "drawStyle": "lines",
+          "fillOpacity": 0.3,
+          "gradientMode": "opacity",
+          "lineInterpolation": "smooth",
+          "lineWidth": 2,
+          "scaleDistribution": {
+            "type": "linear"
+          },
+          "spanNulls": false,
+          "stack": "off"
+        },
+        "datasourceCate": "prometheus",
+        "datasourceName": "Default",
+        "id": "8606d5ad-c3c7-4b1d-86bf-474d3302ee17",
+        "layout": {
+          "h": 4,
+          "i": "8606d5ad-c3c7-4b1d-86bf-474d3302ee17",
+          "isResizable": true,
+          "w": 12,
+          "x": 0,
+          "y": 0
+        },
+        "maxPerRow": 4,
+        "name": "CPU平均使用率",
+        "options": {
+          "legend": {
+            "displayMode": "hidden"
+          },
+          "standardOptions": {},
+          "thresholds": {
+            "steps": [
+              {
+                "color": "#634CD9",
+                "type": "base",
+                "value": null
+              }
+            ]
+          },
+          "tooltip": {
+            "mode": "all",
+            "sort": "none"
+          }
+        },
+        "targets": [
+          {
+            "expr": "sum(aliyun_acs_ecs_dashboard_cpu_utilization_average{ident=~\"$ident\"}) by (ident,instance_id)",
+            "refId": "A"
+          }
        ],
-        "var": [
-            {
-                "definition": "prometheus",
-                "name": "datasource",
-                "type": "datasource"
-            },
-            {
-                "allOption": true,
-                "datasource": {
-                    "cate": "prometheus",
-                    "value": "${datasource}"
-                },
-                "definition": "label_values(aliyun_acs_ecs_dashboard_cpu_utilization_average,ident)",
-                "multi": true,
-                "name": "ident",
-                "type": "query"
-            }
+        "type": "timeseries",
+        "version": "2.0.0",
+        "datasourceValue": "${datasource}"
+      },
+      {
+        "custom": {
+          "drawStyle": "lines",
+          "fillOpacity": 0.3,
+          "gradientMode": "opacity",
+          "lineInterpolation": "smooth",
+          "lineWidth": 2,
+          "scaleDistribution": {
+            "type": "linear"
+          },
+          "spanNulls": false,
+          "stack": "off"
+        },
+        "datasourceCate": "prometheus",
+        "datasourceName": "Default",
+        "id": "c7034fe3-5521-4867-a8bd-429767cc03a2",
+        "layout": {
+          "h": 4,
+          "i": "55404296-0bd9-409d-aeaf-e9c7cceea0dd",
+          "isResizable": true,
+          "w": 12,
+          "x": 12,
+          "y": 0
+        },
+        "maxPerRow": 4,
+        "name": "内存平均使用率",
+        "options": {
+          "legend": {
+            "displayMode": "hidden"
+          },
+          "standardOptions": {},
+          "thresholds": {
+            "steps": [
+              {
+                "color": "#634CD9",
+                "type": "base",
+                "value": null
+              }
+            ]
+          },
+          "tooltip": {
+            "mode": "all",
+            "sort": "none"
+          }
+        },
+        "targets": [
+          {
+            "expr": "sum(aliyun_acs_ecs_dashboard_memory_usedutilization_average{ident=~\"$ident\"}) by (ident,instance_id)",
+            "refId": "A"
+          }
        ],
-        "version": "3.0.0"
-    },
-    "public": 0,
-    "public_cate": 0,
-    "bgids": null,
-    "built_in": 0,
-    "hide": 0,
-    "uuid": 1717556327106006000
-}
+        "type": "timeseries",
+        "version": "2.0.0",
+        "datasourceValue": "${datasource}"
+      },
+      {
+        "custom": {
+          "drawStyle": "lines",
+          "fillOpacity": 0.3,
+          "gradientMode": "opacity",
+          "lineInterpolation": "smooth",
+          "lineWidth": 2,
+          "scaleDistribution": {
+            "type": "linear"
+          },
+          "spanNulls": false,
+          "stack": "off"
+        },
+        "datasourceCate": "prometheus",
+        "datasourceName": "Default",
+        "id": "e4c11925-b359-4edb-9269-4bdd4d230224",
+        "layout": {
+          "h": 4,
+          "i": "0c7b3a5a-ef12-4349-be9b-7a245bf01418",
+          "isResizable": true,
+          "w": 12,
+          "x": 0,
+          "y": 4
+        },
+        "maxPerRow": 4,
+        "name": "系统负载[5m]",
+        "options": {
+          "legend": {
+            "displayMode": "hidden"
+          },
+          "standardOptions": {
+            "util": "percent"
+          },
+          "thresholds": {
+            "steps": [
+              {
+                "color": "#634CD9",
+                "type": "base",
+                "value": null
+              }
+            ]
+          },
+          "tooltip": {
+            "mode": "all",
+            "sort": "none"
+          }
+        },
+        "targets": [
+          {
+            "expr": "sum(aliyun_acs_ecs_dashboard_load_5m_average{ident=~\"$ident\"}) by (ident,instance_id)",
+            "legend": "{{ident}} {{instance_id}} 5分钟负载",
+            "refId": "B"
+          }
+        ],
+        "type": "timeseries",
+        "version": "2.0.0",
+        "datasourceValue": "${datasource}"
+      },
+      {
+        "custom": {
+          "drawStyle": "lines",
+          "fillOpacity": 0.3,
+          "gradientMode": "opacity",
+          "lineInterpolation": "smooth",
+          "lineWidth": 2,
+          "scaleDistribution": {
+            "type": "linear"
+          },
+          "spanNulls": false,
+          "stack": "off"
+        },
+        "datasourceCate": "prometheus",
+        "datasourceName": "Default",
+        "id": "388d4da6-eb1f-48f1-955d-37579809dfec",
+        "layout": {
+          "h": 4,
+          "i": "5abea3d2-ea82-4bdb-a4f0-4dd1316c0377",
+          "isResizable": true,
+          "w": 12,
+          "x": 12,
+          "y": 5
+        },
+        "maxPerRow": 4,
+        "name": "磁盘平均使用率",
+        "options": {
+          "legend": {
+            "displayMode": "hidden"
+          },
+          "standardOptions": {
+            "util": "percent"
+          },
+          "thresholds": {
+            "steps": [
+              {
+                "color": "#634CD9",
+                "type": "base",
+                "value": null
+              }
+            ]
+          },
+          "tooltip": {
+            "mode": "all",
+            "sort": "none"
+          }
+        },
+        "targets": [
+          {
+            "expr": "sum(aliyun_acs_ecs_dashboard_diskusage_utilization_average{ident=~\"$ident\"}) by (ident,instance_id)",
+            "refId": "A"
+          }
+        ],
+        "type": "timeseries",
+        "version": "2.0.0",
+        "datasourceValue": "${datasource}"
+      },
+      {
+        "custom": {
+          "drawStyle": "lines",
+          "fillOpacity": 0.3,
+          "gradientMode": "opacity",
+          "lineInterpolation": "smooth",
+          "lineWidth": 2,
+          "scaleDistribution": {
+            "type": "linear"
+          },
+          "spanNulls": false,
+          "stack": "off"
+        },
+        "datasourceCate": "prometheus",
+        "id": "f8d19cc9-0168-4c13-b9a9-c7980eced974",
+        "layout": {
+          "h": 4,
+          "i": "f8d19cc9-0168-4c13-b9a9-c7980eced974",
+          "w": 12,
+          "x": 0,
+          "y": 9
+        },
+        "maxPerRow": 4,
+        "name": "网络流量",
+        "options": {
+          "legend": {
+            "displayMode": "hidden"
+          },
+          "standardOptions": {
+            "util": "bitsSI"
+          },
+          "thresholds": {
+            "steps": [
+              {
+                "color": "#634CD9",
+                "type": "base",
+                "value": null
+              }
+            ]
+          },
+          "tooltip": {
+            "mode": "all",
+            "sort": "none"
+          }
+        },
+        "targets": [
+          {
+            "expr": "sum(aliyun_acs_ecs_dashboard_intranet_in_average{ident=~\"$ident\"}) by (ident,instance_id)",
+            "legend": "主机：{{ident}} 实例ID: {{instance_id}} 入流量",
+            "refId": "A",
+            "step": 300,
+            "time": {
+              "end": "now",
+              "start": "now-5m"
+            }
+          },
+          {
+            "expr": "sum(aliyun_acs_ecs_dashboard_intranet_out_average{ident=~\"$ident\"}) by (ident,instance_id)",
+            "legend": "主机：{{ident}} 实例ID: {{instance_id}} 出流量",
+            "refId": "B",
+            "step": 300,
+            "time": {
+              "end": "now",
+              "start": "now-5m"
+            }
+          }
+        ],
+        "type": "timeseries",
+        "version": "2.0.0",
+        "datasourceValue": "${datasource}"
+      }
+    ],
+    "var": [
+      {
+        "name": "datasource",
+        "type": "datasource",
+        "definition": "prometheus"
+      },
+      {
+        "allOption": true,
+        "datasource": {
+          "cate": "prometheus",
+          "value": "${datasource}"
+        },
+        "definition": "label_values(aliyun_acs_ecs_dashboard_cpu_utilization_average,ident)",
+        "multi": true,
+        "name": "ident",
+        "type": "query"
+      }
+    ],
+    "version": "3.0.0"
+  }
+}
--- a/integrations/AliYun/dashboards/mongodb.json
+++ b/integrations/AliYun/dashboards/mongodb.json
--- a/integrations/AliYun/dashboards/mse.json
+++ b/integrations/AliYun/dashboards/mse.json
@@ -1,486 +1,474 @@
 {
-    "id": 0,
-    "group_id": 0,
-    "name": "MSE监控大盘",
-    "ident": "MSE-Monitor",
-    "tags": "",
-    "create_at": 0,
-    "create_by": "",
-    "update_at": 0,
-    "update_by": "",
-    "configs": {
-        "panels": [
-            {
-                "custom": {
-                    "calc": "lastNotNull",
-                    "colSpan": 1,
-                    "colorMode": "value",
-                    "graphMode": "none",
-                    "textMode": "valueAndName",
-                    "textSize": {},
-                    "valueField": "Value"
-                },
-                "datasourceCate": "prometheus",
-                "datasourceValue": 7,
-                "id": "aba69dc0-5a11-4bcd-add9-335b5a677bee",
-                "layout": {
-                    "h": 5,
-                    "i": "aba69dc0-5a11-4bcd-add9-335b5a677bee",
-                    "isResizable": true,
-                    "w": 6,
-                    "x": 0,
-                    "y": 0
-                },
-                "maxPerRow": 4,
-                "name": "PV（一分钟）",
-                "options": {
-                    "standardOptions": {},
-                    "thresholds": {
-                        "steps": [
-                            {
-                                "color": "#634CD9",
-                                "type": "base",
-                                "value": null
-                            }
-                        ]
-                    }
-                },
-                "targets": [
-                    {
-                        "expr": "sum(delta(envoy_http_rq_total{envoy_clusterid=\"$envoy_clusterid\"}[1m]))",
-                        "refId": "A"
-                    }
-                ],
-                "transformations": [
-                    {
-                        "id": "organize",
-                        "options": {}
-                    }
-                ],
-                "type": "stat",
-                "version": "3.0.0"
-            },
-            {
-                "custom": {
-                    "calc": "lastNotNull",
-                    "detailName": "详情",
-                    "legengPosition": "right"
-                },
-                "datasourceCate": "prometheus",
-                "datasourceValue": 7,
-                "id": "e34a272e-6125-4afa-a2c1-80d7d9078673",
-                "layout": {
-                    "h": 5,
-                    "i": "116a5607-5860-426e-a560-d3241da88b57",
-                    "isResizable": true,
-                    "w": 9,
-                    "x": 6,
-                    "y": 0
-                },
-                "maxPerRow": 4,
-                "name": "请求成功率",
-                "options": {
-                    "standardOptions": {
-                        "decimals": 0,
-                        "util": "percentUnit"
-                    }
-                },
-                "targets": [
-                    {
-                        "expr": "sum(delta(envoy_http_downstream_rq{envoy_clusterid=\"$envoy_clusterid\"}[3m])) by (response_code_class)",
-                        "legend": "",
-                        "refId": "A"
-                    }
-                ],
-                "transformations": [
-                    {
-                        "id": "organize",
-                        "options": {}
-                    }
-                ],
-                "type": "pie",
-                "version": "3.0.0"
-            },
-            {
-                "custom": {
-                    "drawStyle": "lines",
-                    "fillOpacity": 0.3,
-                    "gradientMode": "opacity",
-                    "lineInterpolation": "smooth",
-                    "lineWidth": 2,
-                    "scaleDistribution": {
-                        "type": "linear"
-                    },
-                    "spanNulls": false,
-                    "stack": "off"
-                },
-                "datasourceCate": "prometheus",
-                "datasourceValue": 7,
-                "id": "a8917108-58a6-479a-8ec4-571f1b5a79c2",
-                "layout": {
-                    "h": 5,
-                    "i": "9be66a1f-c0bb-47dc-a3c0-ad43b588789b",
-                    "isResizable": true,
-                    "w": 9,
-                    "x": 15,
-                    "y": 0
-                },
-                "maxPerRow": 4,
-                "name": "请求量（一分钟）",
-                "options": {
-                    "legend": {
-                        "displayMode": "list"
-                    },
-                    "standardOptions": {
-                        "util": "bytesSI"
-                    },
-                    "thresholds": {
-                        "steps": [
-                            {
-                                "color": "#634CD9",
-                                "type": "base",
-                                "value": null
-                            }
-                        ]
-                    },
-                    "tooltip": {
-                        "mode": "all",
-                        "sort": "none"
-                    }
-                },
-                "targets": [
-                    {
-                        "expr": "sum(delta(envoy_http_downstream_cx_rx_bytes_total{envoy_clusterid=\"$envoy_clusterid\"}[1m]))",
-                        "legend": "",
-                        "refId": "A"
-                    }
-                ],
-                "transformations": [
-                    {
-                        "id": "organize",
-                        "options": {}
-                    }
-                ],
-                "type": "timeseries",
-                "version": "3.0.0"
-            },
-            {
-                "custom": {
-                    "drawStyle": "lines",
-                    "fillOpacity": 0.3,
-                    "gradientMode": "opacity",
-                    "lineInterpolation": "smooth",
-                    "lineWidth": 2,
-                    "scaleDistribution": {
-                        "type": "linear"
-                    },
-                    "spanNulls": false,
-                    "stack": "off"
-                },
-                "datasourceCate": "prometheus",
-                "datasourceValue": 7,
-                "id": "1b102bee-ccc9-49a0-a1d1-cc097bb6a987",
-                "layout": {
-                    "h": 6,
-                    "i": "1b102bee-ccc9-49a0-a1d1-cc097bb6a987",
-                    "isResizable": true,
-                    "w": 8,
-                    "x": 0,
-                    "y": 5
-                },
-                "maxPerRow": 4,
-                "name": "平均延迟",
-                "options": {
-                    "legend": {
-                        "displayMode": "list"
-                    },
-                    "standardOptions": {
-                        "util": "milliseconds"
-                    },
-                    "thresholds": {
-                        "steps": [
-                            {
-                                "color": "#634CD9",
-                                "type": "base",
-                                "value": null
-                            }
-                        ]
-                    },
-                    "tooltip": {
-                        "mode": "all",
-                        "sort": "none"
-                    }
-                },
-                "targets": [
-                    {
-                        "expr": "sum(rate(envoy_http_downstream_rq_time_sum{envoy_clusterid=\"$envoy_clusterid\"}[10m])) / sum(rate(envoy_http_downstream_rq_time_count{envoy_clusterid=\"$envoy_clusterid\"}[10m]))",
-                        "legend": "",
-                        "refId": "A"
-                    }
-                ],
-                "transformations": [
-                    {
-                        "id": "organize",
-                        "options": {}
-                    }
-                ],
-                "type": "timeseries",
-                "version": "3.0.0"
-            },
-            {
-                "custom": {
-                    "drawStyle": "lines",
-                    "fillOpacity": 0.3,
-                    "gradientMode": "opacity",
-                    "lineInterpolation": "smooth",
-                    "lineWidth": 2,
-                    "scaleDistribution": {
-                        "type": "linear"
-                    },
-                    "spanNulls": false,
-                    "stack": "off"
-                },
-                "datasourceCate": "prometheus",
-                "datasourceValue": 7,
-                "id": "b432fc11-2f9d-4b72-826b-6ca787401859",
-                "layout": {
-                    "h": 6,
-                    "i": "ea4c1073-07d3-4adc-a4d3-4812cc55ad7c",
-                    "isResizable": true,
-                    "w": 8,
-                    "x": 8,
-                    "y": 5
-                },
-                "maxPerRow": 4,
-                "name": "P95",
-                "options": {
-                    "legend": {
-                        "displayMode": "list"
-                    },
-                    "standardOptions": {
-                        "util": "milliseconds"
-                    },
-                    "thresholds": {
-                        "steps": [
-                            {
-                                "color": "#634CD9",
-                                "type": "base",
-                                "value": null
-                            }
-                        ]
-                    },
-                    "tooltip": {
-                        "mode": "all",
-                        "sort": "none"
-                    }
-                },
-                "targets": [
-                    {
-                        "expr": "histogram_quantile(0.95, sum(rate(envoy_http_downstream_rq_time_bucket{envoy_clusterid=\"$envoy_clusterid\"}[10m])) by (le, service))",
-                        "legend": "",
-                        "refId": "A"
-                    }
-                ],
-                "transformations": [
-                    {
-                        "id": "organize",
-                        "options": {}
-                    }
-                ],
-                "type": "timeseries",
-                "version": "3.0.0"
-            },
-            {
-                "custom": {
-                    "drawStyle": "lines",
-                    "fillOpacity": 0.3,
-                    "gradientMode": "opacity",
-                    "lineInterpolation": "smooth",
-                    "lineWidth": 2,
-                    "scaleDistribution": {
-                        "type": "linear"
-                    },
-                    "spanNulls": false,
-                    "stack": "off"
-                },
-                "datasourceCate": "prometheus",
-                "datasourceValue": 7,
-                "id": "9062d707-d8a7-4a93-82e5-46f6059e8d70",
-                "layout": {
-                    "h": 6,
-                    "i": "d36246b9-4a9c-4ab0-9171-c5ac330be0ca",
-                    "isResizable": true,
-                    "w": 8,
-                    "x": 16,
-                    "y": 5
-                },
-                "maxPerRow": 4,
-                "name": "QPS",
-                "options": {
-                    "legend": {
-                        "displayMode": "list"
-                    },
-                    "standardOptions": {
-                        "util": "none"
-                    },
-                    "thresholds": {
-                        "steps": [
-                            {
-                                "color": "#634CD9",
-                                "type": "base",
-                                "value": null
-                            }
-                        ]
-                    },
-                    "tooltip": {
-                        "mode": "all",
-                        "sort": "none"
-                    }
-                },
-                "targets": [
-                    {
-                        "expr": "sum(irate(envoy_http_downstream_rq{envoy_clusterid=\"$envoy_clusterid\"}[2m]))",
-                        "legend": "",
-                        "refId": "A"
-                    }
-                ],
-                "transformations": [
-                    {
-                        "id": "organize",
-                        "options": {}
-                    }
-                ],
-                "type": "timeseries",
-                "version": "3.0.0"
-            },
-            {
-                "custom": {
-                    "baseColor": "#9470FF",
-                    "calc": "lastNotNull",
-                    "serieWidth": 40,
-                    "sortOrder": "desc"
-                },
-                "datasourceCate": "prometheus",
-                "datasourceValue": 7,
-                "id": "c3f64cfd-adb2-4316-bb84-55f88ed513a3",
-                "layout": {
-                    "h": 6,
-                    "i": "807c34f9-bd61-4da3-ad88-41bb3e045605",
-                    "isResizable": true,
-                    "w": 24,
-                    "x": 0,
-                    "y": 11
-                },
-                "maxPerRow": 4,
-                "name": "Top Service Request",
-                "options": {
-                    "standardOptions": {}
-                },
-                "targets": [
-                    {
-                        "expr": "label_replace(label_replace(topk(10, sum(delta(envoy_cluster_upstream_rq_total{envoy_clusterid=\"$envoy_clusterid\", cluster_name=~\"outbound_([0-9]+)_(.*)_(.*).svc.cluster.local$\", cluster_name!~\".*waf-proxy.static\", cluster_name!~\"outbound_([0-9]+)_(.*)_kubernetes.default.svc.cluster.local\", cluster_name!~\"outbound_([0-9]+)_(.*)_(.*).kube-system.svc.cluster.local\", cluster_name!~\"outbound_([0-9]+)_(.*)_(.*).arms-prom.svc.cluster.local\"}[1m])) by (cluster_name)), \"service_name\", \"$3\", \"cluster_name\", \"outbound_([0-9]+)_(.*)_(.*).svc.cluster.local$\"), \"port\", \"$1\", \"cluster_name\", \"outbound_([0-9]+)_(.*)_(.*).svc.cluster.local$\")",
-                        "legend": "{{service_name}}:{{port}}",
-                        "refId": "A"
-                    }
-                ],
-                "transformations": [
-                    {
-                        "id": "organize",
-                        "options": {}
-                    }
-                ],
-                "type": "barGauge",
-                "version": "3.0.0"
-            },
-            {
-                "custom": {
-                    "drawStyle": "lines",
-                    "fillOpacity": 0.3,
-                    "gradientMode": "opacity",
-                    "lineInterpolation": "smooth",
-                    "lineWidth": 2,
-                    "scaleDistribution": {
-                        "type": "linear"
-                    },
-                    "spanNulls": false,
-                    "stack": "off"
-                },
-                "datasourceCate": "prometheus",
-                "datasourceValue": 7,
-                "id": "8df57678-ff19-4b63-b768-4dad3f12222b",
-                "layout": {
-                    "h": 5,
-                    "i": "44f413ba-3262-4ccf-a4b1-c1165bafaaff",
-                    "isResizable": true,
-                    "w": 24,
-                    "x": 0,
-                    "y": 17
-                },
-                "maxPerRow": 4,
-                "name": "Top Service RT",
-                "options": {
-                    "legend": {
-                        "displayMode": "hidden"
-                    },
-                    "standardOptions": {
-                        "util": "milliseconds"
-                    },
-                    "thresholds": {
-                        "steps": [
-                            {
-                                "color": "#634CD9",
-                                "type": "base",
-                                "value": null
-                            }
-                        ]
-                    },
-                    "tooltip": {
-                        "mode": "all",
-                        "sort": "none"
-                    }
-                },
-                "targets": [
-                    {
-                        "expr": "label_replace(label_replace(avg(delta(envoy_cluster_upstream_rq_time_sum{envoy_clusterid=\"$envoy_clusterid\", cluster_name=~\"outbound_([0-9]+)_(.*)_(.*)$\"}[3m])) by (cluster_name) / avg(delta(envoy_cluster_upstream_rq_time_count{envoy_clusterid=\"$envoy_clusterid\", cluster_name=~\"outbound_([0-9]+)_(.*)_(.*)$\"}[1m])) by (cluster_name), \"service_name\", \"$3\", \"cluster_name\", \"outbound_([0-9]+)_(.*)_(.*)$\"), \"port\", \"$1\", \"cluster_name\", \"outbound_([0-9]+)_(.*)_(.*)$\")",
-                        "legend": "{{service_name}}:{{port}}",
-                        "refId": "A"
-                    }
-                ],
-                "transformations": [
-                    {
-                        "id": "organize",
-                        "options": {}
-                    }
-                ],
-                "type": "timeseries",
-                "version": "3.0.0"
-            }
+  "name": "MSE监控大盘",
+  "tags": "",
+  "ident": "MSE-Monitor",
+  "configs": {
+    "var": [
+      {
+        "name": "datasource",
+        "type": "datasource",
+        "definition": "prometheus"
+      },
+      {
+        "name": "envoy_clusterid",
+        "label": "envoy_clusterid",
+        "type": "query",
+        "hide": false,
+        "definition": "label_values(envoy_cluster_bind_errors, envoy_clusterid)",
+        "multi": false,
+        "datasource": {
+          "cate": "prometheus",
+          "value": "${datasource}"
+        }
+      }
+    ],
+    "panels": [
+      {
+        "type": "stat",
+        "id": "aba69dc0-5a11-4bcd-add9-335b5a677bee",
+        "layout": {
+          "h": 5,
+          "w": 6,
+          "x": 0,
+          "y": 0,
+          "i": "aba69dc0-5a11-4bcd-add9-335b5a677bee",
+          "isResizable": true
+        },
+        "version": "3.0.0",
+        "datasourceCate": "prometheus",
+        "datasourceValue": 7,
+        "targets": [
+          {
+            "refId": "A",
+            "expr": "sum(delta(envoy_http_rq_total{envoy_clusterid=\"$envoy_clusterid\"}[1m]))"
+          }
        ],
-        "var": [
-            {
-                "definition": "prometheus",
-                "name": "datasource",
-                "type": "datasource"
-            },
-            {
-                "datasource": {
-                    "cate": "prometheus",
-                    "value": "${datasource}"
-                },
-                "definition": "label_values(envoy_cluster_bind_errors, envoy_clusterid)",
-                "hide": false,
-                "label": "envoy_clusterid",
-                "multi": false,
-                "name": "envoy_clusterid",
-                "type": "query"
-            }
+        "transformations": [
+          {
+            "id": "organize",
+            "options": {}
+          }
        ],
-        "version": "3.0.0"
-    },
-    "public": 0,
-    "public_cate": 0,
-    "bgids": null,
-    "built_in": 0,
-    "hide": 0,
-    "uuid": 1717556327111860000
-}
+        "name": "PV（一分钟）",
+        "maxPerRow": 4,
+        "custom": {
+          "textMode": "valueAndName",
+          "graphMode": "none",
+          "colorMode": "value",
+          "calc": "lastNotNull",
+          "valueField": "Value",
+          "colSpan": 1,
+          "textSize": {}
+        },
+        "options": {
+          "thresholds": {
+            "steps": [
+              {
+                "color": "#634CD9",
+                "value": null,
+                "type": "base"
+              }
+            ]
+          },
+          "standardOptions": {}
+        }
+      },
+      {
+        "type": "pie",
+        "id": "e34a272e-6125-4afa-a2c1-80d7d9078673",
+        "layout": {
+          "h": 5,
+          "w": 9,
+          "x": 6,
+          "y": 0,
+          "i": "116a5607-5860-426e-a560-d3241da88b57",
+          "isResizable": true
+        },
+        "version": "3.0.0",
+        "datasourceCate": "prometheus",
+        "datasourceValue": 7,
+        "targets": [
+          {
+            "refId": "A",
+            "expr": "sum(delta(envoy_http_downstream_rq{envoy_clusterid=\"$envoy_clusterid\"}[3m])) by (response_code_class)",
+            "legend": ""
+          }
+        ],
+        "transformations": [
+          {
+            "id": "organize",
+            "options": {}
+          }
+        ],
+        "name": "请求成功率",
+        "maxPerRow": 4,
+        "custom": {
+          "calc": "lastNotNull",
+          "legengPosition": "right",
+          "detailName": "详情"
+        },
+        "options": {
+          "standardOptions": {
+            "util": "percentUnit",
+            "decimals": 0
+          }
+        }
+      },
+      {
+        "type": "timeseries",
+        "id": "a8917108-58a6-479a-8ec4-571f1b5a79c2",
+        "layout": {
+          "h": 5,
+          "w": 9,
+          "x": 15,
+          "y": 0,
+          "i": "9be66a1f-c0bb-47dc-a3c0-ad43b588789b",
+          "isResizable": true
+        },
+        "version": "3.0.0",
+        "datasourceCate": "prometheus",
+        "datasourceValue": 7,
+        "targets": [
+          {
+            "refId": "A",
+            "expr": "sum(delta(envoy_http_downstream_cx_rx_bytes_total{envoy_clusterid=\"$envoy_clusterid\"}[1m]))",
+            "legend": ""
+          }
+        ],
+        "transformations": [
+          {
+            "id": "organize",
+            "options": {}
+          }
+        ],
+        "name": "请求量（一分钟）",
+        "maxPerRow": 4,
+        "options": {
+          "tooltip": {
+            "mode": "all",
+            "sort": "none"
+          },
+          "legend": {
+            "displayMode": "list"
+          },
+          "standardOptions": {
+            "util": "bytesSI"
+          },
+          "thresholds": {
+            "steps": [
+              {
+                "color": "#634CD9",
+                "value": null,
+                "type": "base"
+              }
+            ]
+          }
+        },
+        "custom": {
+          "drawStyle": "lines",
+          "lineInterpolation": "smooth",
+          "spanNulls": false,
+          "lineWidth": 2,
+          "fillOpacity": 0.3,
+          "gradientMode": "opacity",
+          "stack": "off",
+          "scaleDistribution": {
+            "type": "linear"
+          }
+        }
+      },
+      {
+        "type": "timeseries",
+        "id": "1b102bee-ccc9-49a0-a1d1-cc097bb6a987",
+        "layout": {
+          "h": 6,
+          "w": 8,
+          "x": 0,
+          "y": 5,
+          "i": "1b102bee-ccc9-49a0-a1d1-cc097bb6a987",
+          "isResizable": true
+        },
+        "version": "3.0.0",
+        "datasourceCate": "prometheus",
+        "datasourceValue": 7,
+        "targets": [
+          {
+            "refId": "A",
+            "expr": "sum(rate(envoy_http_downstream_rq_time_sum{envoy_clusterid=\"$envoy_clusterid\"}[10m])) / sum(rate(envoy_http_downstream_rq_time_count{envoy_clusterid=\"$envoy_clusterid\"}[10m]))",
+            "legend": ""
+          }
+        ],
+        "transformations": [
+          {
+            "id": "organize",
+            "options": {}
+          }
+        ],
+        "name": "平均延迟",
+        "maxPerRow": 4,
+        "options": {
+          "tooltip": {
+            "mode": "all",
+            "sort": "none"
+          },
+          "legend": {
+            "displayMode": "list"
+          },
+          "standardOptions": {
+            "util": "milliseconds"
+          },
+          "thresholds": {
+            "steps": [
+              {
+                "color": "#634CD9",
+                "value": null,
+                "type": "base"
+              }
+            ]
+          }
+        },
+        "custom": {
+          "drawStyle": "lines",
+          "lineInterpolation": "smooth",
+          "spanNulls": false,
+          "lineWidth": 2,
+          "fillOpacity": 0.3,
+          "gradientMode": "opacity",
+          "stack": "off",
+          "scaleDistribution": {
+            "type": "linear"
+          }
+        }
+      },
+      {
+        "type": "timeseries",
+        "id": "b432fc11-2f9d-4b72-826b-6ca787401859",
+        "layout": {
+          "h": 6,
+          "w": 8,
+          "x": 8,
+          "y": 5,
+          "i": "ea4c1073-07d3-4adc-a4d3-4812cc55ad7c",
+          "isResizable": true
+        },
+        "version": "3.0.0",
+        "datasourceCate": "prometheus",
+        "datasourceValue": 7,
+        "targets": [
+          {
+            "refId": "A",
+            "expr": "histogram_quantile(0.95, sum(rate(envoy_http_downstream_rq_time_bucket{envoy_clusterid=\"$envoy_clusterid\"}[10m])) by (le, service))",
+            "legend": ""
+          }
+        ],
+        "transformations": [
+          {
+            "id": "organize",
+            "options": {}
+          }
+        ],
+        "name": "P95",
+        "maxPerRow": 4,
+        "options": {
+          "tooltip": {
+            "mode": "all",
+            "sort": "none"
+          },
+          "legend": {
+            "displayMode": "list"
+          },
+          "standardOptions": {
+            "util": "milliseconds"
+          },
+          "thresholds": {
+            "steps": [
+              {
+                "color": "#634CD9",
+                "value": null,
+                "type": "base"
+              }
+            ]
+          }
+        },
+        "custom": {
+          "drawStyle": "lines",
+          "lineInterpolation": "smooth",
+          "spanNulls": false,
+          "lineWidth": 2,
+          "fillOpacity": 0.3,
+          "gradientMode": "opacity",
+          "stack": "off",
+          "scaleDistribution": {
+            "type": "linear"
+          }
+        }
+      },
+      {
+        "type": "timeseries",
+        "id": "9062d707-d8a7-4a93-82e5-46f6059e8d70",
+        "layout": {
+          "h": 6,
+          "w": 8,
+          "x": 16,
+          "y": 5,
+          "i": "d36246b9-4a9c-4ab0-9171-c5ac330be0ca",
+          "isResizable": true
+        },
+        "version": "3.0.0",
+        "datasourceCate": "prometheus",
+        "datasourceValue": 7,
+        "targets": [
+          {
+            "refId": "A",
+            "expr": "sum(irate(envoy_http_downstream_rq{envoy_clusterid=\"$envoy_clusterid\"}[2m]))",
+            "legend": ""
+          }
+        ],
+        "transformations": [
+          {
+            "id": "organize",
+            "options": {}
+          }
+        ],
+        "name": "QPS",
+        "maxPerRow": 4,
+        "options": {
+          "tooltip": {
+            "mode": "all",
+            "sort": "none"
+          },
+          "legend": {
+            "displayMode": "list"
+          },
+          "standardOptions": {
+            "util": "none"
+          },
+          "thresholds": {
+            "steps": [
+              {
+                "color": "#634CD9",
+                "value": null,
+                "type": "base"
+              }
+            ]
+          }
+        },
+        "custom": {
+          "drawStyle": "lines",
+          "lineInterpolation": "smooth",
+          "spanNulls": false,
+          "lineWidth": 2,
+          "fillOpacity": 0.3,
+          "gradientMode": "opacity",
+          "stack": "off",
+          "scaleDistribution": {
+            "type": "linear"
+          }
+        }
+      },
+      {
+        "type": "barGauge",
+        "id": "c3f64cfd-adb2-4316-bb84-55f88ed513a3",
+        "layout": {
+          "h": 6,
+          "w": 24,
+          "x": 0,
+          "y": 11,
+          "i": "807c34f9-bd61-4da3-ad88-41bb3e045605",
+          "isResizable": true
+        },
+        "version": "3.0.0",
+        "datasourceCate": "prometheus",
+        "datasourceValue": 7,
+        "targets": [
+          {
+            "refId": "A",
+            "expr": "label_replace(label_replace(topk(10, sum(delta(envoy_cluster_upstream_rq_total{envoy_clusterid=\"$envoy_clusterid\", cluster_name=~\"outbound_([0-9]+)_(.*)_(.*).svc.cluster.local$\", cluster_name!~\".*waf-proxy.static\", cluster_name!~\"outbound_([0-9]+)_(.*)_kubernetes.default.svc.cluster.local\", cluster_name!~\"outbound_([0-9]+)_(.*)_(.*).kube-system.svc.cluster.local\", cluster_name!~\"outbound_([0-9]+)_(.*)_(.*).arms-prom.svc.cluster.local\"}[1m])) by (cluster_name)), \"service_name\", \"$3\", \"cluster_name\", \"outbound_([0-9]+)_(.*)_(.*).svc.cluster.local$\"), \"port\", \"$1\", \"cluster_name\", \"outbound_([0-9]+)_(.*)_(.*).svc.cluster.local$\")",
+            "legend": "{{service_name}}:{{port}}"
+          }
+        ],
+        "transformations": [
+          {
+            "id": "organize",
+            "options": {}
+          }
+        ],
+        "name": "Top Service Request",
+        "maxPerRow": 4,
+        "custom": {
+          "calc": "lastNotNull",
+          "baseColor": "#9470FF",
+          "serieWidth": 40,
+          "sortOrder": "desc"
+        },
+        "options": {
+          "standardOptions": {}
+        }
+      },
+      {
+        "type": "timeseries",
+        "id": "8df57678-ff19-4b63-b768-4dad3f12222b",
+        "layout": {
+          "h": 5,
+          "w": 24,
+          "x": 0,
+          "y": 17,
+          "i": "44f413ba-3262-4ccf-a4b1-c1165bafaaff",
+          "isResizable": true
+        },
+        "version": "3.0.0",
+        "datasourceCate": "prometheus",
+        "datasourceValue": 7,
+        "targets": [
+          {
+            "refId": "A",
+            "expr": "label_replace(label_replace(avg(delta(envoy_cluster_upstream_rq_time_sum{envoy_clusterid=\"$envoy_clusterid\", cluster_name=~\"outbound_([0-9]+)_(.*)_(.*)$\"}[3m])) by (cluster_name) / avg(delta(envoy_cluster_upstream_rq_time_count{envoy_clusterid=\"$envoy_clusterid\", cluster_name=~\"outbound_([0-9]+)_(.*)_(.*)$\"}[1m])) by (cluster_name), \"service_name\", \"$3\", \"cluster_name\", \"outbound_([0-9]+)_(.*)_(.*)$\"), \"port\", \"$1\", \"cluster_name\", \"outbound_([0-9]+)_(.*)_(.*)$\")",
+            "legend": "{{service_name}}:{{port}}"
+          }
+        ],
+        "transformations": [
+          {
+            "id": "organize",
+            "options": {}
+          }
+        ],
+        "name": "Top Service RT",
+        "maxPerRow": 4,
+        "options": {
+          "tooltip": {
+            "mode": "all",
+            "sort": "none"
+          },
+          "legend": {
+            "displayMode": "hidden"
+          },
+          "standardOptions": {
+            "util": "milliseconds"
+          },
+          "thresholds": {
+            "steps": [
+              {
+                "color": "#634CD9",
+                "value": null,
+                "type": "base"
+              }
+            ]
+          }
+        },
+        "custom": {
+          "drawStyle": "lines",
+          "lineInterpolation": "smooth",
+          "spanNulls": false,
+          "lineWidth": 2,
+          "fillOpacity": 0.3,
+          "gradientMode": "opacity",
+          "stack": "off",
+          "scaleDistribution": {
+            "type": "linear"
+          }
+        }
+      }
+    ],
+    "version": "3.0.0"
+  }
+}
--- a/integrations/AliYun/dashboards/mysql.json
+++ b/integrations/AliYun/dashboards/mysql.json
@@ -1,971 +0,0 @@
-{
-  "name": "阿里云MySQL",
-  "tags": "阿里云 mysql",
-  "ident": "",
-  "configs": {
-    "panels": [
-      {
-        "type": "row",
-        "id": "1cb8caf3-ef35-4572-9ecc-71b9f063a685",
-        "name": "关键指标",
-        "collapsed": true,
-        "layout": {
-          "h": 1,
-          "w": 24,
-          "x": 0,
-          "y": 0,
-          "i": "1cb8caf3-ef35-4572-9ecc-71b9f063a685",
-          "isResizable": false
-        },
-        "panels": []
-      },
-      {
-        "type": "timeseries",
-        "id": "5aad17df-354e-40de-a643-61da6668939b",
-        "layout": {
-          "h": 5,
-          "w": 24,
-          "x": 0,
-          "y": 1,
-          "i": "fcf9515d-3a56-4596-8b3a-d7d8631aa218",
-          "isResizable": true
-        },
-        "version": "3.0.0",
-        "datasourceCate": "prometheus",
-        "datasourceValue": "${datasource}",
-        "targets": [
-          {
-            "expr": "AliyunRds_MySQL_SlowQueries{instanceName=\"$instance\"}",
-            "legend": "{{instanceName}}",
-            "refId": "A",
-            "maxDataPoints": 240
-          }
-        ],
-        "transformations": [
-          {
-            "id": "organize",
-            "options": {}
-          }
-        ],
-        "name": "每秒慢查询数量(countS)",
-        "maxPerRow": 4,
-        "options": {
-          "tooltip": {
-            "mode": "all",
-            "sort": "none"
-          },
-          "legend": {
-            "displayMode": "hidden",
-            "behaviour": "showItem"
-          },
-          "standardOptions": {},
-          "thresholds": {
-            "steps": [
-              {
-                "color": "#634CD9",
-                "value": null,
-                "type": "base"
-              }
-            ]
-          }
-        },
-        "custom": {
-          "drawStyle": "lines",
-          "lineInterpolation": "smooth",
-          "spanNulls": false,
-          "lineWidth": 2,
-          "fillOpacity": 0.3,
-          "gradientMode": "opacity",
-          "stack": "off",
-          "scaleDistribution": {
-            "type": "linear"
-          }
-        },
-        "overrides": [
-          {
-            "matcher": {
-              "id": "byFrameRefID"
-            },
-            "properties": {
-              "rightYAxisDisplay": "off"
-            }
-          }
-        ]
-      },
-      {
-        "type": "row",
-        "id": "2b3a816e-94e2-4c9d-9bb8-770c458033db",
-        "name": "基础指标",
-        "collapsed": true,
-        "layout": {
-          "h": 1,
-          "w": 24,
-          "x": 0,
-          "y": 6,
-          "i": "2b3a816e-94e2-4c9d-9bb8-770c458033db",
-          "isResizable": false
-        },
-        "panels": []
-      },
-      {
-        "type": "timeseries",
-        "id": "12d4a674-6d09-4b02-aa4f-d767531bd368",
-        "layout": {
-          "h": 4,
-          "w": 8,
-          "x": 0,
-          "y": 7,
-          "i": "baba4778-b950-4224-9dac-9ecda041f93b",
-          "isResizable": true
-        },
-        "version": "3.0.0",
-        "datasourceCate": "prometheus",
-        "datasourceValue": "${datasource}",
-        "targets": [
-          {
-            "expr": "AliyunRds_CpuUsage{instanceName=\"$instance\"}",
-            "legend": "",
-            "refId": "A",
-            "maxDataPoints": 240
-          }
-        ],
-        "transformations": [
-          {
-            "id": "organize",
-            "options": {}
-          }
-        ],
-        "name": "CPU使用率",
-        "maxPerRow": 4,
-        "options": {
-          "tooltip": {
-            "mode": "all",
-            "sort": "none"
-          },
-          "legend": {
-            "displayMode": "hidden",
-            "behaviour": "showItem"
-          },
-          "standardOptions": {
-            "util": "percent"
-          },
-          "thresholds": {
-            "steps": [
-              {
-                "color": "#634CD9",
-                "value": null,
-                "type": "base"
-              }
-            ]
-          }
-        },
-        "custom": {
-          "drawStyle": "lines",
-          "lineInterpolation": "smooth",
-          "spanNulls": false,
-          "lineWidth": 2,
-          "fillOpacity": 0.3,
-          "gradientMode": "opacity",
-          "stack": "off",
-          "scaleDistribution": {
-            "type": "linear"
-          }
-        },
-        "overrides": [
-          {
-            "matcher": {
-              "id": "byFrameRefID"
-            },
-            "properties": {
-              "rightYAxisDisplay": "off"
-            }
-          }
-        ]
-      },
-      {
-        "type": "timeseries",
-        "id": "55b17951-a4ae-46a7-a2d7-57db1414f6ff",
-        "layout": {
-          "h": 4,
-          "w": 8,
-          "x": 8,
-          "y": 7,
-          "i": "c4c248bd-21fb-4485-8235-f50640116e65",
-          "isResizable": true
-        },
-        "version": "3.0.0",
-        "datasourceCate": "prometheus",
-        "datasourceValue": "${datasource}",
-        "targets": [
-          {
-            "expr": "AliyunRds_MemoryUsage{instanceName=\"$instance\"}",
-            "legend": "",
-            "refId": "A",
-            "maxDataPoints": 240
-          }
-        ],
-        "transformations": [
-          {
-            "id": "organize",
-            "options": {}
-          }
-        ],
-        "name": "内存使用率",
-        "maxPerRow": 4,
-        "options": {
-          "tooltip": {
-            "mode": "all",
-            "sort": "none"
-          },
-          "legend": {
-            "displayMode": "hidden",
-            "behaviour": "showItem"
-          },
-          "standardOptions": {
-            "util": "percent"
-          },
-          "thresholds": {
-            "steps": [
-              {
-                "color": "#634CD9",
-                "value": null,
-                "type": "base"
-              }
-            ]
-          }
-        },
-        "custom": {
-          "drawStyle": "lines",
-          "lineInterpolation": "smooth",
-          "spanNulls": false,
-          "lineWidth": 2,
-          "fillOpacity": 0.3,
-          "gradientMode": "opacity",
-          "stack": "off",
-          "scaleDistribution": {
-            "type": "linear"
-          }
-        },
-        "overrides": [
-          {
-            "matcher": {
-              "id": "byFrameRefID"
-            },
-            "properties": {
-              "rightYAxisDisplay": "off"
-            }
-          }
-        ]
-      },
-      {
-        "type": "timeseries",
-        "id": "02c6af68-0e59-4f62-b0e8-80a9a9d0df82",
-        "layout": {
-          "h": 4,
-          "w": 8,
-          "x": 16,
-          "y": 7,
-          "i": "51cf9211-5e76-4176-b1ec-42929ccc6803",
-          "isResizable": true
-        },
-        "version": "3.0.0",
-        "datasourceCate": "prometheus",
-        "datasourceValue": "${datasource}",
-        "targets": [
-          {
-            "expr": "AliyunRds_DiskUsage{instanceName=\"$instance\"}",
-            "legend": "",
-            "refId": "A",
-            "maxDataPoints": 240
-          }
-        ],
-        "transformations": [
-          {
-            "id": "organize",
-            "options": {}
-          }
-        ],
-        "name": "磁盘使用率",
-        "maxPerRow": 4,
-        "options": {
-          "tooltip": {
-            "mode": "all",
-            "sort": "none"
-          },
-          "legend": {
-            "displayMode": "hidden",
-            "behaviour": "showItem"
-          },
-          "standardOptions": {
-            "util": "percent"
-          },
-          "thresholds": {
-            "steps": [
-              {
-                "color": "#634CD9",
-                "value": null,
-                "type": "base"
-              }
-            ]
-          }
-        },
-        "custom": {
-          "drawStyle": "lines",
-          "lineInterpolation": "smooth",
-          "spanNulls": false,
-          "lineWidth": 2,
-          "fillOpacity": 0.3,
-          "gradientMode": "opacity",
-          "stack": "off",
-          "scaleDistribution": {
-            "type": "linear"
-          }
-        },
-        "overrides": [
-          {
-            "matcher": {
-              "id": "byFrameRefID"
-            },
-            "properties": {
-              "rightYAxisDisplay": "off"
-            }
-          }
-        ]
-      },
-      {
-        "type": "timeseries",
-        "id": "b72c5032-1ea0-4c87-9cfd-d21b374680f1",
-        "layout": {
-          "h": 4,
-          "w": 8,
-          "x": 0,
-          "y": 11,
-          "i": "b72c5032-1ea0-4c87-9cfd-d21b374680f1",
-          "isResizable": true
-        },
-        "version": "3.0.0",
-        "datasourceCate": "prometheus",
-        "datasourceValue": "${datasource}",
-        "targets": [
-          {
-            "expr": "AliyunRds_MySQL_ActiveSessions{instanceName=\"$instance\"}",
-            "legend": "",
-            "refId": "A",
-            "maxDataPoints": 240
-          }
-        ],
-        "transformations": [
-          {
-            "id": "organize",
-            "options": {}
-          }
-        ],
-        "name": "活跃连接数",
-        "maxPerRow": 4,
-        "options": {
-          "tooltip": {
-            "mode": "all",
-            "sort": "none"
-          },
-          "legend": {
-            "displayMode": "hidden",
-            "behaviour": "showItem"
-          },
-          "standardOptions": {},
-          "thresholds": {
-            "steps": [
-              {
-                "color": "#634CD9",
-                "value": null,
-                "type": "base"
-              }
-            ]
-          }
-        },
-        "custom": {
-          "drawStyle": "lines",
-          "lineInterpolation": "smooth",
-          "spanNulls": false,
-          "lineWidth": 2,
-          "fillOpacity": 0.3,
-          "gradientMode": "opacity",
-          "stack": "off",
-          "scaleDistribution": {
-            "type": "linear"
-          }
-        },
-        "overrides": [
-          {
-            "matcher": {
-              "id": "byFrameRefID"
-            },
-            "properties": {
-              "rightYAxisDisplay": "off"
-            }
-          }
-        ]
-      },
-      {
-        "type": "timeseries",
-        "id": "b518c9c4-f0e8-4712-ab67-be4521eeff0c",
-        "layout": {
-          "h": 4,
-          "w": 8,
-          "x": 8,
-          "y": 11,
-          "i": "ff589719-6072-488d-819d-6e080a6f3c60",
-          "isResizable": true
-        },
-        "version": "3.0.0",
-        "datasourceCate": "prometheus",
-        "datasourceValue": "${datasource}",
-        "targets": [
-          {
-            "expr": "AliyunRds_ConnectionUsage{instanceName=\"$instance\"}",
-            "legend": "",
-            "refId": "A",
-            "maxDataPoints": 240
-          }
-        ],
-        "transformations": [
-          {
-            "id": "organize",
-            "options": {}
-          }
-        ],
-        "name": "连接数使用率",
-        "maxPerRow": 4,
-        "options": {
-          "tooltip": {
-            "mode": "all",
-            "sort": "none"
-          },
-          "legend": {
-            "displayMode": "hidden",
-            "behaviour": "showItem"
-          },
-          "standardOptions": {},
-          "thresholds": {
-            "steps": [
-              {
-                "color": "#634CD9",
-                "value": null,
-                "type": "base"
-              }
-            ]
-          }
-        },
-        "custom": {
-          "drawStyle": "lines",
-          "lineInterpolation": "smooth",
-          "spanNulls": false,
-          "lineWidth": 2,
-          "fillOpacity": 0.3,
-          "gradientMode": "opacity",
-          "stack": "off",
-          "scaleDistribution": {
-            "type": "linear"
-          }
-        },
-        "overrides": [
-          {
-            "matcher": {
-              "id": "byFrameRefID"
-            },
-            "properties": {
-              "rightYAxisDisplay": "off"
-            }
-          }
-        ]
-      },
-      {
-        "type": "timeseries",
-        "id": "86c1f728-ac1e-402b-bea6-2e3979f472c3",
-        "layout": {
-          "h": 4,
-          "w": 8,
-          "x": 16,
-          "y": 11,
-          "i": "5d673c5d-1fbb-4df4-9ece-c991d053ca34",
-          "isResizable": true
-        },
-        "version": "3.0.0",
-        "datasourceCate": "prometheus",
-        "datasourceValue": "${datasource}",
-        "targets": [
-          {
-            "expr": "AliyunRds_IOPSUsage{instanceName=\"$instance\"} ",
-            "legend": "",
-            "refId": "A",
-            "maxDataPoints": 240
-          }
-        ],
-        "transformations": [
-          {
-            "id": "organize",
-            "options": {}
-          }
-        ],
-        "name": "IOPS使用率",
-        "maxPerRow": 4,
-        "options": {
-          "tooltip": {
-            "mode": "all",
-            "sort": "none"
-          },
-          "legend": {
-            "displayMode": "hidden",
-            "behaviour": "showItem"
-          },
-          "standardOptions": {
-            "util": "percent"
-          },
-          "thresholds": {
-            "steps": [
-              {
-                "color": "#634CD9",
-                "value": null,
-                "type": "base"
-              }
-            ]
-          }
-        },
-        "custom": {
-          "drawStyle": "lines",
-          "lineInterpolation": "smooth",
-          "spanNulls": false,
-          "lineWidth": 2,
-          "fillOpacity": 0.3,
-          "gradientMode": "opacity",
-          "stack": "off",
-          "scaleDistribution": {
-            "type": "linear"
-          }
-        },
-        "overrides": [
-          {
-            "matcher": {
-              "id": "byFrameRefID"
-            },
-            "properties": {
-              "rightYAxisDisplay": "off",
-              "standardOptions": {
-                "util": "percent"
-              }
-            }
-          }
-        ]
-      },
-      {
-        "type": "timeseries",
-        "id": "dc874418-8d11-409c-96e8-e48fac2f6e20",
-        "layout": {
-          "h": 4,
-          "w": 8,
-          "x": 0,
-          "y": 15,
-          "i": "86915dd4-990c-41ba-b048-3da301d97327",
-          "isResizable": true
-        },
-        "version": "3.0.0",
-        "datasourceCate": "prometheus",
-        "datasourceValue": "${datasource}",
-        "targets": [
-          {
-            "expr": "AliyunRds_MySQL_NetworkInNew{instanceName=\"$instance\"}/ 8",
-            "legend": "",
-            "refId": "A",
-            "maxDataPoints": 240
-          }
-        ],
-        "transformations": [
-          {
-            "id": "organize",
-            "options": {}
-          }
-        ],
-        "name": "网络流入带宽",
-        "maxPerRow": 4,
-        "options": {
-          "tooltip": {
-            "mode": "all",
-            "sort": "none"
-          },
-          "legend": {
-            "displayMode": "hidden",
-            "behaviour": "showItem"
-          },
-          "standardOptions": {
-            "util": "bytesSecIEC"
-          },
-          "thresholds": {
-            "steps": [
-              {
-                "color": "#634CD9",
-                "value": null,
-                "type": "base"
-              }
-            ]
-          }
-        },
-        "custom": {
-          "drawStyle": "lines",
-          "lineInterpolation": "smooth",
-          "spanNulls": false,
-          "lineWidth": 2,
-          "fillOpacity": 0.3,
-          "gradientMode": "opacity",
-          "stack": "off",
-          "scaleDistribution": {
-            "type": "linear"
-          }
-        },
-        "overrides": [
-          {
-            "matcher": {
-              "id": "byFrameRefID"
-            },
-            "properties": {
-              "rightYAxisDisplay": "off"
-            }
-          }
-        ]
-      },
-      {
-        "type": "timeseries",
-        "id": "b979878a-81a6-4c0d-960d-22a736d00655",
-        "layout": {
-          "h": 4,
-          "w": 8,
-          "x": 8,
-          "y": 15,
-          "i": "86f9e07f-85dc-44e0-8245-ca0a9b0dfa81",
-          "isResizable": true
-        },
-        "version": "3.0.0",
-        "datasourceCate": "prometheus",
-        "datasourceValue": "${datasource}",
-        "targets": [
-          {
-            "expr": "AliyunRds_MySQL_NetworkOutNew{instanceName=\"$instance\"}/ 8",
-            "legend": "",
-            "refId": "A",
-            "maxDataPoints": 240
-          }
-        ],
-        "transformations": [
-          {
-            "id": "organize",
-            "options": {}
-          }
-        ],
-        "name": "网络流出带宽",
-        "maxPerRow": 4,
-        "options": {
-          "tooltip": {
-            "mode": "all",
-            "sort": "none"
-          },
-          "legend": {
-            "displayMode": "hidden",
-            "behaviour": "showItem"
-          },
-          "standardOptions": {
-            "util": "bytesSecIEC"
-          },
-          "thresholds": {
-            "steps": [
-              {
-                "color": "#634CD9",
-                "value": null,
-                "type": "base"
-              }
-            ]
-          }
-        },
-        "custom": {
-          "drawStyle": "lines",
-          "lineInterpolation": "smooth",
-          "spanNulls": false,
-          "lineWidth": 2,
-          "fillOpacity": 0.3,
-          "gradientMode": "opacity",
-          "stack": "off",
-          "scaleDistribution": {
-            "type": "linear"
-          }
-        },
-        "overrides": [
-          {
-            "matcher": {
-              "id": "byFrameRefID"
-            },
-            "properties": {
-              "rightYAxisDisplay": "off"
-            }
-          }
-        ]
-      },
-      {
-        "type": "row",
-        "id": "6d896a20-bf04-4dc7-94da-1394ef109848",
-        "name": "性能指标",
-        "collapsed": true,
-        "layout": {
-          "h": 1,
-          "w": 24,
-          "x": 0,
-          "y": 19,
-          "i": "6d896a20-bf04-4dc7-94da-1394ef109848",
-          "isResizable": false
-        },
-        "panels": []
-      },
-      {
-        "type": "timeseries",
-        "id": "2e545b2b-130b-4829-a2d2-ee5305c302aa",
-        "layout": {
-          "h": 4,
-          "w": 8,
-          "x": 0,
-          "y": 20,
-          "i": "13dceb72-9e9d-483d-86d2-b192debdcece",
-          "isResizable": true
-        },
-        "version": "3.0.0",
-        "datasourceCate": "prometheus",
-        "datasourceValue": "${datasource}",
-        "targets": [
-          {
-            "expr": "AliyunRds_MySQL_QPS{instanceName=\"$instance\"}",
-            "legend": "",
-            "refId": "A",
-            "maxDataPoints": 240
-          }
-        ],
-        "transformations": [
-          {
-            "id": "organize",
-            "options": {}
-          }
-        ],
-        "name": "QPS",
-        "maxPerRow": 4,
-        "options": {
-          "tooltip": {
-            "mode": "all",
-            "sort": "none"
-          },
-          "legend": {
-            "displayMode": "hidden",
-            "behaviour": "showItem"
-          },
-          "standardOptions": {
-            "util": "reqps"
-          },
-          "thresholds": {
-            "steps": [
-              {
-                "color": "#634CD9",
-                "value": null,
-                "type": "base"
-              }
-            ]
-          }
-        },
-        "custom": {
-          "drawStyle": "lines",
-          "lineInterpolation": "smooth",
-          "spanNulls": false,
-          "lineWidth": 2,
-          "fillOpacity": 0.3,
-          "gradientMode": "opacity",
-          "stack": "off",
-          "scaleDistribution": {
-            "type": "linear"
-          }
-        },
-        "overrides": [
-          {
-            "matcher": {
-              "id": "byFrameRefID"
-            },
-            "properties": {
-              "rightYAxisDisplay": "off"
-            }
-          }
-        ]
-      },
-      {
-        "type": "timeseries",
-        "id": "0299da4b-d779-4ed7-9cd5-096f43181b2e",
-        "layout": {
-          "h": 4,
-          "w": 8,
-          "x": 8,
-          "y": 20,
-          "i": "2b23c24e-b6f9-44f5-8151-2d5a7585c31a",
-          "isResizable": true
-        },
-        "version": "3.0.0",
-        "datasourceCate": "prometheus",
-        "datasourceValue": "${datasource}",
-        "targets": [
-          {
-            "expr": "AliyunRds_MySQL_TPS{instanceName=\"$instance\"}",
-            "legend": "",
-            "refId": "A",
-            "maxDataPoints": 240
-          }
-        ],
-        "transformations": [
-          {
-            "id": "organize",
-            "options": {}
-          }
-        ],
-        "name": "TPS",
-        "maxPerRow": 4,
-        "options": {
-          "tooltip": {
-            "mode": "all",
-            "sort": "none"
-          },
-          "legend": {
-            "displayMode": "hidden",
-            "behaviour": "showItem"
-          },
-          "standardOptions": {
-            "util": "reqps"
-          },
-          "thresholds": {
-            "steps": [
-              {
-                "color": "#634CD9",
-                "value": null,
-                "type": "base"
-              }
-            ]
-          }
-        },
-        "custom": {
-          "drawStyle": "lines",
-          "lineInterpolation": "smooth",
-          "spanNulls": false,
-          "lineWidth": 2,
-          "fillOpacity": 0.3,
-          "gradientMode": "opacity",
-          "stack": "off",
-          "scaleDistribution": {
-            "type": "linear"
-          }
-        },
-        "overrides": [
-          {
-            "matcher": {
-              "id": "byFrameRefID"
-            },
-            "properties": {
-              "rightYAxisDisplay": "off"
-            }
-          }
-        ]
-      },
-      {
-        "type": "timeseries",
-        "id": "56a0e345-1d4d-4051-a3cf-738bea220f96",
-        "layout": {
-          "h": 4,
-          "w": 8,
-          "x": 16,
-          "y": 20,
-          "i": "d1752ed4-f4a1-4c4b-854f-1c2ef01b34a4",
-          "isResizable": true
-        },
-        "version": "3.0.0",
-        "datasourceCate": "prometheus",
-        "datasourceValue": "${datasource}",
-        "targets": [
-          {
-            "expr": "AliyunRds_MySQL_IbufUseRatio{instanceName=\"$instance\"}",
-            "legend": "",
-            "refId": "A",
-            "maxDataPoints": 240
-          }
-        ],
-        "transformations": [
-          {
-            "id": "organize",
-            "options": {}
-          }
-        ],
-        "name": "BP利用率",
-        "maxPerRow": 4,
-        "options": {
-          "tooltip": {
-            "mode": "all",
-            "sort": "none"
-          },
-          "legend": {
-            "displayMode": "hidden",
-            "behaviour": "showItem"
-          },
-          "standardOptions": {},
-          "thresholds": {
-            "steps": [
-              {
-                "color": "#634CD9",
-                "value": null,
-                "type": "base"
-              }
-            ]
-          }
-        },
-        "custom": {
-          "drawStyle": "lines",
-          "lineInterpolation": "smooth",
-          "spanNulls": false,
-          "lineWidth": 2,
-          "fillOpacity": 0.3,
-          "gradientMode": "opacity",
-          "stack": "off",
-          "scaleDistribution": {
-            "type": "linear"
-          }
-        },
-        "overrides": [
-          {
-            "matcher": {
-              "id": "byFrameRefID"
-            },
-            "properties": {
-              "rightYAxisDisplay": "off"
-            }
-          }
-        ]
-      }
-    ],
-    "var": [
-      {
-        "name": "datasource",
-        "label": "datasource",
-        "type": "datasource",
-        "hide": false,
-        "definition": "prometheus"
-      },
-      {
-        "name": "instance",
-        "label": "",
-        "type": "query",
-        "hide": false,
-        "datasource": {
-          "cate": "prometheus",
-          "value": "${datasource}"
-        },
-        "definition": "label_values(AliyunRds_MySQL_SlowQueries, instanceName)"
-      }
-    ],
-    "version": "3.0.0"
-  },
-  "uuid": 1717556327098444000
-}
--- a/integrations/AliYun/dashboards/nat.json
+++ b/integrations/AliYun/dashboards/nat.json
--- a/integrations/AliYun/dashboards/oss.json
+++ b/integrations/AliYun/dashboards/oss.json
--- a/integrations/AliYun/dashboards/polardb_mysql.json
+++ b/integrations/AliYun/dashboards/polardb_mysql.json
--- a/integrations/AliYun/dashboards/rds.json
+++ b/integrations/AliYun/dashboards/rds.json
@@ -1,346 +1,334 @@
 {
-    "id": 0,
-    "group_id": 0,
-    "name": "阿里云RDS",
-    "ident": "",
-    "tags": "",
-    "create_at": 0,
-    "create_by": "",
-    "update_at": 0,
-    "update_by": "",
-    "configs": {
-        "panels": [
-            {
-                "custom": {
-                    "drawStyle": "lines",
-                    "fillOpacity": 0.3,
-                    "gradientMode": "opacity",
-                    "lineInterpolation": "smooth",
-                    "lineWidth": 2,
-                    "scaleDistribution": {
-                        "type": "linear"
-                    },
-                    "spanNulls": false,
-                    "stack": "off"
-                },
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${datasource}",
-                "id": "01f4d444-aa2d-466d-9615-c76baf60a40c",
-                "layout": {
-                    "h": 4,
-                    "i": "01f4d444-aa2d-466d-9615-c76baf60a40c",
-                    "isResizable": true,
-                    "w": 12,
-                    "x": 0,
-                    "y": 0
-                },
-                "maxPerRow": 4,
-                "name": "CPU平均使用率",
-                "options": {
-                    "legend": {
-                        "displayMode": "hidden"
-                    },
-                    "standardOptions": {},
-                    "thresholds": {
-                        "steps": [
-                            {
-                                "color": "#634CD9",
-                                "type": "base",
-                                "value": null
-                            }
-                        ]
-                    },
-                    "tooltip": {
-                        "mode": "all",
-                        "sort": "none"
-                    }
-                },
-                "targets": [
-                    {
-                        "expr": "sum(aliyun_acs_rds_dashboard_cpu_usage_average{instance_id=\"$instance_id\"}) by (instance_id)",
-                        "legend": "",
-                        "refId": "A"
-                    }
-                ],
-                "type": "timeseries",
-                "version": "2.0.0"
-            },
-            {
-                "custom": {
-                    "drawStyle": "lines",
-                    "fillOpacity": 0.3,
-                    "gradientMode": "opacity",
-                    "lineInterpolation": "smooth",
-                    "lineWidth": 2,
-                    "scaleDistribution": {
-                        "type": "linear"
-                    },
-                    "spanNulls": false,
-                    "stack": "off"
-                },
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${datasource}",
-                "id": "c43eb882-915f-4c38-a0b5-8f33c21ab44a",
-                "layout": {
-                    "h": 4,
-                    "i": "09903231-6557-42be-9cf3-2873878e9bf2",
-                    "isResizable": true,
-                    "w": 12,
-                    "x": 12,
-                    "y": 0
-                },
-                "maxPerRow": 4,
-                "name": "内存平均使用率",
-                "options": {
-                    "legend": {
-                        "displayMode": "hidden"
-                    },
-                    "standardOptions": {},
-                    "thresholds": {
-                        "steps": [
-                            {
-                                "color": "#634CD9",
-                                "type": "base",
-                                "value": null
-                            }
-                        ]
-                    },
-                    "tooltip": {
-                        "mode": "all",
-                        "sort": "none"
-                    }
-                },
-                "targets": [
-                    {
-                        "expr": "sum(aliyun_acs_rds_dashboard_memory_usage_average{instance_id=\"$instance_id\"}) by (instance_id)",
-                        "legend": "",
-                        "refId": "A"
-                    }
-                ],
-                "type": "timeseries",
-                "version": "2.0.0"
-            },
-            {
-                "custom": {
-                    "drawStyle": "lines",
-                    "fillOpacity": 0.3,
-                    "gradientMode": "opacity",
-                    "lineInterpolation": "smooth",
-                    "lineWidth": 2,
-                    "scaleDistribution": {
-                        "type": "linear"
-                    },
-                    "spanNulls": false,
-                    "stack": "off"
-                },
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${datasource}",
-                "id": "37447883-ad79-46bc-888a-1be2835c1c64",
-                "layout": {
-                    "h": 4,
-                    "i": "378a5a26-c28e-4612-af09-f82ec2e11d80",
-                    "isResizable": true,
-                    "w": 12,
-                    "x": 0,
-                    "y": 4
-                },
-                "maxPerRow": 4,
-                "name": "磁盘平均使用率",
-                "options": {
-                    "legend": {
-                        "displayMode": "hidden"
-                    },
-                    "standardOptions": {},
-                    "thresholds": {
-                        "steps": [
-                            {
-                                "color": "#634CD9",
-                                "type": "base",
-                                "value": null
-                            }
-                        ]
-                    },
-                    "tooltip": {
-                        "mode": "all",
-                        "sort": "none"
-                    }
-                },
-                "targets": [
-                    {
-                        "expr": "sum(aliyun_acs_rds_dashboard_disk_usage_average{instance_id=\"$instance_id\"}) by (instance_id)",
-                        "legend": "",
-                        "refId": "A"
-                    }
-                ],
-                "type": "timeseries",
-                "version": "2.0.0"
-            },
-            {
-                "custom": {
-                    "drawStyle": "lines",
-                    "fillOpacity": 0.3,
-                    "gradientMode": "opacity",
-                    "lineInterpolation": "smooth",
-                    "lineWidth": 2,
-                    "scaleDistribution": {
-                        "type": "linear"
-                    },
-                    "spanNulls": false,
-                    "stack": "off"
-                },
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${datasource}",
-                "id": "c9735607-3f24-44a7-bbf1-3ad39441c5c9",
-                "layout": {
-                    "h": 4,
-                    "i": "93a4c8a6-ac23-4e26-8a38-781ec1668820",
-                    "isResizable": true,
-                    "w": 12,
-                    "x": 12,
-                    "y": 4
-                },
-                "maxPerRow": 4,
-                "name": "IOPS平均使用率",
-                "options": {
-                    "legend": {
-                        "displayMode": "hidden"
-                    },
-                    "standardOptions": {},
-                    "thresholds": {
-                        "steps": [
-                            {
-                                "color": "#634CD9",
-                                "type": "base",
-                                "value": null
-                            }
-                        ]
-                    },
-                    "tooltip": {
-                        "mode": "all",
-                        "sort": "none"
-                    }
-                },
-                "targets": [
-                    {
-                        "expr": "sum(aliyun_acs_rds_dashboard_iops_usage_average{instance_id=\"$instance_id\"}) by (instance_id)",
-                        "legend": "",
-                        "refId": "A"
-                    }
-                ],
-                "type": "timeseries",
-                "version": "2.0.0"
-            },
-            {
-                "custom": {
-                    "drawStyle": "lines",
-                    "fillOpacity": 0.3,
-                    "gradientMode": "opacity",
-                    "lineInterpolation": "smooth",
-                    "lineWidth": 2,
-                    "scaleDistribution": {
-                        "type": "linear"
-                    },
-                    "spanNulls": false,
-                    "stack": "off"
-                },
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${datasource}",
-                "id": "b516e7dc-8022-409d-b907-18c4143df891",
-                "layout": {
-                    "h": 5,
-                    "i": "b516e7dc-8022-409d-b907-18c4143df891",
-                    "isResizable": true,
-                    "w": 24,
-                    "x": 0,
-                    "y": 8
-                },
-                "maxPerRow": 4,
-                "name": "SQL执行量",
-                "options": {
-                    "legend": {
-                        "displayMode": "hidden"
-                    },
-                    "standardOptions": {
-                        "util": "percent"
-                    },
-                    "thresholds": {
-                        "steps": [
-                            {
-                                "color": "#634CD9",
-                                "type": "base",
-                                "value": null
-                            }
-                        ]
-                    },
-                    "tooltip": {
-                        "mode": "all",
-                        "sort": "none"
-                    }
-                },
-                "targets": [
-                    {
-                        "expr": "sum(aliyun_acs_rds_dashboard_my_sql_com_delete_average{instance_id=\"$instance_id\"}) by (instance_id)",
-                        "legend": "delete",
-                        "refId": "A"
-                    },
-                    {
-                        "expr": "sum(aliyun_acs_rds_dashboard_my_sql_com_insert_average{instance_id=\"$instance_id\"}) by (instance_id)",
-                        "legend": "insert",
-                        "refId": "B"
-                    },
-                    {
-                        "expr": "sum(aliyun_acs_rds_dashboard_my_sql_com_insert_select_average{instance_id=\"$instance_id\"}) by (instance_id)",
-                        "legend": "insert_select",
-                        "refId": "C"
-                    },
-                    {
-                        "expr": "sum(aliyun_acs_rds_dashboard_my_sql_com_update_average{instance_id=\"$instance_id\"}) by (instance_id)",
-                        "legend": "update",
-                        "refId": "D"
-                    },
-                    {
-                        "expr": "sum(aliyun_acs_rds_dashboard_my_sql_com_select_average{instance_id=\"$instance_id\"}) by (instance_id)",
-                        "legend": "select",
-                        "refId": "E"
-                    }
-                ],
-                "type": "timeseries",
-                "version": "2.0.0"
-            }
+  "name": "阿里云RDS",
+  "tags": "",
+  "ident": "",
+  "configs": {
+    "panels": [
+      {
+        "custom": {
+          "drawStyle": "lines",
+          "fillOpacity": 0.3,
+          "gradientMode": "opacity",
+          "lineInterpolation": "smooth",
+          "lineWidth": 2,
+          "scaleDistribution": {
+            "type": "linear"
+          },
+          "spanNulls": false,
+          "stack": "off"
+        },
+        "datasourceCate": "prometheus",
+        "datasourceValue": "${datasource}",
+        "id": "01f4d444-aa2d-466d-9615-c76baf60a40c",
+        "layout": {
+          "h": 4,
+          "i": "01f4d444-aa2d-466d-9615-c76baf60a40c",
+          "isResizable": true,
+          "w": 12,
+          "x": 0,
+          "y": 0
+        },
+        "maxPerRow": 4,
+        "name": "CPU平均使用率",
+        "options": {
+          "legend": {
+            "displayMode": "hidden"
+          },
+          "standardOptions": {},
+          "thresholds": {
+            "steps": [
+              {
+                "color": "#634CD9",
+                "type": "base",
+                "value": null
+              }
+            ]
+          },
+          "tooltip": {
+            "mode": "all",
+            "sort": "none"
+          }
+        },
+        "targets": [
+          {
+            "expr": "sum(aliyun_acs_rds_dashboard_cpu_usage_average{instance_id=\"$instance_id\"}) by (instance_id)",
+            "legend": "",
+            "refId": "A"
+          }
        ],
-        "var": [
-            {
-                "definition": "prometheus",
-                "name": "datasource",
-                "type": "datasource"
-            },
-            {
-                "datasource": {
-                    "cate": "prometheus",
-                    "value": "${datasource}"
-                },
-                "definition": "label_values(aliyun_acs_rds_dashboard_cpu_usage_average,name)",
-                "multi": false,
-                "name": "name",
-                "type": "query"
-            },
-            {
-                "datasource": {
-                    "cate": "prometheus",
-                    "value": "${datasource}"
-                },
-                "definition": "label_values(aliyun_acs_rds_dashboard_cpu_usage_average{name=\"$name\"},instance_id)",
-                "multi": false,
-                "name": "instance_id",
-                "type": "query"
-            }
+        "type": "timeseries",
+        "version": "2.0.0"
+      },
+      {
+        "custom": {
+          "drawStyle": "lines",
+          "fillOpacity": 0.3,
+          "gradientMode": "opacity",
+          "lineInterpolation": "smooth",
+          "lineWidth": 2,
+          "scaleDistribution": {
+            "type": "linear"
+          },
+          "spanNulls": false,
+          "stack": "off"
+        },
+        "datasourceCate": "prometheus",
+        "datasourceValue": "${datasource}",
+        "id": "c43eb882-915f-4c38-a0b5-8f33c21ab44a",
+        "layout": {
+          "h": 4,
+          "i": "09903231-6557-42be-9cf3-2873878e9bf2",
+          "isResizable": true,
+          "w": 12,
+          "x": 12,
+          "y": 0
+        },
+        "maxPerRow": 4,
+        "name": "内存平均使用率",
+        "options": {
+          "legend": {
+            "displayMode": "hidden"
+          },
+          "standardOptions": {},
+          "thresholds": {
+            "steps": [
+              {
+                "color": "#634CD9",
+                "type": "base",
+                "value": null
+              }
+            ]
+          },
+          "tooltip": {
+            "mode": "all",
+            "sort": "none"
+          }
+        },
+        "targets": [
+          {
+            "expr": "sum(aliyun_acs_rds_dashboard_memory_usage_average{instance_id=\"$instance_id\"}) by (instance_id)",
+            "legend": "",
+            "refId": "A"
+          }
        ],
-        "version": "3.0.0"
-    },
-    "public": 0,
-    "public_cate": 0,
-    "bgids": null,
-    "built_in": 0,
-    "hide": 0,
-    "uuid": 1717556327125143000
-}
+        "type": "timeseries",
+        "version": "2.0.0"
+      },
+      {
+        "custom": {
+          "drawStyle": "lines",
+          "fillOpacity": 0.3,
+          "gradientMode": "opacity",
+          "lineInterpolation": "smooth",
+          "lineWidth": 2,
+          "scaleDistribution": {
+            "type": "linear"
+          },
+          "spanNulls": false,
+          "stack": "off"
+        },
+        "datasourceCate": "prometheus",
+        "datasourceValue": "${datasource}",
+        "id": "37447883-ad79-46bc-888a-1be2835c1c64",
+        "layout": {
+          "h": 4,
+          "i": "378a5a26-c28e-4612-af09-f82ec2e11d80",
+          "isResizable": true,
+          "w": 12,
+          "x": 0,
+          "y": 4
+        },
+        "maxPerRow": 4,
+        "name": "磁盘平均使用率",
+        "options": {
+          "legend": {
+            "displayMode": "hidden"
+          },
+          "standardOptions": {},
+          "thresholds": {
+            "steps": [
+              {
+                "color": "#634CD9",
+                "type": "base",
+                "value": null
+              }
+            ]
+          },
+          "tooltip": {
+            "mode": "all",
+            "sort": "none"
+          }
+        },
+        "targets": [
+          {
+            "expr": "sum(aliyun_acs_rds_dashboard_disk_usage_average{instance_id=\"$instance_id\"}) by (instance_id)",
+            "legend": "",
+            "refId": "A"
+          }
+        ],
+        "type": "timeseries",
+        "version": "2.0.0"
+      },
+      {
+        "custom": {
+          "drawStyle": "lines",
+          "fillOpacity": 0.3,
+          "gradientMode": "opacity",
+          "lineInterpolation": "smooth",
+          "lineWidth": 2,
+          "scaleDistribution": {
+            "type": "linear"
+          },
+          "spanNulls": false,
+          "stack": "off"
+        },
+        "datasourceCate": "prometheus",
+        "datasourceValue": "${datasource}",
+        "id": "c9735607-3f24-44a7-bbf1-3ad39441c5c9",
+        "layout": {
+          "h": 4,
+          "i": "93a4c8a6-ac23-4e26-8a38-781ec1668820",
+          "isResizable": true,
+          "w": 12,
+          "x": 12,
+          "y": 4
+        },
+        "maxPerRow": 4,
+        "name": "IOPS平均使用率",
+        "options": {
+          "legend": {
+            "displayMode": "hidden"
+          },
+          "standardOptions": {},
+          "thresholds": {
+            "steps": [
+              {
+                "color": "#634CD9",
+                "type": "base",
+                "value": null
+              }
+            ]
+          },
+          "tooltip": {
+            "mode": "all",
+            "sort": "none"
+          }
+        },
+        "targets": [
+          {
+            "expr": "sum(aliyun_acs_rds_dashboard_iops_usage_average{instance_id=\"$instance_id\"}) by (instance_id)",
+            "legend": "",
+            "refId": "A"
+          }
+        ],
+        "type": "timeseries",
+        "version": "2.0.0"
+      },
+      {
+        "custom": {
+          "drawStyle": "lines",
+          "fillOpacity": 0.3,
+          "gradientMode": "opacity",
+          "lineInterpolation": "smooth",
+          "lineWidth": 2,
+          "scaleDistribution": {
+            "type": "linear"
+          },
+          "spanNulls": false,
+          "stack": "off"
+        },
+        "datasourceCate": "prometheus",
+        "datasourceValue": "${datasource}",
+        "id": "b516e7dc-8022-409d-b907-18c4143df891",
+        "layout": {
+          "h": 5,
+          "i": "b516e7dc-8022-409d-b907-18c4143df891",
+          "isResizable": true,
+          "w": 24,
+          "x": 0,
+          "y": 8
+        },
+        "maxPerRow": 4,
+        "name": "SQL执行量",
+        "options": {
+          "legend": {
+            "displayMode": "hidden"
+          },
+          "standardOptions": {
+            "util": "percent"
+          },
+          "thresholds": {
+            "steps": [
+              {
+                "color": "#634CD9",
+                "type": "base",
+                "value": null
+              }
+            ]
+          },
+          "tooltip": {
+            "mode": "all",
+            "sort": "none"
+          }
+        },
+        "targets": [
+          {
+            "expr": "sum(aliyun_acs_rds_dashboard_my_sql_com_delete_average{instance_id=\"$instance_id\"}) by (instance_id)",
+            "legend": "delete",
+            "refId": "A"
+          },
+          {
+            "expr": "sum(aliyun_acs_rds_dashboard_my_sql_com_insert_average{instance_id=\"$instance_id\"}) by (instance_id)",
+            "legend": "insert",
+            "refId": "B"
+          },
+          {
+            "expr": "sum(aliyun_acs_rds_dashboard_my_sql_com_insert_select_average{instance_id=\"$instance_id\"}) by (instance_id)",
+            "legend": "insert_select",
+            "refId": "C"
+          },
+          {
+            "expr": "sum(aliyun_acs_rds_dashboard_my_sql_com_update_average{instance_id=\"$instance_id\"}) by (instance_id)",
+            "legend": "update",
+            "refId": "D"
+          },
+          {
+            "expr": "sum(aliyun_acs_rds_dashboard_my_sql_com_select_average{instance_id=\"$instance_id\"}) by (instance_id)",
+            "legend": "select",
+            "refId": "E"
+          }
+        ],
+        "type": "timeseries",
+        "version": "2.0.0"
+      }
+    ],
+    "var": [
+      {
+        "name": "datasource",
+        "type": "datasource",
+        "definition": "prometheus"
+      },
+      {
+        "name": "name",
+        "type": "query",
+        "datasource": {
+          "cate": "prometheus",
+          "value": "${datasource}"
+        },
+        "definition": "label_values(aliyun_acs_rds_dashboard_cpu_usage_average,name)",
+        "multi": false
+      },
+      {
+        "name": "instance_id",
+        "type": "query",
+        "datasource": {
+          "cate": "prometheus",
+          "value": "${datasource}"
+        },
+        "definition": "label_values(aliyun_acs_rds_dashboard_cpu_usage_average{name=\"$name\"},instance_id)",
+        "multi": false
+      }
+    ],
+    "version": "3.0.0"
+  }
+}
--- a/integrations/AliYun/dashboards/rds_new.json
+++ b/integrations/AliYun/dashboards/rds_new.json
--- a/integrations/AliYun/dashboards/redis.json
+++ b/integrations/AliYun/dashboards/redis.json
@@ -1,331 +1,319 @@
 {
-    "id": 0,
-    "group_id": 0,
-    "name": "阿里云REDIS",
-    "ident": "",
-    "tags": "",
-    "create_at": 0,
-    "create_by": "",
-    "update_at": 0,
-    "update_by": "",
-    "configs": {
-        "panels": [
-            {
-                "custom": {
-                    "drawStyle": "lines",
-                    "fillOpacity": 0.3,
-                    "gradientMode": "opacity",
-                    "lineInterpolation": "smooth",
-                    "lineWidth": 2,
-                    "scaleDistribution": {
-                        "type": "linear"
-                    },
-                    "spanNulls": false,
-                    "stack": "off"
-                },
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${datasource}",
-                "id": "01f4d444-aa2d-466d-9615-c76baf60a40c",
-                "layout": {
-                    "h": 4,
-                    "i": "01f4d444-aa2d-466d-9615-c76baf60a40c",
-                    "isResizable": true,
-                    "w": 12,
-                    "x": 0,
-                    "y": 0
-                },
-                "maxPerRow": 4,
-                "name": "CPU平均使用率",
-                "options": {
-                    "legend": {
-                        "displayMode": "hidden"
-                    },
-                    "standardOptions": {},
-                    "thresholds": {
-                        "steps": [
-                            {
-                                "color": "#634CD9",
-                                "type": "base",
-                                "value": null
-                            }
-                        ]
-                    },
-                    "tooltip": {
-                        "mode": "all",
-                        "sort": "none"
-                    }
-                },
-                "targets": [
-                    {
-                        "expr": "sum(aliyun_acs_kvstore_cpu_usage_average{instance_id=\"$instance_id\"}) by (instance_id)",
-                        "legend": "",
-                        "refId": "A"
-                    }
-                ],
-                "type": "timeseries",
-                "version": "2.0.0"
-            },
-            {
-                "custom": {
-                    "drawStyle": "lines",
-                    "fillOpacity": 0.3,
-                    "gradientMode": "opacity",
-                    "lineInterpolation": "smooth",
-                    "lineWidth": 2,
-                    "scaleDistribution": {
-                        "type": "linear"
-                    },
-                    "spanNulls": false,
-                    "stack": "off"
-                },
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${datasource}",
-                "id": "c43eb882-915f-4c38-a0b5-8f33c21ab44a",
-                "layout": {
-                    "h": 4,
-                    "i": "09903231-6557-42be-9cf3-2873878e9bf2",
-                    "isResizable": true,
-                    "w": 12,
-                    "x": 12,
-                    "y": 0
-                },
-                "maxPerRow": 4,
-                "name": "内存平均使用率",
-                "options": {
-                    "legend": {
-                        "displayMode": "hidden"
-                    },
-                    "standardOptions": {},
-                    "thresholds": {
-                        "steps": [
-                            {
-                                "color": "#634CD9",
-                                "type": "base",
-                                "value": null
-                            }
-                        ]
-                    },
-                    "tooltip": {
-                        "mode": "all",
-                        "sort": "none"
-                    }
-                },
-                "targets": [
-                    {
-                        "expr": "sum(aliyun_acs_kvstore_memory_usage_average{instance_id=\"$instance_id\"}) by (instance_id)",
-                        "legend": "",
-                        "refId": "A"
-                    }
-                ],
-                "type": "timeseries",
-                "version": "2.0.0"
-            },
-            {
-                "custom": {
-                    "drawStyle": "lines",
-                    "fillOpacity": 0.3,
-                    "gradientMode": "opacity",
-                    "lineInterpolation": "smooth",
-                    "lineWidth": 2,
-                    "scaleDistribution": {
-                        "type": "linear"
-                    },
-                    "spanNulls": false,
-                    "stack": "off"
-                },
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${datasource}",
-                "id": "37447883-ad79-46bc-888a-1be2835c1c64",
-                "layout": {
-                    "h": 4,
-                    "i": "378a5a26-c28e-4612-af09-f82ec2e11d80",
-                    "isResizable": true,
-                    "w": 12,
-                    "x": 0,
-                    "y": 4
-                },
-                "maxPerRow": 4,
-                "name": "连接数平均使用率",
-                "options": {
-                    "legend": {
-                        "displayMode": "hidden"
-                    },
-                    "standardOptions": {},
-                    "thresholds": {
-                        "steps": [
-                            {
-                                "color": "#634CD9",
-                                "type": "base",
-                                "value": null
-                            }
-                        ]
-                    },
-                    "tooltip": {
-                        "mode": "all",
-                        "sort": "none"
-                    }
-                },
-                "targets": [
-                    {
-                        "expr": "sum(aliyun_acs_kvstore_connection_usage_average{instance_id=\"$instance_id\"}) by (instance_id)",
-                        "legend": "",
-                        "refId": "A"
-                    }
-                ],
-                "type": "timeseries",
-                "version": "2.0.0"
-            },
-            {
-                "custom": {
-                    "drawStyle": "lines",
-                    "fillOpacity": 0.3,
-                    "gradientMode": "opacity",
-                    "lineInterpolation": "smooth",
-                    "lineWidth": 2,
-                    "scaleDistribution": {
-                        "type": "linear"
-                    },
-                    "spanNulls": false,
-                    "stack": "off"
-                },
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${datasource}",
-                "id": "c9735607-3f24-44a7-bbf1-3ad39441c5c9",
-                "layout": {
-                    "h": 4,
-                    "i": "93a4c8a6-ac23-4e26-8a38-781ec1668820",
-                    "isResizable": true,
-                    "w": 12,
-                    "x": 12,
-                    "y": 4
-                },
-                "maxPerRow": 4,
-                "name": "失败统计平均使用率",
-                "options": {
-                    "legend": {
-                        "displayMode": "hidden"
-                    },
-                    "standardOptions": {},
-                    "thresholds": {
-                        "steps": [
-                            {
-                                "color": "#634CD9",
-                                "type": "base",
-                                "value": null
-                            }
-                        ]
-                    },
-                    "tooltip": {
-                        "mode": "all",
-                        "sort": "none"
-                    }
-                },
-                "targets": [
-                    {
-                        "expr": "sum(aliyun_acs_kvstore_failed_count_average{instance_id=\"$instance_id\"}) by (instance_id)",
-                        "legend": "",
-                        "refId": "A"
-                    }
-                ],
-                "type": "timeseries",
-                "version": "2.0.0"
-            },
-            {
-                "custom": {
-                    "drawStyle": "lines",
-                    "fillOpacity": 0.3,
-                    "gradientMode": "opacity",
-                    "lineInterpolation": "smooth",
-                    "lineWidth": 2,
-                    "scaleDistribution": {
-                        "type": "linear"
-                    },
-                    "spanNulls": false,
-                    "stack": "off"
-                },
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${datasource}",
-                "id": "b516e7dc-8022-409d-b907-18c4143df891",
-                "layout": {
-                    "h": 5,
-                    "i": "b516e7dc-8022-409d-b907-18c4143df891",
-                    "isResizable": true,
-                    "w": 24,
-                    "x": 0,
-                    "y": 8
-                },
-                "maxPerRow": 4,
-                "name": "网络流量",
-                "options": {
-                    "legend": {
-                        "displayMode": "hidden"
-                    },
-                    "standardOptions": {
-                        "util": "bitsSI"
-                    },
-                    "thresholds": {
-                        "steps": [
-                            {
-                                "color": "#634CD9",
-                                "type": "base",
-                                "value": null
-                            }
-                        ]
-                    },
-                    "tooltip": {
-                        "mode": "all",
-                        "sort": "none"
-                    }
-                },
-                "targets": [
-                    {
-                        "expr": "sum(aliyun_acs_kvstore_intranet_in_average{instance_id=\"$instance_id\"}) by (instance_id)",
-                        "legend": "in",
-                        "refId": "A"
-                    },
-                    {
-                        "expr": "sum(aliyun_acs_kvstore_intranet_out_average{instance_id=\"$instance_id\"}) by (instance_id)",
-                        "legend": "out",
-                        "refId": "B"
-                    }
-                ],
-                "type": "timeseries",
-                "version": "2.0.0"
-            }
+  "name": "阿里云REDIS",
+  "tags": "",
+  "ident": "",
+  "configs": {
+    "panels": [
+      {
+        "custom": {
+          "drawStyle": "lines",
+          "fillOpacity": 0.3,
+          "gradientMode": "opacity",
+          "lineInterpolation": "smooth",
+          "lineWidth": 2,
+          "scaleDistribution": {
+            "type": "linear"
+          },
+          "spanNulls": false,
+          "stack": "off"
+        },
+        "datasourceCate": "prometheus",
+        "datasourceValue": "${datasource}",
+        "id": "01f4d444-aa2d-466d-9615-c76baf60a40c",
+        "layout": {
+          "h": 4,
+          "i": "01f4d444-aa2d-466d-9615-c76baf60a40c",
+          "isResizable": true,
+          "w": 12,
+          "x": 0,
+          "y": 0
+        },
+        "maxPerRow": 4,
+        "name": "CPU平均使用率",
+        "options": {
+          "legend": {
+            "displayMode": "hidden"
+          },
+          "standardOptions": {},
+          "thresholds": {
+            "steps": [
+              {
+                "color": "#634CD9",
+                "type": "base",
+                "value": null
+              }
+            ]
+          },
+          "tooltip": {
+            "mode": "all",
+            "sort": "none"
+          }
+        },
+        "targets": [
+          {
+            "expr": "sum(aliyun_acs_kvstore_cpu_usage_average{instance_id=\"$instance_id\"}) by (instance_id)",
+            "legend": "",
+            "refId": "A"
+          }
        ],
-        "var": [
-            {
-                "definition": "prometheus",
-                "name": "datasource",
-                "type": "datasource"
-            },
-            {
-                "datasource": {
-                    "cate": "prometheus",
-                    "value": "${datasource}"
-                },
-                "definition": "label_values(aliyun_acs_kvstore_cpu_usage_average,name)",
-                "multi": false,
-                "name": "name",
-                "type": "query"
-            },
-            {
-                "datasource": {
-                    "cate": "prometheus",
-                    "value": "${datasource}"
-                },
-                "definition": "label_values(aliyun_acs_kvstore_cpu_usage_average{name=\"$name\"},instance_id)",
-                "multi": false,
-                "name": "instance_id",
-                "type": "query"
-            }
+        "type": "timeseries",
+        "version": "2.0.0"
+      },
+      {
+        "custom": {
+          "drawStyle": "lines",
+          "fillOpacity": 0.3,
+          "gradientMode": "opacity",
+          "lineInterpolation": "smooth",
+          "lineWidth": 2,
+          "scaleDistribution": {
+            "type": "linear"
+          },
+          "spanNulls": false,
+          "stack": "off"
+        },
+        "datasourceCate": "prometheus",
+        "datasourceValue": "${datasource}",
+        "id": "c43eb882-915f-4c38-a0b5-8f33c21ab44a",
+        "layout": {
+          "h": 4,
+          "i": "09903231-6557-42be-9cf3-2873878e9bf2",
+          "isResizable": true,
+          "w": 12,
+          "x": 12,
+          "y": 0
+        },
+        "maxPerRow": 4,
+        "name": "内存平均使用率",
+        "options": {
+          "legend": {
+            "displayMode": "hidden"
+          },
+          "standardOptions": {},
+          "thresholds": {
+            "steps": [
+              {
+                "color": "#634CD9",
+                "type": "base",
+                "value": null
+              }
+            ]
+          },
+          "tooltip": {
+            "mode": "all",
+            "sort": "none"
+          }
+        },
+        "targets": [
+          {
+            "expr": "sum(aliyun_acs_kvstore_memory_usage_average{instance_id=\"$instance_id\"}) by (instance_id)",
+            "legend": "",
+            "refId": "A"
+          }
        ],
-        "version": "3.0.0"
-    },
-    "public": 0,
-    "public_cate": 0,
-    "bgids": null,
-    "built_in": 0,
-    "hide": 0,
-    "uuid": 1717556327128561000
-}
+        "type": "timeseries",
+        "version": "2.0.0"
+      },
+      {
+        "custom": {
+          "drawStyle": "lines",
+          "fillOpacity": 0.3,
+          "gradientMode": "opacity",
+          "lineInterpolation": "smooth",
+          "lineWidth": 2,
+          "scaleDistribution": {
+            "type": "linear"
+          },
+          "spanNulls": false,
+          "stack": "off"
+        },
+        "datasourceCate": "prometheus",
+        "datasourceValue": "${datasource}",
+        "id": "37447883-ad79-46bc-888a-1be2835c1c64",
+        "layout": {
+          "h": 4,
+          "i": "378a5a26-c28e-4612-af09-f82ec2e11d80",
+          "isResizable": true,
+          "w": 12,
+          "x": 0,
+          "y": 4
+        },
+        "maxPerRow": 4,
+        "name": "连接数平均使用率",
+        "options": {
+          "legend": {
+            "displayMode": "hidden"
+          },
+          "standardOptions": {},
+          "thresholds": {
+            "steps": [
+              {
+                "color": "#634CD9",
+                "type": "base",
+                "value": null
+              }
+            ]
+          },
+          "tooltip": {
+            "mode": "all",
+            "sort": "none"
+          }
+        },
+        "targets": [
+          {
+            "expr": "sum(aliyun_acs_kvstore_connection_usage_average{instance_id=\"$instance_id\"}) by (instance_id)",
+            "legend": "",
+            "refId": "A"
+          }
+        ],
+        "type": "timeseries",
+        "version": "2.0.0"
+      },
+      {
+        "custom": {
+          "drawStyle": "lines",
+          "fillOpacity": 0.3,
+          "gradientMode": "opacity",
+          "lineInterpolation": "smooth",
+          "lineWidth": 2,
+          "scaleDistribution": {
+            "type": "linear"
+          },
+          "spanNulls": false,
+          "stack": "off"
+        },
+        "datasourceCate": "prometheus",
+        "datasourceValue": "${datasource}",
+        "id": "c9735607-3f24-44a7-bbf1-3ad39441c5c9",
+        "layout": {
+          "h": 4,
+          "i": "93a4c8a6-ac23-4e26-8a38-781ec1668820",
+          "isResizable": true,
+          "w": 12,
+          "x": 12,
+          "y": 4
+        },
+        "maxPerRow": 4,
+        "name": "失败统计平均使用率",
+        "options": {
+          "legend": {
+            "displayMode": "hidden"
+          },
+          "standardOptions": {},
+          "thresholds": {
+            "steps": [
+              {
+                "color": "#634CD9",
+                "type": "base",
+                "value": null
+              }
+            ]
+          },
+          "tooltip": {
+            "mode": "all",
+            "sort": "none"
+          }
+        },
+        "targets": [
+          {
+            "expr": "sum(aliyun_acs_kvstore_failed_count_average{instance_id=\"$instance_id\"}) by (instance_id)",
+            "legend": "",
+            "refId": "A"
+          }
+        ],
+        "type": "timeseries",
+        "version": "2.0.0"
+      },
+      {
+        "custom": {
+          "drawStyle": "lines",
+          "fillOpacity": 0.3,
+          "gradientMode": "opacity",
+          "lineInterpolation": "smooth",
+          "lineWidth": 2,
+          "scaleDistribution": {
+            "type": "linear"
+          },
+          "spanNulls": false,
+          "stack": "off"
+        },
+        "datasourceCate": "prometheus",
+        "datasourceValue": "${datasource}",
+        "id": "b516e7dc-8022-409d-b907-18c4143df891",
+        "layout": {
+          "h": 5,
+          "i": "b516e7dc-8022-409d-b907-18c4143df891",
+          "isResizable": true,
+          "w": 24,
+          "x": 0,
+          "y": 8
+        },
+        "maxPerRow": 4,
+        "name": "网络流量",
+        "options": {
+          "legend": {
+            "displayMode": "hidden"
+          },
+          "standardOptions": {
+            "util": "bitsSI"
+          },
+          "thresholds": {
+            "steps": [
+              {
+                "color": "#634CD9",
+                "type": "base",
+                "value": null
+              }
+            ]
+          },
+          "tooltip": {
+            "mode": "all",
+            "sort": "none"
+          }
+        },
+        "targets": [
+          {
+            "expr": "sum(aliyun_acs_kvstore_intranet_in_average{instance_id=\"$instance_id\"}) by (instance_id)",
+            "legend": "in",
+            "refId": "A"
+          },
+          {
+            "expr": "sum(aliyun_acs_kvstore_intranet_out_average{instance_id=\"$instance_id\"}) by (instance_id)",
+            "legend": "out",
+            "refId": "B"
+          }
+        ],
+        "type": "timeseries",
+        "version": "2.0.0"
+      }
+    ],
+    "var": [
+      {
+        "name": "datasource",
+        "type": "datasource",
+        "definition": "prometheus"
+      },
+      {
+        "name": "name",
+        "type": "query",
+        "datasource": {
+          "cate": "prometheus",
+          "value": "${datasource}"
+        },
+        "definition": "label_values(aliyun_acs_kvstore_cpu_usage_average,name)",
+        "multi": false
+      },
+      {
+        "name": "instance_id",
+        "type": "query",
+        "datasource": {
+          "cate": "prometheus",
+          "value": "${datasource}"
+        },
+        "definition": "label_values(aliyun_acs_kvstore_cpu_usage_average{name=\"$name\"},instance_id)",
+        "multi": false
+      }
+    ],
+    "version": "3.0.0"
+  }
+}
--- a/integrations/AliYun/dashboards/redis_cluster.json
+++ b/integrations/AliYun/dashboards/redis_cluster.json
--- a/integrations/AliYun/dashboards/redis_new.json
+++ b/integrations/AliYun/dashboards/redis_new.json
@@ -1,449 +1,437 @@
 {
-    "id": 0,
-    "group_id": 0,
-    "name": "阿里云REDIS_N",
-    "ident": "",
-    "tags": "",
-    "create_at": 0,
-    "create_by": "",
-    "update_at": 0,
-    "update_by": "",
-    "configs": {
-        "panels": [
-            {
-                "collapsed": false,
-                "id": "2c38fd30-4c4c-40a9-ad4a-5c945db32947",
-                "layout": {
-                    "h": 1,
-                    "i": "2c38fd30-4c4c-40a9-ad4a-5c945db32947",
-                    "isResizable": false,
-                    "w": 24,
-                    "x": 0,
-                    "y": 0
-                },
-                "name": "默认分组",
-                "type": "row"
-            },
-            {
-                "custom": {
-                    "drawStyle": "lines",
-                    "fillOpacity": 0.3,
-                    "gradientMode": "opacity",
-                    "lineInterpolation": "smooth",
-                    "lineWidth": 2,
-                    "scaleDistribution": {
-                        "type": "linear"
-                    },
-                    "spanNulls": false,
-                    "stack": "off"
-                },
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${datasource}",
-                "id": "01f4d444-aa2d-466d-9615-c76baf60a40c",
-                "layout": {
-                    "h": 4,
-                    "i": "01f4d444-aa2d-466d-9615-c76baf60a40c",
-                    "isResizable": true,
-                    "w": 8,
-                    "x": 0,
-                    "y": 1
-                },
-                "maxPerRow": 4,
-                "name": "CPU 使用率(%)",
-                "options": {
-                    "legend": {
-                        "displayMode": "hidden"
-                    },
-                    "standardOptions": {
-                        "util": "percent"
-                    },
-                    "thresholds": {
-                        "steps": [
-                            {
-                                "color": "#634CD9",
-                                "type": "base",
-                                "value": null
-                            }
-                        ]
-                    },
-                    "tooltip": {
-                        "mode": "all",
-                        "sort": "none"
-                    }
-                },
-                "targets": [
-                    {
-                        "expr": "aliyun_acs_kvstore_cpu_usage_average{instance_id=\"$instance_id\"}",
-                        "instant": false,
-                        "legend": "",
-                        "refId": "A",
-                        "step": 120
-                    }
-                ],
-                "transformations": [
-                    {
-                        "id": "organize",
-                        "options": {}
-                    }
-                ],
-                "type": "timeseries",
-                "version": "3.0.0"
-            },
-            {
-                "custom": {
-                    "drawStyle": "lines",
-                    "fillOpacity": 0.3,
-                    "gradientMode": "opacity",
-                    "lineInterpolation": "smooth",
-                    "lineWidth": 2,
-                    "scaleDistribution": {
-                        "type": "linear"
-                    },
-                    "spanNulls": false,
-                    "stack": "off"
-                },
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${datasource}",
-                "id": "c43eb882-915f-4c38-a0b5-8f33c21ab44a",
-                "layout": {
-                    "h": 4,
-                    "i": "09903231-6557-42be-9cf3-2873878e9bf2",
-                    "isResizable": true,
-                    "w": 8,
-                    "x": 8,
-                    "y": 1
-                },
-                "maxPerRow": 4,
-                "name": "内存使用率(%)",
-                "options": {
-                    "legend": {
-                        "displayMode": "hidden"
-                    },
-                    "standardOptions": {
-                        "util": "percent"
-                    },
-                    "thresholds": {
-                        "steps": [
-                            {
-                                "color": "#634CD9",
-                                "type": "base",
-                                "value": null
-                            }
-                        ]
-                    },
-                    "tooltip": {
-                        "mode": "all",
-                        "sort": "none"
-                    }
-                },
-                "targets": [
-                    {
-                        "expr": "aliyun_acs_kvstore_memory_usage_average{instance_id=\"$instance_id\"}",
-                        "legend": "",
-                        "refId": "A",
-                        "step": 120
-                    }
-                ],
-                "transformations": [
-                    {
-                        "id": "organize",
-                        "options": {}
-                    }
-                ],
-                "type": "timeseries",
-                "version": "3.0.0"
-            },
-            {
-                "custom": {
-                    "drawStyle": "lines",
-                    "fillOpacity": 0.3,
-                    "gradientMode": "opacity",
-                    "lineInterpolation": "smooth",
-                    "lineWidth": 2,
-                    "scaleDistribution": {
-                        "type": "linear"
-                    },
-                    "spanNulls": false,
-                    "stack": "off"
-                },
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${datasource}",
-                "id": "37447883-ad79-46bc-888a-1be2835c1c64",
-                "layout": {
-                    "h": 4,
-                    "i": "378a5a26-c28e-4612-af09-f82ec2e11d80",
-                    "isResizable": true,
-                    "w": 8,
-                    "x": 16,
-                    "y": 1
-                },
-                "maxPerRow": 4,
-                "name": "连接数使用率(%)",
-                "options": {
-                    "legend": {
-                        "displayMode": "hidden"
-                    },
-                    "standardOptions": {
-                        "util": "percent"
-                    },
-                    "thresholds": {
-                        "steps": [
-                            {
-                                "color": "#634CD9",
-                                "type": "base",
-                                "value": null
-                            }
-                        ]
-                    },
-                    "tooltip": {
-                        "mode": "all",
-                        "sort": "none"
-                    }
-                },
-                "targets": [
-                    {
-                        "expr": "aliyun_acs_kvstore_connection_usage_average{instance_id=\"$instance_id\"}",
-                        "legend": "",
-                        "refId": "A",
-                        "step": 120
-                    }
-                ],
-                "transformations": [
-                    {
-                        "id": "organize",
-                        "options": {}
-                    }
-                ],
-                "type": "timeseries",
-                "version": "3.0.0"
-            },
-            {
-                "custom": {
-                    "drawStyle": "lines",
-                    "fillOpacity": 0.3,
-                    "gradientMode": "opacity",
-                    "lineInterpolation": "smooth",
-                    "lineWidth": 2,
-                    "scaleDistribution": {
-                        "type": "linear"
-                    },
-                    "spanNulls": false,
-                    "stack": "off"
-                },
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${datasource}",
-                "id": "2d1c8cdf-538e-48b5-8563-358f242825e5",
-                "layout": {
-                    "h": 4,
-                    "i": "764e188d-d728-44a0-a79d-133d957df9a9",
-                    "isResizable": true,
-                    "w": 8,
-                    "x": 0,
-                    "y": 5
-                },
-                "maxPerRow": 4,
-                "name": "流入带宽使用率(%)",
-                "options": {
-                    "legend": {
-                        "displayMode": "hidden"
-                    },
-                    "standardOptions": {
-                        "util": "percent"
-                    },
-                    "thresholds": {
-                        "steps": [
-                            {
-                                "color": "#634CD9",
-                                "type": "base",
-                                "value": null
-                            }
-                        ]
-                    },
-                    "tooltip": {
-                        "mode": "all",
-                        "sort": "none"
-                    }
-                },
-                "targets": [
-                    {
-                        "expr": "aliyun_acs_kvstore_intranet_in_ratio_average{instance_id=\"$instance_id\"}",
-                        "instant": false,
-                        "legend": "",
-                        "refId": "A",
-                        "step": 120
-                    }
-                ],
-                "transformations": [
-                    {
-                        "id": "organize",
-                        "options": {}
-                    }
-                ],
-                "type": "timeseries",
-                "version": "3.0.0"
-            },
-            {
-                "custom": {
-                    "drawStyle": "lines",
-                    "fillOpacity": 0.3,
-                    "gradientMode": "opacity",
-                    "lineInterpolation": "smooth",
-                    "lineWidth": 2,
-                    "scaleDistribution": {
-                        "type": "linear"
-                    },
-                    "spanNulls": false,
-                    "stack": "off"
-                },
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${datasource}",
-                "id": "0577dc0f-887a-4a54-9100-ef5e5e7443a0",
-                "layout": {
-                    "h": 4,
-                    "i": "93955b6b-620c-4407-908c-01ba4f544fef",
-                    "isResizable": true,
-                    "w": 8,
-                    "x": 8,
-                    "y": 5
-                },
-                "maxPerRow": 4,
-                "name": "流出带宽使用率(%)",
-                "options": {
-                    "legend": {
-                        "displayMode": "hidden"
-                    },
-                    "standardOptions": {
-                        "util": "percent"
-                    },
-                    "thresholds": {
-                        "steps": [
-                            {
-                                "color": "#634CD9",
-                                "type": "base",
-                                "value": null
-                            }
-                        ]
-                    },
-                    "tooltip": {
-                        "mode": "all",
-                        "sort": "none"
-                    }
-                },
-                "targets": [
-                    {
-                        "expr": "aliyun_acs_kvstore_intranet_out_ratio_average{instance_id=\"$instance_id\"}",
-                        "instant": false,
-                        "legend": "",
-                        "refId": "A",
-                        "step": 120
-                    }
-                ],
-                "transformations": [
-                    {
-                        "id": "organize",
-                        "options": {}
-                    }
-                ],
-                "type": "timeseries",
-                "version": "3.0.0"
-            },
-            {
-                "custom": {
-                    "drawStyle": "lines",
-                    "fillOpacity": 0.3,
-                    "gradientMode": "opacity",
-                    "lineInterpolation": "smooth",
-                    "lineWidth": 2,
-                    "scaleDistribution": {
-                        "type": "linear"
-                    },
-                    "spanNulls": false,
-                    "stack": "off"
-                },
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${datasource}",
-                "id": "a83bd550-3866-4225-9c09-08dd77e1b281",
-                "layout": {
-                    "h": 4,
-                    "i": "7b4d509b-1a8d-4f6a-9df4-f14116c4b9eb",
-                    "isResizable": true,
-                    "w": 8,
-                    "x": 16,
-                    "y": 5
-                },
-                "maxPerRow": 4,
-                "name": "连接数使用率(%)",
-                "options": {
-                    "legend": {
-                        "displayMode": "hidden"
-                    },
-                    "standardOptions": {},
-                    "thresholds": {
-                        "steps": [
-                            {
-                                "color": "#634CD9",
-                                "type": "base",
-                                "value": null
-                            }
-                        ]
-                    },
-                    "tooltip": {
-                        "mode": "all",
-                        "sort": "none"
-                    }
-                },
-                "targets": [
-                    {
-                        "expr": "aliyun_acs_kvstore_connection_usage_average{instance_id=\"$instance_id\"}",
-                        "instant": false,
-                        "legend": "",
-                        "refId": "A",
-                        "step": 120
-                    }
-                ],
-                "transformations": [
-                    {
-                        "id": "organize",
-                        "options": {}
-                    }
-                ],
-                "type": "timeseries",
-                "version": "3.0.0"
-            }
+  "name": "阿里云REDIS_N",
+  "tags": "",
+  "ident": "",
+  "configs": {
+    "panels": [
+      {
+        "collapsed": false,
+        "id": "2c38fd30-4c4c-40a9-ad4a-5c945db32947",
+        "layout": {
+          "h": 1,
+          "i": "2c38fd30-4c4c-40a9-ad4a-5c945db32947",
+          "isResizable": false,
+          "w": 24,
+          "x": 0,
+          "y": 0
+        },
+        "name": "默认分组",
+        "type": "row"
+      },
+      {
+        "custom": {
+          "drawStyle": "lines",
+          "fillOpacity": 0.3,
+          "gradientMode": "opacity",
+          "lineInterpolation": "smooth",
+          "lineWidth": 2,
+          "scaleDistribution": {
+            "type": "linear"
+          },
+          "spanNulls": false,
+          "stack": "off"
+        },
+        "datasourceCate": "prometheus",
+        "datasourceValue": "${datasource}",
+        "id": "01f4d444-aa2d-466d-9615-c76baf60a40c",
+        "layout": {
+          "h": 4,
+          "i": "01f4d444-aa2d-466d-9615-c76baf60a40c",
+          "isResizable": true,
+          "w": 8,
+          "x": 0,
+          "y": 1
+        },
+        "maxPerRow": 4,
+        "name": "CPU 使用率(%)",
+        "options": {
+          "legend": {
+            "displayMode": "hidden"
+          },
+          "standardOptions": {
+            "util": "percent"
+          },
+          "thresholds": {
+            "steps": [
+              {
+                "color": "#634CD9",
+                "type": "base",
+                "value": null
+              }
+            ]
+          },
+          "tooltip": {
+            "mode": "all",
+            "sort": "none"
+          }
+        },
+        "targets": [
+          {
+            "expr": "aliyun_acs_kvstore_cpu_usage_average{instance_id=\"$instance_id\"}",
+            "instant": false,
+            "legend": "",
+            "refId": "A",
+            "step": 120
+          }
        ],
-        "var": [
-            {
-                "definition": "prometheus",
-                "name": "datasource",
-                "type": "datasource"
-            },
-            {
-                "datasource": {
-                    "cate": "prometheus",
-                    "value": "${datasource}"
-                },
-                "definition": "label_values(aliyun_acs_kvstore_cpu_usage_average,name)",
-                "multi": false,
-                "name": "name",
-                "type": "query"
-            },
-            {
-                "datasource": {
-                    "cate": "prometheus",
-                    "value": "${datasource}"
-                },
-                "definition": "label_values(aliyun_acs_kvstore_cpu_usage_average,instance_id)",
-                "multi": false,
-                "name": "instance_id",
-                "type": "query"
-            }
+        "transformations": [
+          {
+            "id": "organize",
+            "options": {}
+          }
        ],
+        "type": "timeseries",
        "version": "3.0.0"
-    },
-    "public": 0,
-    "public_cate": 0,
-    "bgids": null,
-    "built_in": 0,
-    "hide": 0,
-    "uuid": 1717556327133348000
-}
+      },
+      {
+        "custom": {
+          "drawStyle": "lines",
+          "fillOpacity": 0.3,
+          "gradientMode": "opacity",
+          "lineInterpolation": "smooth",
+          "lineWidth": 2,
+          "scaleDistribution": {
+            "type": "linear"
+          },
+          "spanNulls": false,
+          "stack": "off"
+        },
+        "datasourceCate": "prometheus",
+        "datasourceValue": "${datasource}",
+        "id": "c43eb882-915f-4c38-a0b5-8f33c21ab44a",
+        "layout": {
+          "h": 4,
+          "i": "09903231-6557-42be-9cf3-2873878e9bf2",
+          "isResizable": true,
+          "w": 8,
+          "x": 8,
+          "y": 1
+        },
+        "maxPerRow": 4,
+        "name": "内存使用率(%)",
+        "options": {
+          "legend": {
+            "displayMode": "hidden"
+          },
+          "standardOptions": {
+            "util": "percent"
+          },
+          "thresholds": {
+            "steps": [
+              {
+                "color": "#634CD9",
+                "type": "base",
+                "value": null
+              }
+            ]
+          },
+          "tooltip": {
+            "mode": "all",
+            "sort": "none"
+          }
+        },
+        "targets": [
+          {
+            "expr": "aliyun_acs_kvstore_memory_usage_average{instance_id=\"$instance_id\"}",
+            "legend": "",
+            "refId": "A",
+            "step": 120
+          }
+        ],
+        "transformations": [
+          {
+            "id": "organize",
+            "options": {}
+          }
+        ],
+        "type": "timeseries",
+        "version": "3.0.0"
+      },
+      {
+        "custom": {
+          "drawStyle": "lines",
+          "fillOpacity": 0.3,
+          "gradientMode": "opacity",
+          "lineInterpolation": "smooth",
+          "lineWidth": 2,
+          "scaleDistribution": {
+            "type": "linear"
+          },
+          "spanNulls": false,
+          "stack": "off"
+        },
+        "datasourceCate": "prometheus",
+        "datasourceValue": "${datasource}",
+        "id": "37447883-ad79-46bc-888a-1be2835c1c64",
+        "layout": {
+          "h": 4,
+          "i": "378a5a26-c28e-4612-af09-f82ec2e11d80",
+          "isResizable": true,
+          "w": 8,
+          "x": 16,
+          "y": 1
+        },
+        "maxPerRow": 4,
+        "name": "连接数使用率(%)",
+        "options": {
+          "legend": {
+            "displayMode": "hidden"
+          },
+          "standardOptions": {
+            "util": "percent"
+          },
+          "thresholds": {
+            "steps": [
+              {
+                "color": "#634CD9",
+                "type": "base",
+                "value": null
+              }
+            ]
+          },
+          "tooltip": {
+            "mode": "all",
+            "sort": "none"
+          }
+        },
+        "targets": [
+          {
+            "expr": "aliyun_acs_kvstore_connection_usage_average{instance_id=\"$instance_id\"}",
+            "legend": "",
+            "refId": "A",
+            "step": 120
+          }
+        ],
+        "transformations": [
+          {
+            "id": "organize",
+            "options": {}
+          }
+        ],
+        "type": "timeseries",
+        "version": "3.0.0"
+      },
+      {
+        "custom": {
+          "drawStyle": "lines",
+          "fillOpacity": 0.3,
+          "gradientMode": "opacity",
+          "lineInterpolation": "smooth",
+          "lineWidth": 2,
+          "scaleDistribution": {
+            "type": "linear"
+          },
+          "spanNulls": false,
+          "stack": "off"
+        },
+        "datasourceCate": "prometheus",
+        "datasourceValue": "${datasource}",
+        "id": "2d1c8cdf-538e-48b5-8563-358f242825e5",
+        "layout": {
+          "h": 4,
+          "i": "764e188d-d728-44a0-a79d-133d957df9a9",
+          "isResizable": true,
+          "w": 8,
+          "x": 0,
+          "y": 5
+        },
+        "maxPerRow": 4,
+        "name": "流入带宽使用率(%)",
+        "options": {
+          "legend": {
+            "displayMode": "hidden"
+          },
+          "standardOptions": {
+            "util": "percent"
+          },
+          "thresholds": {
+            "steps": [
+              {
+                "color": "#634CD9",
+                "type": "base",
+                "value": null
+              }
+            ]
+          },
+          "tooltip": {
+            "mode": "all",
+            "sort": "none"
+          }
+        },
+        "targets": [
+          {
+            "expr": "aliyun_acs_kvstore_intranet_in_ratio_average{instance_id=\"$instance_id\"}",
+            "instant": false,
+            "legend": "",
+            "refId": "A",
+            "step": 120
+          }
+        ],
+        "transformations": [
+          {
+            "id": "organize",
+            "options": {}
+          }
+        ],
+        "type": "timeseries",
+        "version": "3.0.0"
+      },
+      {
+        "custom": {
+          "drawStyle": "lines",
+          "fillOpacity": 0.3,
+          "gradientMode": "opacity",
+          "lineInterpolation": "smooth",
+          "lineWidth": 2,
+          "scaleDistribution": {
+            "type": "linear"
+          },
+          "spanNulls": false,
+          "stack": "off"
+        },
+        "datasourceCate": "prometheus",
+        "datasourceValue": "${datasource}",
+        "id": "0577dc0f-887a-4a54-9100-ef5e5e7443a0",
+        "layout": {
+          "h": 4,
+          "i": "93955b6b-620c-4407-908c-01ba4f544fef",
+          "isResizable": true,
+          "w": 8,
+          "x": 8,
+          "y": 5
+        },
+        "maxPerRow": 4,
+        "name": "流出带宽使用率(%)",
+        "options": {
+          "legend": {
+            "displayMode": "hidden"
+          },
+          "standardOptions": {
+            "util": "percent"
+          },
+          "thresholds": {
+            "steps": [
+              {
+                "color": "#634CD9",
+                "type": "base",
+                "value": null
+              }
+            ]
+          },
+          "tooltip": {
+            "mode": "all",
+            "sort": "none"
+          }
+        },
+        "targets": [
+          {
+            "expr": "aliyun_acs_kvstore_intranet_out_ratio_average{instance_id=\"$instance_id\"}",
+            "instant": false,
+            "legend": "",
+            "refId": "A",
+            "step": 120
+          }
+        ],
+        "transformations": [
+          {
+            "id": "organize",
+            "options": {}
+          }
+        ],
+        "type": "timeseries",
+        "version": "3.0.0"
+      },
+      {
+        "custom": {
+          "drawStyle": "lines",
+          "fillOpacity": 0.3,
+          "gradientMode": "opacity",
+          "lineInterpolation": "smooth",
+          "lineWidth": 2,
+          "scaleDistribution": {
+            "type": "linear"
+          },
+          "spanNulls": false,
+          "stack": "off"
+        },
+        "datasourceCate": "prometheus",
+        "datasourceValue": "${datasource}",
+        "id": "a83bd550-3866-4225-9c09-08dd77e1b281",
+        "layout": {
+          "h": 4,
+          "i": "7b4d509b-1a8d-4f6a-9df4-f14116c4b9eb",
+          "isResizable": true,
+          "w": 8,
+          "x": 16,
+          "y": 5
+        },
+        "maxPerRow": 4,
+        "name": "连接数使用率(%)",
+        "options": {
+          "legend": {
+            "displayMode": "hidden"
+          },
+          "standardOptions": {},
+          "thresholds": {
+            "steps": [
+              {
+                "color": "#634CD9",
+                "type": "base",
+                "value": null
+              }
+            ]
+          },
+          "tooltip": {
+            "mode": "all",
+            "sort": "none"
+          }
+        },
+        "targets": [
+          {
+            "expr": "aliyun_acs_kvstore_connection_usage_average{instance_id=\"$instance_id\"}",
+            "instant": false,
+            "legend": "",
+            "refId": "A",
+            "step": 120
+          }
+        ],
+        "transformations": [
+          {
+            "id": "organize",
+            "options": {}
+          }
+        ],
+        "type": "timeseries",
+        "version": "3.0.0"
+      }
+    ],
+    "var": [
+      {
+        "name": "datasource",
+        "type": "datasource",
+        "definition": "prometheus"
+      },
+      {
+        "name": "name",
+        "type": "query",
+        "datasource": {
+          "cate": "prometheus",
+          "value": "${datasource}"
+        },
+        "definition": "label_values(aliyun_acs_kvstore_cpu_usage_average,name)",
+        "multi": false
+      },
+      {
+        "datasource": {
+          "cate": "prometheus",
+          "value": "${datasource}"
+        },
+        "definition": "label_values(aliyun_acs_kvstore_cpu_usage_average,instance_id)",
+        "multi": false,
+        "name": "instance_id",
+        "type": "query"
+      }
+    ],
+    "version": "3.0.0"
+  }
+}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
ning	cbcd2a0ca1	refactor	2024-05-24 12:13:17 +08:00
ning	3f865e2d19	code refactor	2024-05-22 10:47:37 +08:00
ning	e3ea65d098	code refactor	2024-05-22 10:34:34 +08:00