fix standard output option for dashboards

2026-03-03 14:38:55 +00:00 · 2023-04-24 10:46:45 +08:00
799 changed files with 14521 additions and 207871 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: Relevant server.conf | webapi.conf
+      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 | server | webapi | 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
@@ -5,7 +5,7 @@ on:
    tags:
      - 'v*'
 env:
-  GO_VERSION: 1.23
+  GO_VERSION: 1.18

 jobs:
  goreleaser:
@@ -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/.gitignore
+++ b/.gitignore
@@ -9,7 +9,6 @@
 *.o
 *.a
 *.so
-*.db
 *.sw[po]
 *.tar.gz
 *.[568vq]
@@ -31,11 +30,7 @@ _test
 /dist
 /etc/*.local.yml
 /etc/*.local.conf
-/etc/rsa/*
 /etc/plugins/*.local.yml
-/etc/script/rules.yaml
-/etc/script/alert-rules.json
-/etc/script/record-rules.json
 /data*
 /tarball
 /run
@@ -45,14 +40,8 @@ _test
 /n9e
 /docker/pub
 /docker/n9e
-/docker/compose-bridge/mysqldata
-/docker/compose-host-network/mysqldata
-/docker/compose-host-network-metric-log/mysqldata
-/docker/compose-host-network-metric-log/n9e-logs
-/docker/compose-postgres/pgdata
-/etc.local*
-/front/statik/statik.go
-/docker/compose-bridge/etc-nightingale/rsa/
+/docker/mysqldata
+/etc.local

 .alerts
 .idea
--- a/.goreleaser.yaml
+++ b/.goreleaser.yaml
@@ -2,7 +2,6 @@ before:
  hooks:
    # You may remove this if you don't use go modules.
    - go mod tidy
-    - go install github.com/rakyll/statik

 snapshot:
  name_template: '{{ .Tag }}'
@@ -15,8 +14,7 @@ builds:
  - id: build
    hooks:
      pre:
-      - cmd: sh -x ./fe.sh
-        output: true
+       - ./fe.sh
    main: ./cmd/center/
    binary: n9e
    env:
@@ -42,9 +40,22 @@ builds:
    ldflags:
      - -s -w
      - -X github.com/ccfos/nightingale/v6/pkg/version.Version={{ .Tag }}-{{.Commit}}
-  - id: build-edge
-    main: ./cmd/edge/
-    binary: n9e-edge
+  - id: build-alert
+    main: ./cmd/alert/
+    binary: n9e-alert
+    env:
+      - CGO_ENABLED=0
+    goos:
+      - linux
+    goarch:
+      - amd64
+      - arm64
+    ldflags:
+      - -s -w
+      - -X github.com/ccfos/nightingale/v6/pkg/version.Version={{ .Tag }}-{{.Commit}}
+  - id: build-pushgw
+    main: ./cmd/pushgw/
+    binary: n9e-pushgw
    env:
      - CGO_ENABLED=0
    goos:
@@ -61,7 +72,8 @@ archives:
    builds:
      - build
      - build-cli
-      - build-edge
+      - build-alert
+      - build-pushgw
    format: tar.gz
    format_overrides:
      - goos: windows
@@ -71,6 +83,7 @@ archives:
    files:
      - docker/*
      - etc/*
+      - pub/*
      - integrations/*
      - cli/*
      - n9e.sql
@@ -90,6 +103,7 @@ dockers:
      - build
    dockerfile: docker/Dockerfile.goreleaser
    extra_files:
+      - pub
      - etc
      - integrations
    use: buildx
@@ -101,8 +115,9 @@ dockers:
    goarch: arm64
    ids:
      - build
-    dockerfile: docker/Dockerfile.goreleaser.arm64
+    dockerfile: docker/Dockerfile.goreleaser
    extra_files:
+      - pub
      - etc
      - integrations
    use: buildx
--- a/18
+++ b/18
@@ -1,4 +1,4 @@
-.PHONY: prebuild build
+.PHONY: start build

 ROOT:=$(shell pwd -P)
 GIT_COMMIT:=$(shell git --work-tree ${ROOT}  rev-parse 'HEAD^{commit}')
@@ -6,35 +6,27 @@ _GIT_VERSION:=$(shell git --work-tree ${ROOT} describe --tags --abbrev=14 "${GIT
 TAG=$(shell echo "${_GIT_VERSION}" |  awk -F"-" '{print $$1}')
 RELEASE_VERSION:="$(TAG)-$(GIT_COMMIT)"

-all: prebuild build
-
-prebuild:
-	echo "begin download and embed the front-end file..."
-	sh fe.sh
-	echo "front-end file download and embedding completed."
+all: build

 build:
 	go build -ldflags "-w -s -X github.com/ccfos/nightingale/v6/pkg/version.Version=$(RELEASE_VERSION)" -o n9e ./cmd/center/main.go

-build-edge:
-	go build -ldflags "-w -s -X github.com/ccfos/nightingale/v6/pkg/version.Version=$(RELEASE_VERSION)" -o n9e-edge ./cmd/edge/
-
 build-alert:
 	go build -ldflags "-w -s -X github.com/ccfos/nightingale/v6/pkg/version.Version=$(RELEASE_VERSION)" -o n9e-alert ./cmd/alert/main.go

 build-pushgw:
 	go build -ldflags "-w -s -X github.com/ccfos/nightingale/v6/pkg/version.Version=$(RELEASE_VERSION)" -o n9e-pushgw ./cmd/pushgw/main.go

-build-cli: 
+build-cli:
 	go build -ldflags "-w -s -X github.com/ccfos/nightingale/v6/pkg/version.Version=$(RELEASE_VERSION)" -o n9e-cli ./cmd/cli/main.go

 run:
 	nohup ./n9e > n9e.log 2>&1 &

-run-alert:
+run_alert:
 	nohup ./n9e-alert > n9e-alert.log 2>&1 &

-run-pushgw:
+run_pushgw:
 	nohup ./n9e-pushgw > n9e-pushgw.log 2>&1 &

 release:
--- a/README.md
+++ b/README.md
@@ -1,107 +1,148 @@
 <p align="center">
  <a href="https://github.com/ccfos/nightingale">
-    <img src="doc/img/Nightingale_L_V.png" alt="nightingale - cloud native monitoring" width="100" /></a>
-</p>
-<p align="center">
-  <b>开源告警管理专家 一体化的可观测平台</b>
+    <img src="doc/img/nightingale_logo_h.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">
+  <b>All-in-one</b> 的开源观测平台 <br/>
+  <b>开箱即用</b>，集数据采集、可视化、监控告警于一体 <br/>
+  推荐升级您的 <b>Prometheus + AlertManager + Grafana + ELK + Jaeger</b> 组合方案到夜莺！
 </p>
-
-

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

-## 夜莺 Nightingale 是什么
-
-夜莺监控是一款开源云原生观测分析工具，采用 All-in-One 的设计理念，集数据采集、可视化、监控告警、数据分析于一体，与云原生生态紧密集成，提供开箱即用的企业级监控分析和告警能力。夜莺于 2020 年 3 月 20 日，在 GitHub 上发布 v1 版本，已累计迭代 100 多个版本。
-
-夜莺最初由滴滴开发和开源，并于 2022 年 5 月 11 日，捐赠予中国计算机学会开源发展委员会（CCF ODC），为 CCF ODC 成立后接受捐赠的第一个开源项目。夜莺的核心研发团队，也是 Open-Falcon 项目原核心研发人员，从 2014 年（Open-Falcon 是 2014 年开源）算起来，也有 10 年了，只为把监控这个事情做好。


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

-## 功能特点
+- **开箱即用**
+  - 支持 Docker、Helm Chart、云服务等多种部署方式，集数据采集、监控告警、可视化为一体，内置多种监控仪表盘、快捷视图、告警规则模板，导入即可快速使用，**大幅降低云原生监控系统的建设成本、学习成本、使用成本**；
+- **专业告警**
+  - 可视化的告警配置和管理，支持丰富的告警规则，提供屏蔽规则、订阅规则的配置能力，支持告警多种送达渠道，支持告警自愈、告警事件管理等；
+  - **推荐您使用夜莺的同时，无缝搭配[FlashDuty](https://flashcat.cloud/product/flashcat-duty/)，实现告警聚合收敛、认领、升级、排班、协同，让告警的触达既高效，又确保告警处理不遗漏、做到件件有回响**。
+- **云原生**
+  - 以交钥匙的方式快速构建企业级的云原生监控体系，支持 [Categraf](https://github.com/flashcatcloud/categraf)、Telegraf、Grafana-agent 等多种采集器，支持 Prometheus、VictoriaMetrics、M3DB、ElasticSearch、Jaeger 等多种数据源，兼容支持导入 Grafana 仪表盘，**与云原生生态无缝集成**；
+- **高性能 高可用**
+  - 得益于夜莺的多数据源管理引擎，和夜莺引擎侧优秀的架构设计，借助于高性能时序库，可以满足数亿时间线的采集、存储、告警分析场景，节省大量成本；
+  - 夜莺监控组件均可水平扩展，无单点，已在上千家企业部署落地，经受了严苛的生产实践检验。众多互联网头部公司，夜莺集群机器达百台，处理数亿级时间线，重度使用夜莺监控；
+- **灵活扩展 中心化管理**
+  - 夜莺监控，可部署在 1 核 1G 的云主机，可在上百台机器集群化部署，可运行在 K8s 中；也可将时序库、告警引擎等组件下沉到各机房、各 Region，兼顾边缘部署和中心化统一管理，**解决数据割裂，缺乏统一视图的难题**；
+- **开放社区**
+  - 托管于[中国计算机学会开源发展委员会](https://www.ccf.org.cn/kyfzwyh/)，有[快猫星云](https://flashcat.cloud)和众多公司的持续投入，和数千名社区用户的积极参与，以及夜莺监控项目清晰明确的定位，都保证了夜莺开源社区健康、长久的发展。活跃、专业的社区用户也在持续迭代和沉淀更多的最佳实践于产品中；

- 对接多种时序库：支持对接 Prometheus、VictoriaMetrics、Thanos、Mimir、M3DB、TDengine 等多种时序库，实现统一告警管理。
- 专业告警能力：内置支持多种告警规则，可以扩展支持常见通知媒介，支持告警屏蔽/抑制/订阅/自愈、告警事件管理。
- 高性能可视化引擎：支持多种图表样式，内置众多 Dashboard 模版，也可导入 Grafana 模版，开箱即用，开源协议商业友好。
- 支持常见采集器：支持 [Categraf](https://flashcat.cloud/product/categraf)、Telegraf、Grafana-agent、Datadog-agent、各种 Exporter 作为采集器，没有什么数据是不能监控的。
- 👀无缝搭配 [Flashduty](https://flashcat.cloud/product/flashcat-duty/)：实现告警聚合收敛、认领、升级、排班、IM集成，确保告警处理不遗漏，减少打扰，高效协同。
+## 使用场景
+1. **如果您希望在一个平台中，统一管理和查看 Metrics、Logging、Tracing 数据，推荐你使用夜莺**：
+   - 请参考阅读：[不止于监控，夜莺 V6 全新升级为开源观测平台](http://flashcat.cloud/blog/nightingale-v6-release/)
+2. **如果您在使用 Prometheus 过程中，有以下的一个或者多个需求场景，推荐您无缝升级到夜莺**：
+   - Prometheus、Alertmanager、Grafana 等多个系统较为割裂，缺乏统一视图，无法开箱即用;
+   - 通过修改配置文件来管理 Prometheus、Alertmanager 的方式，学习曲线大，协同有难度;
+   - 数据量过大而无法扩展您的 Prometheus 集群；
+   - 生产环境运行多套 Prometheus 集群，面临管理和使用成本高的问题；
+3. **如果您在使用 Zabbix，有以下的场景，推荐您升级到夜莺**：
+   - 监控的数据量太大，希望有更好的扩展解决方案；
+   - 学习曲线高，多人多团队模式下，希望有更好的协同使用效率；
+   - 微服务和云原生架构下，监控数据的生命周期多变、监控数据维度基数高，Zabbix 数据模型不易适配；
+   - 了解更多Zabbix和夜莺监控的对比，推荐您进一步阅读[Zabbix 和夜莺监控选型对比](https://flashcat.cloud/blog/zabbx-vs-nightingale/)
+4. **如果您在使用 [Open-Falcon](https://github.com/open-falcon/falcon-plus)，我们推荐您升级到夜莺：**
+   - 关于 Open-Falcon 和夜莺的详细介绍，请参考阅读：[云原生监控的十个特点和趋势](http://flashcat.cloud/blog/10-trends-of-cloudnative-monitoring/)
+   - 监控系统和可观测平台的区别，请参考阅读：[从监控系统到可观测平台，Gap有多大
+](https://flashcat.cloud/blog/gap-of-monitoring-to-o11y/)
+5. **我们推荐您使用 [Categraf](https://github.com/flashcatcloud/categraf) 作为首选的监控数据采集器**：
+   - [Categraf](https://github.com/flashcatcloud/categraf) 是夜莺监控的默认采集器，采用开放插件机制和 All-in-one 的设计理念，同时支持 metric、log、trace、event 的采集。Categraf 不仅可以采集 CPU、内存、网络等系统层面的指标，也集成了众多开源组件的采集能力，支持K8s生态。Categraf 内置了对应的仪表盘和告警规则，开箱即用。
+
+## 文档
+
+[English Doc](https://n9e.github.io/) |  [中文文档](https://flashcat.cloud/docs/)
+
+## 产品示意图
+
+https://user-images.githubusercontent.com/792850/216888712-2565fcea-9df5-47bd-a49e-d60af9bd76e8.mp4
+
+## 夜莺架构
+
+夜莺监控可以接收各种采集器上报的监控数据（比如 [Categraf](https://github.com/flashcatcloud/categraf)、telegraf、grafana-agent、Prometheus），并写入多种流行的时序数据库中（可以支持Prometheus、M3DB、VictoriaMetrics、Thanos、TDEngine等），提供告警规则、屏蔽规则、订阅规则的配置能力，提供监控数据的查看能力，提供告警自愈机制（告警触发之后自动回调某个webhook地址或者执行某个脚本），提供历史告警事件的存储管理、分组查看的能力。
+
+### 中心汇聚式部署方案
+
+![中心汇聚式部署方案](https://download.flashcat.cloud/ulric/20230327133406.png)
+
+夜莺只有一个模块，就是 n9e，可以部署多个 n9e 实例组成集群，n9e 依赖 2 个存储，数据库、Redis，数据库可以使用 MySQL 或 Postgres，自己按需选用。
+
+n9e 提供的是 HTTP 接口，前面负载均衡可以是 4 层的，也可以是 7 层的。一般就选用 Nginx 就可以了。
+
+n9e 这个模块接收到数据之后，需要转发给后端的时序库，相关配置是：
+
+```toml
+[Pushgw]
+LabelRewrite = true
+[[Pushgw.Writers]] 
+Url = "http://127.0.0.1:9090/api/v1/write"
+```
+
+> 注意：虽然数据源可以在页面配置了，但是上报转发链路，还是需要在配置文件指定。
+
+所有机房的 agent（ 比如 Categraf、Telegraf、 Grafana-agent、Datadog-agent ），都直接推数据给 n9e，这个架构最为简单，维护成本最低。当然，前提是要求机房之间网络链路比较好，一般有专线。如果网络链路不好，则要使用下面的部署方式了。
+
+### 边缘下沉式混杂部署方案
+
+![边缘下沉式混杂部署方案](https://download.flashcat.cloud/ulric/20230327135615.png)
+
+这个图尝试解释 3 种不同的情形，比如 A 机房和中心网络链路很好，Categraf 可以直接汇报数据给中心 n9e 模块，另一个机房网络链路不好，就需要把时序库下沉部署，时序库下沉了，对应的告警引擎和转发网关也都要跟随下沉，这样数据不会跨机房传输，比较稳定。但是心跳还是需要往中心心跳，要不然在对象列表里看不到机器的 CPU、内存使用率。还有的时候，可能是接入的一个已有的 Prometheus，数据采集没有走 Categraf，那此时只需要把 Prometheus 作为数据源接入夜莺即可，可以在夜莺里看图、配告警规则，但是就是在对象列表里看不到，也不能使用告警自愈的功能，问题也不大，核心功能都不受影响。
+
+边缘机房，下沉部署时序库、告警引擎、转发网关的时候，要注意，告警引擎需要依赖数据库，因为要同步告警规则，转发网关也要依赖数据库，因为要注册对象到数据库里去，需要打通相关网络，告警引擎和转发网关都不用Redis，所以无需为 Redis 打通网络。 
+
+### VictoriaMetrics 集群架构
+<img src="doc/img/install-vm.png" width="600">
+
+如果单机版本的时序数据库（比如 Prometheus） 性能有瓶颈或容灾较差，我们推荐使用 [VictoriaMetrics](https://github.com/VictoriaMetrics/VictoriaMetrics)，VictoriaMetrics 架构较为简单，性能优异，易于部署和运维，架构图如上。VictoriaMetrics 更详尽的文档，还请参考其[官网](https://victoriametrics.com/)。
+
+## 夜莺社区
+
+开源项目要更有生命力，离不开开放的治理架构和源源不断的开发者和用户共同参与，我们致力于建立开放、中立的开源治理架构，吸纳更多来自企业、高校等各方面对云原生监控感兴趣、有热情的开发者，一起打造有活力的夜莺开源社区。关于《夜莺开源项目和社区治理架构（草案）》，请查阅 [COMMUNITY GOVERNANCE](./doc/community-governance.md).
+
+**我们欢迎您以各种方式参与到夜莺开源项目和开源社区中来，工作包括不限于**：
+- 补充和完善文档 => [n9e.github.io](https://n9e.github.io/)
+- 分享您在使用夜莺监控过程中的最佳实践和经验心得 => [文章分享](https://flashcat.cloud/docs/content/flashcat-monitor/nightingale/share/)
+- 提交产品建议 =》 [github issue](https://github.com/ccfos/nightingale/issues/new?assignees=&labels=kind%2Ffeature&template=enhancement.md)
+- 提交代码，让夜莺监控更快、更稳、更好用 => [github pull request](https://github.com/didi/nightingale/pulls)
+
+**尊重、认可和记录每一位贡献者的工作**是夜莺开源社区的第一指导原则，我们提倡**高效的提问**，这既是对开发者时间的尊重，也是对整个社区知识沉淀的贡献：
+- 提问之前请先查阅 [FAQ](https://www.gitlink.org.cn/ccfos/nightingale/wiki/faq) 
+- 我们使用[论坛](https://answer.flashcat.cloud/)进行交流，有问题可以到这里搜索、提问
+- 我们也推荐你加入微信群，和其他夜莺用户交流经验 (请先加好友：[picobyte](https://www.gitlink.org.cn/UlricQin/gist/tree/master/self.jpeg) 备注：夜莺加群+姓名+公司)


-## 截图演示
+## Who is using Nightingale

+您可以通过在 **[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)

-![语言切换](https://download.flashcat.cloud/ulric/n9e-switch-i18n.png)
-
-即时查询，类似 Prometheus 内置的查询分析页面，做 ad-hoc 查询，夜莺做了一些 UI 优化，同时提供了一些内置 promql 指标，让不太了解 promql 的用户也可以快速查询。
-
-![即时查询](https://download.flashcat.cloud/ulric/20240513103305.png)
-
-当然，也可以直接通过指标视图查看，有了指标视图，即时查询基本可以不用了，或者只有高端玩家使用即时查询，普通用户直接通过指标视图查询即可。
-
-![指标视图](https://download.flashcat.cloud/ulric/20240513103530.png)
-
-夜莺内置了常用仪表盘，可以直接导入使用。也可以导入 Grafana 仪表盘，不过只能兼容 Grafana 基本图表，如果已经习惯了 Grafana 建议继续使用 Grafana 看图，把夜莺作为一个告警引擎使用。
-
-![内置仪表盘](https://download.flashcat.cloud/ulric/20240513103628.png)
-
-除了内置的仪表盘，也内置了很多告警规则，开箱即用。
-
-![内置告警规则](https://download.flashcat.cloud/ulric/20240513103825.png)
-
-
-
-## 产品架构
-
-社区使用夜莺最多的场景就是使用夜莺做告警引擎，对接多套时序库，统一告警规则管理。绘图仍然使用 Grafana 居多。作为一个告警引擎，夜莺的产品架构如下：
-
-![产品架构](https://download.flashcat.cloud/ulric/20240221152601.png)
-
-对于个别边缘机房，如果和中心夜莺服务端网络链路不好，希望提升告警可用性，我们也提供边缘机房告警引擎下沉部署模式，这个模式下，即便网络割裂，告警功能也不受影响。
-
-![边缘部署模式](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/20241022141621.png)，如果二维码过期了，可以联系我（我的微信：`picobyte`）拉群，备注： `夜莺互助群`
-
-## 广受关注
-[![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、提交功能需求、分享最佳实践，共建专业、活跃的夜莺开源社区。
- ❤️ 夜莺贡献者
+## 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)
+
+## 加入交流群
+
+<img src="doc/img/wecom.png" width="120">
--- 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_logo_h.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.md) | [中文](./README_ZH.md)


-[English](./README_en.md) | [中文](./README.md)
+## Highlighted Features

-## 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.
-
-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
+
+[English Doc](https://n9e.github.io/) |  [中文文档](http://n9e.flashcat.cloud/)
+
 ## 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
@@ -2,10 +2,11 @@ package aconf

 import (
 	"path"
+
+	"github.com/toolkits/pkg/runner"
 )

 type Alert struct {
-	Disable     bool
 	EngineDelay int64
 	Heartbeat   HeartbeatConfig
 	Alerting    Alerting
@@ -32,7 +33,6 @@ type Alerting struct {
 	Timeout           int64
 	TemplatesDir      string
 	NotifyConcurrency int
-	WebhookBatchSend  bool
 }

 type CallPlugin struct {
@@ -47,9 +47,16 @@ type RedisPub struct {
 	ChannelKey    string
 }

-func (a *Alert) PreCheck(configDir string) {
+type Ibex struct {
+	Address       string
+	BasicAuthUser string
+	BasicAuthPass string
+	Timeout       int64
+}
+
+func (a *Alert) PreCheck() {
 	if a.Alerting.TemplatesDir == "" {
-		a.Alerting.TemplatesDir = path.Join(configDir, "template")
+		a.Alerting.TemplatesDir = path.Join(runner.Cwd, "etc", "template")
 	}

 	if a.Alerting.NotifyConcurrency == 0 {
@@ -60,7 +67,7 @@ func (a *Alert) PreCheck(configDir string) {
 		a.Heartbeat.Interval = 1000
 	}

-	if a.EngineDelay == 0 {
-		a.EngineDelay = 30
+	if a.Heartbeat.EngineName == "" {
+		a.Heartbeat.EngineName = "default"
 	}
 }
--- a/alert/alert.go
+++ b/alert/alert.go
@@ -15,7 +15,6 @@ import (
 	"github.com/ccfos/nightingale/v6/alert/router"
 	"github.com/ccfos/nightingale/v6/alert/sender"
 	"github.com/ccfos/nightingale/v6/conf"
-	"github.com/ccfos/nightingale/v6/dumper"
 	"github.com/ccfos/nightingale/v6/memsto"
 	"github.com/ccfos/nightingale/v6/models"
 	"github.com/ccfos/nightingale/v6/pkg/ctx"
@@ -25,9 +24,6 @@ import (
 	"github.com/ccfos/nightingale/v6/pushgw/pconf"
 	"github.com/ccfos/nightingale/v6/pushgw/writer"
 	"github.com/ccfos/nightingale/v6/storage"
-	"github.com/ccfos/nightingale/v6/tdengine"
-
-	"github.com/flashcatcloud/ibex/src/cmd/ibex"
 )

 func Initialize(configDir string, cryptoKey string) (func(), error) {
@@ -41,10 +37,13 @@ func Initialize(configDir string, cryptoKey string) (func(), error) {
 		return nil, err
 	}

-	ctx := ctx.NewContext(context.Background(), nil, false, config.CenterApi)
+	db, err := storage.New(config.DB)
+	if err != nil {
+		return nil, err
+	}
+	ctx := ctx.NewContext(context.Background(), db)

-	var redis storage.Redis
-	redis, err = storage.NewRedis(config.Redis)
+	redis, err := storage.NewRedis(config.Redis)
 	if err != nil {
 		return nil, err
 	}
@@ -52,36 +51,22 @@ func Initialize(configDir string, cryptoKey string) (func(), error) {
 	syncStats := memsto.NewSyncStats()
 	alertStats := astats.NewSyncStats()

-	configCache := memsto.NewConfigCache(ctx, syncStats, nil, "")
 	targetCache := memsto.NewTargetCache(ctx, syncStats, redis)
 	busiGroupCache := memsto.NewBusiGroupCache(ctx, syncStats)
 	alertMuteCache := memsto.NewAlertMuteCache(ctx, syncStats)
 	alertRuleCache := memsto.NewAlertRuleCache(ctx, syncStats)
-	notifyConfigCache := memsto.NewNotifyConfigCache(ctx, configCache)
+	notifyConfigCache := memsto.NewNotifyConfigCache(ctx)
 	dsCache := memsto.NewDatasourceCache(ctx, syncStats)
-	userCache := memsto.NewUserCache(ctx, syncStats)
-	userGroupCache := memsto.NewUserGroupCache(ctx, syncStats)
-	taskTplsCache := memsto.NewTaskTplCache(ctx)
-	configCvalCache := memsto.NewCvalCache(ctx, syncStats)

-	promClients := prom.NewPromClient(ctx)
-	dispatch.InitRegisterQueryFunc(promClients)
-	tdengineClients := tdengine.NewTdengineClient(ctx, config.Alert.Heartbeat)
+	promClients := prom.NewPromClient(ctx, config.Alert.Heartbeat)

 	externalProcessors := process.NewExternalProcessors()

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

-	r := httpx.GinEngine(config.Global.RunMode, config.HTTP,
-		configCvalCache.PrintBodyPaths, configCvalCache.PrintAccessLog)
+	r := httpx.GinEngine(config.Global.RunMode, config.HTTP)
 	rt := router.New(config.HTTP, config.Alert, alertMuteCache, targetCache, busiGroupCache, alertStats, ctx, externalProcessors)
-
-	if config.Ibex.Enable {
-		ibex.ServerStart(false, nil, redis, config.HTTP.APIForService.BasicAuth, config.Alert.Heartbeat, &config.CenterApi, r, nil, config.Ibex, config.HTTP.Port)
-	}
-
 	rt.Config(r)
-	dumper.ConfigRouter(r)

 	httpClean := httpx.Init(config.HTTP, r)

@@ -92,28 +77,27 @@ func Initialize(configDir string, cryptoKey string) (func(), error) {
 }

 func Start(alertc aconf.Alert, pushgwc pconf.Pushgw, syncStats *memsto.Stats, alertStats *astats.Stats, externalProcessors *process.ExternalProcessorsType, targetCache *memsto.TargetCacheType, busiGroupCache *memsto.BusiGroupCacheType,
-	alertMuteCache *memsto.AlertMuteCacheType, alertRuleCache *memsto.AlertRuleCacheType, notifyConfigCache *memsto.NotifyConfigCacheType, taskTplsCache *memsto.TaskTplCache, datasourceCache *memsto.DatasourceCacheType, ctx *ctx.Context,
-	promClients *prom.PromClientMap, tdendgineClients *tdengine.TdengineClientMap, userCache *memsto.UserCacheType, userGroupCache *memsto.UserGroupCacheType) {
+	alertMuteCache *memsto.AlertMuteCacheType, alertRuleCache *memsto.AlertRuleCacheType, notifyConfigCache *memsto.NotifyConfigCacheType, datasourceCache *memsto.DatasourceCacheType, ctx *ctx.Context, promClients *prom.PromClientMap, isCenter bool) {
+	userCache := memsto.NewUserCache(ctx, syncStats)
+	userGroupCache := memsto.NewUserGroupCache(ctx, syncStats)
 	alertSubscribeCache := memsto.NewAlertSubscribeCache(ctx, syncStats)
 	recordingRuleCache := memsto.NewRecordingRuleCache(ctx, syncStats)
-	targetsOfAlertRulesCache := memsto.NewTargetOfAlertRuleCache(ctx, alertc.Heartbeat.EngineName, syncStats)

 	go models.InitNotifyConfig(ctx, alertc.Alerting.TemplatesDir)

-	naming := naming.NewNaming(ctx, alertc.Heartbeat, alertStats)
+	naming := naming.NewNaming(ctx, alertc.Heartbeat, isCenter)

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

-	eval.NewScheduler(alertc, externalProcessors, alertRuleCache, targetCache, targetsOfAlertRulesCache,
-		busiGroupCache, alertMuteCache, datasourceCache, promClients, tdendgineClients, naming, ctx, alertStats)
+	eval.NewScheduler(isCenter, alertc, externalProcessors, alertRuleCache, targetCache, busiGroupCache, alertMuteCache, datasourceCache, promClients, 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)
+	dp := dispatch.NewDispatch(alertRuleCache, userCache, userGroupCache, alertSubscribeCache, targetCache, notifyConfigCache, alertc.Alerting, ctx)
+	consumer := dispatch.NewConsumer(alertc.Alerting, ctx, dp)

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

 	go queue.ReportQueueSize(alertStats)
-	go sender.InitEmailSender(ctx, notifyConfigCache)
+	go sender.StartEmailSender(notifyConfigCache.GetSMTP()) // todo
 }
--- a/alert/astats/stats.go
+++ b/alert/astats/stats.go
@@ -10,77 +10,22 @@ const (
 )

 type Stats struct {
-	AlertNotifyTotal            *prometheus.CounterVec
-	AlertNotifyErrorTotal       *prometheus.CounterVec
-	CounterAlertsTotal          *prometheus.CounterVec
-	GaugeAlertQueueSize         prometheus.Gauge
-	CounterRuleEval             *prometheus.CounterVec
-	CounterQueryDataErrorTotal  *prometheus.CounterVec
-	CounterQueryDataTotal       *prometheus.CounterVec
-	CounterRecordEval           *prometheus.CounterVec
-	CounterRecordEvalErrorTotal *prometheus.CounterVec
-	CounterMuteTotal            *prometheus.CounterVec
-	CounterRuleEvalErrorTotal   *prometheus.CounterVec
-	CounterHeartbeatErrorTotal  *prometheus.CounterVec
-	CounterSubEventTotal        *prometheus.CounterVec
+	CounterSampleTotal   *prometheus.CounterVec
+	CounterAlertsTotal   *prometheus.CounterVec
+	GaugeAlertQueueSize  prometheus.Gauge
+	GaugeSampleQueueSize *prometheus.GaugeVec
+	RequestDuration      *prometheus.HistogramVec
+	ForwardDuration      *prometheus.HistogramVec
 }

 func NewSyncStats() *Stats {
-	CounterRuleEval := prometheus.NewCounterVec(prometheus.CounterOpts{
+	// 从各个接收接口接收到的监控数据总量
+	CounterSampleTotal := prometheus.NewCounterVec(prometheus.CounterOpts{
 		Namespace: namespace,
 		Subsystem: subsystem,
-		Name:      "rule_eval_total",
-		Help:      "Number of rule eval.",
-	}, []string{})
-
-	CounterRuleEvalErrorTotal := prometheus.NewCounterVec(prometheus.CounterOpts{
-		Namespace: namespace,
-		Subsystem: subsystem,
-		Name:      "rule_eval_error_total",
-		Help:      "Number of rule eval error.",
-	}, []string{"datasource", "stage", "busi_group", "rule_id"})
-
-	CounterQueryDataErrorTotal := prometheus.NewCounterVec(prometheus.CounterOpts{
-		Namespace: namespace,
-		Subsystem: subsystem,
-		Name:      "query_data_error_total",
-		Help:      "Number of rule eval query data error.",
-	}, []string{"datasource"})
-
-	CounterQueryDataTotal := prometheus.NewCounterVec(prometheus.CounterOpts{
-		Namespace: namespace,
-		Subsystem: subsystem,
-		Name:      "query_data_total",
-		Help:      "Number of rule eval query data.",
-	}, []string{"datasource"})
-
-	CounterRecordEval := prometheus.NewCounterVec(prometheus.CounterOpts{
-		Namespace: namespace,
-		Subsystem: subsystem,
-		Name:      "record_eval_total",
-		Help:      "Number of record eval.",
-	}, []string{"datasource"})
-
-	CounterRecordEvalErrorTotal := prometheus.NewCounterVec(prometheus.CounterOpts{
-		Namespace: namespace,
-		Subsystem: subsystem,
-		Name:      "record_eval_error_total",
-		Help:      "Number of record eval error.",
-	}, []string{"datasource"})
-
-	AlertNotifyTotal := prometheus.NewCounterVec(prometheus.CounterOpts{
-		Namespace: namespace,
-		Subsystem: subsystem,
-		Name:      "alert_notify_total",
-		Help:      "Number of send msg.",
-	}, []string{"channel"})
-
-	AlertNotifyErrorTotal := prometheus.NewCounterVec(prometheus.CounterOpts{
-		Namespace: namespace,
-		Subsystem: subsystem,
-		Name:      "alert_notify_error_total",
-		Help:      "Number of send msg.",
-	}, []string{"channel"})
+		Name:      "samples_received_total",
+		Help:      "Total number samples received.",
+	}, []string{"cluster", "channel"})

 	// 产生的告警总量
 	CounterAlertsTotal := prometheus.NewCounterVec(prometheus.CounterOpts{
@@ -88,7 +33,7 @@ func NewSyncStats() *Stats {
 		Subsystem: subsystem,
 		Name:      "alerts_total",
 		Help:      "Total number alert events.",
-	}, []string{"cluster", "type", "busi_group"})
+	}, []string{"cluster"})

 	// 内存中的告警事件队列的长度
 	GaugeAlertQueueSize := prometheus.NewGauge(prometheus.GaugeOpts{
@@ -98,56 +43,51 @@ func NewSyncStats() *Stats {
 		Help:      "The size of alert queue.",
 	})

-	CounterMuteTotal := prometheus.NewCounterVec(prometheus.CounterOpts{
+	// 数据转发队列，各个队列的长度
+	GaugeSampleQueueSize := prometheus.NewGaugeVec(prometheus.GaugeOpts{
 		Namespace: namespace,
 		Subsystem: subsystem,
-		Name:      "mute_total",
-		Help:      "Number of mute.",
-	}, []string{"group"})
+		Name:      "sample_queue_size",
+		Help:      "The size of sample queue.",
+	}, []string{"cluster", "channel_number"})

-	CounterSubEventTotal := prometheus.NewCounterVec(prometheus.CounterOpts{
-		Namespace: namespace,
-		Subsystem: subsystem,
-		Name:      "sub_event_total",
-		Help:      "Number of sub event.",
-	}, []string{"group"})
+	// 一些重要的请求，比如接收数据的请求，应该统计一下延迟情况
+	RequestDuration := prometheus.NewHistogramVec(
+		prometheus.HistogramOpts{
+			Namespace: namespace,
+			Subsystem: subsystem,
+			Buckets:   []float64{.01, .1, 1},
+			Name:      "http_request_duration_seconds",
+			Help:      "HTTP request latencies in seconds.",
+		}, []string{"code", "path", "method"},
+	)

-	CounterHeartbeatErrorTotal := prometheus.NewCounterVec(prometheus.CounterOpts{
-		Namespace: namespace,
-		Subsystem: subsystem,
-		Name:      "heartbeat_error_count",
-		Help:      "Number of heartbeat error.",
-	}, []string{})
+	// 发往后端TSDB，延迟如何
+	ForwardDuration := prometheus.NewHistogramVec(
+		prometheus.HistogramOpts{
+			Namespace: namespace,
+			Subsystem: subsystem,
+			Buckets:   []float64{.1, 1, 10},
+			Name:      "forward_duration_seconds",
+			Help:      "Forward samples to TSDB. latencies in seconds.",
+		}, []string{"cluster", "channel_number"},
+	)

 	prometheus.MustRegister(
+		CounterSampleTotal,
 		CounterAlertsTotal,
 		GaugeAlertQueueSize,
-		AlertNotifyTotal,
-		AlertNotifyErrorTotal,
-		CounterRuleEval,
-		CounterQueryDataTotal,
-		CounterQueryDataErrorTotal,
-		CounterRecordEval,
-		CounterRecordEvalErrorTotal,
-		CounterMuteTotal,
-		CounterRuleEvalErrorTotal,
-		CounterHeartbeatErrorTotal,
-		CounterSubEventTotal,
+		GaugeSampleQueueSize,
+		RequestDuration,
+		ForwardDuration,
 	)

 	return &Stats{
-		CounterAlertsTotal:          CounterAlertsTotal,
-		GaugeAlertQueueSize:         GaugeAlertQueueSize,
-		AlertNotifyTotal:            AlertNotifyTotal,
-		AlertNotifyErrorTotal:       AlertNotifyErrorTotal,
-		CounterRuleEval:             CounterRuleEval,
-		CounterQueryDataTotal:       CounterQueryDataTotal,
-		CounterQueryDataErrorTotal:  CounterQueryDataErrorTotal,
-		CounterRecordEval:           CounterRecordEval,
-		CounterRecordEvalErrorTotal: CounterRecordEvalErrorTotal,
-		CounterMuteTotal:            CounterMuteTotal,
-		CounterRuleEvalErrorTotal:   CounterRuleEvalErrorTotal,
-		CounterHeartbeatErrorTotal:  CounterHeartbeatErrorTotal,
-		CounterSubEventTotal:        CounterSubEventTotal,
+		CounterSampleTotal:   CounterSampleTotal,
+		CounterAlertsTotal:   CounterAlertsTotal,
+		GaugeAlertQueueSize:  GaugeAlertQueueSize,
+		GaugeSampleQueueSize: GaugeSampleQueueSize,
+		RequestDuration:      RequestDuration,
+		ForwardDuration:      ForwardDuration,
 	}
 }
--- a/models/anomaly_point.go
+++ b/models/anomaly_point.go
@@ -1,25 +1,20 @@
-package models
+package common

 import (
 	"fmt"
 	"math"
 	"strings"

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

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

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

 import (
 	"fmt"
-	"strings"

 	"github.com/ccfos/nightingale/v6/models"
 )
@@ -23,21 +22,13 @@ func MatchTags(eventTagsMap map[string]string, itags []models.TagFilter) bool {
 	}
 	return true
 }
-func MatchGroupsName(groupName string, groupFilter []models.TagFilter) bool {
-	for _, filter := range groupFilter {
-		if !matchTag(groupName, filter) {
-			return false
-		}
-	}
-	return true
-}

 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,23 +1,14 @@
 package dispatch

 import (
-	"context"
-	"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/pkg/tplx"
-	"github.com/ccfos/nightingale/v6/prom"

-	"github.com/prometheus/common/model"
 	"github.com/toolkits/pkg/concurrent/semaphore"
 	"github.com/toolkits/pkg/logger"
 )
@@ -26,29 +17,15 @@ type Consumer struct {
 	alerting aconf.Alerting
 	ctx      *ctx.Context

-	dispatch    *Dispatch
-	promClients *prom.PromClientMap
-}
-
-func InitRegisterQueryFunc(promClients *prom.PromClientMap) {
-	tplx.RegisterQueryFunc(func(datasourceID int64, promql string) model.Value {
-		if promClients.IsNil(datasourceID) {
-			return nil
-		}
-
-		readerClient := promClients.GetCli(datasourceID)
-		value, _, _ := readerClient.Query(context.Background(), promql, time.Now())
-		return value
-	})
+	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,
 	}
 }

@@ -83,29 +60,16 @@ func (e *Consumer) consume(events []interface{}, sema *semaphore.Semaphore) {
 func (e *Consumer) consumeOne(event *models.AlertCurEvent) {
 	LogEvent(event, "consume")

-	eventType := "alert"
-	if event.IsRecovered {
-		eventType = "recovery"
-	}
-
-	e.dispatch.Astats.CounterAlertsTotal.WithLabelValues(event.Cluster, eventType, event.GroupName).Inc()
-
 	if err := event.ParseRule("rule_name"); err != nil {
-		logger.Warningf("ruleid:%d failed to parse rule name: %v", event.RuleId, err)
 		event.RuleName = fmt.Sprintf("failed to parse rule name: %v", err)
 	}

-	if err := event.ParseRule("annotations"); err != nil {
-		logger.Warningf("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
+	if err := event.ParseRule("rule_note"); err != nil {
+		event.RuleNote = fmt.Sprintf("failed to parse rule note: %v", err)
 	}

-	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)
+	if err := event.ParseRule("annotations"); err != nil {
+		event.Annotations = fmt.Sprintf("failed to parse rule note: %v", err)
 	}

 	e.persist(event)
@@ -118,89 +82,78 @@ func (e *Consumer) consumeOne(event *models.AlertCurEvent) {
 }

 func (e *Consumer) persist(event *models.AlertCurEvent) {
-	if event.Status != 0 {
+	has, err := models.AlertCurEventExists(e.ctx, "hash=?", event.Hash)
+	if err != nil {
+		logger.Errorf("event_persist_check_exists_fail: %v rule_id=%d hash=%s", err, event.RuleId, event.Hash)
 		return
 	}

-	if !e.ctx.IsCenter {
-		event.DB2FE()
-		var err error
-		event.Id, err = poster.PostByUrlsWithResp[int64](e.ctx, "/v1/n9e/event-persist", event)
+	his := event.ToHis(e.ctx)
+
+	// 不管是告警还是恢复，全量告警里都要记录
+	if err := his.Add(e.ctx); err != nil {
+		logger.Errorf(
+			"event_persist_his_fail: %v rule_id=%d cluster:%s hash=%s tags=%v timestamp=%d value=%s",
+			err,
+			event.RuleId,
+			event.Cluster,
+			event.Hash,
+			event.TagsJSON,
+			event.TriggerTime,
+			event.TriggerValue,
+		)
+	}
+
+	if has {
+		// 活跃告警表中有记录，删之
+		err = models.AlertCurEventDelByHash(e.ctx, event.Hash)
 		if err != nil {
-			logger.Errorf("event:%+v persist err:%v", event, err)
-			e.dispatch.Astats.CounterRuleEvalErrorTotal.WithLabelValues(fmt.Sprintf("%v", event.DatasourceId), "persist_event", event.GroupName, fmt.Sprintf("%v", event.RuleId)).Inc()
+			logger.Errorf("event_del_cur_fail: %v hash=%s", err, event.Hash)
+			return
 		}
-		return
-	}

-	err := models.EventPersist(e.ctx, event)
-	if err != nil {
-		logger.Errorf("event%+v persist err:%v", event, err)
-		e.dispatch.Astats.CounterRuleEvalErrorTotal.WithLabelValues(fmt.Sprintf("%v", event.DatasourceId), "persist_event", event.GroupName, fmt.Sprintf("%v", event.RuleId)).Inc()
-	}
-}
-
-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)
+		if !event.IsRecovered {
+			// 恢复事件，从活跃告警列表彻底删掉，告警事件，要重新加进来新的event
+			// use his id as cur id
+			event.Id = his.Id
+			if event.Id > 0 {
+				if err := event.Add(e.ctx); err != nil {
+					logger.Errorf(
+						"event_persist_cur_fail: %v rule_id=%d cluster:%s hash=%s tags=%v timestamp=%d value=%s",
+						err,
+						event.RuleId,
+						event.Cluster,
+						event.Hash,
+						event.TagsJSON,
+						event.TriggerTime,
+						event.TriggerValue,
+					)
+				}
+			}
 		}
+
 		return
 	}

-	if len(warnings) > 0 {
-		logger.Errorf("rule_eval:%s promql:%s, warnings:%v", getKey(event), promql, warnings)
+	if event.IsRecovered {
+		// alert_cur_event表里没有数据，表示之前没告警，结果现在报了恢复，神奇....理论上不应该出现的
+		return
 	}

-	anomalyPoints := models.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)
+	// use his id as cur id
+	event.Id = his.Id
+	if event.Id > 0 {
+		if err := event.Add(e.ctx); err != nil {
+			logger.Errorf(
+				"event_persist_cur_fail: %v rule_id=%d cluster:%s hash=%s tags=%v timestamp=%d value=%s",
+				err,
+				event.RuleId,
+				event.Cluster,
+				event.Hash,
+				event.TagsJSON,
+				event.TriggerTime,
+				event.TriggerValue,
+			)
+		}
 	}
 }
-
-func getKey(event *models.AlertCurEvent) string {
-	return common.RuleKey(event.DatasourceId, event.RuleId)
-}
--- a/alert/dispatch/dispatch.go
+++ b/alert/dispatch/dispatch.go
@@ -4,14 +4,11 @@ import (
 	"bytes"
 	"encoding/json"
 	"html/template"
-	"net/url"
 	"strconv"
-	"strings"
 	"sync"
 	"time"

 	"github.com/ccfos/nightingale/v6/alert/aconf"
-	"github.com/ccfos/nightingale/v6/alert/astats"
 	"github.com/ccfos/nightingale/v6/alert/common"
 	"github.com/ccfos/nightingale/v6/alert/sender"
 	"github.com/ccfos/nightingale/v6/memsto"
@@ -28,18 +25,13 @@ type Dispatch struct {
 	alertSubscribeCache *memsto.AlertSubscribeCacheType
 	targetCache         *memsto.TargetCacheType
 	notifyConfigCache   *memsto.NotifyConfigCacheType
-	taskTplsCache       *memsto.TaskTplCache

 	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
+	senders map[string]sender.Sender
+	tpls    map[string]*template.Template

-	ctx    *ctx.Context
-	Astats *astats.Stats
+	ctx *ctx.Context

 	RwLock sync.RWMutex
 }
@@ -47,7 +39,7 @@ type Dispatch struct {
 // 创建一个 Notify 实例
 func NewDispatch(alertRuleCache *memsto.AlertRuleCacheType, userCache *memsto.UserCacheType, userGroupCache *memsto.UserGroupCacheType,
 	alertSubscribeCache *memsto.AlertSubscribeCacheType, targetCache *memsto.TargetCacheType, notifyConfigCache *memsto.NotifyConfigCacheType,
-	taskTplsCache *memsto.TaskTplCache, alerting aconf.Alerting, ctx *ctx.Context, astats *astats.Stats) *Dispatch {
+	alerting aconf.Alerting, ctx *ctx.Context) *Dispatch {
 	notify := &Dispatch{
 		alertRuleCache:      alertRuleCache,
 		userCache:           userCache,
@@ -55,17 +47,13 @@ func NewDispatch(alertRuleCache *memsto.AlertRuleCacheType, userCache *memsto.Us
 		alertSubscribeCache: alertSubscribeCache,
 		targetCache:         targetCache,
 		notifyConfigCache:   notifyConfigCache,
-		taskTplsCache:       taskTplsCache,

 		alerting: alerting,

-		Senders:          make(map[string]sender.Sender),
-		tpls:             make(map[string]*template.Template),
-		ExtraSenders:     make(map[string]sender.Sender),
-		BeforeSenderHook: func(*models.AlertCurEvent) bool { return true },
+		senders: make(map[string]sender.Sender),
+		tpls:    make(map[string]*template.Template),

-		ctx:    ctx,
-		Astats: astats,
+		ctx: ctx,
 	}
 	return notify
 }
@@ -73,7 +61,7 @@ func NewDispatch(alertRuleCache *memsto.AlertRuleCacheType, userCache *memsto.Us
 func (e *Dispatch) ReloadTpls() error {
 	err := e.relaodTpls()
 	if err != nil {
-		logger.Errorf("failed to reload tpls: %v", err)
+		logger.Error("failed to reload tpls: %v", err)
 	}

 	duration := time.Duration(9000) * time.Millisecond
@@ -93,40 +81,17 @@ func (e *Dispatch) relaodTpls() error {
 	smtp := e.notifyConfigCache.GetSMTP()

 	senders := map[string]sender.Sender{
-		models.Email:      sender.NewSender(models.Email, tmpTpls, smtp),
-		models.Dingtalk:   sender.NewSender(models.Dingtalk, tmpTpls),
-		models.Wecom:      sender.NewSender(models.Wecom, tmpTpls),
-		models.Feishu:     sender.NewSender(models.Feishu, tmpTpls),
-		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),
+		models.Email:    sender.NewSender(models.Email, tmpTpls, smtp),
+		models.Dingtalk: sender.NewSender(models.Dingtalk, tmpTpls, smtp),
+		models.Wecom:    sender.NewSender(models.Wecom, tmpTpls, smtp),
+		models.Feishu:   sender.NewSender(models.Feishu, tmpTpls, smtp),
+		models.Mm:       sender.NewSender(models.Mm, tmpTpls, smtp),
+		models.Telegram: sender.NewSender(models.Telegram, tmpTpls, smtp),
 	}

-	// 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()
-	for channelName, extraSender := range e.ExtraSenders {
-		senders[channelName] = extraSender
-	}
-	e.RwLock.RUnlock()
-
 	e.RwLock.Lock()
 	e.tpls = tmpTpls
-	e.Senders = senders
-	e.CallBacks = callbacks
+	e.senders = senders
 	e.RwLock.Unlock()
 	return nil
 }
@@ -139,12 +104,6 @@ func (e *Dispatch) HandleEventNotify(event *models.AlertCurEvent, isSubscribe bo
 	if rule == nil {
 		return
 	}
-
-	if e.blockEventNotify(rule, event) {
-		logger.Infof("block event notify: rule_id:%d event:%+v", rule.Id, event)
-		return
-	}
-
 	fillUsers(event, e.userCache, e.userGroupCache)

 	var (
@@ -181,25 +140,6 @@ func (e *Dispatch) HandleEventNotify(event *models.AlertCurEvent, isSubscribe bo
 	}
 }

-func (e *Dispatch) blockEventNotify(rule *models.AlertRule, event *models.AlertCurEvent) bool {
-	ruleType := rule.GetRuleType()
-
-	// 若为机器则先看机器是否删除
-	if ruleType == models.HOST {
-		host, ok := e.targetCache.Get(event.TagsMap["ident"])
-		if !ok || host == nil {
-			return true
-		}
-	}
-
-	// 恢复通知，检测规则配置是否改变
-	// if event.IsRecovered && event.RuleHash != rule.Hash() {
-	// 	return true
-	// }
-
-	return false
-}
-
 func (e *Dispatch) handleSubs(event *models.AlertCurEvent) {
 	// handle alert subscribes
 	subscribes := make([]*models.AlertSubscribe, 0)
@@ -219,171 +159,45 @@ func (e *Dispatch) handleSubs(event *models.AlertCurEvent) {

 // handleSub 处理订阅规则的event,注意这里event要使用值传递,因为后面会修改event的状态
 func (e *Dispatch) handleSub(sub *models.AlertSubscribe, event models.AlertCurEvent) {
-	if sub.IsDisabled() {
+	if sub.IsDisabled() || !sub.MatchCluster(event.DatasourceId) {
 		return
 	}
-
-	if !sub.MatchCluster(event.DatasourceId) {
-		return
-	}
-
-	if !sub.MatchProd(event.RuleProd) {
-		return
-	}
-
 	if !common.MatchTags(event.TagsMap, sub.ITags) {
 		return
 	}
-	// event BusiGroups filter
-	if !common.MatchGroupsName(event.GroupName, sub.IBusiGroups) {
-		return
-	}
 	if sub.ForDuration > (event.TriggerTime - event.FirstTriggerTime) {
 		return
 	}
-
-	if len(sub.SeveritiesJson) != 0 {
-		match := false
-		for _, s := range sub.SeveritiesJson {
-			if s == event.Severity || s == 0 {
-				match = true
-				break
-			}
-		}
-		if !match {
-			return
-		}
-	}
-
-	e.Astats.CounterSubEventTotal.WithLabelValues(event.GroupName).Inc()
 	sub.ModifyEvent(&event)
-	event.SubRuleId = sub.Id
-
 	LogEvent(&event, "subscribe")
 	e.HandleEventNotify(&event, true)
 }

 func (e *Dispatch) Send(rule *models.AlertRule, event *models.AlertCurEvent, notifyTarget *NotifyTarget, isSubscribe bool) {
-	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)
-			e.RwLock.RLock()
-			s := e.Senders[channel]
-			e.RwLock.RUnlock()
-			if s == nil {
-				logger.Debugf("no sender for channel: %s", channel)
-				continue
-			}
-
-			var event *models.AlertCurEvent
-			if len(msgCtx.Events) > 0 {
-				event = msgCtx.Events[0]
-			}
-
-			logger.Debugf("send to channel:%s event:%+v users:%+v", channel, event, msgCtx.Users)
-			s.Send(msgCtx)
+	for channel, uids := range notifyTarget.ToChannelUserMap() {
+		ctx := sender.BuildMessageContext(rule, event, uids, e.userCache)
+		e.RwLock.RLock()
+		s := e.senders[channel]
+		e.RwLock.RUnlock()
+		if s == nil {
+			logger.Warningf("no sender for channel: %s", channel)
+			continue
 		}
+		logger.Debugf("send event: %s, channel: %s", event.Hash, channel)
+		for i := 0; i < len(ctx.Users); i++ {
+			logger.Debug("send event to user: ", ctx.Users[i])
+		}
+		s.Send(ctx)
 	}

 	// handle event callbacks
-	e.SendCallbacks(rule, notifyTarget, event)
+	sender.SendCallbacks(e.ctx, notifyTarget.ToCallbackList(), event, e.targetCache, e.notifyConfigCache.GetIbex())

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

 	// 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()
-	whMap := notifyTarget.ToWebhookMap()
-	ogw := event.OverrideGlobalWebhook()
-	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 wh, ok := whMap[cbCtx.CallBackURL]; !ogw && ok && wh.Enable {
-			logger.Debugf("SendCallbacks: webhook[%s] is in global conf.", cbCtx.CallBackURL)
-			continue
-		}
-
-		if strings.HasPrefix(urlStr, "${ibex}") {
-			e.CallBacks[models.IbexDomain].CallBack(cbCtx)
-			continue
-		}
-
-		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())
 }

 type Notice struct {
--- a/alert/dispatch/log.go
+++ b/alert/dispatch/log.go
@@ -18,12 +18,11 @@ func LogEvent(event *models.AlertCurEvent, location string, err ...error) {
 	}

 	logger.Infof(
-		"event(%s %s) %s: rule_id=%d sub_id:%d cluster:%s %v%s@%d %s",
+		"event(%s %s) %s: rule_id=%d cluster:%s %v%s@%d %s",
 		event.Hash,
 		status,
 		location,
 		event.RuleId,
-		event.SubRuleId,
 		event.Cluster,
 		event.TagsJSON,
 		event.TriggerValue,
--- a/alert/dispatch/notify_target.go
+++ b/alert/dispatch/notify_target.go
@@ -76,16 +76,12 @@ func (s *NotifyTarget) ToCallbackList() []string {
 	return callbacks
 }

-func (s *NotifyTarget) ToWebhookMap() map[string]*models.Webhook {
-	return s.webhooks
-}
-
-func (s *NotifyTarget) ToUidList() []int64 {
-	uids := make([]int64, 0, len(s.userMap))
-	for uid, _ := range s.userMap {
-		uids = append(uids, uid)
+func (s *NotifyTarget) ToWebhookList() []*models.Webhook {
+	webhooks := make([]*models.Webhook, 0, len(s.webhooks))
+	for _, wh := range s.webhooks {
+		webhooks = append(webhooks, wh)
 	}
-	return uids
+	return webhooks
 }

 // Dispatch 抽象由告警事件到信息接收者的路由策略
--- a/alert/eval/alert_rule.go
+++ b/alert/eval/alert_rule.go
@@ -3,7 +3,6 @@ package eval
 import (
 	"context"
 	"fmt"
-	"strconv"
 	"time"

 	"github.com/ccfos/nightingale/v6/alert/aconf"
@@ -13,12 +12,11 @@ import (
 	"github.com/ccfos/nightingale/v6/memsto"
 	"github.com/ccfos/nightingale/v6/pkg/ctx"
 	"github.com/ccfos/nightingale/v6/prom"
-	"github.com/ccfos/nightingale/v6/tdengine"
-
 	"github.com/toolkits/pkg/logger"
 )

 type Scheduler struct {
+	isCenter bool
 	// key: hash
 	alertRules map[string]*AlertRuleWorker

@@ -26,15 +24,13 @@ type Scheduler struct {

 	aconf aconf.Alert

-	alertRuleCache          *memsto.AlertRuleCacheType
-	targetCache             *memsto.TargetCacheType
-	targetsOfAlertRuleCache *memsto.TargetsOfAlertRuleCacheType
-	busiGroupCache          *memsto.BusiGroupCacheType
-	alertMuteCache          *memsto.AlertMuteCacheType
-	datasourceCache         *memsto.DatasourceCacheType
+	alertRuleCache  *memsto.AlertRuleCacheType
+	targetCache     *memsto.TargetCacheType
+	busiGroupCache  *memsto.BusiGroupCacheType
+	alertMuteCache  *memsto.AlertMuteCacheType
+	datasourceCache *memsto.DatasourceCacheType

-	promClients     *prom.PromClientMap
-	tdengineClients *tdengine.TdengineClientMap
+	promClients *prom.PromClientMap

 	naming *naming.Naming

@@ -42,26 +38,24 @@ type Scheduler struct {
 	stats *astats.Stats
 }

-func NewScheduler(aconf aconf.Alert, externalProcessors *process.ExternalProcessorsType, arc *memsto.AlertRuleCacheType,
-	targetCache *memsto.TargetCacheType, toarc *memsto.TargetsOfAlertRuleCacheType,
-	busiGroupCache *memsto.BusiGroupCacheType, alertMuteCache *memsto.AlertMuteCacheType, datasourceCache *memsto.DatasourceCacheType,
-	promClients *prom.PromClientMap, tdengineClients *tdengine.TdengineClientMap, naming *naming.Naming, ctx *ctx.Context, stats *astats.Stats) *Scheduler {
+func NewScheduler(isCenter bool, aconf aconf.Alert, externalProcessors *process.ExternalProcessorsType, arc *memsto.AlertRuleCacheType, targetCache *memsto.TargetCacheType,
+	busiGroupCache *memsto.BusiGroupCacheType, alertMuteCache *memsto.AlertMuteCacheType, datasourceCache *memsto.DatasourceCacheType, promClients *prom.PromClientMap, naming *naming.Naming,
+	ctx *ctx.Context, stats *astats.Stats) *Scheduler {
 	scheduler := &Scheduler{
+		isCenter:   isCenter,
 		aconf:      aconf,
 		alertRules: make(map[string]*AlertRuleWorker),

 		ExternalProcessors: externalProcessors,

-		alertRuleCache:          arc,
-		targetCache:             targetCache,
-		targetsOfAlertRuleCache: toarc,
-		busiGroupCache:          busiGroupCache,
-		alertMuteCache:          alertMuteCache,
-		datasourceCache:         datasourceCache,
+		alertRuleCache:  arc,
+		targetCache:     targetCache,
+		busiGroupCache:  busiGroupCache,
+		alertMuteCache:  alertMuteCache,
+		datasourceCache: datasourceCache,

-		promClients:     promClients,
-		tdengineClients: tdengineClients,
-		naming:          naming,
+		promClients: promClients,
+		naming:      naming,

 		ctx:   ctx,
 		stats: stats,
@@ -93,12 +87,10 @@ func (s *Scheduler) syncAlertRules() {
 		if rule == nil {
 			continue
 		}
-
-		ruleType := rule.GetRuleType()
-		if rule.IsPrometheusRule() || rule.IsLokiRule() || rule.IsTdengineRule() {
-			datasourceIds := s.datasourceCache.GetIDsByDsCateAndQueries(rule.Cate, rule.DatasourceQueries)
+		if rule.IsPrometheusRule() {
+			datasourceIds := s.promClients.Hit(rule.DatasourceIdsJson)
 			for _, dsId := range datasourceIds {
-				if !naming.DatasourceHashRing.IsHit(strconv.FormatInt(dsId, 10), fmt.Sprintf("%d", rule.Id), s.aconf.Heartbeat.Endpoint) {
+				if !naming.DatasourceHashRing.IsHit(dsId, fmt.Sprintf("%d", rule.Id), s.aconf.Heartbeat.Endpoint) {
 					continue
 				}
 				ds := s.datasourceCache.GetById(dsId)
@@ -107,33 +99,27 @@ func (s *Scheduler) syncAlertRules() {
 					continue
 				}

-				if ds.PluginType != ruleType {
-					logger.Debugf("datasource %d category is %s not %s", dsId, ds.PluginType, ruleType)
-					continue
-				}
-
 				if ds.Status != "enabled" {
 					logger.Debugf("datasource %d status is %s", dsId, ds.Status)
 					continue
 				}
-				processor := process.NewProcessor(s.aconf.Heartbeat.EngineName, rule, dsId, s.alertRuleCache, s.targetCache, s.targetsOfAlertRuleCache, s.busiGroupCache, s.alertMuteCache, s.datasourceCache, s.ctx, s.stats)
+				processor := process.NewProcessor(rule, dsId, s.alertRuleCache, s.targetCache, s.busiGroupCache, s.alertMuteCache, s.datasourceCache, s.promClients, s.ctx, s.stats)

-				alertRule := NewAlertRuleWorker(rule, dsId, processor, s.promClients, s.tdengineClients, s.ctx)
+				alertRule := NewAlertRuleWorker(rule, dsId, processor, s.promClients, s.ctx)
 				alertRuleWorkers[alertRule.Hash()] = alertRule
 			}
-		} else if rule.IsHostRule() {
+		} else if rule.IsHostRule() && s.isCenter {
 			// all host rule will be processed by center instance
-			if !naming.DatasourceHashRing.IsHit(s.aconf.Heartbeat.EngineName, strconv.FormatInt(rule.Id, 10), s.aconf.Heartbeat.Endpoint) {
+			if !naming.DatasourceHashRing.IsHit(naming.HostDatasource, fmt.Sprintf("%d", rule.Id), s.aconf.Heartbeat.Endpoint) {
 				continue
 			}
-			processor := process.NewProcessor(s.aconf.Heartbeat.EngineName, rule, 0, s.alertRuleCache, s.targetCache, s.targetsOfAlertRuleCache, s.busiGroupCache, s.alertMuteCache, s.datasourceCache, s.ctx, s.stats)
-			alertRule := NewAlertRuleWorker(rule, 0, processor, s.promClients, s.tdengineClients, s.ctx)
+			processor := process.NewProcessor(rule, 0, s.alertRuleCache, s.targetCache, s.busiGroupCache, s.alertMuteCache, s.datasourceCache, s.promClients, s.ctx, s.stats)
+			alertRule := NewAlertRuleWorker(rule, 0, processor, s.promClients, s.ctx)
 			alertRuleWorkers[alertRule.Hash()] = alertRule
 		} else {
 			// 如果 rule 不是通过 prometheus engine 来告警的，则创建为 externalRule
 			// if rule is not processed by prometheus engine, create it as externalRule
-			dsIds := s.datasourceCache.GetIDsByDsCateAndQueries(rule.Cate, rule.DatasourceQueries)
-			for _, dsId := range dsIds {
+			for _, dsId := range rule.DatasourceIdsJson {
 				ds := s.datasourceCache.GetById(dsId)
 				if ds == nil {
 					logger.Debugf("datasource %d not found", dsId)
@@ -144,7 +130,7 @@ func (s *Scheduler) syncAlertRules() {
 					logger.Debugf("datasource %d status is %s", dsId, ds.Status)
 					continue
 				}
-				processor := process.NewProcessor(s.aconf.Heartbeat.EngineName, rule, dsId, s.alertRuleCache, s.targetCache, s.targetsOfAlertRuleCache, s.busiGroupCache, s.alertMuteCache, s.datasourceCache, s.ctx, s.stats)
+				processor := process.NewProcessor(rule, dsId, s.alertRuleCache, s.targetCache, s.busiGroupCache, s.alertMuteCache, s.datasourceCache, s.promClients, s.ctx, s.stats)
 				externalRuleWorkers[processor.Key()] = processor
 			}
 		}
--- a/alert/eval/eval.go
+++ b/alert/eval/eval.go
--- a/alert/eval/eval_test.go
+++ b/alert/eval/eval_test.go
@@ -1,458 +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
-}
-
-// allValueDeepEqualOmitOrder 判断两个字符串切片是否相等，不考虑顺序
-func allValueDeepEqualOmitOrder(got, want []string) bool {
-	if len(got) != len(want) {
-		return false
-	}
-	slices.Sort(got)
-	slices.Sort(want)
-	for i := range got {
-		if got[i] != want[i] {
-			return false
-		}
-	}
-	return true
-}
-
-func Test_removeVal(t *testing.T) {
-	type args struct {
-		promql string
-	}
-	tests := []struct {
-		name string
-		args args
-		want string
-	}{
-		// TODO: Add test cases.
-		{
-			name: "removeVal1",
-			args: args{
-				promql: "mem{test1=\"$test1\",test2=\"$test2\",test3=\"$test3\"} > $val",
-			},
-			want: "mem{} > $val",
-		},
-		{
-			name: "removeVal2",
-			args: args{
-				promql: "mem{test1=\"test1\",test2=\"$test2\",test3=\"$test3\"} > $val",
-			},
-			want: "mem{test1=\"test1\"} > $val",
-		},
-		{
-			name: "removeVal3",
-			args: args{
-				promql: "mem{test1=\"$test1\",test2=\"test2\",test3=\"$test3\"} > $val",
-			},
-			want: "mem{test2=\"test2\"} > $val",
-		},
-		{
-			name: "removeVal4",
-			args: args{
-				promql: "mem{test1=\"$test1\",test2=\"$test2\",test3=\"test3\"} > $val",
-			},
-			want: "mem{test3=\"test3\"} > $val",
-		},
-		{
-			name: "removeVal5",
-			args: args{
-				promql: "mem{test1=\"$test1\",test2=\"test2\",test3=\"test3\"} > $val",
-			},
-			want: "mem{test2=\"test2\",test3=\"test3\"} > $val",
-		},
-		{
-			name: "removeVal6",
-			args: args{
-				promql: "mem{test1=\"test1\",test2=\"$test2\",test3=\"test3\"} > $val",
-			},
-			want: "mem{test1=\"test1\",test3=\"test3\"} > $val",
-		},
-		{
-			name: "removeVal7",
-			args: args{
-				promql: "mem{test1=\"test1\",test2=\"test2\",test3='$test3'} > $val",
-			},
-			want: "mem{test1=\"test1\",test2=\"test2\"} > $val",
-		},
-		{
-			name: "removeVal8",
-			args: args{
-				promql: "mem{test1=\"test1\",test2=\"test2\",test3=\"test3\"} > $val",
-			},
-			want: "mem{test1=\"test1\",test2=\"test2\",test3=\"test3\"} > $val",
-		},
-		{
-			name: "removeVal9",
-			args: args{
-				promql: "mem{test1=\"$test1\",test2=\"test2\"} > $val1 and mem{test3=\"test3\",test4=\"test4\"} > $val2",
-			},
-			want: "mem{test2=\"test2\"} > $val1 and mem{test3=\"test3\",test4=\"test4\"} > $val2",
-		},
-		{
-			name: "removeVal10",
-			args: args{
-				promql: "mem{test1=\"test1\",test2='$test2'} > $val1 and mem{test3=\"test3\",test4=\"test4\"} > $val2",
-			},
-			want: "mem{test1=\"test1\"} > $val1 and mem{test3=\"test3\",test4=\"test4\"} > $val2",
-		},
-		{
-			name: "removeVal11",
-			args: args{
-				promql: "mem{test1='test1',test2=\"test2\"} > $val1 and mem{test3=\"$test3\",test4=\"test4\"} > $val2",
-			},
-			want: "mem{test1='test1',test2=\"test2\"} > $val1 and mem{test4=\"test4\"} > $val2",
-		},
-		{
-			name: "removeVal12",
-			args: args{
-				promql: "mem{test1=\"test1\",test2=\"test2\"} > $val1 and mem{test3=\"test3\",test4=\"$test4\"} > $val2",
-			},
-			want: "mem{test1=\"test1\",test2=\"test2\"} > $val1 and mem{test3=\"test3\"} > $val2",
-		},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			if got := removeVal(tt.args.promql); got != tt.want {
-				t.Errorf("removeVal() = %v, want %v", got, tt.want)
-			}
-		})
-	}
-}
-
-func TestExtractVarMapping(t *testing.T) {
-	tests := []struct {
-		name   string
-		promql string
-		want   map[string]string
-	}{
-		{
-			name:   "单个花括号单个变量",
-			promql: `mem_used_percent{host="$my_host"} > $val`,
-			want:   map[string]string{"my_host": "host"},
-		},
-		{
-			name:   "单个花括号多个变量",
-			promql: `mem_used_percent{host="$my_host",region="$region",env="prod"} > $val`,
-			want:   map[string]string{"my_host": "host", "region": "region"},
-		},
-		{
-			name:   "多个花括号多个变量",
-			promql: `sum(rate(mem_used_percent{host="$my_host"})) by (instance) + avg(node_load1{region="$region"}) > $val`,
-			want:   map[string]string{"my_host": "host", "region": "region"},
-		},
-		{
-			name:   "相同变量出现多次",
-			promql: `sum(rate(mem_used_percent{host="$my_host"})) + avg(node_load1{host="$my_host"}) > $val`,
-			want:   map[string]string{"my_host": "host"},
-		},
-		{
-			name:   "没有变量",
-			promql: `mem_used_percent{host="localhost",region="cn"} > 80`,
-			want:   map[string]string{},
-		},
-		{
-			name:   "没有花括号",
-			promql: `80 > $val`,
-			want:   map[string]string{},
-		},
-		{
-			name:   "格式不规范的标签",
-			promql: `mem_used_percent{host=$my_host,region = $region} > $val`,
-			want:   map[string]string{"my_host": "host", "region": "region"},
-		},
-		{
-			name:   "空花括号",
-			promql: `mem_used_percent{} > $val`,
-			want:   map[string]string{},
-		},
-		{
-			name:   "不完整的花括号",
-			promql: `mem_used_percent{host="$my_host"`,
-			want:   map[string]string{},
-		},
-		{
-			name:   "复杂表达式",
-			promql: `sum(rate(http_requests_total{handler="$handler",code="$code"}[5m])) by (handler) / sum(rate(http_requests_total{handler="$handler"}[5m])) by (handler) * 100 > $threshold`,
-			want:   map[string]string{"handler": "handler", "code": "code"},
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			got := ExtractVarMapping(tt.promql)
-			if !reflect.DeepEqual(got, tt.want) {
-				t.Errorf("ExtractVarMapping() = %v, want %v", got, tt.want)
-			}
-		})
-	}
-}
--- a/alert/mute/mute.go
+++ b/alert/mute/mute.go
@@ -12,33 +12,32 @@ import (
 	"github.com/toolkits/pkg/logger"
 )

-func IsMuted(rule *models.AlertRule, event *models.AlertCurEvent, targetCache *memsto.TargetCacheType, alertMuteCache *memsto.AlertMuteCacheType) (bool, string) {
-	if rule.Disabled == 1 {
-		return true, "rule disabled"
-	}
-
-	if TimeSpanMuteStrategy(rule, event) {
-		return true, "rule is not effective for period of time"
+func IsMuted(rule *models.AlertRule, event *models.AlertCurEvent, targetCache *memsto.TargetCacheType, alertMuteCache *memsto.AlertMuteCacheType) bool {
+	if TimeNonEffectiveMuteStrategy(rule, event) {
+		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
-// 时间范围，左闭右开，默认范围：00:00-24:00
-func TimeSpanMuteStrategy(rule *models.AlertRule, event *models.AlertCurEvent) bool {
+// TimeNonEffectiveMuteStrategy 根据规则配置的告警时间过滤,如果产生的告警不在规则配置的告警时间内,则不告警
+func TimeNonEffectiveMuteStrategy(rule *models.AlertRule, event *models.AlertCurEvent) bool {
+	if rule.Disabled == 1 {
+		return true
+	}
+
 	tm := time.Unix(event.TriggerTime, 0)
 	triggerTime := tm.Format("15:04")
 	triggerWeek := strconv.Itoa(int(tm.Weekday()))
@@ -53,33 +52,18 @@ func TimeSpanMuteStrategy(rule *models.AlertRule, event *models.AlertCurEvent) b
 		if !strings.Contains(enableDaysOfWeek[i], triggerWeek) {
 			continue
 		}
-
-		if enableStime[i] < enableEtime[i] {
-			if enableEtime[i] == "23:59" {
-				// 02:00-23:59，这种情况做个特殊处理，相当于左闭右闭区间了
-				if triggerTime < enableStime[i] {
-					// mute, 即没生效
-					continue
-				}
-			} else {
-				// 02:00-04:00 或者 02:00-24:00
-				if triggerTime < enableStime[i] || triggerTime >= enableEtime[i] {
-					// mute, 即没生效
-					continue
-				}
+		if enableStime[i] <= enableEtime[i] {
+			if triggerTime < enableStime[i] || triggerTime > enableEtime[i] {
+				continue
 			}
-		} else if enableStime[i] > enableEtime[i] {
-			// 21:00-09:00
-			if triggerTime < enableStime[i] && triggerTime >= enableEtime[i] {
-				// mute, 即没生效
+		} else {
+			if triggerTime < enableStime[i] && triggerTime > enableEtime[i] {
 				continue
 			}
 		}
-
-		// 到这里说明当前时刻在告警规则的某组生效时间范围内，即没有 mute，直接返回 false
+		// 到这里说明当前时刻在告警规则的某组生效时间范围内，直接返回 false
 		return false
 	}
-
 	return true
 }

@@ -114,7 +98,7 @@ func BgNotMatchMuteStrategy(rule *models.AlertRule, event *models.AlertCurEvent,
 	target, exists := targetCache.Get(ident)
 	// 对于包含ident的告警事件，check一下ident所属bg和rule所属bg是否相同
 	// 如果告警规则选择了只在本BG生效，那其他BG的机器就不能因此规则产生告警
-	if exists && !target.MatchGroupId(rule.GroupId) {
+	if exists && target.GroupId != rule.GroupId {
 		logger.Debugf("[%s] mute: rule_eval:%d cluster:%s", "BgNotMatchMuteStrategy", rule.Id, event.Cluster)
 		return true
 	}
@@ -147,7 +131,7 @@ func matchMute(event *models.AlertCurEvent, mute *models.AlertMute, clock ...int
 	}

 	// 如果不是全局的，判断 匹配的 datasource id
-	if len(mute.DatasourceIdsJson) != 0 && mute.DatasourceIdsJson[0] != 0 && event.DatasourceId != 0 {
+	if !(len(mute.DatasourceIdsJson) != 0 && mute.DatasourceIdsJson[0] == 0) && event.DatasourceId != 0 {
 		idm := make(map[int64]struct{}, len(mute.DatasourceIdsJson))
 		for i := 0; i < len(mute.DatasourceIdsJson); i++ {
 			idm[mute.DatasourceIdsJson[i]] = struct{}{}
@@ -172,16 +156,13 @@ func matchMute(event *models.AlertCurEvent, mute *models.AlertMute, clock ...int

 		for i := 0; i < len(mute.PeriodicMutesJson); i++ {
 			if strings.Contains(mute.PeriodicMutesJson[i].EnableDaysOfWeek, triggerWeek) {
-				if mute.PeriodicMutesJson[i].EnableStime == mute.PeriodicMutesJson[i].EnableEtime || (mute.PeriodicMutesJson[i].EnableStime == "00:00" && mute.PeriodicMutesJson[i].EnableEtime == "23:59") {
-					matchTime = true
-					break
-				} else if mute.PeriodicMutesJson[i].EnableStime < mute.PeriodicMutesJson[i].EnableEtime {
+				if mute.PeriodicMutesJson[i].EnableStime <= mute.PeriodicMutesJson[i].EnableEtime {
 					if triggerTime >= mute.PeriodicMutesJson[i].EnableStime && triggerTime < mute.PeriodicMutesJson[i].EnableEtime {
 						matchTime = true
 						break
 					}
 				} else {
-					if triggerTime >= mute.PeriodicMutesJson[i].EnableStime || triggerTime < mute.PeriodicMutesJson[i].EnableEtime {
+					if triggerTime < mute.PeriodicMutesJson[i].EnableStime || triggerTime >= mute.PeriodicMutesJson[i].EnableEtime {
 						matchTime = true
 						break
 					}
@@ -193,25 +174,5 @@ func matchMute(event *models.AlertCurEvent, mute *models.AlertMute, clock ...int
 		return false
 	}

-	var matchSeverity bool
-	if len(mute.SeveritiesJson) > 0 {
-		for _, s := range mute.SeveritiesJson {
-			if event.Severity == s || s == 0 {
-				matchSeverity = true
-				break
-			}
-		}
-	} else {
-		matchSeverity = true
-	}
-
-	if !matchSeverity {
-		return false
-	}
-
-	if mute.ITags == nil || len(mute.ITags) == 0 {
-		return true
-	}
-
 	return common.MatchTags(event.TagsMap, mute.ITags)
 }
--- a/alert/naming/hashring.go
+++ b/alert/naming/hashring.go
@@ -1,7 +1,6 @@
 package naming

 import (
-	"errors"
 	"sync"

 	"github.com/toolkits/pkg/consistent"
@@ -12,12 +11,12 @@ const NodeReplicas = 500

 type DatasourceHashRingType struct {
 	sync.RWMutex
-	Rings map[string]*consistent.Consistent
+	Rings map[int64]*consistent.Consistent
 }

 // for alert_rule sharding
-var HostDatasource int64 = 99999999
-var DatasourceHashRing = DatasourceHashRingType{Rings: make(map[string]*consistent.Consistent)}
+var HostDatasource int64 = 100000
+var DatasourceHashRing = DatasourceHashRingType{Rings: make(map[int64]*consistent.Consistent)}

 func NewConsistentHashRing(replicas int32, nodes []string) *consistent.Consistent {
 	ret := consistent.New()
@@ -28,7 +27,7 @@ func NewConsistentHashRing(replicas int32, nodes []string) *consistent.Consisten
 	return ret
 }

-func RebuildConsistentHashRing(datasourceId string, nodes []string) {
+func RebuildConsistentHashRing(datasourceId int64, nodes []string) {
 	r := consistent.New()
 	r.NumberOfReplicas = NodeReplicas
 	for i := 0; i < len(nodes); i++ {
@@ -36,12 +35,12 @@ func RebuildConsistentHashRing(datasourceId string, nodes []string) {
 	}

 	DatasourceHashRing.Set(datasourceId, r)
-	logger.Infof("hash ring %s rebuild %+v", datasourceId, r.Members())
+	logger.Infof("hash ring %d rebuild %+v", datasourceId, r.Members())
 }

-func (chr *DatasourceHashRingType) GetNode(datasourceId string, pk string) (string, error) {
-	chr.Lock()
-	defer chr.Unlock()
+func (chr *DatasourceHashRingType) GetNode(datasourceId int64, pk string) (string, error) {
+	chr.RLock()
+	defer chr.RUnlock()
 	_, exists := chr.Rings[datasourceId]
 	if !exists {
 		chr.Rings[datasourceId] = NewConsistentHashRing(int32(NodeReplicas), []string{})
@@ -50,36 +49,17 @@ func (chr *DatasourceHashRingType) GetNode(datasourceId string, pk string) (stri
 	return chr.Rings[datasourceId].Get(pk)
 }

-func (chr *DatasourceHashRingType) IsHit(datasourceId string, pk string, currentNode string) bool {
+func (chr *DatasourceHashRingType) IsHit(datasourceId int64, pk string, currentNode string) bool {
 	node, err := chr.GetNode(datasourceId, pk)
 	if err != nil {
-		if !errors.Is(err, consistent.ErrEmptyCircle) {
-			logger.Errorf("rule id:%s is not work, datasource id:%s failed to get node from hashring:%v", pk, datasourceId, err)
-		}
+		logger.Debugf("datasource id:%d pk:%s failed to get node from hashring:%v", datasourceId, pk, err)
 		return false
 	}
 	return node == currentNode
 }

-func (chr *DatasourceHashRingType) Set(datasourceId string, r *consistent.Consistent) {
-	chr.Lock()
-	defer chr.Unlock()
+func (chr *DatasourceHashRingType) Set(datasourceId int64, r *consistent.Consistent) {
+	chr.RLock()
+	defer chr.RUnlock()
 	chr.Rings[datasourceId] = r
 }
-
-func (chr *DatasourceHashRingType) Del(datasourceId string) {
-	chr.Lock()
-	defer chr.Unlock()
-	delete(chr.Rings, datasourceId)
-}
-
-func (chr *DatasourceHashRingType) Clear(engineName string) {
-	chr.Lock()
-	defer chr.Unlock()
-	for id := range chr.Rings {
-		if id == engineName {
-			continue
-		}
-		delete(chr.Rings, id)
-	}
-}
--- a/alert/naming/heartbeat.go
+++ b/alert/naming/heartbeat.go
@@ -7,10 +7,8 @@ import (
 	"time"

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

 	"github.com/toolkits/pkg/logger"
 )
@@ -18,14 +16,14 @@ import (
 type Naming struct {
 	ctx             *ctx.Context
 	heartbeatConfig aconf.HeartbeatConfig
-	astats          *astats.Stats
+	isCenter        bool
 }

-func NewNaming(ctx *ctx.Context, heartbeat aconf.HeartbeatConfig, alertStats *astats.Stats) *Naming {
+func NewNaming(ctx *ctx.Context, heartbeat aconf.HeartbeatConfig, isCenter bool) *Naming {
 	naming := &Naming{
 		ctx:             ctx,
 		heartbeatConfig: heartbeat,
-		astats:          alertStats,
+		isCenter:        isCenter,
 	}
 	naming.Heartbeats()
 	return naming
@@ -33,11 +31,9 @@ func NewNaming(ctx *ctx.Context, heartbeat aconf.HeartbeatConfig, alertStats *as

 // local servers
 var localss map[int64]string
-var localHostServers map[string]string

 func (n *Naming) Heartbeats() error {
 	localss = make(map[int64]string)
-	localHostServers = make(map[string]string)
 	if err := n.heartbeat(); err != nil {
 		fmt.Println("failed to heartbeat:", err)
 		return err
@@ -49,10 +45,6 @@ func (n *Naming) Heartbeats() error {
 }

 func (n *Naming) loopDeleteInactiveInstances() {
-	if !n.ctx.IsCenter {
-		return
-	}
-
 	interval := time.Duration(10) * time.Minute
 	for {
 		time.Sleep(interval)
@@ -82,7 +74,7 @@ func (n *Naming) heartbeat() error {
 	var err error

 	// 在页面上维护实例和集群的对应关系
-	datasourceIds, err = models.GetDatasourceIdsByEngineName(n.ctx, n.heartbeatConfig.EngineName)
+	datasourceIds, err = models.GetDatasourceIdsByClusterName(n.ctx, n.heartbeatConfig.EngineName)
 	if err != nil {
 		return err
 	}
@@ -91,32 +83,20 @@ func (n *Naming) heartbeat() error {
 		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])
 			if err != nil {
 				logger.Warningf("heartbeat with cluster %d err:%v", datasourceIds[i], err)
-				n.astats.CounterHeartbeatErrorTotal.WithLabelValues().Inc()
 			}
 		}
 	}

-	if len(datasourceIds) == 0 {
-		DatasourceHashRing.Clear(n.heartbeatConfig.EngineName)
-		for dsId := range localss {
-			delete(localss, dsId)
-		}
-	}
-
-	newDatasource := make(map[int64]struct{})
 	for i := 0; i < len(datasourceIds); i++ {
-		newDatasource[datasourceIds[i]] = struct{}{}
 		servers, err := n.ActiveServers(datasourceIds[i])
 		if err != nil {
 			logger.Warningf("hearbeat %d get active server err:%v", datasourceIds[i], err)
-			n.astats.CounterHeartbeatErrorTotal.WithLabelValues().Inc()
 			continue
 		}

@@ -128,42 +108,36 @@ func (n *Naming) heartbeat() error {
 			continue
 		}

-		RebuildConsistentHashRing(fmt.Sprintf("%d", datasourceIds[i]), servers)
+		RebuildConsistentHashRing(datasourceIds[i], servers)
 		localss[datasourceIds[i]] = newss
 	}

-	for dsId := range localss {
-		if _, exists := newDatasource[dsId]; !exists {
-			delete(localss, dsId)
-			DatasourceHashRing.Del(fmt.Sprintf("%d", dsId))
+	if n.isCenter {
+		// 如果是中心节点，还需要处理 host 类型的告警规则，host 类型告警规则，和数据源无关，想复用下数据源的 hash ring，想用一个虚假的数据源 id 来处理
+		// if is center node, we need to handle host type alerting rules, host type alerting rules are not related to datasource, we want to reuse the hash ring of datasource, we want to use a fake datasource id to handle it
+		err := models.AlertingEngineHeartbeatWithCluster(n.ctx, n.heartbeatConfig.Endpoint, n.heartbeatConfig.EngineName, HostDatasource)
+		if err != nil {
+			logger.Warningf("heartbeat with cluster %s err:%v", "", err)
 		}
+
+		servers, err := n.ActiveServers(HostDatasource)
+		if err != nil {
+			logger.Warningf("hearbeat %d get active server err:%v", HostDatasource, err)
+			return nil
+		}
+
+		sort.Strings(servers)
+		newss := strings.Join(servers, " ")
+
+		oldss, exists := localss[HostDatasource]
+		if exists && oldss == newss {
+			return nil
+		}
+
+		RebuildConsistentHashRing(HostDatasource, servers)
+		localss[HostDatasource] = newss
 	}

-	// host 告警使用的是 hash ring
-	err = models.AlertingEngineHeartbeatWithCluster(n.ctx, n.heartbeatConfig.Endpoint, n.heartbeatConfig.EngineName, HostDatasource)
-	if err != nil {
-		logger.Warningf("heartbeat with cluster %s err:%v", "", err)
-		n.astats.CounterHeartbeatErrorTotal.WithLabelValues().Inc()
-	}
-
-	servers, err := n.ActiveServersByEngineName()
-	if err != nil {
-		logger.Warningf("hearbeat %d get active server err:%v", HostDatasource, err)
-		n.astats.CounterHeartbeatErrorTotal.WithLabelValues().Inc()
-		return nil
-	}
-
-	sort.Strings(servers)
-	newss := strings.Join(servers, " ")
-
-	oldss, exists := localHostServers[n.heartbeatConfig.EngineName]
-	if exists && oldss == newss {
-		return nil
-	}
-
-	RebuildConsistentHashRing(n.heartbeatConfig.EngineName, servers)
-	localHostServers[n.heartbeatConfig.EngineName] = newss
-
 	return nil
 }

@@ -172,21 +146,6 @@ func (n *Naming) ActiveServers(datasourceId int64) ([]string, error) {
 		return nil, fmt.Errorf("cluster is empty")
 	}

-	if !n.ctx.IsCenter {
-		lst, err := poster.GetByUrls[[]string](n.ctx, "/v1/n9e/servers-active?dsid="+fmt.Sprintf("%d", datasourceId))
-		return lst, err
-	}
-
 	// 30秒内有心跳，就认为是活的
 	return models.AlertingEngineGetsInstances(n.ctx, "datasource_id = ? and clock > ?", datasourceId, time.Now().Unix()-30)
 }
-
-func (n *Naming) ActiveServersByEngineName() ([]string, error) {
-	if !n.ctx.IsCenter {
-		lst, err := poster.GetByUrls[[]string](n.ctx, "/v1/n9e/servers-active?engine_name="+n.heartbeatConfig.EngineName)
-		return lst, err
-	}
-
-	// 30秒内有心跳，就认为是活的
-	return models.AlertingEngineGetsInstances(n.ctx, "engine_cluster = ? and clock > ?", n.heartbeatConfig.EngineName, time.Now().Unix()-30)
-}
--- a/alert/naming/leader.go
+++ b/alert/naming/leader.go
@@ -1,28 +0,0 @@
-package naming
-
-import (
-	"sort"
-
-	"github.com/toolkits/pkg/logger"
-)
-
-func (n *Naming) IamLeader() bool {
-	if !n.ctx.IsCenter {
-		return false
-	}
-
-	servers, err := n.ActiveServersByEngineName()
-	if err != nil {
-		logger.Errorf("failed to get active servers: %v", err)
-		return false
-	}
-
-	if len(servers) == 0 {
-		logger.Errorf("active servers empty")
-		return false
-	}
-
-	sort.Strings(servers)
-
-	return n.heartbeatConfig.Endpoint == servers[0]
-}
--- a/alert/process/process.go
+++ b/alert/process/process.go
@@ -18,16 +18,11 @@ 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/robfig/cron/v3"
+	"github.com/ccfos/nightingale/v6/prom"
 	"github.com/toolkits/pkg/logger"
 	"github.com/toolkits/pkg/str"
 )

-type EventMuteHookFunc func(event *models.AlertCurEvent) bool
-
 type ExternalProcessorsType struct {
 	ExternalLock sync.RWMutex
 	Processors   map[string]*Processor
@@ -48,17 +43,13 @@ func (e *ExternalProcessorsType) GetExternalAlertRule(datasourceId, id int64) (*
 	return processor, has
 }

-type HandleEventFunc func(event *models.AlertCurEvent)
-
 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
@@ -66,22 +57,15 @@ type Processor struct {
 	targetNote string
 	groupName  string

-	alertRuleCache          *memsto.AlertRuleCacheType
-	TargetCache             *memsto.TargetCacheType
-	TargetsOfAlertRuleCache *memsto.TargetsOfAlertRuleCacheType
-	BusiGroupCache          *memsto.BusiGroupCacheType
-	alertMuteCache          *memsto.AlertMuteCacheType
-	datasourceCache         *memsto.DatasourceCacheType
+	atertRuleCache  *memsto.AlertRuleCacheType
+	TargetCache     *memsto.TargetCacheType
+	BusiGroupCache  *memsto.BusiGroupCacheType
+	alertMuteCache  *memsto.AlertMuteCacheType
+	datasourceCache *memsto.DatasourceCacheType

-	ctx   *ctx.Context
-	Stats *astats.Stats
-
-	HandleFireEventHook    HandleEventFunc
-	HandleRecoverEventHook HandleEventFunc
-	EventMuteHook          EventMuteHookFunc
-
-	ScheduleEntry    cron.Entry
-	PromEvalInterval int
+	promClients *prom.PromClientMap
+	ctx         *ctx.Context
+	stats       *astats.Stats
 }

 func (p *Processor) Key() string {
@@ -93,82 +77,63 @@ func (p *Processor) DatasourceId() int64 {
 }

 func (p *Processor) Hash() string {
-	return str.MD5(fmt.Sprintf("%d_%s_%s_%d",
+	return str.MD5(fmt.Sprintf("%d_%d_%s_%d",
 		p.rule.Id,
-		p.rule.CronPattern,
+		p.rule.PromEvalInterval,
 		p.rule.RuleConfig,
 		p.datasourceId,
 	))
 }

-func NewProcessor(engineName string, rule *models.AlertRule, datasourceId int64, alertRuleCache *memsto.AlertRuleCacheType,
-	targetCache *memsto.TargetCacheType, targetsOfAlertRuleCache *memsto.TargetsOfAlertRuleCacheType,
-	busiGroupCache *memsto.BusiGroupCacheType, alertMuteCache *memsto.AlertMuteCacheType, datasourceCache *memsto.DatasourceCacheType, ctx *ctx.Context,
+func NewProcessor(rule *models.AlertRule, datasourceId int64, atertRuleCache *memsto.AlertRuleCacheType, targetCache *memsto.TargetCacheType,
+	busiGroupCache *memsto.BusiGroupCacheType, alertMuteCache *memsto.AlertMuteCacheType, datasourceCache *memsto.DatasourceCacheType, promClients *prom.PromClientMap, ctx *ctx.Context,
 	stats *astats.Stats) *Processor {

 	p := &Processor{
-		EngineName:   engineName,
 		datasourceId: datasourceId,
 		rule:         rule,

-		TargetCache:             targetCache,
-		TargetsOfAlertRuleCache: targetsOfAlertRuleCache,
-		BusiGroupCache:          busiGroupCache,
-		alertMuteCache:          alertMuteCache,
-		alertRuleCache:          alertRuleCache,
-		datasourceCache:         datasourceCache,
+		TargetCache:     targetCache,
+		BusiGroupCache:  busiGroupCache,
+		alertMuteCache:  alertMuteCache,
+		atertRuleCache:  atertRuleCache,
+		datasourceCache: datasourceCache,

-		ctx:   ctx,
-		Stats: stats,
-
-		HandleFireEventHook:    func(event *models.AlertCurEvent) {},
-		HandleRecoverEventHook: func(event *models.AlertCurEvent) {},
-		EventMuteHook:          func(event *models.AlertCurEvent) bool { return false },
+		promClients: promClients,
+		ctx:         ctx,
+		stats:       stats,
 	}

 	p.mayHandleGroup()
 	return p
 }

-func (p *Processor) Handle(anomalyPoints []models.AnomalyPoint, from string, inhibit bool) {
+func (p *Processor) Handle(anomalyPoints []common.AnomalyPoint, from string, inhibit bool) {
 	// 有可能rule的一些配置已经发生变化，比如告警接收人、callbacks等
 	// 这些信息的修改是不会引起worker restart的，但是确实会影响告警处理逻辑
 	// 所以，这里直接从memsto.AlertRuleCache中获取并覆盖
 	p.inhibit = inhibit
-	cachedRule := p.alertRuleCache.Get(p.rule.Id)
+	p.rule = p.atertRuleCache.Get(p.rule.Id)
+	cachedRule := p.rule
 	if cachedRule == nil {
 		logger.Errorf("rule not found %+v", anomalyPoints)
-		p.Stats.CounterRuleEvalErrorTotal.WithLabelValues(fmt.Sprintf("%v", p.DatasourceId()), "handle_event", p.BusiGroupCache.GetNameByBusiGroupId(p.rule.GroupId), fmt.Sprintf("%v", p.rule.Id)).Inc()
 		return
 	}

-	// 在 rule 变化之前取到 ruleHash
-	ruleHash := p.rule.Hash()
-
-	p.rule = cachedRule
 	now := time.Now().Unix()
 	alertingKeys := map[string]struct{}{}

 	// 根据 event 的 tag 将 events 分组，处理告警抑制的情况
 	eventsMap := make(map[string][]*models.AlertCurEvent)
 	for _, anomalyPoint := range anomalyPoints {
-		event := p.BuildEvent(anomalyPoint, from, now, ruleHash)
+		event := p.BuildEvent(anomalyPoint, from, now)
 		// 如果 event 被 mute 了,本质也是 fire 的状态,这里无论如何都添加到 alertingKeys 中,防止 fire 的事件自动恢复了
 		hash := event.Hash
 		alertingKeys[hash] = struct{}{}
-		isMuted, detail := mute.IsMuted(cachedRule, event, p.TargetCache, p.alertMuteCache)
-		if isMuted {
-			p.Stats.CounterMuteTotal.WithLabelValues(event.GroupName).Inc()
-			logger.Debugf("rule_eval:%s event:%v is muted, detail:%s", p.Key(), event, detail)
+		if mute.IsMuted(cachedRule, event, p.TargetCache, p.alertMuteCache) {
+			logger.Debugf("rule_eval:%s event:%v is muted", p.Key(), event)
 			continue
 		}
-
-		if p.EventMuteHook(event) {
-			p.Stats.CounterMuteTotal.WithLabelValues(event.GroupName).Inc()
-			logger.Debugf("rule_eval:%s event:%v is muted by hook", p.Key(), event)
-			continue
-		}
-
 		tagHash := TagHash(anomalyPoint)
 		eventsMap[tagHash] = append(eventsMap[tagHash], event)
 	}
@@ -177,12 +142,10 @@ func (p *Processor) Handle(anomalyPoints []models.AnomalyPoint, from string, inh
 		p.handleEvent(events)
 	}

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

-func (p *Processor) BuildEvent(anomalyPoint models.AnomalyPoint, from string, now int64, ruleHash string) *models.AlertCurEvent {
+func (p *Processor) BuildEvent(anomalyPoint common.AnomalyPoint, from string, now int64) *models.AlertCurEvent {
 	p.fillTags(anomalyPoint)
 	p.mayHandleIdent()
 	hash := Hash(p.rule.Id, p.datasourceId, anomalyPoint)
@@ -193,12 +156,6 @@ func (p *Processor) BuildEvent(anomalyPoint models.AnomalyPoint, from string, no
 	}

 	event := p.rule.GenerateNewEvent(p.ctx)
-
-	bg := p.BusiGroupCache.GetByBusiGroupId(p.rule.GroupId)
-	if bg != nil {
-		event.GroupName = bg.Name
-	}
-
 	event.TriggerTime = anomalyPoint.Timestamp
 	event.TagsMap = p.tagsMap
 	event.DatasourceId = p.datasourceId
@@ -207,9 +164,8 @@ func (p *Processor) BuildEvent(anomalyPoint models.AnomalyPoint, from string, no
 	event.TargetIdent = p.target
 	event.TargetNote = p.targetNote
 	event.TriggerValue = anomalyPoint.ReadableValue()
-	event.TriggerValues = anomalyPoint.Values
-	event.TriggerValuesJson = models.EventTriggerValues{ValuesWithUnit: anomalyPoint.ValuesUnit}
 	event.TagsJSON = p.tagsArr
+	event.GroupName = p.groupName
 	event.Tags = strings.Join(p.tagsArr, ",,")
 	event.IsRecovered = false
 	event.Callbacks = p.rule.Callbacks
@@ -219,82 +175,16 @@ func (p *Processor) BuildEvent(anomalyPoint models.AnomalyPoint, from string, no
 	event.RuleConfig = p.rule.RuleConfig
 	event.RuleConfigJson = p.rule.RuleConfigJson
 	event.Severity = anomalyPoint.Severity
-	event.ExtraConfig = p.rule.ExtraConfigJSON
-	event.PromQl = anomalyPoint.Query
-	event.RecoverConfig = anomalyPoint.RecoverConfig
-	event.RuleHash = ruleHash
-
-	if p.target != "" {
-		if pt, exist := p.TargetCache.Get(p.target); exist {
-			pt.GroupNames = p.BusiGroupCache.GetNamesByBusiGroupIds(pt.GroupIds)
-			event.Target = pt
-		} else {
-			logger.Infof("Target[ident: %s] doesn't exist in cache.", p.target)
-		}
-	}
-
-	if event.TriggerValues != "" && strings.Count(event.TriggerValues, "$") > 1 {
-		// TriggerValues 有多个变量，将多个变量都放到 TriggerValue 中
-		event.TriggerValue = event.TriggerValues
-	}

 	if from == "inner" {
 		event.LastEvalTime = now
 	} 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) {
+func (p *Processor) HandleRecover(alertingKeys map[string]struct{}, now int64) {
 	for _, hash := range p.pendings.Keys() {
 		if _, has := alertingKeys[hash]; has {
 			continue
@@ -302,110 +192,42 @@ func (p *Processor) HandleRecover(alertingKeys map[string]struct{}, now int64, i
 		p.pendings.Delete(hash)
 	}

-	hashArr := make([]string, 0, len(alertingKeys))
-	for hash, _ := range p.fires.GetAll() {
+	for hash := range p.fires.GetAll() {
 		if _, has := alertingKeys[hash]; has {
 			continue
 		}
-
-		hashArr = append(hashArr, hash)
+		p.RecoverSingle(hash, now, nil)
 	}
-	p.HandleRecoverEvent(hashArr, now, inhibit)
-
 }

-func (p *Processor) HandleRecoverEvent(hashArr []string, now int64, inhibit bool) {
+func (p *Processor) RecoverSingle(hash string, now int64, value *string) {
 	cachedRule := p.rule
 	if cachedRule == nil {
 		return
 	}
-
-	if !inhibit {
-		for _, hash := range hashArr {
-			p.RecoverSingle(false, hash, now, nil)
-		}
-		return
-	}
-
-	eventMap := make(map[string]models.AlertCurEvent)
-	for _, hash := range hashArr {
-		event, has := p.fires.Get(hash)
-		if !has {
-			continue
-		}
-
-		e, exists := eventMap[event.Tags]
-		if !exists {
-			eventMap[event.Tags] = *event
-			continue
-		}
-
-		if e.Severity > event.Severity {
-			// hash 对应的恢复事件的被抑制了，把之前的事件删除
-			p.fires.Delete(e.Hash)
-			p.pendings.Delete(e.Hash)
-			models.AlertCurEventDelByHash(p.ctx, e.Hash)
-			eventMap[event.Tags] = *event
-		}
-	}
-
-	for _, event := range eventMap {
-		p.RecoverSingle(false, event.Hash, now, nil)
-	}
-}
-
-func (p *Processor) RecoverSingle(byRecover bool, hash string, now int64, value *string, values ...string) {
-	cachedRule := p.rule
-	if cachedRule == nil {
-		return
-	}
-
 	event, has := p.fires.Get(hash)
 	if !has {
 		return
 	}
-
 	// 如果配置了留观时长，就不能立马恢复了
-	if cachedRule.RecoverDuration > 0 {
-		lastPendingEvent, has := p.pendingsUseByRecover.Get(hash)
-		if !has {
-			// 说明没有产生过异常点，就不需要恢复了
-			logger.Debugf("rule_eval:%s event:%v do not has pending event, not recover", p.Key(), event)
-			return
-		}
-
-		if now-lastPendingEvent.LastEvalTime < cachedRule.RecoverDuration {
-			logger.Debugf("rule_eval:%s event:%v not recover", p.Key(), event)
-			return
-		}
-	}
-
-	// 如果设置了恢复条件，则不能在此处恢复，必须依靠 recoverPoint 来恢复
-	if event.RecoverConfig.JudgeType != models.Origin && !byRecover {
+	if cachedRule.RecoverDuration > 0 && now-event.LastEvalTime < cachedRule.RecoverDuration {
 		logger.Debugf("rule_eval:%s event:%v not recover", p.Key(), event)
 		return
 	}
-
 	if value != nil {
 		event.TriggerValue = *value
-		if len(values) > 0 {
-			event.TriggerValues = values[0]
-		}
 	}

 	// 没查到触发阈值的vector，姑且就认为这个vector的值恢复了
 	// 我确实无法分辨，是prom中有值但是未满足阈值所以没返回，还是prom中确实丢了一些点导致没有数据可以返回，尴尬
 	p.fires.Delete(hash)
 	p.pendings.Delete(hash)
-	p.pendingsUseByRecover.Delete(hash)

 	// 可能是因为调整了promql才恢复的，所以事件里边要体现最新的promql，否则用户会比较困惑
 	// 当然，其实rule的各个字段都可能发生变化了，都更新一下吧
 	cachedRule.UpdateEvent(event)
 	event.IsRecovered = true
 	event.LastEvalTime = now
-
-	p.HandleRecoverEventHook(event)
 	p.pushEventToQueue(event)
 }

@@ -417,14 +239,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)
-		}
-
-		event.PromEvalInterval = p.PromEvalInterval
 		if p.rule.PromForDuration == 0 {
 			fireEvents = append(fireEvents, event)
 			if severity > event.Severity {
@@ -433,7 +247,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)
@@ -471,12 +285,9 @@ func (p *Processor) fireEvent(event *models.AlertCurEvent) {
 	if cachedRule == nil {
 		return
 	}
-
 	logger.Debugf("rule_eval:%s event:%+v fire", p.Key(), event)
 	if fired, has := p.fires.Get(event.Hash); has {
 		p.fires.UpdateLastEvalTime(event.Hash, event.LastEvalTime)
-		event.FirstTriggerTime = fired.FirstTriggerTime
-		p.HandleFireEventHook(event)

 		if cachedRule.NotifyRepeatStep == 0 {
 			logger.Debugf("rule_eval:%s event:%+v repeat is zero nothing to do", p.Key(), event)
@@ -486,10 +297,11 @@ func (p *Processor) fireEvent(event *models.AlertCurEvent) {
 		}

 		// 之前发送过告警了，这次是否要继续发送，要看是否过了通道静默时间
-		if event.LastEvalTime >= fired.LastSentTime+int64(cachedRule.NotifyRepeatStep)*60 {
+		if event.LastEvalTime > fired.LastSentTime+int64(cachedRule.NotifyRepeatStep)*60 {
 			if cachedRule.NotifyMaxNumber == 0 {
 				// 最大可以发送次数如果是0，表示不想限制最大发送次数，一直发即可
 				event.NotifyCurNumber = fired.NotifyCurNumber + 1
+				event.FirstTriggerTime = fired.FirstTriggerTime
 				p.pushEventToQueue(event)
 			} else {
 				// 有最大发送次数的限制，就要看已经发了几次了，是否达到了最大发送次数
@@ -498,6 +310,7 @@ func (p *Processor) fireEvent(event *models.AlertCurEvent) {
 					return
 				} else {
 					event.NotifyCurNumber = fired.NotifyCurNumber + 1
+					event.FirstTriggerTime = fired.FirstTriggerTime
 					p.pushEventToQueue(event)
 				}
 			}
@@ -505,7 +318,6 @@ func (p *Processor) fireEvent(event *models.AlertCurEvent) {
 	} else {
 		event.NotifyCurNumber = 1
 		event.FirstTriggerTime = event.TriggerTime
-		p.HandleFireEventHook(event)
 		p.pushEventToQueue(event)
 	}
 }
@@ -516,55 +328,33 @@ func (p *Processor) pushEventToQueue(e *models.AlertCurEvent) {
 		p.fires.Set(e.Hash, e)
 	}

+	p.stats.CounterAlertsTotal.WithLabelValues(fmt.Sprintf("%d", e.DatasourceId)).Inc()
 	dispatch.LogEvent(e, "push_queue")
 	if !queue.EventQueue.PushFront(e) {
 		logger.Warningf("event_push_queue: queue is full, event:%+v", e)
-		p.Stats.CounterRuleEvalErrorTotal.WithLabelValues(fmt.Sprintf("%v", p.DatasourceId()), "push_event_queue", p.BusiGroupCache.GetNameByBusiGroupId(p.rule.GroupId), fmt.Sprintf("%v", p.rule.Id)).Inc()
 	}
 }

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

-	curEvents, err := models.AlertCurEventGetByRuleIdAndDsId(p.ctx, p.rule.Id, p.datasourceId)
+	curEvents, err := models.AlertCurEventGetByRuleIdAndCluster(p.ctx, p.rule.Id, p.datasourceId)
 	if err != nil {
 		logger.Errorf("recover event from db for rule:%s failed, err:%s", p.Key(), err)
-		p.Stats.CounterRuleEvalErrorTotal.WithLabelValues(fmt.Sprintf("%v", p.DatasourceId()), "get_recover_event", p.BusiGroupCache.GetNameByBusiGroupId(p.rule.GroupId), fmt.Sprintf("%v", p.rule.Id)).Inc()
 		p.fires = NewAlertCurEventMap(nil)
 		return
 	}

 	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)
-			if exists && target.EngineName != p.EngineName && !(p.ctx.IsCenter && target.EngineName == "") {
-				// 如果是 host rule，且 target 的 engineName 不是当前的 engineName 或者是中心机房 target EngineName 为空，就跳过
-				continue
-			}
-		}
-
 		event.DB2Mem()
-		target, exists := p.TargetCache.Get(event.TargetIdent)
-		if exists {
-			target.GroupNames = p.BusiGroupCache.GetNamesByBusiGroupIds(target.GroupIds)
-			event.Target = target
-		}
-
 		fireMap[event.Hash] = event
-		e := *event
-		pendingsUseByRecoverMap[event.Hash] = &e
 	}

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

-func (p *Processor) fillTags(anomalyPoint models.AnomalyPoint) {
+func (p *Processor) fillTags(anomalyPoint common.AnomalyPoint) {
 	// handle series tags
 	tagsMap := make(map[string]string)
 	for label, value := range anomalyPoint.Labels {
@@ -616,13 +406,7 @@ func (p *Processor) mayHandleIdent() {
 		if target, exists := p.TargetCache.Get(ident); exists {
 			p.target = target.Ident
 			p.targetNote = target.Note
-		} else {
-			p.target = ident
-			p.targetNote = ""
 		}
-	} else {
-		p.target = ""
-		p.targetNote = ""
 	}
 }

@@ -634,12 +418,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 {
 	numLabels := len(m)

@@ -654,10 +432,10 @@ func labelMapToArr(m map[string]string) []string {
 	return labelStrings
 }

-func Hash(ruleId, datasourceId int64, vector models.AnomalyPoint) string {
-	return str.MD5(fmt.Sprintf("%d_%s_%d_%d_%s", ruleId, vector.Labels.String(), datasourceId, vector.Severity, vector.Query))
+func Hash(ruleId, datasourceId int64, vector common.AnomalyPoint) string {
+	return str.MD5(fmt.Sprintf("%d_%s_%d_%d", ruleId, vector.Labels.String(), datasourceId, vector.Severity))
 }

-func TagHash(vector models.AnomalyPoint) string {
+func TagHash(vector common.AnomalyPoint) string {
 	return str.MD5(vector.Labels.String())
 }
--- a/alert/record/prom_rule.go
+++ b/alert/record/prom_rule.go
@@ -6,11 +6,9 @@ import (
 	"strings"
 	"time"

-	"github.com/ccfos/nightingale/v6/alert/astats"
 	"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 +18,19 @@ type RecordRuleContext struct {
 	datasourceId int64
 	quit         chan struct{}

-	scheduler   *cron.Cron
-	rule        *models.RecordingRule
+	rule *models.RecordingRule
+	// writers     *writer.WritersType
 	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{
+func NewRecordRuleContext(rule *models.RecordingRule, datasourceId int64, promClients *prom.PromClientMap, writers *writer.WritersType) *RecordRuleContext {
+	return &RecordRuleContext{
 		datasourceId: datasourceId,
 		quit:         make(chan struct{}),
 		rule:         rule,
 		promClients:  promClients,
-		stats:        stats,
+		//writers:      writers,
 	}
-
-	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 +38,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,11 +50,24 @@ 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
+	}
+	go func() {
+		for {
+			select {
+			case <-rrc.quit:
+				return
+			default:
+				rrc.Eval()
+				time.Sleep(time.Duration(interval) * time.Second)
+			}
+		}
+	}()
 }

 func (rrc *RecordRuleContext) Eval() {
-	rrc.stats.CounterRecordEval.WithLabelValues(fmt.Sprintf("%d", rrc.datasourceId)).Inc()
 	promql := strings.TrimSpace(rrc.rule.PromQl)
 	if promql == "" {
 		logger.Errorf("eval:%s promql is blank", rrc.Key())
@@ -82,37 +76,27 @@ func (rrc *RecordRuleContext) Eval() {

 	if rrc.promClients.IsNil(rrc.datasourceId) {
 		logger.Errorf("eval:%s reader client is nil", rrc.Key())
-		rrc.stats.CounterRecordEvalErrorTotal.WithLabelValues(fmt.Sprintf("%d", rrc.datasourceId)).Inc()
 		return
 	}

 	value, warnings, err := rrc.promClients.GetCli(rrc.datasourceId).Query(context.Background(), promql, time.Now())
 	if err != nil {
 		logger.Errorf("eval:%s promql:%s, error:%v", rrc.Key(), promql, err)
-		rrc.stats.CounterRecordEvalErrorTotal.WithLabelValues(fmt.Sprintf("%d", rrc.datasourceId)).Inc()
 		return
 	}

 	if len(warnings) > 0 {
 		logger.Errorf("eval:%s promql:%s, warnings:%v", rrc.Key(), promql, warnings)
-		rrc.stats.CounterRecordEvalErrorTotal.WithLabelValues(fmt.Sprintf("%d", rrc.datasourceId)).Inc()
 		return
 	}

 	ts := ConvertToTimeSeries(value, rrc.rule)
 	if len(ts) != 0 {
-		err := rrc.promClients.GetWriterCli(rrc.datasourceId).Write(ts)
-		if err != nil {
-			logger.Errorf("eval:%s promql:%s, error:%v", rrc.Key(), promql, err)
-			rrc.stats.CounterRecordEvalErrorTotal.WithLabelValues(fmt.Sprintf("%d", rrc.datasourceId)).Inc()
-		}
+		rrc.promClients.GetWriterCli(rrc.datasourceId).Write(ts)
 	}
 }

 func (rrc *RecordRuleContext) Stop() {
 	logger.Infof("%s stopped", rrc.Key())
-
-	c := rrc.scheduler.Stop()
-	<-c.Done()
 	close(rrc.quit)
 }
--- a/alert/record/sample.go
+++ b/alert/record/sample.go
@@ -15,7 +15,7 @@ const (
 	LabelName = "__name__"
 )

-func ConvertToTimeSeries(value model.Value, rule *models.RecordingRule) (lst []prompb.TimeSeries) {
+func ConvertToTimeSeries(value model.Value, rule *models.RecordingRule) (lst []*prompb.TimeSeries) {
 	switch value.Type() {
 	case model.ValVector:
 		items, ok := value.(model.Vector)
@@ -31,7 +31,7 @@ func ConvertToTimeSeries(value model.Value, rule *models.RecordingRule) (lst []p
 			s.Timestamp = time.Unix(item.Timestamp.Unix(), 0).UnixNano() / 1e6
 			s.Value = float64(item.Value)
 			l := labelsToLabelsProto(item.Metric, rule)
-			lst = append(lst, prompb.TimeSeries{
+			lst = append(lst, &prompb.TimeSeries{
 				Labels:  l,
 				Samples: []prompb.Sample{s},
 			})
@@ -63,7 +63,7 @@ func ConvertToTimeSeries(value model.Value, rule *models.RecordingRule) (lst []p
 					Value:     float64(v.Value),
 				})
 			}
-			lst = append(lst, prompb.TimeSeries{
+			lst = append(lst, &prompb.TimeSeries{
 				Labels:  l,
 				Samples: slst,
 			})
@@ -78,7 +78,7 @@ func ConvertToTimeSeries(value model.Value, rule *models.RecordingRule) (lst []p
 			return
 		}

-		lst = append(lst, prompb.TimeSeries{
+		lst = append(lst, &prompb.TimeSeries{
 			Labels:  nil,
 			Samples: []prompb.Sample{{Value: float64(item.Value), Timestamp: time.Unix(item.Timestamp.Unix(), 0).UnixNano() / 1e6}},
 		})
@@ -89,9 +89,9 @@ func ConvertToTimeSeries(value model.Value, rule *models.RecordingRule) (lst []p
 	return
 }

-func labelsToLabelsProto(labels model.Metric, rule *models.RecordingRule) (result []prompb.Label) {
+func labelsToLabelsProto(labels model.Metric, rule *models.RecordingRule) (result []*prompb.Label) {
 	//name
-	nameLs := prompb.Label{
+	nameLs := &prompb.Label{
 		Name:  LabelName,
 		Value: rule.Name,
 	}
@@ -101,7 +101,7 @@ func labelsToLabelsProto(labels model.Metric, rule *models.RecordingRule) (resul
 			continue
 		}
 		if model.LabelNameRE.MatchString(string(k)) {
-			result = append(result, prompb.Label{
+			result = append(result, &prompb.Label{
 				Name:  string(k),
 				Value: string(v),
 			})
@@ -111,7 +111,7 @@ func labelsToLabelsProto(labels model.Metric, rule *models.RecordingRule) (resul
 		for _, v := range rule.AppendTagsJSON {
 			index := strings.Index(v, "=")
 			if model.LabelNameRE.MatchString(v[:index]) {
-				result = append(result, prompb.Label{
+				result = append(result, &prompb.Label{
 					Name:  v[:index],
 					Value: v[index+1:],
 				})
--- a/alert/record/scheduler.go
+++ b/alert/record/scheduler.go
@@ -3,7 +3,6 @@ package record
 import (
 	"context"
 	"fmt"
-	"strconv"
 	"time"

 	"github.com/ccfos/nightingale/v6/alert/aconf"
@@ -26,11 +25,9 @@ type Scheduler struct {
 	writers     *writer.WritersType

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

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

 		stats: stats,
-
-		datasourceCache: datasourceCache,
 	}

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

-		datasourceIds := s.datasourceCache.GetIDsByDsCateAndQueries("prometheus", rule.DatasourceQueries)
+		datasourceIds := s.promClients.Hit(rule.DatasourceIdsJson)
 		for _, dsId := range datasourceIds {
-			if !naming.DatasourceHashRing.IsHit(strconv.FormatInt(dsId, 10), fmt.Sprintf("%d", rule.Id), s.aconf.Heartbeat.Endpoint) {
+			if !naming.DatasourceHashRing.IsHit(dsId, fmt.Sprintf("%d", rule.Id), s.aconf.Heartbeat.Endpoint) {
 				continue
 			}

-			recordRule := NewRecordRuleContext(rule, dsId, s.promClients, s.writers, s.stats)
+			recordRule := NewRecordRuleContext(rule, dsId, s.promClients, s.writers)
 			recordRules[recordRule.Hash()] = recordRule
 		}
 	}
--- a/alert/router/router.go
+++ b/alert/router/router.go
@@ -39,16 +39,15 @@ func New(httpConfig httpx.Config, alert aconf.Alert, amc *memsto.AlertMuteCacheT
 }

 func (rt *Router) Config(r *gin.Engine) {
-	if !rt.HTTP.APIForService.Enable {
+	if !rt.HTTP.Alert.Enable {
 		return
 	}

 	service := r.Group("/v1/n9e")
-	if len(rt.HTTP.APIForService.BasicAuth) > 0 {
-		service.Use(gin.BasicAuth(rt.HTTP.APIForService.BasicAuth))
+	if len(rt.HTTP.Alert.BasicAuth) > 0 {
+		service.Use(gin.BasicAuth(rt.HTTP.Alert.BasicAuth))
 	}
 	service.POST("/event", rt.pushEventToQueue)
-	service.POST("/event-persist", rt.eventPersist)
 	service.POST("/make-event", rt.makeEvent)
 }

--- a/alert/router/router_event.go
+++ b/alert/router/router_event.go
@@ -2,10 +2,10 @@ package router

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

+	"github.com/ccfos/nightingale/v6/alert/common"
 	"github.com/ccfos/nightingale/v6/alert/dispatch"
 	"github.com/ccfos/nightingale/v6/alert/mute"
 	"github.com/ccfos/nightingale/v6/alert/naming"
@@ -33,7 +33,7 @@ func (rt *Router) pushEventToQueue(c *gin.Context) {
 			continue
 		}

-		arr := strings.SplitN(pair, "=", 2)
+		arr := strings.Split(pair, "=")
 		if len(arr) != 2 {
 			continue
 		}
@@ -72,6 +72,8 @@ func (rt *Router) pushEventToQueue(c *gin.Context) {
 	event.NotifyChannels = strings.Join(event.NotifyChannelsJSON, " ")
 	event.NotifyGroups = strings.Join(event.NotifyGroupsJSON, " ")

+	rt.AlertStats.CounterAlertsTotal.WithLabelValues(event.Cluster).Inc()
+
 	dispatch.LogEvent(event, "http_push_queue")
 	if !queue.EventQueue.PushFront(event) {
 		msg := fmt.Sprintf("event:%+v push_queue err: queue is full", event)
@@ -81,17 +83,9 @@ func (rt *Router) pushEventToQueue(c *gin.Context) {
 	ginx.NewRender(c).Message(nil)
 }

-func (rt *Router) eventPersist(c *gin.Context) {
-	var event *models.AlertCurEvent
-	ginx.BindJSON(c, &event)
-	event.FE2DB()
-	err := models.EventPersist(rt.Ctx, event)
-	ginx.NewRender(c).Data(event.Id, err)
-}
-
 type eventForm struct {
 	Alert         bool                  `json:"alert"`
-	AnomalyPoints []models.AnomalyPoint `json:"vectors"`
+	AnomalyPoints []common.AnomalyPoint `json:"vectors"`
 	RuleId        int64                 `json:"rule_id"`
 	DatasourceId  int64                 `json:"datasource_id"`
 	Inhibit       bool                  `json:"inhibit"`
@@ -102,7 +96,7 @@ func (rt *Router) makeEvent(c *gin.Context) {
 	ginx.BindJSON(c, &events)
 	//now := time.Now().Unix()
 	for i := 0; i < len(events); i++ {
-		node, err := naming.DatasourceHashRing.GetNode(strconv.FormatInt(events[i].DatasourceId, 10), fmt.Sprintf("%d", events[i].RuleId))
+		node, err := naming.DatasourceHashRing.GetNode(events[i].DatasourceId, fmt.Sprintf("%d", events[i].RuleId))
 		if err != nil {
 			logger.Warningf("event:%+v get node err:%v", events[i], err)
 			ginx.Bomb(200, "event node not exists")
@@ -128,7 +122,7 @@ func (rt *Router) makeEvent(c *gin.Context) {
 		} else {
 			for _, vector := range events[i].AnomalyPoints {
 				readableString := vector.ReadableValue()
-				go ruleWorker.RecoverSingle(false, process.Hash(events[i].RuleId, events[i].DatasourceId, vector), vector.Timestamp, &readableString)
+				go ruleWorker.RecoverSingle(process.Hash(events[i].RuleId, events[i].DatasourceId, vector), vector.Timestamp, &readableString)
 			}
 		}
 	}
--- a/alert/sender/callback.go
+++ b/alert/sender/callback.go
@@ -1,182 +1,58 @@
 package sender

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

-	"github.com/ccfos/nightingale/v6/alert/astats"
+	"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/ccfos/nightingale/v6/pkg/ibex"
 	"github.com/ccfos/nightingale/v6/pkg/poster"

 	"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, ibexConf aconf.Ibex) {
+	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, ibexConf)
+			}
+			continue
+		}

-	doSendAndRecord(ctx.Ctx, ctx.CallBackURL, ctx.CallBackURL, event, "callback", ctx.Stats, ctx.Events)
-}
+		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, events []*models.AlertCurEvent) {
-	res, err := doSend(url, body, channel, stats)
-	NotifyRecord(ctx, events, channel, token, res, err)
-}
-
-func NotifyRecord(ctx *ctx.Context, evts []*models.AlertCurEvent, channel, target, res string, err error) {
-	// 一个通知可能对应多个 event，都需要记录
-	notis := make([]*models.NotificaitonRecord, 0, len(evts))
-	for _, evt := range evts {
-		noti := models.NewNotificationRecord(evt, channel, target)
+		resp, code, err := poster.PostJSON(url, 5*time.Second, event, 3)
 		if err != nil {
-			noti.SetStatus(models.NotiStatusFailure)
-			noti.SetDetails(err.Error())
-		} else if res != "" {
-			noti.SetDetails(string(res))
+			logger.Errorf("event_callback(rule_id=%d url=%s) fail, resp: %s, err: %v, code: %d", event.RuleId, url, string(resp), err, code)
+		} else {
+			logger.Infof("event_callback(rule_id=%d url=%s) succ, resp: %s, code: %d", event.RuleId, url, string(resp), code)
 		}
-		notis = append(notis, noti)
-	}
-
-	if !ctx.IsCenter {
-		_, err := poster.PostByUrlsWithResp[[]int64](ctx, "/v1/n9e/notify-record", notis)
-		if err != nil {
-			logger.Errorf("add notis:%v failed, err: %v", notis, err)
-		}
-		return
-	}
-
-	if err := models.DB(ctx).CreateInBatches(notis, 100).Error; err != nil {
-		logger.Errorf("add notis:%v failed, err: %v", notis, 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 TaskForm struct {
+	Title     string   `json:"title"`
+	Account   string   `json:"account"`
+	Batch     int      `json:"batch"`
+	Tolerance int      `json:"tolerance"`
+	Timeout   int      `json:"timeout"`
+	Pause     string   `json:"pause"`
+	Script    string   `json:"script"`
+	Args      string   `json:"args"`
+	Action    string   `json:"action"`
+	Creator   string   `json:"creator"`
+	Hosts     []string `json:"hosts"`
 }

 type TaskCreateReply struct {
@@ -184,26 +60,135 @@ 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, ibexConf aconf.Ibex) {
+	arr := strings.Split(url, "/")

-	if queue == nil {
-		queue = &WebhookQueue{
-			eventQueue: NewSafeEventQueue(QueueMaxSize),
-			closeCh:    make(chan struct{}),
-		}
+	var idstr string
+	var host string

-		CallbackEventQueueLock.Lock()
-		CallbackEventQueue[webhook.Url] = queue
-		CallbackEventQueueLock.Unlock()
-
-		StartConsumer(ctx, queue, webhook.Batch, webhook, stats)
+	if len(arr) > 1 {
+		idstr = arr[1]
 	}

-	succ := queue.eventQueue.Push(event)
-	if !succ {
-		logger.Warningf("Write channel(%s) full, current channel size: %d event:%v", webhook.Url, queue.eventQueue.Len(), event)
+	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, err := models.TaskTplGet(ctx, "id = ?", id)
+	if err != nil {
+		logger.Errorf("event_callback_ibex: failed to get tpl: %v", err)
+		return
+	}
+
+	if tpl == nil {
+		logger.Errorf("event_callback_ibex: no such tpl(%d)", id)
+		return
+	}
+
+	// check perm
+	// tpl.GroupId - host - account 三元组校验权限
+	can, err := canDoIbex(ctx, tpl.UpdateBy, tpl, host, targetCache)
+	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
+	}
+
+	// call ibex
+	in := 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,
+		Action:    "start",
+		Creator:   tpl.UpdateBy,
+		Hosts:     []string{host},
+	}
+
+	var res TaskCreateReply
+	err = ibex.New(
+		ibexConf.Address,
+		ibexConf.BasicAuthUser,
+		ibexConf.BasicAuthPass,
+		ibexConf.Timeout,
+	).
+		Path("/ibex/v1/tasks").
+		In(in).
+		Out(&res).
+		POST()
+
+	if err != nil {
+		logger.Errorf("event_callback_ibex: call ibex fail: %v", err)
+		return
+	}
+
+	if res.Err != "" {
+		logger.Errorf("event_callback_ibex: call ibex response error: %v", res.Err)
+		return
+	}
+
+	// write db
+	record := models.TaskRecord{
+		Id:           res.Dat,
+		GroupId:      tpl.GroupId,
+		IbexAddress:  ibexConf.Address,
+		IbexAuthUser: ibexConf.BasicAuthUser,
+		IbexAuthPass: ibexConf.BasicAuthPass,
+		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(ctx *ctx.Context, username string, tpl *models.TaskTpl, host string, targetCache *memsto.TargetCacheType) (bool, error) {
+	user, err := models.UserGetByUsername(ctx, username)
+	if err != nil {
+		return false, err
+	}
+
+	if user != nil && user.IsAdmin() {
+		return true, nil
+	}
+
+	target, has := targetCache.Get(host)
+	if !has {
+		return false, nil
+	}
+
+	return target.GroupId == tpl.GroupId, nil
+}
--- a/alert/sender/dingtalk.go
+++ b/alert/sender/dingtalk.go
@@ -3,8 +3,12 @@ package sender
 import (
 	"html/template"
 	"strings"
+	"time"

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

 type dingtalkMarkdown struct {
@@ -23,33 +27,29 @@ type dingtalk struct {
 	At       dingtalkAt       `json:"at"`
 }

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

 func (ds *DingtalkSender) Send(ctx MessageContext) {
-	if len(ctx.Users) == 0 || len(ctx.Events) == 0 {
+	if len(ctx.Users) == 0 || ctx.Rule == nil || ctx.Event == nil {
 		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)
+	message := BuildTplMessage(ds.tpl, ctx.Event)

-	for i, url := range urls {
+	for _, url := range urls {
 		var body dingtalk
 		// NoAt in url
 		if strings.Contains(url, "noat=1") {
 			body = dingtalk{
 				Msgtype: "markdown",
 				Markdown: dingtalkMarkdown{
-					Title: ctx.Events[0].RuleName,
+					Title: ctx.Rule.Name,
 					Text:  message,
 				},
 			}
@@ -57,7 +57,7 @@ func (ds *DingtalkSender) Send(ctx MessageContext) {
 			body = dingtalk{
 				Msgtype: "markdown",
 				Markdown: dingtalkMarkdown{
-					Title: ctx.Events[0].RuleName,
+					Title: ctx.Rule.Name,
 					Text:  message + "\n" + strings.Join(ats, " "),
 				},
 				At: dingtalkAt{
@@ -66,45 +66,14 @@ func (ds *DingtalkSender) Send(ctx MessageContext) {
 				},
 			}
 		}
-
-		doSendAndRecord(ctx.Ctx, url, tokens[i], body, models.Dingtalk, ctx.Stats, ctx.Events)
+		ds.doSend(url, body)
 	}
 }

-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)
-}
-
 // 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 != "" {
@@ -112,12 +81,20 @@ func (ds *DingtalkSender) extract(users []*models.User) ([]string, []string, []s
 		}
 		if token, has := user.ExtractToken(models.Dingtalk); has {
 			url := token
-			if !strings.HasPrefix(token, "https://") && !strings.HasPrefix(token, "http://") {
+			if !strings.HasPrefix(token, "https://") {
 				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 (ds *DingtalkSender) doSend(url string, body dingtalk) {
+	res, code, err := poster.PostJSON(url, time.Second*5, body, 3)
+	if err != nil {
+		logger.Errorf("dingtalk_sender: result=fail url=%s code=%d error=%v response=%s", url, code, err, string(res))
+	} else {
+		logger.Infof("dingtalk_sender: result=succ url=%s code=%d response=%s", url, code, string(res))
+	}
 }
--- a/alert/sender/email.go
+++ b/alert/sender/email.go
@@ -2,21 +2,18 @@ package sender

 import (
 	"crypto/tls"
-	"errors"
 	"html/template"
 	"time"

 	"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,27 +21,20 @@ type EmailSender struct {
 	smtp       aconf.SMTPConfig
 }

-type EmailContext struct {
-	events []*models.AlertCurEvent
-	mail   *gomail.Message
-}
-
 func (es *EmailSender) Send(ctx MessageContext) {
-	if len(ctx.Users) == 0 || len(ctx.Events) == 0 {
+	if len(ctx.Users) == 0 || ctx.Rule == nil || ctx.Event == nil {
 		return
 	}
 	tos := extract(ctx.Users)
 	var subject string

 	if es.subjectTpl != nil {
-		subject = BuildTplMessage(models.Email, es.subjectTpl, []*models.AlertCurEvent{ctx.Events[0]})
+		subject = BuildTplMessage(es.subjectTpl, ctx.Event)
 	} else {
-		subject = ctx.Events[0].RuleName
+		subject = ctx.Rule.Name
 	}
-	content := BuildTplMessage(models.Email, es.contentTpl, ctx.Events)
-	es.WriteEmail(subject, content, tos, ctx.Events)
-
-	ctx.Stats.AlertNotifyTotal.WithLabelValues(models.Email).Add(float64(len(tos)))
+	content := BuildTplMessage(es.contentTpl, ctx.Event)
+	es.WriteEmail(subject, content, tos)
 }

 func extract(users []*models.User) []string {
@@ -57,7 +47,7 @@ func extract(users []*models.User) []string {
 	return tos
 }

-func SendEmail(subject, content string, tos []string, stmp aconf.SMTPConfig) error {
+func (es *EmailSender) SendEmail(subject, content string, tos []string, stmp aconf.SMTPConfig) {
 	conf := stmp

 	d := gomail.NewDialer(conf.Host, conf.Port, conf.User, conf.Pass)
@@ -74,12 +64,11 @@ func SendEmail(subject, content string, tos []string, stmp aconf.SMTPConfig) err

 	err := d.DialAndSend(m)
 	if err != nil {
-		return errors.New("email_sender: failed to send: " + err.Error())
+		logger.Errorf("email_sender: failed to send: %v", err)
 	}
-	return nil
 }

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

 	m.SetHeader("From", es.smtp.From)
@@ -87,65 +76,39 @@ func (es *EmailSender) WriteEmail(subject, content string, tos []string, events
 	m.SetHeader("Subject", subject)
 	m.SetBody("text/html", content)

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

 func dialSmtp(d *gomail.Dialer) gomail.SendCloser {
 	for {
-		select {
-		case <-mailQuit:
-			// Note that Sendcloser is not obtained below,
-			// and the outgoing signal (with configuration changes) exits the current dial
-			return nil
-		default:
-			if s, err := d.Dial(); err != nil {
-				logger.Errorf("email_sender: failed to dial smtp: %s", err)
-			} else {
-				return s
-			}
+		if s, err := d.Dial(); err != nil {
+			logger.Errorf("email_sender: failed to dial smtp: %s", err)
 			time.Sleep(time.Second)
+			continue
+		} else {
+			return s
 		}
 	}
 }

 var mailQuit = make(chan struct{})

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

-var smtpConfig aconf.SMTPConfig
+func StartEmailSender(smtp aconf.SMTPConfig) {
+	mailch = make(chan *gomail.Message, 100000)

-func InitEmailSender(ctx *ctx.Context, ncc *memsto.NotifyConfigCacheType) {
-	mailch = make(chan *EmailContext, 100000)
-	go updateSmtp(ctx, ncc)
-	smtpConfig = ncc.GetSMTP()
-	go startEmailSender(ctx, smtpConfig)
-}
-
-func updateSmtp(ctx *ctx.Context, ncc *memsto.NotifyConfigCacheType) {
-	for {
-		time.Sleep(1 * time.Minute)
-		smtp := ncc.GetSMTP()
-		if smtpConfig.Host != smtp.Host || smtpConfig.Batch != smtp.Batch || smtpConfig.From != smtp.From ||
-			smtpConfig.Pass != smtp.Pass || smtpConfig.User != smtp.User || smtpConfig.Port != smtp.Port ||
-			smtpConfig.InsecureSkipVerify != smtp.InsecureSkipVerify { //diff
-			smtpConfig = smtp
-			RestartEmailSender(ctx, smtp)
-		}
-	}
-}
-
-func startEmailSender(ctx *ctx.Context, smtp aconf.SMTPConfig) {
 	conf := smtp
+
 	if conf.Host == "" || conf.Port == 0 {
 		logger.Warning("SMTP configurations invalid")
-		<-mailQuit
 		return
 	}
-	logger.Infof("start email sender... conf.Host:%+v,conf.Port:%+v", conf.Host, conf.Port)
+	logger.Infof("start email sender... %+v", conf)

 	d := gomail.NewDialer(conf.Host, conf.Port, conf.User, conf.Pass)
 	if conf.InsecureSkipVerify {
@@ -166,16 +129,9 @@ func startEmailSender(ctx *ctx.Context, smtp aconf.SMTPConfig) {

 			if !open {
 				s = dialSmtp(d)
-				if s == nil {
-					// Indicates that the dialing failed and exited the current goroutine directly,
-					// but put the Message back in the mailch
-					mailch <- m
-					return
-				}
 				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
@@ -184,28 +140,13 @@ func startEmailSender(ctx *ctx.Context, smtp aconf.SMTPConfig) {
 				}

 				s = dialSmtp(d)
-				if s == nil {
-					// Indicates that the dialing failed and exited the current goroutine directly,
-					// but put the Message back in the mailch
-					mailch <- m
-					return
-				}
 				open = true

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

 			size++
--- a/alert/sender/feishu.go
+++ b/alert/sender/feishu.go
@@ -1,11 +1,14 @@
 package sender

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

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

 type feishuContent struct {
@@ -23,47 +26,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)
-}
-
 func (fs *FeishuSender) Send(ctx MessageContext) {
-	if len(ctx.Users) == 0 || len(ctx.Events) == 0 {
+	if len(ctx.Users) == 0 || ctx.Rule == nil || ctx.Event == nil {
 		return
 	}
-	urls, ats, tokens := fs.extract(ctx.Users)
-	message := BuildTplMessage(models.Feishu, fs.tpl, ctx.Events)
-	for i, url := range urls {
+	urls, ats := fs.extract(ctx.Users)
+	message := BuildTplMessage(fs.tpl, ctx.Event)
+	for _, url := range urls {
 		body := feishu{
 			Msgtype: "text",
 			Content: feishuContent{
@@ -76,14 +49,13 @@ func (fs *FeishuSender) Send(ctx MessageContext) {
 				IsAtAll:   false,
 			}
 		}
-		doSendAndRecord(ctx.Ctx, url, tokens[i], body, models.Feishu, ctx.Stats, ctx.Events)
+		fs.doSend(url, body)
 	}
 }

-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 != "" {
@@ -91,12 +63,20 @@ func (fs *FeishuSender) extract(users []*models.User) ([]string, []string, []str
 		}
 		if token, has := user.ExtractToken(models.Feishu); has {
 			url := token
-			if !strings.HasPrefix(token, "https://") && !strings.HasPrefix(token, "http://") {
+			if !strings.HasPrefix(token, "https://") {
 				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
+}
+
+func (fs *FeishuSender) doSend(url string, body feishu) {
+	res, code, err := poster.PostJSON(url, time.Second*5, body, 3)
+	if err != nil {
+		logger.Errorf("feishu_sender: result=fail url=%s code=%d error=%v response=%s", url, code, err, string(res))
+	} else {
+		logger.Infof("feishu_sender: result=succ url=%s code=%d response=%s", url, code, string(res))
+	}
 }
--- a/alert/sender/feishucard.go
+++ b/alert/sender/feishucard.go
@@ -1,180 +0,0 @@
-package sender
-
-import (
-	"fmt"
-	"html/template"
-	"net/url"
-	"strings"
-
-	"github.com/ccfos/nightingale/v6/models"
-)
-
-type Conf struct {
-	WideScreenMode bool `json:"wide_screen_mode"`
-	EnableForward  bool `json:"enable_forward"`
-}
-
-type Te struct {
-	Content string `json:"content"`
-	Tag     string `json:"tag"`
-}
-
-type Element struct {
-	Tag      string    `json:"tag"`
-	Text     Te        `json:"text"`
-	Content  string    `json:"content"`
-	Elements []Element `json:"elements"`
-}
-
-type Titles struct {
-	Content string `json:"content"`
-	Tag     string `json:"tag"`
-}
-
-type Headers struct {
-	Title    Titles `json:"title"`
-	Template string `json:"template"`
-}
-
-type Cards struct {
-	Config   Conf      `json:"config"`
-	Elements []Element `json:"elements"`
-	Header   Headers   `json:"header"`
-}
-
-type feishuCard struct {
-	feishu
-	Card Cards `json:"card"`
-}
-
-type FeishuCardSender struct {
-	tpl *template.Template
-}
-
-const (
-	Recovered = "recovered"
-	Triggered = "triggered"
-)
-
-func createFeishuCardBody() feishuCard {
-	return feishuCard{
-		feishu: feishu{Msgtype: "interactive"},
-		Card: Cards{
-			Config: Conf{
-				WideScreenMode: true,
-				EnableForward:  true,
-			},
-			Header: Headers{
-				Title: Titles{
-					Tag: "plain_text",
-				},
-			},
-			Elements: []Element{
-				{
-					Tag: "div",
-					Text: Te{
-						Tag: "lark_md",
-					},
-				},
-				{
-					Tag: "hr",
-				},
-				{
-					Tag: "note",
-					Elements: []Element{
-						{
-							Tag: "lark_md",
-						},
-					},
-				},
-			},
-		},
-	}
-}
-
-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 := createFeishuCardBody()
-	body.Card.Header.Title.Content = SendTitle
-	body.Card.Header.Template = color
-	body.Card.Elements[0].Text.Content = message
-	body.Card.Elements[2].Elements[0].Content = SendTitle
-
-	// 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)
-}
-
-func (fs *FeishuCardSender) Send(ctx MessageContext) {
-	if len(ctx.Users) == 0 || len(ctx.Events) == 0 {
-		return
-	}
-	urls, tokens := fs.extract(ctx.Users)
-	message := BuildTplMessage(models.FeishuCard, 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 := createFeishuCardBody()
-	body.Card.Header.Title.Content = SendTitle
-	body.Card.Header.Template = color
-	body.Card.Elements[0].Text.Content = message
-	body.Card.Elements[2].Elements[0].Content = SendTitle
-	for i, url := range urls {
-		doSendAndRecord(ctx.Ctx, url, tokens[i], body, models.FeishuCard, ctx.Stats, ctx.Events)
-	}
-}
-
-func (fs *FeishuCardSender) extract(users []*models.User) ([]string, []string) {
-	urls := make([]string, 0, len(users))
-	tokens := make([]string, 0, len(users))
-	for i := range users {
-		if token, has := users[i].ExtractToken(models.FeishuCard); has {
-			url := token
-			if !strings.HasPrefix(token, "https://") && !strings.HasPrefix(token, "http://") {
-				url = "https://open.feishu.cn/open-apis/bot/v2/hook/" + strings.TrimSpace(token)
-			}
-			urls = append(urls, url)
-			tokens = append(tokens, token)
-		}
-	}
-	return urls, tokens
-}
--- a/alert/sender/ibex.go
+++ b/alert/sender/ibex.go
@@ -1,276 +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.SplitN(pair, "=", 2)
-		if len(arr) != 2 {
-			continue
-		}
-
-		tagsMap[arr[0]] = arr[1]
-	}
-	// 附加告警级别  告警触发值标签
-	tagsMap["alert_severity"] = strconv.Itoa(event.Severity)
-	tagsMap["alert_trigger_value"] = event.TriggerValue
-	tagsMap["is_recovered"] = strconv.FormatBool(event.IsRecovered)
-
-	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.MatchGroupId(tpl.GroupId), nil
-}
-
-func TaskAdd(f models.TaskForm, authUser string, isCenter bool) (int64, error) {
-	if storage.Cache == nil {
-		logger.Warning("event_callback_ibex: redis cache is nil")
-		return 0, fmt.Errorf("redis cache is nil")
-	}
-
-	hosts := cleanHosts(f.Hosts)
-	if len(hosts) == 0 {
-		return 0, fmt.Errorf("arg(hosts) empty")
-	}
-
-	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)
-}
-
-func (lk *LarkSender) Send(ctx MessageContext) {
-	if len(ctx.Users) == 0 || len(ctx.Events) == 0 {
-		return
-	}
-	urls, tokens := lk.extract(ctx.Users)
-	message := BuildTplMessage(models.Lark, lk.tpl, ctx.Events)
-	for i, url := range urls {
-		body := feishu{
-			Msgtype: "text",
-			Content: feishuContent{
-				Text: message,
-			},
-		}
-		doSendAndRecord(ctx.Ctx, url, tokens[i], body, models.Lark, ctx.Stats, ctx.Events)
-	}
-}
-
-func (lk *LarkSender) extract(users []*models.User) ([]string, []string) {
-	urls := make([]string, 0, len(users))
-	tokens := make([]string, 0, len(users))
-
-	for _, user := range users {
-		if token, has := user.ExtractToken(models.Lark); has {
-			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)
-			tokens = append(tokens, token)
-		}
-	}
-	return urls, tokens
-}
--- a/alert/sender/larkcard.go
+++ b/alert/sender/larkcard.go
@@ -1,101 +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 := createFeishuCardBody()
-	body.Card.Header.Title.Content = SendTitle
-	body.Card.Header.Template = color
-	body.Card.Elements[0].Text.Content = message
-	body.Card.Elements[2].Elements[0].Content = SendTitle
-
-	// 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)
-}
-
-func (fs *LarkCardSender) Send(ctx MessageContext) {
-	if len(ctx.Users) == 0 || len(ctx.Events) == 0 {
-		return
-	}
-	urls, tokens := 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 := createFeishuCardBody()
-	body.Card.Header.Title.Content = SendTitle
-	body.Card.Header.Template = color
-	body.Card.Elements[0].Text.Content = message
-	body.Card.Elements[2].Elements[0].Content = SendTitle
-	for i, url := range urls {
-		doSendAndRecord(ctx.Ctx, url, tokens[i], body, models.LarkCard, ctx.Stats, ctx.Events)
-	}
-}
-
-func (fs *LarkCardSender) extract(users []*models.User) ([]string, []string) {
-	urls := make([]string, 0, len(users))
-	tokens := 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)
-			tokens = append(tokens, token)
-		}
-	}
-	return urls, tokens
-}
--- a/alert/sender/mm.go
+++ b/alert/sender/mm.go
@@ -4,10 +4,10 @@ import (
 	"html/template"
 	"net/url"
 	"strings"
+	"time"

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

 	"github.com/toolkits/pkg/logger"
 )
@@ -15,7 +15,6 @@ import (
 type MatterMostMessage struct {
 	Text   string
 	Tokens []string
-	Stats  *astats.Stats
 }

 type mm struct {
@@ -29,7 +28,7 @@ type MmSender struct {
 }

 func (ms *MmSender) Send(ctx MessageContext) {
-	if len(ctx.Users) == 0 || len(ctx.Events) == 0 {
+	if len(ctx.Users) == 0 || ctx.Rule == nil || ctx.Event == nil {
 		return
 	}

@@ -37,26 +36,12 @@ func (ms *MmSender) Send(ctx MessageContext) {
 	if len(urls) == 0 {
 		return
 	}
-	message := BuildTplMessage(models.Mm, ms.tpl, ctx.Events)
+	message := BuildTplMessage(ms.tpl, ctx.Event)

-	SendMM(ctx.Ctx, MatterMostMessage{
+	SendMM(MatterMostMessage{
 		Text:   message,
 		Tokens: urls,
-		Stats:  ctx.Stats,
-	}, ctx.Events, models.Mm)
-}
-
-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, "callback")
+	})
 }

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

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

@@ -103,7 +87,13 @@ func SendMM(ctx *ctx.Context, message MatterMostMessage, events []*models.AlertC
 				Username: username,
 				Text:     txt + message.Text,
 			}
-			doSendAndRecord(ctx, ur, message.Tokens[i], body, channel, message.Stats, events)
+
+			res, code, err := poster.PostJSON(ur, time.Second*5, body, 3)
+			if err != nil {
+				logger.Errorf("mm_sender: result=fail url=%s code=%d error=%v response=%s", ur, code, err, string(res))
+			} else {
+				logger.Infof("mm_sender: result=succ url=%s code=%d response=%s", ur, code, string(res))
+			}
 		}
 	}
 }
--- a/alert/sender/plugin.go
+++ b/alert/sender/plugin.go
@@ -2,38 +2,31 @@ 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) {
 	if len(noticeBytes) == 0 {
 		return
 	}
-	alertingCallScript(ctx, noticeBytes, notifyScript, stats, event)
+	alertingCallScript(noticeBytes, notifyScript)
 }

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

-	channel := "script"
-	stats.AlertNotifyTotal.WithLabelValues(channel).Inc()
 	fpath := ".notify_scriptt"
 	if config.Type == 1 {
 		fpath = config.Content
@@ -42,8 +35,7 @@ func alertingCallScript(ctx *ctx.Context, stdinBytes []byte, notifyScript models
 		if file.IsExist(fpath) {
 			oldContent, err := file.ToString(fpath)
 			if err != nil {
-				logger.Errorf("event_script_notify_fail: read script file err: %v", err)
-				stats.AlertNotifyErrorTotal.WithLabelValues(channel).Inc()
+				logger.Errorf("event_notify: read script file err: %v", err)
 				return
 			}

@@ -55,15 +47,13 @@ func alertingCallScript(ctx *ctx.Context, stdinBytes []byte, notifyScript models
 		if rewrite {
 			_, err := file.WriteString(fpath, config.Content)
 			if err != nil {
-				logger.Errorf("event_script_notify_fail: write script file err: %v", err)
-				stats.AlertNotifyErrorTotal.WithLabelValues(channel).Inc()
+				logger.Errorf("event_notify: write script file err: %v", err)
 				return
 			}

 			err = os.Chmod(fpath, 0777)
 			if err != nil {
-				logger.Errorf("event_script_notify_fail: chmod script file err: %v", err)
-				stats.AlertNotifyErrorTotal.WithLabelValues(channel).Inc()
+				logger.Errorf("event_notify: chmod script file err: %v", err)
 				return
 			}
 		}
@@ -80,38 +70,28 @@ func alertingCallScript(ctx *ctx.Context, stdinBytes []byte, notifyScript models

 	err := startCmd(cmd)
 	if err != nil {
-		logger.Errorf("event_script_notify_fail: run cmd err: %v", err)
+		logger.Errorf("event_notify: run cmd err: %v", err)
 		return
 	}

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

 	if isTimeout {
 		if err == nil {
-			logger.Errorf("event_script_notify_fail: timeout and killed process %s", fpath)
+			logger.Errorf("event_notify: timeout and killed process %s", fpath)
 		}

 		if err != nil {
-			logger.Errorf("event_script_notify_fail: kill process %s occur error %v", fpath, err)
-			stats.AlertNotifyErrorTotal.WithLabelValues(channel).Inc()
+			logger.Errorf("event_notify: kill process %s occur error %v", fpath, err)
 		}
+
 		return
 	}

 	if err != nil {
-		logger.Errorf("event_script_notify_fail: exec script %s occur error: %v, output: %s", fpath, err, buf.String())
-		stats.AlertNotifyErrorTotal.WithLabelValues(channel).Inc()
+		logger.Errorf("event_notify: exec script %s occur error: %v, output: %s", fpath, err, buf.String())
 		return
 	}

-	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)
-	}
+	logger.Infof("event_notify: exec %s output: %s", fpath, buf.String())
 }
--- a/alert/sender/sender.go
+++ b/alert/sender/sender.go
@@ -5,10 +5,8 @@ import (
 	"html/template"

 	"github.com/ccfos/nightingale/v6/alert/aconf"
-	"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 (
@@ -19,15 +17,13 @@ type (

 	// MessageContext 一个event所生成的告警通知的上下文
 	MessageContext struct {
-		Users  []*models.User
-		Rule   *models.AlertRule
-		Events []*models.AlertCurEvent
-		Stats  *astats.Stats
-		Ctx    *ctx.Context
+		Users []*models.User
+		Rule  *models.AlertRule
+		Event *models.AlertCurEvent
 	}
 )

-func NewSender(key string, tpls map[string]*template.Template, smtp ...aconf.SMTPConfig) Sender {
+func NewSender(key string, tpls map[string]*template.Template, smtp aconf.SMTPConfig) Sender {
 	switch key {
 	case models.Dingtalk:
 		return &DingtalkSender{tpl: tpls[models.Dingtalk]}
@@ -35,51 +31,32 @@ func NewSender(key string, tpls map[string]*template.Template, smtp ...aconf.SMT
 		return &WecomSender{tpl: tpls[models.Wecom]}
 	case models.Feishu:
 		return &FeishuSender{tpl: tpls[models.Feishu]}
-	case models.FeishuCard:
-		return &FeishuCardSender{tpl: tpls[models.FeishuCard]}
 	case models.Email:
-		return &EmailSender{subjectTpl: tpls[models.EmailSubject], contentTpl: tpls[models.Email], smtp: smtp[0]}
+		return &EmailSender{subjectTpl: tpls["mailsubject"], contentTpl: tpls[models.Email], smtp: smtp}
 	case models.Mm:
 		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, event *models.AlertCurEvent, uids []int64, userCache *memsto.UserCacheType) MessageContext {
 	users := userCache.GetByUserIds(uids)
 	return MessageContext{
-		Rule:   rule,
-		Events: events,
-		Users:  users,
-		Stats:  stats,
-		Ctx:    ctx,
+		Rule:  rule,
+		Event: event,
+		Users: users,
 	}
 }

-type BuildTplMessageFunc func(channel string, tpl *template.Template, events []*models.AlertCurEvent) string
-
-var BuildTplMessage BuildTplMessageFunc = buildTplMessage
-
-func buildTplMessage(channel string, tpl *template.Template, events []*models.AlertCurEvent) string {
+func BuildTplMessage(tpl *template.Template, event *models.AlertCurEvent) string {
 	if tpl == nil {
 		return "tpl for current sender not found, please check configuration"
 	}
-
-	var content string
-	for _, event := range events {
-		var body bytes.Buffer
-		if err := tpl.Execute(&body, event); err != nil {
-			return err.Error()
-		}
-		content += body.String() + "\n\n"
+	var body bytes.Buffer
+	if err := tpl.Execute(&body, event); err != nil {
+		return err.Error()
 	}
-
-	return content
+	return body.String()
 }
--- a/alert/sender/telegram.go
+++ b/alert/sender/telegram.go
@@ -1,13 +1,12 @@
 package sender

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

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

 	"github.com/toolkits/pkg/logger"
 )
@@ -15,7 +14,6 @@ import (
 type TelegramMessage struct {
 	Text   string
 	Tokens []string
-	Stats  *astats.Stats
 }

 type telegram struct {
@@ -23,39 +21,21 @@ 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, "callback")
-}
-
 func (ts *TelegramSender) Send(ctx MessageContext) {
-	if len(ctx.Users) == 0 || len(ctx.Events) == 0 {
+	if len(ctx.Users) == 0 || ctx.Rule == nil || ctx.Event == nil {
 		return
 	}
 	tokens := ts.extract(ctx.Users)
-	message := BuildTplMessage(models.Telegram, ts.tpl, ctx.Events)
+	message := BuildTplMessage(ts.tpl, ctx.Event)

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

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

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

-		doSendAndRecord(ctx, url, message.Tokens[i], body, channel, message.Stats, events)
+		res, code, err := poster.PostJSON(url, time.Second*5, body, 3)
+		if err != nil {
+			logger.Errorf("telegram_sender: result=fail url=%s code=%d error=%v response=%s", url, code, err, string(res))
+		} else {
+			logger.Infof("telegram_sender: result=succ url=%s code=%d response=%s", url, code, string(res))
+		}
 	}
 }
--- a/alert/sender/webhook.go
+++ b/alert/sender/webhook.go
@@ -2,181 +2,67 @@ package sender

 import (
 	"bytes"
-	"crypto/tls"
 	"encoding/json"
-	"fmt"
-	"io"
+	"io/ioutil"
 	"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
-	}
-
-	if conf.Client == nil {
-		logger.Warningf("event_%s, event:%s, url: [%s], error: [%s]", channel, string(bs), conf.Url, "client is nil")
-		conf.Client = &http.Client{
-			Timeout: time.Duration(conf.Timeout) * time.Second,
-			Transport: &http.Transport{
-				TLSClientConfig: &tls.Config{InsecureSkipVerify: insecureSkipVerify},
-			},
-		}
-	}
-
-	stats.AlertNotifyTotal.WithLabelValues(channel).Inc()
-	var resp *http.Response
-	var body []byte
-	resp, err = conf.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 map[string]*models.Webhook, event *models.AlertCurEvent, stats *astats.Stats) {
+func SendWebhooks(webhooks []*models.Webhook, event *models.AlertCurEvent) {
 	for _, conf := range webhooks {
-		retryCount := 0
-		for retryCount < 3 {
-			needRetry, res, err := sendWebhook(conf, event, stats)
-			NotifyRecord(ctx, []*models.AlertCurEvent{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 map[string]*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 {
-	eventQueue *SafeEventQueue
-	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{
-			eventQueue: NewSafeEventQueue(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.eventQueue.Push(event)
-	if !succ {
-		stats.AlertNotifyErrorTotal.WithLabelValues("push_event_queue").Inc()
-		logger.Warningf("Write channel(%s) full, current channel size: %d event:%v", webhook.Url, queue.eventQueue.Len(), event)
-	}
-}
+		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.eventQueue.PopN(popSize)
-			if len(events) == 0 {
-				time.Sleep(time.Millisecond * 400)
-				continue
-			}
-
-			retryCount := 0
-			for retryCount < webhook.RetryCount {
-				needRetry, res, err := sendWebhook(webhook, events, stats)
-				go NotifyRecord(ctx, events, "webhook", webhook.Url, res, err)
-				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" {
+					req.Host = conf.Headers[i+1]
+					continue
 				}
-				retryCount++
-				time.Sleep(time.Second * time.Duration(webhook.RetryInterval) * time.Duration(retryCount))
+				req.Header.Set(conf.Headers[i], conf.Headers[i+1])
 			}
 		}
+
+		// todo add skip verify
+		client := http.Client{
+			Timeout: time.Duration(conf.Timeout) * time.Second,
+		}
+
+		var resp *http.Response
+		resp, err = client.Do(req)
+		if err != nil {
+			logger.Warningf("WebhookCallError, 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, _ = ioutil.ReadAll(resp.Body)
+		}
+
+		logger.Debugf("alertingWebhook done, url: %s, response code: %d, body: %s", conf.Url, resp.StatusCode, string(body))
 	}
 }
--- a/alert/sender/webhook_event_queue.go
+++ b/alert/sender/webhook_event_queue.go
@@ -1,109 +0,0 @@
-package sender
-
-import (
-	"container/list"
-	"sync"
-
-	"github.com/ccfos/nightingale/v6/models"
-)
-
-type SafeEventQueue struct {
-	lock        sync.RWMutex
-	maxSize     int
-	queueHigh   *list.List
-	queueMiddle *list.List
-	queueLow    *list.List
-}
-
-const (
-	High   = 1
-	Middle = 2
-	Low    = 3
-)
-
-func NewSafeEventQueue(maxSize int) *SafeEventQueue {
-	return &SafeEventQueue{
-		maxSize:     maxSize,
-		lock:        sync.RWMutex{},
-		queueHigh:   list.New(),
-		queueMiddle: list.New(),
-		queueLow:    list.New(),
-	}
-}
-
-func (spq *SafeEventQueue) Len() int {
-	spq.lock.RLock()
-	defer spq.lock.RUnlock()
-	return spq.queueHigh.Len() + spq.queueMiddle.Len() + spq.queueLow.Len()
-}
-
-// len 无锁读取长度，不要在本文件外调用
-func (spq *SafeEventQueue) len() int {
-	return spq.queueHigh.Len() + spq.queueMiddle.Len() + spq.queueLow.Len()
-}
-
-func (spq *SafeEventQueue) Push(event *models.AlertCurEvent) bool {
-	spq.lock.Lock()
-	defer spq.lock.Unlock()
-
-	for spq.len() > spq.maxSize {
-		return false
-	}
-
-	switch event.Severity {
-	case High:
-		spq.queueHigh.PushBack(event)
-	case Middle:
-		spq.queueMiddle.PushBack(event)
-	case Low:
-		spq.queueLow.PushBack(event)
-	default:
-		return false
-	}
-
-	return true
-}
-
-// pop 无锁弹出事件，不要在本文件外调用
-func (spq *SafeEventQueue) pop() *models.AlertCurEvent {
-	if spq.len() == 0 {
-		return nil
-	}
-
-	var elem interface{}
-
-	if spq.queueHigh.Len() > 0 {
-		elem = spq.queueHigh.Remove(spq.queueHigh.Front())
-	} else if spq.queueMiddle.Len() > 0 {
-		elem = spq.queueMiddle.Remove(spq.queueMiddle.Front())
-	} else {
-		elem = spq.queueLow.Remove(spq.queueLow.Front())
-	}
-	event, ok := elem.(*models.AlertCurEvent)
-	if !ok {
-		return nil
-	}
-	return event
-}
-
-func (spq *SafeEventQueue) Pop() *models.AlertCurEvent {
-	spq.lock.Lock()
-	defer spq.lock.Unlock()
-	return spq.pop()
-}
-
-func (spq *SafeEventQueue) PopN(n int) []*models.AlertCurEvent {
-	spq.lock.Lock()
-	defer spq.lock.Unlock()
-
-	events := make([]*models.AlertCurEvent, 0, n)
-	count := 0
-	for count < n && spq.len() > 0 {
-		event := spq.pop()
-		if event != nil {
-			events = append(events, event)
-		}
-		count++
-	}
-	return events
-}
--- a/alert/sender/webhook_event_queue_test.go
+++ b/alert/sender/webhook_event_queue_test.go
@@ -1,157 +0,0 @@
-package sender
-
-import (
-	"sync"
-	"testing"
-	"time"
-
-	"github.com/ccfos/nightingale/v6/models"
-	"github.com/stretchr/testify/assert"
-)
-
-func TestSafePriorityQueue_ConcurrentPushPop(t *testing.T) {
-	spq := NewSafeEventQueue(100000)
-
-	var wg sync.WaitGroup
-	numGoroutines := 100
-	numEvents := 1000
-
-	// 并发 Push
-	wg.Add(numGoroutines)
-	for i := 0; i < numGoroutines; i++ {
-		go func(goroutineID int) {
-			defer wg.Done()
-			for j := 0; j < numEvents; j++ {
-				event := &models.AlertCurEvent{
-					Severity:    goroutineID%3 + 1,
-					TriggerTime: time.Now().UnixNano(),
-				}
-				spq.Push(event)
-			}
-		}(i)
-	}
-	wg.Wait()
-
-	// 检查队列长度是否正确
-	expectedLen := numGoroutines * numEvents
-	assert.Equal(t, expectedLen, spq.Len(), "Queue length mismatch after concurrent pushes")
-
-	// 并发 Pop
-	wg.Add(numGoroutines)
-	for i := 0; i < numGoroutines; i++ {
-		go func() {
-			defer wg.Done()
-			for {
-				event := spq.Pop()
-				if event == nil {
-					return
-				}
-			}
-		}()
-	}
-	wg.Wait()
-
-	// 最终队列应该为空
-	assert.Equal(t, 0, spq.Len(), "Queue should be empty after concurrent pops")
-}
-
-func TestSafePriorityQueue_ConcurrentPopMax(t *testing.T) {
-	spq := NewSafeEventQueue(100000)
-
-	// 添加初始数据
-	for i := 0; i < 1000; i++ {
-		spq.Push(&models.AlertCurEvent{
-			Severity:    i%3 + 1,
-			TriggerTime: time.Now().UnixNano(),
-		})
-	}
-
-	var wg sync.WaitGroup
-	numGoroutines := 10
-	popMax := 100
-
-	// 并发 PopN
-	wg.Add(numGoroutines)
-	for i := 0; i < numGoroutines; i++ {
-		go func() {
-			defer wg.Done()
-			events := spq.PopN(popMax)
-			assert.LessOrEqual(t, len(events), popMax, "PopN exceeded maximum")
-		}()
-	}
-	wg.Wait()
-
-	// 检查队列长度是否正确
-	expectedRemaining := 1000 - (numGoroutines * popMax)
-	if expectedRemaining < 0 {
-		expectedRemaining = 0
-	}
-	assert.Equal(t, expectedRemaining, spq.Len(), "Queue length mismatch after concurrent PopN")
-}
-
-func TestSafePriorityQueue_ConcurrentPushPopWithDifferentSeverities(t *testing.T) {
-	spq := NewSafeEventQueue(100000)
-
-	var wg sync.WaitGroup
-	numGoroutines := 50
-	numEvents := 500
-
-	// 并发 Push 不同优先级的事件
-	wg.Add(numGoroutines)
-	for i := 0; i < numGoroutines; i++ {
-		go func(goroutineID int) {
-			defer wg.Done()
-			for j := 0; j < numEvents; j++ {
-				event := &models.AlertCurEvent{
-					Severity:    goroutineID%3 + 1, // 模拟不同的 Severity
-					TriggerTime: time.Now().UnixNano(),
-				}
-				spq.Push(event)
-			}
-		}(i)
-	}
-	wg.Wait()
-
-	// 检查队列长度是否正确
-	expectedLen := numGoroutines * numEvents
-	assert.Equal(t, expectedLen, spq.Len(), "Queue length mismatch after concurrent pushes")
-
-	// 检查事件的顺序是否按照优先级排列
-	var lastEvent *models.AlertCurEvent
-	for spq.Len() > 0 {
-		event := spq.Pop()
-		if lastEvent != nil {
-			assert.LessOrEqual(t, lastEvent.Severity, event.Severity, "Events are not in correct priority order")
-		}
-		lastEvent = event
-	}
-}
-
-func TestSafePriorityQueue_ExceedMaxSize(t *testing.T) {
-	spq := NewSafeEventQueue(5)
-
-	// 插入超过最大容量的事件
-	for i := 0; i < 10; i++ {
-		spq.Push(&models.AlertCurEvent{
-			Severity:    i % 3,
-			TriggerTime: int64(i),
-		})
-	}
-
-	// 验证队列的长度是否不超过 maxSize
-	assert.LessOrEqual(t, spq.Len(), spq.maxSize)
-
-	// 验证队列中剩余事件的内容
-	expectedEvents := 5
-	if spq.Len() < 5 {
-		expectedEvents = spq.Len()
-	}
-
-	// 检查最后存入的事件是否是按优先级排序
-	for i := 0; i < expectedEvents; i++ {
-		event := spq.Pop()
-		if event != nil {
-			assert.LessOrEqual(t, event.Severity, 2)
-		}
-	}
-}
--- a/alert/sender/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
@@ -3,8 +3,12 @@ package sender
 import (
 	"html/template"
 	"strings"
+	"time"

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

 type wecomMarkdown struct {
@@ -16,59 +20,46 @@ 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)
-}
-
 func (ws *WecomSender) Send(ctx MessageContext) {
-	if len(ctx.Users) == 0 || len(ctx.Events) == 0 {
+	if len(ctx.Users) == 0 || ctx.Rule == nil || ctx.Event == nil {
 		return
 	}
-	urls, tokens := ws.extract(ctx.Users)
-	message := BuildTplMessage(models.Wecom, ws.tpl, ctx.Events)
-	for i, url := range urls {
+	urls := ws.extract(ctx.Users)
+	message := BuildTplMessage(ws.tpl, ctx.Event)
+	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)
+		ws.doSend(url, body)
 	}
 }

-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
-			if !strings.HasPrefix(token, "https://") && !strings.HasPrefix(token, "http://") {
+			if !strings.HasPrefix(token, "https://") {
 				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
+}
+
+func (ws *WecomSender) doSend(url string, body wecom) {
+	res, code, err := poster.PostJSON(url, time.Second*5, body, 3)
+	if err != nil {
+		logger.Errorf("wecom_sender: result=fail url=%s code=%d error=%v response=%s", url, code, err, string(res))
+	} else {
+		logger.Infof("wecom_sender: result=succ url=%s code=%d response=%s", url, code, string(res))
+	}
 }
--- a/center/cconf/conf.go
+++ b/center/cconf/conf.go
@@ -1,20 +1,19 @@
 package cconf

-import "time"
+import (
+	"github.com/gin-gonic/gin"
+)

 type Center struct {
 	Plugins                []Plugin
+	BasicAuth              gin.Accounts
 	MetricsYamlFile        string
 	OpsYamlFile            string
 	BuiltinIntegrationsDir string
 	I18NHeaderKey          string
 	MetricDesc             MetricDescType
+	TargetMetrics          map[string]string
 	AnonymousAccess        AnonymousAccess
-	UseFileAssets          bool
-	FlashDuty              FlashDuty
-	EventHistoryGroupView  bool
-	CleanNotifyRecordDay   int
-	MigrateBusiGroupLabel  bool
 }

 type Plugin struct {
@@ -24,12 +23,6 @@ type Plugin struct {
 	TypeName string `json:"plugin_type_name"`
 }

-type FlashDuty struct {
-	Api     string
-	Headers map[string]string
-	Timeout time.Duration
-}
-
 type AnonymousAccess struct {
 	PromQuerier bool
 	AlertDetail bool
--- a/center/cconf/metric.go
+++ b/center/cconf/metric.go
@@ -4,6 +4,7 @@ import (
 	"path"

 	"github.com/toolkits/pkg/file"
+	"github.com/toolkits/pkg/runner"
 )

 // metricDesc , As load map happens before read map, there is no necessary to use concurrent map for metric desc store
@@ -18,32 +19,24 @@ 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 {
+
+func LoadMetricsYaml(metricsYamlFile string) error {
 	fp := metricsYamlFile
 	if fp == "" {
-		fp = path.Join(configDir, "metrics.yaml")
+		fp = path.Join(runner.Cwd, "etc", "metrics.yaml")
 	}
 	if !file.IsExist(fp) {
 		return nil
--- a/center/cconf/ops.go
+++ b/center/cconf/ops.go
@@ -1,11 +1,10 @@
 package cconf

 import (
-	"fmt"
 	"path"

 	"github.com/toolkits/pkg/file"
-	"gopkg.in/yaml.v2"
+	"github.com/toolkits/pkg/runner"
 )

 var Operations = Operation{}
@@ -20,22 +19,14 @@ type Ops struct {
 	Ops   []string `yaml:"ops" json:"ops"`
 }

-func LoadOpsYaml(configDir string, opsYamlFile string) error {
+func LoadOpsYaml(opsYamlFile string) error {
 	fp := opsYamlFile
 	if fp == "" {
-		fp = path.Join(configDir, "ops.yaml")
+		fp = path.Join(runner.Cwd, "etc", "ops.yaml")
 	}
 	if !file.IsExist(fp) {
 		return nil
 	}
-
-	hash, _ := file.MD5(fp)
-	if hash == "2f91a9ed265cf2024e266dc1d538ee77" {
-		// ops.yaml 是老的默认文件，删除
-		file.Remove(fp)
-		return nil
-	}
-
 	return file.ReadYaml(fp, &Operations)
 }

@@ -46,161 +37,3 @@ func GetAllOps(ops []Ops) []string {
 	}
 	return ret
 }
-
-func MergeOperationConf() error {
-	opsBuiltIn := Operation{}
-	err := yaml.Unmarshal([]byte(builtInOps), &opsBuiltIn)
-	if err != nil {
-		return fmt.Errorf("cannot parse builtInOps: %s", err.Error())
-	}
-	configOpsMap := make(map[string]struct{})
-	for _, op := range Operations.Ops {
-		configOpsMap[op.Name] = struct{}{}
-	}
-	//If the opBu.Name is not a constant in the target (Operations.Ops), add Ops from the built-in options
-	for _, opBu := range opsBuiltIn.Ops {
-		if _, has := configOpsMap[opBu.Name]; !has {
-			Operations.Ops = append(Operations.Ops, opBu)
-		}
-	}
-	return nil
-}
-
-const (
-	builtInOps = `
-ops:
- name: dashboards
-  cname: 仪表盘
-  ops:
-    - "/dashboards"
-    - "/dashboards/add"
-    - "/dashboards/put"
-    - "/dashboards/del"
-    - "/embedded-dashboards/put"
-    - "/embedded-dashboards"
-    - "/public-dashboards"
-
- name: alert
-  cname: 告警规则
-  ops:
-    - "/alert-rules"
-    - "/alert-rules/add"
-    - "/alert-rules/put"
-    - "/alert-rules/del"
-
- name: alert-mutes
-  cname: 告警静默管理
-  ops:
-    - "/alert-mutes"
-    - "/alert-mutes/add"
-    - "/alert-mutes/put"
-    - "/alert-mutes/del"
-  
- name: alert-subscribes
-  cname: 告警订阅管理
-  ops:
-    - "/alert-subscribes"
-    - "/alert-subscribes/add"
-    - "/alert-subscribes/put"
-    - "/alert-subscribes/del"
-
- name: alert-events  
-  cname: 告警事件管理
-  ops:
-    - "/alert-cur-events"
-    - "/alert-cur-events/del"
-    - "/alert-his-events" 
-
- name: recording-rules
-  cname: 记录规则管理
-  ops:
-    - "/recording-rules"
-    - "/recording-rules/add"
-    - "/recording-rules/put"
-    - "/recording-rules/del"
-
- name: metric
-  cname: 时序指标
-  ops:
-  - "/metric/explorer"
-  - "/object/explorer"
-
- name: log
-  cname: 日志分析
-  ops:
-  - "/log/explorer"
-  - "/log/index-patterns"
-
- name: targets
-  cname: 基础设施
-  ops:
-    - "/targets"
-    - "/targets/add"
-    - "/targets/put"
-    - "/targets/del"
-    - "/targets/bind"
-
- name: job
-  cname: 任务管理
-  ops:
-    - "/job-tpls"
-    - "/job-tpls/add"
-    - "/job-tpls/put"
-    - "/job-tpls/del"
-    - "/job-tasks"
-    - "/job-tasks/add"
-    - "/job-tasks/put"
-    - "/ibex-settings"
-
- name: user
-  cname: 用户管理
-  ops:
-  - "/users"
-  - "/user-groups"
-  - "/user-groups/add"
-  - "/user-groups/put"
-  - "/user-groups/del"
-
- name: permissions
-  cname: 权限管理
-  ops:
-  - "/permissions"
-
- name: busi-groups
-  cname: 业务分组管理
-  ops:
-  - "/busi-groups"
-  - "/busi-groups/add"
-  - "/busi-groups/put"
-  - "/busi-groups/del"
-
- name: builtin-metrics
-  cname: 指标视图
-  ops:
-    - "/metrics-built-in"
-    - "/builtin-metrics/add"
-    - "/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:
-  - "/help/variable-configs"
-  - "/help/version"
-  - "/help/servers"
-  - "/help/source"
-  - "/help/sso"
-  - "/help/notification-tpls"
-  - "/help/notification-settings"
-  - "/help/migrate"
-  - "/site-settings"
-`
-)
--- a/center/cconf/plugin.go
+++ b/center/cconf/plugin.go
@@ -15,14 +15,8 @@ var Plugins = []Plugin{
 	},
 	{
 		Id:       3,
-		Category: "loki",
-		Type:     "loki",
-		TypeName: "Loki",
-	},
-	{
-		Id:       4,
-		Category: "timeseries",
-		Type:     "tdengine",
-		TypeName: "TDengine",
+		Category: "logging",
+		Type:     "jaeger",
+		TypeName: "Jaeger",
 	},
 }
--- a/center/cconf/rsa/rsa_conf.go
+++ b/center/cconf/rsa/rsa_conf.go
@@ -1,105 +0,0 @@
-package rsa
-
-import (
-	"os"
-
-	"github.com/ccfos/nightingale/v6/models"
-	"github.com/ccfos/nightingale/v6/pkg/ctx"
-	"github.com/ccfos/nightingale/v6/pkg/httpx"
-	"github.com/ccfos/nightingale/v6/pkg/secu"
-
-	"github.com/pkg/errors"
-	"github.com/toolkits/pkg/file"
-	"github.com/toolkits/pkg/logger"
-)
-
-func InitRSAConfig(ctx *ctx.Context, rsaConfig *httpx.RSAConfig) error {
-
-	// 1.Load RSA keys from Database
-	rsaPassWord, err := models.ConfigsGet(ctx, models.RSA_PASSWORD)
-	if err != nil {
-		return errors.WithMessagef(err, "cannot query config(%s)", models.RSA_PASSWORD)
-	}
-	privateKeyVal, err := models.ConfigsGet(ctx, models.RSA_PRIVATE_KEY)
-	if err != nil {
-		return errors.WithMessagef(err, "cannot query config(%s)", models.RSA_PRIVATE_KEY)
-	}
-	publicKeyVal, err := models.ConfigsGet(ctx, models.RSA_PUBLIC_KEY)
-	if err != nil {
-		return errors.WithMessagef(err, "cannot query config(%s)", models.RSA_PUBLIC_KEY)
-	}
-	if rsaPassWord != "" && privateKeyVal != "" && publicKeyVal != "" {
-		rsaConfig.RSAPassWord = rsaPassWord
-		rsaConfig.RSAPrivateKey = []byte(privateKeyVal)
-		rsaConfig.RSAPublicKey = []byte(publicKeyVal)
-		return nil
-	}
-
-	// 2.Read RSA configuration from file if exists
-	if file.IsExist(rsaConfig.RSAPrivateKeyPath) && file.IsExist(rsaConfig.RSAPublicKeyPath) {
-		//password already read from config
-		rsaConfig.RSAPrivateKey, rsaConfig.RSAPublicKey, err = readConfigFile(rsaConfig)
-		if err != nil {
-			return errors.WithMessage(err, "failed to read rsa config from file")
-		}
-		return nil
-	}
-	// 3.Generate RSA keys if not exist
-	rsaConfig.RSAPassWord, rsaConfig.RSAPrivateKey, rsaConfig.RSAPublicKey, err = initRSAKeyPairs(ctx, rsaConfig.RSAPassWord)
-	if err != nil {
-		return errors.WithMessage(err, "failed to generate rsa key pair")
-	}
-	return nil
-}
-
-func initRSAKeyPairs(ctx *ctx.Context, rsaPassWord string) (password string, privateByte, publicByte []byte, err error) {
-
-	// Generate RSA keys
-
-	// Generate RSA password
-	if rsaPassWord != "" {
-		logger.Debug("Using existing RSA password")
-		password = rsaPassWord
-		err = models.ConfigsSet(ctx, models.RSA_PASSWORD, password)
-		if err != nil {
-			err = errors.WithMessagef(err, "failed to set config(%s)", models.RSA_PASSWORD)
-			return
-		}
-	} else {
-		password, err = models.InitRSAPassWord(ctx)
-		if err != nil {
-			err = errors.WithMessage(err, "failed to generate rsa password")
-			return
-		}
-	}
-	privateByte, publicByte, err = secu.GenerateRsaKeyPair(password)
-	if err != nil {
-		err = errors.WithMessage(err, "failed to generate rsa key pair")
-		return
-	}
-	// Save generated RSA keys
-	err = models.ConfigsSet(ctx, models.RSA_PRIVATE_KEY, string(privateByte))
-	if err != nil {
-		err = errors.WithMessagef(err, "failed to set config(%s)", models.RSA_PRIVATE_KEY)
-		return
-	}
-	err = models.ConfigsSet(ctx, models.RSA_PUBLIC_KEY, string(publicByte))
-	if err != nil {
-		err = errors.WithMessagef(err, "failed to set config(%s)", models.RSA_PUBLIC_KEY)
-		return
-	}
-	return
-}
-
-func readConfigFile(rsaConfig *httpx.RSAConfig) (privateBuf, publicBuf []byte, err error) {
-	publicBuf, err = os.ReadFile(rsaConfig.RSAPublicKeyPath)
-	if err != nil {
-		err = errors.WithMessagef(err, "could not read RSAPublicKeyPath %q", rsaConfig.RSAPublicKeyPath)
-		return
-	}
-	privateBuf, err = os.ReadFile(rsaConfig.RSAPrivateKeyPath)
-	if err != nil {
-		err = errors.WithMessagef(err, "could not read RSAPrivateKeyPath %q", rsaConfig.RSAPrivateKeyPath)
-	}
-	return
-}
--- a/center/cconf/sql_tpl.go
+++ b/center/cconf/sql_tpl.go
@@ -1,15 +0,0 @@
-package cconf
-
-var TDengineSQLTpl = map[string]string{
-	"load5":                "SELECT _wstart as ts, last(load5) FROM $database.system WHERE host = '$server' and _ts >= $from and _ts <= $to interval($interval) fill(null)",
-	"process_total":        "SELECT _wstart as ts, last(total) FROM $database.processes WHERE host = '$server' and _ts >= $from and _ts <= $to interval($interval) fill(null)",
-	"thread_total":         "SELECT _wstart as ts, last(total) FROM $database.threads WHERE host = '$server' and _ts >= $from and _ts <= $to interval($interval) fill(null)",
-	"cpu_idle":             "SELECT _wstart as ts, last(usage_idle) * -1 + 100 FROM $database.cpu WHERE (host = '$server' and cpu = 'cpu-total') and _ts >= $from and _ts <= $to interval($interval) fill(null)",
-	"mem_used_percent":     "SELECT _wstart as ts, last(used_percent) FROM $database.mem WHERE (host = '$server') and _ts >= $from and _ts <= $to interval($interval) fill(null)",
-	"disk_used_percent":    "SELECT _wstart as ts, last(used_percent) FROM $database.disk WHERE (host = '$server' and path = '/') and _ts >= $from and _ts <= $to interval($interval) fill(null)",
-	"cpu_context_switches": "select ts, derivative(context_switches, 1s, 0) as context FROM (SELECT _wstart as ts, avg(context_switches) as context_switches FROM $database.kernel WHERE host = '$server' and _ts >= $from and _ts <= $to interval($interval) )",
-	"tcp":                  "SELECT _wstart as ts, avg(tcp_close) as CLOSED, avg(tcp_close_wait) as CLOSE_WAIT, avg(tcp_closing) as CLOSING, avg(tcp_established) as ESTABLISHED, avg(tcp_fin_wait1) as FIN_WAIT1, avg(tcp_fin_wait2) as FIN_WAIT2, avg(tcp_last_ack) as LAST_ACK, avg(tcp_syn_recv) as SYN_RECV, avg(tcp_syn_sent) as SYN_SENT, avg(tcp_time_wait) as TIME_WAIT FROM $database.netstat WHERE host = '$server' and _ts >= $from and _ts <= $to interval($interval)",
-	"net_bytes_recv":       "SELECT _wstart as ts, derivative(bytes_recv,1s, 1) as bytes_in FROM $database.net WHERE host = '$server' and interface = '$netif' and _ts >= $from and _ts <= $to group by tbname",
-	"net_bytes_sent":       "SELECT _wstart as ts, derivative(bytes_sent,1s, 1) as bytes_out FROM $database.net WHERE host = '$server' and interface = '$netif' and _ts >= $from and _ts <= $to group by tbname",
-	"disk_total":           "SELECT _wstart as ts, avg(total) AS total, avg(used) as used FROM $database.disk WHERE   path = '$mountpoint' and _ts >= $from and _ts <= $to  interval($interval) group by host",
-}
--- a/center/center.go
+++ b/center/center.go
@@ -6,36 +6,25 @@ import (

 	"github.com/ccfos/nightingale/v6/alert"
 	"github.com/ccfos/nightingale/v6/alert/astats"
-	"github.com/ccfos/nightingale/v6/alert/dispatch"
 	"github.com/ccfos/nightingale/v6/alert/process"
-	alertrt "github.com/ccfos/nightingale/v6/alert/router"
 	"github.com/ccfos/nightingale/v6/center/cconf"
-	"github.com/ccfos/nightingale/v6/center/cconf/rsa"
-	"github.com/ccfos/nightingale/v6/center/cstats"
-	"github.com/ccfos/nightingale/v6/center/integration"
 	"github.com/ccfos/nightingale/v6/center/metas"
-	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"
-	"github.com/ccfos/nightingale/v6/models/migrate"
 	"github.com/ccfos/nightingale/v6/pkg/ctx"
-	"github.com/ccfos/nightingale/v6/pkg/flashduty"
 	"github.com/ccfos/nightingale/v6/pkg/httpx"
 	"github.com/ccfos/nightingale/v6/pkg/i18nx"
 	"github.com/ccfos/nightingale/v6/pkg/logx"
-	"github.com/ccfos/nightingale/v6/pkg/version"
 	"github.com/ccfos/nightingale/v6/prom"
 	"github.com/ccfos/nightingale/v6/pushgw/idents"
-	pushgwrt "github.com/ccfos/nightingale/v6/pushgw/router"
 	"github.com/ccfos/nightingale/v6/pushgw/writer"
 	"github.com/ccfos/nightingale/v6/storage"
-	"github.com/ccfos/nightingale/v6/tdengine"

-	"github.com/flashcatcloud/ibex/src/cmd/ibex"
+	alertrt "github.com/ccfos/nightingale/v6/alert/router"
+	centerrt "github.com/ccfos/nightingale/v6/center/router"
+	pushgwrt "github.com/ccfos/nightingale/v6/pushgw/router"
 )

 func Initialize(configDir string, cryptoKey string) (func(), error) {
@@ -44,111 +33,62 @@ func Initialize(configDir string, cryptoKey string) (func(), error) {
 		return nil, fmt.Errorf("failed to init config: %v", err)
 	}

-	cconf.LoadMetricsYaml(configDir, config.Center.MetricsYamlFile)
-	cconf.LoadOpsYaml(configDir, config.Center.OpsYamlFile)
-
-	cconf.MergeOperationConf()
-
-	if config.Alert.Heartbeat.EngineName == "" {
-		config.Alert.Heartbeat.EngineName = "default"
-	}
+	cconf.LoadMetricsYaml(config.Center.MetricsYamlFile)
+	cconf.LoadOpsYaml(config.Center.OpsYamlFile)

 	logxClean, err := logx.Init(config.Log)
 	if err != nil {
 		return nil, err
 	}

-	i18nx.Init(configDir)
-	cstats.Init()
-	flashduty.Init(config.Center.FlashDuty)
+	i18nx.Init()

 	db, err := storage.New(config.DB)
 	if err != nil {
 		return nil, err
 	}
-	ctx := ctx.NewContext(context.Background(), db, true)
-	migrate.Migrate(db)
-	isRootInit := models.InitRoot(ctx)
+	ctx := ctx.NewContext(context.Background(), db)
+	models.InitRoot(ctx)

-	config.HTTP.JWTAuth.SigningKey = models.InitJWTSigningKey(ctx)
-
-	err = rsa.InitRSAConfig(ctx, &config.HTTP.RSA)
-	if err != nil {
-		return nil, err
-	}
-
-	go integration.Init(ctx, config.Center.BuiltinIntegrationsDir)
-	var redis storage.Redis
-	redis, err = storage.NewRedis(config.Redis)
+	redis, err := storage.NewRedis(config.Redis)
 	if err != nil {
 		return nil, err
 	}

 	metas := metas.New(redis)
-	idents := idents.New(ctx, redis)
+	idents := idents.New(db)

 	syncStats := memsto.NewSyncStats()
 	alertStats := astats.NewSyncStats()

-	configCache := memsto.NewConfigCache(ctx, syncStats, config.HTTP.RSA.RSAPrivateKey, config.HTTP.RSA.RSAPassWord)
+	sso := sso.Init(config.Center, ctx)
+
 	busiGroupCache := memsto.NewBusiGroupCache(ctx, syncStats)
 	targetCache := memsto.NewTargetCache(ctx, syncStats, redis)
 	dsCache := memsto.NewDatasourceCache(ctx, syncStats)
 	alertMuteCache := memsto.NewAlertMuteCache(ctx, syncStats)
 	alertRuleCache := memsto.NewAlertRuleCache(ctx, syncStats)
-	notifyConfigCache := memsto.NewNotifyConfigCache(ctx, configCache)
-	userCache := memsto.NewUserCache(ctx, syncStats)
-	userGroupCache := memsto.NewUserGroupCache(ctx, syncStats)
-	taskTplCache := memsto.NewTaskTplCache(ctx)
-	configCvalCache := memsto.NewCvalCache(ctx, syncStats)
+	notifyConfigCache := memsto.NewNotifyConfigCache(ctx)

-	sso := sso.Init(config.Center, ctx, configCache)
-	promClients := prom.NewPromClient(ctx)
-
-	dispatch.InitRegisterQueryFunc(promClients)
-
-	tdengineClients := tdengine.NewTdengineClient(ctx, config.Alert.Heartbeat)
+	promClients := prom.NewPromClient(ctx, config.Alert.Heartbeat)

 	externalProcessors := process.NewExternalProcessors()
-	alert.Start(config.Alert, config.Pushgw, syncStats, alertStats, externalProcessors, targetCache, busiGroupCache, alertMuteCache, alertRuleCache, notifyConfigCache, taskTplCache, dsCache, ctx, promClients, tdengineClients, userCache, userGroupCache)
+	alert.Start(config.Alert, config.Pushgw, syncStats, alertStats, externalProcessors, targetCache, busiGroupCache, alertMuteCache, alertRuleCache, notifyConfigCache, dsCache, ctx, promClients, true)

 	writers := writer.NewWriters(config.Pushgw)

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

-	go func() {
-		if config.Center.MigrateBusiGroupLabel || models.CanMigrateBg(ctx) {
-			models.MigrateBg(ctx, pushgwRouter.Pushgw.BusiGroupLabelKey)
-		}
-	}()
-
-	r := httpx.GinEngine(config.Global.RunMode, config.HTTP, configCvalCache.PrintBodyPaths, configCvalCache.PrintAccessLog)
+	r := httpx.GinEngine(config.Global.RunMode, config.HTTP)

 	centerRouter.Config(r)
 	alertrtRouter.Config(r)
 	pushgwRouter.Config(r)
-	dumper.ConfigRouter(r)
-
-	if config.Ibex.Enable {
-		migrate.MigrateIbexTables(db)
-		ibex.ServerStart(true, db, redis, config.HTTP.APIForService.BasicAuth, config.Alert.Heartbeat, &config.CenterApi, r, centerRouter, config.Ibex, config.HTTP.Port)
-	}

 	httpClean := httpx.Init(config.HTTP, r)

-	fmt.Printf("please view n9e at  http://%v:%v\n", config.Alert.Heartbeat.IP, config.HTTP.Port)
-	if isRootInit {
-		fmt.Println("username/password: root/root.2020")
-	}
-
 	return func() {
 		logxClean()
 		httpClean()
--- a/center/integration/init.go
+++ b/center/integration/init.go
@@ -1,381 +0,0 @@
-package integration
-
-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/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")
-	}
-
-	// var fileList []string
-	dirList, err := file.DirsUnder(fp)
-	if err != nil {
-		logger.Warning("read builtin component dir fail ", err)
-		return
-	}
-
-	for _, dir := range dirList {
-		// components icon
-		componentDir := fp + "/" + dir
-		component := models.BuiltinComponent{
-			Ident: dir,
-		}
-
-		// get logo name
-		// /api/n9e/integrations/icon/AliYun/aliyun.png
-		files, err := file.FilesUnder(componentDir + "/icon")
-		if err == nil && len(files) > 0 {
-			component.Logo = "/api/n9e/integrations/icon/" + component.Ident + "/" + files[0]
-		} else if err != nil {
-			logger.Warningf("read builtin component icon dir fail %s %v", component.Ident, err)
-		}
-
-		// get description
-		files, err = file.FilesUnder(componentDir + "/markdown")
-		if err == nil && len(files) > 0 {
-			var readmeFile string
-			for _, file := range files {
-				if strings.HasSuffix(strings.ToLower(file), "md") {
-					readmeFile = componentDir + "/markdown/" + file
-					break
-				}
-			}
-			if readmeFile != "" {
-				component.Readme, _ = file.ReadString(readmeFile)
-			}
-		} else if err != nil {
-			logger.Warningf("read builtin component markdown dir fail %s %v", component.Ident, err)
-		}
-
-		exists, _ := models.BuiltinComponentExists(ctx, &component)
-		if !exists {
-			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)
-		}
-
-		// 删除 uuid%1000 不为 0 uuid > 1000000000000000000 且 type 为 dashboard 的记录
-		err = models.DB(ctx).Exec("delete from builtin_payloads where uuid%1000 != 0 and uuid > 1000000000000000000 and type = 'dashboard' and updated_by = 'system'").Error
-		if err != nil {
-			logger.Warning("delete builtin payloads fail ", err)
-		}
-
-		// alerts
-		files, err = file.FilesUnder(componentDir + "/alerts")
-		if err == nil && len(files) > 0 {
-			for _, f := range files {
-				fp := componentDir + "/alerts/" + f
-				bs, err := file.ReadBytes(fp)
-				if err != nil {
-					logger.Warning("read builtin component alerts file fail ", f, err)
-					continue
-				}
-
-				alerts := []models.AlertRule{}
-				err = json.Unmarshal(bs, &alerts)
-				if err != nil {
-					logger.Warning("parse builtin component alerts file fail ", f, err)
-					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)
-						continue
-					}
-
-					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,
-					}
-
-					old, err := models.BuiltinPayloadGet(ctx, "uuid = ?", alert.UUID)
-					if err != nil {
-						logger.Warning("get builtin alert fail ", builtinAlert, err)
-						continue
-					}
-
-					if old == nil {
-						err := builtinAlert.Add(ctx, SYSTEM)
-						if err != nil {
-							logger.Warning("add builtin alert fail ", builtinAlert, err)
-						}
-						continue
-					}
-
-					if old.UpdatedBy == SYSTEM {
-						old.ComponentID = component.ID
-						old.Content = string(content)
-						old.Name = alert.Name
-						old.Tags = alert.AppendTags
-						err = models.DB(ctx).Model(old).Select("*").Updates(old).Error
-						if err != nil {
-							logger.Warningf("update builtin alert:%+v fail %v", builtinAlert, err)
-						}
-					}
-				}
-
-				if writeAlertFileFlag {
-					bs, err = json.MarshalIndent(newAlerts, "", "    ")
-					if err != nil {
-						logger.Warning("marshal builtin alerts fail ", newAlerts, err)
-						continue
-					}
-
-					_, err = file.WriteBytes(fp, bs)
-					if err != nil {
-						logger.Warning("write builtin alerts file fail ", f, err)
-					}
-				}
-
-			}
-		}
-
-		// dashboards
-		files, err = file.FilesUnder(componentDir + "/dashboards")
-		if err == nil && len(files) > 0 {
-			for _, f := range files {
-				fp := componentDir + "/dashboards/" + f
-				bs, err := file.ReadBytes(fp)
-				if err != nil {
-					logger.Warning("read builtin component dashboards file fail ", f, err)
-					continue
-				}
-
-				dashboard := BuiltinBoard{}
-				err = json.Unmarshal(bs, &dashboard)
-				if err != nil {
-					logger.Warning("parse builtin component dashboards file fail ", f, err)
-					continue
-				}
-
-				if dashboard.UUID == 0 {
-					time.Sleep(time.Microsecond)
-					dashboard.UUID = time.Now().UnixMicro()
-					// 补全文件中的 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)
-					continue
-				}
-
-				builtinDashboard := models.BuiltinPayload{
-					ComponentID: component.ID,
-					Type:        "dashboard",
-					Cate:        "",
-					Name:        dashboard.Name,
-					Tags:        dashboard.Tags,
-					Content:     string(content),
-					UUID:        dashboard.UUID,
-				}
-
-				old, err := models.BuiltinPayloadGet(ctx, "uuid = ?", dashboard.UUID)
-				if err != nil {
-					logger.Warning("get builtin alert fail ", builtinDashboard, err)
-					continue
-				}
-
-				if old == nil {
-					err := builtinDashboard.Add(ctx, SYSTEM)
-					if err != nil {
-						logger.Warning("add builtin alert fail ", builtinDashboard, err)
-					}
-					continue
-				}
-
-				if old.UpdatedBy == SYSTEM {
-					old.ComponentID = component.ID
-					old.Content = string(content)
-					old.Name = dashboard.Name
-					old.Tags = dashboard.Tags
-					err = models.DB(ctx).Model(old).Select("*").Updates(old).Error
-					if err != nil {
-						logger.Warningf("update builtin alert:%+v fail %v", builtinDashboard, err)
-					}
-				}
-			}
-		} else if err != nil {
-			logger.Warningf("read builtin component dash dir fail %s %v", component.Ident, err)
-		}
-
-		// metrics
-		files, err = file.FilesUnder(componentDir + "/metrics")
-		if err == nil && len(files) > 0 {
-			for _, f := range files {
-				fp := componentDir + "/metrics/" + f
-				bs, err := file.ReadBytes(fp)
-				if err != nil {
-					logger.Warning("read builtin component metrics file fail", f, err)
-					continue
-				}
-
-				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)
-					if err != nil {
-						logger.Warning("get builtin metrics fail ", metric, err)
-						continue
-					}
-
-					if old == nil {
-						err := metric.Add(ctx, SYSTEM)
-						if err != nil {
-							logger.Warning("add builtin metrics fail ", metric, err)
-						}
-						continue
-					}
-
-					if old.UpdatedBy == SYSTEM {
-						old.Collector = metric.Collector
-						old.Typ = metric.Typ
-						old.Name = metric.Name
-						old.Unit = metric.Unit
-						old.Note = metric.Note
-						old.Lang = metric.Lang
-						old.Expression = metric.Expression
-
-						err = models.DB(ctx).Model(old).Select("*").Updates(old).Error
-						if err != nil {
-							logger.Warningf("update builtin metric:%+v fail %v", metric, err)
-						}
-					}
-				}
-
-				if writeMetricFileFlag {
-					bs, err = json.MarshalIndent(newMetrics, "", "    ")
-					if err != nil {
-						logger.Warning("marshal builtin metrics fail ", newMetrics, err)
-						continue
-					}
-
-					_, err = file.WriteBytes(fp, bs)
-					if err != nil {
-						logger.Warning("write builtin metrics file fail ", f, err)
-					}
-				}
-
-			}
-		} else if err != nil {
-			logger.Warningf("read builtin component metrics dir fail %s %v", component.Ident, err)
-		}
-	}
-}
-
-type BuiltinBoard struct {
-	Id         int64       `json:"id" gorm:"primaryKey"`
-	GroupId    int64       `json:"group_id"`
-	Name       string      `json:"name"`
-	Ident      string      `json:"ident"`
-	Tags       string      `json:"tags"`
-	CreateAt   int64       `json:"create_at"`
-	CreateBy   string      `json:"create_by"`
-	UpdateAt   int64       `json:"update_at"`
-	UpdateBy   string      `json:"update_by"`
-	Configs    interface{} `json:"configs" gorm:"-"`
-	Public     int         `json:"public"`      // 0: false, 1: true
-	PublicCate int         `json:"public_cate"` // 0: anonymous, 1: login, 2: busi
-	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/metas/metas.go
+++ b/center/metas/metas.go
@@ -2,7 +2,6 @@ package metas

 import (
 	"context"
-	"encoding/json"
 	"sync"
 	"time"

@@ -91,41 +90,15 @@ func (s *Set) updateMeta(items map[string]models.HostMeta) {
 }

 func (s *Set) updateTargets(m map[string]models.HostMeta) error {
-	if s.redis == nil {
-		logger.Warningf("redis is nil")
-		return nil
-	}
-
 	count := int64(len(m))
 	if count == 0 {
 		return nil
 	}

 	newMap := make(map[string]interface{}, count)
-	extendMap := make(map[string]interface{})
 	for ident, meta := range m {
-		if meta.ExtendInfo != nil {
-			extendMeta := meta.ExtendInfo
-			meta.ExtendInfo = make(map[string]interface{})
-			extendMetaStr, err := json.Marshal(extendMeta)
-			if err != nil {
-				return err
-			}
-			extendMap[models.WrapExtendIdent(ident)] = extendMetaStr
-		}
 		newMap[models.WrapIdent(ident)] = meta
 	}
 	err := storage.MSet(context.Background(), s.redis, newMap)
-	if err != nil {
-		return err
-	}
-
-	if len(extendMap) > 0 {
-		err = storage.MSet(context.Background(), s.redis, extendMap)
-		if err != nil {
-			return err
-		}
-	}
-
 	return err
 }
--- a/center/router/router.go
+++ b/center/router/router.go
@@ -4,89 +4,53 @@ import (
 	"fmt"
 	"net/http"
 	"path"
-	"runtime"
 	"strings"
 	"time"

-	"github.com/ccfos/nightingale/v6/alert/aconf"
 	"github.com/ccfos/nightingale/v6/center/cconf"
 	"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/models"
 	"github.com/ccfos/nightingale/v6/pkg/aop"
 	"github.com/ccfos/nightingale/v6/pkg/ctx"
 	"github.com/ccfos/nightingale/v6/pkg/httpx"
-	"github.com/ccfos/nightingale/v6/pkg/version"
 	"github.com/ccfos/nightingale/v6/prom"
-	"github.com/ccfos/nightingale/v6/pushgw/idents"
 	"github.com/ccfos/nightingale/v6/storage"
-	"github.com/ccfos/nightingale/v6/tdengine"
+	"github.com/toolkits/pkg/runner"

 	"github.com/gin-gonic/gin"
-	"github.com/rakyll/statik/fs"
-	"github.com/toolkits/pkg/ginx"
-	"github.com/toolkits/pkg/logger"
-	"github.com/toolkits/pkg/runner"
 )

 type Router struct {
 	HTTP              httpx.Config
 	Center            cconf.Center
-	Ibex              conf.Ibex
-	Alert             aconf.Alert
 	Operations        cconf.Operation
 	DatasourceCache   *memsto.DatasourceCacheType
 	NotifyConfigCache *memsto.NotifyConfigCacheType
 	PromClients       *prom.PromClientMap
-	TdendgineClients  *tdengine.TdengineClientMap
 	Redis             storage.Redis
 	MetaSet           *metas.Set
-	IdentSet          *idents.Set
-	TargetCache       *memsto.TargetCacheType
 	Sso               *sso.SsoClient
-	UserCache         *memsto.UserCacheType
-	UserGroupCache    *memsto.UserGroupCacheType
 	Ctx               *ctx.Context
-	HeartbeatHook     HeartbeatHookFunc
-	TargetDeleteHook  models.TargetDeleteHookFunc
 }

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

-func emptyDeleteHook(ctx *ctx.Context, idents []string) error {
-	return nil
-}
-
 func stat() gin.HandlerFunc {
 	return func(c *gin.Context) {
 		start := time.Now()
@@ -107,74 +71,47 @@ 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") {
-					c.Request.Header.Set("X-Language", "zh_CN")
+				if strings.HasPrefix(lang, "zh") {
+					c.Request.Header.Set("X-Language", "zh")
 				} else if strings.HasPrefix(lang, "en") {
 					c.Request.Header.Set("X-Language", "en")
 				} else {
 					c.Request.Header.Set("X-Language", lang)
 				}
 			} else {
-				c.Request.Header.Set("X-Language", "zh_CN")
+				c.Request.Header.Set("X-Language", "en")
 			}
 		}
 		c.Next()
 	}
 }

-func (rt *Router) configNoRoute(r *gin.Engine, fs *http.FileSystem) {
+func (rt *Router) configNoRoute(r *gin.Engine) {
 	r.NoRoute(func(c *gin.Context) {
 		arr := strings.Split(c.Request.URL.Path, ".")
 		suffix := arr[len(arr)-1]
-
 		switch suffix {
-		case "png", "jpeg", "jpg", "svg", "ico", "gif", "css", "js", "html", "htm", "gz", "zip", "map", "ttf", "md":
-			if !rt.Center.UseFileAssets {
-				c.FileFromFS(c.Request.URL.Path, *fs)
-			} else {
-				cwdarr := []string{"/"}
-				if runtime.GOOS == "windows" {
-					cwdarr[0] = ""
-				}
-				cwdarr = append(cwdarr, strings.Split(runner.Cwd, "/")...)
-				cwdarr = append(cwdarr, "pub")
-				cwdarr = append(cwdarr, strings.Split(c.Request.URL.Path, "/")...)
-				c.File(path.Join(cwdarr...))
-			}
+		case "png", "jpeg", "jpg", "svg", "ico", "gif", "css", "js", "html", "htm", "gz", "zip", "map":
+			cwdarr := []string{"/"}
+			cwdarr = append(cwdarr, strings.Split(runner.Cwd, "/")...)
+			cwdarr = append(cwdarr, "pub")
+			cwdarr = append(cwdarr, strings.Split(c.Request.URL.Path, "/")...)
+			c.File(path.Join(cwdarr...))
 		default:
-			if !rt.Center.UseFileAssets {
-				c.FileFromFS("/", *fs)
-			} else {
-				cwdarr := []string{"/"}
-				if runtime.GOOS == "windows" {
-					cwdarr[0] = ""
-				}
-				cwdarr = append(cwdarr, strings.Split(runner.Cwd, "/")...)
-				cwdarr = append(cwdarr, "pub")
-				cwdarr = append(cwdarr, "index.html")
-				c.File(path.Join(cwdarr...))
-			}
+			cwdarr := []string{"/"}
+			cwdarr = append(cwdarr, strings.Split(runner.Cwd, "/")...)
+			cwdarr = append(cwdarr, "pub")
+			cwdarr = append(cwdarr, "index.html")
+			c.File(path.Join(cwdarr...))
 		}
 	})
 }

 func (rt *Router) Config(r *gin.Engine) {
-
 	r.Use(stat())
 	r.Use(languageDetector(rt.Center.I18NHeaderKey))
 	r.Use(aop.Recovery())

-	statikFS, err := fs.New()
-	if err != nil {
-		logger.Errorf("cannot create statik fs: %v", err)
-	}
-
-	if !rt.Center.UseFileAssets {
-		r.StaticFS("/pub", statikFS)
-	}
-
 	pagesPrefix := "/api/n9e"
 	pages := r.Group(pagesPrefix)
 	{
@@ -184,47 +121,24 @@ func (rt *Router) Config(r *gin.Engine) {
 			pages.POST("/query-range-batch", rt.promBatchQueryRange)
 			pages.POST("/query-instant-batch", rt.promBatchQueryInstant)
 			pages.GET("/datasource/brief", rt.datasourceBriefs)
-			pages.POST("/datasource/query", rt.datasourceQuery)
-
-			pages.POST("/ds-query", rt.QueryData)
-			pages.POST("/logs-query", rt.QueryLog)
-
-			pages.POST("/tdengine-databases", rt.tdengineDatabases)
-			pages.POST("/tdengine-tables", rt.tdengineTables)
-			pages.POST("/tdengine-columns", rt.tdengineColumns)
-
 		} else {
 			pages.Any("/proxy/:id/*url", rt.auth(), rt.dsProxy)
 			pages.POST("/query-range-batch", rt.auth(), rt.promBatchQueryRange)
 			pages.POST("/query-instant-batch", rt.auth(), rt.promBatchQueryInstant)
-			pages.GET("/datasource/brief", rt.auth(), rt.user(), rt.datasourceBriefs)
-			pages.POST("/datasource/query", rt.auth(), rt.user(), rt.datasourceQuery)
-
-			pages.POST("/ds-query", rt.auth(), rt.QueryData)
-			pages.POST("/logs-query", rt.auth(), rt.QueryLog)
-
-			pages.POST("/tdengine-databases", rt.auth(), rt.tdengineDatabases)
-			pages.POST("/tdengine-tables", rt.auth(), rt.tdengineTables)
-			pages.POST("/tdengine-columns", rt.auth(), rt.tdengineColumns)
+			pages.GET("/datasource/brief", rt.auth(), rt.datasourceBriefs)
 		}

-		pages.GET("/sql-template", rt.QuerySqlTemplate)
 		pages.POST("/auth/login", rt.jwtMock(), rt.loginPost)
-		pages.POST("/auth/logout", rt.jwtMock(), rt.auth(), rt.user(), rt.logoutPost)
+		pages.POST("/auth/logout", rt.jwtMock(), rt.logoutPost)
 		pages.POST("/auth/refresh", rt.jwtMock(), rt.refreshPost)
-		pages.POST("/auth/captcha", rt.jwtMock(), rt.generateCaptcha)
-		pages.POST("/auth/captcha-verify", rt.jwtMock(), rt.captchaVerify)
-		pages.GET("/auth/ifshowcaptcha", rt.ifShowCaptcha)

 		pages.GET("/auth/sso-config", rt.ssoConfigNameGet)
-		pages.GET("/auth/rsa-config", rt.rsaConfigGet)
 		pages.GET("/auth/redirect", rt.loginRedirect)
 		pages.GET("/auth/redirect/cas", rt.loginRedirectCas)
 		pages.GET("/auth/redirect/oauth", rt.loginRedirectOAuth)
 		pages.GET("/auth/callback", rt.loginCallback)
 		pages.GET("/auth/callback/cas", rt.loginCallbackCas)
 		pages.GET("/auth/callback/oauth", rt.loginCallbackOAuth)
-		pages.GET("/auth/perms", rt.allPerms)

 		pages.GET("/metrics/desc", rt.metricsDescGetFile)
 		pages.POST("/metrics/desc", rt.metricsDescGetMap)
@@ -249,20 +163,6 @@ func (rt *Router) Config(r *gin.Engine) {
 		pages.POST("/metric-views", rt.auth(), rt.user(), rt.metricViewAdd)
 		pages.PUT("/metric-views", rt.auth(), rt.user(), rt.metricViewPut)

-		pages.GET("/builtin-metric-filters", rt.auth(), rt.user(), rt.metricFilterGets)
-		pages.DELETE("/builtin-metric-filters", rt.auth(), rt.user(), rt.metricFilterDel)
-		pages.POST("/builtin-metric-filters", rt.auth(), rt.user(), rt.metricFilterAdd)
-		pages.PUT("/builtin-metric-filters", rt.auth(), rt.user(), rt.metricFilterPut)
-		pages.POST("/builtin-metric-promql", rt.auth(), rt.user(), rt.getMetricPromql)
-
-		pages.POST("/builtin-metrics", rt.auth(), rt.user(), rt.perm("/builtin-metrics/add"), rt.builtinMetricsAdd)
-		pages.PUT("/builtin-metrics", rt.auth(), rt.user(), rt.perm("/builtin-metrics/put"), rt.builtinMetricsPut)
-		pages.DELETE("/builtin-metrics", rt.auth(), rt.user(), rt.perm("/builtin-metrics/del"), rt.builtinMetricsDel)
-		pages.GET("/builtin-metrics", rt.auth(), rt.user(), rt.builtinMetricsGets)
-		pages.GET("/builtin-metrics/types", rt.auth(), rt.user(), rt.builtinMetricsTypes)
-		pages.GET("/builtin-metrics/types/default", rt.auth(), rt.user(), rt.builtinMetricsDefaultTypes)
-		pages.GET("/builtin-metrics/collectors", rt.auth(), rt.user(), rt.builtinMetricsCollectors)
-
 		pages.GET("/user-groups", rt.auth(), rt.user(), rt.userGroupGets)
 		pages.POST("/user-groups", rt.auth(), rt.user(), rt.perm("/user-groups/add"), rt.userGroupAdd)
 		pages.GET("/user-group/:id", rt.auth(), rt.user(), rt.userGroupGet)
@@ -280,38 +180,30 @@ func (rt *Router) Config(r *gin.Engine) {
 		pages.DELETE("/busi-group/:id/members", rt.auth(), rt.user(), rt.perm("/busi-groups/put"), rt.bgrw(), rt.busiGroupMemberDel)
 		pages.DELETE("/busi-group/:id", rt.auth(), rt.user(), rt.perm("/busi-groups/del"), rt.bgrw(), rt.busiGroupDel)
 		pages.GET("/busi-group/:id/perm/:perm", rt.auth(), rt.user(), rt.checkBusiGroupPerm)
-		pages.GET("/busi-groups/tags", rt.auth(), rt.user(), rt.busiGroupsGetTags)

 		pages.GET("/targets", rt.auth(), rt.user(), rt.targetGets)
-		pages.GET("/target/extra-meta", rt.auth(), rt.user(), rt.targetExtendInfoByIdent)
 		pages.POST("/target/list", rt.auth(), rt.user(), rt.targetGetsByHostFilter)
 		pages.DELETE("/targets", rt.auth(), rt.user(), rt.perm("/targets/del"), rt.targetDel)
 		pages.GET("/targets/tags", rt.auth(), rt.user(), rt.targetGetTags)
 		pages.POST("/targets/tags", rt.auth(), rt.user(), rt.perm("/targets/put"), rt.targetBindTagsByFE)
 		pages.DELETE("/targets/tags", rt.auth(), rt.user(), rt.perm("/targets/put"), rt.targetUnbindTagsByFE)
 		pages.PUT("/targets/note", rt.auth(), rt.user(), rt.perm("/targets/put"), rt.targetUpdateNote)
-		pages.PUT("/targets/bgids", rt.auth(), rt.user(), rt.perm("/targets/put"), rt.targetBindBgids)
+		pages.PUT("/targets/bgid", rt.auth(), rt.user(), rt.perm("/targets/put"), rt.targetUpdateBgid)

 		pages.POST("/builtin-cate-favorite", rt.auth(), rt.user(), rt.builtinCateFavoriteAdd)
 		pages.DELETE("/builtin-cate-favorite/:name", rt.auth(), rt.user(), rt.builtinCateFavoriteDel)

+		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("/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)
 		pages.GET("/busi-group/:id/boards", rt.auth(), rt.user(), rt.perm("/dashboards"), rt.bgro(), rt.boardGets)
 		pages.POST("/busi-group/:id/boards", rt.auth(), rt.user(), rt.perm("/dashboards/add"), rt.bgrw(), rt.boardAdd)
 		pages.POST("/busi-group/:id/board/:bid/clone", rt.auth(), rt.user(), rt.perm("/dashboards/add"), rt.bgrw(), rt.boardClone)
-		pages.POST("/busi-groups/boards/clones", rt.auth(), rt.user(), rt.perm("/dashboards/add"), rt.boardBatchClone)

-		pages.GET("/boards", rt.auth(), rt.user(), rt.boardGetsByBids)
 		pages.GET("/board/:bid", rt.boardGet)
 		pages.GET("/board/:bid/pure", rt.boardPureGet)
 		pages.PUT("/board/:bid", rt.auth(), rt.user(), rt.perm("/dashboards/put"), rt.boardPut)
@@ -322,26 +214,17 @@ 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/callbacks", rt.auth(), rt.user(), rt.alertRuleCallbacks)
+		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("/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)
 		pages.POST("/busi-group/:id/recording-rules", rt.auth(), rt.user(), rt.perm("/recording-rules/add"), rt.bgrw(), rt.recordingRuleAddByFE)
 		pages.DELETE("/busi-group/:id/recording-rules", rt.auth(), rt.user(), rt.perm("/recording-rules/del"), rt.bgrw(), rt.recordingRuleDel)
@@ -349,16 +232,12 @@ func (rt *Router) Config(r *gin.Engine) {
 		pages.GET("/recording-rule/:rrid", rt.auth(), rt.user(), rt.perm("/recording-rules"), rt.recordingRuleGet)
 		pages.PUT("/busi-group/:id/recording-rules/fields", rt.auth(), rt.user(), rt.perm("/recording-rules/put"), rt.recordingRulePutFields)

-		pages.GET("/busi-groups/alert-mutes", rt.auth(), rt.user(), rt.perm("/alert-mutes"), rt.alertMuteGetsByGids)
 		pages.GET("/busi-group/:id/alert-mutes", rt.auth(), rt.user(), rt.perm("/alert-mutes"), rt.bgro(), rt.alertMuteGetsByBG)
-		pages.POST("/busi-group/:id/alert-mutes/preview", rt.auth(), rt.user(), rt.perm("/alert-mutes/add"), rt.bgrw(), rt.alertMutePreview)
 		pages.POST("/busi-group/:id/alert-mutes", rt.auth(), rt.user(), rt.perm("/alert-mutes/add"), rt.bgrw(), rt.alertMuteAdd)
 		pages.DELETE("/busi-group/:id/alert-mutes", rt.auth(), rt.user(), rt.perm("/alert-mutes/del"), rt.bgrw(), rt.alertMuteDel)
 		pages.PUT("/busi-group/:id/alert-mute/:amid", rt.auth(), rt.user(), rt.perm("/alert-mutes/put"), rt.alertMutePutByFE)
-		pages.GET("/busi-group/:id/alert-mute/:amid", rt.auth(), rt.user(), rt.perm("/alert-mutes"), rt.alertMuteGet)
 		pages.PUT("/busi-group/:id/alert-mutes/fields", rt.auth(), rt.user(), rt.perm("/alert-mutes/put"), rt.bgrw(), rt.alertMutePutFields)

-		pages.GET("/busi-groups/alert-subscribes", rt.auth(), rt.user(), rt.perm("/alert-subscribes"), rt.alertSubscribeGetsByGids)
 		pages.GET("/busi-group/:id/alert-subscribes", rt.auth(), rt.user(), rt.perm("/alert-subscribes"), rt.bgro(), rt.alertSubscribeGets)
 		pages.GET("/alert-subscribe/:sid", rt.auth(), rt.user(), rt.perm("/alert-subscribes"), rt.alertSubscribeGet)
 		pages.POST("/busi-group/:id/alert-subscribes", rt.auth(), rt.user(), rt.perm("/alert-subscribes/add"), rt.bgrw(), rt.alertSubscribeAdd)
@@ -368,27 +247,23 @@ 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)

 		pages.GET("/alert-aggr-views", rt.auth(), rt.alertAggrViewGets)
 		pages.DELETE("/alert-aggr-views", rt.auth(), rt.user(), rt.alertAggrViewDel)
 		pages.POST("/alert-aggr-views", rt.auth(), rt.user(), rt.alertAggrViewAdd)
 		pages.PUT("/alert-aggr-views", rt.auth(), rt.user(), rt.alertAggrViewPut)

-		pages.GET("/busi-groups/task-tpls", rt.auth(), rt.user(), rt.perm("/job-tpls"), rt.taskTplGetsByGids)
 		pages.GET("/busi-group/:id/task-tpls", rt.auth(), rt.user(), rt.perm("/job-tpls"), rt.bgro(), rt.taskTplGets)
 		pages.POST("/busi-group/:id/task-tpls", rt.auth(), rt.user(), rt.perm("/job-tpls/add"), rt.bgrw(), rt.taskTplAdd)
 		pages.DELETE("/busi-group/:id/task-tpl/:tid", rt.auth(), rt.user(), rt.perm("/job-tpls/del"), rt.bgrw(), rt.taskTplDel)
@@ -397,14 +272,15 @@ func (rt *Router) Config(r *gin.Engine) {
 		pages.GET("/busi-group/:id/task-tpl/:tid", rt.auth(), rt.user(), rt.perm("/job-tpls"), rt.bgro(), rt.taskTplGet)
 		pages.PUT("/busi-group/:id/task-tpl/:tid", rt.auth(), rt.user(), rt.perm("/job-tpls/put"), rt.bgrw(), rt.taskTplPut)

-		pages.GET("/busi-groups/tasks", rt.auth(), rt.user(), rt.perm("/job-tasks"), rt.taskGetsByGids)
 		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("/busi-group/:id/task/*url", rt.auth(), rt.user(), rt.perm("/job-tasks"), rt.taskProxy)
+		pages.PUT("/busi-group/:id/task/*url", rt.auth(), rt.user(), rt.perm("/job-tasks/put"), rt.bgrw(), rt.taskProxy)

-		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.admin(), rt.serversGet)
+		pages.GET("/server-clusters", rt.auth(), rt.admin(), rt.serverClustersGet)

-		pages.POST("/datasource/list", rt.auth(), rt.user(), rt.datasourceList)
+		pages.POST("/datasource/list", rt.auth(), rt.datasourceList)
 		pages.POST("/datasource/plugin/list", rt.auth(), rt.pluginList)
 		pages.POST("/datasource/upsert", rt.auth(), rt.admin(), rt.datasourceUpsert)
 		pages.POST("/datasource/desc", rt.auth(), rt.admin(), rt.datasourceGet)
@@ -418,181 +294,84 @@ func (rt *Router) Config(r *gin.Engine) {

 		pages.GET("/role/:id/ops", rt.auth(), rt.admin(), rt.operationOfRole)
 		pages.PUT("/role/:id/ops", rt.auth(), rt.admin(), rt.roleBindOperation)
-		pages.GET("/operation", rt.operations)
+		pages.GET("operation", rt.operations)

-		pages.GET("/notify-tpls", rt.auth(), rt.user(), rt.notifyTplGets)
-		pages.PUT("/notify-tpl/content", rt.auth(), rt.user(), rt.notifyTplUpdateContent)
-		pages.PUT("/notify-tpl", rt.auth(), rt.user(), rt.notifyTplUpdate)
-		pages.POST("/notify-tpl", rt.auth(), rt.user(), rt.notifyTplAdd)
-		pages.DELETE("/notify-tpl/:id", rt.auth(), rt.user(), rt.notifyTplDel)
-		pages.POST("/notify-tpl/preview", rt.auth(), rt.user(), rt.notifyTplPreview)
+		pages.GET("/notify-tpls", rt.auth(), rt.admin(), rt.notifyTplGets)
+		pages.PUT("/notify-tpl/content", rt.auth(), rt.admin(), rt.notifyTplUpdateContent)
+		pages.PUT("/notify-tpl", rt.auth(), rt.admin(), rt.notifyTplUpdate)
+		pages.POST("/notify-tpl/preview", rt.auth(), rt.admin(), rt.notifyTplPreview)

 		pages.GET("/sso-configs", rt.auth(), rt.admin(), rt.ssoConfigGets)
 		pages.PUT("/sso-config", rt.auth(), rt.admin(), rt.ssoConfigUpdate)

-		pages.GET("/webhooks", rt.auth(), rt.user(), rt.webhookGets)
+		pages.GET("/webhooks", rt.auth(), rt.admin(), rt.webhookGets)
 		pages.PUT("/webhooks", rt.auth(), rt.admin(), rt.webhookPuts)

-		pages.GET("/notify-script", rt.auth(), rt.user(), rt.perm("/help/notification-settings"), rt.notifyScriptGet)
+		pages.GET("/notify-script", rt.auth(), rt.admin(), rt.notifyScriptGet)
 		pages.PUT("/notify-script", rt.auth(), rt.admin(), rt.notifyScriptPut)

-		pages.GET("/notify-channel", rt.auth(), rt.user(), rt.perm("/help/notification-settings"), rt.notifyChannelGets)
+		pages.GET("/notify-channel", rt.auth(), rt.admin(), rt.notifyChannelGets)
 		pages.PUT("/notify-channel", rt.auth(), rt.admin(), rt.notifyChannelPuts)

-		pages.GET("/notify-contact", rt.auth(), rt.user(), rt.perm("/help/notification-settings"), rt.notifyContactGets)
+		pages.GET("/notify-contact", rt.auth(), rt.admin(), rt.notifyContactGets)
 		pages.PUT("/notify-contact", rt.auth(), rt.admin(), rt.notifyContactPuts)

-		pages.GET("/notify-config", rt.auth(), rt.user(), rt.perm("/help/notification-settings"), rt.notifyConfigGet)
+		pages.GET("/notify-config", rt.auth(), rt.admin(), rt.notifyConfigGet)
 		pages.PUT("/notify-config", rt.auth(), rt.admin(), rt.notifyConfigPut)
-		pages.PUT("/smtp-config-test", rt.auth(), rt.admin(), rt.attemptSendEmail)
-
-		pages.GET("/es-index-pattern", rt.auth(), rt.esIndexPatternGet)
-		pages.GET("/es-index-pattern-list", rt.auth(), rt.esIndexPatternGetList)
-		pages.POST("/es-index-pattern", rt.auth(), rt.admin(), rt.esIndexPatternAdd)
-		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)
-		pages.DELETE("/user-variable-config/:id", rt.auth(), rt.user(), rt.perm("/help/variable-configs"), rt.userVariableConfigDel)
-
-		pages.GET("/config", rt.auth(), rt.admin(), rt.configGetByKey)
-		pages.PUT("/config", rt.auth(), rt.admin(), rt.configPutByKey)
-		pages.GET("/site-info", rt.siteInfo)
-
-		// 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.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.GET("/builtin-payload", rt.auth(), rt.user(), rt.builtinPayloadsGetByUUIDOrID)
 	}

-	r.GET("/api/n9e/versions", func(c *gin.Context) {
-		v := version.Version
-		lastIndex := strings.LastIndex(version.Version, "-")
-		if lastIndex != -1 {
-			v = version.Version[:lastIndex]
-		}
-
-		gv := version.GithubVersion.Load()
-		if gv != nil {
-			ginx.NewRender(c).Data(gin.H{"version": v, "github_verison": gv.(string)}, nil)
-		} else {
-			ginx.NewRender(c).Data(gin.H{"version": v, "github_verison": ""}, nil)
-		}
-	})
-
-	if rt.HTTP.APIForService.Enable {
+	if rt.HTTP.Service.Enable {
 		service := r.Group("/v1/n9e")
-		if len(rt.HTTP.APIForService.BasicAuth) > 0 {
-			service.Use(gin.BasicAuth(rt.HTTP.APIForService.BasicAuth))
+		if len(rt.HTTP.Service.BasicAuth) > 0 {
+			service.Use(gin.BasicAuth(rt.HTTP.Service.BasicAuth))
 		}
 		{
 			service.Any("/prometheus/*url", rt.dsProxy)
 			service.POST("/users", rt.userAddPost)
-			service.PUT("/user/:id", rt.userProfilePutByService)
-			service.DELETE("/user/:id", rt.userDel)
 			service.GET("/users", rt.userFindAll)

-			service.GET("/user-groups", rt.userGroupGetsByService)
-			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", rt.targetGets)
 			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)
 			service.DELETE("/alert-rules", rt.alertRuleDelByService)
 			service.PUT("/alert-rule/:arid", rt.alertRulePutByService)
 			service.GET("/alert-rule/:arid", rt.alertRuleGet)
 			service.GET("/alert-rules", rt.alertRulesGetByService)

-			service.GET("/alert-subscribes", rt.alertSubscribeGetsByService)
-
-			service.GET("/busi-groups", rt.busiGroupGetsByService)
-
-			service.GET("/datasources", rt.datasourceGetsByService)
-			service.GET("/datasource-ids", rt.getDatasourceIds)
-			service.POST("/server-heartbeat", rt.serverHeartbeat)
-			service.GET("/servers-active", rt.serversActive)
-
-			service.GET("/recording-rules", rt.recordingRuleGetsByService)
-
 			service.GET("/alert-mutes", rt.alertMuteGets)
 			service.POST("/alert-mutes", rt.alertMuteAddByService)
 			service.DELETE("/alert-mutes", rt.alertMuteDel)

 			service.GET("/alert-cur-events", rt.alertCurEventsList)
-			service.GET("/alert-cur-events-get-by-rid", rt.alertCurEventsGetByRid)
 			service.GET("/alert-his-events", rt.alertHisEventsList)
 			service.GET("/alert-his-event/:eid", rt.alertHisEventGet)

-			service.GET("/task-tpl/:tid", rt.taskTplGetByService)
-			service.GET("/task-tpls", rt.taskTplGetsByService)
-			service.GET("/task-tpl/statistics", rt.taskTplStatistics)
-
 			service.GET("/config/:id", rt.configGet)
 			service.GET("/configs", rt.configsGet)
-			service.GET("/config", rt.configGetByKey)
-			service.GET("/all-configs", rt.configGetAll)
 			service.PUT("/configs", rt.configsPut)
 			service.POST("/configs", rt.configsPost)
 			service.DELETE("/configs", rt.configsDel)

 			service.POST("/conf-prop/encrypt", rt.confPropEncrypt)
 			service.POST("/conf-prop/decrypt", rt.confPropDecrypt)
-
-			service.GET("/statistic", rt.statistic)
-
-			service.GET("/notify-tpls", rt.notifyTplGets)
-
-			service.POST("/task-record-add", rt.taskRecordAdd)
-
-			service.GET("/user-variable/decrypt", rt.userVariableGetDecryptByService)
-
-			service.GET("/targets-of-alert-rule", rt.targetsOfAlertRule)
-
-			service.POST("/notify-record", rt.notificationRecordAdd)
-
-			service.GET("/alert-cur-events-del-by-hash", rt.alertCurEventDelByHash)
-
-			service.POST("/center/heartbeat", rt.heartbeat)
 		}
 	}

-	if rt.HTTP.APIForAgent.Enable {
+	if rt.HTTP.Heartbeat.Enable {
 		heartbeat := r.Group("/v1/n9e")
 		{
-			if len(rt.HTTP.APIForAgent.BasicAuth) > 0 {
-				heartbeat.Use(gin.BasicAuth(rt.HTTP.APIForAgent.BasicAuth))
+			if len(rt.HTTP.Heartbeat.BasicAuth) > 0 {
+				heartbeat.Use(gin.BasicAuth(rt.HTTP.Heartbeat.BasicAuth))
 			}
 			heartbeat.POST("/heartbeat", rt.heartbeat)
 		}
 	}

-	rt.configNoRoute(r, &statikFS)
-
+	rt.configNoRoute(r)
 }

 func Render(c *gin.Context, data, msg interface{}) {
--- a/center/router/router_alert_aggr_view.go
+++ b/center/router/router_alert_aggr_view.go
@@ -69,11 +69,6 @@ func (rt *Router) alertAggrViewPut(c *gin.Context) {
 			return
 		}
 	}
-	view.Name = f.Name
-	view.Rule = f.Rule
-	view.Cate = f.Cate
-	if view.CreateBy == 0 {
-		view.CreateBy = me.Id
-	}
-	ginx.NewRender(c).Message(view.Update(rt.Ctx))
+
+	ginx.NewRender(c).Message(view.Update(rt.Ctx, f.Name, f.Rule, f.Cate, me.Id))
 }
--- a/center/router/router_alert_cur_event.go
+++ b/center/router/router_alert_cur_event.go
@@ -4,7 +4,6 @@ import (
 	"net/http"
 	"sort"
 	"strings"
-	"time"

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

@@ -43,6 +42,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,12 +61,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.AlertCurEventsGet(rt.Ctx, prods, bgids, stime, etime, severity, dsIds,
-		cates, 0, 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)
@@ -132,19 +128,13 @@ func (rt *Router) alertCurEventsCardDetails(c *gin.Context) {
 	ginx.NewRender(c).Data(list, err)
 }

-// alertCurEventsGetByRid
-func (rt *Router) alertCurEventsGetByRid(c *gin.Context) {
-	rid := ginx.QueryInt64(c, "rid")
-	dsId := ginx.QueryInt64(c, "dsid")
-	ginx.NewRender(c).Data(models.AlertCurEventGetByRuleIdAndDsId(rt.Ctx, rid, dsId))
-}
-
 // 列表方式，拉取活跃告警
 func (rt *Router) alertCurEventsList(c *gin.Context) {
 	stime, etime := getTimeRange(c)
 	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", "")
@@ -163,17 +153,10 @@ func (rt *Router) alertCurEventsList(c *gin.Context) {
 		cates = strings.Split(cate, ",")
 	}

-	ruleId := ginx.QueryInt64(c, "rid", 0)
-
-	bgids, err := GetBusinessGroupIds(c, rt.Ctx, rt.Center.EventHistoryGroupView)
+	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, ruleId, query)
-	ginx.Dangerous(err)
-
-	list, err := models.AlertCurEventsGet(rt.Ctx, prods, bgids, stime, etime, severity, dsIds,
-		cates, ruleId, query, limit, ginx.Offset(c, limit))
+	list, err := models.AlertCurEventGets(rt.Ctx, prods, busiGroupId, stime, etime, severity, dsIds, cates, query, limit, ginx.Offset(c, limit))
 	ginx.Dangerous(err)

 	cache := make(map[int64]*models.UserGroup)
@@ -192,28 +175,19 @@ func (rt *Router) alertCurEventDel(c *gin.Context) {
 	ginx.BindJSON(c, &f)
 	f.Verify()

-	rt.checkCurEventBusiGroupRWPermission(c, f.Ids)
-
-	ginx.NewRender(c).Message(models.AlertCurEventDel(rt.Ctx, f.Ids))
-}
-
-func (rt *Router) checkCurEventBusiGroupRWPermission(c *gin.Context, ids []int64) {
 	set := make(map[int64]struct{})

-	// event group id is 0, ignore perm check
-	set[0] = struct{}{}
-
-	for i := 0; i < len(ids); i++ {
-		event, err := models.AlertCurEventGetById(rt.Ctx, ids[i])
+	for i := 0; i < len(f.Ids); i++ {
+		event, err := models.AlertCurEventGetById(rt.Ctx, f.Ids[i])
 		ginx.Dangerous(err)
-		if event == nil {
-			continue
-		}
+
 		if _, has := set[event.GroupId]; !has {
 			rt.bgrwCheck(c, event.GroupId)
 			set[event.GroupId] = struct{}{}
 		}
 	}
+
+	ginx.NewRender(c).Message(models.AlertCurEventDel(rt.Ctx, f.Ids))
 }

 func (rt *Router) alertCurEventGet(c *gin.Context) {
@@ -225,25 +199,5 @@ 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)
 }
-
-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,17 +52,10 @@ func (rt *Router) alertHisEventsList(c *gin.Context) {
 		cates = strings.Split(cate, ",")
 	}

-	ruleId := ginx.QueryInt64(c, "rid", 0)
-
-	bgids, err := GetBusinessGroupIds(c, rt.Ctx, rt.Center.EventHistoryGroupView)
+	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, ruleId, query)
-	ginx.Dangerous(err)
-
-	list, err := models.AlertHisEventGets(rt.Ctx, prods, bgids, stime, etime, severity, recovered,
-		dsIds, cates, ruleId, query, limit, ginx.Offset(c, limit))
+	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)
@@ -87,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,26 +1,15 @@
 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"
 )

 // Return all, front-end search and paging
@@ -37,82 +26,8 @@ func (rt *Router) alertRuleGets(c *gin.Context) {
 	ginx.NewRender(c).Data(ars, err)
 }

-func getAlertCueEventTimeRange(c *gin.Context) (stime, etime int64) {
-	stime = ginx.QueryInt64(c, "stime", 0)
-	etime = ginx.QueryInt64(c, "etime", 0)
-	if etime == 0 {
-		etime = time.Now().Unix()
-	}
-	if stime == 0 || stime >= etime {
-		stime = etime - 30*24*int64(time.Hour.Seconds())
-	}
-	return
-}
-
-func (rt *Router) alertRuleGetsByGids(c *gin.Context) {
-	gids := str.IdsInt64(ginx.QueryStr(c, "gids", ""), ",")
-	if len(gids) > 0 {
-		for _, gid := range gids {
-			rt.bgroCheck(c, gid)
-		}
-	} else {
-		me := c.MustGet("user").(*models.User)
-		if !me.IsAdmin() {
-			var err error
-			gids, err = models.MyBusiGroupIds(rt.Ctx, me.Id)
-			ginx.Dangerous(err)
-
-			if len(gids) == 0 {
-				ginx.NewRender(c).Data([]int{}, nil)
-				return
-			}
-		}
-	}
-
-	ars, err := models.AlertRuleGetsByBGIds(rt.Ctx, gids)
-	if err == nil {
-		cache := make(map[int64]*models.UserGroup)
-		rids := make([]int64, 0, len(ars))
-		names := make([]string, 0, len(ars))
-		for i := 0; i < len(ars); i++ {
-			ars[i].FillNotifyGroups(rt.Ctx, cache)
-			ars[i].FillSeverities()
-
-			if len(ars[i].DatasourceQueries) != 0 {
-				ars[i].DatasourceIdsJson = rt.DatasourceCache.GetIDsByDsCateAndQueries(ars[i].Cate, ars[i].DatasourceQueries)
-			}
-
-			rids = append(rids, ars[i].Id)
-			names = append(names, ars[i].UpdateBy)
-		}
-
-		stime, etime := getAlertCueEventTimeRange(c)
-		cnt := models.AlertCurEventCountByRuleId(rt.Ctx, rids, stime, etime)
-		if cnt != nil {
-			for i := 0; i < len(ars); i++ {
-				ars[i].CurEventCount = cnt[ars[i].Id]
-			}
-		}
-
-		users := models.UserMapGet(rt.Ctx, "username in (?)", names)
-		if users != nil {
-			for i := 0; i < len(ars); i++ {
-				if user, exist := users[ars[i].UpdateBy]; exist {
-					ars[i].UpdateByNickname = user.Nickname
-				}
-			}
-		}
-	}
-	ginx.NewRender(c).Data(ars, err)
-}
-
 func (rt *Router) alertRulesGetByService(c *gin.Context) {
-	prods := []string{}
-	prodStr := ginx.QueryStr(c, "prods", "")
-	if prodStr != "" {
-		prods = strings.Split(ginx.QueryStr(c, "prods", ""), ",")
-	}
-
+	prods := strings.Split(ginx.QueryStr(c, "prods", ""), ",")
 	query := ginx.QueryStr(c, "query", "")
 	algorithm := ginx.QueryStr(c, "algorithm", "")
 	cluster := ginx.QueryStr(c, "cluster", "")
@@ -128,10 +43,6 @@ func (rt *Router) alertRulesGetByService(c *gin.Context) {
 		cache := make(map[int64]*models.UserGroup)
 		for i := 0; i < len(ars); i++ {
 			ars[i].FillNotifyGroups(rt.Ctx, cache)
-
-			if len(ars[i].DatasourceQueries) != 0 {
-				ars[i].DatasourceIdsJson = rt.DatasourceCache.GetIDsByDsCateAndQueries(ars[i].Cate, ars[i].DatasourceQueries)
-			}
 		}
 	}
 	ginx.NewRender(c).Data(ars, err)
@@ -166,48 +77,12 @@ func (rt *Router) alertRuleAddByImport(c *gin.Context) {
 		ginx.Bomb(http.StatusBadRequest, "input json is empty")
 	}

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

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

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

-func (rt *Router) alertRuleAddOneByService(c *gin.Context) {
-	var f models.AlertRule
-	ginx.BindJSON(c, &f)
-
-	err := f.FE2DB()
-	ginx.Dangerous(err)
-
-	err = f.Add(rt.Ctx)
-	ginx.NewRender(c).Data(f.Id, err)
-}
-
 func (rt *Router) alertRuleAddForService(lst []models.AlertRule, username string) map[string]string {
 	count := len(lst)
 	// alert rule name -> error string
@@ -358,43 +222,6 @@ func (rt *Router) alertRulePutFields(c *gin.Context) {
 			continue
 		}

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

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

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

 	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
-	ginx.BindJSON(c, &f)
-
-	if len(f.NotifyChannelsJSON) > 0 && len(f.NotifyGroupsJSON) > 0 { //Validation NotifyChannels
-		ngids := make([]int64, 0, len(f.NotifyChannelsJSON))
-		for i := range f.NotifyGroupsJSON {
-			id, _ := strconv.ParseInt(f.NotifyGroupsJSON[i], 10, 64)
-			ngids = append(ngids, id)
-		}
-		userGroups := rt.UserGroupCache.GetByUserGroupIds(ngids)
-		uids := make([]int64, 0)
-		for i := range userGroups {
-			uids = append(uids, userGroups[i].UserIds...)
-		}
-		users := rt.UserCache.GetByUserIds(uids)
-		//If any users have a certain notify channel's token, it will be okay. Otherwise, this notify channel is absent of tokens.
-		ancs := make([]string, 0, len(f.NotifyChannelsJSON)) //absent Notify Channels
-		for i := range f.NotifyChannelsJSON {
-			flag := true
-			//ignore non-default channels
-			switch f.NotifyChannelsJSON[i] {
-			case models.Dingtalk, models.Wecom, models.Feishu, models.Mm,
-				models.Telegram, models.Email, models.FeishuCard:
-				// do nothing
-			default:
-				continue
-			}
-			//default channels
-			for ui := range users {
-				if _, b := users[ui].ExtractToken(f.NotifyChannelsJSON[i]); b {
-					flag = false
-					break
-				}
-			}
-			if flag {
-				ancs = append(ancs, f.NotifyChannelsJSON[i])
-			}
-		}
-
-		if len(ancs) > 0 {
-			ginx.NewRender(c).Message("All users are missing notify channel configurations. Please check for missing tokens (each channel should be configured with at least one user). %s", ancs)
-			return
-		}
-
-	}
-
-	ginx.NewRender(c).Message("")
-}
-
-func (rt *Router) alertRuleCallbacks(c *gin.Context) {
-	user := c.MustGet("user").(*models.User)
-	bussGroupIds, err := models.MyBusiGroupIds(rt.Ctx, user.Id)
-	ginx.Dangerous(err)
-
-	ars, err := models.AlertRuleGetsByBGIds(rt.Ctx, bussGroupIds)
-	ginx.Dangerous(err)
-
-	var callbacks []string
-	callbackFilter := make(map[string]struct{})
-	for i := range ars {
-		for _, callback := range ars[i].CallbacksJSON {
-			if _, ok := callbackFilter[callback]; !ok {
-				callbackFilter[callback] = struct{}{}
-				callbacks = append(callbacks, callback)
-			}
-		}
-	}
-
-	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.SplitN(tag, "=", 2)
-		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.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
@@ -8,61 +8,27 @@ import (

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

 // Return all, front-end search and paging
 func (rt *Router) alertSubscribeGets(c *gin.Context) {
 	bgid := ginx.UrlParamInt64(c, "id")
 	lst, err := models.AlertSubscribeGets(rt.Ctx, bgid)
-	ginx.Dangerous(err)
-
-	ugcache := make(map[int64]*models.UserGroup)
-	rulecache := make(map[int64]string)
-
-	for i := 0; i < len(lst); i++ {
-		ginx.Dangerous(lst[i].FillUserGroups(rt.Ctx, ugcache))
-		ginx.Dangerous(lst[i].FillRuleNames(rt.Ctx, rulecache))
-		ginx.Dangerous(lst[i].FillDatasourceIds(rt.Ctx))
-		ginx.Dangerous(lst[i].DB2FE())
-	}
-
-	ginx.NewRender(c).Data(lst, err)
-}
-
-func (rt *Router) alertSubscribeGetsByGids(c *gin.Context) {
-	gids := str.IdsInt64(ginx.QueryStr(c, "gids", ""), ",")
-	if len(gids) > 0 {
-		for _, gid := range gids {
-			rt.bgroCheck(c, gid)
+	if err == nil {
+		ugcache := make(map[int64]*models.UserGroup)
+		for i := 0; i < len(lst); i++ {
+			ginx.Dangerous(lst[i].FillUserGroups(rt.Ctx, ugcache))
 		}
-	} else {
-		me := c.MustGet("user").(*models.User)
-		if !me.IsAdmin() {
-			var err error
-			gids, err = models.MyBusiGroupIds(rt.Ctx, me.Id)
-			ginx.Dangerous(err)

-			if len(gids) == 0 {
-				ginx.NewRender(c).Data([]int{}, nil)
-				return
-			}
+		rulecache := make(map[int64]string)
+		for i := 0; i < len(lst); i++ {
+			ginx.Dangerous(lst[i].FillRuleName(rt.Ctx, rulecache))
+		}
+
+		for i := 0; i < len(lst); i++ {
+			ginx.Dangerous(lst[i].FillDatasourceIds(rt.Ctx))
 		}
 	}
-
-	lst, err := models.AlertSubscribeGetsByBGIds(rt.Ctx, gids)
-	ginx.Dangerous(err)
-
-	ugcache := make(map[int64]*models.UserGroup)
-	rulecache := make(map[int64]string)
-
-	for i := 0; i < len(lst); i++ {
-		ginx.Dangerous(lst[i].FillUserGroups(rt.Ctx, ugcache))
-		ginx.Dangerous(lst[i].FillRuleNames(rt.Ctx, rulecache))
-		ginx.Dangerous(lst[i].FillDatasourceIds(rt.Ctx))
-		ginx.Dangerous(lst[i].DB2FE())
-	}
-
 	ginx.NewRender(c).Data(lst, err)
 }

@@ -81,7 +47,7 @@ func (rt *Router) alertSubscribeGet(c *gin.Context) {
 	ginx.Dangerous(sub.FillUserGroups(rt.Ctx, ugcache))

 	rulecache := make(map[int64]string)
-	ginx.Dangerous(sub.FillRuleNames(rt.Ctx, rulecache))
+	ginx.Dangerous(sub.FillRuleName(rt.Ctx, rulecache))
 	ginx.Dangerous(sub.FillDatasourceIds(rt.Ctx))
 	ginx.Dangerous(sub.DB2FE())

@@ -113,19 +79,12 @@ func (rt *Router) alertSubscribePut(c *gin.Context) {
 	for i := 0; i < len(fs); i++ {
 		fs[i].UpdateBy = username
 		fs[i].UpdateAt = timestamp
-		//After adding the function of batch subscription alert rules, rule_ids is used instead of rule_id.
-		//When the subscription rules are updated, set rule_id=0 to prevent the wrong subscription caused by the old rule_id.
-		fs[i].RuleId = 0
 		ginx.Dangerous(fs[i].Update(
 			rt.Ctx,
 			"name",
 			"disabled",
-			"prod",
-			"cate",
-			"datasource_ids",
 			"cluster",
 			"rule_id",
-			"rule_ids",
 			"tags",
 			"redefine_severity",
 			"new_severity",
@@ -137,10 +96,7 @@ func (rt *Router) alertSubscribePut(c *gin.Context) {
 			"webhooks",
 			"for_duration",
 			"redefine_webhooks",
-			"severities",
-			"extra_config",
-			"busi_groups",
-			"note",
+			"datasource_ids",
 		))
 	}

@@ -154,8 +110,3 @@ func (rt *Router) alertSubscribeDel(c *gin.Context) {

 	ginx.NewRender(c).Message(models.AlertSubscribeDel(rt.Ctx, f.Ids))
 }
-
-func (rt *Router) alertSubscribeGetsByService(c *gin.Context) {
-	lst, err := models.AlertSubscribeGetsByService(rt.Ctx)
-	ginx.NewRender(c).Data(lst, err)
-}
--- a/center/router/router_board.go
+++ b/center/router/router_board.go
@@ -1,26 +1,22 @@
 package router

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

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

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

 type boardForm struct {
-	Name       string  `json:"name"`
-	Ident      string  `json:"ident"`
-	Tags       string  `json:"tags"`
-	Configs    string  `json:"configs"`
-	Public     int     `json:"public"`
-	PublicCate int     `json:"public_cate"`
-	Bgids      []int64 `json:"bgids"`
+	Name    string `json:"name"`
+	Ident   string `json:"ident"`
+	Tags    string `json:"tags"`
+	Configs string `json:"configs"`
+	Public  int    `json:"public"`
 }

 func (rt *Router) boardAdd(c *gin.Context) {
@@ -69,39 +65,9 @@ func (rt *Router) boardGet(c *gin.Context) {
 		}
 	}

-	if board.PublicCate == models.PublicLogin {
-		rt.auth()(c)
-	} else if board.PublicCate == models.PublicBusi {
-		rt.auth()(c)
-		rt.user()(c)
-
-		me := c.MustGet("user").(*models.User)
-		if !me.IsAdmin() {
-			bgids, err := models.MyBusiGroupIds(rt.Ctx, me.Id)
-			ginx.Dangerous(err)
-			if len(bgids) == 0 {
-				ginx.Bomb(http.StatusForbidden, "forbidden")
-			}
-
-			ok, err := models.BoardBusigroupCheck(rt.Ctx, board.Id, bgids)
-			ginx.Dangerous(err)
-			if !ok {
-				ginx.Bomb(http.StatusForbidden, "forbidden")
-			}
-		}
-	}
-
 	ginx.NewRender(c).Data(board, nil)
 }

-// 根据 bids 参数，获取多个 board
-func (rt *Router) boardGetsByBids(c *gin.Context) {
-	bids := str.IdsInt64(ginx.QueryStr(c, "bids", ""), ",")
-	boards, err := models.BoardGetsByBids(rt.Ctx, bids)
-	ginx.Dangerous(err)
-	ginx.NewRender(c).Data(boards, err)
-}
-
 func (rt *Router) boardPureGet(c *gin.Context) {
 	board, err := models.BoardGetByID(rt.Ctx, ginx.UrlParamInt64(c, "bid"))
 	ginx.Dangerous(err)
@@ -226,20 +192,10 @@ func (rt *Router) boardPutPublic(c *gin.Context) {
 	}

 	bo.Public = f.Public
-	bo.PublicCate = f.PublicCate
-
-	if bo.PublicCate == models.PublicBusi {
-		err := models.BoardBusigroupUpdate(rt.Ctx, bo.Id, f.Bgids)
-		ginx.Dangerous(err)
-	} else {
-		err := models.BoardBusigroupDelByBoardId(rt.Ctx, bo.Id)
-		ginx.Dangerous(err)
-	}
-
 	bo.UpdateBy = me.Username
 	bo.UpdateAt = time.Now().Unix()

-	err := bo.Update(rt.Ctx, "public", "public_cate", "update_by", "update_at")
+	err := bo.Update(rt.Ctx, "public", "update_by", "update_at")
 	ginx.NewRender(c).Data(bo, err)
 }

@@ -251,64 +207,21 @@ func (rt *Router) boardGets(c *gin.Context) {
 	ginx.NewRender(c).Data(boards, err)
 }

-func (rt *Router) publicBoardGets(c *gin.Context) {
-	me := c.MustGet("user").(*models.User)
-
-	bgids, err := models.MyBusiGroupIds(rt.Ctx, me.Id)
-	ginx.Dangerous(err)
-
-	boardIds, err := models.BoardIdsByBusiGroupIds(rt.Ctx, bgids)
-	ginx.Dangerous(err)
-
-	boards, err := models.BoardGets(rt.Ctx, "", "public=1 and (public_cate in (?) or id in (?))", []int64{0, 1}, boardIds)
-	ginx.NewRender(c).Data(boards, err)
-}
-
-func (rt *Router) boardGetsByGids(c *gin.Context) {
-	gids := str.IdsInt64(ginx.QueryStr(c, "gids", ""), ",")
-	query := ginx.QueryStr(c, "query", "")
-
-	if len(gids) > 0 {
-		for _, gid := range gids {
-			rt.bgroCheck(c, gid)
-		}
-	} else {
-		me := c.MustGet("user").(*models.User)
-		if !me.IsAdmin() {
-			var err error
-			gids, err = models.MyBusiGroupIds(rt.Ctx, me.Id)
-			ginx.Dangerous(err)
-
-			if len(gids) == 0 {
-				ginx.NewRender(c).Data([]int{}, nil)
-				return
-			}
-		}
-	}
-
-	boardBusigroups, err := models.BoardBusigroupGets(rt.Ctx)
-	ginx.Dangerous(err)
-	m := make(map[int64][]int64)
-	for _, boardBusigroup := range boardBusigroups {
-		m[boardBusigroup.BoardId] = append(m[boardBusigroup.BoardId], boardBusigroup.BusiGroupId)
-	}
-
-	boards, err := models.BoardGetsByBGIds(rt.Ctx, gids, query)
-	ginx.Dangerous(err)
-	for i := 0; i < len(boards); i++ {
-		if ids, ok := m[boards[i].Id]; ok {
-			boards[i].Bgids = ids
-		}
-	}
-
-	ginx.NewRender(c).Data(boards, err)
-}
-
 func (rt *Router) boardClone(c *gin.Context) {
 	me := c.MustGet("user").(*models.User)
 	bo := rt.Board(ginx.UrlParamInt64(c, "bid"))

-	newBoard := bo.Clone(me.Username, bo.GroupId, " Cloned")
+	newBoard := &models.Board{
+		Name:     bo.Name + " Copy",
+		Tags:     bo.Tags,
+		GroupId:  bo.GroupId,
+		CreateBy: me.Username,
+		UpdateBy: me.Username,
+	}
+
+	if bo.Ident != "" {
+		newBoard.Ident = uuid.NewString()
+	}

 	ginx.Dangerous(newBoard.Add(rt.Ctx))

@@ -322,39 +235,3 @@ func (rt *Router) boardClone(c *gin.Context) {

 	ginx.NewRender(c).Message(nil)
 }
-
-type boardsForm struct {
-	BoardIds []int64 `json:"board_ids"`
-	Bgids    []int64 `json:"bgids"`
-}
-
-func (rt *Router) boardBatchClone(c *gin.Context) {
-	me := c.MustGet("user").(*models.User)
-	var f boardsForm
-	ginx.BindJSON(c, &f)
-
-	for _, bgid := range f.Bgids {
-		rt.bgrwCheck(c, bgid)
-	}
-
-	reterr := make(map[string]string, len(f.BoardIds))
-	lang := c.GetHeader("X-Language")
-
-	for _, bgid := range f.Bgids {
-		for _, bid := range f.BoardIds {
-			bo := rt.Board(bid)
-			newBoard := bo.Clone(me.Username, bgid, "")
-			payload, err := models.BoardPayloadGet(rt.Ctx, bo.Id)
-			if err != nil {
-				reterr[fmt.Sprintf("%s-%d", newBoard.Name, bgid)] = i18n.Sprintf(lang, err.Error())
-				continue
-			}
-
-			if err = newBoard.AtomicAdd(rt.Ctx, payload); err != nil {
-				reterr[fmt.Sprintf("%s-%d", newBoard.Name, bgid)] = i18n.Sprintf(lang, err.Error())
-			}
-		}
-	}
-
-	ginx.NewRender(c).Data(reterr, nil)
-}
--- a/center/router/router_builtin.go
+++ b/center/router/router_builtin.go
@@ -78,7 +78,7 @@ func (rt *Router) builtinBoardCateGets(c *gin.Context) {
 	}

 	me := c.MustGet("user").(*models.User)
-	builtinFavoritesMap, err := models.BuiltinCateGetByUserId(rt.Ctx, me.Id)
+	buildinFavoritesMap, err := models.BuiltinCateGetByUserId(rt.Ctx, me.Id)
 	if err != nil {
 		logger.Warningf("get builtin favorites fail: %v", err)
 	}
@@ -91,9 +91,6 @@ func (rt *Router) builtinBoardCateGets(c *gin.Context) {
 		boardCate.Name = dir
 		files, err := file.FilesUnder(fp + "/" + dir + "/dashboards")
 		ginx.Dangerous(err)
-		if len(files) == 0 {
-			continue
-		}

 		var boards []Payload
 		for _, f := range files {
@@ -117,7 +114,7 @@ func (rt *Router) builtinBoardCateGets(c *gin.Context) {
 		}
 		boardCate.Boards = boards

-		if _, ok := builtinFavoritesMap[dir]; ok {
+		if _, ok := buildinFavoritesMap[dir]; ok {
 			boardCate.Favorite = true
 		}

@@ -173,7 +170,7 @@ func (rt *Router) builtinAlertCateGets(c *gin.Context) {
 	}

 	me := c.MustGet("user").(*models.User)
-	builtinFavoritesMap, err := models.BuiltinCateGetByUserId(rt.Ctx, me.Id)
+	buildinFavoritesMap, err := models.BuiltinCateGetByUserId(rt.Ctx, me.Id)
 	if err != nil {
 		logger.Warningf("get builtin favorites fail: %v", err)
 	}
@@ -210,7 +207,7 @@ func (rt *Router) builtinAlertCateGets(c *gin.Context) {
 			alertCate.IconUrl = fmt.Sprintf("/api/n9e/integrations/icon/%s/%s", dir, iconFiles[0])
 		}

-		if _, ok := builtinFavoritesMap[dir]; ok {
+		if _, ok := buildinFavoritesMap[dir]; ok {
 			alertCate.Favorite = true
 		}

@@ -233,7 +230,7 @@ func (rt *Router) builtinAlertRules(c *gin.Context) {
 	}

 	me := c.MustGet("user").(*models.User)
-	builtinFavoritesMap, err := models.BuiltinCateGetByUserId(rt.Ctx, me.Id)
+	buildinFavoritesMap, err := models.BuiltinCateGetByUserId(rt.Ctx, me.Id)
 	if err != nil {
 		logger.Warningf("get builtin favorites fail: %v", err)
 	}
@@ -246,9 +243,6 @@ func (rt *Router) builtinAlertRules(c *gin.Context) {
 		alertCate.Name = dir
 		files, err := file.FilesUnder(fp + "/" + dir + "/alerts")
 		ginx.Dangerous(err)
-		if len(files) == 0 {
-			continue
-		}

 		alertRules := make(map[string][]models.AlertRule)
 		for _, f := range files {
@@ -274,7 +268,7 @@ func (rt *Router) builtinAlertRules(c *gin.Context) {
 			alertCate.IconUrl = fmt.Sprintf("/api/n9e/integrations/icon/%s/%s", dir, iconFiles[0])
 		}

-		if _, ok := builtinFavoritesMap[dir]; ok {
+		if _, ok := buildinFavoritesMap[dir]; ok {
 			alertCate.Favorite = true
 		}

@@ -315,26 +309,3 @@ func (rt *Router) builtinIcon(c *gin.Context) {
 	iconPath := fp + "/" + cate + "/icon/" + ginx.UrlParamStr(c, "name")
 	c.File(path.Join(iconPath))
 }
-
-func (rt *Router) builtinMarkdown(c *gin.Context) {
-	fp := rt.Center.BuiltinIntegrationsDir
-	if fp == "" {
-		fp = path.Join(runner.Cwd, "integrations")
-	}
-	cate := ginx.UrlParamStr(c, "cate")
-
-	var markdown []byte
-	markdownDir := fp + "/" + cate + "/markdown"
-	markdownFiles, err := file.FilesUnder(markdownDir)
-	if err != nil {
-		logger.Warningf("get markdown fail: %v", err)
-	} else if len(markdownFiles) > 0 {
-		f := markdownFiles[0]
-		fn := markdownDir + "/" + f
-		markdown, err = file.ReadBytes(fn)
-		if err != nil {
-			logger.Warningf("get collect fail: %v", err)
-		}
-	}
-	ginx.NewRender(c).Data(string(markdown), nil)
-}
--- a/center/router/router_builtin_componet.go
+++ b/center/router/router_builtin_componet.go
@@ -1,92 +0,0 @@
-package router
-
-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)
-
-	username := Username(c)
-
-	count := len(lst)
-	if count == 0 {
-		ginx.Bomb(http.StatusBadRequest, "input json is empty")
-	}
-
-	reterr := make(map[string]string)
-	for i := 0; i < count; i++ {
-		if err := lst[i].Add(rt.Ctx, username); err != nil {
-			reterr[lst[i].Ident] = err.Error()
-		}
-	}
-
-	ginx.NewRender(c).Data(reterr, nil)
-}
-
-func (rt *Router) builtinComponentsGets(c *gin.Context) {
-	query := ginx.QueryStr(c, "query", "")
-
-	bc, err := models.BuiltinComponentGets(rt.Ctx, query)
-	ginx.Dangerous(err)
-
-	ginx.NewRender(c).Data(bc, nil)
-}
-
-func (rt *Router) builtinComponentsPut(c *gin.Context) {
-	var req models.BuiltinComponent
-	ginx.BindJSON(c, &req)
-
-	bc, err := models.BuiltinComponentGet(rt.Ctx, "id = ?", req.ID)
-	ginx.Dangerous(err)
-
-	if bc == nil {
-		ginx.NewRender(c, http.StatusNotFound).Message("No such builtin component")
-		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)
-}
-
-func (rt *Router) builtinComponentsDel(c *gin.Context) {
-	var req idsForm
-	ginx.BindJSON(c, &req)
-
-	req.Verify()
-
-	ginx.NewRender(c).Message(models.BuiltinComponentDels(rt.Ctx, req.Ids))
-}
--- a/center/router/router_builtin_metric_filter.go
+++ b/center/router/router_builtin_metric_filter.go
@@ -1,120 +0,0 @@
-package router
-
-import (
-	"github.com/ccfos/nightingale/v6/models"
-	"github.com/ccfos/nightingale/v6/pkg/prom"
-	"github.com/gin-gonic/gin"
-	"github.com/toolkits/pkg/ginx"
-)
-
-func (rt *Router) metricFilterGets(c *gin.Context) {
-	lst, err := models.MetricFilterGets(rt.Ctx, "")
-	ginx.Dangerous(err)
-	me := c.MustGet("user").(*models.User)
-
-	gids, err := models.MyGroupIds(rt.Ctx, me.Id)
-	ginx.Dangerous(err)
-	arr := make([]models.MetricFilter, 0)
-
-	for _, f := range lst {
-		if me.Username == f.CreateBy {
-			arr = append(arr, f)
-			continue
-		}
-
-		if HasPerm(gids, f.GroupsPerm, false) {
-			arr = append(arr, f)
-		}
-	}
-
-	ginx.NewRender(c).Data(arr, err)
-}
-
-func (rt *Router) metricFilterAdd(c *gin.Context) {
-	var f models.MetricFilter
-	ginx.BindJSON(c, &f)
-	me := c.MustGet("user").(*models.User)
-
-	f.CreateBy = me.Username
-	f.UpdateBy = me.Username
-	ginx.Dangerous(f.Add(rt.Ctx))
-	ginx.NewRender(c).Data(f, nil)
-}
-
-func (rt *Router) metricFilterDel(c *gin.Context) {
-	var f idsForm
-	ginx.BindJSON(c, &f)
-	f.Verify()
-
-	me := c.MustGet("user").(*models.User)
-
-	for _, id := range f.Ids {
-		old, err := models.MetricFilterGet(rt.Ctx, id)
-		ginx.Dangerous(err)
-
-		if me.Username != old.CreateBy {
-			gids, err := models.MyGroupIds(rt.Ctx, me.Id)
-			ginx.Dangerous(err)
-
-			if !HasPerm(gids, old.GroupsPerm, true) {
-				ginx.NewRender(c).Message("no permission")
-				return
-			}
-		}
-	}
-
-	ginx.NewRender(c).Message(models.MetricFilterDel(rt.Ctx, f.Ids))
-}
-
-func (rt *Router) metricFilterPut(c *gin.Context) {
-	var f models.MetricFilter
-	ginx.BindJSON(c, &f)
-
-	me := c.MustGet("user").(*models.User)
-	old, err := models.MetricFilterGet(rt.Ctx, f.ID)
-	ginx.Dangerous(err)
-
-	if me.Username != old.CreateBy {
-		gids, err := models.MyGroupIds(rt.Ctx, me.Id)
-		ginx.Dangerous(err)
-
-		if !HasPerm(gids, old.GroupsPerm, true) {
-			ginx.NewRender(c).Message("no permission")
-			return
-		}
-	}
-
-	f.UpdateBy = me.Username
-	ginx.NewRender(c).Message(f.Update(rt.Ctx))
-}
-
-type metricPromqlReq struct {
-	LabelFilter string `json:"label_filter"`
-	Promql      string `json:"promql"`
-}
-
-func (rt *Router) getMetricPromql(c *gin.Context) {
-	var req metricPromqlReq
-	ginx.BindJSON(c, &req)
-
-	promql := prom.AddLabelToPromQL(req.LabelFilter, req.Promql)
-	ginx.NewRender(c).Data(promql, nil)
-}
-
-func HasPerm(gids []int64, gps []models.GroupPerm, checkWrite bool) bool {
-	gmap := make(map[int64]struct{})
-	for _, gp := range gps {
-		if checkWrite && !gp.Write {
-			continue
-		}
-		gmap[gp.Gid] = struct{}{}
-	}
-
-	for _, gid := range gids {
-		if _, ok := gmap[gid]; ok {
-			return true
-		}
-	}
-
-	return false
-}
--- a/center/router/router_builtin_metrics.go
+++ b/center/router/router_builtin_metrics.go
@@ -1,116 +0,0 @@
-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
-func (rt *Router) builtinMetricsAdd(c *gin.Context) {
-	var lst []models.BuiltinMetric
-	ginx.BindJSON(c, &lst)
-	username := Username(c)
-	count := len(lst)
-	if count == 0 {
-		ginx.Bomb(http.StatusBadRequest, "input json is empty")
-	}
-
-	lang := c.GetHeader("X-Language")
-	if lang == "" {
-		lang = "zh_CN"
-	}
-
-	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())
-		}
-	}
-	ginx.NewRender(c).Data(reterr, nil)
-}
-
-func (rt *Router) builtinMetricsGets(c *gin.Context) {
-	collector := ginx.QueryStr(c, "collector", "")
-	typ := ginx.QueryStr(c, "typ", "")
-	query := ginx.QueryStr(c, "query", "")
-	limit := ginx.QueryInt(c, "limit", 20)
-	lang := c.GetHeader("X-Language")
-	unit := ginx.QueryStr(c, "unit", "")
-	if lang == "" {
-		lang = "zh_CN"
-	}
-
-	bm, err := models.BuiltinMetricGets(rt.Ctx, lang, collector, typ, query, unit, limit, ginx.Offset(c, limit))
-	ginx.Dangerous(err)
-
-	total, err := models.BuiltinMetricCount(rt.Ctx, lang, collector, typ, query, unit)
-	ginx.Dangerous(err)
-	ginx.NewRender(c).Data(gin.H{
-		"list":  bm,
-		"total": total,
-	}, nil)
-}
-
-func (rt *Router) builtinMetricsPut(c *gin.Context) {
-	var req models.BuiltinMetric
-	ginx.BindJSON(c, &req)
-
-	bm, err := models.BuiltinMetricGet(rt.Ctx, "id = ?", req.ID)
-	ginx.Dangerous(err)
-	if bm == nil {
-		ginx.NewRender(c, http.StatusNotFound).Message("No such builtin metric")
-		return
-	}
-	username := Username(c)
-
-	req.UpdatedBy = username
-	ginx.NewRender(c).Message(bm.Update(rt.Ctx, req))
-}
-
-func (rt *Router) builtinMetricsDel(c *gin.Context) {
-	var req idsForm
-	ginx.BindJSON(c, &req)
-	req.Verify()
-
-	ginx.NewRender(c).Message(models.BuiltinMetricDels(rt.Ctx, req.Ids))
-}
-
-func (rt *Router) builtinMetricsDefaultTypes(c *gin.Context) {
-	lst := []string{
-		"Linux",
-		"cAdvisor",
-		"Ping",
-		"MySQL",
-		"Redis",
-		"Kafka",
-		"Elasticsearch",
-		"PostgreSQL",
-		"MongoDB",
-		"Memcached",
-	}
-	ginx.NewRender(c).Data(lst, nil)
-}
-
-func (rt *Router) builtinMetricsTypes(c *gin.Context) {
-	collector := ginx.QueryStr(c, "collector", "")
-	query := ginx.QueryStr(c, "query", "")
-	lang := c.GetHeader("X-Language")
-
-	ginx.NewRender(c).Data(models.BuiltinMetricTypes(rt.Ctx, lang, collector, query))
-}
-
-func (rt *Router) builtinMetricsCollectors(c *gin.Context) {
-	typ := ginx.QueryStr(c, "typ", "")
-	query := ginx.QueryStr(c, "query", "")
-	lang := c.GetHeader("X-Language")
-
-	ginx.NewRender(c).Data(models.BuiltinMetricCollectors(rt.Ctx, lang, typ, query))
-}
--- a/center/router/router_builtin_payload.go
+++ b/center/router/router_builtin_payload.go
@@ -1,286 +0,0 @@
-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)
-
-	username := Username(c)
-
-	count := len(lst)
-	if count == 0 {
-		ginx.Bomb(http.StatusBadRequest, "input json is empty")
-	}
-
-	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().UnixMicro()
-					}
-
-					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().UnixMicro()
-			}
-
-			contentBytes, err := json.Marshal(alertRule)
-			if err != nil {
-				reterr[alertRule.Name] = err.Error()
-				continue
-			}
-
-			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:     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())
-			}
-		} 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().UnixMicro()
-					}
-
-					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().UnixMicro()
-			}
-
-			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())
-			}
-		} 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())
-			}
-		}
-
-	}
-
-	ginx.NewRender(c).Data(reterr, nil)
-}
-
-func (rt *Router) builtinPayloadsGets(c *gin.Context) {
-	typ := ginx.QueryStr(c, "type", "")
-	ComponentID := ginx.QueryInt64(c, "component_id", 0)
-
-	cate := ginx.QueryStr(c, "cate", "")
-	query := ginx.QueryStr(c, "query", "")
-
-	lst, err := models.BuiltinPayloadGets(rt.Ctx, uint64(ComponentID), typ, cate, query)
-	ginx.NewRender(c).Data(lst, err)
-}
-
-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)
-}
-
-func (rt *Router) builtinPayloadGet(c *gin.Context) {
-	id := ginx.UrlParamInt64(c, "id")
-
-	bp, err := models.BuiltinPayloadGet(rt.Ctx, "id = ?", id)
-	if err != nil {
-		ginx.Bomb(http.StatusInternalServerError, err.Error())
-	}
-	if bp == nil {
-		ginx.Bomb(http.StatusNotFound, "builtin payload not found")
-	}
-
-	ginx.NewRender(c).Data(bp, nil)
-}
-
-func (rt *Router) builtinPayloadsPut(c *gin.Context) {
-	var req models.BuiltinPayload
-	ginx.BindJSON(c, &req)
-
-	bp, err := models.BuiltinPayloadGet(rt.Ctx, "id = ?", req.ID)
-	ginx.Dangerous(err)
-
-	if bp == nil {
-		ginx.NewRender(c, http.StatusNotFound).Message("No such builtin payload")
-		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
-
-	ginx.NewRender(c).Message(bp.Update(rt.Ctx, req))
-}
-
-func (rt *Router) builtinPayloadsDel(c *gin.Context) {
-	var req idsForm
-	ginx.BindJSON(c, &req)
-
-	req.Verify()
-
-	ginx.NewRender(c).Message(models.BuiltinPayloadDels(rt.Ctx, req.Ids))
-}
-
-func (rt *Router) builtinPayloadsGetByUUIDOrID(c *gin.Context) {
-	uuid := ginx.QueryInt64(c, "uuid", 0)
-	// 优先以 uuid 为准
-	if uuid != 0 {
-		ginx.NewRender(c).Data(models.BuiltinPayloadGet(rt.Ctx, "uuid = ?", uuid))
-		return
-	}
-
-	id := ginx.QueryInt64(c, "id", 0)
-	ginx.NewRender(c).Data(models.BuiltinPayloadGet(rt.Ctx, "id = ?", id))
-}
--- a/center/router/router_busi_group.go
+++ b/center/router/router_busi_group.go
@@ -123,11 +123,6 @@ func (rt *Router) busiGroupGets(c *gin.Context) {
 	ginx.NewRender(c).Data(lst, err)
 }

-func (rt *Router) busiGroupGetsByService(c *gin.Context) {
-	lst, err := models.BusiGroupGetAll(rt.Ctx)
-	ginx.NewRender(c).Data(lst, err)
-}
-
 // 这个接口只有在活跃告警页面才调用，获取各个BG的活跃告警数量
 func (rt *Router) busiGroupAlertingsGets(c *gin.Context) {
 	ids := ginx.QueryStr(c, "ids", "")
@@ -140,12 +135,3 @@ func (rt *Router) busiGroupGet(c *gin.Context) {
 	ginx.Dangerous(bg.FillUserGroups(rt.Ctx))
 	ginx.NewRender(c).Data(bg, nil)
 }
-
-func (rt *Router) busiGroupsGetTags(c *gin.Context) {
-	bgids := str.IdsInt64(ginx.QueryStr(c, "gids", ""), ",")
-	targetIdents, err := models.TargetIndentsGetByBgids(rt.Ctx, bgids)
-	ginx.Dangerous(err)
-	tags, err := models.TargetGetTags(rt.Ctx, targetIdents, true, "busigroup")
-	ginx.Dangerous(err)
-	ginx.NewRender(c).Data(tags, nil)
-}
--- a/center/router/router_captcha.go
+++ b/center/router/router_captcha.go
@@ -1,114 +0,0 @@
-package router
-
-import (
-	"context"
-	"time"
-
-	"github.com/ccfos/nightingale/v6/storage"
-	"github.com/gin-gonic/gin"
-	captcha "github.com/mojocn/base64Captcha"
-	"github.com/toolkits/pkg/ginx"
-	"github.com/toolkits/pkg/logger"
-)
-
-type CaptchaRedisStore struct {
-	redis storage.Redis
-}
-
-func (s *CaptchaRedisStore) Set(id string, value string) error {
-	ctx := context.Background()
-	err := s.redis.Set(ctx, id, value, time.Duration(300*time.Second)).Err()
-	if err != nil {
-		logger.Errorf("captcha id set to redis error : %s", err.Error())
-		return err
-	}
-	return nil
-}
-
-func (s *CaptchaRedisStore) Get(id string, clear bool) string {
-	ctx := context.Background()
-	val, err := s.redis.Get(ctx, id).Result()
-	if err != nil {
-		logger.Errorf("captcha id get from redis error : %s", err.Error())
-		return ""
-	}
-
-	if clear {
-		s.redis.Del(ctx, id)
-	}
-
-	return val
-}
-
-func (s *CaptchaRedisStore) Verify(id, answer string, clear bool) bool {
-
-	old := s.Get(id, clear)
-	return old == answer
-}
-
-func (rt *Router) newCaptchaRedisStore() *CaptchaRedisStore {
-	if captchaStore == nil {
-		captchaStore = &CaptchaRedisStore{redis: rt.Redis}
-	}
-	return captchaStore
-}
-
-var captchaStore *CaptchaRedisStore
-
-type CaptchaReqBody struct {
-	Id          string
-	VerifyValue string
-}
-
-// 生成图形验证码
-func (rt *Router) generateCaptcha(c *gin.Context) {
-	var driver = captcha.NewDriverMath(60, 200, 0, captcha.OptionShowHollowLine, nil, nil, []string{"wqy-microhei.ttc"})
-	cc := captcha.NewCaptcha(driver, rt.newCaptchaRedisStore())
-	//data:image/png;base64
-	id, b64s, _, err := cc.Generate()
-
-	if err != nil {
-		ginx.NewRender(c).Message(err)
-		return
-	}
-
-	ginx.NewRender(c).Data(gin.H{
-		"imgdata":   b64s,
-		"captchaid": id,
-	}, nil)
-}
-
-// 验证
-func (rt *Router) captchaVerify(c *gin.Context) {
-
-	var param CaptchaReqBody
-	ginx.BindJSON(c, &param)
-
-	//verify the captcha
-	if captchaStore.Verify(param.Id, param.VerifyValue, true) {
-		ginx.NewRender(c).Message("")
-		return
-	}
-	ginx.NewRender(c).Message("incorrect verification code")
-}
-
-// 验证码开关
-func (rt *Router) ifShowCaptcha(c *gin.Context) {
-
-	if rt.HTTP.ShowCaptcha.Enable {
-		ginx.NewRender(c).Data(gin.H{
-			"show": true,
-		}, nil)
-		return
-	}
-
-	ginx.NewRender(c).Data(gin.H{
-		"show": false,
-	}, nil)
-}
-
-// 验证
-func CaptchaVerify(id string, value string) bool {
-	//verify the captcha
-	return captchaStore.Verify(id, value, true)
-}
--- a/center/router/router_config.go
+++ b/center/router/router_config.go
@@ -62,8 +62,3 @@ func (rt *Router) contactKeysGets(c *gin.Context) {

 	ginx.NewRender(c).Data(labelAndKeys, nil)
 }
-
-func (rt *Router) siteInfo(c *gin.Context) {
-	config, err := models.ConfigsGet(rt.Ctx, "site_info")
-	ginx.NewRender(c).Data(config, err)
-}
--- a/center/router/router_configs.go
+++ b/center/router/router_configs.go
@@ -1,16 +1,12 @@
 package router

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

 	"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)
@@ -24,71 +20,28 @@ func (rt *Router) configGet(c *gin.Context) {
 	ginx.NewRender(c).Data(configs, err)
 }

-func (rt *Router) configGetAll(c *gin.Context) {
-	config, err := models.ConfigsGetAll(rt.Ctx)
-	ginx.NewRender(c).Data(config, err)
-}
-
-func (rt *Router) configGetByKey(c *gin.Context) {
-	config, err := models.ConfigsGet(rt.Ctx, ginx.QueryStr(c, "key"))
-	ginx.NewRender(c).Data(config, err)
-}
-
-func (rt *Router) configPutByKey(c *gin.Context) {
-	var f models.Configs
-	ginx.BindJSON(c, &f)
-	username := c.MustGet("username").(string)
-	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)
 	ginx.NewRender(c).Message(models.ConfigsDel(rt.Ctx, f.Ids))
 }

-func (rt *Router) configsPut(c *gin.Context) { //for APIForService
+func (rt *Router) configsPut(c *gin.Context) {
 	var arr []models.Configs
 	ginx.BindJSON(c, &arr)
-	username := c.GetString("user")
-	if username == "" {
-		username = "default"
-	}
-	now := time.Now().Unix()
+
 	for i := 0; i < len(arr); i++ {
-		arr[i].UpdateBy = username
-		arr[i].UpdateAt = now
 		ginx.Dangerous(arr[i].Update(rt.Ctx))
 	}

 	ginx.NewRender(c).Message(nil)
 }

-func (rt *Router) configsPost(c *gin.Context) { //for APIForService
+func (rt *Router) configsPost(c *gin.Context) {
 	var arr []models.Configs
 	ginx.BindJSON(c, &arr)
-	username := c.GetString("user")
-	if username == "" {
-		username = "default"
-	}
-	now := time.Now().Unix()
+
 	for i := 0; i < len(arr); i++ {
-		arr[i].CreateBy = username
-		arr[i].UpdateBy = username
-		arr[i].CreateAt = now
-		arr[i].UpdateAt = now
 		ginx.Dangerous(arr[i].Add(rt.Ctx))
 	}

--- a/center/router/router_datasource.go
+++ b/center/router/router_datasource.go
@@ -3,10 +3,8 @@ package router
 import (
 	"crypto/tls"
 	"fmt"
-	"io"
 	"net/http"
 	"net/url"
-	"strings"

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

@@ -26,11 +24,6 @@ type listReq struct {
 }

 func (rt *Router) datasourceList(c *gin.Context) {
-	if rt.DatasourceCache.DatasourceCheckHook(c) {
-		Render(c, []int{}, nil)
-		return
-	}
-
 	var req listReq
 	ginx.BindJSON(c, &req)

@@ -38,52 +31,33 @@ func (rt *Router) datasourceList(c *gin.Context) {
 	category := req.Category
 	name := req.Name

-	user := c.MustGet("user").(*models.User)
-
 	list, err := models.GetDatasourcesGetsBy(rt.Ctx, typ, category, name, "")
-	Render(c, rt.DatasourceCache.DatasourceFilter(list, user), err)
+	Render(c, list, err)
 }

-func (rt *Router) datasourceGetsByService(c *gin.Context) {
-	typ := ginx.QueryStr(c, "typ", "")
-	lst, err := models.GetDatasourcesGetsBy(rt.Ctx, typ, "", "", "")
-	ginx.NewRender(c).Data(lst, err)
+type datasourceBrief struct {
+	Id         int64  `json:"id"`
+	Name       string `json:"name"`
+	PluginType string `json:"plugin_type"`
 }

 func (rt *Router) datasourceBriefs(c *gin.Context) {
-	var dss []*models.Datasource
+	var dss []datasourceBrief
 	list, err := models.GetDatasourcesGetsBy(rt.Ctx, "", "", "", "")
 	ginx.Dangerous(err)

-	for _, item := range list {
-		item.AuthJson.BasicAuthPassword = ""
-		if item.PluginType != models.PROMETHEUS {
-			item.SettingsJson = nil
-		} else {
-			for k, v := range item.SettingsJson {
-				if strings.HasPrefix(k, "prometheus.") {
-					item.SettingsJson[strings.TrimPrefix(k, "prometheus.")] = v
-					delete(item.SettingsJson, k)
-				}
-			}
-		}
-		dss = append(dss, item)
-	}
-
-	if !rt.Center.AnonymousAccess.PromQuerier {
-		user := c.MustGet("user").(*models.User)
-		dss = rt.DatasourceCache.DatasourceFilter(dss, user)
+	for i := range list {
+		dss = append(dss, datasourceBrief{
+			Id:         list[i].Id,
+			Name:       list[i].Name,
+			PluginType: list[i].PluginType,
+		})
 	}

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

 func (rt *Router) datasourceUpsert(c *gin.Context) {
-	if rt.DatasourceCache.DatasourceCheckHook(c) {
-		Render(c, []int{}, nil)
-		return
-	}
-
 	var req models.Datasource
 	ginx.BindJSON(c, &req)
 	username := Username(c)
@@ -92,12 +66,10 @@ func (rt *Router) datasourceUpsert(c *gin.Context) {
 	var err error
 	var count int64

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

 	if req.Id == 0 {
@@ -115,21 +87,15 @@ func (rt *Router) datasourceUpsert(c *gin.Context) {
 		}
 		err = req.Add(rt.Ctx)
 	} else {
-		err = req.Update(rt.Ctx, "name", "description", "cluster_name", "settings", "http", "auth", "updated_by", "updated_at", "is_default")
+		err = req.Update(rt.Ctx, "name", "description", "cluster_name", "settings", "http", "auth", "updated_by", "updated_at")
 	}

 	Render(c, nil, err)
 }

 func DatasourceCheck(ds models.Datasource) error {
-	if ds.PluginType != models.ELASTICSEARCH {
-		if ds.HTTPJson.Url == "" {
-			return fmt.Errorf("url is empty")
-		}
-
-		if !strings.HasPrefix(ds.HTTPJson.Url, "http") {
-			return fmt.Errorf("url must start with http or https")
-		}
+	if ds.HTTPJson.Url == "" {
+		return fmt.Errorf("url is empty")
 	}

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

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

 	if ds.PluginType == models.PROMETHEUS {
 		subPath := "/api/v1/query"
 		query := url.Values{}
-		if ds.HTTPJson.IsLoki() {
-			subPath = "/api/v1/labels"
-		} else {
-			query.Add("query", "1+1")
-		}
+		query.Add("query", "1+1")
 		fullURL = fmt.Sprintf("%s%s?%s", ds.HTTPJson.Url, subPath, query.Encode())

-		req, err = http.NewRequest("GET", fullURL, nil)
-		if err != nil {
-			logger.Errorf("Error creating request: %v", err)
-			return fmt.Errorf("request url:%s failed", fullURL)
-		}
-	} else if ds.PluginType == models.TDENGINE {
-		fullURL = fmt.Sprintf("%s/rest/sql", ds.HTTPJson.Url)
-		req, err = http.NewRequest("POST", fullURL, strings.NewReader("show databases"))
-		if err != nil {
-			logger.Errorf("Error creating request: %v", err)
-			return fmt.Errorf("request url:%s failed", fullURL)
-		}
-	}
-
-	if ds.PluginType == models.LOKI {
-		subPath := "/api/v1/labels"
-
-		fullURL = fmt.Sprintf("%s%s", ds.HTTPJson.Url, subPath)
-
-		req, err = http.NewRequest("GET", fullURL, nil)
+		req, err = http.NewRequest("POST", fullURL, nil)
 		if err != nil {
 			logger.Errorf("Error creating request: %v", err)
 			return fmt.Errorf("request url:%s failed", fullURL)
@@ -200,19 +143,13 @@ func DatasourceCheck(ds models.Datasource) error {

 	if resp.StatusCode != 200 {
 		logger.Errorf("Error making request: %v\n", resp.StatusCode)
-		body, _ := io.ReadAll(resp.Body)
-		return fmt.Errorf("request url:%s failed code:%d body:%s", fullURL, resp.StatusCode, string(body))
+		return fmt.Errorf("request url:%s failed code:%d", fullURL, resp.StatusCode)
 	}

 	return nil
 }

 func (rt *Router) datasourceGet(c *gin.Context) {
-	if rt.DatasourceCache.DatasourceCheckHook(c) {
-		Render(c, []int{}, nil)
-		return
-	}
-
 	var req models.Datasource
 	ginx.BindJSON(c, &req)
 	err := req.Get(rt.Ctx)
@@ -220,11 +157,6 @@ func (rt *Router) datasourceGet(c *gin.Context) {
 }

 func (rt *Router) datasourceUpdataStatus(c *gin.Context) {
-	if rt.DatasourceCache.DatasourceCheckHook(c) {
-		Render(c, []int{}, nil)
-		return
-	}
-
 	var req models.Datasource
 	ginx.BindJSON(c, &req)
 	username := Username(c)
@@ -234,54 +166,13 @@ func (rt *Router) datasourceUpdataStatus(c *gin.Context) {
 }

 func (rt *Router) datasourceDel(c *gin.Context) {
-	if rt.DatasourceCache.DatasourceCheckHook(c) {
-		Render(c, []int{}, nil)
-		return
-	}
-
 	var ids []int64
 	ginx.BindJSON(c, &ids)
 	err := models.DatasourceDel(rt.Ctx, ids)
 	Render(c, nil, err)
 }

-func (rt *Router) getDatasourceIds(c *gin.Context) {
-	name := ginx.QueryStr(c, "name")
-	datasourceIds, err := models.GetDatasourceIdsByEngineName(rt.Ctx, name)
+func Username(c *gin.Context) string {

-	ginx.NewRender(c).Data(datasourceIds, err)
-}
-
-type datasourceQueryForm struct {
-	Cate              string                   `json:"datasource_cate"`
-	DatasourceQueries []models.DatasourceQuery `json:"datasource_queries"`
-}
-
-type datasourceQueryResp struct {
-	ID   int64  `json:"id"`
-	Name string `json:"name"`
-}
-
-func (rt *Router) datasourceQuery(c *gin.Context) {
-	var dsf datasourceQueryForm
-	ginx.BindJSON(c, &dsf)
-	datasources, err := models.GetDatasourcesGetsByTypes(rt.Ctx, []string{dsf.Cate})
-	ginx.Dangerous(err)
-
-	nameToID := make(map[string]int64)
-	IDToName := make(map[int64]string)
-	for _, ds := range datasources {
-		nameToID[ds.Name] = ds.Id
-		IDToName[ds.Id] = ds.Name
-	}
-
-	ids := models.GetDatasourceIDsByDatasourceQueries(dsf.DatasourceQueries, IDToName, nameToID)
-	var req []datasourceQueryResp
-	for _, id := range ids {
-		req = append(req, datasourceQueryResp{
-			ID:   id,
-			Name: IDToName[id],
-		})
-	}
-	ginx.NewRender(c).Data(req, err)
+	return c.MustGet("username").(string)
 }
--- a/center/router/router_es_index_pattern.go
+++ b/center/router/router_es_index_pattern.go
@@ -1,81 +0,0 @@
-package router
-
-import (
-	"net/http"
-	"time"
-
-	"github.com/ccfos/nightingale/v6/models"
-	"github.com/gin-gonic/gin"
-	"github.com/toolkits/pkg/ginx"
-)
-
-// 创建 ES Index Pattern
-func (rt *Router) esIndexPatternAdd(c *gin.Context) {
-	var f models.EsIndexPattern
-	ginx.BindJSON(c, &f)
-
-	username := c.MustGet("username").(string)
-	now := time.Now().Unix()
-	f.CreateAt = now
-	f.CreateBy = username
-	f.UpdateAt = now
-	f.UpdateBy = username
-
-	err := f.Add(rt.Ctx)
-	ginx.NewRender(c).Message(err)
-}
-
-// 更新 ES Index Pattern
-func (rt *Router) esIndexPatternPut(c *gin.Context) {
-	var f models.EsIndexPattern
-	ginx.BindJSON(c, &f)
-
-	id := ginx.QueryInt64(c, "id")
-
-	esIndexPattern, err := models.EsIndexPatternGetById(rt.Ctx, id)
-	ginx.Dangerous(err)
-
-	if esIndexPattern == nil {
-		ginx.NewRender(c, http.StatusNotFound).Message("No such EsIndexPattern")
-		return
-	}
-
-	f.UpdateBy = c.MustGet("username").(string)
-
-	ginx.NewRender(c).Message(esIndexPattern.Update(rt.Ctx, f))
-}
-
-// 删除 ES Index Pattern
-func (rt *Router) esIndexPatternDel(c *gin.Context) {
-	var f idsForm
-	ginx.BindJSON(c, &f)
-
-	if len(f.Ids) == 0 {
-		ginx.Bomb(http.StatusBadRequest, "ids empty")
-	}
-
-	ginx.NewRender(c).Message(models.EsIndexPatternDel(rt.Ctx, f.Ids))
-}
-
-// ES Index Pattern列表
-func (rt *Router) esIndexPatternGetList(c *gin.Context) {
-	datasourceId := ginx.QueryInt64(c, "datasource_id", 0)
-
-	var lst []*models.EsIndexPattern
-	var err error
-	if datasourceId != 0 {
-		lst, err = models.EsIndexPatternGets(rt.Ctx, "datasource_id = ?", datasourceId)
-	} else {
-		lst, err = models.EsIndexPatternGets(rt.Ctx, "")
-	}
-
-	ginx.NewRender(c).Data(lst, err)
-}
-
-// ES Index Pattern 单个数据
-func (rt *Router) esIndexPatternGet(c *gin.Context) {
-	id := ginx.QueryInt64(c, "id")
-
-	item, err := models.EsIndexPatternGet(rt.Ctx, "id=?", id)
-	ginx.NewRender(c).Data(item, err)
-}
--- a/center/router/router_funcs.go
+++ b/center/router/router_funcs.go
@@ -1,62 +1,22 @@
 package router

 import (
+	"fmt"
 	"net/http"
 	"strconv"
 	"strings"

+	"github.com/ccfos/nightingale/v6/alert/aconf"
 	"github.com/ccfos/nightingale/v6/models"
 	"github.com/ccfos/nightingale/v6/pkg/ctx"
-
+	"github.com/ccfos/nightingale/v6/pkg/ibex"
 	"github.com/gin-gonic/gin"
+
 	"github.com/toolkits/pkg/ginx"
 )

 const defaultLimit = 300

-func (rt *Router) statistic(c *gin.Context) {
-	name := ginx.QueryStr(c, "name")
-	var model interface{}
-	var err error
-	var statistics *models.Statistics
-	switch name {
-	case "alert_mute":
-		model = models.AlertMute{}
-	case "alert_rule":
-		model = models.AlertRule{}
-	case "alert_subscribe":
-		model = models.AlertSubscribe{}
-	case "busi_group":
-		model = models.BusiGroup{}
-	case "recording_rule":
-		model = models.RecordingRule{}
-	case "target":
-		model = models.Target{}
-	case "user":
-		model = models.User{}
-	case "user_group":
-		model = models.UserGroup{}
-	case "datasource":
-		// datasource update_at is different from others
-		statistics, err = models.DatasourceStatistics(rt.Ctx)
-		ginx.NewRender(c).Data(statistics, err)
-		return
-	case "user_variable":
-		statistics, err = models.ConfigsUserVariableStatistics(rt.Ctx)
-		ginx.NewRender(c).Data(statistics, err)
-		return
-	case "cval":
-		statistics, err = models.ConfigCvalStatistics(rt.Ctx)
-		ginx.NewRender(c).Data(statistics, err)
-		return
-	default:
-		ginx.Bomb(http.StatusBadRequest, "invalid name")
-	}
-
-	statistics, err = models.StatisticsGet(rt.Ctx, model)
-	ginx.NewRender(c).Data(statistics, err)
-}
-
 func queryDatasourceIds(c *gin.Context) []int64 {
 	datasourceIds := ginx.QueryStr(c, "datasource_ids", "")
 	datasourceIds = strings.ReplaceAll(datasourceIds, ",", " ")
@@ -69,26 +29,8 @@ 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"`
+	Ids []int64 `json:"ids"`
 }

 func (f idsForm) Verify() {
@@ -153,11 +95,27 @@ type TaskCreateReply struct {
 	Dat int64  `json:"dat"` // task.id
 }

-func Username(c *gin.Context) string {
-	username := c.GetString(gin.AuthUserKey)
-	if username == "" {
-		user := c.MustGet("user").(*models.User)
-		username = user.Username
+// return task.id, error
+func TaskCreate(v interface{}, ibexc aconf.Ibex) (int64, error) {
+	var res TaskCreateReply
+	err := ibex.New(
+		ibexc.Address,
+		ibexc.BasicAuthUser,
+		ibexc.BasicAuthPass,
+		ibexc.Timeout,
+	).
+		Path("/ibex/v1/tasks").
+		In(v).
+		Out(&res).
+		POST()
+
+	if err != nil {
+		return 0, err
 	}
-	return username
+
+	if res.Err != "" {
+		return 0, fmt.Errorf("response.err: %v", res.Err)
+	}
+
+	return res.Dat, nil
 }
--- a/center/router/router_heartbeat.go
+++ b/center/router/router_heartbeat.go
@@ -3,35 +3,16 @@ package router
 import (
 	"compress/gzip"
 	"encoding/json"
-	"errors"
 	"io/ioutil"
-	"sort"
-	"strconv"
-	"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
@@ -40,7 +21,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)
@@ -48,156 +29,13 @@ 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
-	}
+	ginx.Dangerous(err)

-	if req.Hostname == "" {
-		return req, errors.New("hostname is required")
-	}
-
-	// maybe from pushgw
-	if req.Offset == 0 {
-		req.Offset = (time.Now().UnixMilli() - req.UnixTime)
-	}
-
-	if req.RemoteAddr == "" {
-		req.RemoteAddr = c.ClientIP()
-	}
-
-	if req.EngineName == "" {
-		req.EngineName = engineName
-	}
-
-	metaSet.Set(req.Hostname, req)
-	var items = make(map[string]struct{})
-	items[req.Hostname] = struct{}{}
-	identSet.MSet(items)
-
-	if target, has := targetCache.Get(req.Hostname); has && target != nil {
-		gidsStr := ginx.QueryStr(c, "gid", "")
-		overwriteGids := ginx.QueryBool(c, "overwrite_gids", false)
-		hostIp := strings.TrimSpace(req.HostIp)
-		gids := strings.Split(gidsStr, ",")
-
-		if overwriteGids {
-			groupIds := make([]int64, 0)
-			for i := range gids {
-				if gids[i] == "" {
-					continue
-				}
-				groupId, err := strconv.ParseInt(gids[i], 10, 64)
-				if err != nil {
-					logger.Warningf("update target:%s group ids failed, err: %v", req.Hostname, err)
-					continue
-				}
-				groupIds = append(groupIds, groupId)
-			}
-
-			err := models.TargetOverrideBgids(ctx, []string{target.Ident}, groupIds, nil)
-			if err != nil {
-				logger.Warningf("update target:%s group ids failed, err: %v", target.Ident, err)
-			}
-		} else if gidsStr != "" {
-			for i := range gids {
-				groupId, err := strconv.ParseInt(gids[i], 10, 64)
-				if err != nil {
-					logger.Warningf("update target:%s group ids failed, err: %v", req.Hostname, err)
-					continue
-				}
-
-				if !target.MatchGroupId(groupId) {
-					err := models.TargetBindBgids(ctx, []string{target.Ident}, []int64{groupId}, nil)
-					if err != nil {
-						logger.Warningf("update target:%s group ids failed, err: %v", target.Ident, err)
-					}
-				}
-			}
-		}
-
-		newTarget := models.Target{}
-		targetNeedUpdate := false
-		if hostIp != "" && hostIp != target.HostIp {
-			newTarget.HostIp = hostIp
-			targetNeedUpdate = true
-		}
-
-		hostTagsMap := target.GetHostTagsMap()
-		hostTagNeedUpdate := false
-		if len(hostTagsMap) != len(req.GlobalLabels) {
-			hostTagNeedUpdate = true
-		} else {
-			for k, v := range req.GlobalLabels {
-				if v == "" {
-					continue
-				}
-
-				if tagv, ok := hostTagsMap[k]; !ok || tagv != v {
-					hostTagNeedUpdate = true
-					break
-				}
-			}
-		}
-
-		if hostTagNeedUpdate {
-			lst := []string{}
-			for k, v := range req.GlobalLabels {
-				lst = append(lst, k+"="+v)
-			}
-			sort.Strings(lst)
-			newTarget.HostTags = lst
-			targetNeedUpdate = true
-		}
-
-		userTagsMap := target.GetTagsMap()
-		userTagNeedUpdate := false
-		userTags := []string{}
-		for k, v := range userTagsMap {
-			if v == "" {
-				continue
-			}
-
-			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
-		}
-
-		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 err != nil {
-				logger.Errorf("update target fields failed, err: %v", err)
-			}
-		}
-		logger.Debugf("heartbeat field:%+v target: %v", newTarget, *target)
-	}
-
-	return req, nil
+	req.Offset = (time.Now().UnixMilli() - req.UnixTime)
+	rt.MetaSet.Set(req.Hostname, req)
+	ginx.NewRender(c).Message(nil)
 }
--- a/center/router/router_login.go
+++ b/center/router/router_login.go
@@ -1,75 +1,50 @@
 package router

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

 	"github.com/ccfos/nightingale/v6/models"
 	"github.com/ccfos/nightingale/v6/pkg/cas"
 	"github.com/ccfos/nightingale/v6/pkg/ldapx"
 	"github.com/ccfos/nightingale/v6/pkg/oauth2x"
 	"github.com/ccfos/nightingale/v6/pkg/oidcx"
-	"github.com/ccfos/nightingale/v6/pkg/secu"
+	"github.com/pelletier/go-toml/v2"

 	"github.com/dgrijalva/jwt-go"
 	"github.com/gin-gonic/gin"
-	"github.com/pelletier/go-toml/v2"
 	"github.com/toolkits/pkg/ginx"
 	"github.com/toolkits/pkg/logger"
 )

 type loginForm struct {
-	Username    string `json:"username" binding:"required"`
-	Password    string `json:"password" binding:"required"`
-	Captchaid   string `json:"captchaid"`
-	Verifyvalue string `json:"verifyvalue"`
+	Username string `json:"username" binding:"required"`
+	Password string `json:"password" binding:"required"`
 }

 func (rt *Router) loginPost(c *gin.Context) {
 	var f loginForm
 	ginx.BindJSON(c, &f)
-	logger.Infof("username:%s login from:%s", f.Username, c.ClientIP())

-	if rt.HTTP.ShowCaptcha.Enable {
-		if !CaptchaVerify(f.Captchaid, f.Verifyvalue) {
-			ginx.NewRender(c).Message("incorrect verification code")
-			return
-		}
-	}
-	authPassWord := f.Password
-	// need decode
-	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)
+	user, err := models.PassLogin(rt.Ctx, f.Username, f.Password)
+	if err != nil {
+		// pass validate fail, try ldap
+		if rt.Sso.LDAP.Enable {
+			roles := strings.Join(rt.Sso.LDAP.DefaultRoles, " ")
+			user, err = models.LdapLogin(rt.Ctx, f.Username, f.Password, roles, rt.Sso.LDAP)
+			if err != nil {
+				logger.Debugf("ldap login failed: %v username: %s", err, f.Username)
+				ginx.NewRender(c).Message(err)
+				return
+			}
+			user.RolesLst = strings.Fields(user.Roles)
+		} else {
 			ginx.NewRender(c).Message(err)
 			return
 		}
-		authPassWord = decPassWord
-	}
-
-	var user *models.User
-	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)
-		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 {
-				ginx.NewRender(c).Message("ldap login failed: %v; n9e login failed: %v", err, errLoginInN9e)
-				return
-			}
-		} else {
-			user.RolesLst = strings.Fields(user.Roles)
-		}
-	} else {
-		user, err = models.PassLogin(rt.Ctx, rt.Redis, f.Username, authPassWord)
-		ginx.Dangerous(err)
 	}

 	if user == nil {
@@ -92,7 +67,6 @@ func (rt *Router) loginPost(c *gin.Context) {
 }

 func (rt *Router) logoutPost(c *gin.Context) {
-	logger.Infof("username:%s logout from:%s", c.GetString("username"), c.ClientIP())
 	metadata, err := rt.extractTokenMetadata(c.Request)
 	if err != nil {
 		ginx.NewRender(c, http.StatusBadRequest).Message("failed to parse jwt token")
@@ -105,18 +79,7 @@ func (rt *Router) logoutPost(c *gin.Context) {
 		return
 	}

-	var logoutAddr string
-	user := c.MustGet("user").(*models.User)
-	switch user.Belong {
-	case "oidc":
-		logoutAddr = rt.Sso.OIDC.GetSsoLogoutAddr()
-	case "cas":
-		logoutAddr = rt.Sso.CAS.GetSsoLogoutAddr()
-	case "oauth2":
-		logoutAddr = rt.Sso.OAuth2.GetSsoLogoutAddr()
-	}
-
-	ginx.NewRender(c).Data(logoutAddr, nil)
+	ginx.NewRender(c).Message("")
 }

 type refreshForm struct {
@@ -244,7 +207,7 @@ func (rt *Router) loginCallback(c *gin.Context) {

 	ret, err := rt.Sso.OIDC.Callback(rt.Redis, c.Request.Context(), code, state)
 	if err != nil {
-		logger.Errorf("sso_callback fail. code:%s, state:%s, get ret: %+v. error: %v", code, state, ret, err)
+		logger.Debugf("sso.callback() get ret %+v error %v", ret, err)
 		ginx.NewRender(c).Data(CallbackOutput{}, err)
 		return
 	}
@@ -254,23 +217,41 @@ func (rt *Router) loginCallback(c *gin.Context) {

 	if user != nil {
 		if rt.Sso.OIDC.CoverAttributes {
-			updatedFields := user.UpdateSsoFields("oidc", ret.Nickname, ret.Phone, ret.Email)
-			ginx.Dangerous(user.Update(rt.Ctx, "update_at", updatedFields...))
+			if ret.Nickname != "" {
+				user.Nickname = ret.Nickname
+			}
+
+			if ret.Email != "" {
+				user.Email = ret.Email
+			}
+
+			if ret.Phone != "" {
+				user.Phone = ret.Phone
+			}
+
+			user.UpdateAt = time.Now().Unix()
+			user.Update(rt.Ctx, "email", "nickname", "phone", "update_at")
 		}
 	} else {
-		user = new(models.User)
-		user.FullSsoFields("oidc", ret.Username, ret.Nickname, ret.Phone, ret.Email, rt.Sso.OIDC.DefaultRoles)
+		now := time.Now().Unix()
+		user = &models.User{
+			Username: ret.Username,
+			Password: "******",
+			Nickname: ret.Nickname,
+			Phone:    ret.Phone,
+			Email:    ret.Email,
+			Portrait: "",
+			Roles:    strings.Join(rt.Sso.OIDC.DefaultRoles, " "),
+			RolesLst: rt.Sso.OIDC.DefaultRoles,
+			Contacts: []byte("{}"),
+			CreateAt: now,
+			UpdateAt: now,
+			CreateBy: "oidc",
+			UpdateBy: "oidc",
+		}
+
 		// 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
@@ -346,12 +327,38 @@ func (rt *Router) loginCallbackCas(c *gin.Context) {
 	ginx.Dangerous(err)
 	if user != nil {
 		if rt.Sso.CAS.CoverAttributes {
-			updatedFields := user.UpdateSsoFields("cas", ret.Nickname, ret.Phone, ret.Email)
-			ginx.Dangerous(user.Update(rt.Ctx, "update_at", updatedFields...))
+			if ret.Nickname != "" {
+				user.Nickname = ret.Nickname
+			}
+
+			if ret.Email != "" {
+				user.Email = ret.Email
+			}
+
+			if ret.Phone != "" {
+				user.Phone = ret.Phone
+			}
+
+			user.UpdateAt = time.Now().Unix()
+			ginx.Dangerous(user.Update(rt.Ctx, "email", "nickname", "phone", "update_at"))
 		}
 	} else {
-		user = new(models.User)
-		user.FullSsoFields("cas", ret.Username, ret.Nickname, ret.Phone, ret.Email, rt.Sso.CAS.DefaultRoles)
+		now := time.Now().Unix()
+		user = &models.User{
+			Username: ret.Username,
+			Password: "******",
+			Nickname: ret.Nickname,
+			Portrait: "",
+			Roles:    strings.Join(rt.Sso.CAS.DefaultRoles, " "),
+			RolesLst: rt.Sso.CAS.DefaultRoles,
+			Contacts: []byte("{}"),
+			Phone:    ret.Phone,
+			Email:    ret.Email,
+			CreateAt: now,
+			UpdateAt: now,
+			CreateBy: "CAS",
+			UpdateBy: "CAS",
+		}
 		// create user from cas
 		ginx.Dangerous(user.Add(rt.Ctx))
 	}
@@ -422,12 +429,39 @@ func (rt *Router) loginCallbackOAuth(c *gin.Context) {

 	if user != nil {
 		if rt.Sso.OAuth2.CoverAttributes {
-			updatedFields := user.UpdateSsoFields("oauth2", ret.Nickname, ret.Phone, ret.Email)
-			ginx.Dangerous(user.Update(rt.Ctx, "update_at", updatedFields...))
+			if ret.Nickname != "" {
+				user.Nickname = ret.Nickname
+			}
+
+			if ret.Email != "" {
+				user.Email = ret.Email
+			}
+
+			if ret.Phone != "" {
+				user.Phone = ret.Phone
+			}
+
+			user.UpdateAt = time.Now().Unix()
+			user.Update(rt.Ctx, "email", "nickname", "phone", "update_at")
 		}
 	} else {
-		user = new(models.User)
-		user.FullSsoFields("oauth2", ret.Username, ret.Nickname, ret.Phone, ret.Email, rt.Sso.OAuth2.DefaultRoles)
+		now := time.Now().Unix()
+		user = &models.User{
+			Username: ret.Username,
+			Password: "******",
+			Nickname: ret.Nickname,
+			Phone:    ret.Phone,
+			Email:    ret.Email,
+			Portrait: "",
+			Roles:    strings.Join(rt.Sso.OAuth2.DefaultRoles, " "),
+			RolesLst: rt.Sso.OAuth2.DefaultRoles,
+			Contacts: []byte("{}"),
+			CreateAt: now,
+			UpdateAt: now,
+			CreateBy: "oauth2",
+			UpdateBy: "oauth2",
+		}
+
 		// create user from oidc
 		ginx.Dangerous(user.Add(rt.Ctx))
 	}
@@ -458,23 +492,10 @@ type SsoConfigOutput struct {
 }

 func (rt *Router) ssoConfigNameGet(c *gin.Context) {
-	var oidcDisplayName, casDisplayName, oauthDisplayName string
-	if rt.Sso.OIDC != nil {
-		oidcDisplayName = rt.Sso.OIDC.GetDisplayName()
-	}
-
-	if rt.Sso.CAS != nil {
-		casDisplayName = rt.Sso.CAS.GetDisplayName()
-	}
-
-	if rt.Sso.OAuth2 != nil {
-		oauthDisplayName = rt.Sso.OAuth2.GetDisplayName()
-	}
-
 	ginx.NewRender(c).Data(SsoConfigOutput{
-		OidcDisplayName:  oidcDisplayName,
-		CasDisplayName:   casDisplayName,
-		OauthDisplayName: oauthDisplayName,
+		OidcDisplayName:  rt.Sso.OIDC.GetDisplayName(),
+		CasDisplayName:   rt.Sso.CAS.GetDisplayName(),
+		OauthDisplayName: rt.Sso.OAuth2.GetDisplayName(),
 	}, nil)
 }

@@ -499,7 +520,8 @@ func (rt *Router) ssoConfigUpdate(c *gin.Context) {
 		var config oidcx.Config
 		err := toml.Unmarshal([]byte(f.Content), &config)
 		ginx.Dangerous(err)
-		rt.Sso.OIDC, err = oidcx.New(config)
+
+		err = rt.Sso.OIDC.Reload(config)
 		ginx.Dangerous(err)
 	case "CAS":
 		var config cas.Config
@@ -515,19 +537,3 @@ func (rt *Router) ssoConfigUpdate(c *gin.Context) {

 	ginx.NewRender(c).Message(nil)
 }
-
-type RSAConfigOutput struct {
-	OpenRSA      bool
-	RSAPublicKey string
-}
-
-func (rt *Router) rsaConfigGet(c *gin.Context) {
-	publicKey := ""
-	if len(rt.HTTP.RSA.RSAPublicKey) > 0 {
-		publicKey = base64.StdEncoding.EncodeToString(rt.HTTP.RSA.RSAPublicKey)
-	}
-	ginx.NewRender(c).Data(RSAConfigOutput{
-		OpenRSA:      rt.HTTP.RSA.OpenRSA,
-		RSAPublicKey: publicKey,
-	}, nil)
-}
--- a/center/router/router_mute.go
+++ b/center/router/router_mute.go
@@ -5,12 +5,10 @@ import (
 	"strings"
 	"time"

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

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

 // Return all, front-end search and paging
@@ -21,83 +19,31 @@ func (rt *Router) alertMuteGetsByBG(c *gin.Context) {
 	ginx.NewRender(c).Data(lst, err)
 }

-func (rt *Router) alertMuteGetsByGids(c *gin.Context) {
-	gids := str.IdsInt64(ginx.QueryStr(c, "gids", ""), ",")
-	if len(gids) > 0 {
-		for _, gid := range gids {
-			rt.bgroCheck(c, gid)
-		}
-	} else {
-		me := c.MustGet("user").(*models.User)
-		if !me.IsAdmin() {
-			var err error
-			gids, err = models.MyBusiGroupIds(rt.Ctx, me.Id)
-			ginx.Dangerous(err)
-
-			if len(gids) == 0 {
-				ginx.NewRender(c).Data([]int{}, nil)
-				return
-			}
-		}
-	}
-
-	lst, err := models.AlertMuteGetsByBGIds(rt.Ctx, gids)
-
-	ginx.NewRender(c).Data(lst, err)
-}
-
 func (rt *Router) alertMuteGets(c *gin.Context) {
 	prods := strings.Fields(ginx.QueryStr(c, "prods", ""))
-	bgid := ginx.QueryInt64(c, "bgid", -1)
+	bgid := ginx.QueryInt64(c, "bgid", 0)
 	query := ginx.QueryStr(c, "query", "")
-	disabled := ginx.QueryInt(c, "disabled", -1)
-	lst, err := models.AlertMuteGets(rt.Ctx, prods, bgid, disabled, query)
+	lst, err := models.AlertMuteGets(rt.Ctx, prods, bgid, query)

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

 func (rt *Router) alertMuteAdd(c *gin.Context) {
-
 	var f models.AlertMute
 	ginx.BindJSON(c, &f)

 	username := c.MustGet("username").(string)
 	f.CreateBy = username
 	f.GroupId = ginx.UrlParamInt64(c, "id")
+
 	ginx.NewRender(c).Message(f.Add(rt.Ctx))
 }

-// Preview events (alert_cur_event) that match the mute strategy based on the following criteria:
-// business group ID (group_id, group_id), product (prod, rule_prod),
-// alert event severity (severities, severity), and event tags (tags, tags).
-// For products of type not 'host', also consider the category (cate, cate) and datasource ID (datasource_ids, datasource_id).
-func (rt *Router) alertMutePreview(c *gin.Context) {
-	//Generally the match of events would be less.
-
-	var f models.AlertMute
-	ginx.BindJSON(c, &f)
-	f.GroupId = ginx.UrlParamInt64(c, "id")
-	ginx.Dangerous(f.Verify()) //verify and parse tags json to ITags
-	events, err := models.AlertCurEventGetsFromAlertMute(rt.Ctx, &f)
-	ginx.Dangerous(err)
-
-	matchEvents := make([]*models.AlertCurEvent, 0, len(events))
-	for i := 0; i < len(events); i++ {
-		events[i].DB2Mem()
-		if common.MatchTags(events[i].TagsMap, f.ITags) {
-			matchEvents = append(matchEvents, events[i])
-		}
-	}
-	ginx.NewRender(c).Data(matchEvents, err)
-
-}
-
 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) {
@@ -108,14 +54,6 @@ func (rt *Router) alertMuteDel(c *gin.Context) {
 	ginx.NewRender(c).Message(models.AlertMuteDel(rt.Ctx, f.Ids))
 }

-// alertMuteGet returns the alert mute by ID
-func (rt *Router) alertMuteGet(c *gin.Context) {
-	amid := ginx.UrlParamInt64(c, "amid")
-	am, err := models.AlertMuteGetById(rt.Ctx, amid)
-	am.DB2FE()
-	ginx.NewRender(c).Data(am, err)
-}
-
 func (rt *Router) alertMutePutByFE(c *gin.Context) {
 	var f models.AlertMute
 	ginx.BindJSON(c, &f)
--- a/center/router/router_mw.go
+++ b/center/router/router_mw.go
@@ -92,10 +92,6 @@ func (rt *Router) jwtAuth() gin.HandlerFunc {
 	}
 }

-func (rt *Router) Auth() gin.HandlerFunc {
-	return rt.auth()
-}
-
 func (rt *Router) auth() gin.HandlerFunc {
 	if rt.HTTP.ProxyAuth.Enable {
 		return rt.proxyAuth()
@@ -124,10 +120,6 @@ func (rt *Router) jwtMock() gin.HandlerFunc {
 	}
 }

-func (rt *Router) User() gin.HandlerFunc {
-	return rt.user()
-}
-
 func (rt *Router) user() gin.HandlerFunc {
 	return func(c *gin.Context) {
 		userid := c.MustGet("userid").(int64)
@@ -143,8 +135,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()
 	}
 }
@@ -184,10 +174,6 @@ func (rt *Router) bgro() gin.HandlerFunc {
 }

 // bgrw 逐步要被干掉，不安全
-func (rt *Router) Bgrw() gin.HandlerFunc {
-	return rt.bgrw()
-}
-
 func (rt *Router) bgrw() gin.HandlerFunc {
 	return func(c *gin.Context) {
 		me := c.MustGet("user").(*models.User)
@@ -247,10 +233,6 @@ func (rt *Router) bgroCheck(c *gin.Context, bgid int64) {
 	c.Set("busi_group", bg)
 }

-func (rt *Router) Perm(operation string) gin.HandlerFunc {
-	return rt.perm(operation)
-}
-
 func (rt *Router) perm(operation string) gin.HandlerFunc {
 	return func(c *gin.Context) {
 		me := c.MustGet("user").(*models.User)
--- a/center/router/router_notification_record.go
+++ b/center/router/router_notification_record.go
@@ -1,212 +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 := models.DB(rt.Ctx).CreateInBatches(req, 100).Error
-	var ids []int64
-	if err == nil {
-		ids = make([]int64, len(req))
-		for i, noti := range req {
-			ids[i] = noti.Id
-		}
-	}
-
-	ginx.NewRender(c).Data(ids, 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
@@ -2,19 +2,15 @@ package router

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

 	"github.com/ccfos/nightingale/v6/alert/aconf"
 	"github.com/ccfos/nightingale/v6/alert/sender"
 	"github.com/ccfos/nightingale/v6/memsto"
 	"github.com/ccfos/nightingale/v6/models"
-	"github.com/ccfos/nightingale/v6/pkg/tplx"
+	"github.com/pelletier/go-toml/v2"

 	"github.com/gin-gonic/gin"
-	"github.com/pelletier/go-toml/v2"
 	"github.com/toolkits/pkg/ginx"
-	"github.com/toolkits/pkg/str"
 )

 func (rt *Router) webhookGets(c *gin.Context) {
@@ -34,19 +30,16 @@ func (rt *Router) webhookPuts(c *gin.Context) {
 	var webhooks []models.Webhook
 	ginx.BindJSON(c, &webhooks)
 	for i := 0; i < len(webhooks); i++ {
-		webhooks[i].Headers = []string{}
-		if len(webhooks[i].HeaderMap) > 0 {
-			for k, v := range webhooks[i].HeaderMap {
-				webhooks[i].Headers = append(webhooks[i].Headers, k)
-				webhooks[i].Headers = append(webhooks[i].Headers, v)
-			}
+		for k, v := range webhooks[i].HeaderMap {
+			webhooks[i].Headers = append(webhooks[i].Headers, k)
+			webhooks[i].Headers = append(webhooks[i].Headers, v)
 		}
 	}

 	data, err := json.Marshal(webhooks)
 	ginx.Dangerous(err)
-	username := c.MustGet("username").(string)
-	ginx.NewRender(c).Message(models.ConfigsSetWithUname(rt.Ctx, models.WEBHOOKKEY, string(data), username))
+
+	ginx.NewRender(c).Message(models.ConfigsSet(rt.Ctx, models.WEBHOOKKEY, string(data)))
 }

 func (rt *Router) notifyScriptGet(c *gin.Context) {
@@ -69,8 +62,8 @@ func (rt *Router) notifyScriptPut(c *gin.Context) {

 	data, err := json.Marshal(notifyScript)
 	ginx.Dangerous(err)
-	username := c.MustGet("username").(string)
-	ginx.NewRender(c).Message(models.ConfigsSetWithUname(rt.Ctx, models.NOTIFYSCRIPT, string(data), username))
+
+	ginx.NewRender(c).Message(models.ConfigsSet(rt.Ctx, models.NOTIFYSCRIPT, string(data)))
 }

 func (rt *Router) notifyChannelGets(c *gin.Context) {
@@ -90,8 +83,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 {
@@ -106,8 +98,8 @@ func (rt *Router) notifyChannelPuts(c *gin.Context) {

 	data, err := json.Marshal(notifyChannels)
 	ginx.Dangerous(err)
-	username := c.MustGet("username").(string)
-	ginx.NewRender(c).Message(models.ConfigsSetWithUname(rt.Ctx, models.NOTIFYCHANNEL, string(data), username))
+
+	ginx.NewRender(c).Message(models.ConfigsSet(rt.Ctx, models.NOTIFYCHANNEL, string(data)))
 }

 func (rt *Router) notifyContactGets(c *gin.Context) {
@@ -127,8 +119,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 {
@@ -143,8 +134,8 @@ func (rt *Router) notifyContactPuts(c *gin.Context) {

 	data, err := json.Marshal(notifyContacts)
 	ginx.Dangerous(err)
-	username := c.MustGet("username").(string)
-	ginx.NewRender(c).Message(models.ConfigsSetWithUname(rt.Ctx, models.NOTIFYCONTACT, string(data), username))
+
+	ginx.NewRender(c).Message(models.ConfigsSet(rt.Ctx, models.NOTIFYCONTACT, string(data)))
 }

 func (rt *Router) notifyConfigGet(c *gin.Context) {
@@ -164,65 +155,36 @@ func (rt *Router) notifyConfigGet(c *gin.Context) {
 func (rt *Router) notifyConfigPut(c *gin.Context) {
 	var f models.Configs
 	ginx.BindJSON(c, &f)
-	userVariableMap := rt.NotifyConfigCache.ConfigCache.Get()
-	text := tplx.ReplaceTemplateUseText(f.Ckey, f.Cval, userVariableMap)
 	switch f.Ckey {
 	case models.SMTP:
 		var smtp aconf.SMTPConfig
-		err := toml.Unmarshal([]byte(text), &smtp)
+		err := toml.Unmarshal([]byte(f.Cval), &smtp)
+		ginx.Dangerous(err)
+	case models.IBEX:
+		var ibex aconf.Ibex
+		err := toml.Unmarshal([]byte(f.Cval), &ibex)
 		ginx.Dangerous(err)
 	default:
 		ginx.Bomb(200, "key %s can not modify", f.Ckey)
 	}
-	username := c.MustGet("username").(string)
-	//insert or update build-in config
-	ginx.Dangerous(models.ConfigsSetWithUname(rt.Ctx, f.Ckey, f.Cval, username))
+
+	err := models.ConfigsSet(rt.Ctx, f.Ckey, f.Cval)
+	if err != nil {
+		ginx.Bomb(200, err.Error())
+	}
+
 	if f.Ckey == models.SMTP {
 		// 重置邮件发送器
+		var smtp aconf.SMTPConfig
+		err := toml.Unmarshal([]byte(f.Cval), &smtp)
+		ginx.Dangerous(err)

-		smtp, errSmtp := SmtpValidate(text)
-		ginx.Dangerous(errSmtp)
-		go sender.RestartEmailSender(rt.Ctx, smtp)
+		if smtp.Host == "" || smtp.Port == 0 {
+			ginx.Bomb(200, "smtp host or port can not be empty")
+		}
+
+		go sender.RestartEmailSender(smtp)
 	}

 	ginx.NewRender(c).Message(nil)
 }
-func SmtpValidate(text string) (aconf.SMTPConfig, error) {
-	var smtp aconf.SMTPConfig
-	var err error
-
-	err = toml.Unmarshal([]byte(text), &smtp)
-	if err != nil {
-		return smtp, err
-	}
-	if smtp.Host == "" || smtp.Port == 0 {
-		return smtp, fmt.Errorf("smtp host or port can not be empty")
-	}
-	return smtp, err
-}
-
-type form struct {
-	models.Configs
-	Email string `json:"email"`
-}
-
-// After configuring the aconf.SMTPConfig, users can choose to perform a test. In this test, the function attempts to send an email
-func (rt *Router) attemptSendEmail(c *gin.Context) {
-	var f form
-	ginx.BindJSON(c, &f)
-
-	if f.Email = strings.TrimSpace(f.Email); f.Email == "" || !str.IsMail(f.Email) {
-		ginx.Bomb(200, "email(%s) invalid", f.Email)
-	}
-
-	if f.Ckey != models.SMTP {
-		ginx.Bomb(200, "config(%v) invalid", f)
-	}
-	userVariableMap := rt.NotifyConfigCache.ConfigCache.Get()
-	text := tplx.ReplaceTemplateUseText(f.Ckey, f.Cval, userVariableMap)
-	smtp, err := SmtpValidate(text)
-	ginx.Dangerous(err)
-
-	ginx.NewRender(c).Message(sender.SendEmail("Email test", "email content", []string{f.Email}, smtp))
-
-}
--- a/center/router/router_notify_tpl.go
+++ b/center/router/router_notify_tpl.go
@@ -3,53 +3,24 @@ package router
 import (
 	"bytes"
 	"encoding/json"
-	"fmt"
 	"html/template"
-	"strings"
-	"time"

 	"github.com/ccfos/nightingale/v6/center/cconf"
 	"github.com/ccfos/nightingale/v6/models"
 	"github.com/ccfos/nightingale/v6/pkg/tplx"
-
 	"github.com/gin-gonic/gin"
 	"github.com/toolkits/pkg/ginx"
-	"github.com/toolkits/pkg/str"
 )

 func (rt *Router) notifyTplGets(c *gin.Context) {
-	m := make(map[string]struct{})
-	for _, channel := range models.DefaultChannels {
-		m[channel] = struct{}{}
-	}
-	m[models.EmailSubject] = struct{}{}
-
 	lst, err := models.NotifyTplGets(rt.Ctx)
-	for i := 0; i < len(lst); i++ {
-		if _, exists := m[lst[i].Channel]; exists {
-			lst[i].BuiltIn = true
-		}
-	}

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

 func (rt *Router) notifyTplUpdateContent(c *gin.Context) {
-	user := c.MustGet("user").(*models.User)
-
 	var f models.NotifyTpl
 	ginx.BindJSON(c, &f)
-	ginx.Dangerous(templateValidate(f))
-
-	notifyTpl, err := models.NotifyTplGet(rt.Ctx, f.Id)
-	ginx.Dangerous(err)
-
-	if notifyTpl.CreateBy != user.Username && !user.IsAdmin() {
-		ginx.Bomb(403, "no permission")
-	}
-
-	f.UpdateAt = time.Now().Unix()
-	f.UpdateBy = user.Username

 	ginx.NewRender(c).Message(f.UpdateContent(rt.Ctx))
 }
@@ -57,95 +28,24 @@ func (rt *Router) notifyTplUpdateContent(c *gin.Context) {
 func (rt *Router) notifyTplUpdate(c *gin.Context) {
 	var f models.NotifyTpl
 	ginx.BindJSON(c, &f)
-	ginx.Dangerous(templateValidate(f))
-	user := c.MustGet("user").(*models.User)

-	notifyTpl, err := models.NotifyTplGet(rt.Ctx, f.Id)
-	ginx.Dangerous(err)
-
-	if notifyTpl.CreateBy != user.Username && !user.IsAdmin() {
-		ginx.Bomb(403, "no permission")
-	}
-
-	// 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))
-	ginx.Dangerous(err)
-	if count != 0 {
-		ginx.Bomb(200, "Refuse to create duplicate channel or name")
-	}
-
-	notifyTpl.UpdateAt = time.Now().Unix()
-	notifyTpl.UpdateBy = user.Username
-	notifyTpl.Name = f.Name
-
-	ginx.NewRender(c).Message(notifyTpl.Update(rt.Ctx))
-}
-
-func templateValidate(f models.NotifyTpl) error {
-	if len(f.Channel) > 32 {
-		return fmt.Errorf("channel length should not exceed 32")
-	}
-
-	if str.Dangerous(f.Channel) {
-		return fmt.Errorf("channel should not contain dangerous characters")
-	}
-
-	if len(f.Name) > 255 {
-		return fmt.Errorf("name length should not exceed 255")
-	}
-
-	if str.Dangerous(f.Name) {
-		return fmt.Errorf("name should not contain dangerous characters")
-	}
-
-	if f.Content == "" {
-		return nil
-	}
-
-	var defs = []string{
-		"{{$labels := .TagsMap}}",
-		"{{$value := .TriggerValue}}",
-	}
-	text := strings.Join(append(defs, f.Content), "")
-
-	if _, err := template.New(f.Channel).Funcs(tplx.TemplateFuncMap).Parse(text); err != nil {
-		return fmt.Errorf("notify template verify illegal:%s", err.Error())
-	}
-
-	return nil
+	ginx.NewRender(c).Message(f.Update(rt.Ctx))
 }

 func (rt *Router) notifyTplPreview(c *gin.Context) {
 	var event models.AlertCurEvent
 	err := json.Unmarshal([]byte(cconf.EVENT_EXAMPLE), &event)
-	ginx.Dangerous(err)
+	if err != nil {
+		ginx.NewRender(c).Message(err.Error())
+		return
+	}

 	var f models.NotifyTpl
 	ginx.BindJSON(c, &f)

-	var defs = []string{
-		"{{$labels := .TagsMap}}",
-		"{{$value := .TriggerValue}}",
-	}
-	text := strings.Join(append(defs, f.Content), "")
-	tpl, err := template.New(f.Channel).Funcs(tplx.TemplateFuncMap).Parse(text)
+	tpl, err := template.New(f.Channel).Funcs(tplx.TemplateFuncMap).Parse(f.Content)
 	ginx.Dangerous(err)

-	event.TagsMap = make(map[string]string)
-	for i := 0; i < len(event.TagsJSON); i++ {
-		pair := strings.TrimSpace(event.TagsJSON[i])
-		if pair == "" {
-			continue
-		}
-
-		arr := strings.SplitN(pair, "=", 2)
-		if len(arr) != 2 {
-			continue
-		}
-
-		event.TagsMap[arr[0]] = arr[1]
-	}
-
 	var body bytes.Buffer
 	var ret string
 	if err := tpl.Execute(&body, event); err != nil {
@@ -156,40 +56,3 @@ func (rt *Router) notifyTplPreview(c *gin.Context) {

 	ginx.NewRender(c).Data(ret, nil)
 }
-
-// add new notify template
-func (rt *Router) notifyTplAdd(c *gin.Context) {
-	var f models.NotifyTpl
-	ginx.BindJSON(c, &f)
-
-        user := c.MustGet("user").(*models.User)
-        f.CreateBy = user.Username
-	
-        f.Channel = strings.TrimSpace(f.Channel)
-	ginx.Dangerous(templateValidate(f))
-
-	count, err := models.Count(models.DB(rt.Ctx).Model(&models.NotifyTpl{}).Where("channel = ? or name = ?", f.Channel, f.Name))
-	ginx.Dangerous(err)
-	if count != 0 {
-		ginx.Bomb(200, "Refuse to create duplicate channel(unique)")
-	}
-
-        f.CreateAt = time.Now().Unix()
-	ginx.NewRender(c).Message(f.Create(rt.Ctx))
-}
-
-// delete notify template, not allowed to delete the system defaults(models.DefaultChannels)
-func (rt *Router) notifyTplDel(c *gin.Context) {
-	f := new(models.NotifyTpl)
-	id := ginx.UrlParamInt64(c, "id")
-	user := c.MustGet("user").(*models.User)
-
-	notifyTpl, err := models.NotifyTplGet(rt.Ctx, id)
-	ginx.Dangerous(err)
-
-	if notifyTpl.CreateBy != user.Username && !user.IsAdmin() {
-		ginx.Bomb(403, "no permission")
-	}
-
-	ginx.NewRender(c).Message(f.NotifyTplDelete(rt.Ctx, id))
-}
--- a/center/router/router_proxy.go
+++ b/center/router/router_proxy.go
@@ -3,50 +3,39 @@ package router
 import (
 	"context"
 	"crypto/tls"
-	"fmt"
 	"net"
 	"net/http"
 	"net/http/httputil"
+	"net/url"
 	"strings"
-	"sync"
 	"time"

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

-type QueryFormItem struct {
+type queryFormItem struct {
 	Start int64  `json:"start" binding:"required"`
 	End   int64  `json:"end" binding:"required"`
 	Step  int64  `json:"step" binding:"required"`
 	Query string `json:"query" binding:"required"`
 }

-type BatchQueryForm struct {
+type batchQueryForm struct {
 	DatasourceId int64           `json:"datasource_id" binding:"required"`
-	Queries      []QueryFormItem `json:"queries" binding:"required"`
+	Queries      []queryFormItem `json:"queries" binding:"required"`
 }

 func (rt *Router) promBatchQueryRange(c *gin.Context) {
-	var f BatchQueryForm
+	var f batchQueryForm
 	ginx.Dangerous(c.BindJSON(&f))

-	lst, err := PromBatchQueryRange(rt.PromClients, f)
-	ginx.NewRender(c).Data(lst, err)
-}
+	cli := rt.PromClients.GetCli(f.DatasourceId)

-func PromBatchQueryRange(pc *prom.PromClientMap, f BatchQueryForm) ([]model.Value, error) {
 	var lst []model.Value

-	cli := pc.GetCli(f.DatasourceId)
-	if cli == nil {
-		return lst, fmt.Errorf("no such datasource id: %d", f.DatasourceId)
-	}
-
 	for _, item := range f.Queries {
 		r := pkgprom.Range{
 			Start: time.Unix(item.Start, 0),
@@ -55,16 +44,15 @@ func PromBatchQueryRange(pc *prom.PromClientMap, f BatchQueryForm) ([]model.Valu
 		}

 		resp, _, err := cli.QueryRange(context.Background(), item.Query, r)
-		if err != nil {
-			return lst, err
-		}
+		ginx.Dangerous(err)

 		lst = append(lst, resp)
 	}
-	return lst, nil
+
+	ginx.NewRender(c).Data(lst, nil)
 }

-type BatchInstantForm struct {
+type batchInstantForm struct {
 	DatasourceId int64             `json:"datasource_id" binding:"required"`
 	Queries      []InstantFormItem `json:"queries" binding:"required"`
 }
@@ -75,31 +63,21 @@ type InstantFormItem struct {
 }

 func (rt *Router) promBatchQueryInstant(c *gin.Context) {
-	var f BatchInstantForm
+	var f batchInstantForm
 	ginx.Dangerous(c.BindJSON(&f))

-	lst, err := PromBatchQueryInstant(rt.PromClients, f)
-	ginx.NewRender(c).Data(lst, err)
-}
+	cli := rt.PromClients.GetCli(f.DatasourceId)

-func PromBatchQueryInstant(pc *prom.PromClientMap, f BatchInstantForm) ([]model.Value, error) {
 	var lst []model.Value

-	cli := pc.GetCli(f.DatasourceId)
-	if cli == nil {
-		logger.Warningf("no such datasource id: %d", f.DatasourceId)
-		return lst, fmt.Errorf("no such datasource id: %d", f.DatasourceId)
-	}
-
 	for _, item := range f.Queries {
 		resp, _, err := cli.Query(context.Background(), item.Query, time.Unix(item.Time, 0))
-		if err != nil {
-			return lst, err
-		}
+		ginx.Dangerous(err)

 		lst = append(lst, resp)
 	}
-	return lst, nil
+
+	ginx.NewRender(c).Data(lst, nil)
 }

 func (rt *Router) dsProxy(c *gin.Context) {
@@ -111,9 +89,9 @@ func (rt *Router) dsProxy(c *gin.Context) {
 		return
 	}

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

@@ -161,77 +139,21 @@ func (rt *Router) dsProxy(c *gin.Context) {
 		http.Error(w, err.Error(), http.StatusBadGateway)
 	}

-	transport, has := transportGet(dsId, ds.UpdatedAt)
-	if !has {
-		transport = &http.Transport{
-			TLSClientConfig: &tls.Config{InsecureSkipVerify: ds.HTTPJson.TLS.SkipTlsVerify},
-			Proxy:           http.ProxyFromEnvironment,
-			DialContext: (&net.Dialer{
-				Timeout: time.Duration(ds.HTTPJson.DialTimeout) * time.Millisecond,
-			}).DialContext,
-			ResponseHeaderTimeout: time.Duration(ds.HTTPJson.Timeout) * time.Millisecond,
-			MaxIdleConnsPerHost:   ds.HTTPJson.MaxIdleConnsPerHost,
-		}
-		transportPut(dsId, ds.UpdatedAt, transport)
-	}
-
-	modifyResponse := func(r *http.Response) error {
-		if r.StatusCode == http.StatusUnauthorized {
-			logger.Warningf("proxy path:%s unauthorized access ", c.Request.URL.Path)
-			return fmt.Errorf("unauthorized access")
-		}
-
-		return nil
+	transport := &http.Transport{
+		TLSClientConfig: &tls.Config{InsecureSkipVerify: ds.HTTPJson.TLS.SkipTlsVerify},
+		Proxy:           http.ProxyFromEnvironment,
+		DialContext: (&net.Dialer{
+			Timeout: time.Duration(ds.HTTPJson.DialTimeout) * time.Millisecond,
+		}).DialContext,
+		ResponseHeaderTimeout: time.Duration(ds.HTTPJson.Timeout) * time.Millisecond,
+		MaxIdleConnsPerHost:   ds.HTTPJson.MaxIdleConnsPerHost,
 	}

 	proxy := &httputil.ReverseProxy{
-		Director:       director,
-		Transport:      transport,
-		ErrorHandler:   errFunc,
-		ModifyResponse: modifyResponse,
+		Director:     director,
+		Transport:    transport,
+		ErrorHandler: errFunc,
 	}

 	proxy.ServeHTTP(c.Writer, c.Request)
-
-}
-
-var (
-	transports     = map[int64]http.RoundTripper{}
-	updatedAts     = map[int64]int64{}
-	transportsLock = &sync.Mutex{}
-)
-
-func transportGet(dsid, newUpdatedAt int64) (http.RoundTripper, bool) {
-	transportsLock.Lock()
-	defer transportsLock.Unlock()
-
-	tran, has := transports[dsid]
-	if !has {
-		return nil, false
-	}
-
-	oldUpdateAt, has := updatedAts[dsid]
-	if !has {
-		oldtran := tran.(*http.Transport)
-		oldtran.CloseIdleConnections()
-		delete(transports, dsid)
-		return nil, false
-	}
-
-	if oldUpdateAt != newUpdatedAt {
-		oldtran := tran.(*http.Transport)
-		oldtran.CloseIdleConnections()
-		delete(transports, dsid)
-		delete(updatedAts, dsid)
-		return nil, false
-	}
-
-	return tran, has
-}
-
-func transportPut(dsid, updatedat int64, tran http.RoundTripper) {
-	transportsLock.Lock()
-	transports[dsid] = tran
-	updatedAts[dsid] = updatedat
-	transportsLock.Unlock()
 }
--- a/center/router/router_recording_rule.go
+++ b/center/router/router_recording_rule.go
@@ -3,13 +3,14 @@ package router
 import (
 	"encoding/json"
 	"net/http"
+	"strconv"
+	"strings"
 	"time"

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

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

 func (rt *Router) recordingRuleGets(c *gin.Context) {
@@ -18,35 +19,6 @@ func (rt *Router) recordingRuleGets(c *gin.Context) {
 	ginx.NewRender(c).Data(ars, err)
 }

-func (rt *Router) recordingRuleGetsByGids(c *gin.Context) {
-	gids := str.IdsInt64(ginx.QueryStr(c, "gids", ""), ",")
-	if len(gids) > 0 {
-		for _, gid := range gids {
-			rt.bgroCheck(c, gid)
-		}
-	} else {
-		me := c.MustGet("user").(*models.User)
-		if !me.IsAdmin() {
-			var err error
-			gids, err = models.MyBusiGroupIds(rt.Ctx, me.Id)
-			ginx.Dangerous(err)
-
-			if len(gids) == 0 {
-				ginx.NewRender(c).Data([]int{}, nil)
-				return
-			}
-		}
-	}
-
-	ars, err := models.RecordingRuleGetsByBGIds(rt.Ctx, gids)
-	ginx.NewRender(c).Data(ars, err)
-}
-
-func (rt *Router) recordingRuleGetsByService(c *gin.Context) {
-	ars, err := models.RecordingRuleEnabledGets(rt.Ctx)
-	ginx.NewRender(c).Data(ars, err)
-}
-
 func (rt *Router) recordingRuleGet(c *gin.Context) {
 	rrid := ginx.UrlParamInt64(c, "rrid")

@@ -72,14 +44,6 @@ func (rt *Router) recordingRuleAddByFE(c *gin.Context) {
 		ginx.Bomb(http.StatusBadRequest, "input json is empty")
 	}

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

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

 	for i := 0; i < len(f.Ids); i++ {
--- a/center/router/router_role.go
+++ b/center/router/router_role.go
@@ -4,7 +4,6 @@ import (
 	"net/http"
 	"strings"

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

 	"github.com/gin-gonic/gin"
@@ -18,15 +17,6 @@ func (rt *Router) rolesGets(c *gin.Context) {

 func (rt *Router) permsGets(c *gin.Context) {
 	user := c.MustGet("user").(*models.User)
-	if user.IsAdmin() {
-		var lst []string
-		for _, ops := range cconf.Operations.Ops {
-			lst = append(lst, ops.Ops...)
-		}
-		ginx.NewRender(c).Data(lst, nil)
-		return
-	}
-
 	lst, err := models.OperationsOfRole(rt.Ctx, strings.Fields(user.Roles))
 	ginx.NewRender(c).Data(lst, err)
 }
@@ -93,18 +83,3 @@ func (rt *Router) roleGets(c *gin.Context) {
 	lst, err := models.RoleGetsAll(rt.Ctx)
 	ginx.NewRender(c).Data(lst, err)
 }
-
-func (rt *Router) allPerms(c *gin.Context) {
-	roles, err := models.RoleGetsAll(rt.Ctx)
-	ginx.Dangerous(err)
-	m := make(map[string][]string)
-	for _, r := range roles {
-		lst, err := models.OperationsOfRole(rt.Ctx, strings.Fields(r.Name))
-		if err != nil {
-			continue
-		}
-		m[r.Name] = lst
-	}
-
-	ginx.NewRender(c).Data(m, err)
-}
--- a/center/router/router_role_operation.go
+++ b/center/router/router_role_operation.go
@@ -3,11 +3,9 @@ package router
 import (
 	"net/http"

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

 func (rt *Router) operationOfRole(c *gin.Context) {
@@ -18,15 +16,6 @@ func (rt *Router) operationOfRole(c *gin.Context) {
 		ginx.Bomb(http.StatusOK, "role not found")
 	}

-	if role.Name == "Admin" {
-		var lst []string
-		for _, ops := range cconf.Operations.Ops {
-			lst = append(lst, ops.Ops...)
-		}
-		ginx.NewRender(c).Data(lst, nil)
-		return
-	}
-
 	ops, err := models.OperationsOfRole(rt.Ctx, []string{role.Name})
 	ginx.NewRender(c).Data(ops, err)
 }
@@ -50,11 +39,5 @@ func (rt *Router) roleBindOperation(c *gin.Context) {
 }

 func (rt *Router) operations(c *gin.Context) {
-	var ops []cconf.Ops
-	for _, v := range rt.Operations.Ops {
-		v.Cname = i18n.Sprintf(c.GetHeader("X-Language"), v.Cname)
-		ops = append(ops, v)
-	}
-
-	ginx.NewRender(c).Data(ops, nil)
+	ginx.NewRender(c).Data(rt.Operations.Ops, nil)
 }
--- a/center/router/router_self.go
+++ b/center/router/router_self.go
@@ -2,13 +2,10 @@ package router

 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) {
@@ -32,11 +29,6 @@ func (rt *Router) selfProfilePut(c *gin.Context) {
 	ginx.BindJSON(c, &f)

 	user := c.MustGet("user").(*models.User)
-	oldInfo := models.User{
-		Username: user.Username,
-		Phone:    user.Phone,
-		Email:    user.Email,
-	}
 	user.Nickname = f.Nickname
 	user.Phone = f.Phone
 	user.Email = f.Email
@@ -44,10 +36,6 @@ func (rt *Router) selfProfilePut(c *gin.Context) {
 	user.Contacts = f.Contacts
 	user.UpdateBy = user.Username

-	if flashduty.NeedSyncUser(rt.Ctx) {
-		flashduty.UpdateUser(rt.Ctx, oldInfo, f.Email, f.Phone)
-	}
-
 	ginx.NewRender(c).Message(user.UpdateAllFields(rt.Ctx))
 }

@@ -60,25 +48,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_server.go
+++ b/center/router/router_server.go
@@ -1,8 +1,6 @@
 package router

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

 	"github.com/gin-gonic/gin"
@@ -18,27 +16,3 @@ func (rt *Router) serverClustersGet(c *gin.Context) {
 	list, err := models.AlertingEngineGetsClusters(rt.Ctx, "")
 	ginx.NewRender(c).Data(list, err)
 }
-
-func (rt *Router) serverHeartbeat(c *gin.Context) {
-	var req models.HeartbeatInfo
-	ginx.BindJSON(c, &req)
-	err := models.AlertingEngineHeartbeatWithCluster(rt.Ctx, req.Instance, req.EngineCluster, req.DatasourceId)
-	ginx.NewRender(c).Message(err)
-}
-
-func (rt *Router) serversActive(c *gin.Context) {
-	datasourceId := ginx.QueryInt64(c, "dsid", 0)
-	engineName := ginx.QueryStr(c, "engine_name", "")
-	if engineName != "" {
-		servers, err := models.AlertingEngineGetsInstances(rt.Ctx, "engine_cluster = ? and clock > ?", engineName, time.Now().Unix()-30)
-		ginx.NewRender(c).Data(servers, err)
-		return
-	}
-
-	if datasourceId == 0 {
-		ginx.NewRender(c).Message("dsid is required")
-		return
-	}
-	servers, err := models.AlertingEngineGetsInstances(rt.Ctx, "datasource_id = ? and clock > ?", datasourceId, time.Now().Unix()-30)
-	ginx.NewRender(c).Data(servers, err)
-}
--- a/center/router/router_target.go
+++ b/center/router/router_target.go
@@ -15,7 +15,6 @@ import (
 	"github.com/prometheus/common/model"
 	"github.com/toolkits/pkg/ginx"
 	"github.com/toolkits/pkg/logger"
-	"github.com/toolkits/pkg/str"
 )

 type TargetQuery struct {
@@ -43,52 +42,17 @@ func (rt *Router) targetGetsByHostFilter(c *gin.Context) {
 }

 func (rt *Router) targetGets(c *gin.Context) {
-	bgids := str.IdsInt64(ginx.QueryStr(c, "gids", ""), ",")
+	bgid := ginx.QueryInt64(c, "bgid", -1)
 	query := ginx.QueryStr(c, "query", "")
 	limit := ginx.QueryInt(c, "limit", 30)
-	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)
-		if !user.IsAdmin() {
-			// 如果是非 admin 用户，全部对象的情况，找到用户有权限的业务组
-			var err error
-			bgids, err = models.MyBusiGroupIds(rt.Ctx, user.Id)
-			ginx.Dangerous(err)
-
-			// 将未分配业务组的对象也加入到列表中
-			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, bgid, dsIds, query)
 	ginx.Dangerous(err)

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

-	tgs, err := models.TargetBusiGroupsGetAll(rt.Ctx)
-	ginx.Dangerous(err)
-
-	for _, t := range list {
-		t.GroupIds = tgs[t.Ident]
-	}
-
 	if err == nil {
 		now := time.Now()
 		cache := make(map[int64]*models.BusiGroup)
@@ -97,12 +61,6 @@ func (rt *Router) targetGets(c *gin.Context) {
 		for i := 0; i < len(list); i++ {
 			ginx.Dangerous(list[i].FillGroup(rt.Ctx, cache))
 			keys = append(keys, models.WrapIdent(list[i].Ident))
-
-			if now.Unix()-list[i].UpdateAt < 60 {
-				list[i].TargetUp = 2
-			} else if now.Unix()-list[i].UpdateAt < 180 {
-				list[i].TargetUp = 1
-			}
 		}

 		if len(keys) > 0 {
@@ -122,6 +80,10 @@ func (rt *Router) targetGets(c *gin.Context) {
 			}

 			for i := 0; i < len(list); i++ {
+				if now.Unix()-list[i].UpdateAt < 120 {
+					list[i].TargetUp = 1
+				}
+
 				if meta, ok := metaMap[list[i].Ident]; ok {
 					list[i].FillMeta(meta)
 				} else {
@@ -139,303 +101,204 @@ func (rt *Router) targetGets(c *gin.Context) {
 	}, nil)
 }

-func (rt *Router) targetExtendInfoByIdent(c *gin.Context) {
-	ident := ginx.QueryStr(c, "ident", "")
-	key := models.WrapExtendIdent(ident)
-	vals := storage.MGet(context.Background(), rt.Redis, []string{key})
-	if len(vals) > 0 {
-		extInfo := string(vals[0])
-		if extInfo == "null" {
-			extInfo = ""
-		}
-		ginx.NewRender(c).Data(gin.H{
-			"extend_info": extInfo,
-			"ident":       ident,
-		}, nil)
-		return
-	}
-	ginx.NewRender(c).Data(gin.H{
-		"extend_info": "",
-		"ident":       ident,
-	}, nil)
-}
-
-func (rt *Router) targetGetsByService(c *gin.Context) {
-	lst, err := models.TargetGetsAll(rt.Ctx)
-	ginx.NewRender(c).Data(lst, err)
-}
-
 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"`
 }

-type targetBgidsForm struct {
-	Idents  []string `json:"idents" binding:"required_without=HostIps"`
-	HostIps []string `json:"host_ips" binding:"required_without=Idents"`
-	Bgids   []int64  `json:"bgids"`
-	Tags    []string `json:"tags"`
-	Action  string   `json:"action"` // add del reset
-}
-
-func (rt *Router) targetBindBgids(c *gin.Context) {
-	var f targetBgidsForm
-	var err error
-	var failedResults = make(map[string]string)
+func (rt *Router) targetUpdateBgid(c *gin.Context) {
+	var f targetBgidForm
 	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() {
-		// 普通用户，检查用户是否有权限操作所有请求的业务组
-		existing, _, err := models.SeparateTargetIdents(rt.Ctx, f.Idents)
+	if user.IsAdmin() {
+		ginx.NewRender(c).Message(models.TargetUpdateBgid(rt.Ctx, f.Idents, f.Bgid, false))
+		return
+	}
+
+	if f.Bgid > 0 {
+		// 把要操作的机器分成两部分，一部分是bgid为0，需要管理员分配，另一部分bgid>0，说明是业务组内部想调整
+		// 比如原来分配给didiyun的机器，didiyun的管理员想把部分机器调整到didiyun-ceph下
+		// 对于调整的这种情况，当前登录用户要对这批机器有操作权限，同时还要对目标BG有操作权限
+		orphans, err := models.IdentsFilter(rt.Ctx, f.Idents, "group_id = ?", 0)
 		ginx.Dangerous(err)
-		rt.checkTargetPerm(c, existing)

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

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

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

-	switch f.Action {
-	case "add":
-		ginx.NewRender(c).Data(failedResults, models.TargetBindBgids(rt.Ctx, f.Idents, f.Bgids, f.Tags))
-	case "del":
-		ginx.NewRender(c).Data(failedResults, models.TargetUnbindBgids(rt.Ctx, f.Idents, f.Bgids))
-	case "reset":
-		ginx.NewRender(c).Data(failedResults, models.TargetOverrideBgids(rt.Ctx, f.Idents, f.Bgids, f.Tags))
-	default:
-		ginx.Bomb(http.StatusBadRequest, "invalid action")
-	}
-}
-
-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.TargetOverrideBgids(rt.Ctx, f.Idents, []int64{f.Bgid}, nil))
+	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, rt.TargetDeleteHook))
-}
-
-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, rt.TargetDeleteHook))
+	ginx.NewRender(c).Message(models.TargetDel(rt.Ctx, f.Idents))
 }

 func (rt *Router) checkTargetPerm(c *gin.Context, idents []string) {
@@ -534,21 +342,3 @@ func (rt *Router) checkTargetPerm(c *gin.Context, idents []string) {
 		ginx.Bomb(http.StatusForbidden, "No permission to operate the targets: %s", strings.Join(nopri, ", "))
 	}
 }
-
-func (rt *Router) targetsOfAlertRule(c *gin.Context) {
-	engineName := ginx.QueryStr(c, "engine_name", "")
-	m, err := models.GetTargetsOfHostAlertRule(rt.Ctx, engineName)
-	ret := make(map[string]map[int64][]string)
-	for en, v := range m {
-		if en != engineName {
-			continue
-		}
-
-		ret[en] = make(map[int64][]string)
-		for rid, idents := range v {
-			ret[en][rid] = idents
-		}
-	}
-
-	ginx.NewRender(c).Data(ret, err)
-}
--- a/center/router/router_task.go
+++ b/center/router/router_task.go
@@ -1,14 +1,17 @@
 package router

 import (
+	"fmt"
+	"net/http"
+	"net/http/httputil"
+	"net/url"
+	"strings"
 	"time"

-	"github.com/ccfos/nightingale/v6/alert/sender"
 	"github.com/ccfos/nightingale/v6/models"

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

@@ -27,55 +30,10 @@ func (rt *Router) taskGets(c *gin.Context) {

 	beginTime := time.Now().Unix() - days*24*3600

-	total, err := models.TaskRecordTotal(rt.Ctx, []int64{bgid}, beginTime, creator, query)
+	total, err := models.TaskRecordTotal(rt.Ctx, bgid, beginTime, creator, query)
 	ginx.Dangerous(err)

-	list, err := models.TaskRecordGets(rt.Ctx, []int64{bgid}, beginTime, creator, query, limit, ginx.Offset(c, limit))
-	ginx.Dangerous(err)
-
-	ginx.NewRender(c).Data(gin.H{
-		"total": total,
-		"list":  list,
-	}, nil)
-}
-
-func (rt *Router) taskGetsByGids(c *gin.Context) {
-	gids := str.IdsInt64(ginx.QueryStr(c, "gids", ""), ",")
-	if len(gids) > 0 {
-		for _, gid := range gids {
-			rt.bgroCheck(c, gid)
-		}
-	} else {
-		me := c.MustGet("user").(*models.User)
-		if !me.IsAdmin() {
-			var err error
-			gids, err = models.MyBusiGroupIds(rt.Ctx, me.Id)
-			ginx.Dangerous(err)
-
-			if len(gids) == 0 {
-				ginx.NewRender(c).Data([]int{}, nil)
-				return
-			}
-		}
-	}
-
-	mine := ginx.QueryBool(c, "mine", false)
-	days := ginx.QueryInt64(c, "days", 7)
-	limit := ginx.QueryInt(c, "limit", 20)
-	query := ginx.QueryStr(c, "query", "")
-	user := c.MustGet("user").(*models.User)
-
-	creator := ""
-	if mine {
-		creator = user.Username
-	}
-
-	beginTime := time.Now().Unix() - days*24*3600
-
-	total, err := models.TaskRecordTotal(rt.Ctx, gids, beginTime, creator, query)
-	ginx.Dangerous(err)
-
-	list, err := models.TaskRecordGets(rt.Ctx, gids, beginTime, creator, query, limit, ginx.Offset(c, limit))
+	list, err := models.TaskRecordGets(rt.Ctx, bgid, beginTime, creator, query, limit, ginx.Offset(c, limit))
 	ginx.Dangerous(err)

 	ginx.NewRender(c).Data(gin.H{
@@ -98,19 +56,72 @@ type taskForm struct {
 	Hosts     []string `json:"hosts" binding:"required"`
 }

-func (rt *Router) taskRecordAdd(c *gin.Context) {
-	var f *models.TaskRecord
-	ginx.BindJSON(c, &f)
-	ginx.NewRender(c).Message(f.Add(rt.Ctx))
+func (f *taskForm) Verify() error {
+	if f.Batch < 0 {
+		return fmt.Errorf("arg(batch) should be nonnegative")
+	}
+
+	if f.Tolerance < 0 {
+		return fmt.Errorf("arg(tolerance) should be nonnegative")
+	}
+
+	if f.Timeout < 0 {
+		return fmt.Errorf("arg(timeout) should be nonnegative")
+	}
+
+	if f.Timeout > 3600*24 {
+		return fmt.Errorf("arg(timeout) longer than one day")
+	}
+
+	if f.Timeout == 0 {
+		f.Timeout = 30
+	}
+
+	f.Pause = strings.Replace(f.Pause, "，", ",", -1)
+	f.Pause = strings.Replace(f.Pause, " ", "", -1)
+	f.Args = strings.Replace(f.Args, "，", ",", -1)
+
+	if f.Title == "" {
+		return fmt.Errorf("arg(title) is required")
+	}
+
+	if str.Dangerous(f.Title) {
+		return fmt.Errorf("arg(title) is dangerous")
+	}
+
+	if f.Script == "" {
+		return fmt.Errorf("arg(script) is required")
+	}
+
+	if str.Dangerous(f.Args) {
+		return fmt.Errorf("arg(args) is dangerous")
+	}
+
+	if str.Dangerous(f.Pause) {
+		return fmt.Errorf("arg(pause) is dangerous")
+	}
+
+	if len(f.Hosts) == 0 {
+		return fmt.Errorf("arg(hosts) empty")
+	}
+
+	if f.Action != "start" && f.Action != "pause" {
+		return fmt.Errorf("arg(action) invalid")
+	}
+
+	return nil
+}
+
+func (f *taskForm) HandleFH(fh string) {
+	i := strings.Index(f.Title, " FH: ")
+	if i > 0 {
+		f.Title = f.Title[:i]
+	}
+	f.Title = f.Title + " FH: " + fh
 }

 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
+	var f taskForm
 	ginx.BindJSON(c, &f)

 	bgid := ginx.UrlParamInt64(c, "id")
@@ -126,7 +137,7 @@ func (rt *Router) taskAdd(c *gin.Context) {
 	rt.checkTargetPerm(c, f.Hosts)

 	// call ibex
-	taskId, err := sender.TaskAdd(f, user.Username, rt.Ctx.IsCenter)
+	taskId, err := TaskCreate(f, rt.NotifyConfigCache.GetIbex())
 	ginx.Dangerous(err)

 	if taskId <= 0 {
@@ -135,20 +146,65 @@ func (rt *Router) taskAdd(c *gin.Context) {

 	// write db
 	record := models.TaskRecord{
-		Id:        taskId,
-		GroupId:   bgid,
-		Title:     f.Title,
-		Account:   f.Account,
-		Batch:     f.Batch,
-		Tolerance: f.Tolerance,
-		Timeout:   f.Timeout,
-		Pause:     f.Pause,
-		Script:    f.Script,
-		Args:      f.Args,
-		CreateAt:  time.Now().Unix(),
-		CreateBy:  f.Creator,
+		Id:           taskId,
+		GroupId:      bgid,
+		IbexAddress:  rt.NotifyConfigCache.GetIbex().Address,
+		IbexAuthUser: rt.NotifyConfigCache.GetIbex().BasicAuthUser,
+		IbexAuthPass: rt.NotifyConfigCache.GetIbex().BasicAuthPass,
+		Title:        f.Title,
+		Account:      f.Account,
+		Batch:        f.Batch,
+		Tolerance:    f.Tolerance,
+		Timeout:      f.Timeout,
+		Pause:        f.Pause,
+		Script:       f.Script,
+		Args:         f.Args,
+		CreateAt:     time.Now().Unix(),
+		CreateBy:     f.Creator,
 	}

 	err = record.Add(rt.Ctx)
 	ginx.NewRender(c).Data(taskId, err)
 }
+
+func (rt *Router) taskProxy(c *gin.Context) {
+	target, err := url.Parse(rt.NotifyConfigCache.GetIbex().Address)
+	if err != nil {
+		ginx.NewRender(c).Message("invalid ibex address: %s", rt.NotifyConfigCache.GetIbex().Address)
+		return
+	}
+
+	director := func(req *http.Request) {
+		req.URL.Scheme = target.Scheme
+		req.URL.Host = target.Host
+
+		// fe request e.g. /api/n9e/busi-group/:id/task/*url
+		index := strings.Index(req.URL.Path, "/task/")
+		if index == -1 {
+			panic("url path invalid")
+		}
+
+		req.URL.Path = "/ibex/v1" + req.URL.Path[index:]
+
+		if target.RawQuery == "" || req.URL.RawQuery == "" {
+			req.URL.RawQuery = target.RawQuery + req.URL.RawQuery
+		} else {
+			req.URL.RawQuery = target.RawQuery + "&" + req.URL.RawQuery
+		}
+
+		if rt.NotifyConfigCache.GetIbex().BasicAuthUser != "" {
+			req.SetBasicAuth(rt.NotifyConfigCache.GetIbex().BasicAuthUser, rt.NotifyConfigCache.GetIbex().BasicAuthPass)
+		}
+	}
+
+	errFunc := func(w http.ResponseWriter, r *http.Request, err error) {
+		ginx.NewRender(c, http.StatusBadGateway).Message(err)
+	}
+
+	proxy := &httputil.ReverseProxy{
+		Director:     director,
+		ErrorHandler: errFunc,
+	}
+
+	proxy.ServeHTTP(c.Writer, c.Request)
+}
--- 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"
 )

@@ -19,45 +18,10 @@ func (rt *Router) taskTplGets(c *gin.Context) {
 	limit := ginx.QueryInt(c, "limit", 20)
 	groupId := ginx.UrlParamInt64(c, "id")

-	total, err := models.TaskTplTotal(rt.Ctx, []int64{groupId}, query)
+	total, err := models.TaskTplTotal(rt.Ctx, groupId, query)
 	ginx.Dangerous(err)

-	list, err := models.TaskTplGets(rt.Ctx, []int64{groupId}, query, limit, ginx.Offset(c, limit))
-	ginx.Dangerous(err)
-
-	ginx.NewRender(c).Data(gin.H{
-		"total": total,
-		"list":  list,
-	}, nil)
-}
-
-func (rt *Router) taskTplGetsByGids(c *gin.Context) {
-	query := ginx.QueryStr(c, "query", "")
-	limit := ginx.QueryInt(c, "limit", 20)
-
-	gids := str.IdsInt64(ginx.QueryStr(c, "gids", ""), ",")
-	if len(gids) > 0 {
-		for _, gid := range gids {
-			rt.bgroCheck(c, gid)
-		}
-	} else {
-		me := c.MustGet("user").(*models.User)
-		if !me.IsAdmin() {
-			var err error
-			gids, err = models.MyBusiGroupIds(rt.Ctx, me.Id)
-			ginx.Dangerous(err)
-
-			if len(gids) == 0 {
-				ginx.NewRender(c).Data([]int{}, nil)
-				return
-			}
-		}
-	}
-
-	total, err := models.TaskTplTotal(rt.Ctx, gids, query)
-	ginx.Dangerous(err)
-
-	list, err := models.TaskTplGets(rt.Ctx, gids, query, limit, ginx.Offset(c, limit))
+	list, err := models.TaskTplGets(rt.Ctx, groupId, query, limit, ginx.Offset(c, limit))
 	ginx.Dangerous(err)

 	ginx.NewRender(c).Data(gin.H{
@@ -84,27 +48,6 @@ func (rt *Router) taskTplGet(c *gin.Context) {
 	}, err)
 }

-func (rt *Router) taskTplGetByService(c *gin.Context) {
-	tid := ginx.UrlParamInt64(c, "tid")
-
-	tpl, err := models.TaskTplGetById(rt.Ctx, tid)
-	ginx.Dangerous(err)
-
-	if tpl == nil {
-		ginx.Bomb(404, "no such task template")
-	}
-
-	ginx.NewRender(c).Data(tpl, err)
-}
-
-func (rt *Router) taskTplGetsByService(c *gin.Context) {
-	ginx.NewRender(c).Data(models.TaskTplGetAll(rt.Ctx))
-}
-
-func (rt *Router) taskTplStatistics(c *gin.Context) {
-	ginx.NewRender(c).Data(models.TaskTplStatistics(rt.Ctx))
-}
-
 type taskTplForm struct {
 	Title     string   `json:"title" binding:"required"`
 	Batch     int      `json:"batch"`
@@ -119,11 +62,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 +134,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_tdengine.go
+++ b/center/router/router_tdengine.go
@@ -1,117 +0,0 @@
-package router
-
-import (
-	"net/http"
-
-	"github.com/ccfos/nightingale/v6/center/cconf"
-	"github.com/ccfos/nightingale/v6/models"
-
-	"github.com/gin-gonic/gin"
-	"github.com/toolkits/pkg/ginx"
-	"github.com/toolkits/pkg/logger"
-)
-
-type databasesQueryForm struct {
-	Cate         string `json:"cate" form:"cate"`
-	DatasourceId int64  `json:"datasource_id" form:"datasource_id"`
-}
-
-func (rt *Router) tdengineDatabases(c *gin.Context) {
-	var f databasesQueryForm
-	ginx.BindJSON(c, &f)
-
-	tdClient := rt.TdendgineClients.GetCli(f.DatasourceId)
-	if tdClient == nil {
-		ginx.NewRender(c, http.StatusNotFound).Message("No such datasource")
-		return
-	}
-
-	databases, err := tdClient.GetDatabases()
-	ginx.NewRender(c).Data(databases, err)
-}
-
-type tablesQueryForm struct {
-	Cate         string `json:"cate"`
-	DatasourceId int64  `json:"datasource_id" `
-	Database     string `json:"db"`
-	IsStable     bool   `json:"is_stable"`
-}
-
-// get tdengine tables
-func (rt *Router) tdengineTables(c *gin.Context) {
-	var f tablesQueryForm
-	ginx.BindJSON(c, &f)
-
-	tdClient := rt.TdendgineClients.GetCli(f.DatasourceId)
-	if tdClient == nil {
-		ginx.NewRender(c, http.StatusNotFound).Message("No such datasource")
-		return
-	}
-
-	tables, err := tdClient.GetTables(f.Database, f.IsStable)
-	ginx.NewRender(c).Data(tables, err)
-}
-
-type columnsQueryForm struct {
-	Cate         string `json:"cate"`
-	DatasourceId int64  `json:"datasource_id" `
-	Database     string `json:"db"`
-	Table        string `json:"table"`
-}
-
-// get tdengine columns
-func (rt *Router) tdengineColumns(c *gin.Context) {
-	var f columnsQueryForm
-	ginx.BindJSON(c, &f)
-
-	tdClient := rt.TdendgineClients.GetCli(f.DatasourceId)
-	if tdClient == nil {
-		ginx.NewRender(c, http.StatusNotFound).Message("No such datasource")
-		return
-	}
-
-	columns, err := tdClient.GetColumns(f.Database, f.Table)
-	ginx.NewRender(c).Data(columns, err)
-}
-
-func (rt *Router) QueryData(c *gin.Context) {
-	var f models.QueryParam
-	ginx.BindJSON(c, &f)
-
-	var resp []models.DataResp
-	var err error
-	tdClient := rt.TdendgineClients.GetCli(f.DatasourceId)
-	for _, q := range f.Querys {
-		datas, err := tdClient.Query(q)
-		ginx.Dangerous(err)
-		resp = append(resp, datas...)
-	}
-
-	ginx.NewRender(c).Data(resp, err)
-}
-
-func (rt *Router) QueryLog(c *gin.Context) {
-	var f models.QueryParam
-	ginx.BindJSON(c, &f)
-
-	tdClient := rt.TdendgineClients.GetCli(f.DatasourceId)
-	if len(f.Querys) == 0 {
-		ginx.Bomb(200, "querys is empty")
-		return
-	}
-
-	data, err := tdClient.QueryLog(f.Querys[0])
-	logger.Debugf("tdengine query:%s result: %+v", f.Querys[0], data)
-	ginx.NewRender(c).Data(data, err)
-}
-
-// query sql template
-func (rt *Router) QuerySqlTemplate(c *gin.Context) {
-	cate := ginx.QueryStr(c, "cate")
-	m := make(map[string]string)
-	switch cate {
-	case models.TDENGINE:
-		m = cconf.TDengineSQLTpl
-	}
-	ginx.NewRender(c).Data(m, nil)
-}
--- a/center/router/router_user.go
+++ b/center/router/router_user.go
@@ -5,54 +5,36 @@ import (
 	"strings"

 	"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) {
-	userid := ginx.QueryInt64(c, "userid", 0)
-	username := ginx.QueryStr(c, "username", "")
-
-	if userid == 0 && username == "" {
-		ginx.Bomb(http.StatusBadRequest, "userid or username required")
-	}
-
-	var user *models.User
-	var err error
-	if userid > 0 {
-		user, err = models.UserGetById(rt.Ctx, userid)
-	} else {
-		user, err = models.UserGetByUsername(rt.Ctx, username)
-	}
+func (rt *Router) userFindAll(c *gin.Context) {
+	limit := ginx.QueryInt(c, "limit", 20)
+	query := ginx.QueryStr(c, "query", "")

+	total, err := models.UserTotal(rt.Ctx, query)
 	ginx.Dangerous(err)

-	groups, err := user.BusiGroups(rt.Ctx, 10000, "")
-	ginx.NewRender(c).Data(groups, err)
-}
+	list, err := models.UserGets(rt.Ctx, query, limit, ginx.Offset(c, limit))
+	ginx.Dangerous(err)

-func (rt *Router) userFindAll(c *gin.Context) {
-	list, err := models.UserGetAll(rt.Ctx)
-	ginx.NewRender(c).Data(list, err)
+	ginx.NewRender(c).Data(gin.H{
+		"list":  list,
+		"total": total,
+	}, nil)
 }

 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,25 +61,14 @@ 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 {
 		ginx.Bomb(http.StatusBadRequest, "roles empty")
 	}

-	username := Username(c)
+	user := c.MustGet("user").(*models.User)

 	u := models.User{
 		Username: f.Username,
@@ -108,11 +79,10 @@ func (rt *Router) userAddPost(c *gin.Context) {
 		Portrait: f.Portrait,
 		Roles:    strings.Join(f.Roles, " "),
 		Contacts: f.Contacts,
-		CreateBy: username,
-		UpdateBy: username,
+		CreateBy: user.Username,
+		UpdateBy: user.Username,
 	}

-	ginx.Dangerous(u.Verify())
 	ginx.NewRender(c).Message(u.Add(rt.Ctx))
 }

@@ -129,30 +99,6 @@ type userProfileForm struct {
 	Contacts ormx.JSONObj `json:"contacts"`
 }

-func (rt *Router) userProfilePutByService(c *gin.Context) {
-	var f models.User
-	ginx.BindJSON(c, &f)
-
-	if len(f.RolesLst) == 0 {
-		ginx.Bomb(http.StatusBadRequest, "roles empty")
-	}
-
-	password, err := models.CryptoPass(rt.Ctx, f.Password)
-	ginx.Dangerous(err)
-
-	target := User(rt.Ctx, ginx.UrlParamInt64(c, "id"))
-	target.Nickname = f.Nickname
-	target.Password = password
-	target.Phone = f.Phone
-	target.Email = f.Email
-	target.Portrait = f.Portrait
-	target.Roles = strings.Join(f.RolesLst, " ")
-	target.Contacts = f.Contacts
-	target.UpdateBy = Username(c)
-
-	ginx.NewRender(c).Message(target.UpdateAllFields(rt.Ctx))
-}
-
 func (rt *Router) userProfilePut(c *gin.Context) {
 	var f userProfileForm
 	ginx.BindJSON(c, &f)
@@ -162,11 +108,6 @@ func (rt *Router) userProfilePut(c *gin.Context) {
 	}

 	target := User(rt.Ctx, ginx.UrlParamInt64(c, "id"))
-	oldInfo := models.User{
-		Username: target.Username,
-		Phone:    target.Phone,
-		Email:    target.Email,
-	}
 	target.Nickname = f.Nickname
 	target.Phone = f.Phone
 	target.Email = f.Email
@@ -174,10 +115,6 @@ func (rt *Router) userProfilePut(c *gin.Context) {
 	target.Contacts = f.Contacts
 	target.UpdateBy = c.MustGet("username").(string)

-	if flashduty.NeedSyncUser(rt.Ctx) {
-		flashduty.UpdateUser(rt.Ctx, oldInfo, f.Email, f.Phone)
-	}
-
 	ginx.NewRender(c).Message(target.UpdateAllFields(rt.Ctx))
 }

@@ -191,18 +128,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
@@ -5,12 +5,10 @@ import (
 	"time"

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

 	"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) {
@@ -31,49 +29,9 @@ func (rt *Router) userGroupGets(c *gin.Context) {
 	ginx.NewRender(c).Data(lst, err)
 }

-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)
-}
-
-// user group member get by service
-func (rt *Router) userGroupMemberGetsByService(c *gin.Context) {
-	members, err := models.UserGroupMemberGetAll(rt.Ctx)
-	ginx.NewRender(c).Data(members, err)
-}
-
 type userGroupForm struct {
-	Name              string `json:"name" binding:"required"`
-	Note              string `json:"note"`
-	IsSyncToFlashDuty bool   `json:"is_sync_to_flashduty"`
+	Name string `json:"name" binding:"required"`
+	Note string `json:"note"`
 }

 func (rt *Router) userGroupAdd(c *gin.Context) {
@@ -90,19 +48,12 @@ func (rt *Router) userGroupAdd(c *gin.Context) {
 	}

 	err := ug.Add(rt.Ctx)
-	ginx.Dangerous(err)
-
-	// Even failure is not a big deal
-	models.UserGroupMemberAdd(rt.Ctx, ug.Id, me.Id)
-
-	if f.IsSyncToFlashDuty || flashduty.NeedSyncTeam(rt.Ctx) {
-		ugs, err := flashduty.NewUserGroupSyncer(rt.Ctx, &ug)
-		ginx.Dangerous(err)
-		err = ugs.SyncUGAdd()
-		ginx.Dangerous(err)
+	if err == nil {
+		// Even failure is not a big deal
+		models.UserGroupMemberAdd(rt.Ctx, ug.Id, me.Id)
 	}
-	ginx.NewRender(c).Data(ug.Id, err)

+	ginx.NewRender(c).Data(ug.Id, err)
 }

 func (rt *Router) userGroupPut(c *gin.Context) {
@@ -111,7 +62,6 @@ func (rt *Router) userGroupPut(c *gin.Context) {

 	me := c.MustGet("user").(*models.User)
 	ug := c.MustGet("user_group").(*models.UserGroup)
-	oldUGName := ug.Name

 	if ug.Name != f.Name {
 		// name changed, check duplication
@@ -127,14 +77,8 @@ func (rt *Router) userGroupPut(c *gin.Context) {
 	ug.Note = f.Note
 	ug.UpdateBy = me.Username
 	ug.UpdateAt = time.Now().Unix()
-	if f.IsSyncToFlashDuty || flashduty.NeedSyncTeam(rt.Ctx) {
-		ugs, err := flashduty.NewUserGroupSyncer(rt.Ctx, ug)
-		ginx.Dangerous(err)
-		err = ugs.SyncUGPut(oldUGName)
-		ginx.Dangerous(err)
-	}
-	ginx.NewRender(c).Message(ug.Update(rt.Ctx, "Name", "Note", "UpdateAt", "UpdateBy"))

+	ginx.NewRender(c).Message(ug.Update(rt.Ctx, "Name", "Note", "UpdateAt", "UpdateBy"))
 }

 // Return all members, front-end search and paging
@@ -154,16 +98,8 @@ func (rt *Router) userGroupGet(c *gin.Context) {
 }

 func (rt *Router) userGroupDel(c *gin.Context) {
-	isSyncToFlashDuty := ginx.QueryBool(c, "is_sync_to_flashduty", false)
 	ug := c.MustGet("user_group").(*models.UserGroup)
-	if isSyncToFlashDuty || flashduty.NeedSyncTeam(rt.Ctx) {
-		ugs, err := flashduty.NewUserGroupSyncer(rt.Ctx, ug)
-		ginx.Dangerous(err)
-		err = ugs.SyncUGDel(ug.Name)
-		ginx.Dangerous(err)
-	}
 	ginx.NewRender(c).Message(ug.Del(rt.Ctx))
-
 }

 func (rt *Router) userGroupMemberAdd(c *gin.Context) {
@@ -175,21 +111,13 @@ func (rt *Router) userGroupMemberAdd(c *gin.Context) {
 	ug := c.MustGet("user_group").(*models.UserGroup)

 	err := ug.AddMembers(rt.Ctx, f.Ids)
-	ginx.Dangerous(err)
 	if err == nil {
 		ug.UpdateAt = time.Now().Unix()
 		ug.UpdateBy = me.Username
 		ug.Update(rt.Ctx, "UpdateAt", "UpdateBy")
 	}

-	if f.IsSyncToFlashDuty || flashduty.NeedSyncTeam(rt.Ctx) {
-		ugs, err := flashduty.NewUserGroupSyncer(rt.Ctx, ug)
-		ginx.Dangerous(err)
-		err = ugs.SyncMembersAdd()
-		ginx.Dangerous(err)
-	}
 	ginx.NewRender(c).Message(err)
-
 }

 func (rt *Router) userGroupMemberDel(c *gin.Context) {
@@ -206,12 +134,6 @@ func (rt *Router) userGroupMemberDel(c *gin.Context) {
 		ug.UpdateBy = me.Username
 		ug.Update(rt.Ctx, "UpdateAt", "UpdateBy")
 	}
-	if f.IsSyncToFlashDuty || flashduty.NeedSyncTeam(rt.Ctx) {
-		ugs, err := flashduty.NewUserGroupSyncer(rt.Ctx, ug)
-		ginx.Dangerous(err)
-		err = ugs.SyncMembersDel()
-		ginx.Dangerous(err)
-	}

 	ginx.NewRender(c).Message(err)
 }
--- a/center/router/router_user_variable_config.go
+++ b/center/router/router_user_variable_config.go
@@ -1,70 +0,0 @@
-package router
-
-import (
-	"strings"
-	"time"
-
-	"github.com/ccfos/nightingale/v6/models"
-
-	"github.com/gin-gonic/gin"
-	"github.com/toolkits/pkg/ginx"
-)
-
-func (rt *Router) userVariableConfigGets(context *gin.Context) {
-	userVariables, err := models.ConfigsGetUserVariable(rt.Ctx)
-	ginx.NewRender(context).Data(userVariables, err)
-}
-func (rt *Router) userVariableConfigAdd(context *gin.Context) {
-	var f models.Configs
-	ginx.BindJSON(context, &f)
-	f.Ckey = strings.TrimSpace(f.Ckey)
-	//insert external config. needs to make sure not plaintext for an encrypted type config
-	username := context.MustGet("username").(string)
-	now := time.Now().Unix()
-	f.CreateBy = username
-	f.UpdateBy = username
-	f.CreateAt = now
-	f.UpdateAt = now
-	ginx.NewRender(context).Message(models.ConfigsUserVariableInsert(rt.Ctx, f))
-
-}
-
-func (rt *Router) userVariableConfigPut(context *gin.Context) {
-	var f models.Configs
-	ginx.BindJSON(context, &f)
-	f.Id = ginx.UrlParamInt64(context, "id")
-	f.Ckey = strings.TrimSpace(f.Ckey)
-	f.UpdateBy = context.MustGet("username").(string)
-	f.UpdateAt = time.Now().Unix()
-
-	user := context.MustGet("user").(*models.User)
-	if !user.IsAdmin() && f.CreateBy != user.Username {
-		// only admin or creator can update
-		ginx.Bomb(403, "no permission")
-	}
-
-	ginx.NewRender(context).Message(models.ConfigsUserVariableUpdate(rt.Ctx, f))
-}
-
-func (rt *Router) userVariableConfigDel(context *gin.Context) {
-	id := ginx.UrlParamInt64(context, "id")
-	configs, err := models.ConfigGet(rt.Ctx, id)
-	ginx.Dangerous(err)
-
-	user := context.MustGet("user").(*models.User)
-	if !user.IsAdmin() && configs.CreateBy != user.Username {
-		// only admin or creator can delete
-		ginx.Bomb(403, "no permission")
-	}
-
-	if configs != nil && configs.External == models.ConfigExternal {
-		ginx.NewRender(context).Message(models.ConfigsDel(rt.Ctx, []int64{id}))
-	} else {
-		ginx.NewRender(context).Message(nil)
-	}
-}
-
-func (rt *Router) userVariableGetDecryptByService(context *gin.Context) {
-	decryptMap, decryptErr := models.ConfigUserVariableGetDecryptMap(rt.Ctx, rt.HTTP.RSA.RSAPrivateKey, rt.HTTP.RSA.RSAPassWord)
-	ginx.NewRender(context).Data(decryptMap, decryptErr)
-}
--- a/center/sso/init.go
+++ b/center/sso/init.go
@@ -1,32 +1,25 @@
 package sso

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

+	"github.com/BurntSushi/toml"
 	"github.com/ccfos/nightingale/v6/center/cconf"
-	"github.com/ccfos/nightingale/v6/memsto"
 	"github.com/ccfos/nightingale/v6/models"
 	"github.com/ccfos/nightingale/v6/pkg/cas"
 	"github.com/ccfos/nightingale/v6/pkg/ctx"
 	"github.com/ccfos/nightingale/v6/pkg/ldapx"
 	"github.com/ccfos/nightingale/v6/pkg/oauth2x"
 	"github.com/ccfos/nightingale/v6/pkg/oidcx"
-	"github.com/ccfos/nightingale/v6/pkg/tplx"

-	"github.com/BurntSushi/toml"
 	"github.com/toolkits/pkg/logger"
 )

 type SsoClient struct {
-	OIDC                 *oidcx.SsoClient
-	LDAP                 *ldapx.SsoClient
-	CAS                  *cas.SsoClient
-	OAuth2               *oauth2x.SsoClient
-	LastUpdateTime       int64
-	configCache          *memsto.ConfigCache
-	configLastUpdateTime int64
+	OIDC   *oidcx.SsoClient
+	LDAP   *ldapx.SsoClient
+	CAS    *cas.SsoClient
+	OAuth2 *oauth2x.SsoClient
 }

 const LDAP = `
@@ -36,21 +29,13 @@ Port = 389
 BaseDn = 'dc=example,dc=org'
 BindUser = 'cn=manager,dc=example,dc=org'
 BindPass = '*******'
-SyncAddUsers = false
-SyncDelUsers = false
-# unit: s
-SyncInterval = 86400
-# openldap format e.g. (&(uid=%s))
-# AD format e.g. (&(sAMAccountName=%s))
 AuthFilter = '(&(uid=%s))'
-UserFilter = '(&(uid=*))'
 CoverAttributes = true
 TLS = false
 StartTLS = true
 DefaultRoles = ['Standard']

 [Attributes]
-Username = 'uid'
 Nickname = 'cn'
 Phone = 'mobile'
 Email = 'mail'
@@ -59,9 +44,8 @@ Email = 'mail'
 const OAuth2 = `
 Enable = false
 DisplayName = 'OAuth2登录'
-RedirectURL = 'http://n9e.com/callback/oauth'
+RedirectURL = 'http://127.0.0.1:18000/callback/oauth'
 SsoAddr = 'https://sso.example.com/oauth2/authorize'
-SsoLogoutAddr = 'https://sso.example.com/oauth2/authorize/session/end'
 TokenAddr = 'https://sso.example.com/oauth2/token'
 UserInfoAddr = 'https://api.example.com/api/v1/user/info'
 TranTokenMethod = 'header'
@@ -74,7 +58,7 @@ UserinfoPrefix = 'data'
 Scopes = ['profile', 'email', 'phone']

 [Attributes]
-Username = 'sub'
+Username = 'username'
 Nickname = 'nickname'
 Phone = 'phone_number'
 Email = 'email'
@@ -82,41 +66,34 @@ Email = 'email'

 const CAS = `
 Enable = false
-DisplayName = 'CAS登录'
-RedirectURL = 'http://n9e.com/callback/cas'
 SsoAddr = 'https://cas.example.com/cas/'
-SsoLogoutAddr = 'https://cas.example.com/cas/session/end'
-# LoginPath = ''
-CoverAttributes = true
+RedirectURL = 'http://127.0.0.1:18000/callback/cas'
+DisplayName = 'CAS登录'
+CoverAttributes = false
 DefaultRoles = ['Standard']

 [Attributes]
-Username = 'sub'
 Nickname = 'nickname'
 Phone = 'phone_number'
 Email = 'email'
 `
-
 const OIDC = `
 Enable = false
 DisplayName = 'OIDC登录'
 RedirectURL = 'http://n9e.com/callback'
 SsoAddr = 'http://sso.example.org'
-SsoLogoutAddr = 'http://sso.example.org/session/end'
 ClientId = ''
 ClientSecret = ''
 CoverAttributes = true
 DefaultRoles = ['Standard']
-Scopes = ['openid', 'profile', 'email', 'phone']

 [Attributes]
-Username = 'sub'
 Nickname = 'nickname'
 Phone = 'phone_number'
 Email = 'email'
 `

-func Init(center cconf.Center, ctx *ctx.Context, configCache *memsto.ConfigCache) *SsoClient {
+func Init(center cconf.Center, ctx *ctx.Context) *SsoClient {
 	ssoClient := new(SsoClient)
 	m := make(map[string]string)
 	m["LDAP"] = LDAP
@@ -145,11 +122,6 @@ func Init(center cconf.Center, ctx *ctx.Context, configCache *memsto.ConfigCache
 			log.Fatalln(err)
 		}
 	}
-	if configCache == nil {
-		log.Fatalln(fmt.Errorf("configCache is nil, sso initialization failed"))
-	}
-	ssoClient.configCache = configCache
-	userVariableMap := configCache.Get()

 	configs, err := models.SsoConfigGets(ctx)
 	if err != nil {
@@ -157,7 +129,6 @@ func Init(center cconf.Center, ctx *ctx.Context, configCache *memsto.ConfigCache
 	}

 	for _, cfg := range configs {
-		cfg.Content = tplx.ReplaceTemplateUseText(cfg.Name, cfg.Content, userVariableMap)
 		switch cfg.Name {
 		case "LDAP":
 			var config ldapx.Config
@@ -172,7 +143,6 @@ func Init(center cconf.Center, ctx *ctx.Context, configCache *memsto.ConfigCache
 			if err != nil {
 				log.Fatalln("init oidc failed:", err)
 			}
-			logger.Info("init oidc..")
 			oidcClient, err := oidcx.New(config)
 			if err != nil {
 				logger.Error("init oidc failed:", err)
@@ -195,84 +165,5 @@ func Init(center cconf.Center, ctx *ctx.Context, configCache *memsto.ConfigCache
 			ssoClient.OAuth2 = oauth2x.New(config)
 		}
 	}
-
-	go ssoClient.SyncSsoUsers(ctx)
-	go ssoClient.Reload(ctx)
 	return ssoClient
 }
-
-// 定期更新sso配置
-func (s *SsoClient) reload(ctx *ctx.Context) error {
-	lastUpdateTime, err := models.SsoConfigLastUpdateTime(ctx)
-	if err != nil {
-		return err
-	}
-
-	lastCacheUpdateTime := s.configCache.GetLastUpdateTime()
-	if lastUpdateTime == s.LastUpdateTime && lastCacheUpdateTime == s.configLastUpdateTime {
-		return nil
-	}
-
-	configs, err := models.SsoConfigGets(ctx)
-	if err != nil {
-		return err
-	}
-	userVariableMap := s.configCache.Get()
-	for _, cfg := range configs {
-		cfg.Content = tplx.ReplaceTemplateUseText(cfg.Name, cfg.Content, userVariableMap)
-		switch cfg.Name {
-		case "LDAP":
-			var config ldapx.Config
-			err := toml.Unmarshal([]byte(cfg.Content), &config)
-			if err != nil {
-				logger.Warning("reload ldap failed", err)
-				continue
-			}
-			s.LDAP.Reload(config)
-		case "OIDC":
-			var config oidcx.Config
-			err := toml.Unmarshal([]byte(cfg.Content), &config)
-			if err != nil {
-				logger.Warning("reload oidc failed:", err)
-				continue
-			}
-
-			logger.Info("reload oidc..")
-			err = s.OIDC.Reload(config)
-			if err != nil {
-				logger.Error("reload oidc failed:", err)
-				continue
-			}
-		case "CAS":
-			var config cas.Config
-			err := toml.Unmarshal([]byte(cfg.Content), &config)
-			if err != nil {
-				logger.Warning("reload cas failed:", err)
-				continue
-			}
-			s.CAS.Reload(config)
-		case "OAuth2":
-			var config oauth2x.Config
-			err := toml.Unmarshal([]byte(cfg.Content), &config)
-			if err != nil {
-				logger.Warning("reload oauth2 failed:", err)
-				continue
-			}
-			s.OAuth2.Reload(config)
-		}
-	}
-
-	s.LastUpdateTime = lastUpdateTime
-	s.configLastUpdateTime = lastCacheUpdateTime
-	return nil
-}
-
-func (s *SsoClient) Reload(ctx *ctx.Context) {
-	duration := time.Duration(9000) * time.Millisecond
-	for {
-		time.Sleep(duration)
-		if err := s.reload(ctx); err != nil {
-			logger.Warning("reload sso client err:", err)
-		}
-	}
-}
--- a/center/sso/sync.go
+++ b/center/sso/sync.go
@@ -1,37 +0,0 @@
-package sso
-
-import (
-	"fmt"
-
-	"github.com/ccfos/nightingale/v6/pkg/ctx"
-	"github.com/toolkits/pkg/logger"
-)
-
-func (s *SsoClient) SyncSsoUsers(ctx *ctx.Context) {
-	if err := s.LDAP.SyncAddAndDelUsers(ctx); err != nil {
-		fmt.Println("failed to sync the addition and deletion of ldap users:", err)
-	}
-
-	if err := s.LDAP.SyncDelUsers(ctx); err != nil {
-		fmt.Println("failed to sync deletion of ldap users:", err)
-	}
-
-	go s.loopSyncSsoUsers(ctx)
-}
-
-func (s *SsoClient) loopSyncSsoUsers(ctx *ctx.Context) {
-	for {
-		select {
-		case <-s.LDAP.Ticker.C:
-			lc := s.LDAP.Copy()
-
-			if err := lc.SyncAddAndDelUsers(ctx); err != nil {
-				logger.Warningf("failed to sync the addition and deletion of ldap users: %v", err)
-			}
-
-			if err := lc.SyncDelUsers(ctx); err != nil {
-				logger.Warningf("failed to sync deletion of ldap users: %v", err)
-			}
-		}
-	}
-}
--- a/cli/upgrade/config.go
+++ b/cli/upgrade/config.go
@@ -33,7 +33,7 @@ type ClusterOptions struct {
 	MaxIdleConnsPerHost int
 }

-func Parse(fpath string, configPtr *Config) error {
+func Parse(fpath string, configPtr interface{}) error {
 	var (
 		tBuf []byte
 	)
--- a/cli/upgrade/upgrade.go
+++ b/cli/upgrade/upgrade.go
@@ -18,9 +18,9 @@ func Upgrade(configFile string) error {
 		return err
 	}

-	ctx := ctx.NewContext(context.Background(), db, true)
+	ctx := ctx.NewContext(context.Background(), db)
 	for _, cluster := range config.Clusters {
-		count, err := models.GetDatasourcesCountByName(ctx, cluster.Name)
+		count, err := models.GetDatasourcesCountBy(ctx, "", "", cluster.Name)
 		if err != nil {
 			logger.Errorf("get datasource %s count error: %v", cluster.Name, err)
 			continue
--- a/cli/upgrade/upgrade.sql
+++ b/cli/upgrade/upgrade.sql
@@ -8,13 +8,6 @@ insert into `role_operation`(role_name, operation) values('Standard', '/trace/ex
 insert into `role_operation`(role_name, operation) values('Standard', '/alert-rules-built-in');
 insert into `role_operation`(role_name, operation) values('Standard', '/dashboards-built-in');
 insert into `role_operation`(role_name, operation) values('Standard', '/trace/dependencies');
-insert into `role_operation`(role_name, operation) values('Standard', '/help/servers');
-insert into `role_operation`(role_name, operation) values('Standard', '/help/migrate');
-
-insert into `role_operation`(role_name, operation) values('Admin', '/help/source');
-insert into `role_operation`(role_name, operation) values('Admin', '/help/sso');
-insert into `role_operation`(role_name, operation) values('Admin', '/help/notification-tpls');
-insert into `role_operation`(role_name, operation) values('Admin', '/help/notification-settings');

 alter table `board` add built_in tinyint(1) not null default 0 comment '0:false 1:true';
 alter table `board` add hide tinyint(1) not null default 0 comment '0:false 1:true';
@@ -48,9 +41,6 @@ alter table `alert_his_event` add annotations text not null comment 'annotations
 alter table `alert_his_event` add rule_config text not null comment 'rule_config';

 alter table `alerting_engines` add datasource_id bigint unsigned not null default 0;
-alter table `alerting_engines` change cluster engine_cluster varchar(128) not null default '' comment 'n9e engine cluster';
-
-alter table `task_record` add event_id bigint not null comment 'event id' default 0;

 CREATE TABLE `datasource`
 (
--- a/Show More
+++ b/Show More