refactor basic auth configurations: merge HTTP.Pushgw and HTTP.Heartbeat to HTTP.APIForAgent; merge HTTP.Alert and HTTP.Service to HTTP.APIForService

2026-03-05 15:38:59 +00:00 · 2023-06-01 16:12:50 +08:00
723 changed files with 17976 additions and 123862 deletions
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -11,7 +11,7 @@ body:
  - type: textarea
    id: config
    attributes:
-      label: Your config.toml
+      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:
@@ -20,7 +20,7 @@ body:
    id: logs
    attributes:
      label: Relevant logs
-      description: categraf | telegraf | n9e | prometheus | chrome request/response ...
+      description: categraf | telegraf | server | webapi | prometheus | chrome request/response ...
      render: text
    validations:
      required: true
--- a/.gitignore
+++ b/.gitignore
@@ -30,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
@@ -44,14 +40,9 @@ _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
+/docker/mysqldata
+/docker/experience_pg_vm/pgdata
 /etc.local*
-/front/statik/statik.go
-/docker/compose-bridge/etc-nightingale/rsa/

 .alerts
 .idea
--- a/.goreleaser.yaml
+++ b/.goreleaser.yaml
@@ -15,8 +15,7 @@ builds:
  - id: build
    hooks:
      pre:
-      - cmd: sh -x ./fe.sh
-        output: true
+       - ./fe.sh
    main: ./cmd/center/
    binary: n9e
    env:
@@ -42,9 +41,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 +73,8 @@ archives:
    builds:
      - build
      - build-cli
-      - build-edge
+      - build-alert
+      - build-pushgw
    format: tar.gz
    format_overrides:
      - goos: windows
@@ -71,6 +84,7 @@ archives:
    files:
      - docker/*
      - etc/*
+      - pub/*
      - integrations/*
      - cli/*
      - n9e.sql
@@ -90,6 +104,7 @@ dockers:
      - build
    dockerfile: docker/Dockerfile.goreleaser
    extra_files:
+      - pub
      - etc
      - integrations
    use: buildx
@@ -103,6 +118,7 @@ dockers:
      - build
    dockerfile: docker/Dockerfile.goreleaser.arm64
    extra_files:
+      - pub
      - etc
      - integrations
    use: buildx
--- a/13
+++ b/13
@@ -1,4 +1,4 @@
-.PHONY: prebuild build
+.PHONY: prebuild start build

 ROOT:=$(shell pwd -P)
 GIT_COMMIT:=$(shell git --work-tree ${ROOT}  rev-parse 'HEAD^{commit}')
@@ -6,19 +6,16 @@ _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

@@ -31,10 +28,10 @@ build-cli:
 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,79 +1,68 @@
 <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">
+  告警管理专家，一体化开源观测平台！
 </p>
-
-

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

-## 夜莺 Nightingale 是什么
-夜莺 Nightingale 是中国计算机学会接受捐赠并托管的第一个开源项目，是一个 All-in-One 的云原生监控工具，集合了 Prometheus 和 Grafana 的优点，你可以在 WebUI 上管理和配置告警策略，也可以对分布在多个 Region 的指标、日志、链路追踪数据进行统一的可视化和分析。夜莺融入了一线互联网公司可观测性最佳实践，沉淀了众多社区专家经验，开箱即用。[了解更多...](https://flashcat.cloud/product/nightingale/)
+## 资料
+
+- 文档：[https://flashcat.cloud/docs/](https://flashcat.cloud/docs/)
+- 论坛提问：[https://answer.flashcat.cloud/](https://answer.flashcat.cloud/)
+- 报Bug：[https://github.com/ccfos/nightingale/issues](https://github.com/ccfos/nightingale/issues/new?assignees=&labels=kind%2Fbug&projects=&template=bug_report.yml)
+- 商业版本：[企业版](https://mp.weixin.qq.com/s/FOwnnGPkRao2ZDV574EHrw) | [专业版](https://mp.weixin.qq.com/s/uM2a8QUDJEYwdBpjkbQDxA) 感兴趣请 [联系我们交流试用](https://flashcat.cloud/contact/)
+
+## 功能和特点
+
+- **统一接入各种时序库**：支持对接 Prometheus、VictoriaMetrics、Thanos、Mimir、M3DB 等多种时序库，实现统一告警管理
+- **专业告警能力**：内置支持多种告警规则，可以扩展支持所有通知媒介，支持告警屏蔽、告警抑制、告警自愈、告警事件管理
+- **无缝搭配 [FlashDuty](https://flashcat.cloud/product/flashcat-duty/)**：实现告警聚合收敛、认领、升级、排班、IM集成，确保告警处理不遗漏，减少打扰，更好协同
+- **支持所有常见采集器**：支持 categraf、telegraf、grafana-agent、datadog-agent、给类 exporter 作为采集器，没有什么数据是不能监控的
+- **统一的观测平台**：从 v6 版本开始，支持接入 ElasticSearch、Jaeger 数据源，逐步实现日志、链路、指标的一体化观测
+
+## 产品示意图
+
+https://user-images.githubusercontent.com/792850/216888712-2565fcea-9df5-47bd-a49e-d60af9bd76e8.mp4


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

-## 功能特点
+欢迎加入 QQ 交流群，群号：479290895，也可以扫下方二维码加入微信交流群：

- 对接多种时序库：支持对接 Prometheus、VictoriaMetrics、Thanos、Mimir、M3DB、TDengine 等多种时序库，实现统一告警管理。
- 专业告警能力：内置支持多种告警规则，可以扩展支持常见通知媒介，支持告警屏蔽/抑制/聚合/自愈、告警事件管理。
- 高性能可视化引擎：支持多种图表样式，内置众多 Dashboard 模版，也可导入 Grafana 模版，开箱即用，开源协议商业友好。
- 支持常见采集器：支持 [Categraf](https://flashcat.cloud/product/categraf)、Telegraf、Grafana-agent、Datadog-agent、各种 Exporter 作为采集器，没有什么数据是不能监控的。
- 一体化观测平台：从 V6 版本开始，支持对接 ElasticSearch、Jaeger 数据源，实现日志、链路、指标多维度的统一可观测。
- 👀无缝搭配 [Flashduty](https://flashcat.cloud/product/flashcat-duty/)：实现告警聚合收敛、认领、升级、排班、IM集成，确保告警处理不遗漏，减少打扰，高效协同。
+<img src="doc/img/wecom.png" width="240">

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

-## 功能演示
-![演示](https://fcpub-1301667576.cos.ap-nanjing.myqcloud.com/n9e/n9e-demo.gif)
-
-## 部署架构
-<p align=center>中心化部署</p>
-
-![中心化部署](https://fcpub-1301667576.cos.ap-nanjing.myqcloud.com/flashcat/images/blog/n9e-opensource-china/8.png)
-
-<p align=center>多机房部署</p>
-
-![多机房部署](https://fcpub-1301667576.cos.ap-nanjing.myqcloud.com/flashcat/images/blog/n9e-opensource-china/9.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`
- 日常答疑、技术分享、用户之间的交流，统一使用知识星球，大伙可以免费加入交流，[入口在这里](https://download.flashcat.cloud/ulric/20240319095409.png)
-
-## 广受关注
-[![Stargazers over time](https://api.star-history.com/svg?repos=ccfos/nightingale&type=Date)](https://star-history.com/#ccfos/nightingale&Date)
-
-
-## 社区共建
- ❇️请阅读浏览[夜莺开源项目和社区治理架构草案](./doc/community-governance.md)，真诚欢迎每一位用户、开发者、公司以及组织，使用夜莺监控、积极反馈 Bug、提交功能需求、分享最佳实践，共建专业、活跃的夜莺开源社区。
- 夜莺贡献者❤️
+## 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)
+
+## 社区管理
+
+[夜莺开源项目和社区治理架构（草案）](./doc/community-governance.md)
+
--- a/README_en.md
+++ b/README_en.md
@@ -1,6 +1,6 @@
 <p align="center">
  <a href="https://github.com/ccfos/nightingale">
-    <img src="doc/img/Nightingale_L_V.png" alt="nightingale - cloud native monitoring" width="240" /></a>
+    <img src="doc/img/nightingale_logo_h.png" alt="nightingale - cloud native monitoring" width="240" /></a>
 </p>

 <p align="center">
@@ -25,7 +25,7 @@
  We recommend upgrading your <b>Prometheus + AlertManager + Grafana</b> combination to Nightingale!
 </p>

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


 ## Highlighted Features
@@ -62,7 +62,7 @@

 ## Getting Started

-[https://n9e.github.io/](https://n9e.github.io/)
+[English Doc](https://n9e.github.io/) |  [中文文档](http://n9e.flashcat.cloud/)

 ## Screenshots

--- 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
@@ -53,9 +54,9 @@ type Ibex struct {
 	Timeout       int64
 }

-func (a *Alert) PreCheck(configDir string) {
+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 {
@@ -69,8 +70,4 @@ func (a *Alert) PreCheck(configDir string) {
 	if a.Heartbeat.EngineName == "" {
 		a.Heartbeat.EngineName = "default"
 	}
-
-	if a.EngineDelay == 0 {
-		a.EngineDelay = 30
-	}
 }
--- 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"
@@ -24,7 +23,6 @@ import (
 	"github.com/ccfos/nightingale/v6/prom"
 	"github.com/ccfos/nightingale/v6/pushgw/pconf"
 	"github.com/ccfos/nightingale/v6/pushgw/writer"
-	"github.com/ccfos/nightingale/v6/tdengine"
 )

 func Initialize(configDir string, cryptoKey string) (func(), error) {
@@ -43,27 +41,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, nil)
 	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)

-	promClients := prom.NewPromClient(ctx)
-	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, dsCache, ctx, promClients, tdengineClients, userCache, userGroupCache)
+	Start(config.Alert, config.Pushgw, syncStats, alertStats, externalProcessors, targetCache, busiGroupCache, alertMuteCache, alertRuleCache, notifyConfigCache, dsCache, ctx, promClients)

 	r := httpx.GinEngine(config.Global.RunMode, config.HTTP)
 	rt := router.New(config.HTTP, config.Alert, alertMuteCache, targetCache, busiGroupCache, alertStats, ctx, externalProcessors)
 	rt.Config(r)
-	dumper.ConfigRouter(r)

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

@@ -74,28 +67,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, 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) {
+	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)

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

-	eval.NewScheduler(alertc, externalProcessors, alertRuleCache, targetCache, targetsOfAlertRulesCache,
-		busiGroupCache, alertMuteCache, datasourceCache, promClients, tdendgineClients, naming, ctx, alertStats)
+	eval.NewScheduler(alertc, externalProcessors, alertRuleCache, targetCache, busiGroupCache, alertMuteCache, datasourceCache, promClients, naming, ctx, alertStats)

-	dp := dispatch.NewDispatch(alertRuleCache, userCache, userGroupCache, alertSubscribeCache, targetCache, notifyConfigCache, alertc.Alerting, ctx, alertStats)
+	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(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"})
-
-	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/alert/common/conv.go
+++ b/alert/common/conv.go
@@ -15,8 +15,6 @@ type AnomalyPoint struct {
 	Value     float64      `json:"value"`
 	Severity  int          `json:"severity"`
 	Triggered bool         `json:"triggered"`
-	Query     string       `json:"query"`
-	Values    string       `json:"values"`
 }

 func NewAnomalyPoint(key string, labels map[string]string, ts int64, value float64, severity int) AnomalyPoint {
--- a/alert/common/key.go
+++ b/alert/common/key.go
@@ -22,14 +22,6 @@ 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 {
--- a/alert/dispatch/consume.go
+++ b/alert/dispatch/consume.go
@@ -61,27 +61,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("rule_note"); err != nil {
-		logger.Warningf("ruleid:%d failed to parse rule note: %v", event.RuleId, err)
 		event.RuleNote = fmt.Sprintf("failed to parse rule note: %v", err)
 	}

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

 	e.persist(event)
@@ -94,17 +83,11 @@ func (e *Consumer) consumeOne(event *models.AlertCurEvent) {
 }

 func (e *Consumer) persist(event *models.AlertCurEvent) {
-	if event.Status != 0 {
-		return
-	}
-
 	if !e.ctx.IsCenter {
 		event.DB2FE()
-		var err error
-		event.Id, err = poster.PostByUrlsWithResp[int64](e.ctx, "/v1/n9e/event-persist", event)
+		err := poster.PostByUrls(e.ctx, "/v1/n9e/event-persist", 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").Inc()
+			logger.Errorf("event%+v persist err:%v", event, err)
 		}
 		return
 	}
@@ -112,6 +95,5 @@ func (e *Consumer) persist(event *models.AlertCurEvent) {
 	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").Inc()
 	}
 }
--- a/alert/dispatch/dispatch.go
+++ b/alert/dispatch/dispatch.go
@@ -9,7 +9,6 @@ import (
 	"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"
@@ -29,13 +28,11 @@ type Dispatch struct {

 	alerting aconf.Alerting

-	Senders          map[string]sender.Sender
-	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
+	ExtraSenders map[string]sender.Sender

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

 	RwLock sync.RWMutex
 }
@@ -43,7 +40,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,
-	alerting aconf.Alerting, ctx *ctx.Context, astats *astats.Stats) *Dispatch {
+	alerting aconf.Alerting, ctx *ctx.Context) *Dispatch {
 	notify := &Dispatch{
 		alertRuleCache:      alertRuleCache,
 		userCache:           userCache,
@@ -54,13 +51,11 @@ func NewDispatch(alertRuleCache *memsto.AlertRuleCacheType, userCache *memsto.Us

 		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),
+		ExtraSenders: make(map[string]sender.Sender),

-		ctx:    ctx,
-		Astats: astats,
+		ctx: ctx,
 	}
 	return notify
 }
@@ -68,7 +63,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
@@ -88,24 +83,23 @@ 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.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),
 	}

 	e.RwLock.RLock()
-	for channelName, extraSender := range e.ExtraSenders {
-		senders[channelName] = extraSender
+	for channel, sender := range e.ExtraSenders {
+		senders[channel] = sender
 	}
 	e.RwLock.RUnlock()

 	e.RwLock.Lock()
 	e.tpls = tmpTpls
-	e.Senders = senders
+	e.senders = senders
 	e.RwLock.Unlock()
 	return nil
 }
@@ -146,7 +140,7 @@ func (e *Dispatch) HandleEventNotify(event *models.AlertCurEvent, isSubscribe bo
 	}

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

 	// 如果是不是订阅规则出现的event, 则需要处理订阅规则的event
 	if !isSubscribe {
@@ -173,81 +167,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) {
-	needSend := e.BeforeSenderHook(event)
-	if needSend {
-		for channel, uids := range notifyTarget.ToChannelUserMap() {
-			msgCtx := sender.BuildMessageContext(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)
+func (e *Dispatch) Send(rule *models.AlertRule, event *models.AlertCurEvent, notifyTarget *NotifyTarget, isSubscribe bool) {
+	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.Debugf("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
-	sender.SendCallbacks(e.ctx, notifyTarget.ToCallbackList(), event, e.targetCache, e.userCache, e.notifyConfigCache.GetIbex(), e.Astats)
+	sender.SendCallbacks(e.ctx, notifyTarget.ToCallbackList(), event, e.targetCache, e.userCache, e.notifyConfigCache.GetIbex())

 	// handle global webhooks
-	sender.SendWebhooks(notifyTarget.ToWebhookList(), event, e.Astats)
+	sender.SendWebhooks(notifyTarget.ToWebhookList(), event)

 	// handle plugin call
-	go sender.MayPluginNotify(e.genNoticeBytes(event), e.notifyConfigCache.GetNotifyScript(), e.Astats)
+	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/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,8 +12,6 @@ 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"
 )

@@ -26,15 +23,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 +37,23 @@ 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(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{
 		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,13 +85,10 @@ func (s *Scheduler) syncAlertRules() {
 		if rule == nil {
 			continue
 		}
-
-		ruleType := rule.GetRuleType()
-		if rule.IsPrometheusRule() || rule.IsLokiRule() || rule.IsTdengineRule() {
+		if rule.IsPrometheusRule() {
 			datasourceIds := s.promClients.Hit(rule.DatasourceIdsJson)
-			datasourceIds = append(datasourceIds, s.tdengineClients.Hit(rule.DatasourceIdsJson)...)
 			for _, dsId := range datasourceIds {
-				if !naming.DatasourceHashRing.IsHit(strconv.FormatInt(dsId, 10), fmt.Sprintf("%d", rule.Id), s.aconf.Heartbeat.Endpoint) {
+				if !naming.DatasourceHashRing.IsHit(dsId, fmt.Sprintf("%d", rule.Id), s.aconf.Heartbeat.Endpoint) {
 					continue
 				}
 				ds := s.datasourceCache.GetById(dsId)
@@ -108,27 +97,22 @@ 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.ctx.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
@@ -144,7 +128,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
@@ -4,8 +4,6 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
-	"math"
-	"sort"
 	"strings"
 	"time"

@@ -13,11 +11,8 @@ import (
 	"github.com/ccfos/nightingale/v6/alert/process"
 	"github.com/ccfos/nightingale/v6/models"
 	"github.com/ccfos/nightingale/v6/pkg/ctx"
-	"github.com/ccfos/nightingale/v6/pkg/hash"
-	"github.com/ccfos/nightingale/v6/pkg/parser"
 	promsdk "github.com/ccfos/nightingale/v6/pkg/prom"
 	"github.com/ccfos/nightingale/v6/prom"
-	"github.com/ccfos/nightingale/v6/tdengine"

 	"github.com/toolkits/pkg/logger"
 	"github.com/toolkits/pkg/str"
@@ -33,29 +28,19 @@ type AlertRuleWorker struct {

 	processor *process.Processor

-	promClients     *prom.PromClientMap
-	tdengineClients *tdengine.TdengineClientMap
-	ctx             *ctx.Context
+	promClients *prom.PromClientMap
+	ctx         *ctx.Context
 }

-const (
-	GET_RULE_CONFIG = "get_rule_config"
-	GET_PROCESSOR   = "get_processor"
-	CHECK_QUERY     = "check_query_config"
-	GET_CLIENT      = "get_client"
-	QUERY_DATA      = "query_data"
-)
-
-func NewAlertRuleWorker(rule *models.AlertRule, datasourceId int64, processor *process.Processor, promClients *prom.PromClientMap, tdengineClients *tdengine.TdengineClientMap, ctx *ctx.Context) *AlertRuleWorker {
+func NewAlertRuleWorker(rule *models.AlertRule, datasourceId int64, processor *process.Processor, promClients *prom.PromClientMap, ctx *ctx.Context) *AlertRuleWorker {
 	arw := &AlertRuleWorker{
 		datasourceId: datasourceId,
 		quit:         make(chan struct{}),
 		rule:         rule,
 		processor:    processor,

-		promClients:     promClients,
-		tdengineClients: tdengineClients,
-		ctx:             ctx,
+		promClients: promClients,
+		ctx:         ctx,
 	}

 	return arw
@@ -84,16 +69,14 @@ func (arw *AlertRuleWorker) Start() {
 	if interval <= 0 {
 		interval = 10
 	}
-
-	ticker := time.NewTicker(time.Duration(interval) * time.Second)
 	go func() {
-		defer ticker.Stop()
 		for {
 			select {
 			case <-arw.quit:
 				return
-			case <-ticker.C:
+			default:
 				arw.Eval()
+				time.Sleep(time.Duration(interval) * time.Second)
 			}
 		}
 	}()
@@ -102,23 +85,17 @@ func (arw *AlertRuleWorker) Start() {
 func (arw *AlertRuleWorker) Eval() {
 	cachedRule := arw.rule
 	if cachedRule == nil {
-		// logger.Errorf("rule_eval:%s rule not found", arw.Key())
+		//logger.Errorf("rule_eval:%s rule not found", arw.Key())
 		return
 	}
-	arw.processor.Stats.CounterRuleEval.WithLabelValues().Inc()

 	typ := cachedRule.GetRuleType()
-	var anomalyPoints []common.AnomalyPoint
-	var recoverPoints []common.AnomalyPoint
+	var lst []common.AnomalyPoint
 	switch typ {
 	case models.PROMETHEUS:
-		anomalyPoints = arw.GetPromAnomalyPoint(cachedRule.RuleConfig)
+		lst = arw.GetPromAnomalyPoint(cachedRule.RuleConfig)
 	case models.HOST:
-		anomalyPoints = arw.GetHostAnomalyPoint(cachedRule.RuleConfig)
-	case models.TDENGINE:
-		anomalyPoints, recoverPoints = arw.GetTdengineAnomalyPoint(cachedRule, arw.processor.DatasourceId())
-	case models.LOKI:
-		anomalyPoints = arw.GetPromAnomalyPoint(cachedRule.RuleConfig)
+		lst = arw.GetHostAnomalyPoint(cachedRule.RuleConfig)
 	default:
 		return
 	}
@@ -128,11 +105,7 @@ func (arw *AlertRuleWorker) Eval() {
 		return
 	}

-	for _, point := range recoverPoints {
-		str := fmt.Sprintf("%v", point.Value)
-		arw.processor.RecoverSingle(process.Hash(cachedRule.Id, arw.processor.DatasourceId(), point), point.Timestamp, &str)
-	}
-	arw.processor.Handle(anomalyPoints, "inner", arw.inhibit)
+	arw.processor.Handle(lst, "inner", arw.inhibit)
 }

 func (arw *AlertRuleWorker) Stop() {
@@ -147,13 +120,11 @@ func (arw *AlertRuleWorker) GetPromAnomalyPoint(ruleConfig string) []common.Anom
 	var rule *models.PromRuleConfig
 	if err := json.Unmarshal([]byte(ruleConfig), &rule); err != nil {
 		logger.Errorf("rule_eval:%s rule_config:%s, error:%v", arw.Key(), ruleConfig, err)
-		arw.processor.Stats.CounterRuleEvalErrorTotal.WithLabelValues(fmt.Sprintf("%v", arw.processor.DatasourceId()), GET_RULE_CONFIG).Inc()
 		return lst
 	}

 	if rule == nil {
 		logger.Errorf("rule_eval:%s rule_config:%s, error:rule is nil", arw.Key(), ruleConfig)
-		arw.processor.Stats.CounterRuleEvalErrorTotal.WithLabelValues(fmt.Sprintf("%v", arw.processor.DatasourceId()), GET_RULE_CONFIG).Inc()
 		return lst
 	}

@@ -165,33 +136,26 @@ func (arw *AlertRuleWorker) GetPromAnomalyPoint(ruleConfig string) []common.Anom

 		promql := strings.TrimSpace(query.PromQl)
 		if promql == "" {
-			logger.Warningf("rule_eval:%s promql is blank", arw.Key())
-			arw.processor.Stats.CounterRuleEvalErrorTotal.WithLabelValues(fmt.Sprintf("%v", arw.processor.DatasourceId()), CHECK_QUERY).Inc()
+			logger.Errorf("rule_eval:%s promql is blank", arw.Key())
 			continue
 		}

 		if arw.promClients.IsNil(arw.datasourceId) {
-			logger.Warningf("rule_eval:%s error reader client is nil", arw.Key())
-			arw.processor.Stats.CounterRuleEvalErrorTotal.WithLabelValues(fmt.Sprintf("%v", arw.processor.DatasourceId()), GET_CLIENT).Inc()
+			logger.Errorf("rule_eval:%s error reader client is nil", arw.Key())
 			continue
 		}

 		readerClient := arw.promClients.GetCli(arw.datasourceId)

 		var warnings promsdk.Warnings
-		arw.processor.Stats.CounterQueryDataTotal.WithLabelValues(fmt.Sprintf("%d", arw.datasourceId)).Inc()
 		value, warnings, err := readerClient.Query(context.Background(), promql, time.Now())
 		if err != nil {
 			logger.Errorf("rule_eval:%s promql:%s, error:%v", arw.Key(), promql, err)
-			arw.processor.Stats.CounterQueryDataErrorTotal.WithLabelValues(fmt.Sprintf("%d", arw.datasourceId)).Inc()
-			arw.processor.Stats.CounterRuleEvalErrorTotal.WithLabelValues(fmt.Sprintf("%v", arw.processor.DatasourceId()), QUERY_DATA).Inc()
 			continue
 		}

 		if len(warnings) > 0 {
 			logger.Errorf("rule_eval:%s promql:%s, warnings:%v", arw.Key(), promql, warnings)
-			arw.processor.Stats.CounterQueryDataErrorTotal.WithLabelValues(fmt.Sprintf("%d", arw.datasourceId)).Inc()
-			arw.processor.Stats.CounterRuleEvalErrorTotal.WithLabelValues(fmt.Sprintf("%v", arw.processor.DatasourceId()), QUERY_DATA).Inc()
 			continue
 		}

@@ -199,68 +163,12 @@ func (arw *AlertRuleWorker) GetPromAnomalyPoint(ruleConfig string) []common.Anom
 		points := common.ConvertAnomalyPoints(value)
 		for i := 0; i < len(points); i++ {
 			points[i].Severity = query.Severity
-			points[i].Query = promql
 		}
 		lst = append(lst, points...)
 	}
 	return lst
 }

-func (arw *AlertRuleWorker) GetTdengineAnomalyPoint(rule *models.AlertRule, dsId int64) ([]common.AnomalyPoint, []common.AnomalyPoint) {
-	// 获取查询和规则判断条件
-	points := []common.AnomalyPoint{}
-	recoverPoints := []common.AnomalyPoint{}
-	ruleConfig := strings.TrimSpace(rule.RuleConfig)
-	if ruleConfig == "" {
-		logger.Warningf("rule_eval:%d promql is blank", rule.Id)
-		arw.processor.Stats.CounterRuleEvalErrorTotal.WithLabelValues(fmt.Sprintf("%v", arw.processor.DatasourceId()), GET_RULE_CONFIG).Inc()
-		return points, recoverPoints
-	}
-
-	var ruleQuery models.RuleQuery
-	err := json.Unmarshal([]byte(ruleConfig), &ruleQuery)
-	if err != nil {
-		logger.Warningf("rule_eval:%d promql parse error:%s", rule.Id, err.Error())
-		arw.processor.Stats.CounterRuleEvalErrorTotal.WithLabelValues(fmt.Sprintf("%v", arw.processor.DatasourceId())).Inc()
-		arw.processor.Stats.CounterRuleEvalErrorTotal.WithLabelValues(fmt.Sprintf("%v", arw.processor.DatasourceId()), GET_RULE_CONFIG).Inc()
-		return points, recoverPoints
-	}
-
-	arw.inhibit = ruleQuery.Inhibit
-	if len(ruleQuery.Queries) > 0 {
-		seriesStore := make(map[uint64]models.DataResp)
-		seriesTagIndex := make(map[uint64][]uint64)
-
-		for _, query := range ruleQuery.Queries {
-			arw.processor.Stats.CounterQueryDataTotal.WithLabelValues(fmt.Sprintf("%d", arw.datasourceId)).Inc()
-			cli := arw.tdengineClients.GetCli(dsId)
-			if cli == nil {
-				logger.Warningf("rule_eval:%d tdengine client is nil", rule.Id)
-				arw.processor.Stats.CounterQueryDataErrorTotal.WithLabelValues(fmt.Sprintf("%d", arw.datasourceId)).Inc()
-				arw.processor.Stats.CounterRuleEvalErrorTotal.WithLabelValues(fmt.Sprintf("%v", arw.processor.DatasourceId()), GET_CLIENT).Inc()
-				continue
-			}
-
-			series, err := cli.Query(query)
-			arw.processor.Stats.CounterQueryDataTotal.WithLabelValues(fmt.Sprintf("%d", arw.datasourceId)).Inc()
-			if err != nil {
-				logger.Warningf("rule_eval rid:%d query data error: %v", rule.Id, err)
-				arw.processor.Stats.CounterQueryDataErrorTotal.WithLabelValues(fmt.Sprintf("%d", arw.datasourceId)).Inc()
-				arw.processor.Stats.CounterRuleEvalErrorTotal.WithLabelValues(fmt.Sprintf("%v", arw.processor.DatasourceId()), QUERY_DATA).Inc()
-				continue
-			}
-
-			//  此条日志很重要，是告警判断的现场值
-			logger.Debugf("rule_eval rid:%d req:%+v resp:%+v", rule.Id, query, series)
-			MakeSeriesMap(series, seriesTagIndex, seriesStore)
-		}
-
-		points, recoverPoints = GetAnomalyPoint(rule.Id, ruleQuery, seriesTagIndex, seriesStore)
-	}
-
-	return points, recoverPoints
-}
-
 func (arw *AlertRuleWorker) GetHostAnomalyPoint(ruleConfig string) []common.AnomalyPoint {
 	var lst []common.AnomalyPoint
 	var severity int
@@ -268,13 +176,11 @@ func (arw *AlertRuleWorker) GetHostAnomalyPoint(ruleConfig string) []common.Anom
 	var rule *models.HostRuleConfig
 	if err := json.Unmarshal([]byte(ruleConfig), &rule); err != nil {
 		logger.Errorf("rule_eval:%s rule_config:%s, error:%v", arw.Key(), ruleConfig, err)
-		arw.processor.Stats.CounterRuleEvalErrorTotal.WithLabelValues(fmt.Sprintf("%v", arw.processor.DatasourceId()), GET_RULE_CONFIG).Inc()
 		return lst
 	}

 	if rule == nil {
 		logger.Errorf("rule_eval:%s rule_config:%s, error:rule is nil", arw.Key(), ruleConfig)
-		arw.processor.Stats.CounterRuleEvalErrorTotal.WithLabelValues(fmt.Sprintf("%v", arw.processor.DatasourceId()), GET_RULE_CONFIG).Inc()
 		return lst
 	}

@@ -285,42 +191,15 @@ func (arw *AlertRuleWorker) GetHostAnomalyPoint(ruleConfig string) []common.Anom
 			arw.severity = trigger.Severity
 		}

+		query := models.GetHostsQuery(rule.Queries)
 		switch trigger.Type {
 		case "target_miss":
 			t := now - int64(trigger.Duration)
-
-			var idents, engineIdents, missEngineIdents []string
-			var exists bool
-			if arw.ctx.IsCenter {
-				// 如果是中心节点, 将不再上报数据的主机 engineName 为空的机器，也加入到 targets 中
-				missEngineIdents, exists = arw.processor.TargetsOfAlertRuleCache.Get("", arw.rule.Id)
-				if !exists {
-					logger.Debugf("rule_eval:%s targets not found engineName:%s", arw.Key(), arw.processor.EngineName)
-					arw.processor.Stats.CounterRuleEvalErrorTotal.WithLabelValues(fmt.Sprintf("%v", arw.processor.DatasourceId()), QUERY_DATA).Inc()
-				}
-			}
-			idents = append(idents, missEngineIdents...)
-
-			engineIdents, exists = arw.processor.TargetsOfAlertRuleCache.Get(arw.processor.EngineName, arw.rule.Id)
-			if !exists {
-				logger.Warningf("rule_eval:%s targets not found engineName:%s", arw.Key(), arw.processor.EngineName)
-				arw.processor.Stats.CounterRuleEvalErrorTotal.WithLabelValues(fmt.Sprintf("%v", arw.processor.DatasourceId()), QUERY_DATA).Inc()
-			}
-			idents = append(idents, engineIdents...)
-
-			if len(idents) == 0 {
+			targets, err := models.MissTargetGetsByFilter(arw.ctx, query, t)
+			if err != nil {
+				logger.Errorf("rule_eval:%s query:%v, error:%v", arw.Key(), query, err)
 				continue
 			}
-
-			var missTargets []string
-			targetUpdateTimeMap := arw.processor.TargetCache.GetHostUpdateTime(idents)
-			for ident, updateTime := range targetUpdateTimeMap {
-				if updateTime < t {
-					missTargets = append(missTargets, ident)
-				}
-			}
-
-			targets := arw.processor.TargetCache.Gets(missTargets)
 			for _, target := range targets {
 				m := make(map[string]string)
 				target.FillTagsMap()
@@ -337,43 +216,20 @@ func (arw *AlertRuleWorker) GetHostAnomalyPoint(ruleConfig string) []common.Anom
 				lst = append(lst, common.NewAnomalyPoint(trigger.Type, m, now, float64(now-target.UpdateAt), trigger.Severity))
 			}
 		case "offset":
-			idents, exists := arw.processor.TargetsOfAlertRuleCache.Get(arw.processor.EngineName, arw.rule.Id)
-			if !exists {
-				logger.Warningf("rule_eval:%s targets not found", arw.Key())
-				arw.processor.Stats.CounterRuleEvalErrorTotal.WithLabelValues(fmt.Sprintf("%v", arw.processor.DatasourceId()), QUERY_DATA).Inc()
+			targets, err := models.TargetGetsByFilter(arw.ctx, query, 0, 0)
+			if err != nil {
+				logger.Errorf("rule_eval:%s query:%v, error:%v", arw.Key(), query, err)
 				continue
 			}
-
-			targets := arw.processor.TargetCache.Gets(idents)
-			targetMap := make(map[string]*models.Target)
+			var targetMap = make(map[string]*models.Target)
 			for _, target := range targets {
 				targetMap[target.Ident] = target
 			}

-			offsetIdents := make(map[string]int64)
-			targetsMeta := arw.processor.TargetCache.GetHostMetas(targets)
-			for ident, meta := range targetsMeta {
-				if meta.CpuNum <= 0 {
-					// means this target is not collect by categraf, do not check offset
-					continue
-				}
-
-				if target, exists := targetMap[ident]; exists {
-					if now-target.UpdateAt > 120 {
-						// means this target is not a active host, do not check offset
-						continue
-					}
-				}
-
-				offset := meta.Offset
-				if math.Abs(float64(offset)) > float64(trigger.Duration) {
-					offsetIdents[ident] = offset
-				}
-			}
-
-			for host, offset := range offsetIdents {
+			hostOffsetMap := arw.processor.TargetCache.GetOffsetHost(targets, now, int64(trigger.Duration))
+			for host, offset := range hostOffsetMap {
 				m := make(map[string]string)
-				target, exists := arw.processor.TargetCache.Get(host)
+				target, exists := targetMap[host]
 				if exists {
 					target.FillTagsMap()
 					for k, v := range target.TagsMap {
@@ -391,22 +247,18 @@ func (arw *AlertRuleWorker) GetHostAnomalyPoint(ruleConfig string) []common.Anom
 			}
 		case "pct_target_miss":
 			t := now - int64(trigger.Duration)
-			idents, exists := arw.processor.TargetsOfAlertRuleCache.Get(arw.processor.EngineName, arw.rule.Id)
-			if !exists {
-				logger.Warningf("rule_eval:%s targets not found", arw.Key())
-				arw.processor.Stats.CounterRuleEvalErrorTotal.WithLabelValues(fmt.Sprintf("%v", arw.processor.DatasourceId()), QUERY_DATA).Inc()
+			count, err := models.MissTargetCountByFilter(arw.ctx, query, t)
+			if err != nil {
+				logger.Errorf("rule_eval:%s query:%v, error:%v", arw.Key(), query, err)
 				continue
 			}

-			var missTargets []string
-			targetUpdateTimeMap := arw.processor.TargetCache.GetHostUpdateTime(idents)
-			for ident, updateTime := range targetUpdateTimeMap {
-				if updateTime < t {
-					missTargets = append(missTargets, ident)
-				}
+			total, err := models.TargetCountByFilter(arw.ctx, query)
+			if err != nil {
+				logger.Errorf("rule_eval:%s query:%v, error:%v", arw.Key(), query, err)
+				continue
 			}
-
-			pct := float64(len(missTargets)) / float64(len(idents)) * 100
+			pct := float64(count) / float64(total) * 100
 			if pct >= float64(trigger.Percent) {
 				lst = append(lst, common.NewAnomalyPoint(trigger.Type, nil, now, pct, trigger.Severity))
 			}
@@ -414,92 +266,3 @@ func (arw *AlertRuleWorker) GetHostAnomalyPoint(ruleConfig string) []common.Anom
 	}
 	return lst
 }
-
-func GetAnomalyPoint(ruleId int64, ruleQuery models.RuleQuery, seriesTagIndex map[uint64][]uint64, seriesStore map[uint64]models.DataResp) ([]common.AnomalyPoint, []common.AnomalyPoint) {
-	points := []common.AnomalyPoint{}
-	recoverPoints := []common.AnomalyPoint{}
-
-	for _, trigger := range ruleQuery.Triggers {
-		for _, seriesHash := range seriesTagIndex {
-			sort.Slice(seriesHash, func(i, j int) bool {
-				return seriesHash[i] < seriesHash[j]
-			})
-
-			m := make(map[string]float64)
-			var ts int64
-			var sample models.DataResp
-			var value float64
-			for _, serieHash := range seriesHash {
-				series, exists := seriesStore[serieHash]
-				if !exists {
-					logger.Warningf("rule_eval rid:%d series:%+v not found", ruleId, series)
-					continue
-				}
-				t, v, exists := series.Last()
-				if !exists {
-					logger.Warningf("rule_eval rid:%d series:%+v value not found", ruleId, series)
-					continue
-				}
-
-				if !strings.Contains(trigger.Exp, "$"+series.Ref) {
-					// 表达式中不包含该变量
-					continue
-				}
-
-				m["$"+series.Ref] = v
-				m["$"+series.Ref+"."+series.MetricName()] = v
-				ts = int64(t)
-				sample = series
-				value = v
-			}
-			isTriggered := parser.Calc(trigger.Exp, m)
-			//  此条日志很重要，是告警判断的现场值
-			logger.Infof("rule_eval rid:%d trigger:%+v exp:%s res:%v m:%v", ruleId, trigger, trigger.Exp, isTriggered, m)
-
-			var values string
-			for k, v := range m {
-				if !strings.Contains(k, ".") {
-					continue
-				}
-				values += fmt.Sprintf("%s:%v ", k, v)
-			}
-
-			point := common.AnomalyPoint{
-				Key:       sample.MetricName(),
-				Labels:    sample.Metric,
-				Timestamp: int64(ts),
-				Value:     value,
-				Values:    values,
-				Severity:  trigger.Severity,
-				Triggered: isTriggered,
-				Query:     fmt.Sprintf("query:%+v trigger:%+v", ruleQuery.Queries, trigger),
-			}
-
-			if sample.Query != "" {
-				point.Query = sample.Query
-			}
-
-			if isTriggered {
-				points = append(points, point)
-			} else {
-				recoverPoints = append(recoverPoints, point)
-			}
-		}
-	}
-
-	return points, recoverPoints
-}
-
-func MakeSeriesMap(series []models.DataResp, seriesTagIndex map[uint64][]uint64, seriesStore map[uint64]models.DataResp) {
-	for i := 0; i < len(series); i++ {
-		serieHash := hash.GetHash(series[i].Metric, series[i].Ref)
-		tagHash := hash.GetTagHash(series[i].Metric)
-		seriesStore[serieHash] = series[i]
-
-		// 将曲线按照相同的 tag 分组
-		if _, exists := seriesTagIndex[tagHash]; !exists {
-			seriesTagIndex[tagHash] = make([]uint64, 0)
-		}
-		seriesTagIndex[tagHash] = append(seriesTagIndex[tagHash], serieHash)
-	}
-}
--- a/alert/mute/mute.go
+++ b/alert/mute/mute.go
@@ -13,11 +13,7 @@ import (
 )

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

@@ -36,9 +32,12 @@ func IsMuted(rule *models.AlertRule, event *models.AlertCurEvent, targetCache *m
 	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
 }

@@ -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
@@ -12,12 +12,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 +28,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,10 +36,10 @@ 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) {
+func (chr *DatasourceHashRingType) GetNode(datasourceId int64, pk string) (string, error) {
 	chr.Lock()
 	defer chr.Unlock()
 	_, exists := chr.Rings[datasourceId]
@@ -50,30 +50,21 @@ 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)
+		if errors.Is(err, consistent.ErrEmptyCircle) {
+			logger.Debugf("rule id:%s is not work, datasource id:%d is not assigned to active alert engine", pk, datasourceId)
+		} else {
+			logger.Debugf("rule id:%s is not work, datasource id:%d failed to get node from hashring:%v", pk, datasourceId, err)
 		}
 		return false
 	}
 	return node == currentNode
 }

-func (chr *DatasourceHashRingType) Set(datasourceId string, r *consistent.Consistent) {
+func (chr *DatasourceHashRingType) Set(datasourceId int64, r *consistent.Consistent) {
 	chr.Lock()
 	defer chr.Unlock()
 	chr.Rings[datasourceId] = r
 }
-
-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,7 +7,6 @@ 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"
@@ -18,14 +17,12 @@ import (
 type Naming struct {
 	ctx             *ctx.Context
 	heartbeatConfig aconf.HeartbeatConfig
-	astats          *astats.Stats
 }

-func NewNaming(ctx *ctx.Context, heartbeat aconf.HeartbeatConfig, alertStats *astats.Stats) *Naming {
+func NewNaming(ctx *ctx.Context, heartbeat aconf.HeartbeatConfig) *Naming {
 	naming := &Naming{
 		ctx:             ctx,
 		heartbeatConfig: heartbeat,
-		astats:          alertStats,
 	}
 	naming.Heartbeats()
 	return naming
@@ -33,11 +30,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
@@ -91,30 +86,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)
-		}
-	}
-
 	for i := 0; i < len(datasourceIds); i++ {
 		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
 		}

@@ -126,35 +111,36 @@ func (n *Naming) heartbeat() error {
 			continue
 		}

-		RebuildConsistentHashRing(fmt.Sprintf("%d", datasourceIds[i]), servers)
+		RebuildConsistentHashRing(datasourceIds[i], servers)
 		localss[datasourceIds[i]] = 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()
+	if n.ctx.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
 	}

-	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
 }

@@ -171,13 +157,3 @@ func (n *Naming) ActiveServers(datasourceId int64) ([]string, error) {
 	// 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,12 +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/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
@@ -44,11 +43,8 @@ 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
@@ -61,19 +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
+	promClients *prom.PromClientMap
+	ctx         *ctx.Context
+	stats       *astats.Stats
 }

 func (p *Processor) Key() string {
@@ -93,29 +85,23 @@ func (p *Processor) Hash() string {
 	))
 }

-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()
@@ -127,13 +113,11 @@ func (p *Processor) Handle(anomalyPoints []common.AnomalyPoint, from string, inh
 	// 这些信息的修改是不会引起worker restart的，但是确实会影响告警处理逻辑
 	// 所以，这里直接从memsto.AlertRuleCache中获取并覆盖
 	p.inhibit = inhibit
-	cachedRule := p.alertRuleCache.Get(p.rule.Id)
+	cachedRule := p.atertRuleCache.Get(p.rule.Id)
 	if cachedRule == nil {
 		logger.Errorf("rule not found %+v", anomalyPoints)
-		p.Stats.CounterRuleEvalErrorTotal.WithLabelValues(fmt.Sprintf("%v", p.DatasourceId()), "handle_event").Inc()
 		return
 	}
-
 	p.rule = cachedRule
 	now := time.Now().Unix()
 	alertingKeys := map[string]struct{}{}
@@ -146,17 +130,9 @@ func (p *Processor) Handle(anomalyPoints []common.AnomalyPoint, from string, inh
 		hash := event.Hash
 		alertingKeys[hash] = struct{}{}
 		if mute.IsMuted(cachedRule, event, p.TargetCache, p.alertMuteCache) {
-			p.Stats.CounterMuteTotal.WithLabelValues(event.GroupName).Inc()
 			logger.Debugf("rule_eval:%s event:%v is muted", 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)
 	}
@@ -179,12 +155,6 @@ func (p *Processor) BuildEvent(anomalyPoint common.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
@@ -193,8 +163,8 @@ func (p *Processor) BuildEvent(anomalyPoint common.AnomalyPoint, from string, no
 	event.TargetIdent = p.target
 	event.TargetNote = p.targetNote
 	event.TriggerValue = anomalyPoint.ReadableValue()
-	event.TriggerValues = anomalyPoint.Values
 	event.TagsJSON = p.tagsArr
+	event.GroupName = p.groupName
 	event.Tags = strings.Join(p.tagsArr, ",,")
 	event.IsRecovered = false
 	event.Callbacks = p.rule.Callbacks
@@ -204,8 +174,6 @@ func (p *Processor) BuildEvent(anomalyPoint common.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

 	if from == "inner" {
 		event.LastEvalTime = now
@@ -231,12 +199,11 @@ func (p *Processor) HandleRecover(alertingKeys map[string]struct{}, now int64) {
 	}
 }

-func (p *Processor) RecoverSingle(hash string, now int64, value *string, values ...string) {
+func (p *Processor) RecoverSingle(hash string, now int64, value *string) {
 	cachedRule := p.rule
 	if cachedRule == nil {
 		return
 	}
-
 	event, has := p.fires.Get(hash)
 	if !has {
 		return
@@ -248,9 +215,6 @@ func (p *Processor) RecoverSingle(hash string, now int64, value *string, values
 	}
 	if value != nil {
 		event.TriggerValue = *value
-		if len(values) > 0 {
-			event.TriggerValues = values[0]
-		}
 	}

 	// 没查到触发阈值的vector，姑且就认为这个vector的值恢复了
@@ -263,8 +227,6 @@ func (p *Processor) RecoverSingle(hash string, now int64, value *string, values
 	cachedRule.UpdateEvent(event)
 	event.IsRecovered = true
 	event.LastEvalTime = now
-
-	p.HandleRecoverEventHook(event)
 	p.pushEventToQueue(event)
 }

@@ -322,12 +284,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)
@@ -337,10 +296,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 {
 				// 有最大发送次数的限制，就要看已经发了几次了，是否达到了最大发送次数
@@ -349,6 +309,7 @@ func (p *Processor) fireEvent(event *models.AlertCurEvent) {
 					return
 				} else {
 					event.NotifyCurNumber = fired.NotifyCurNumber + 1
+					event.FirstTriggerTime = fired.FirstTriggerTime
 					p.pushEventToQueue(event)
 				}
 			}
@@ -356,7 +317,6 @@ func (p *Processor) fireEvent(event *models.AlertCurEvent) {
 	} else {
 		event.NotifyCurNumber = 1
 		event.FirstTriggerTime = event.TriggerTime
-		p.HandleFireEventHook(event)
 		p.pushEventToQueue(event)
 	}
 }
@@ -367,10 +327,10 @@ 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").Inc()
 	}
 }

@@ -380,21 +340,12 @@ func (p *Processor) RecoverAlertCurEventFromDb() {
 	curEvents, err := models.AlertCurEventGetByRuleIdAndDsId(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").Inc()
 		p.fires = NewAlertCurEventMap(nil)
 		return
 	}

 	fireMap := 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()
 		fireMap[event.Hash] = event
 	}
@@ -454,13 +405,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 = ""
 	}
 }

@@ -487,7 +432,7 @@ func labelMapToArr(m map[string]string) []string {
 }

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

 func TagHash(vector common.AnomalyPoint) string {
--- a/alert/record/prom_rule.go
+++ b/alert/record/prom_rule.go
@@ -6,7 +6,6 @@ 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"
@@ -19,18 +18,18 @@ type RecordRuleContext struct {
 	datasourceId int64
 	quit         chan struct{}

-	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 {
+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,
 	}
 }

@@ -55,23 +54,20 @@ func (rrc *RecordRuleContext) Start() {
 	if interval <= 0 {
 		interval = 10
 	}
-
-	ticker := time.NewTicker(time.Duration(interval) * time.Second)
 	go func() {
-		defer ticker.Stop()
 		for {
 			select {
 			case <-rrc.quit:
 				return
-			case <-ticker.C:
+			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())
@@ -80,30 +76,23 @@ 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)
 	}
 }

--- 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"
@@ -69,11 +68,11 @@ func (s *Scheduler) syncRecordRules() {

 		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_event.go
+++ b/alert/router/router_event.go
@@ -2,7 +2,6 @@ package router

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

@@ -73,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)
@@ -86,8 +87,7 @@ 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)
+	ginx.NewRender(c).Message(models.EventPersist(rt.Ctx, event))
 }

 type eventForm struct {
@@ -103,7 +103,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")
--- a/alert/sender/callback.go
+++ b/alert/sender/callback.go
@@ -1,13 +1,11 @@
 package sender

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

 	"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"
@@ -17,8 +15,7 @@ import (
 	"github.com/toolkits/pkg/logger"
 )

-func SendCallbacks(ctx *ctx.Context, urls []string, event *models.AlertCurEvent, targetCache *memsto.TargetCacheType, userCache *memsto.UserCacheType,
-	ibexConf aconf.Ibex, stats *astats.Stats) {
+func SendCallbacks(ctx *ctx.Context, urls []string, event *models.AlertCurEvent, targetCache *memsto.TargetCacheType, userCache *memsto.UserCacheType, ibexConf aconf.Ibex) {
 	for _, url := range urls {
 		if url == "" {
 			continue
@@ -35,11 +32,9 @@ func SendCallbacks(ctx *ctx.Context, urls []string, event *models.AlertCurEvent,
 			url = "http://" + url
 		}

-		stats.AlertNotifyTotal.WithLabelValues("rule_callback").Inc()
 		resp, code, err := poster.PostJSON(url, 5*time.Second, event, 3)
 		if err != nil {
 			logger.Errorf("event_callback_fail(rule_id=%d url=%s), resp: %s, err: %v, code: %d", event.RuleId, url, string(resp), err, code)
-			stats.AlertNotifyErrorTotal.WithLabelValues("rule_callback").Inc()
 		} else {
 			logger.Infof("event_callback_succ(rule_id=%d url=%s), resp: %s, code: %d", event.RuleId, url, string(resp), code)
 		}
@@ -55,7 +50,6 @@ type TaskForm struct {
 	Pause     string   `json:"pause"`
 	Script    string   `json:"script"`
 	Args      string   `json:"args"`
-	Stdin     string   `json:"stdin"`
 	Action    string   `json:"action"`
 	Creator   string   `json:"creator"`
 	Hosts     []string `json:"hosts"`
@@ -96,7 +90,7 @@ func handleIbex(ctx *ctx.Context, url string, event *models.AlertCurEvent, targe
 		return
 	}

-	tpl, err := models.TaskTplGetById(ctx, id)
+	tpl, err := models.TaskTplGet(ctx, "id = ?", id)
 	if err != nil {
 		logger.Errorf("event_callback_ibex: failed to get tpl: %v", err)
 		return
@@ -120,30 +114,6 @@ func handleIbex(ctx *ctx.Context, url string, event *models.AlertCurEvent, targe
 		return
 	}

-	tagsMap := make(map[string]string)
-	for i := 0; i < len(event.TagsJSON); i++ {
-		pair := strings.TrimSpace(event.TagsJSON[i])
-		if pair == "" {
-			continue
-		}
-
-		arr := strings.Split(pair, "=")
-		if len(arr) != 2 {
-			continue
-		}
-
-		tagsMap[arr[0]] = arr[1]
-	}
-	// 附加告警级别  告警触发值标签
-	tagsMap["alert_severity"] = strconv.Itoa(event.Severity)
-	tagsMap["alert_trigger_value"] = event.TriggerValue
-
-	tags, err := json.Marshal(tagsMap)
-	if err != nil {
-		logger.Errorf("event_callback_ibex: failed to marshal tags to json: %v", tagsMap)
-		return
-	}
-
 	// call ibex
 	in := TaskForm{
 		Title:     tpl.Title + " FH: " + host,
@@ -154,7 +124,6 @@ func handleIbex(ctx *ctx.Context, url string, event *models.AlertCurEvent, targe
 		Pause:     tpl.Pause,
 		Script:    tpl.Script,
 		Args:      tpl.Args,
-		Stdin:     string(tags),
 		Action:    "start",
 		Creator:   tpl.UpdateBy,
 		Hosts:     []string{host},
--- a/alert/sender/dingtalk.go
+++ b/alert/sender/dingtalk.go
@@ -5,7 +5,6 @@ import (
 	"strings"
 	"time"

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

@@ -33,7 +32,7 @@ type DingtalkSender struct {
 }

 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
 	}

@@ -41,7 +40,7 @@ func (ds *DingtalkSender) Send(ctx MessageContext) {
 	if len(urls) == 0 {
 		return
 	}
-	message := BuildTplMessage(models.Dingtalk, ds.tpl, ctx.Events)
+	message := BuildTplMessage(ds.tpl, ctx.Event)

 	for _, url := range urls {
 		var body dingtalk
@@ -50,7 +49,7 @@ func (ds *DingtalkSender) Send(ctx MessageContext) {
 			body = dingtalk{
 				Msgtype: "markdown",
 				Markdown: dingtalkMarkdown{
-					Title: ctx.Events[0].RuleName,
+					Title: ctx.Event.RuleName,
 					Text:  message,
 				},
 			}
@@ -58,7 +57,7 @@ func (ds *DingtalkSender) Send(ctx MessageContext) {
 			body = dingtalk{
 				Msgtype: "markdown",
 				Markdown: dingtalkMarkdown{
-					Title: ctx.Events[0].RuleName,
+					Title: ctx.Event.RuleName,
 					Text:  message + "\n" + strings.Join(ats, " "),
 				},
 				At: dingtalkAt{
@@ -67,8 +66,7 @@ func (ds *DingtalkSender) Send(ctx MessageContext) {
 				},
 			}
 		}
-
-		doSend(url, body, models.Dingtalk, ctx.Stats)
+		ds.doSend(url, body)
 	}
 }

@@ -83,7 +81,7 @@ func (ds *DingtalkSender) extract(users []*models.User) ([]string, []string) {
 		}
 		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)
@@ -92,14 +90,11 @@ func (ds *DingtalkSender) extract(users []*models.User) ([]string, []string) {
 	return urls, ats
 }

-func doSend(url string, body interface{}, channel string, stats *astats.Stats) {
-	stats.AlertNotifyTotal.WithLabelValues(channel).Inc()
-
+func (ds *DingtalkSender) doSend(url string, body dingtalk) {
 	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()
+		logger.Errorf("dingtalk_sender: result=fail url=%s code=%d error=%v response=%s", url, code, err, string(res))
 	} else {
-		logger.Infof("%s_sender: result=succ url=%s code=%d req:%v response=%s", channel, url, code, body, string(res))
+		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,12 +2,10 @@ 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/toolkits/pkg/logger"
@@ -24,21 +22,19 @@ type EmailSender struct {
 }

 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.Event.RuleName
 	}
-	content := BuildTplMessage(models.Email, es.contentTpl, ctx.Events)
+	content := BuildTplMessage(es.contentTpl, ctx.Event)
 	es.WriteEmail(subject, content, tos)
-
-	ctx.Stats.AlertNotifyTotal.WithLabelValues(models.Email).Add(float64(len(tos)))
 }

 func extract(users []*models.User) []string {
@@ -51,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)
@@ -68,9 +64,8 @@ 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) {
@@ -101,39 +96,19 @@ var mailQuit = make(chan struct{})
 func RestartEmailSender(smtp aconf.SMTPConfig) {
 	close(mailQuit)
 	mailQuit = make(chan struct{})
-	startEmailSender(smtp)
+	StartEmailSender(smtp)
 }

-var smtpConfig aconf.SMTPConfig
-
-func InitEmailSender(ncc *memsto.NotifyConfigCacheType) {
+func StartEmailSender(smtp aconf.SMTPConfig) {
 	mailch = make(chan *gomail.Message, 100000)
-	go updateSmtp(ncc)
-	smtpConfig = ncc.GetSMTP()
-	startEmailSender(smtpConfig)

-}
-
-func updateSmtp(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(smtp)
-		}
-	}
-}
-
-func startEmailSender(smtp aconf.SMTPConfig) {
 	conf := smtp
+
 	if conf.Host == "" || conf.Port == 0 {
 		logger.Warning("SMTP configurations invalid")
 		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 {
--- a/alert/sender/feishu.go
+++ b/alert/sender/feishu.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 feishuContent struct {
@@ -27,11 +31,11 @@ type FeishuSender struct {
 }

 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 := fs.extract(ctx.Users)
-	message := BuildTplMessage(models.Feishu, fs.tpl, ctx.Events)
+	message := BuildTplMessage(fs.tpl, ctx.Event)
 	for _, url := range urls {
 		body := feishu{
 			Msgtype: "text",
@@ -45,7 +49,7 @@ func (fs *FeishuSender) Send(ctx MessageContext) {
 				IsAtAll:   false,
 			}
 		}
-		doSend(url, body, models.Feishu, ctx.Stats)
+		fs.doSend(url, body)
 	}
 }

@@ -59,7 +63,7 @@ func (fs *FeishuSender) extract(users []*models.User) ([]string, []string) {
 		}
 		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)
@@ -67,3 +71,12 @@ func (fs *FeishuSender) extract(users []*models.User) ([]string, []string) {
 	}
 	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,131 +0,0 @@
-package sender
-
-import (
-	"fmt"
-	"html/template"
-	"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"
-)
-
-var (
-	body = 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) Send(ctx MessageContext) {
-	if len(ctx.Users) == 0 || len(ctx.Events) == 0 {
-		return
-	}
-	urls, _ := 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.Card.Header.Title.Content = SendTitle
-	body.Card.Header.Template = color
-	body.Card.Elements[0].Text.Content = message
-	body.Card.Elements[2].Elements[0].Content = SendTitle
-	for _, url := range urls {
-		doSend(url, body, models.FeishuCard, ctx.Stats)
-	}
-}
-
-func (fs *FeishuCardSender) extract(users []*models.User) ([]string, []string) {
-	urls := make([]string, 0, len(users))
-	ats := make([]string, 0)
-	for i := range users {
-		if token, has := users[i].ExtractToken(models.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)
-		}
-	}
-	return urls, ats
-}
--- a/alert/sender/mm.go
+++ b/alert/sender/mm.go
@@ -4,9 +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/poster"

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

 type mm struct {
@@ -28,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
 	}

@@ -36,12 +36,11 @@ 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(MatterMostMessage{
 		Text:   message,
 		Tokens: urls,
-		Stats:  ctx.Stats,
 	})
 }

@@ -88,7 +87,13 @@ func SendMM(message MatterMostMessage) {
 				Username: username,
 				Text:     txt + message.Text,
 			}
-			doSend(ur, body, models.Mm, message.Stats)
+
+			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
@@ -6,7 +6,6 @@ import (
 	"os/exec"
 	"time"

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

 	"github.com/toolkits/pkg/file"
@@ -14,22 +13,20 @@ import (
 	"github.com/toolkits/pkg/sys"
 )

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

-func alertingCallScript(stdinBytes []byte, notifyScript models.NotifyScript, stats *astats.Stats) {
+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
@@ -39,7 +36,6 @@ func alertingCallScript(stdinBytes []byte, notifyScript models.NotifyScript, sta
 			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()
 				return
 			}

@@ -52,14 +48,12 @@ func alertingCallScript(stdinBytes []byte, notifyScript models.NotifyScript, sta
 			_, 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()
 				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()
 				return
 			}
 		}
@@ -89,14 +83,13 @@ func alertingCallScript(stdinBytes []byte, notifyScript models.NotifyScript, sta

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

--- a/alert/sender/sender.go
+++ b/alert/sender/sender.go
@@ -5,7 +5,6 @@ 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"
 )
@@ -18,14 +17,13 @@ type (

 	// MessageContext 一个event所生成的告警通知的上下文
 	MessageContext struct {
-		Users  []*models.User
-		Rule   *models.AlertRule
-		Events []*models.AlertCurEvent
-		Stats  *astats.Stats
+		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]}
@@ -33,10 +31,8 @@ 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:
@@ -45,33 +41,23 @@ func NewSender(key string, tpls map[string]*template.Template, smtp ...aconf.SMT
 	return nil
 }

-func BuildMessageContext(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,
+		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
@@ -3,9 +3,10 @@ package sender
 import (
 	"html/template"
 	"strings"
+	"time"

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

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

 type telegram struct {
@@ -26,16 +26,15 @@ type TelegramSender struct {
 }

 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(TelegramMessage{
 		Text:   message,
 		Tokens: tokens,
-		Stats:  ctx.Stats,
 	})
 }

@@ -56,7 +55,7 @@ func SendTelegram(message TelegramMessage) {
 			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], "/")
@@ -73,6 +72,11 @@ func SendTelegram(message TelegramMessage) {
 			Text:      message.Text,
 		}

-		doSend(url, body, models.Telegram, message.Stats)
+		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
@@ -3,17 +3,16 @@ package sender
 import (
 	"bytes"
 	"encoding/json"
-	"io"
+	"io/ioutil"
 	"net/http"
 	"time"

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

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

-func SendWebhooks(webhooks []*models.Webhook, event *models.AlertCurEvent, stats *astats.Stats) {
+func SendWebhooks(webhooks []*models.Webhook, event *models.AlertCurEvent) {
 	for _, conf := range webhooks {
 		if conf.Url == "" || !conf.Enable {
 			continue
@@ -51,11 +50,9 @@ func SendWebhooks(webhooks []*models.Webhook, event *models.AlertCurEvent, stats
 			Timeout: time.Duration(conf.Timeout) * time.Second,
 		}

-		stats.AlertNotifyTotal.WithLabelValues("webhook").Inc()
 		var resp *http.Response
 		resp, err = client.Do(req)
 		if err != nil {
-			stats.AlertNotifyErrorTotal.WithLabelValues("webhook").Inc()
 			logger.Errorf("event_webhook_fail, ruleId: [%d], eventId: [%d], url: [%s], error: [%s]", event.RuleId, event.Id, conf.Url, err)
 			continue
 		}
@@ -63,9 +60,9 @@ func SendWebhooks(webhooks []*models.Webhook, event *models.AlertCurEvent, stats
 		var body []byte
 		if resp.Body != nil {
 			defer resp.Body.Close()
-			body, _ = io.ReadAll(resp.Body)
+			body, _ = ioutil.ReadAll(resp.Body)
 		}

-		logger.Debugf("event_webhook_succ, url: %s, response code: %d, body: %s event:%+v", conf.Url, resp.StatusCode, string(body), event)
+		logger.Debugf("event_webhook_succ, url: %s, response code: %d, body: %s", conf.Url, resp.StatusCode, string(body))
 	}
 }
--- 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 {
@@ -21,11 +25,11 @@ type WecomSender struct {
 }

 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 := ws.extract(ctx.Users)
-	message := BuildTplMessage(models.Wecom, ws.tpl, ctx.Events)
+	message := BuildTplMessage(ws.tpl, ctx.Event)
 	for _, url := range urls {
 		body := wecom{
 			Msgtype: "markdown",
@@ -33,7 +37,7 @@ func (ws *WecomSender) Send(ctx MessageContext) {
 				Content: message,
 			},
 		}
-		doSend(url, body, models.Wecom, ctx.Stats)
+		ws.doSend(url, body)
 	}
 }

@@ -42,7 +46,7 @@ func (ws *WecomSender) extract(users []*models.User) []string {
 	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)
@@ -50,3 +54,12 @@ func (ws *WecomSender) extract(users []*models.User) []string {
 	}
 	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,7 +1,5 @@
 package cconf

-import "time"
-
 type Center struct {
 	Plugins                []Plugin
 	MetricsYamlFile        string
@@ -10,8 +8,6 @@ type Center struct {
 	I18NHeaderKey          string
 	MetricDesc             MetricDescType
 	AnonymousAccess        AnonymousAccess
-	UseFileAssets          bool
-	FlashDuty              FlashDuty
 }

 type Plugin struct {
@@ -21,11 +17,6 @@ type Plugin struct {
 	TypeName string `json:"plugin_type_name"`
 }

-type FlashDuty struct {
-	Api     string        `json:"api"`
-	Timeout time.Duration `json:"timeout"`
-}
-
 type AnonymousAccess struct {
 	PromQuerier bool
 	AlertDetail bool
--- a/center/cconf/ops.go
+++ b/center/cconf/ops.go
@@ -1,11 +1,9 @@
 package cconf

 import (
-	"fmt"
 	"path"

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

 var Operations = Operation{}
@@ -28,14 +26,6 @@ func LoadOpsYaml(configDir string, opsYamlFile string) error {
 	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,143 +36,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"
-    - "/dashboards-built-in"
-
- name: alert
-  cname: 告警规则
-  ops:
-    - "/alert-rules"
-    - "/alert-rules/add"
-    - "/alert-rules/put"
-    - "/alert-rules/del"
-    - "/alert-rules-built-in"
- 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: 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
@@ -8,26 +8,19 @@ import (
 	"github.com/ccfos/nightingale/v6/alert/astats"
 	"github.com/ccfos/nightingale/v6/alert/process"
 	"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/metas"
 	"github.com/ccfos/nightingale/v6/center/sso"
 	"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/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"
 	"github.com/ccfos/nightingale/v6/pushgw/writer"
 	"github.com/ccfos/nightingale/v6/storage"
-	"github.com/ccfos/nightingale/v6/tdengine"

 	alertrt "github.com/ccfos/nightingale/v6/alert/router"
 	centerrt "github.com/ccfos/nightingale/v6/center/router"
@@ -43,75 +36,56 @@ func Initialize(configDir string, cryptoKey string) (func(), error) {
 	cconf.LoadMetricsYaml(configDir, config.Center.MetricsYamlFile)
 	cconf.LoadOpsYaml(configDir, config.Center.OpsYamlFile)

-	cconf.MergeOperationConf()
-
 	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)
 	models.InitRoot(ctx)

-	err = rsa.InitRSAConfig(ctx, &config.HTTP.RSA)
-	if err != nil {
-		return nil, err
-	}
-
-	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(ctx)

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

 	sso := sso.Init(config.Center, ctx)

-	configCache := memsto.NewConfigCache(ctx, syncStats, config.HTTP.RSA.RSAPrivateKey, config.HTTP.RSA.RSAPassWord)
 	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)
+	notifyConfigCache := memsto.NewNotifyConfigCache(ctx)

-	promClients := prom.NewPromClient(ctx)
-	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, dsCache, ctx, promClients, tdengineClients, userCache, userGroupCache)
+	alert.Start(config.Alert, config.Pushgw, syncStats, alertStats, externalProcessors, targetCache, busiGroupCache, alertMuteCache, alertRuleCache, notifyConfigCache, dsCache, ctx, promClients)

 	writers := writer.NewWriters(config.Pushgw)

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

 	r := httpx.GinEngine(config.Global.RunMode, config.HTTP)

 	centerRouter.Config(r)
 	alertrtRouter.Config(r)
 	pushgwRouter.Config(r)
-	dumper.ConfigRouter(r)

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

--- 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
@@ -3,12 +3,9 @@ package router
 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"
@@ -18,55 +15,41 @@ import (
 	"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/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
-	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
 }

-func New(httpConfig httpx.Config, center cconf.Center, alert aconf.Alert, operations cconf.Operation, ds *memsto.DatasourceCacheType, ncc *memsto.NotifyConfigCacheType, pc *prom.PromClientMap, tdendgineClients *tdengine.TdengineClientMap, redis storage.Redis, sso *sso.SsoClient, ctx *ctx.Context, metaSet *metas.Set, idents *idents.Set, tc *memsto.TargetCacheType, uc *memsto.UserCacheType, ugc *memsto.UserGroupCacheType) *Router {
+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, tc *memsto.TargetCacheType) *Router {
 	return &Router{
 		HTTP:              httpConfig,
 		Center:            center,
-		Alert:             alert,
 		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,
 	}
 }
@@ -112,32 +95,10 @@ func (rt *Router) configNoRoute(r *gin.Engine, fs *http.FileSystem) {
 		suffix := arr[len(arr)-1]

 		switch suffix {
-		case "png", "jpeg", "jpg", "svg", "ico", "gif", "css", "js", "html", "htm", "gz", "zip", "map", "ttf":
-			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":
+			c.FileFromFS(c.Request.URL.Path, *fs)
 		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...))
-			}
+			c.FileFromFS("/", *fs)
 		}
 	})
 }
@@ -152,10 +113,7 @@ func (rt *Router) Config(r *gin.Engine) {
 	if err != nil {
 		logger.Errorf("cannot create statik fs: %v", err)
 	}
-
-	if !rt.Center.UseFileAssets {
-		r.StaticFS("/pub", statikFS)
-	}
+	r.StaticFS("/pub", statikFS)

 	pagesPrefix := "/api/n9e"
 	pages := r.Group(pagesPrefix)
@@ -166,38 +124,18 @@ 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("/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("/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)
@@ -248,7 +186,6 @@ func (rt *Router) Config(r *gin.Engine) {
 		pages.GET("/busi-group/:id/perm/:perm", rt.auth(), rt.user(), rt.checkBusiGroupPerm)

 		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)
@@ -266,14 +203,10 @@ func (rt *Router) Config(r *gin.Engine) {
 		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("/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-group/:id/boards/clones", rt.auth(), rt.user(), rt.perm("/dashboards/add"), rt.boardBatchClone)

 		pages.GET("/board/:bid", rt.boardGet)
 		pages.GET("/board/:bid/pure", rt.boardPureGet)
@@ -287,9 +220,7 @@ func (rt *Router) Config(r *gin.Engine) {

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

-		pages.GET("/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)
@@ -297,9 +228,7 @@ func (rt *Router) Config(r *gin.Engine) {
 		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.PUT("/busi-group/alert-rule/validate", rt.auth(), rt.user(), rt.perm("/alert-rules/put"), rt.alertRuleValidation)

-		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)
@@ -307,16 +236,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)
@@ -337,14 +262,12 @@ func (rt *Router) Config(r *gin.Engine) {
 		pages.POST("/alert-cur-events/card/details", rt.auth(), rt.alertCurEventsCardDetails)
 		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)
@@ -353,7 +276,6 @@ 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)
@@ -362,7 +284,7 @@ func (rt *Router) Config(r *gin.Engine) {
 		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)
@@ -378,67 +300,30 @@ func (rt *Router) Config(r *gin.Engine) {
 		pages.PUT("/role/:id/ops", rt.auth(), rt.admin(), rt.roleBindOperation)
 		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("/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)
-
 	}

-	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 {
 		service := r.Group("/v1/n9e")
 		if len(rt.HTTP.APIForService.BasicAuth) > 0 {
@@ -447,8 +332,6 @@ func (rt *Router) Config(r *gin.Engine) {
 		{
 			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)
@@ -461,7 +344,6 @@ func (rt *Router) Config(r *gin.Engine) {
 			service.PUT("/targets/note", rt.targetUpdateNoteByService)

 			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)
@@ -487,8 +369,6 @@ func (rt *Router) Config(r *gin.Engine) {
 			service.GET("/alert-his-events", rt.alertHisEventsList)
 			service.GET("/alert-his-event/:eid", rt.alertHisEventGet)

-			service.GET("/task-tpl/:tid", rt.taskTplGetByService)
-
 			service.GET("/config/:id", rt.configGet)
 			service.GET("/configs", rt.configsGet)
 			service.GET("/config", rt.configGetByKey)
@@ -504,11 +384,6 @@ func (rt *Router) Config(r *gin.Engine) {
 			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)
-
 		}
 	}

--- 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"

@@ -183,19 +182,10 @@ 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 _, has := set[event.GroupId]; !has {
@@ -203,6 +193,8 @@ func (rt *Router) checkCurEventBusiGroupRWPermission(c *gin.Context, ids []int64
 			set[event.GroupId] = struct{}{}
 		}
 	}
+
+	ginx.NewRender(c).Message(models.AlertCurEventDel(rt.Ctx, f.Ids))
 }

 func (rt *Router) alertCurEventGet(c *gin.Context) {
@@ -216,8 +208,3 @@ func (rt *Router) alertCurEventGet(c *gin.Context) {

 	ginx.NewRender(c).Data(event, nil)
 }
-
-func (rt *Router) alertCurEventsStatistics(c *gin.Context) {
-
-	ginx.NewRender(c).Data(models.AlertCurEventStatistics(rt.Ctx, time.Now()), nil)
-}
--- a/center/router/router_alert_rule.go
+++ b/center/router/router_alert_rule.go
@@ -2,7 +2,6 @@ package router

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

@@ -11,7 +10,6 @@ import (
 	"github.com/gin-gonic/gin"
 	"github.com/toolkits/pkg/ginx"
 	"github.com/toolkits/pkg/i18n"
-	"github.com/toolkits/pkg/str"
 )

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

-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)
-		}
-	}
-
-	ars, err := models.AlertRuleGetsByBGIds(rt.Ctx, gids)
-	if err == nil {
-		cache := make(map[int64]*models.UserGroup)
-		for i := 0; i < len(ars); i++ {
-			ars[i].FillNotifyGroups(rt.Ctx, cache)
-			ars[i].FillSeverities()
-		}
-	}
-	ginx.NewRender(c).Data(ars, err)
-}
-
 func (rt *Router) alertRulesGetByService(c *gin.Context) {
 	prods := []string{}
 	prodStr := ginx.QueryStr(c, "prods", "")
@@ -128,17 +100,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
@@ -310,76 +271,3 @@ func (rt *Router) alertRuleGet(c *gin.Context) {

 	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)
-}
--- a/center/router/router_alert_subscribe.go
+++ b/center/router/router_alert_subscribe.go
@@ -8,56 +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)
+
+		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)
 }

@@ -76,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())

@@ -108,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",
@@ -132,10 +96,7 @@ func (rt *Router) alertSubscribePut(c *gin.Context) {
 			"webhooks",
 			"for_duration",
 			"redefine_webhooks",
-			"severities",
-			"extra_config",
-			"busi_groups",
-			"note",
+			"datasource_ids",
 		))
 	}

--- a/center/router/router_board.go
+++ b/center/router/router_board.go
@@ -7,19 +7,16 @@ import (
 	"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) {
@@ -68,28 +65,6 @@ 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)
 }

@@ -217,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)
 }

@@ -242,59 +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)
-		}
-	}
-
-	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)
+	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))

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

 	ginx.NewRender(c).Message(nil)
 }
-
-type boardsForm struct {
-	BoardIds []int64 `json:"board_ids"`
-}
-
-func (rt *Router) boardBatchClone(c *gin.Context) {
-	me := c.MustGet("user").(*models.User)
-	bgid := ginx.UrlParamInt64(c, "id")
-	rt.bgrwCheck(c, bgid)
-
-	var f boardsForm
-	ginx.BindJSON(c, &f)
-
-	reterr := make(map[string]string, len(f.BoardIds))
-	lang := c.GetHeader("X-Language")
-	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[newBoard.Name] = i18n.Sprintf(lang, err.Error())
-			continue
-		}
-
-		if err = newBoard.AtomicAdd(rt.Ctx, payload); err != nil {
-			reterr[newBoard.Name] = i18n.Sprintf(lang, err.Error())
-		} else {
-			reterr[newBoard.Name] = ""
-		}
-	}
-
-	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_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
@@ -2,7 +2,6 @@ package router

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

 	"github.com/gin-gonic/gin"
 	"github.com/toolkits/pkg/ginx"
@@ -26,49 +25,28 @@ func (rt *Router) configGetByKey(c *gin.Context) {
 	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) 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,7 +3,6 @@ package router
 import (
 	"crypto/tls"
 	"fmt"
-	"io"
 	"net/http"
 	"net/url"
 	"strings"
@@ -26,11 +25,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,10 +32,8 @@ 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) {
@@ -50,40 +42,29 @@ func (rt *Router) datasourceGetsByService(c *gin.Context) {
 	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)
@@ -113,7 +94,7 @@ 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)
@@ -124,10 +105,6 @@ func DatasourceCheck(ds models.Datasource) error {
 		return fmt.Errorf("url is empty")
 	}

-	if !strings.HasPrefix(ds.HTTPJson.Url, "http") {
-		return fmt.Errorf("url must start with http or https")
-	}
-
 	client := &http.Client{
 		Transport: &http.Transport{
 			TLSClientConfig: &tls.Config{
@@ -146,33 +123,16 @@ func DatasourceCheck(ds models.Datasource) error {
 	if ds.PluginType == models.PROMETHEUS {
 		subPath := "/api/v1/query"
 		query := url.Values{}
-		if ds.HTTPJson.IsLoki() {
+		if strings.Contains(fullURL, "loki") {
 			subPath = "/api/v1/labels"
+			query.Add("start", "1")
+			query.Add("end", "2")
 		} else {
 			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)
@@ -196,19 +156,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)
@@ -216,11 +170,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)
@@ -230,11 +179,6 @@ 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)
@@ -247,3 +191,8 @@ func (rt *Router) getDatasourceIds(c *gin.Context) {

 	ginx.NewRender(c).Data(datasourceIds, err)
 }
+
+func Username(c *gin.Context) string {
+
+	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
@@ -44,10 +44,6 @@ func (rt *Router) statistic(c *gin.Context) {
 		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
 	default:
 		ginx.Bomb(http.StatusBadRequest, "invalid name")
 	}
@@ -69,8 +65,7 @@ func queryDatasourceIds(c *gin.Context) []int64 {
 }

 type idsForm struct {
-	Ids               []int64 `json:"ids"`
-	IsSyncToFlashDuty bool    `json:"is_sync_to_flashduty"`
+	Ids []int64 `json:"ids"`
 }

 func (f idsForm) Verify() {
@@ -159,12 +154,3 @@ func TaskCreate(v interface{}, ibexc aconf.Ibex) (int64, error) {

 	return res.Dat, nil
 }
-
-func Username(c *gin.Context) string {
-	username := c.GetString(gin.AuthUserKey)
-	if username == "" {
-		user := c.MustGet("user").(*models.User)
-		username = user.Username
-	}
-	return username
-}
--- a/center/router/router_heartbeat.go
+++ b/center/router/router_heartbeat.go
@@ -4,15 +4,12 @@ import (
 	"compress/gzip"
 	"encoding/json"
 	"io/ioutil"
-	"sort"
-	"strings"
 	"time"

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

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

 func (rt *Router) heartbeat(c *gin.Context) {
@@ -38,60 +35,17 @@ func (rt *Router) heartbeat(c *gin.Context) {
 	err = json.Unmarshal(bs, &req)
 	ginx.Dangerous(err)

-	// 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 = rt.Alert.Heartbeat.EngineName
-	}
-
+	req.Offset = (time.Now().UnixMilli() - req.UnixTime)
+	req.RemoteAddr = c.ClientIP()
 	rt.MetaSet.Set(req.Hostname, req)
-	var items = make(map[string]struct{})
-	items[req.Hostname] = struct{}{}
-	rt.IdentSet.MSet(items)

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

-		filed := make(map[string]interface{})
-		if gid != 0 && gid != target.GroupId {
-			filed["group_id"] = gid
+	if gid != 0 {
+		target, has := rt.TargetCache.Get(req.Hostname)
+		if has && target.GroupId != gid {
+			err = models.TargetUpdateBgid(rt.Ctx, []string{req.Hostname}, gid, false)
 		}
-
-		if hostIp != "" && hostIp != target.HostIp {
-			filed["host_ip"] = hostIp
-		}
-
-		if len(req.GlobalLabels) > 0 {
-			lst := []string{}
-			for k, v := range req.GlobalLabels {
-				lst = append(lst, k+"="+v)
-			}
-			sort.Strings(lst)
-			labels := strings.Join(lst, " ")
-			if target.Tags != labels {
-				filed["tags"] = labels
-			}
-		}
-
-		if req.EngineName != "" && req.EngineName != target.EngineName {
-			filed["engine_name"] = req.EngineName
-		}
-
-		if len(filed) > 0 {
-			err := target.UpdateFieldsMap(rt.Ctx, filed)
-			if err != nil {
-				logger.Errorf("update target fields failed, err: %v", err)
-			}
-		}
-		logger.Debugf("heartbeat field:%+v target: %v", filed, *target)
 	}

 	ginx.NewRender(c).Message(err)
--- 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)
-		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, 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, 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 login 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,12 +217,39 @@ 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))
 	}
@@ -337,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))
 	}
@@ -413,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))
 	}
@@ -449,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)
 }

@@ -490,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
@@ -506,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,26 +19,6 @@ 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)
-		}
-	}
-
-	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)
@@ -51,41 +29,16 @@ func (rt *Router) alertMuteGets(c *gin.Context) {
 }

 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)
@@ -101,14 +54,6 @@ func (rt *Router) alertMuteDel(c *gin.Context) {
 	ginx.NewRender(c).Message(models.AlertMuteDel(rt.Ctx, f.Ids))
 }

-// alertMuteGetById 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_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) {
@@ -45,8 +41,8 @@ func (rt *Router) webhookPuts(c *gin.Context) {

 	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 +65,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) {
@@ -105,8 +101,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) {
@@ -141,8 +137,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) {
@@ -162,12 +158,10 @@ 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
@@ -176,55 +170,24 @@ func (rt *Router) notifyConfigPut(c *gin.Context) {
 	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)
+
+		if smtp.Host == "" || smtp.Port == 0 {
+			ginx.Bomb(200, "smtp host or port can not be empty")
+		}

-		smtp, errSmtp := SmtpValidate(text)
-		ginx.Dangerous(errSmtp)
 		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
@@ -6,98 +6,45 @@ import (
 	"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")
+	if err := templateValidate(f); err != nil {
+		ginx.NewRender(c).Message(err.Error())
+		return
 	}

-	f.UpdateAt = time.Now().Unix()
-	f.UpdateBy = user.Username
-
 	ginx.NewRender(c).Message(f.UpdateContent(rt.Ctx))
 }

 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")
+	if err := templateValidate(f); err != nil {
+		ginx.NewRender(c).Message(err.Error())
+		return
 	}

-	// 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))
+	ginx.NewRender(c).Message(f.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
 	}
@@ -118,7 +65,10 @@ func templateValidate(f models.NotifyTpl) error {
 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)
@@ -156,34 +106,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)
-	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)")
-	}
-	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,51 +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),
@@ -56,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"`
 }
@@ -76,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) {
@@ -162,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
@@ -11,7 +11,6 @@ import (

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

 func (rt *Router) recordingRuleGets(c *gin.Context) {
@@ -20,25 +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)
-		}
-	}
-
-	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)
--- 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)
 }
--- 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
@@ -3,7 +3,6 @@ package router
 import (
 	"github.com/ccfos/nightingale/v6/models"
 	"github.com/ccfos/nightingale/v6/pkg/ormx"
-	"github.com/ccfos/nightingale/v6/pkg/secu"

 	"github.com/gin-gonic/gin"
 	"github.com/toolkits/pkg/ginx"
@@ -49,9 +48,5 @@ func (rt *Router) selfPasswordPut(c *gin.Context) {
 	var f selfPasswordForm
 	ginx.BindJSON(c, &f)
 	user := c.MustGet("user").(*models.User)
-	decodeOP, err := secu.Decrypt(f.OldPass, rt.HTTP.RSA.RSAPrivateKey, rt.HTTP.RSA.RSAPassWord)
-	ginx.Dangerous(err)
-	decodeNP, err := secu.Decrypt(f.NewPass, rt.HTTP.RSA.RSAPrivateKey, rt.HTTP.RSA.RSAPassWord)
-	ginx.Dangerous(err)
-	ginx.NewRender(c).Message(user.ChangePassword(rt.Ctx, decodeOP, decodeNP))
+	ginx.NewRender(c).Message(user.ChangePassword(rt.Ctx, f.OldPass, f.NewPass))
 }
--- a/center/router/router_server.go
+++ b/center/router/router_server.go
@@ -27,18 +27,8 @@ func (rt *Router) serverHeartbeat(c *gin.Context) {
 }

 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
-	}
+	datasourceId := ginx.QueryInt64(c, "dsid")

-	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,30 +42,15 @@ 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)

-	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)
-		}
-	}
-
-	total, err := models.TargetTotal(rt.Ctx, bgids, dsIds, query, downtime)
+	total, err := models.TargetTotal(rt.Ctx, bgid, dsIds, query)
 	ginx.Dangerous(err)

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

 	if err == nil {
@@ -77,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 {
@@ -102,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 {
@@ -119,27 +101,6 @@ 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)
@@ -332,11 +293,7 @@ func (rt *Router) targetUpdateBgid(c *gin.Context) {

 		// 机器里边存在未归组的，登录用户就需要是admin
 		if len(orphans) > 0 && !user.IsAdmin() {
-			can, err := user.CheckPerm(rt.Ctx, "/targets/bind")
-			ginx.Dangerous(err)
-			if !can {
-				ginx.Bomb(http.StatusForbidden, "No permission. Only admin can assign BG")
-			}
+			ginx.Bomb(http.StatusForbidden, "No permission. Only admin can assign BG")
 		}

 		reBelongs, err := models.IdentsFilter(rt.Ctx, f.Idents, "group_id > ?", 0)
@@ -390,21 +347,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
@@ -30,50 +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)
-		}
-	}
-
-	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{
@@ -132,7 +92,6 @@ func (f *taskForm) Verify() error {
 	if f.Script == "" {
 		return fmt.Errorf("arg(script) is required")
 	}
-	f.Script = strings.Replace(f.Script, "\r\n", "\n", -1)

 	if str.Dangerous(f.Args) {
 		return fmt.Errorf("arg(args) is dangerous")
--- a/center/router/router_task_tpl.go
+++ b/center/router/router_task_tpl.go
@@ -18,40 +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)
-		}
-	}
-
-	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{
@@ -78,19 +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)
-}
-
 type taskTplForm struct {
 	Title     string   `json:"title" binding:"required"`
 	Batch     int      `json:"batch"`
--- 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
@@ -6,34 +6,11 @@ import (

 	"github.com/ccfos/nightingale/v6/models"
 	"github.com/ccfos/nightingale/v6/pkg/ormx"
-	"github.com/ccfos/nightingale/v6/pkg/secu"

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

-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)
-	}
-
-	ginx.Dangerous(err)
-
-	groups, err := user.BusiGroups(rt.Ctx, 10000, "")
-	ginx.NewRender(c).Data(groups, err)
-}
-
 func (rt *Router) userFindAll(c *gin.Context) {
 	list, err := models.UserGetAll(rt.Ctx)
 	ginx.NewRender(c).Data(list, err)
@@ -73,17 +50,14 @@ func (rt *Router) userAddPost(c *gin.Context) {
 	var f userAddForm
 	ginx.BindJSON(c, &f)

-	decPassWord, err := secu.Decrypt(f.Password, rt.HTTP.RSA.RSAPrivateKey, rt.HTTP.RSA.RSAPassWord)
-	ginx.Dangerous(err)
-
-	password, err := models.CryptoPass(rt.Ctx, decPassWord)
+	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,
@@ -94,8 +68,8 @@ 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.NewRender(c).Message(u.Add(rt.Ctx))
@@ -114,33 +88,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")
-	}
-
-	decPassWord, err := secu.Decrypt(f.Password, rt.HTTP.RSA.RSAPrivateKey, rt.HTTP.RSA.RSAPassWord)
-	ginx.Dangerous(err)
-
-	password, err := models.CryptoPass(rt.Ctx, decPassWord)
-	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)
@@ -170,10 +117,7 @@ func (rt *Router) userPasswordPut(c *gin.Context) {

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

-	decPassWord, err := secu.Decrypt(f.Password, rt.HTTP.RSA.RSAPrivateKey, rt.HTTP.RSA.RSAPassWord)
-	ginx.Dangerous(err)
-
-	cryptoPass, err := models.CryptoPass(rt.Ctx, decPassWord)
+	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,7 +5,6 @@ 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"
@@ -42,9 +41,8 @@ func (rt *Router) userGroupMemberGetsByService(c *gin.Context) {
 }

 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) {
@@ -61,19 +59,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) {
@@ -82,7 +73,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
@@ -98,14 +88,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
@@ -125,16 +109,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) {
@@ -146,21 +122,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) {
@@ -177,12 +145,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
@@ -2,8 +2,8 @@ package sso

 import (
 	"log"
-	"time"

+	"github.com/BurntSushi/toml"
 	"github.com/ccfos/nightingale/v6/center/cconf"
 	"github.com/ccfos/nightingale/v6/models"
 	"github.com/ccfos/nightingale/v6/pkg/cas"
@@ -12,16 +12,14 @@ import (
 	"github.com/ccfos/nightingale/v6/pkg/oauth2x"
 	"github.com/ccfos/nightingale/v6/pkg/oidcx"

-	"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
+	OIDC   *oidcx.SsoClient
+	LDAP   *ldapx.SsoClient
+	CAS    *cas.SsoClient
+	OAuth2 *oauth2x.SsoClient
 }

 const LDAP = `
@@ -31,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'
@@ -54,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'
@@ -69,7 +58,7 @@ UserinfoPrefix = 'data'
 Scopes = ['profile', 'email', 'phone']

 [Attributes]
-Username = 'sub'
+Username = 'username'
 Nickname = 'nickname'
 Phone = 'phone_number'
 Email = 'email'
@@ -77,35 +66,28 @@ 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'
@@ -161,7 +143,6 @@ func Init(center cconf.Center, ctx *ctx.Context) *SsoClient {
 			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)
@@ -184,81 +165,5 @@ func Init(center cconf.Center, ctx *ctx.Context) *SsoClient {
 			ssoClient.OAuth2 = oauth2x.New(config)
 		}
 	}
-
-	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
-	}
-
-	if lastUpdateTime == s.LastUpdateTime {
-		return nil
-	}
-
-	configs, err := models.SsoConfigGets(ctx)
-	if err != nil {
-		return err
-	}
-
-	for _, cfg := range configs {
-		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
-	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/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, false)
 	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';
--- a/cmd/alert/main.go
+++ b/cmd/alert/main.go
@@ -17,7 +17,7 @@ import (

 var (
 	showVersion = flag.Bool("version", false, "Show version.")
-	configDir   = flag.String("configs", osx.GetEnv("N9E_ALERT_CONFIGS", "etc"), "Specify configuration directory.(env:N9E_ALERT_CONFIGS)")
+	configDir   = flag.String("configs", osx.GetEnv("N9E_CONFIGS", "etc"), "Specify configuration directory.(env:N9E_CONFIGS)")
 	cryptoKey   = flag.String("crypto-key", "", "Specify the secret key for configuration file field encryption.")
 )

--- a/cmd/center/main.go
+++ b/cmd/center/main.go
@@ -12,7 +12,6 @@ import (
 	"github.com/ccfos/nightingale/v6/pkg/osx"
 	"github.com/ccfos/nightingale/v6/pkg/version"

-	"github.com/toolkits/pkg/net/tcpx"
 	"github.com/toolkits/pkg/runner"
 )

@@ -32,8 +31,6 @@ func main() {

 	printEnv()

-	tcpx.WaitHosts()
-
 	cleanFunc, err := center.Initialize(*configDir, *cryptoKey)
 	if err != nil {
 		log.Fatalln("failed to initialize:", err)
--- a/cmd/edge/edge.go
+++ b/cmd/edge/edge.go
@@ -1,92 +0,0 @@
-package main
-
-import (
-	"context"
-	"errors"
-	"fmt"
-
-	"github.com/ccfos/nightingale/v6/alert"
-	"github.com/ccfos/nightingale/v6/alert/astats"
-	"github.com/ccfos/nightingale/v6/alert/process"
-	"github.com/ccfos/nightingale/v6/center/metas"
-	"github.com/ccfos/nightingale/v6/conf"
-	"github.com/ccfos/nightingale/v6/dumper"
-	"github.com/ccfos/nightingale/v6/memsto"
-	"github.com/ccfos/nightingale/v6/pkg/ctx"
-	"github.com/ccfos/nightingale/v6/pkg/httpx"
-	"github.com/ccfos/nightingale/v6/pkg/logx"
-	"github.com/ccfos/nightingale/v6/prom"
-	"github.com/ccfos/nightingale/v6/pushgw/idents"
-	"github.com/ccfos/nightingale/v6/pushgw/writer"
-	"github.com/ccfos/nightingale/v6/storage"
-	"github.com/ccfos/nightingale/v6/tdengine"
-
-	alertrt "github.com/ccfos/nightingale/v6/alert/router"
-	pushgwrt "github.com/ccfos/nightingale/v6/pushgw/router"
-)
-
-func Initialize(configDir string, cryptoKey string) (func(), error) {
-	config, err := conf.InitConfig(configDir, cryptoKey)
-	if err != nil {
-		return nil, fmt.Errorf("failed to init config: %v", err)
-	}
-
-	logxClean, err := logx.Init(config.Log)
-	if err != nil {
-		return nil, err
-	}
-	//check CenterApi is default value
-	if len(config.CenterApi.Addrs) < 1 {
-		return nil, errors.New("failed to init config: the CenterApi configuration is missing")
-	}
-	ctx := ctx.NewContext(context.Background(), nil, false, config.CenterApi)
-
-	var redis storage.Redis
-	if config.Redis.Address != "" {
-		redis, err = storage.NewRedis(config.Redis)
-		if err != nil {
-			return nil, err
-		}
-	}
-
-	syncStats := memsto.NewSyncStats()
-
-	targetCache := memsto.NewTargetCache(ctx, syncStats, nil)
-	busiGroupCache := memsto.NewBusiGroupCache(ctx, syncStats)
-	idents := idents.New(ctx, redis)
-	metas := metas.New(redis)
-	writers := writer.NewWriters(config.Pushgw)
-	pushgwRouter := pushgwrt.New(config.HTTP, config.Pushgw, config.Alert, targetCache, busiGroupCache, idents, metas, writers, ctx)
-	r := httpx.GinEngine(config.Global.RunMode, config.HTTP)
-	pushgwRouter.Config(r)
-
-	if !config.Alert.Disable {
-		configCache := memsto.NewConfigCache(ctx, syncStats, nil, "")
-		alertStats := astats.NewSyncStats()
-		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)
-
-		promClients := prom.NewPromClient(ctx)
-		tdengineClients := tdengine.NewTdengineClient(ctx, config.Alert.Heartbeat)
-		externalProcessors := process.NewExternalProcessors()
-
-		alert.Start(config.Alert, config.Pushgw, syncStats, alertStats, externalProcessors, targetCache, busiGroupCache, alertMuteCache,
-			alertRuleCache, notifyConfigCache, dsCache, ctx, promClients, tdengineClients, userCache, userGroupCache)
-
-		alertrtRouter := alertrt.New(config.HTTP, config.Alert, alertMuteCache, targetCache, busiGroupCache, alertStats, ctx, externalProcessors)
-
-		alertrtRouter.Config(r)
-	}
-
-	dumper.ConfigRouter(r)
-	httpClean := httpx.Init(config.HTTP, r)
-
-	return func() {
-		logxClean()
-		httpClean()
-	}, nil
-}
--- a/cmd/edge/main.go
+++ b/cmd/edge/main.go
@@ -1,68 +0,0 @@
-package main
-
-import (
-	"flag"
-	"fmt"
-	"log"
-	"os"
-	"os/signal"
-	"syscall"
-
-	"github.com/ccfos/nightingale/v6/pkg/osx"
-	"github.com/ccfos/nightingale/v6/pkg/version"
-
-	"github.com/toolkits/pkg/runner"
-)
-
-var (
-	showVersion = flag.Bool("version", false, "Show version.")
-	configDir   = flag.String("configs", osx.GetEnv("N9E_EDGE_CONFIGS", "etc"), "Specify configuration directory.(env:N9E_EDGE_CONFIGS)")
-	cryptoKey   = flag.String("crypto-key", "", "Specify the secret key for configuration file field encryption.")
-)
-
-func main() {
-	flag.Parse()
-
-	if *showVersion {
-		fmt.Println(version.Version)
-		os.Exit(0)
-	}
-
-	printEnv()
-
-	cleanFunc, err := Initialize(*configDir, *cryptoKey)
-	if err != nil {
-		log.Fatalln("failed to initialize:", err)
-	}
-
-	code := 1
-	sc := make(chan os.Signal, 1)
-	signal.Notify(sc, syscall.SIGHUP, syscall.SIGINT, syscall.SIGTERM, syscall.SIGQUIT)
-
-EXIT:
-	for {
-		sig := <-sc
-		fmt.Println("received signal:", sig.String())
-		switch sig {
-		case syscall.SIGQUIT, syscall.SIGTERM, syscall.SIGINT:
-			code = 0
-			break EXIT
-		case syscall.SIGHUP:
-			// reload configuration?
-		default:
-			break EXIT
-		}
-	}
-
-	cleanFunc()
-	fmt.Println("process exited")
-	os.Exit(code)
-}
-
-func printEnv() {
-	runner.Init()
-	fmt.Println("runner.cwd:", runner.Cwd)
-	fmt.Println("runner.hostname:", runner.Hostname)
-	fmt.Println("runner.fd_limits:", runner.FdLimits())
-	fmt.Println("runner.vm_limits:", runner.VMLimits())
-}
--- a/cmd/pushgw/main.go
+++ b/cmd/pushgw/main.go
@@ -17,7 +17,7 @@ import (

 var (
 	showVersion = flag.Bool("version", false, "Show version.")
-	configDir   = flag.String("configs", osx.GetEnv("N9E_PUSHGW_CONFIGS", "etc"), "Specify configuration directory.(env:N9E_PUSHGW_CONFIGS)")
+	configDir   = flag.String("configs", osx.GetEnv("N9E_CONFIGS", "etc"), "Specify configuration directory.(env:N9E_CONFIGS)")
 	cryptoKey   = flag.String("crypto-key", "", "Specify the secret key for configuration file field encryption.")
 )

--- a/conf/conf.go
+++ b/conf/conf.go
@@ -14,6 +14,8 @@ import (
 	"github.com/ccfos/nightingale/v6/pkg/ormx"
 	"github.com/ccfos/nightingale/v6/pushgw/pconf"
 	"github.com/ccfos/nightingale/v6/storage"
+
+	"github.com/gin-gonic/gin"
 )

 type ConfigType struct {
@@ -30,10 +32,8 @@ type ConfigType struct {
 }

 type CenterApi struct {
-	Addrs         []string
-	BasicAuthUser string
-	BasicAuthPass string
-	Timeout       int64
+	Addrs     []string
+	BasicAuth gin.Accounts
 }

 type GlobalConfig struct {
@@ -48,7 +48,7 @@ func InitConfig(configDir, cryptoKey string) (*ConfigType, error) {
 	}

 	config.Pushgw.PreCheck()
-	config.Alert.PreCheck(configDir)
+	config.Alert.PreCheck()
 	config.Center.PreCheck()

 	err := decryptConfig(config, cryptoKey)
--- a/doc/community-governance.md
+++ b/doc/community-governance.md
@@ -77,3 +77,4 @@ Committer 记录并公示于 **[COMMITTERS](https://github.com/ccfos/nightingale
 2. 提问之前请先搜索 [Github Issues](https://github.com/ccfos/nightingale/issues "Github Issue")；
 3. 我们优先推荐通过提交 [Github Issue](https://github.com/ccfos/nightingale/issues "Github Issue") 来提问，如果[有问题点击这里](https://github.com/ccfos/nightingale/issues/new?assignees=&labels=kind%2Fbug&template=bug_report.yml "有问题点击这里") | [有需求建议点击这里](https://github.com/ccfos/nightingale/issues/new?assignees=&labels=kind%2Ffeature&template=enhancement.md "有需求建议点击这里")；

+最后，我们推荐你加入微信群，针对相关开放式问题，相互交流咨询 (请先加好友：[UlricGO](https://www.gitlink.org.cn/UlricQin/gist/tree/master/self.jpeg "UlricGO") 备注：夜莺加群+姓名+公司，交流群里会有开发者团队和专业、热心的群友回答问题)。
--- a/doc/img/Nightingale_L_V.png
+++ b/doc/img/Nightingale_L_V.png
--- a/doc/img/n9e-arch-latest.png
+++ b/doc/img/n9e-arch-latest.png
--- a/doc/img/n9e-screenshot-gif-v6.gif
+++ b/doc/img/n9e-screenshot-gif-v6.gif
--- a/docker/.dockerignore
+++ b/docker/.dockerignore
@@ -1,5 +1,7 @@
-compose-host-network
-compose-postgres
-compose-bridge
+ibexetc
 initsql
+mysqletc
+n9eetc
+prometc
 build.sh
+docker-compose.yaml
--- a/docker/Dockerfile.goreleaser
+++ b/docker/Dockerfile.goreleaser
@@ -5,7 +5,8 @@ WORKDIR /app
 ADD n9e /app/
 ADD etc /app/
 ADD integrations /app/integrations/
-RUN pip install requests
+ADD --chmod=755 https://github.com/ufoscout/docker-compose-wait/releases/download/2.11.0/wait_x86_64 /wait
+RUN chmod +x /wait

 EXPOSE 17000

--- a/docker/Dockerfile.goreleaser.arm64
+++ b/docker/Dockerfile.goreleaser.arm64
@@ -1,3 +1,4 @@
+FROM flashcatcloud/toolbox:v0.0.1 as toolbox
 FROM --platform=$TARGETPLATFORM python:3-slim


@@ -5,6 +6,7 @@ WORKDIR /app
 ADD n9e /app/
 ADD etc /app/
 ADD integrations /app/integrations/
+COPY --chmod=755  --from=toolbox /toolbox/wait_aarch64 /wait

 EXPOSE 17000

--- a/docker/compose-host-network-metric-log/etc-categraf/config.toml
+++ b/docker/compose-host-network-metric-log/etc-categraf/config.toml
--- a/docker/compose-bridge/etc-categraf/input.cpu/cpu.toml
+++ b/docker/compose-bridge/etc-categraf/input.cpu/cpu.toml
--- a/docker/compose-host-network-metric-log/etc-categraf/input.disk/disk.toml
+++ b/docker/compose-host-network-metric-log/etc-categraf/input.disk/disk.toml
--- a/docker/compose-bridge/etc-categraf/input.diskio/diskio.toml
+++ b/docker/compose-bridge/etc-categraf/input.diskio/diskio.toml
--- a/docker/compose-postgres/categraf/conf/input.docker/docker.toml
+++ b/docker/compose-postgres/categraf/conf/input.docker/docker.toml
--- a/docker/compose-bridge/etc-categraf/input.kernel/kernel.toml
+++ b/docker/compose-bridge/etc-categraf/input.kernel/kernel.toml
--- a/docker/categraf/conf/input.kernel_vmstat/kernel_vmstat.toml
+++ b/docker/categraf/conf/input.kernel_vmstat/kernel_vmstat.toml
--- a/docker/categraf/conf/input.linux_sysctl_fs/linux_sysctl_fs.toml
+++ b/docker/categraf/conf/input.linux_sysctl_fs/linux_sysctl_fs.toml
--- a/docker/compose-bridge/etc-categraf/input.mem/mem.toml
+++ b/docker/compose-bridge/etc-categraf/input.mem/mem.toml
--- a/Show More
+++ b/Show More