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

2026-03-04 06:59:00 +00:00 · 2023-06-01 16:12:50 +08:00
319 changed files with 7149 additions and 52730 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -31,9 +31,6 @@ _test
 /etc/*.local.yml
 /etc/*.local.conf
 /etc/plugins/*.local.yml
-/etc/script/rules.yaml
-/etc/script/alert-rules.json
-/etc/script/record-rules.json
 /data*
 /tarball
 /run
@@ -46,7 +43,6 @@ _test
 /docker/mysqldata
 /docker/experience_pg_vm/pgdata
 /etc.local*
-/front/statik/statik.go

 .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
@@ -4,71 +4,65 @@
 </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>
-<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">
-<br/><img alt="GitHub Repo issues" src="https://img.shields.io/github/issues/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">
-<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://github.com/ccfos/nightingale/graphs/contributors">
+  <img alt="GitHub contributors" src="https://img.shields.io/github/contributors-anon/ccfos/nightingale"/></a>
 <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是中国计算机学会托管的开源云原生可观测工具，最早由滴滴于 2020 年孵化并开源，并于 2022 年正式捐赠予中国计算机学会。夜莺采用 All-in-One 的设计理念，集数据采集、可视化、监控告警、数据分析于一体，与云原生生态紧密集成，融入了顶级互联网公司可观测性最佳实践，沉淀了众多社区专家经验，开箱即用。
-
 ## 资料

- 文档：[flashcat.cloud/docs](https://flashcat.cloud/docs/)
- 提问：[answer.flashcat.cloud](https://answer.flashcat.cloud/)
- 报Bug：[github.com/ccfos/nightingale/issues](https://github.com/ccfos/nightingale/issues/new?assignees=&labels=kind%2Fbug&projects=&template=bug_report.yml)
-
+- 文档：[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 等多种时序库，实现统一告警管理
- 专业告警能力：内置支持多种告警规则，可以扩展支持所有通知媒介，支持告警屏蔽、告警抑制、告警自愈、告警事件管理
- 高性能可视化引擎：支持多种图表样式，内置众多Dashboard模版，也可导入Grafana模版，开箱即用，开源协议商业友好
- 无缝搭配 [Flashduty](https://flashcat.cloud/product/flashcat-duty/)：实现告警聚合收敛、认领、升级、排班、IM集成，确保告警处理不遗漏，减少打扰，更好协同
- 支持所有常见采集器：支持 [Categraf](https://flashcat.cloud/product/categraf)、telegraf、grafana-agent、datadog-agent、各种 exporter 作为采集器，没有什么数据是不能监控的
- 一体化观测平台：从 v6 版本开始，支持接入 ElasticSearch、Jaeger 数据源，实现日志、链路、指标多维度的统一可观测
+- **统一接入各种时序库**：支持对接 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

-![演示](doc/img/n9e-screenshot-gif-v6.gif)
-
-## 部署架构
-
-![架构](doc/img/n9e-arch-latest.png)

 ## 加入交流群

-欢迎加入 QQ 交流群，群号：479290895，QQ 群适合群友互助，夜莺研发人员通常不在群里。如果要报 bug 请到[这里](https://github.com/ccfos/nightingale/issues/new?assignees=&labels=kind%2Fbug&projects=&template=bug_report.yml)，提问到[这里](https://answer.flashcat.cloud/)。
+欢迎加入 QQ 交流群，群号：479290895，也可以扫下方二维码加入微信交流群：
+
+<img src="doc/img/wecom.png" width="240">

 ## Stargazers over time
-
-[![Stargazers over time](https://api.star-history.com/svg?repos=ccfos/nightingale&type=Date)](https://star-history.com/#ccfos/nightingale&Date)
-
+[![Stargazers over time](https://starchart.cc/ccfos/nightingale.svg)](https://starchart.cc/ccfos/nightingale)

 ## Contributors
 <a href="https://github.com/ccfos/nightingale/graphs/contributors">
  <img src="https://contrib.rocks/image?repo=ccfos/nightingale" />
 </a>

-## 社区治理
-[夜莺开源项目和社区治理架构（草案）](./doc/community-governance.md)
-
 ## License
 [Apache License V2.0](https://github.com/didi/nightingale/blob/main/LICENSE)
+
+## 社区管理
+
+[夜莺开源项目和社区治理架构（草案）](./doc/community-governance.md)
+
--- a/alert/aconf/conf.go
+++ b/alert/aconf/conf.go
@@ -7,7 +7,6 @@ import (
 )

 type Alert struct {
-	Disable     bool
 	EngineDelay int64
 	Heartbeat   HeartbeatConfig
 	Alerting    Alerting
@@ -71,8 +70,4 @@ func (a *Alert) PreCheck() {
 	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"
@@ -48,19 +47,16 @@ func Initialize(configDir string, cryptoKey string) (func(), error) {
 	alertRuleCache := memsto.NewAlertRuleCache(ctx, syncStats)
 	notifyConfigCache := memsto.NewNotifyConfigCache(ctx)
 	dsCache := memsto.NewDatasourceCache(ctx, syncStats)
-	userCache := memsto.NewUserCache(ctx, syncStats)
-	userGroupCache := memsto.NewUserGroupCache(ctx, syncStats)

 	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, 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)

@@ -71,7 +67,9 @@ 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, 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)

--- a/alert/common/conv.go
+++ b/alert/common/conv.go
@@ -15,7 +15,6 @@ type AnomalyPoint struct {
 	Value     float64      `json:"value"`
 	Severity  int          `json:"severity"`
 	Triggered bool         `json:"triggered"`
-	Query     string       `json:"query"`
 }

 func NewAnomalyPoint(key string, labels map[string]string, ts int64, value float64, severity int) AnomalyPoint {
--- a/alert/dispatch/consume.go
+++ b/alert/dispatch/consume.go
@@ -83,10 +83,6 @@ 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()
 		err := poster.PostByUrls(e.ctx, "/v1/n9e/event-persist", event)
--- a/alert/dispatch/dispatch.go
+++ b/alert/dispatch/dispatch.go
@@ -28,10 +28,9 @@ 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

@@ -52,10 +51,9 @@ 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,
 	}
@@ -65,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
@@ -85,13 +83,12 @@ 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, 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),
-		models.FeishuCard: sender.NewSender(models.FeishuCard, tmpTpls, smtp),
+		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()
@@ -102,7 +99,7 @@ func (e *Dispatch) relaodTpls() error {

 	e.RwLock.Lock()
 	e.tpls = tmpTpls
-	e.Senders = senders
+	e.senders = senders
 	e.RwLock.Unlock()
 	return nil
 }
@@ -143,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 {
@@ -179,41 +176,26 @@ func (e *Dispatch) handleSub(sub *models.AlertSubscribe, event models.AlertCurEv
 	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
-		}
-	}
-
 	sub.ModifyEvent(&event)
 	LogEvent(&event, "subscribe")
-
-	event.SubRuleId = sub.Id
 	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() {
-			ctx := sender.BuildMessageContext(rule, []*models.AlertCurEvent{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
-			}
-			s.Send(ctx)
+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
--- a/alert/eval/eval.go
+++ b/alert/eval/eval.go
@@ -69,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)
 			}
 		}
 	}()
@@ -165,7 +163,6 @@ 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...)
 	}
--- 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
 }

@@ -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 {
-					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,21 +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
-	}
-
 	return common.MatchTags(event.TagsMap, mute.ITags)
 }
--- a/alert/naming/hashring.go
+++ b/alert/naming/hashring.go
@@ -16,7 +16,7 @@ type DatasourceHashRingType struct {
 }

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

 func NewConsistentHashRing(replicas int32, nodes []string) *consistent.Consistent {
@@ -53,7 +53,9 @@ func (chr *DatasourceHashRingType) GetNode(datasourceId int64, pk string) (strin
 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) {
+		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
@@ -66,14 +68,3 @@ func (chr *DatasourceHashRingType) Set(datasourceId int64, r *consistent.Consist
 	defer chr.Unlock()
 	chr.Rings[datasourceId] = r
 }
-
-func (chr *DatasourceHashRingType) Clear() {
-	chr.Lock()
-	defer chr.Unlock()
-	for id := range chr.Rings {
-		if id == HostDatasource {
-			continue
-		}
-		delete(chr.Rings, id)
-	}
-}
--- a/alert/naming/heartbeat.go
+++ b/alert/naming/heartbeat.go
@@ -96,16 +96,6 @@ func (n *Naming) heartbeat() error {
 		}
 	}

-	if len(datasourceIds) == 0 {
-		DatasourceHashRing.Clear()
-		for dsId := range localss {
-			if dsId == HostDatasource {
-				continue
-			}
-			delete(localss, dsId)
-		}
-	}
-
 	for i := 0; i < len(datasourceIds); i++ {
 		servers, err := n.ActiveServers(datasourceIds[i])
 		if err != nil {
@@ -167,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/process/process.go
+++ b/alert/process/process.go
@@ -23,8 +23,6 @@ import (
 	"github.com/toolkits/pkg/str"
 )

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

-type HandleEventFunc func(event *models.AlertCurEvent)
-
 type Processor struct {
 	datasourceId int64

@@ -70,10 +66,6 @@ type Processor struct {
 	promClients *prom.PromClientMap
 	ctx         *ctx.Context
 	stats       *astats.Stats
-
-	HandleFireEventHook    HandleEventFunc
-	HandleRecoverEventHook HandleEventFunc
-	EventMuteHook          EventMuteHookFunc
 }

 func (p *Processor) Key() string {
@@ -110,10 +102,6 @@ func NewProcessor(rule *models.AlertRule, datasourceId int64, atertRuleCache *me
 		promClients: promClients,
 		ctx:         ctx,
 		stats:       stats,
-
-		HandleFireEventHook:    func(event *models.AlertCurEvent) {},
-		HandleRecoverEventHook: func(event *models.AlertCurEvent) {},
-		EventMuteHook:          func(event *models.AlertCurEvent) bool { return false },
 	}

 	p.mayHandleGroup()
@@ -145,11 +133,6 @@ func (p *Processor) Handle(anomalyPoints []common.AnomalyPoint, from string, inh
 			logger.Debugf("rule_eval:%s event:%v is muted", p.Key(), event)
 			continue
 		}
-
-		if p.EventMuteHook(event) {
-			continue
-		}
-
 		tagHash := TagHash(anomalyPoint)
 		eventsMap[tagHash] = append(eventsMap[tagHash], event)
 	}
@@ -191,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
@@ -246,8 +227,6 @@ func (p *Processor) RecoverSingle(hash string, now int64, value *string) {
 	cachedRule.UpdateEvent(event)
 	event.IsRecovered = true
 	event.LastEvalTime = now
-
-	p.HandleRecoverEventHook(event)
 	p.pushEventToQueue(event)
 }

@@ -305,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)
@@ -320,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 {
 				// 有最大发送次数的限制，就要看已经发了几次了，是否达到了最大发送次数
@@ -332,6 +309,7 @@ func (p *Processor) fireEvent(event *models.AlertCurEvent) {
 					return
 				} else {
 					event.NotifyCurNumber = fired.NotifyCurNumber + 1
+					event.FirstTriggerTime = fired.FirstTriggerTime
 					p.pushEventToQueue(event)
 				}
 			}
@@ -339,7 +317,6 @@ func (p *Processor) fireEvent(event *models.AlertCurEvent) {
 	} else {
 		event.NotifyCurNumber = 1
 		event.FirstTriggerTime = event.TriggerTime
-		p.HandleFireEventHook(event)
 		p.pushEventToQueue(event)
 	}
 }
@@ -455,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
@@ -54,16 +54,14 @@ 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)
 			}
 		}
 	}()
--- a/alert/sender/callback.go
+++ b/alert/sender/callback.go
@@ -1,7 +1,6 @@
 package sender

 import (
-	"encoding/json"
 	"strconv"
 	"strings"
 	"time"
@@ -51,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"`
@@ -116,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,
@@ -150,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
@@ -32,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
 	}

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

 	for _, url := range urls {
 		var body dingtalk
@@ -49,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,
 				},
 			}
@@ -57,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{
--- a/alert/sender/email.go
+++ b/alert/sender/email.go
@@ -22,18 +22,18 @@ 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(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(es.contentTpl, ctx.Events)
+	content := BuildTplMessage(es.contentTpl, ctx.Event)
 	es.WriteEmail(subject, content, tos)
 }

--- a/alert/sender/feishu.go
+++ b/alert/sender/feishu.go
@@ -31,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(fs.tpl, ctx.Events)
+	message := BuildTplMessage(fs.tpl, ctx.Event)
 	for _, url := range urls {
 		body := feishu{
 			Msgtype: "text",
--- a/alert/sender/feishucard.go
+++ b/alert/sender/feishucard.go
@@ -1,144 +0,0 @@
-package sender
-
-import (
-	"fmt"
-	"html/template"
-	"strings"
-	"time"
-
-	"github.com/ccfos/nightingale/v6/models"
-	"github.com/ccfos/nightingale/v6/pkg/poster"
-
-	"github.com/toolkits/pkg/logger"
-)
-
-type 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(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 {
-		fs.doSend(url, body)
-	}
-}
-
-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://") {
-				url = "https://open.feishu.cn/open-apis/bot/v2/hook/" + strings.TrimSpace(token)
-			}
-			urls = append(urls, url)
-		}
-	}
-	return urls, ats
-}
-
-func (fs *FeishuCardSender) doSend(url string, body feishuCard) {
-	res, code, err := poster.PostJSON(url, time.Second*5, body, 3)
-	if err != nil {
-		logger.Errorf("feishucard_sender: result=fail url=%s code=%d error=%v response=%s", url, code, err, string(res))
-	} else {
-		logger.Debugf("feishucard_sender: result=succ url=%s code=%d response=%s", url, code, string(res))
-	}
-}
--- a/alert/sender/mm.go
+++ b/alert/sender/mm.go
@@ -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,7 +36,7 @@ func (ms *MmSender) Send(ctx MessageContext) {
 	if len(urls) == 0 {
 		return
 	}
-	message := BuildTplMessage(ms.tpl, ctx.Events)
+	message := BuildTplMessage(ms.tpl, ctx.Event)

 	SendMM(MatterMostMessage{
 		Text:   message,
--- a/alert/sender/sender.go
+++ b/alert/sender/sender.go
@@ -17,9 +17,9 @@ type (

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

@@ -31,8 +31,6 @@ func NewSender(key string, tpls map[string]*template.Template, smtp aconf.SMTPCo
 		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["mailsubject"], contentTpl: tpls[models.Email], smtp: smtp}
 	case models.Mm:
@@ -43,32 +41,23 @@ func NewSender(key string, tpls map[string]*template.Template, smtp aconf.SMTPCo
 	return nil
 }

-func BuildMessageContext(rule *models.AlertRule, events []*models.AlertCurEvent, uids []int64, userCache *memsto.UserCacheType) 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,
+		Rule:  rule,
+		Event: event,
+		Users: users,
 	}
 }

-type BuildTplMessageFunc func(tpl *template.Template, events []*models.AlertCurEvent) string
-
-var BuildTplMessage BuildTplMessageFunc = buildTplMessage
-
-func buildTplMessage(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
@@ -26,11 +26,11 @@ 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(ts.tpl, ctx.Events)
+	message := BuildTplMessage(ts.tpl, ctx.Event)

 	SendTelegram(TelegramMessage{
 		Text:   message,
--- a/alert/sender/wecom.go
+++ b/alert/sender/wecom.go
@@ -25,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(ws.tpl, ctx.Events)
+	message := BuildTplMessage(ws.tpl, ctx.Event)
 	for _, url := range urls {
 		body := wecom{
 			Msgtype: "markdown",
--- a/center/cconf/conf.go
+++ b/center/cconf/conf.go
@@ -8,7 +8,6 @@ type Center struct {
 	I18NHeaderKey          string
 	MetricDesc             MetricDescType
 	AnonymousAccess        AnonymousAccess
-	UseFileAssets          bool
 }

 type Plugin struct {
--- a/center/center.go
+++ b/center/center.go
@@ -11,10 +11,8 @@ import (
 	"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/httpx"
 	"github.com/ccfos/nightingale/v6/pkg/i18nx"
@@ -51,7 +49,6 @@ func Initialize(configDir string, cryptoKey string) (func(), error) {
 	}
 	ctx := ctx.NewContext(context.Background(), db, true)
 	models.InitRoot(ctx)
-	migrate.Migrate(db)

 	redis, err := storage.NewRedis(config.Redis)
 	if err != nil {
@@ -72,20 +69,16 @@ func Initialize(configDir string, cryptoKey string) (func(), error) {
 	alertMuteCache := memsto.NewAlertMuteCache(ctx, syncStats)
 	alertRuleCache := memsto.NewAlertRuleCache(ctx, syncStats)
 	notifyConfigCache := memsto.NewNotifyConfigCache(ctx)
-	userCache := memsto.NewUserCache(ctx, syncStats)
-	userGroupCache := memsto.NewUserGroupCache(ctx, syncStats)

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

 	writers := writer.NewWriters(config.Pushgw)

-	httpx.InitRSAConfig(&config.HTTP.RSA)
-
 	alertrtRouter := alertrt.New(config.HTTP, config.Alert, alertMuteCache, targetCache, busiGroupCache, alertStats, ctx, externalProcessors)
-	centerRouter := centerrt.New(config.HTTP, config.Center, cconf.Operations, dsCache, notifyConfigCache, promClients, redis, sso, ctx, metas, idents, targetCache, userCache, userGroupCache)
+	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)
@@ -93,7 +86,6 @@ func Initialize(configDir string, cryptoKey string) (func(), error) {
 	centerRouter.Config(r)
 	alertrtRouter.Config(r)
 	pushgwRouter.Config(r)
-	dumper.ConfigRouter(r)

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

--- a/center/router/router.go
+++ b/center/router/router.go
@@ -3,8 +3,6 @@ package router
 import (
 	"fmt"
 	"net/http"
-	"path"
-	"runtime"
 	"strings"
 	"time"

@@ -18,13 +16,11 @@ import (
 	"github.com/ccfos/nightingale/v6/pkg/ctx"
 	"github.com/ccfos/nightingale/v6/pkg/httpx"
 	"github.com/ccfos/nightingale/v6/prom"
-	"github.com/ccfos/nightingale/v6/pushgw/idents"
 	"github.com/ccfos/nightingale/v6/storage"

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

 type Router struct {
@@ -36,17 +32,13 @@ type Router struct {
 	PromClients       *prom.PromClientMap
 	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, operations cconf.Operation, ds *memsto.DatasourceCacheType, ncc *memsto.NotifyConfigCacheType,
-	pc *prom.PromClientMap, 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 {
+	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,
@@ -56,11 +48,8 @@ func New(httpConfig httpx.Config, center cconf.Center, operations cconf.Operatio
 		PromClients:       pc,
 		Redis:             redis,
 		MetaSet:           metaSet,
-		IdentSet:          idents,
 		TargetCache:       tc,
 		Sso:               sso,
-		UserCache:         uc,
-		UserGroupCache:    ugc,
 		Ctx:               ctx,
 	}
 }
@@ -106,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)
 		}
 	})
 }
@@ -146,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)
@@ -168,14 +132,10 @@ func (rt *Router) Config(r *gin.Engine) {
 		}

 		pages.POST("/auth/login", rt.jwtMock(), rt.loginPost)
-		pages.POST("/auth/logout", rt.jwtMock(), rt.auth(), 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)
@@ -268,7 +228,6 @@ 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/:id/alert-rule/:arid/validate", rt.auth(), rt.user(), rt.perm("/alert-rules/put"), rt.alertRuleValidation)

 		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)
@@ -344,8 +303,6 @@ func (rt *Router) Config(r *gin.Engine) {
 		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", rt.auth(), rt.admin(), rt.notifyTplAdd)
-		pages.DELETE("/notify-tpl/:id", rt.auth(), rt.admin(), rt.notifyTplDel)
 		pages.POST("/notify-tpl/preview", rt.auth(), rt.admin(), rt.notifyTplPreview)

 		pages.GET("/sso-configs", rt.auth(), rt.admin(), rt.ssoConfigGets)
@@ -365,12 +322,6 @@ func (rt *Router) Config(r *gin.Engine) {

 		pages.GET("/notify-config", rt.auth(), rt.admin(), rt.notifyConfigGet)
 		pages.PUT("/notify-config", rt.auth(), rt.admin(), rt.notifyConfigPut)
-
-		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)
 	}

 	if rt.HTTP.APIForService.Enable {
--- 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_rule.go
+++ b/center/router/router_alert_rule.go
@@ -2,7 +2,6 @@ package router

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

@@ -272,56 +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)
-
-	arid := ginx.UrlParamInt64(c, "arid")
-	ar, err := models.AlertRuleGetById(rt.Ctx, arid)
-	ginx.Dangerous(err)
-
-	if ar == nil {
-		ginx.NewRender(c, http.StatusNotFound).Message("No such AlertRule")
-		return
-	}
-
-	rt.bgrwCheck(c, ar.GroupId)
-
-	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
-			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(i18n.Sprintf(c.GetHeader("X-Language"), "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("")
-}
--- a/center/router/router_alert_subscribe.go
+++ b/center/router/router_alert_subscribe.go
@@ -83,9 +83,6 @@ func (rt *Router) alertSubscribePut(c *gin.Context) {
 			rt.Ctx,
 			"name",
 			"disabled",
-			"prod",
-			"cate",
-			"datasource_ids",
 			"cluster",
 			"rule_id",
 			"tags",
@@ -99,8 +96,7 @@ func (rt *Router) alertSubscribePut(c *gin.Context) {
 			"webhooks",
 			"for_duration",
 			"redefine_webhooks",
-			"severities",
-			"extra_config",
+			"datasource_ids",
 		))
 	}

--- a/center/router/router_builtin.go
+++ b/center/router/router_builtin.go
@@ -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 {
@@ -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 {
--- 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_datasource.go
+++ b/center/router/router_datasource.go
@@ -105,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{
@@ -129,6 +125,8 @@ func DatasourceCheck(ds models.Datasource) error {
 		query := url.Values{}
 		if strings.Contains(fullURL, "loki") {
 			subPath = "/api/v1/labels"
+			query.Add("start", "1")
+			query.Add("end", "2")
 		} else {
 			query.Add("query", "1+1")
 		}
--- a/center/router/router_es_index_pattern.go
+++ b/center/router/router_es_index_pattern.go
@@ -1,80 +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_heartbeat.go
+++ b/center/router/router_heartbeat.go
@@ -35,19 +35,9 @@ 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()
-	}
-
+	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)

 	gid := ginx.QueryInt64(c, "gid", 0)

--- a/center/router/router_login.go
+++ b/center/router/router_login.go
@@ -1,7 +1,6 @@
 package router

 import (
-	"encoding/base64"
 	"fmt"
 	"net/http"
 	"strconv"
@@ -13,7 +12,6 @@ import (
 	"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"
@@ -23,40 +21,20 @@ import (
 )

 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)
-			ginx.NewRender(c).Message(err)
-			return
-		}
-		authPassWord = decPassWord
-	}
-	user, err := models.PassLogin(rt.Ctx, f.Username, authPassWord)
+	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, authPassWord, roles, rt.Sso.LDAP)
+			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)
@@ -89,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")
@@ -560,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 rt.HTTP.RSA.OpenRSA {
-		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_notify_tpl.go
+++ b/center/router/router_notify_tpl.go
@@ -10,25 +10,12 @@ import (
 	"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["mailsubject"] = 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)
 }
@@ -36,7 +23,11 @@ func (rt *Router) notifyTplGets(c *gin.Context) {
 func (rt *Router) notifyTplUpdateContent(c *gin.Context) {
 	var f models.NotifyTpl
 	ginx.BindJSON(c, &f)
-	ginx.Dangerous(templateValidate(f))
+
+	if err := templateValidate(f); err != nil {
+		ginx.NewRender(c).Message(err.Error())
+		return
+	}

 	ginx.NewRender(c).Message(f.UpdateContent(rt.Ctx))
 }
@@ -44,28 +35,16 @@ func (rt *Router) notifyTplUpdateContent(c *gin.Context) {
 func (rt *Router) notifyTplUpdate(c *gin.Context) {
 	var f models.NotifyTpl
 	ginx.BindJSON(c, &f)
-	ginx.Dangerous(templateValidate(f))
+
+	if err := templateValidate(f); err != nil {
+		ginx.NewRender(c).Message(err.Error())
+		return
+	}

 	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
 	}
@@ -86,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)
@@ -124,25 +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.NotifyTplCountByChannel(rt.Ctx, f.Channel)
-	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")
-	ginx.NewRender(c).Message(f.NotifyTplDelete(rt.Ctx, id))
-}
--- a/center/router/router_proxy.go
+++ b/center/router/router_proxy.go
@@ -8,14 +8,12 @@ import (
 	"net/http/httputil"
 	"net/url"
 	"strings"
-	"sync"
 	"time"

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

 type queryFormItem struct {
@@ -33,14 +31,10 @@ type batchQueryForm struct {
 func (rt *Router) promBatchQueryRange(c *gin.Context) {
 	var f batchQueryForm
 	ginx.Dangerous(c.BindJSON(&f))
-	var lst []model.Value

 	cli := rt.PromClients.GetCli(f.DatasourceId)
-	if cli == nil {
-		logger.Warningf("no such datasource id: %d", f.DatasourceId)
-		ginx.NewRender(c).Data(lst, nil)
-		return
-	}
+
+	var lst []model.Value

 	for _, item := range f.Queries {
 		r := pkgprom.Range{
@@ -72,14 +66,9 @@ func (rt *Router) promBatchQueryInstant(c *gin.Context) {
 	var f batchInstantForm
 	ginx.Dangerous(c.BindJSON(&f))

-	var lst []model.Value
-
 	cli := rt.PromClients.GetCli(f.DatasourceId)
-	if cli == nil {
-		logger.Warningf("no such datasource id: %d", f.DatasourceId)
-		ginx.NewRender(c).Data(lst, nil)
-		return
-	}
+
+	var lst []model.Value

 	for _, item := range f.Queries {
 		resp, _, err := cli.Query(context.Background(), item.Query, time.Unix(item.Time, 0))
@@ -150,18 +139,14 @@ 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)
+	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{
@@ -172,44 +157,3 @@ func (rt *Router) dsProxy(c *gin.Context) {

 	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_server.go
+++ b/center/router/router_server.go
@@ -28,12 +28,6 @@ func (rt *Router) serverHeartbeat(c *gin.Context) {

 func (rt *Router) serversActive(c *gin.Context) {
 	datasourceId := ginx.QueryInt64(c, "dsid")
-	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
-	}

 	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
@@ -47,27 +47,10 @@ func (rt *Router) targetGets(c *gin.Context) {
 	limit := ginx.QueryInt(c, "limit", 30)
 	dsIds := queryDatasourceIds(c)

-	var bgids []int64
-	var err error
-	if bgid == -1 {
-		// 全部对象的情况，找到用户有权限的业务组
-		user := c.MustGet("user").(*models.User)
-		userGroupIds, err := models.MyGroupIds(rt.Ctx, user.Id)
-		ginx.Dangerous(err)
-
-		bgids, err = models.BusiGroupIds(rt.Ctx, userGroupIds)
-		ginx.Dangerous(err)
-
-		// 将未分配业务组的对象也加入到列表中
-		bgids = append(bgids, 0)
-	} else {
-		bgids = append(bgids, bgid)
-	}
-
-	total, err := models.TargetTotal(rt.Ctx, bgids, dsIds, query)
+	total, err := models.TargetTotal(rt.Ctx, bgid, dsIds, query)
 	ginx.Dangerous(err)

-	list, err := models.TargetGets(rt.Ctx, bgids, dsIds, query, 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 {
@@ -97,18 +80,16 @@ 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 {
 					// 未上报过元数据的主机，cpuNum默认为-1, 用于前端展示 unknown
 					list[i].CpuNum = -1
 				}
-
-				if now.Unix()-list[i].UnixTime/1000 < 60 {
-					list[i].TargetUp = 2
-				} else if now.Unix()-list[i].UnixTime/1000 < 180 {
-					list[i].TargetUp = 1
-				}
 			}
 		}

--- 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/edge/edge.go
+++ b/cmd/edge/edge.go
@@ -1,73 +0,0 @@
-package main
-
-import (
-	"context"
-	"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/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"
-
-	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
-	}
-
-	ctx := ctx.NewContext(context.Background(), nil, false, config.CenterApi)
-
-	syncStats := memsto.NewSyncStats()
-
-	targetCache := memsto.NewTargetCache(ctx, syncStats, nil)
-	busiGroupCache := memsto.NewBusiGroupCache(ctx, syncStats)
-	idents := idents.New(ctx)
-	writers := writer.NewWriters(config.Pushgw)
-	pushgwRouter := pushgwrt.New(config.HTTP, config.Pushgw, targetCache, busiGroupCache, idents, writers, ctx)
-	r := httpx.GinEngine(config.Global.RunMode, config.HTTP)
-	pushgwRouter.Config(r)
-
-	if !config.Alert.Disable {
-		alertStats := astats.NewSyncStats()
-		dsCache := memsto.NewDatasourceCache(ctx, syncStats)
-		alertMuteCache := memsto.NewAlertMuteCache(ctx, syncStats)
-		alertRuleCache := memsto.NewAlertRuleCache(ctx, syncStats)
-		notifyConfigCache := memsto.NewNotifyConfigCache(ctx)
-		userCache := memsto.NewUserCache(ctx, syncStats)
-		userGroupCache := memsto.NewUserGroupCache(ctx, syncStats)
-
-		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, 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 {
--- 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/Dockerfile.goreleaser
+++ b/docker/Dockerfile.goreleaser
@@ -6,7 +6,7 @@ ADD n9e /app/
 ADD etc /app/
 ADD integrations /app/integrations/
 ADD --chmod=755 https://github.com/ufoscout/docker-compose-wait/releases/download/2.11.0/wait_x86_64 /wait
-RUN chmod +x /wait && pip install requests
+RUN chmod +x /wait

 EXPOSE 17000

--- a/docker/experience_pg_vm/initsql_for_postgres/b-ibex-for-Postgres.sql
+++ b/docker/experience_pg_vm/initsql_for_postgres/b-ibex-for-Postgres.sql
@@ -1,17 +1,16 @@
 CREATE TABLE task_meta
 (
-    id          bigserial,
-    title       varchar(255)    not null default '',
-    account     varchar(64)     not null,
-    batch       int     not null default 0,
-    tolerance   int     not null default 0,
-    timeout     int     not null default 0,
-    pause       varchar(255)    not null default '',
-    script      text            not null,
-    args        varchar(512)    not null default '',
-    stdin       varchar(1024)   not null default '' ,
-    creator     varchar(64)     not null default '',
-    created     timestamp       not null default CURRENT_TIMESTAMP,
+    id        bigserial,
+    title     varchar(255)    not null default '',
+    account   varchar(64)     not null,
+    batch     int     not null default 0,
+    tolerance int     not null default 0,
+    timeout   int     not null default 0,
+    pause     varchar(255)    not null default '',
+    script    text            not null,
+    args      varchar(512)    not null default '',
+    creator   varchar(64)     not null default '',
+    created   timestamp       not null default CURRENT_TIMESTAMP,
    PRIMARY KEY (id)
 ) ;
 CREATE INDEX task_meta_creator_idx ON task_meta (creator);
--- a/docker/initsql/a-n9e.sql
+++ b/docker/initsql/a-n9e.sql
@@ -54,7 +54,7 @@ insert into user_group_member(group_id, user_id) values(1, 1);
 CREATE TABLE `configs` (
    `id` bigint unsigned not null auto_increment,
    `ckey` varchar(191) not null,
-    `cval` text not null,
+    `cval` varchar(4096) not null default '',
    PRIMARY KEY (`id`),
    UNIQUE KEY (`ckey`)
 ) ENGINE = InnoDB DEFAULT CHARSET = utf8mb4;
@@ -94,17 +94,10 @@ insert into `role_operation`(role_name, operation) values('Standard', '/log/expl
 insert into `role_operation`(role_name, operation) values('Standard', '/trace/explorer');
 insert into `role_operation`(role_name, operation) values('Standard', '/help/version');
 insert into `role_operation`(role_name, operation) values('Standard', '/help/contact');
-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('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('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');
-
 insert into `role_operation`(role_name, operation) values('Standard', '/users');
 insert into `role_operation`(role_name, operation) values('Standard', '/user-groups');
 insert into `role_operation`(role_name, operation) values('Standard', '/user-groups/add');
@@ -281,7 +274,6 @@ CREATE TABLE `alert_rule` (
    `runbook_url` varchar(255),
    `append_tags` varchar(255) not null default '' comment 'split by space: service=n9e mod=api',
    `annotations` text not null comment 'annotations',
-    `extra_config` text not null comment 'extra_config',
    `create_at` bigint not null default 0,
    `create_by` varchar(64) not null default '',
    `update_at` bigint not null default 0,
@@ -306,7 +298,6 @@ CREATE TABLE `alert_mute` (
    `disabled` tinyint(1) not null default 0 comment '0:enabled 1:disabled',
    `mute_time_type` tinyint(1) not null default 0,
    `periodic_mutes` varchar(4096) not null default '',
-    `severities` varchar(32) not null default '',
    `create_at` bigint not null default 0,
    `create_by` varchar(64) not null default '',
    `update_at` bigint not null default 0,
@@ -326,7 +317,6 @@ CREATE TABLE `alert_subscribe` (
    `datasource_ids` varchar(255) not null default '' comment 'datasource ids',
    `cluster` varchar(128) not null,
    `rule_id` bigint not null default 0,
-    `severities` varchar(32) not null default '',
    `tags` varchar(4096) not null default '' comment 'json,map,tagkey->regexp|value',
    `redefine_severity` tinyint(1) default 0 comment 'is redefine severity?',
    `new_severity` tinyint(1) not null comment '0:Emergency 1:Warning 2:Notice',
@@ -334,7 +324,6 @@ CREATE TABLE `alert_subscribe` (
    `new_channels` varchar(255) not null default '' comment 'split by space: sms voice email dingtalk wecom',
    `user_group_ids` varchar(250) not null comment 'split by space 1 34 5, notify cc to user_group_ids',
    `webhooks` text not null,
-    `extra_config` text not null comment 'extra_config',
    `redefine_webhooks` tinyint(1) default 0,
    `for_duration` bigint not null default 0,
    `create_at` bigint not null default 0,
@@ -406,7 +395,6 @@ CREATE TABLE `recording_rule` (
    `prom_ql` varchar(8192) not null comment 'promql',
    `prom_eval_interval` int not null comment 'evaluate interval',
    `append_tags` varchar(255) default '' comment 'split by space: service=n9e mod=api',
-    `query_configs` text not null comment 'query configs',
    `create_at` bigint default '0',
    `create_by` varchar(64) default '',
    `update_at` bigint default '0',
@@ -618,19 +606,4 @@ CREATE TABLE `sso_config` (
    `content` text not null,
    PRIMARY KEY (`id`),
    UNIQUE KEY (`name`)
-) ENGINE = InnoDB DEFAULT CHARSET = utf8mb4;
-
-CREATE TABLE `es_index_pattern` (
-    `id` bigint unsigned not null auto_increment,
-    `datasource_id` bigint not null default 0 comment 'datasource id',
-    `name` varchar(191) not null,
-    `time_field` varchar(128) not null default '@timestamp',
-    `allow_hide_system_indices` tinyint(1) not null default 0,
-    `fields_format` varchar(4096) not null default '',
-    `create_at` bigint default '0',
-    `create_by` varchar(64) default '',
-    `update_at` bigint default '0',
-    `update_by` varchar(64) default '',
-    PRIMARY KEY (`id`),
-    UNIQUE KEY (`datasource_id`, `name`)
 ) ENGINE = InnoDB DEFAULT CHARSET = utf8mb4;
--- a/docker/initsql/b-ibex.sql
+++ b/docker/initsql/b-ibex.sql
@@ -6,18 +6,17 @@ use ibex;

 CREATE TABLE `task_meta`
 (
-    `id`          bigint unsigned NOT NULL AUTO_INCREMENT,
-    `title`       varchar(255)    not null default '',
-    `account`     varchar(64)     not null,
-    `batch`       int unsigned    not null default 0,
-    `tolerance`   int unsigned    not null default 0,
-    `timeout`     int unsigned    not null default 0,
-    `pause`       varchar(255)    not null default '',
-    `script`      text            not null,
-    `args`        varchar(512)    not null default '',
-    `stdin`       varchar(1024)   not null default '',
-    `creator`     varchar(64)     not null default '',
-    `created`     timestamp       not null default CURRENT_TIMESTAMP,
+    `id`        bigint unsigned NOT NULL AUTO_INCREMENT,
+    `title`     varchar(255)    not null default '',
+    `account`   varchar(64)     not null,
+    `batch`     int unsigned    not null default 0,
+    `tolerance` int unsigned    not null default 0,
+    `timeout`   int unsigned    not null default 0,
+    `pause`     varchar(255)    not null default '',
+    `script`    text            not null,
+    `args`      varchar(512)    not null default '',
+    `creator`   varchar(64)     not null default '',
+    `created`   timestamp       not null default CURRENT_TIMESTAMP,
    PRIMARY KEY (`id`),
    KEY (`creator`),
    KEY (`created`)
--- a/dumper/dumper.go
+++ b/dumper/dumper.go
@@ -1,8 +0,0 @@
-package dumper
-
-import "github.com/gin-gonic/gin"
-
-// package level functions
-func ConfigRouter(r *gin.Engine) {
-	syncDumper.ConfigRouter(r)
-}
--- a/dumper/sync.go
+++ b/dumper/sync.go
@@ -1,110 +0,0 @@
-package dumper
-
-import (
-	"fmt"
-	"strings"
-	"sync"
-
-	"github.com/gin-gonic/gin"
-	"github.com/toolkits/pkg/time"
-)
-
-type SyncRecord struct {
-	Timestamp int64
-	Mills     int64
-	Count     int
-	Message   string
-}
-
-func (sr *SyncRecord) String() string {
-	var sb strings.Builder
-	sb.WriteString("timestamp: ")
-	sb.WriteString(time.Format(sr.Timestamp))
-	sb.WriteString(", mills: ")
-	sb.WriteString(fmt.Sprint(sr.Mills, "ms"))
-	sb.WriteString(", count: ")
-	sb.WriteString(fmt.Sprint(sr.Count))
-	sb.WriteString(", message: ")
-	sb.WriteString(sr.Message)
-
-	return sb.String()
-}
-
-type SyncRecords struct {
-	Current *SyncRecord
-	Last    *SyncRecord
-}
-
-type SyncDumper struct {
-	sync.RWMutex
-	records map[string]*SyncRecords
-}
-
-func NewSyncDumper() *SyncDumper {
-	return &SyncDumper{
-		records: make(map[string]*SyncRecords),
-	}
-}
-
-var syncDumper = NewSyncDumper()
-
-func (sd *SyncDumper) Put(key string, timestamp, mills int64, count int, message string) {
-	sr := &SyncRecord{
-		Timestamp: timestamp,
-		Mills:     mills,
-		Count:     count,
-		Message:   message,
-	}
-
-	sd.Lock()
-	defer sd.Unlock()
-
-	if _, ok := sd.records[key]; !ok {
-		sd.records[key] = &SyncRecords{Current: sr}
-		return
-	}
-
-	sd.records[key].Last = sd.records[key].Current
-	sd.records[key].Current = sr
-}
-
-// busi_groups:
-// last: timestamp, mills, count
-// curr: timestamp, mills, count
-func (sd *SyncDumper) Sprint() string {
-	sd.RLock()
-	defer sd.RUnlock()
-
-	var sb strings.Builder
-	sb.WriteString("\n")
-
-	for k, v := range sd.records {
-		sb.WriteString(k)
-		sb.WriteString(":\n")
-		if v.Last != nil {
-			sb.WriteString("last: ")
-			sb.WriteString(v.Last.String())
-			sb.WriteString("\n")
-		}
-		sb.WriteString("curr: ")
-		sb.WriteString(v.Current.String())
-		sb.WriteString("\n\n")
-	}
-
-	return sb.String()
-}
-
-func (sd *SyncDumper) ConfigRouter(r *gin.Engine) {
-	r.GET("/dumper/sync", func(c *gin.Context) {
-		clientIP := c.ClientIP()
-		if clientIP != "127.0.0.1" && clientIP != "::1" {
-			c.String(403, "forbidden")
-			return
-		}
-		c.String(200, sd.Sprint())
-	})
-}
-
-func PutSyncRecord(key string, timestamp, mills int64, count int, message string) {
-	syncDumper.Put(key, timestamp, mills, count, message)
-}
--- a/etc/alert.toml.example
+++ b/etc/alert.toml.example
@@ -0,0 +1,60 @@
+[Global]
+RunMode = "release"
+
+[CenterApi]
+Addrs = ["http://127.0.0.1:17000"]
+[CenterApi.BasicAuth]
+user001 = "ccc26da7b9aba533cbb263a36c07dcc5"
+
+[Alert]
+[Alert.Heartbeat]
+# auto detect if blank
+IP = ""
+# unit ms
+Interval = 1000
+EngineName = "default02"
+
+[Log]
+# log write dir
+Dir = "logs"
+# log level: DEBUG INFO WARNING ERROR
+Level = "DEBUG"
+# stdout, stderr, file
+Output = "stdout"
+# # rotate by time
+# KeepHours = 4
+# # rotate by size
+# RotateNum = 3
+# # unit: MB
+# RotateSize = 256
+
+[HTTP]
+# http listening address
+Host = "0.0.0.0"
+# http listening port
+Port = 17001
+# https cert file path
+CertFile = ""
+# https key file path
+KeyFile = ""
+# whether print access log
+PrintAccessLog = false
+# whether enable pprof
+PProf = false
+# expose prometheus /metrics?
+ExposeMetrics = true
+# http graceful shutdown timeout, unit: s
+ShutdownTimeout = 30
+# max content length: 64M
+MaxContentLength = 67108864
+# http server read timeout, unit: s
+ReadTimeout = 20
+# http server write timeout, unit: s
+WriteTimeout = 40
+# http server idle timeout, unit: s
+IdleTimeout = 120
+
+[HTTP.Alert]
+Enable = true 
+[HTTP.Alert.BasicAuth]
+user001 = "ccc26da7b9aba533cbb263a36c07dcc5"
--- a/etc/config.toml
+++ b/etc/config.toml
@@ -41,17 +41,14 @@ WriteTimeout = 40
 # http server idle timeout, unit: s
 IdleTimeout = 120

-[HTTP.ShowCaptcha]
-Enable = false 
-
 [HTTP.APIForAgent]
 Enable = true 
-# [HTTP.APIForAgent.BasicAuth]
+# [HTTP.Pushgw.BasicAuth]
 # user001 = "ccc26da7b9aba533cbb263a36c07dcc5"

 [HTTP.APIForService]
 Enable = true 
-[HTTP.APIForService.BasicAuth]
+[HTTP.Service.BasicAuth]
 user001 = "ccc26da7b9aba533cbb263a36c07dcc5"

 [HTTP.JWTAuth]
@@ -70,16 +67,6 @@ Enable = false
 HeaderUserNameKey = "X-User-Name"
 DefaultRoles = ["Standard"]

-[HTTP.RSA]
-# open RSA
-OpenRSA = false
-# RSA public key
-RSAPublicKeyPath = "/etc/n9e/public.pem"
-# RSA private key
-RSAPrivateKeyPath = "/etc/n9e/private.pem"
-# RSA private key password
-RSAPassWord = ""
-
 [DB]
 # postgres: host=%s port=%s user=%s dbname=%s password=%s sslmode=%s
 DSN="root:1234@tcp(127.0.0.1:3306)/n9e_v6?charset=utf8mb4&parseTime=True&loc=Local&allowNativePasswords=true"
@@ -144,8 +131,12 @@ LabelRewrite = true
 # __name__ = "xx"

 # [Pushgw.WriterOpt]
+# # Writer Options
+# QueueCount = 1000
 # QueueMaxSize = 1000000
 # QueuePopSize = 1000
+# # ident or metric
+# ShardingKey = "ident"

 [[Pushgw.Writers]] 
 # Url = "http://127.0.0.1:8480/insert/0/prometheus/api/v1/write"
--- a/etc/metrics.yaml
+++ b/etc/metrics.yaml
@@ -40,14 +40,14 @@ zh:
  kernel_processes_forked: fork的进程数

  mem_active: 活跃使用的内存总数(包括cache和buffer内存)
-  mem_available: 可用内存大小(bytes)
+  mem_available: 应用程序可用内存数
  mem_available_percent: 内存剩余百分比(0~100)
  mem_buffered: 用来给文件做缓冲大小
  mem_cached: 被高速缓冲存储器（cache memory）用的内存的大小（等于 diskcache minus SwapCache ）
  mem_commit_limit: 根据超额分配比率（'vm.overcommit_ratio'），这是当前在系统上分配可用的内存总量，这个限制只是在模式2('vm.overcommit_memory')时启用
  mem_committed_as: 目前在系统上分配的内存量。是所有进程申请的内存的总和
  mem_dirty: 等待被写回到磁盘的内存大小
-  mem_free: 空闲内存大小(bytes)
+  mem_free: 空闲内存数
  mem_high_free: 未被使用的高位内存大小
  mem_high_total: 高位内存总大小（Highmem是指所有内存高于860MB的物理内存,Highmem区域供用户程序使用，或用于页面缓存。该区域不是直接映射到内核空间。内核必须使用不同的手法使用该段内存）
  mem_huge_page_size: 每个大页的大小
--- a/etc/ops.yaml
+++ b/etc/ops.yaml
@@ -107,5 +107,4 @@ ops:
  - "/help/source"
  - "/help/sso"
  - "/help/notification-tpls"
-  - "/help/notification-settings"
-  - "/help/migrate"
+  - "/help/notification-settings"
--- a/etc/pushgw.toml.example
+++ b/etc/pushgw.toml.example
@@ -3,72 +3,9 @@ RunMode = "release"

 [CenterApi]
 Addrs = ["http://127.0.0.1:17000"]
-BasicAuthUser = "user001"
-BasicAuthPass = "ccc26da7b9aba533cbb263a36c07dcc5"
-# unit: ms
-Timeout = 9000
-
-[Log]
-# log write dir
-Dir = "logs"
-# log level: DEBUG INFO WARNING ERROR
-Level = "DEBUG"
-# stdout, stderr, file
-Output = "stdout"
-# # rotate by time
-# KeepHours = 4
-# # rotate by size
-# RotateNum = 3
-# # unit: MB
-# RotateSize = 256
-
-[HTTP]
-# http listening address
-Host = "0.0.0.0"
-# http listening port
-Port = 19000
-# https cert file path
-CertFile = ""
-# https key file path
-KeyFile = ""
-# whether print access log
-PrintAccessLog = false
-# whether enable pprof
-PProf = false
-# expose prometheus /metrics?
-ExposeMetrics = true
-# http graceful shutdown timeout, unit: s
-ShutdownTimeout = 30
-# max content length: 64M
-MaxContentLength = 67108864
-# http server read timeout, unit: s
-ReadTimeout = 20
-# http server write timeout, unit: s
-WriteTimeout = 40
-# http server idle timeout, unit: s
-IdleTimeout = 120
-
-[HTTP.APIForAgent]
-Enable = true 
-# [HTTP.APIForAgent.BasicAuth]
-# user001 = "ccc26da7b9aba533cbb263a36c07dcc5"
-
-[HTTP.APIForService]
-Enable = true 
-[HTTP.APIForService.BasicAuth]
+[CenterApi.BasicAuth]
 user001 = "ccc26da7b9aba533cbb263a36c07dcc5"

-[Alert]
-[Alert.Heartbeat]
-# auto detect if blank
-IP = ""
-# unit ms
-Interval = 1000
-EngineName = "edge"
-
-# [Alert.Alerting]
-# NotifyConcurrency = 10
-
 [Pushgw]
 # use target labels in database instead of in series
 LabelRewrite = true
@@ -81,8 +18,12 @@ LabelRewrite = true
 # __name__ = "xx"

 # [Pushgw.WriterOpt]
+# # Writer Options
+# QueueCount = 1000
 # QueueMaxSize = 1000000
 # QueuePopSize = 1000
+# # ident or metric
+# ShardingKey = "ident"

 [[Pushgw.Writers]] 
 # Url = "http://127.0.0.1:8480/insert/0/prometheus/api/v1/write"
@@ -115,3 +56,48 @@ MaxIdleConnsPerHost = 100
 # Regex = "([^:]+)(?::\\d+)?"
 # Replacement = "$1:80"
 # TargetLabel = "__address__"
+
+[Log]
+# log write dir
+Dir = "logs"
+# log level: DEBUG INFO WARNING ERROR
+Level = "DEBUG"
+# stdout, stderr, file
+Output = "stdout"
+# # rotate by time
+# KeepHours = 4
+# # rotate by size
+# RotateNum = 3
+# # unit: MB
+# RotateSize = 256
+
+[HTTP]
+# http listening address
+Host = "0.0.0.0"
+# http listening port
+Port = 17000
+# https cert file path
+CertFile = ""
+# https key file path
+KeyFile = ""
+# whether print access log
+PrintAccessLog = false
+# whether enable pprof
+PProf = false
+# expose prometheus /metrics?
+ExposeMetrics = true
+# http graceful shutdown timeout, unit: s
+ShutdownTimeout = 30
+# max content length: 64M
+MaxContentLength = 67108864
+# http server read timeout, unit: s
+ReadTimeout = 20
+# http server write timeout, unit: s
+WriteTimeout = 40
+# http server idle timeout, unit: s
+IdleTimeout = 120
+
+[HTTP.Pushgw]
+Enable = true 
+# [HTTP.Pushgw.BasicAuth]
+# user001 = "ccc26da7b9aba533cbb263a36c07dcc5"
--- a/etc/template/README.md
+++ b/etc/template/README.md
@@ -0,0 +1,26 @@
+# 告警消息模版文件
+
+模版中可以使用的变量参考`AlertCurEvent`对象
+模版语法如何使用可以参考[html/template](https://pkg.go.dev/html/template)
+
+## 如何在告警模版中添加监控详情url
+
+假设web的地址是http://127.0.0.1:18000/, 实际使用时用web地址替换该地址
+
+在监控模版中添加以下行:
+
+* dingtalk / wecom / feishu
+```markdown
+[监控详情](http://127.0.0.1:18000/metric/explorer?promql={{ .PromQl | escape }})
+```
+
+* mailbody
+
+```html
+<tr>
+  <th>监控详情：</th>
+  <td>
+    <a href="http://127.0.0.1:18000/metric/explorer?promql={{ .PromQl | escape }}" target="_blank">点击查看</a>
+  </td>
+</tr>
+```
--- a/etc/template/dingtalk.tpl
+++ b/etc/template/dingtalk.tpl
@@ -0,0 +1,11 @@
+#### {{if .IsRecovered}}<font color="#008800">S{{.Severity}} - Recovered - {{.RuleName}}</font>{{else}}<font color="#FF0000">S{{.Severity}} - Triggered - {{.RuleName}}</font>{{end}}
+
+---
+
+- **规则标题**: {{.RuleName}}{{if .RuleNote}}
+- **规则备注**: {{.RuleNote}}{{end}}
+{{if not .IsRecovered}}- **触发时值**: {{.TriggerValue}}{{end}}
+{{if .TargetIdent}}- **监控对象**: {{.TargetIdent}}{{end}}
+- **监控指标**: {{.TagsJSON}}
+- {{if .IsRecovered}}**恢复时间**: {{timeformat .LastEvalTime}}{{else}}**触发时间**: {{timeformat .TriggerTime}}{{end}}
+- **发送时间**: {{timestamp}}
--- a/etc/template/email.tpl
+++ b/etc/template/email.tpl
@@ -0,0 +1,217 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta http-equiv="X-UA-Compatible" content="ie=edge">
+    <title>夜莺告警通知</title>
+    <style type="text/css">
+        .wrapper {
+            background-color: #f8f8f8;
+            padding: 15px;
+            height: 100%;
+        }
+        .main {
+            width: 600px;
+            padding: 30px;
+            margin: 0 auto;
+            background-color: #fff;
+            font-size: 12px;
+            font-family: verdana,'Microsoft YaHei',Consolas,'Deja Vu Sans Mono','Bitstream Vera Sans Mono';
+        }
+        header {
+            border-radius: 2px 2px 0 0;
+        }
+        header .title {
+            font-size: 14px;
+            color: #333333;
+            margin: 0;
+        }
+        header .sub-desc {
+            color: #333;
+            font-size: 14px;
+            margin-top: 6px;
+            margin-bottom: 0;
+        }
+        hr {
+            margin: 20px 0;
+            height: 0;
+            border: none;
+            border-top: 1px solid #e5e5e5;
+        }
+        em {
+            font-weight: 600;
+        }
+        table {
+            margin: 20px 0;
+            width: 100%;
+        }
+
+        table tbody tr{
+            font-weight: 200;
+            font-size: 12px;
+            color: #666;
+            height: 32px;
+        }
+
+        .succ {
+            background-color: green;
+            color: #fff;
+        }
+
+        .fail {
+            background-color: red;
+            color: #fff;
+        }
+
+        .succ th, .succ td, .fail th, .fail td {
+            color: #fff;
+        }
+
+        table tbody tr th {
+            width: 80px;
+            text-align: right;
+        }
+        .text-right {
+            text-align: right;
+        }
+        .body {
+            margin-top: 24px;
+        }
+        .body-text {
+            color: #666666;
+            -webkit-font-smoothing: antialiased;
+        }
+        .body-extra {
+            -webkit-font-smoothing: antialiased;
+        }
+        .body-extra.text-right a {
+            text-decoration: none;
+            color: #333;
+        }
+        .body-extra.text-right a:hover {
+            color: #666;
+        }
+        .button {
+            width: 200px;
+            height: 50px;
+            margin-top: 20px;
+            text-align: center;
+            border-radius: 2px;
+            background: #2D77EE;
+            line-height: 50px;
+            font-size: 20px;
+            color: #FFFFFF;
+            cursor: pointer;
+        }
+        .button:hover {
+            background: rgb(25, 115, 255);
+            border-color: rgb(25, 115, 255);
+            color: #fff;
+        }
+        footer {
+            margin-top: 10px;
+            text-align: right;
+        }
+        .footer-logo {
+            text-align: right;
+        }
+        .footer-logo-image {
+            width: 108px;
+            height: 27px;
+            margin-right: 10px;
+        }
+        .copyright {
+            margin-top: 10px;
+            font-size: 12px;
+            text-align: right;
+            color: #999;
+            -webkit-font-smoothing: antialiased;
+        }
+    </style>
+</head>
+<body>
+<div class="wrapper">
+    <div class="main">
+        <header>
+            <h3 class="title">{{.RuleName}}</h3>
+            <p class="sub-desc"></p>
+        </header>
+
+        <hr>
+
+        <div class="body">
+            <table cellspacing="0" cellpadding="0" border="0">
+                <tbody>
+                {{if .IsRecovered}}
+                <tr class="succ">
+                    <th>级别状态：</th>
+                    <td>S{{.Severity}} Recovered</td>
+                </tr>
+                {{else}}
+                <tr class="fail">
+                    <th>级别状态：</th>
+                    <td>S{{.Severity}} Triggered</td>
+                </tr>
+                {{end}}
+
+                <tr>
+                    <th>策略备注：</th>
+                    <td>{{.RuleNote}}</td>
+                </tr>
+                <tr>
+                    <th>设备备注：</th>
+                    <td>{{.TargetNote}}</td>
+                </tr>
+                {{if not .IsRecovered}}
+                <tr>
+                    <th>触发时值：</th>
+                    <td>{{.TriggerValue}}</td>
+                </tr>
+                {{end}}
+
+                {{if .TargetIdent}}
+                <tr>
+                    <th>监控对象：</th>
+                    <td>{{.TargetIdent}}</td>
+                </tr>
+                {{end}}
+                <tr>
+                    <th>监控指标：</th>
+                    <td>{{.TagsJSON}}</td>
+                </tr>
+
+                {{if .IsRecovered}}
+                <tr>
+                    <th>恢复时间：</th>
+                    <td>{{timeformat .LastEvalTime}}</td>
+                </tr>
+                {{else}}
+                <tr>
+                    <th>触发时间：</th>
+                    <td>
+                        {{timeformat .TriggerTime}}
+                    </td>
+                </tr>
+                {{end}}
+
+                <tr>
+                    <th>发送时间：</th>
+                    <td>
+                        {{timestamp}}
+                    </td>
+                </tr>
+                </tbody>
+            </table>
+
+            <hr>
+
+            <footer>
+                <div class="copyright" style="font-style: italic">
+                    我们希望与您一起，将监控这个事情，做到极致！
+                </div>
+            </footer>
+        </div>
+    </div>
+</div>
+</body>
+</html>
--- a/etc/template/feishu.tpl
+++ b/etc/template/feishu.tpl
@@ -0,0 +1,7 @@
+级别状态: S{{.Severity}} {{if .IsRecovered}}Recovered{{else}}Triggered{{end}}
+规则名称: {{.RuleName}}{{if .RuleNote}}
+规则备注: {{.RuleNote}}{{end}}
+监控指标: {{.TagsJSON}}
+{{if .IsRecovered}}恢复时间：{{timeformat .LastEvalTime}}{{else}}触发时间: {{timeformat .TriggerTime}}
+触发时值: {{.TriggerValue}}{{end}}
+发送时间: {{timestamp}}
--- a/etc/template/mailsubject.tpl
+++ b/etc/template/mailsubject.tpl
@@ -0,0 +1 @@
+{{if .IsRecovered}}Recovered{{else}}Triggered{{end}}: {{.RuleName}} {{.TagsJSON}}
--- a/etc/template/mm.tpl
+++ b/etc/template/mm.tpl
@@ -0,0 +1,7 @@
+级别状态: S{{.Severity}} {{if .IsRecovered}}Recovered{{else}}Triggered{{end}}
+规则名称: {{.RuleName}}{{if .RuleNote}}
+规则备注: {{.RuleNote}}{{end}}
+监控指标: {{.TagsJSON}}
+{{if .IsRecovered}}恢复时间：{{timeformat .LastEvalTime}}{{else}}触发时间: {{timeformat .TriggerTime}}
+触发时值: {{.TriggerValue}}{{end}}
+发送时间: {{timestamp}}
--- a/etc/template/telegram.tpl
+++ b/etc/template/telegram.tpl
@@ -0,0 +1,9 @@
+**级别状态**: {{if .IsRecovered}}<font color="info">S{{.Severity}} Recovered</font>{{else}}<font color="warning">S{{.Severity}} Triggered</font>{{end}}
+**规则标题**: {{.RuleName}}{{if .RuleNote}}
+**规则备注**: {{.RuleNote}}{{end}}{{if .TargetIdent}}
+**监控对象**: {{.TargetIdent}}{{end}}
+**监控指标**: {{.TagsJSON}}{{if not .IsRecovered}}
+**触发时值**: {{.TriggerValue}}{{end}}
+{{if .IsRecovered}}**恢复时间**: {{timeformat .LastEvalTime}}{{else}}**首次触发时间**: {{timeformat .FirstTriggerTime}}{{end}}
+{{$time_duration := sub now.Unix .FirstTriggerTime }}{{if .IsRecovered}}{{$time_duration = sub .LastEvalTime .FirstTriggerTime }}{{end}}**持续时长**: {{humanizeDurationInterface $time_duration}}
+**发送时间**: {{timestamp}}
--- a/etc/template/wecom.tpl
+++ b/etc/template/wecom.tpl
@@ -0,0 +1,9 @@
+**级别状态**: {{if .IsRecovered}}<font color="info">S{{.Severity}} Recovered</font>{{else}}<font color="warning">S{{.Severity}} Triggered</font>{{end}}
+**规则标题**: {{.RuleName}}{{if .RuleNote}}
+**规则备注**: {{.RuleNote}}{{end}}{{if .TargetIdent}}
+**监控对象**: {{.TargetIdent}}{{end}}
+**监控指标**: {{.TagsJSON}}{{if not .IsRecovered}}
+**触发时值**: {{.TriggerValue}}{{end}}
+{{if .IsRecovered}}**恢复时间**: {{timeformat .LastEvalTime}}{{else}}**首次触发时间**: {{timeformat .FirstTriggerTime}}{{end}}
+{{$time_duration := sub now.Unix .FirstTriggerTime }}{{if .IsRecovered}}{{$time_duration = sub .LastEvalTime .FirstTriggerTime }}{{end}}**持续时长**: {{humanizeDurationInterface $time_duration}}
+**发送时间**: {{timestamp}}
--- a/fe.sh
+++ b/fe.sh
@@ -1,26 +1,17 @@
 #!/bin/bash

-cp -f ./docker/initsql/a-n9e.sql n9e.sql
+TAG=$(curl -sX GET https://api.github.com/repos/n9e/fe/releases/latest   | awk '/tag_name/{print $4;exit}' FS='[""]')
+VERSION=$(echo $TAG)

-if [ ! -d "./pub" ]; then
-    TAG=$(curl -sX GET https://api.github.com/repos/n9e/fe/releases/latest   | awk '/tag_name/{print $4;exit}' FS='[""]')
+curl -o n9e-fe-${VERSION}.tar.gz -L https://github.com/n9e/fe/releases/download/${TAG}/n9e-fe-${VERSION}.tar.gz  

-    if ! curl -o n9e-fe-${TAG}.tar.gz -L https://github.com/n9e/fe/releases/download/${TAG}/n9e-fe-${TAG}.tar.gz; then
-        echo "failed to download n9e-fe-${TAG}.tar.gz!"
-        exit 1
-    fi
+tar zxvf n9e-fe-${VERSION}.tar.gz

-    if ! tar zxf n9e-fe-${TAG}.tar.gz; then
-        echo "failed to untar n9e-fe-${TAG}.tar.gz!"
-        exit 2
-    fi
-fi
+cp ./docker/initsql/a-n9e.sql n9e.sql

-GOPATH=$(go env GOPATH)
-GOPATH=${GOPATH:-/home/runner/go}
+# Embed files into a Go executable
+statik -src=./pub -dest=./front

-# Embed files into a go binary
-if ! $GOPATH/bin/statik -src=./pub -dest=./front; then
-    echo "failed to embed files into a go binary!"
-    exit 4
-fi
+# rm the fe file
+rm n9e-fe-${VERSION}.tar.gz
+rm -r ./pub
--- a/go.mod
+++ b/go.mod
@@ -7,20 +7,18 @@ require (
 	github.com/coreos/go-oidc v2.2.1+incompatible
 	github.com/dgrijalva/jwt-go v3.2.0+incompatible
 	github.com/gin-contrib/pprof v1.4.0
-	github.com/gin-gonic/gin v1.9.1
+	github.com/gin-gonic/gin v1.9.0
 	github.com/go-ldap/ldap/v3 v3.4.4
 	github.com/gogo/protobuf v1.3.2
 	github.com/golang-jwt/jwt v3.2.2+incompatible
 	github.com/golang/protobuf v1.5.2
 	github.com/golang/snappy v0.0.4
 	github.com/google/uuid v1.3.0
-	github.com/hashicorp/go-version v1.6.0
 	github.com/json-iterator/go v1.1.12
 	github.com/koding/multiconfig v0.0.0-20171124222453-69c27309b2d7
 	github.com/mailru/easyjson v0.7.7
-	github.com/mattn/go-isatty v0.0.19
-	github.com/mojocn/base64Captcha v1.3.5
-	github.com/pelletier/go-toml/v2 v2.0.8
+	github.com/mattn/go-isatty v0.0.17
+	github.com/pelletier/go-toml/v2 v2.0.6
 	github.com/pkg/errors v0.9.1
 	github.com/prometheus/client_golang v1.14.0
 	github.com/prometheus/common v0.39.0
@@ -29,7 +27,7 @@ require (
 	github.com/redis/go-redis/v9 v9.0.2
 	github.com/tidwall/gjson v1.14.0
 	github.com/toolkits/pkg v1.3.3
-	golang.org/x/oauth2 v0.4.0
+	golang.org/x/oauth2 v0.3.0
 	gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df
 	gorm.io/driver/mysql v1.4.4
 	gorm.io/driver/postgres v1.4.5
@@ -39,21 +37,19 @@ require (
 require (
 	github.com/Azure/go-ntlmssp v0.0.0-20220621081337-cb9428e4ac1e // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
-	github.com/bytedance/sonic v1.9.1 // indirect
+	github.com/bytedance/sonic v1.8.0 // indirect
 	github.com/cespare/xxhash/v2 v2.2.0 // indirect
 	github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311 // indirect
 	github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
 	github.com/fatih/camelcase v1.0.0 // indirect
 	github.com/fatih/structs v1.1.0 // indirect
-	github.com/gabriel-vasile/mimetype v1.4.2 // indirect
 	github.com/gin-contrib/sse v0.1.0 // indirect
 	github.com/go-asn1-ber/asn1-ber v1.5.4 // indirect
 	github.com/go-playground/locales v0.14.1 // indirect
 	github.com/go-playground/universal-translator v0.18.1 // indirect
-	github.com/go-playground/validator/v10 v10.14.0 // indirect
+	github.com/go-playground/validator/v10 v10.11.2 // indirect
 	github.com/go-sql-driver/mysql v1.6.0 // indirect
-	github.com/goccy/go-json v0.10.2 // indirect
-	github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 // indirect
+	github.com/goccy/go-json v0.10.0 // indirect
 	github.com/grpc-ecosystem/grpc-gateway v1.16.0 // indirect
 	github.com/jackc/chunkreader/v2 v2.0.1 // indirect
 	github.com/jackc/pgconn v1.13.0 // indirect
@@ -66,8 +62,8 @@ require (
 	github.com/jinzhu/inflection v1.0.0 // indirect
 	github.com/jinzhu/now v1.1.5 // indirect
 	github.com/josharian/intern v1.0.0 // indirect
-	github.com/klauspost/cpuid/v2 v2.2.4 // indirect
-	github.com/leodido/go-urn v1.2.4 // indirect
+	github.com/klauspost/cpuid/v2 v2.0.9 // indirect
+	github.com/leodido/go-urn v1.2.1 // indirect
 	github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
@@ -78,18 +74,17 @@ require (
 	github.com/tidwall/match v1.1.1 // indirect
 	github.com/tidwall/pretty v1.2.0 // indirect
 	github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
-	github.com/ugorji/go/codec v1.2.11 // indirect
+	github.com/ugorji/go/codec v1.2.9 // indirect
 	go.uber.org/automaxprocs v1.4.0 // indirect
-	golang.org/x/arch v0.3.0 // indirect
-	golang.org/x/crypto v0.9.0 // indirect
-	golang.org/x/image v0.5.0 // indirect
-	golang.org/x/net v0.10.0 // indirect
-	golang.org/x/sys v0.8.0 // indirect
-	golang.org/x/text v0.9.0 // indirect
+	golang.org/x/arch v0.0.0-20210923205945-b76863e36670 // indirect
+	golang.org/x/crypto v0.5.0 // indirect
+	golang.org/x/net v0.7.0 // indirect
+	golang.org/x/sys v0.5.0 // indirect
+	golang.org/x/text v0.7.0 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
-	google.golang.org/genproto v0.0.0-20230110181048-76db0878b65f // indirect
-	google.golang.org/grpc v1.53.0 // indirect
-	google.golang.org/protobuf v1.30.0 // indirect
+	google.golang.org/genproto v0.0.0-20221227171554-f9683d7f8bef // indirect
+	google.golang.org/grpc v1.51.0 // indirect
+	google.golang.org/protobuf v1.28.1 // indirect
 	gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc // indirect
 	gopkg.in/square/go-jose.v2 v2.6.0 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
--- a/go.sum
+++ b/go.sum
@@ -12,8 +12,8 @@ github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6r
 github.com/bsm/ginkgo/v2 v2.5.0 h1:aOAnND1T40wEdAtkGSkvSICWeQ8L3UASX7YVCqQx+eQ=
 github.com/bsm/gomega v1.20.0 h1:JhAwLmtRzXFTx2AkALSLa8ijZafntmhSoU63Ok18Uq8=
 github.com/bytedance/sonic v1.5.0/go.mod h1:ED5hyg4y6t3/9Ku1R6dU/4KyJ48DZ4jPhfY1O2AihPM=
-github.com/bytedance/sonic v1.9.1 h1:6iJ6NqdoxCDr6mbY8h18oSO+cShGSMRGCEo7F2h0x8s=
-github.com/bytedance/sonic v1.9.1/go.mod h1:i736AoUSYt75HyZLoJW9ERYxcy6eaN6h4BZXU064P/U=
+github.com/bytedance/sonic v1.8.0 h1:ea0Xadu+sHlu7x5O3gKhRpQ1IKiMrSiHttPF0ybECuA=
+github.com/bytedance/sonic v1.8.0/go.mod h1:i736AoUSYt75HyZLoJW9ERYxcy6eaN6h4BZXU064P/U=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44=
 github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
@@ -45,8 +45,6 @@ github.com/fatih/camelcase v1.0.0 h1:hxNvNX/xYBp0ovncs8WyWZrOrpBNub/JfaMvbURyft8
 github.com/fatih/camelcase v1.0.0/go.mod h1:yN2Sb0lFhZJUdVvtELVWefmrXpuZESvPmqwoZc+/fpc=
 github.com/fatih/structs v1.1.0 h1:Q7juDM0QtcnhCpeyLGQKyg4TOIghuNXrkL32pHAUMxo=
 github.com/fatih/structs v1.1.0/go.mod h1:9NiDSp5zOcgEDl+j00MP/WkGVPOlPRLejGD8Ga6PJ7M=
-github.com/gabriel-vasile/mimetype v1.4.2 h1:w5qFW6JKBz9Y393Y4q372O9A7cUSequkh1Q7OhCmWKU=
-github.com/gabriel-vasile/mimetype v1.4.2/go.mod h1:zApsH/mKG4w07erKIaJPFiX0Tsq9BFQgN3qGY5GnNgA=
 github.com/garyburd/redigo v1.6.2/go.mod h1:NR3MbYisc3/PwhQ00EMzDiPmrwpPxAn5GI05/YaO1SY=
 github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
 github.com/gin-contrib/pprof v1.4.0 h1:XxiBSf5jWZ5i16lNOPbMTVdgHBdhfGRD5PZ1LWazzvg=
@@ -55,8 +53,8 @@ github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE
 github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI=
 github.com/gin-gonic/gin v1.7.7/go.mod h1:axIBovoeJpVj8S3BwE0uPMTeReE4+AfFtqpqaZ1qq1U=
 github.com/gin-gonic/gin v1.8.1/go.mod h1:ji8BvRH1azfM+SYow9zQ6SZMvR8qOMZHmsCuWR9tTTk=
-github.com/gin-gonic/gin v1.9.1 h1:4idEAncQnU5cB7BeOkPtxjfCSye0AAm1R0RVIqJ+Jmg=
-github.com/gin-gonic/gin v1.9.1/go.mod h1:hPrL7YrpYKXt5YId3A/Tnip5kqbEAP+KLuI3SUcPTeU=
+github.com/gin-gonic/gin v1.9.0 h1:OjyFBKICoexlu99ctXNR2gg+c5pKrKMuyjgARg9qeY8=
+github.com/gin-gonic/gin v1.9.0/go.mod h1:W1Me9+hsUSyj3CePGrd1/QrKJMSJ1Tu/0hFEH89961k=
 github.com/go-asn1-ber/asn1-ber v1.5.4 h1:vXT6d/FNDiELJnLb6hGNa309LMsrCoYFvpwHDF0+Y1A=
 github.com/go-asn1-ber/asn1-ber v1.5.4/go.mod h1:hEBeB/ic+5LoWskz+yKT7vGhhPYkProFKoKdwZRWMe0=
 github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY=
@@ -75,22 +73,20 @@ github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJn
 github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91TpwSH2VMlDf28Uj24BCp08ZFTUY=
 github.com/go-playground/validator/v10 v10.4.1/go.mod h1:nlOn6nFhuKACm19sB/8EGNn9GlaMV7XkbRSipzJ0Ii4=
 github.com/go-playground/validator/v10 v10.10.0/go.mod h1:74x4gJWsvQexRdW8Pn3dXSGrTK4nAUsbPlLADvpJkos=
-github.com/go-playground/validator/v10 v10.14.0 h1:vgvQWe3XCz3gIeFDm/HnTIbj6UGmg/+t63MyGU2n5js=
-github.com/go-playground/validator/v10 v10.14.0/go.mod h1:9iXMNT7sEkjXb0I+enO7QXmzG6QCsPWY4zveKFVRSyU=
+github.com/go-playground/validator/v10 v10.11.2 h1:q3SHpufmypg+erIExEKUmsgmhDTyhcJ38oeKGACXohU=
+github.com/go-playground/validator/v10 v10.11.2/go.mod h1:NieE624vt4SCTJtD87arVLvdmjPAeV8BQlHtMnw9D7s=
 github.com/go-sql-driver/mysql v1.6.0 h1:BCTh4TKNUYmOmMUcQ3IipzF5prigylS7XXjEkfCHuOE=
 github.com/go-sql-driver/mysql v1.6.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg=
 github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
 github.com/goccy/go-json v0.9.7/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I=
-github.com/goccy/go-json v0.10.2 h1:CrxCmQqYDkv1z7lO7Wbh2HN93uovUHgrECaO5ZrCXAU=
-github.com/goccy/go-json v0.10.2/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I=
+github.com/goccy/go-json v0.10.0 h1:mXKd9Qw4NuzShiRlOXKews24ufknHO7gx30lsDyokKA=
+github.com/goccy/go-json v0.10.0/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I=
 github.com/gofrs/uuid v4.0.0+incompatible h1:1SD/1F5pU8p29ybwgQSwpQk+mwdRrXCYuPhW6m+TnJw=
 github.com/gofrs/uuid v4.0.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM=
 github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
 github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
 github.com/golang-jwt/jwt v3.2.2+incompatible h1:IfV12K8xAKAnZqdXVzCZ+TOjboZ2keLg81eXfW3O+oY=
 github.com/golang-jwt/jwt v3.2.2+incompatible/go.mod h1:8pz2t5EyA70fFQQSrl6XZXzqecmYZeUEB8OUGHkxJ+I=
-github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 h1:DACJavvAHhabrF08vX0COfcOBJRhZ8lUbR+ZWIs0Y5g=
-github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0/go.mod h1:E/TSTwGwJL78qG/PmXZO1EjYhfJinVAhrmmHX6Z8B9k=
 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
 github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
 github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
@@ -106,7 +102,7 @@ github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEW
 github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
 github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
+github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg=
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
 github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
 github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
@@ -114,8 +110,6 @@ github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
 github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/grpc-ecosystem/grpc-gateway v1.16.0 h1:gmcG1KaJ57LophUzW0Hy8NmPhnMZb4M0+kPpLofRdBo=
 github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw=
-github.com/hashicorp/go-version v1.6.0 h1:feTTfFNnjP967rlCxM/I9g701jU+RN74YKx2mOkIeek=
-github.com/hashicorp/go-version v1.6.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA=
 github.com/jackc/chunkreader v1.0.0/go.mod h1:RT6O25fNZIuasFJRyZ4R/Y2BbhasbmZXF9QQ7T3kePo=
 github.com/jackc/chunkreader/v2 v2.0.0/go.mod h1:odVSm741yZoC3dpHEUXIqA9tQRhFrgOHwnPIn9lDKlk=
 github.com/jackc/chunkreader/v2 v2.0.1 h1:i+RDz65UE+mmpjTfyz0MoVTnzeYxroil2G82ki7MGG8=
@@ -175,9 +169,8 @@ github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnr
 github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
 github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
 github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
+github.com/klauspost/cpuid/v2 v2.0.9 h1:lgaqFMSdTdQYdZ04uHyN2d/eKdOMyi2YLSvlQIBFYa4=
 github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg=
-github.com/klauspost/cpuid/v2 v2.2.4 h1:acbojRNwl3o09bUq+yDCtZFc1aiwaAAxtcn8YkZXnvk=
-github.com/klauspost/cpuid/v2 v2.2.4/go.mod h1:RVVoqg1df56z8g3pUjL/3lE5UfnlrJX8tyFgg4nqhuY=
 github.com/koding/multiconfig v0.0.0-20171124222453-69c27309b2d7 h1:SWlt7BoQNASbhTUD0Oy5yysI2seJ7vWuGUp///OM4TM=
 github.com/koding/multiconfig v0.0.0-20171124222453-69c27309b2d7/go.mod h1:Y2SaZf2Rzd0pXkLVhLlCiAXFCLSXAIbTKDivVgff/AM=
 github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
@@ -192,9 +185,8 @@ github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
 github.com/leodido/go-urn v1.2.0/go.mod h1:+8+nEpDfqqsY+g338gtMEUOtuK+4dEMhiQEgxpxOKII=
+github.com/leodido/go-urn v1.2.1 h1:BqpAaACuzVSgi/VLzGZIobT2z4v53pjosyNd9Yv6n/w=
 github.com/leodido/go-urn v1.2.1/go.mod h1:zt4jvISO2HfUBqxjfIshjdMTYS56ZS/qv49ictyFfxY=
-github.com/leodido/go-urn v1.2.4 h1:XlAE/cm/ms7TE/VMVoduSpNBoyc2dOxHs5MZSwAN63Q=
-github.com/leodido/go-urn v1.2.4/go.mod h1:7ZrI8mTSeBSHl/UaRyKQW1qZeMgak41ANeCNaVckg+4=
 github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
 github.com/lib/pq v1.1.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
 github.com/lib/pq v1.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
@@ -208,8 +200,8 @@ github.com/mattn/go-isatty v0.0.5/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hd
 github.com/mattn/go-isatty v0.0.7/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
 github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
 github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94=
-github.com/mattn/go-isatty v0.0.19 h1:JITubQf0MOLdlGRuRq+jtsDlekdYPia9ZFsB8h/APPA=
-github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
+github.com/mattn/go-isatty v0.0.17 h1:BTarxUcIeDqL27Mc+vyvdWYSL28zpIhv3RoTdsLMPng=
+github.com/mattn/go-isatty v0.0.17/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
 github.com/matttproud/golang_protobuf_extensions v1.0.4 h1:mmDVorXM7PCGKw94cs5zkfA9PSy5pEvNWRP0ET0TIVo=
 github.com/matttproud/golang_protobuf_extensions v1.0.4/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4=
 github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
@@ -218,11 +210,9 @@ github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJ
 github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
 github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M=
 github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
-github.com/mojocn/base64Captcha v1.3.5 h1:Qeilr7Ta6eDtG4S+tQuZ5+hO+QHbiGAJdi4PfoagaA0=
-github.com/mojocn/base64Captcha v1.3.5/go.mod h1:/tTTXn4WTpX9CfrmipqRytCpJ27Uw3G6I7NcP2WwcmY=
 github.com/pelletier/go-toml/v2 v2.0.1/go.mod h1:r9LEWfGN8R5k0VXJ+0BkIe7MYkRdwZOjgMj2KwnJFUo=
-github.com/pelletier/go-toml/v2 v2.0.8 h1:0ctb6s9mE31h0/lhu+J6OPmVeDxJn+kYnJc2jZR9tGQ=
-github.com/pelletier/go-toml/v2 v2.0.8/go.mod h1:vuYfssBdrU2XDZ9bYydBu6t+6a6PYNcZljzZR9VXg+4=
+github.com/pelletier/go-toml/v2 v2.0.6 h1:nrzqCb7j9cDFj2coyLNLaZuJTLjWjlaz6nvTvIwycIU=
+github.com/pelletier/go-toml/v2 v2.0.6/go.mod h1:eumQOmlWiOPt5WriQQqoM5y18pDHwha2N+QD+EUNTek=
 github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA=
 github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
@@ -277,10 +267,8 @@ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/
 github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.2/go.mod h1:R6va5+xMeoiuVRoj+gSkQ7d3FALtqAAGI1FQKckRals=
 github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
+github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk=
 github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
-github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
-github.com/stretchr/testify v1.8.3 h1:RP3t2pwF7cMEbC1dqtB6poj3niw/9gnV4Cjg5oW5gtY=
-github.com/stretchr/testify v1.8.3/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
 github.com/tidwall/gjson v1.14.0 h1:6aeJ0bzojgWLa82gDQHcx3S0Lr/O51I9bJ5nv6JFx5w=
 github.com/tidwall/gjson v1.14.0/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=
 github.com/tidwall/match v1.1.1 h1:+Ho715JplO36QYgwN9PGYNhgZvoUSc9X2c80KVTi+GA=
@@ -295,8 +283,8 @@ github.com/ugorji/go v1.1.7/go.mod h1:kZn38zHttfInRq0xu/PH0az30d+z6vm202qpg1oXVM
 github.com/ugorji/go v1.2.7/go.mod h1:nF9osbDWLy6bDVv/Rtoh6QgnvNDpmCalQV5urGCCS6M=
 github.com/ugorji/go/codec v1.1.7/go.mod h1:Ax+UKWsSmolVDwsd+7N3ZtXu+yMGCf907BLYF3GoBXY=
 github.com/ugorji/go/codec v1.2.7/go.mod h1:WGN1fab3R1fzQlVQTkfxVtIBhWDRqOviHU95kRgeqEY=
-github.com/ugorji/go/codec v1.2.11 h1:BMaWp1Bb6fHwEtbplGBGJ498wD+LKlNSl25MjdZY4dU=
-github.com/ugorji/go/codec v1.2.11/go.mod h1:UNopzCgEMSXjBc6AOMqYvWC1ktqTAfzJZUZgYf6w6lg=
+github.com/ugorji/go/codec v1.2.9 h1:rmenucSohSTiyL09Y+l2OCk+FrMxGMzho2+tjr5ticU=
+github.com/ugorji/go/codec v1.2.9/go.mod h1:UNopzCgEMSXjBc6AOMqYvWC1ktqTAfzJZUZgYf6w6lg=
 github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
@@ -314,9 +302,8 @@ go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod h1:vJERXedbb3MVM5f9E
 go.uber.org/zap v1.9.1/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q=
 go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q=
 go.uber.org/zap v1.13.0/go.mod h1:zwrFLgMcdUuIBviXEYEH1YKNaOBnKXsx2IPda5bBwHM=
+golang.org/x/arch v0.0.0-20210923205945-b76863e36670 h1:18EFjUmQOcUvxNYSkA6jO9VAiXCnxFY6NyDX0bHDmkU=
 golang.org/x/arch v0.0.0-20210923205945-b76863e36670/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8=
-golang.org/x/arch v0.3.0 h1:02VY4/ZcO/gBOH6PUaoiptASxtXU10jazRCP865E97k=
-golang.org/x/arch v0.3.0/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20190411191339-88737f569e3a/go.mod h1:WFFai1msRO1wXaEeE5yQxYXgSfI8pQAWXbQop6sCtWE=
 golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
@@ -329,12 +316,9 @@ golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5y
 golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
 golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
-golang.org/x/crypto v0.9.0 h1:LF6fAI+IutBocDJ2OT0Q1g8plpYljMZ4+lty+dsqw3g=
-golang.org/x/crypto v0.9.0/go.mod h1:yrmDGqONDYtNj3tH8X9dzUun2m2lzPa9ngI6/RUPGR0=
+golang.org/x/crypto v0.5.0 h1:U/0M97KRkSFvyD/3FSmdP5W5swImpNgle/EHFhOsQPE=
+golang.org/x/crypto v0.5.0/go.mod h1:NK/OQwhpMQP3MwtdjgLlYHnH9ebylxKWv3e0fK+mkQU=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
-golang.org/x/image v0.0.0-20190501045829-6d32002ffd75/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
-golang.org/x/image v0.5.0 h1:5JMiNunQeQw++mMOz48/ISeNu3Iweh/JaZU8ZLqHRrI=
-golang.org/x/image v0.5.0/go.mod h1:FVC7BI/5Ym8R25iw5OLsgshdUBbT1h5jZTpA+mvAdZ4=
 golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
 golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
 golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
@@ -359,12 +343,12 @@ golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwY
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
-golang.org/x/net v0.10.0 h1:X2//UzNDwYmtCLn7To6G58Wr6f5ahEAQgKNzv9Y951M=
-golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
+golang.org/x/net v0.7.0 h1:rJrUqqhjsgNp7KqAIc25s9pZnjU7TUcSY7HcVZjdn1g=
+golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
-golang.org/x/oauth2 v0.4.0 h1:NF0gk8LVPg1Ml7SSbGyySuoxdsXitj7TvgvuRxIMc/M=
-golang.org/x/oauth2 v0.4.0/go.mod h1:RznEsdpjGAINPTOF0UH/t+xJ75L18YO3Ho6Pyn+uRec=
+golang.org/x/oauth2 v0.3.0 h1:6l90koy8/LaBLmLu8jpHeHexzMwEita0zFfYlggy2F8=
+golang.org/x/oauth2 v0.3.0/go.mod h1:rQrIauxkUhJ6CuwEXwymO2/eh4xz2ZWF1nBkcxS+tGk=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -391,11 +375,10 @@ golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210806184541-e5e7981a1069/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220704084225-05e143d24a9e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.8.0 h1:EBmGv8NaZBZTWvrbjNoL6HVt+IVy3QDQpJs7VRIw3tU=
-golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.5.0 h1:MUK/U/4lj1t1oPg0HfuXDN/Z1wv31ZJ/YcPiGccS4DU=
+golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
@@ -406,9 +389,8 @@ golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
 golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
+golang.org/x/text v0.7.0 h1:4BRB4x83lYWy72KwLD/qYDuTu7q9PjSagHvijDw7cLo=
 golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
-golang.org/x/text v0.9.0 h1:2sjJmO8cDvYveuX97RDLsxlyUxLl+GHoLxBiRdHllBE=
-golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
@@ -437,20 +419,20 @@ google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCID
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
 google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
 google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
-google.golang.org/genproto v0.0.0-20230110181048-76db0878b65f h1:BWUVssLB0HVOSY78gIdvk1dTVYtT1y8SBWtPYuTJ/6w=
-google.golang.org/genproto v0.0.0-20230110181048-76db0878b65f/go.mod h1:RGgjbofJ8xD9Sq1VVhDM1Vok1vRONV+rg+CjzG4SZKM=
+google.golang.org/genproto v0.0.0-20221227171554-f9683d7f8bef h1:uQ2vjV/sHTsWSqdKeLqmwitzgvjMl7o4IdtHwUDXSJY=
+google.golang.org/genproto v0.0.0-20221227171554-f9683d7f8bef/go.mod h1:RGgjbofJ8xD9Sq1VVhDM1Vok1vRONV+rg+CjzG4SZKM=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
 google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
 google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
 google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTpR3n0=
-google.golang.org/grpc v1.53.0 h1:LAv2ds7cmFV/XTS3XG1NneeENYrXGmorPxsBbptIjNc=
-google.golang.org/grpc v1.53.0/go.mod h1:OnIrk0ipVdj4N5d9IUoFUx72/VlD7+jUsHwZgwSMQpw=
+google.golang.org/grpc v1.51.0 h1:E1eGv1FTqoLIdnBCZufiSHgKjlqG6fKFf6pPWtMTh8U=
+google.golang.org/grpc v1.51.0/go.mod h1:wgNDFcnuBGmxLKI/qn4T+m5BtEBYXJPvibbUPsAIPww=
 google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
 google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
 google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
-google.golang.org/protobuf v1.30.0 h1:kPPoIgf3TsEvrm0PFe15JQ+570QVxYzEvvHqChK+cng=
-google.golang.org/protobuf v1.30.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
+google.golang.org/protobuf v1.28.1 h1:d0NfwRgPtno5B1Wa6L2DAG+KivqkdutMf1UhdNx175w=
+google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
 gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc h1:2gGKlE2+asNV9m7xrywl36YYNnBG5ZQ0r/BOOxqPpmk=
 gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc/go.mod h1:m7x9LTH6d71AHyAX77c9yqWCCa3UKHcVEj9y7hAtKDk=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
--- a/integrations/AliYun/alerts/alerts.json
+++ b/integrations/AliYun/alerts/alerts.json
--- a/integrations/AliYun/dashboards/ecs.json
+++ b/integrations/AliYun/dashboards/ecs.json
@@ -1,313 +0,0 @@
-{
-  "name": "阿里云ECS",
-  "tags": "",
-  "ident": "",
-  "configs": {
-    "var": [
-      {
-        "name": "ident",
-        "type": "query",
-        "datasource": {
-          "cate": "prometheus"
-        },
-        "definition": "label_values(aliyun_acs_ecs_dashboard_cpu_utilization_average,ident)",
-        "multi": true,
-        "allOption": true
-      }
-    ],
-    "panels": [
-      {
-        "type": "timeseries",
-        "id": "8606d5ad-c3c7-4b1d-86bf-474d3302ee17",
-        "layout": {
-          "h": 4,
-          "w": 12,
-          "x": 0,
-          "y": 0,
-          "i": "8606d5ad-c3c7-4b1d-86bf-474d3302ee17",
-          "isResizable": true
-        },
-        "version": "2.0.0",
-        "datasourceCate": "prometheus",
-        "datasourceName": "Default",
-        "targets": [
-          {
-            "refId": "A",
-            "expr": "sum(aliyun_acs_ecs_dashboard_cpu_utilization_average{ident=~\"$ident\"}) by (ident,instance_id)"
-          }
-        ],
-        "name": "CPU平均使用率",
-        "maxPerRow": 4,
-        "options": {
-          "tooltip": {
-            "mode": "all",
-            "sort": "none"
-          },
-          "legend": {
-            "displayMode": "hidden"
-          },
-          "standardOptions": {},
-          "thresholds": {
-            "steps": [
-              {
-                "color": "#634CD9",
-                "value": null,
-                "type": "base"
-              }
-            ]
-          }
-        },
-        "custom": {
-          "drawStyle": "lines",
-          "lineInterpolation": "smooth",
-          "spanNulls": false,
-          "lineWidth": 1,
-          "fillOpacity": 0.5,
-          "gradientMode": "none",
-          "stack": "off",
-          "scaleDistribution": {
-            "type": "linear"
-          }
-        }
-      },
-      {
-        "type": "timeseries",
-        "id": "c7034fe3-5521-4867-a8bd-429767cc03a2",
-        "layout": {
-          "h": 4,
-          "w": 12,
-          "x": 12,
-          "y": 0,
-          "i": "55404296-0bd9-409d-aeaf-e9c7cceea0dd",
-          "isResizable": true
-        },
-        "version": "2.0.0",
-        "datasourceCate": "prometheus",
-        "datasourceName": "Default",
-        "targets": [
-          {
-            "refId": "A",
-            "expr": "sum(aliyun_acs_ecs_dashboard_memory_usedutilization_average{ident=~\"$ident\"}) by (ident,instance_id)"
-          }
-        ],
-        "name": "内存平均使用率",
-        "maxPerRow": 4,
-        "options": {
-          "tooltip": {
-            "mode": "all",
-            "sort": "none"
-          },
-          "legend": {
-            "displayMode": "hidden"
-          },
-          "standardOptions": {},
-          "thresholds": {
-            "steps": [
-              {
-                "color": "#634CD9",
-                "value": null,
-                "type": "base"
-              }
-            ]
-          }
-        },
-        "custom": {
-          "drawStyle": "lines",
-          "lineInterpolation": "smooth",
-          "spanNulls": false,
-          "lineWidth": 1,
-          "fillOpacity": 0.5,
-          "gradientMode": "none",
-          "stack": "off",
-          "scaleDistribution": {
-            "type": "linear"
-          }
-        }
-      },
-      {
-        "type": "timeseries",
-        "id": "e4c11925-b359-4edb-9269-4bdd4d230224",
-        "layout": {
-          "h": 4,
-          "w": 12,
-          "x": 0,
-          "y": 4,
-          "i": "0c7b3a5a-ef12-4349-be9b-7a245bf01418",
-          "isResizable": true
-        },
-        "version": "2.0.0",
-        "datasourceCate": "prometheus",
-        "datasourceName": "Default",
-        "targets": [
-          {
-            "expr": "sum(aliyun_acs_ecs_dashboard_load_5m_average{ident=~\"$ident\"}) by (ident,instance_id)",
-            "refId": "B",
-            "legend": "{{ident}} {{instance_id}} 5分钟负载"
-          }
-        ],
-        "name": "系统负载[5m]",
-        "maxPerRow": 4,
-        "options": {
-          "tooltip": {
-            "mode": "all",
-            "sort": "none"
-          },
-          "legend": {
-            "displayMode": "hidden"
-          },
-          "standardOptions": {
-            "util": "percent"
-          },
-          "thresholds": {
-            "steps": [
-              {
-                "color": "#634CD9",
-                "value": null,
-                "type": "base"
-              }
-            ]
-          }
-        },
-        "custom": {
-          "drawStyle": "lines",
-          "lineInterpolation": "smooth",
-          "spanNulls": false,
-          "lineWidth": 1,
-          "fillOpacity": 0.5,
-          "gradientMode": "none",
-          "stack": "off",
-          "scaleDistribution": {
-            "type": "linear"
-          }
-        }
-      },
-      {
-        "type": "timeseries",
-        "id": "388d4da6-eb1f-48f1-955d-37579809dfec",
-        "layout": {
-          "h": 4,
-          "w": 12,
-          "x": 12,
-          "y": 5,
-          "i": "5abea3d2-ea82-4bdb-a4f0-4dd1316c0377",
-          "isResizable": true
-        },
-        "version": "2.0.0",
-        "datasourceCate": "prometheus",
-        "datasourceName": "Default",
-        "targets": [
-          {
-            "refId": "A",
-            "expr": "sum(aliyun_acs_ecs_dashboard_diskusage_utilization_average{ident=~\"$ident\"}) by (ident,instance_id)"
-          }
-        ],
-        "name": "磁盘平均使用率",
-        "maxPerRow": 4,
-        "options": {
-          "tooltip": {
-            "mode": "all",
-            "sort": "none"
-          },
-          "legend": {
-            "displayMode": "hidden"
-          },
-          "standardOptions": {
-            "util": "percent"
-          },
-          "thresholds": {
-            "steps": [
-              {
-                "color": "#634CD9",
-                "value": null,
-                "type": "base"
-              }
-            ]
-          }
-        },
-        "custom": {
-          "drawStyle": "lines",
-          "lineInterpolation": "smooth",
-          "spanNulls": false,
-          "lineWidth": 1,
-          "fillOpacity": 0.5,
-          "gradientMode": "none",
-          "stack": "off",
-          "scaleDistribution": {
-            "type": "linear"
-          }
-        }
-      },
-      {
-        "type": "timeseries",
-        "id": "f8d19cc9-0168-4c13-b9a9-c7980eced974",
-        "layout": {
-          "x": 0,
-          "y": 9,
-          "w": 12,
-          "h": 4,
-          "i": "f8d19cc9-0168-4c13-b9a9-c7980eced974"
-        },
-        "version": "2.0.0",
-        "datasourceCate": "prometheus",
-        "targets": [
-          {
-            "refId": "A",
-            "expr": "sum(aliyun_acs_ecs_dashboard_intranet_in_average{ident=~\"$ident\"}) by (ident,instance_id)",
-            "legend": "主机：{{ident}} 实例ID: {{instance_id}} 入流量",
-            "step": 300,
-            "time": {
-              "start": "now-5m",
-              "end": "now"
-            }
-          },
-          {
-            "expr": "sum(aliyun_acs_ecs_dashboard_intranet_out_average{ident=~\"$ident\"}) by (ident,instance_id)",
-            "refId": "B",
-            "legend": "主机：{{ident}} 实例ID: {{instance_id}} 出流量",
-            "step": 300,
-            "time": {
-              "start": "now-5m",
-              "end": "now"
-            }
-          }
-        ],
-        "name": "网络流量",
-        "maxPerRow": 4,
-        "options": {
-          "tooltip": {
-            "mode": "all",
-            "sort": "none"
-          },
-          "legend": {
-            "displayMode": "hidden"
-          },
-          "standardOptions": {
-            "util": "bitsSI"
-          },
-          "thresholds": {
-            "steps": [
-              {
-                "color": "#634CD9",
-                "value": null,
-                "type": "base"
-              }
-            ]
-          }
-        },
-        "custom": {
-          "drawStyle": "lines",
-          "lineInterpolation": "smooth",
-          "spanNulls": false,
-          "lineWidth": 1,
-          "fillOpacity": 0.5,
-          "gradientMode": "none",
-          "stack": "off",
-          "scaleDistribution": {
-            "type": "linear"
-          }
-        }
-      }
-    ],
-    "version": "2.0.0"
-  }
-}
--- a/integrations/AliYun/dashboards/rds.json
+++ b/integrations/AliYun/dashboards/rds.json
@@ -1,313 +0,0 @@
-{
-  "name": "阿里云RDS",
-  "tags": "",
-  "ident": "",
-  "configs": {
-    "var": [
-      {
-        "name": "instance_id",
-        "type": "query",
-        "datasource": {
-          "cate": "prometheus"
-        },
-        "definition": "label_values(aliyun_acs_rds_dashboard_cpu_usage_average,instance_id)",
-        "multi": false
-      }
-    ],
-    "panels": [
-      {
-        "type": "timeseries",
-        "id": "01f4d444-aa2d-466d-9615-c76baf60a40c",
-        "layout": {
-          "h": 4,
-          "w": 12,
-          "x": 0,
-          "y": 0,
-          "i": "01f4d444-aa2d-466d-9615-c76baf60a40c",
-          "isResizable": true
-        },
-        "version": "2.0.0",
-        "datasourceCate": "prometheus",
-        "targets": [
-          {
-            "refId": "A",
-            "expr": "sum(aliyun_acs_rds_dashboard_cpu_usage_average{instance_id=\"$instance_id\"}) by (instance_id)",
-            "legend": ""
-          }
-        ],
-        "name": "CPU平均使用率",
-        "maxPerRow": 4,
-        "options": {
-          "tooltip": {
-            "mode": "all",
-            "sort": "none"
-          },
-          "legend": {
-            "displayMode": "hidden"
-          },
-          "standardOptions": {},
-          "thresholds": {
-            "steps": [
-              {
-                "color": "#634CD9",
-                "value": null,
-                "type": "base"
-              }
-            ]
-          }
-        },
-        "custom": {
-          "drawStyle": "lines",
-          "lineInterpolation": "smooth",
-          "spanNulls": false,
-          "lineWidth": 1,
-          "fillOpacity": 0.5,
-          "gradientMode": "none",
-          "stack": "off",
-          "scaleDistribution": {
-            "type": "linear"
-          }
-        }
-      },
-      {
-        "type": "timeseries",
-        "id": "c43eb882-915f-4c38-a0b5-8f33c21ab44a",
-        "layout": {
-          "h": 4,
-          "w": 12,
-          "x": 12,
-          "y": 0,
-          "i": "09903231-6557-42be-9cf3-2873878e9bf2",
-          "isResizable": true
-        },
-        "version": "2.0.0",
-        "datasourceCate": "prometheus",
-        "targets": [
-          {
-            "refId": "A",
-            "expr": "sum(aliyun_acs_rds_dashboard_memory_usage_average{instance_id=\"$instance_id\"}) by (instance_id)",
-            "legend": ""
-          }
-        ],
-        "name": "内存平均使用率",
-        "maxPerRow": 4,
-        "options": {
-          "tooltip": {
-            "mode": "all",
-            "sort": "none"
-          },
-          "legend": {
-            "displayMode": "hidden"
-          },
-          "standardOptions": {},
-          "thresholds": {
-            "steps": [
-              {
-                "color": "#634CD9",
-                "value": null,
-                "type": "base"
-              }
-            ]
-          }
-        },
-        "custom": {
-          "drawStyle": "lines",
-          "lineInterpolation": "smooth",
-          "spanNulls": false,
-          "lineWidth": 1,
-          "fillOpacity": 0.5,
-          "gradientMode": "none",
-          "stack": "off",
-          "scaleDistribution": {
-            "type": "linear"
-          }
-        }
-      },
-      {
-        "type": "timeseries",
-        "id": "37447883-ad79-46bc-888a-1be2835c1c64",
-        "layout": {
-          "h": 4,
-          "w": 12,
-          "x": 0,
-          "y": 4,
-          "i": "378a5a26-c28e-4612-af09-f82ec2e11d80",
-          "isResizable": true
-        },
-        "version": "2.0.0",
-        "datasourceCate": "prometheus",
-        "targets": [
-          {
-            "refId": "A",
-            "expr": "sum(aliyun_acs_rds_dashboard_disk_usage_average{instance_id=\"$instance_id\"}) by (instance_id)",
-            "legend": ""
-          }
-        ],
-        "name": "磁盘平均使用率",
-        "maxPerRow": 4,
-        "options": {
-          "tooltip": {
-            "mode": "all",
-            "sort": "none"
-          },
-          "legend": {
-            "displayMode": "hidden"
-          },
-          "standardOptions": {},
-          "thresholds": {
-            "steps": [
-              {
-                "color": "#634CD9",
-                "value": null,
-                "type": "base"
-              }
-            ]
-          }
-        },
-        "custom": {
-          "drawStyle": "lines",
-          "lineInterpolation": "smooth",
-          "spanNulls": false,
-          "lineWidth": 1,
-          "fillOpacity": 0.5,
-          "gradientMode": "none",
-          "stack": "off",
-          "scaleDistribution": {
-            "type": "linear"
-          }
-        }
-      },
-      {
-        "type": "timeseries",
-        "id": "c9735607-3f24-44a7-bbf1-3ad39441c5c9",
-        "layout": {
-          "h": 4,
-          "w": 12,
-          "x": 12,
-          "y": 4,
-          "i": "93a4c8a6-ac23-4e26-8a38-781ec1668820",
-          "isResizable": true
-        },
-        "version": "2.0.0",
-        "datasourceCate": "prometheus",
-        "targets": [
-          {
-            "refId": "A",
-            "expr": "sum(aliyun_acs_rds_dashboard_iops_usage_average{instance_id=\"$instance_id\"}) by (instance_id)",
-            "legend": ""
-          }
-        ],
-        "name": "IOPS平均使用率",
-        "maxPerRow": 4,
-        "options": {
-          "tooltip": {
-            "mode": "all",
-            "sort": "none"
-          },
-          "legend": {
-            "displayMode": "hidden"
-          },
-          "standardOptions": {},
-          "thresholds": {
-            "steps": [
-              {
-                "color": "#634CD9",
-                "value": null,
-                "type": "base"
-              }
-            ]
-          }
-        },
-        "custom": {
-          "drawStyle": "lines",
-          "lineInterpolation": "smooth",
-          "spanNulls": false,
-          "lineWidth": 1,
-          "fillOpacity": 0.5,
-          "gradientMode": "none",
-          "stack": "off",
-          "scaleDistribution": {
-            "type": "linear"
-          }
-        }
-      },
-      {
-        "type": "timeseries",
-        "id": "b516e7dc-8022-409d-b907-18c4143df891",
-        "layout": {
-          "h": 5,
-          "w": 24,
-          "x": 0,
-          "y": 8,
-          "i": "b516e7dc-8022-409d-b907-18c4143df891",
-          "isResizable": true
-        },
-        "version": "2.0.0",
-        "datasourceCate": "prometheus",
-        "targets": [
-          {
-            "refId": "A",
-            "expr": "sum(aliyun_acs_rds_dashboard_my_sql_com_delete_average{instance_id=\"$instance_id\"}) by (instance_id)",
-            "legend": "delete"
-          },
-          {
-            "expr": "sum(aliyun_acs_rds_dashboard_my_sql_com_insert_average{instance_id=\"$instance_id\"}) by (instance_id)",
-            "refId": "B",
-            "legend": "insert"
-          },
-          {
-            "expr": "sum(aliyun_acs_rds_dashboard_my_sql_com_insert_select_average{instance_id=\"$instance_id\"}) by (instance_id)",
-            "refId": "C",
-            "legend": "insert_select"
-          },
-          {
-            "expr": "sum(aliyun_acs_rds_dashboard_my_sql_com_update_average{instance_id=\"$instance_id\"}) by (instance_id)",
-            "refId": "D",
-            "legend": "update"
-          },
-          {
-            "expr": "sum(aliyun_acs_rds_dashboard_my_sql_com_select_average{instance_id=\"$instance_id\"}) by (instance_id)",
-            "refId": "E",
-            "legend": "select"
-          }
-        ],
-        "name": "SQL执行量",
-        "maxPerRow": 4,
-        "options": {
-          "tooltip": {
-            "mode": "all",
-            "sort": "none"
-          },
-          "legend": {
-            "displayMode": "hidden"
-          },
-          "standardOptions": {
-            "util": "percent"
-          },
-          "thresholds": {
-            "steps": [
-              {
-                "color": "#634CD9",
-                "value": null,
-                "type": "base"
-              }
-            ]
-          }
-        },
-        "custom": {
-          "drawStyle": "lines",
-          "lineInterpolation": "smooth",
-          "spanNulls": false,
-          "lineWidth": 1,
-          "fillOpacity": 0.5,
-          "gradientMode": "none",
-          "stack": "off",
-          "scaleDistribution": {
-            "type": "linear"
-          }
-        }
-      }
-    ],
-    "version": "2.0.0"
-  }
-}
--- a/integrations/AliYun/dashboards/redis.json
+++ b/integrations/AliYun/dashboards/redis.json
@@ -1,298 +0,0 @@
-{
-  "name": "阿里云REDIS",
-  "tags": "",
-  "ident": "",
-  "configs": {
-    "var": [
-      {
-        "name": "instance_id",
-        "type": "query",
-        "datasource": {
-          "cate": "prometheus"
-        },
-        "definition": "label_values(aliyun_acs_kvstore_cpu_usage_average,instance_id)",
-        "multi": false
-      }
-    ],
-    "panels": [
-      {
-        "type": "timeseries",
-        "id": "01f4d444-aa2d-466d-9615-c76baf60a40c",
-        "layout": {
-          "h": 4,
-          "w": 12,
-          "x": 0,
-          "y": 0,
-          "i": "01f4d444-aa2d-466d-9615-c76baf60a40c",
-          "isResizable": true
-        },
-        "version": "2.0.0",
-        "datasourceCate": "prometheus",
-        "targets": [
-          {
-            "refId": "A",
-            "expr": "sum(aliyun_acs_kvstore_cpu_usage_average{instance_id=\"$instance_id\"}) by (instance_id)",
-            "legend": ""
-          }
-        ],
-        "name": "CPU平均使用率",
-        "maxPerRow": 4,
-        "options": {
-          "tooltip": {
-            "mode": "all",
-            "sort": "none"
-          },
-          "legend": {
-            "displayMode": "hidden"
-          },
-          "standardOptions": {},
-          "thresholds": {
-            "steps": [
-              {
-                "color": "#634CD9",
-                "value": null,
-                "type": "base"
-              }
-            ]
-          }
-        },
-        "custom": {
-          "drawStyle": "lines",
-          "lineInterpolation": "smooth",
-          "spanNulls": false,
-          "lineWidth": 1,
-          "fillOpacity": 0.5,
-          "gradientMode": "none",
-          "stack": "off",
-          "scaleDistribution": {
-            "type": "linear"
-          }
-        }
-      },
-      {
-        "type": "timeseries",
-        "id": "c43eb882-915f-4c38-a0b5-8f33c21ab44a",
-        "layout": {
-          "h": 4,
-          "w": 12,
-          "x": 12,
-          "y": 0,
-          "i": "09903231-6557-42be-9cf3-2873878e9bf2",
-          "isResizable": true
-        },
-        "version": "2.0.0",
-        "datasourceCate": "prometheus",
-        "targets": [
-          {
-            "refId": "A",
-            "expr": "sum(aliyun_acs_kvstore_memory_usage_average{instance_id=\"$instance_id\"}) by (instance_id)",
-            "legend": ""
-          }
-        ],
-        "name": "内存平均使用率",
-        "maxPerRow": 4,
-        "options": {
-          "tooltip": {
-            "mode": "all",
-            "sort": "none"
-          },
-          "legend": {
-            "displayMode": "hidden"
-          },
-          "standardOptions": {},
-          "thresholds": {
-            "steps": [
-              {
-                "color": "#634CD9",
-                "value": null,
-                "type": "base"
-              }
-            ]
-          }
-        },
-        "custom": {
-          "drawStyle": "lines",
-          "lineInterpolation": "smooth",
-          "spanNulls": false,
-          "lineWidth": 1,
-          "fillOpacity": 0.5,
-          "gradientMode": "none",
-          "stack": "off",
-          "scaleDistribution": {
-            "type": "linear"
-          }
-        }
-      },
-      {
-        "type": "timeseries",
-        "id": "37447883-ad79-46bc-888a-1be2835c1c64",
-        "layout": {
-          "h": 4,
-          "w": 12,
-          "x": 0,
-          "y": 4,
-          "i": "378a5a26-c28e-4612-af09-f82ec2e11d80",
-          "isResizable": true
-        },
-        "version": "2.0.0",
-        "datasourceCate": "prometheus",
-        "targets": [
-          {
-            "refId": "A",
-            "expr": "sum(aliyun_acs_kvstore_connection_usage_average{instance_id=\"$instance_id\"}) by (instance_id)",
-            "legend": ""
-          }
-        ],
-        "name": "连接数平均使用率",
-        "maxPerRow": 4,
-        "options": {
-          "tooltip": {
-            "mode": "all",
-            "sort": "none"
-          },
-          "legend": {
-            "displayMode": "hidden"
-          },
-          "standardOptions": {},
-          "thresholds": {
-            "steps": [
-              {
-                "color": "#634CD9",
-                "value": null,
-                "type": "base"
-              }
-            ]
-          }
-        },
-        "custom": {
-          "drawStyle": "lines",
-          "lineInterpolation": "smooth",
-          "spanNulls": false,
-          "lineWidth": 1,
-          "fillOpacity": 0.5,
-          "gradientMode": "none",
-          "stack": "off",
-          "scaleDistribution": {
-            "type": "linear"
-          }
-        }
-      },
-      {
-        "type": "timeseries",
-        "id": "c9735607-3f24-44a7-bbf1-3ad39441c5c9",
-        "layout": {
-          "h": 4,
-          "w": 12,
-          "x": 12,
-          "y": 4,
-          "i": "93a4c8a6-ac23-4e26-8a38-781ec1668820",
-          "isResizable": true
-        },
-        "version": "2.0.0",
-        "datasourceCate": "prometheus",
-        "targets": [
-          {
-            "refId": "A",
-            "expr": "sum(aliyun_acs_kvstore_failed_count_average{instance_id=\"$instance_id\"}) by (instance_id)",
-            "legend": ""
-          }
-        ],
-        "name": "失败统计平均使用率",
-        "maxPerRow": 4,
-        "options": {
-          "tooltip": {
-            "mode": "all",
-            "sort": "none"
-          },
-          "legend": {
-            "displayMode": "hidden"
-          },
-          "standardOptions": {},
-          "thresholds": {
-            "steps": [
-              {
-                "color": "#634CD9",
-                "value": null,
-                "type": "base"
-              }
-            ]
-          }
-        },
-        "custom": {
-          "drawStyle": "lines",
-          "lineInterpolation": "smooth",
-          "spanNulls": false,
-          "lineWidth": 1,
-          "fillOpacity": 0.5,
-          "gradientMode": "none",
-          "stack": "off",
-          "scaleDistribution": {
-            "type": "linear"
-          }
-        }
-      },
-      {
-        "type": "timeseries",
-        "id": "b516e7dc-8022-409d-b907-18c4143df891",
-        "layout": {
-          "h": 5,
-          "w": 24,
-          "x": 0,
-          "y": 8,
-          "i": "b516e7dc-8022-409d-b907-18c4143df891",
-          "isResizable": true
-        },
-        "version": "2.0.0",
-        "datasourceCate": "prometheus",
-        "targets": [
-          {
-            "refId": "A",
-            "expr": "sum(aliyun_acs_kvstore_intranet_in_average{instance_id=\"$instance_id\"}) by (instance_id)",
-            "legend": "in"
-          },
-          {
-            "expr": "sum(aliyun_acs_kvstore_intranet_out_average{instance_id=\"$instance_id\"}) by (instance_id)",
-            "refId": "B",
-            "legend": "out"
-          }
-        ],
-        "name": "网络流量",
-        "maxPerRow": 4,
-        "options": {
-          "tooltip": {
-            "mode": "all",
-            "sort": "none"
-          },
-          "legend": {
-            "displayMode": "hidden"
-          },
-          "standardOptions": {
-            "util": "bitsSI"
-          },
-          "thresholds": {
-            "steps": [
-              {
-                "color": "#634CD9",
-                "value": null,
-                "type": "base"
-              }
-            ]
-          }
-        },
-        "custom": {
-          "drawStyle": "lines",
-          "lineInterpolation": "smooth",
-          "spanNulls": false,
-          "lineWidth": 1,
-          "fillOpacity": 0.5,
-          "gradientMode": "none",
-          "stack": "off",
-          "scaleDistribution": {
-            "type": "linear"
-          }
-        }
-      }
-    ],
-    "version": "2.0.0"
-  }
-}
--- a/integrations/AliYun/dashboards/slb.json
+++ b/integrations/AliYun/dashboards/slb.json
@@ -1,376 +0,0 @@
-{
-  "name": "阿里云SLB",
-  "tags": "",
-  "ident": "",
-  "configs": {
-    "var": [
-      {
-        "name": "instance_id",
-        "type": "query",
-        "datasource": {
-          "cate": "prometheus"
-        },
-        "definition": "label_values(aliyun_acs_slb_dashboard_active_connection_average ,instance_id)",
-        "multi": true,
-        "allOption": true
-      }
-    ],
-    "panels": [
-      {
-        "type": "timeseries",
-        "id": "aa8b2623-1e14-43cd-a3c4-33944a61fcc5",
-        "layout": {
-          "h": 4,
-          "w": 12,
-          "x": 0,
-          "y": 0,
-          "i": "aa8b2623-1e14-43cd-a3c4-33944a61fcc5",
-          "isResizable": true
-        },
-        "version": "2.0.0",
-        "datasourceCate": "prometheus",
-        "datasourceName": "Default",
-        "targets": [
-          {
-            "refId": "A",
-            "expr": "sum(aliyun_acs_slb_dashboard_instance_qps_utilization_average{instance_id=~\"$instance_id\"}) by (instance_id)",
-            "legend": "{{instance_id}} QPS使用率 "
-          }
-        ],
-        "name": "七层实例QPS使用率(%)",
-        "maxPerRow": 4,
-        "options": {
-          "tooltip": {
-            "mode": "all",
-            "sort": "none"
-          },
-          "legend": {
-            "displayMode": "hidden"
-          },
-          "standardOptions": {},
-          "thresholds": {
-            "steps": [
-              {
-                "color": "#634CD9",
-                "value": null,
-                "type": "base"
-              }
-            ]
-          }
-        },
-        "custom": {
-          "drawStyle": "lines",
-          "lineInterpolation": "smooth",
-          "spanNulls": false,
-          "lineWidth": 1,
-          "fillOpacity": 0.5,
-          "gradientMode": "none",
-          "stack": "off",
-          "scaleDistribution": {
-            "type": "linear"
-          }
-        }
-      },
-      {
-        "type": "timeseries",
-        "id": "b2002c63-8f0b-436c-b765-5bb65191f3c2",
-        "layout": {
-          "h": 4,
-          "w": 12,
-          "x": 12,
-          "y": 0,
-          "i": "b2002c63-8f0b-436c-b765-5bb65191f3c2",
-          "isResizable": true
-        },
-        "version": "2.0.0",
-        "datasourceCate": "prometheus",
-        "targets": [
-          {
-            "refId": "A",
-            "expr": "sum(aliyun_acs_slb_dashboard_upstream_code4xx_average{instance_id=~\"$instance_id\"}) by (instance_id)",
-            "legend": "{{instance_id}} 状态码 4xx "
-          },
-          {
-            "expr": "sum(aliyun_acs_slb_dashboard_upstream_code5xx_average{instance_id=~\"$instance_id\"}) by (instance_id)",
-            "refId": "B",
-            "legend": "{{instance_id}} 状态码 5xx "
-          }
-        ],
-        "name": "7层协议实例Upstream状态码分布",
-        "maxPerRow": 4,
-        "options": {
-          "tooltip": {
-            "mode": "all",
-            "sort": "none"
-          },
-          "legend": {
-            "displayMode": "hidden"
-          },
-          "standardOptions": {},
-          "thresholds": {
-            "steps": [
-              {
-                "color": "#634CD9",
-                "value": null,
-                "type": "base"
-              }
-            ]
-          }
-        },
-        "custom": {
-          "drawStyle": "lines",
-          "lineInterpolation": "smooth",
-          "spanNulls": false,
-          "lineWidth": 1,
-          "fillOpacity": 0.5,
-          "gradientMode": "none",
-          "stack": "off",
-          "scaleDistribution": {
-            "type": "linear"
-          }
-        }
-      },
-      {
-        "type": "timeseries",
-        "id": "71028d82-4804-468f-92f4-3444953b22cc",
-        "layout": {
-          "h": 4,
-          "w": 12,
-          "x": 0,
-          "y": 4,
-          "i": "71028d82-4804-468f-92f4-3444953b22cc",
-          "isResizable": true
-        },
-        "version": "2.0.0",
-        "datasourceCate": "prometheus",
-        "targets": [
-          {
-            "refId": "A",
-            "expr": "sum(aliyun_acs_slb_dashboard_instance_new_connection_average{instance_id=~\"$instance_id\"}) by (instance_id)",
-            "legend": "{{instance_id}} 新建连接数"
-          }
-        ],
-        "name": "新建连接数",
-        "maxPerRow": 4,
-        "options": {
-          "tooltip": {
-            "mode": "all",
-            "sort": "none"
-          },
-          "legend": {
-            "displayMode": "hidden"
-          },
-          "standardOptions": {},
-          "thresholds": {
-            "steps": [
-              {
-                "color": "#634CD9",
-                "value": null,
-                "type": "base"
-              }
-            ]
-          }
-        },
-        "custom": {
-          "drawStyle": "lines",
-          "lineInterpolation": "smooth",
-          "spanNulls": false,
-          "lineWidth": 1,
-          "fillOpacity": 0.5,
-          "gradientMode": "none",
-          "stack": "off",
-          "scaleDistribution": {
-            "type": "linear"
-          }
-        }
-      },
-      {
-        "type": "timeseries",
-        "id": "25f90635-ff68-4dc2-bfb0-c6634f0e6867",
-        "layout": {
-          "h": 4,
-          "w": 12,
-          "x": 12,
-          "y": 4,
-          "i": "25f90635-ff68-4dc2-bfb0-c6634f0e6867",
-          "isResizable": true
-        },
-        "version": "2.0.0",
-        "datasourceCate": "prometheus",
-        "targets": [
-          {
-            "refId": "A",
-            "expr": "sum(aliyun_acs_slb_dashboard_active_connection_average{instance_id=~\"$instance_id\"}) by (instance_id)",
-            "legend": "{{instance_id}} 活跃连接数"
-          },
-          {
-            "expr": "sum(aliyun_acs_slb_dashboard_inactive_connection_average{instance_id=~\"$instance_id\"}) by (instance_id)",
-            "refId": "B",
-            "legend": "{{instance_id}} 非活跃连接数"
-          },
-          {
-            "expr": "sum(aliyun_acs_slb_dashboard_max_connection_average{instance_id=~\"$instance_id\"}) by (instance_id)",
-            "refId": "C",
-            "legend": "{{instance_id}} 最大活跃连接数"
-          }
-        ],
-        "name": "并发连接数",
-        "maxPerRow": 4,
-        "options": {
-          "tooltip": {
-            "mode": "all",
-            "sort": "none"
-          },
-          "legend": {
-            "displayMode": "hidden"
-          },
-          "standardOptions": {},
-          "thresholds": {
-            "steps": [
-              {
-                "color": "#634CD9",
-                "value": null,
-                "type": "base"
-              }
-            ]
-          }
-        },
-        "custom": {
-          "drawStyle": "lines",
-          "lineInterpolation": "smooth",
-          "spanNulls": false,
-          "lineWidth": 1,
-          "fillOpacity": 0.5,
-          "gradientMode": "none",
-          "stack": "off",
-          "scaleDistribution": {
-            "type": "linear"
-          }
-        }
-      },
-      {
-        "type": "timeseries",
-        "id": "fde27e57-bdd6-4fd6-b3c0-75222f736d3b",
-        "layout": {
-          "h": 4,
-          "w": 12,
-          "x": 0,
-          "y": 8,
-          "i": "fde27e57-bdd6-4fd6-b3c0-75222f736d3b",
-          "isResizable": true
-        },
-        "version": "2.0.0",
-        "datasourceCate": "prometheus",
-        "targets": [
-          {
-            "refId": "A",
-            "expr": "sum(aliyun_acs_slb_dashboard_packet_rx_average{instance_id=~\"$instance_id\"}) by (instance_id)",
-            "legend": "{{instance_id}} 接受数据包数"
-          },
-          {
-            "expr": "sum(aliyun_acs_slb_dashboard_packet_tx_average{instance_id=~\"$instance_id\"}) by (instance_id)",
-            "refId": "B",
-            "legend": "{{instance_id}} 发送数据包数"
-          }
-        ],
-        "name": "数据包数",
-        "maxPerRow": 4,
-        "options": {
-          "tooltip": {
-            "mode": "all",
-            "sort": "none"
-          },
-          "legend": {
-            "displayMode": "hidden"
-          },
-          "standardOptions": {
-            "util": "none"
-          },
-          "thresholds": {
-            "steps": [
-              {
-                "color": "#634CD9",
-                "value": null,
-                "type": "base"
-              }
-            ]
-          }
-        },
-        "custom": {
-          "drawStyle": "lines",
-          "lineInterpolation": "smooth",
-          "spanNulls": false,
-          "lineWidth": 1,
-          "fillOpacity": 0.5,
-          "gradientMode": "none",
-          "stack": "off",
-          "scaleDistribution": {
-            "type": "linear"
-          }
-        }
-      },
-      {
-        "type": "timeseries",
-        "id": "a0fd47db-0b49-4b71-ae16-b4108324e35a",
-        "layout": {
-          "h": 4,
-          "w": 12,
-          "x": 12,
-          "y": 8,
-          "i": "a0fd47db-0b49-4b71-ae16-b4108324e35a",
-          "isResizable": true
-        },
-        "version": "2.0.0",
-        "datasourceCate": "prometheus",
-        "targets": [
-          {
-            "refId": "A",
-            "expr": "sum(aliyun_acs_slb_dashboard_instance_traffic_rx_average{instance_id=~\"$instance_id\"}) by (instance_id)",
-            "legend": "{{instance_id}} 出流量"
-          },
-          {
-            "expr": "sum(aliyun_acs_slb_dashboard_instance_traffic_tx_average{instance_id=~\"$instance_id\"}) by (instance_id)",
-            "refId": "B",
-            "legend": "{{instance_id}} 入流量"
-          }
-        ],
-        "name": "流量",
-        "maxPerRow": 4,
-        "options": {
-          "tooltip": {
-            "mode": "all",
-            "sort": "none"
-          },
-          "legend": {
-            "displayMode": "hidden"
-          },
-          "standardOptions": {
-            "util": "bitsSI"
-          },
-          "thresholds": {
-            "steps": [
-              {
-                "color": "#634CD9",
-                "value": null,
-                "type": "base"
-              }
-            ]
-          }
-        },
-        "custom": {
-          "drawStyle": "lines",
-          "lineInterpolation": "smooth",
-          "spanNulls": false,
-          "lineWidth": 1,
-          "fillOpacity": 0.5,
-          "gradientMode": "none",
-          "stack": "off",
-          "scaleDistribution": {
-            "type": "linear"
-          }
-        }
-      }
-    ],
-    "version": "2.0.0"
-  }
-}
--- a/integrations/AliYun/dashboards/waf.json
+++ b/integrations/AliYun/dashboards/waf.json
@@ -1,346 +0,0 @@
-{
-  "name": "阿里云WAF",
-  "tags": "",
-  "ident": "",
-  "configs": {
-    "var": [
-      {
-        "name": "instance_id",
-        "type": "query",
-        "datasource": {
-          "cate": "prometheus"
-        },
-        "definition": "label_values(aliyun_waf_qps_ratio_maximum,instance_id)",
-        "multi": true,
-        "allOption": true
-      }
-    ],
-    "panels": [
-      {
-        "type": "timeseries",
-        "id": "ec46b990-faf5-4ed7-a791-bbac5df91636",
-        "layout": {
-          "h": 4,
-          "w": 12,
-          "x": 0,
-          "y": 0,
-          "i": "ec46b990-faf5-4ed7-a791-bbac5df91636",
-          "isResizable": true
-        },
-        "version": "2.0.0",
-        "datasourceCate": "prometheus",
-        "targets": [
-          {
-            "refId": "A",
-            "expr": "sum(aliyun_waf_4xx_ratio_wafv3_maximum{instance_id=~\"$instance_id\"}) by (instance_id)",
-            "legend": "4xx 环比率V3"
-          }
-        ],
-        "name": "4xx 环比率V3",
-        "maxPerRow": 4,
-        "options": {
-          "tooltip": {
-            "mode": "all",
-            "sort": "none"
-          },
-          "legend": {
-            "displayMode": "hidden"
-          },
-          "standardOptions": {},
-          "thresholds": {
-            "steps": [
-              {
-                "color": "#634CD9",
-                "value": null,
-                "type": "base"
-              }
-            ]
-          }
-        },
-        "custom": {
-          "drawStyle": "lines",
-          "lineInterpolation": "smooth",
-          "spanNulls": false,
-          "lineWidth": 1,
-          "fillOpacity": 0.5,
-          "gradientMode": "none",
-          "stack": "off",
-          "scaleDistribution": {
-            "type": "linear"
-          }
-        }
-      },
-      {
-        "type": "timeseries",
-        "id": "efc75e62-5e75-470d-b12b-a98ca44b268a",
-        "layout": {
-          "h": 4,
-          "w": 12,
-          "x": 12,
-          "y": 0,
-          "i": "584b5a3c-2b7a-4e11-bee5-c2ed8661933e",
-          "isResizable": true
-        },
-        "version": "2.0.0",
-        "datasourceCate": "prometheus",
-        "targets": [
-          {
-            "refId": "A",
-            "expr": "sum(aliyun_waf_5xx_ratio_wafv3_maximum{instance_id=~\"$instance_id\"}) by (instance_id)",
-            "legend": "5xx 环比率V3"
-          }
-        ],
-        "name": "5xx 环比率V3",
-        "maxPerRow": 4,
-        "options": {
-          "tooltip": {
-            "mode": "all",
-            "sort": "none"
-          },
-          "legend": {
-            "displayMode": "hidden"
-          },
-          "standardOptions": {},
-          "thresholds": {
-            "steps": [
-              {
-                "color": "#634CD9",
-                "value": null,
-                "type": "base"
-              }
-            ]
-          }
-        },
-        "custom": {
-          "drawStyle": "lines",
-          "lineInterpolation": "smooth",
-          "spanNulls": false,
-          "lineWidth": 1,
-          "fillOpacity": 0.5,
-          "gradientMode": "none",
-          "stack": "off",
-          "scaleDistribution": {
-            "type": "linear"
-          }
-        }
-      },
-      {
-        "type": "timeseries",
-        "id": "79aefa1b-5e50-4c0c-980d-e5523b859509",
-        "layout": {
-          "h": 4,
-          "w": 12,
-          "x": 0,
-          "y": 4,
-          "i": "fc875397-c1a4-4713-b564-09abf852bcf3",
-          "isResizable": true
-        },
-        "version": "2.0.0",
-        "datasourceCate": "prometheus",
-        "targets": [
-          {
-            "refId": "A",
-            "expr": "sum(aliyun_waf_4xx_ratio_maximum{instance_id=~\"$instance_id\"}) by (instance_id)",
-            "legend": "4xx 环比率"
-          }
-        ],
-        "name": "4xx 环比率",
-        "maxPerRow": 4,
-        "options": {
-          "tooltip": {
-            "mode": "all",
-            "sort": "none"
-          },
-          "legend": {
-            "displayMode": "hidden"
-          },
-          "standardOptions": {},
-          "thresholds": {
-            "steps": [
-              {
-                "color": "#634CD9",
-                "value": null,
-                "type": "base"
-              }
-            ]
-          }
-        },
-        "custom": {
-          "drawStyle": "lines",
-          "lineInterpolation": "smooth",
-          "spanNulls": false,
-          "lineWidth": 1,
-          "fillOpacity": 0.5,
-          "gradientMode": "none",
-          "stack": "off",
-          "scaleDistribution": {
-            "type": "linear"
-          }
-        }
-      },
-      {
-        "type": "timeseries",
-        "id": "60c211d4-d51a-4681-b23b-ec8cc5dce7fe",
-        "layout": {
-          "h": 4,
-          "w": 12,
-          "x": 12,
-          "y": 4,
-          "i": "946be0db-32a3-48ea-9473-88fdfa77201d",
-          "isResizable": true
-        },
-        "version": "2.0.0",
-        "datasourceCate": "prometheus",
-        "targets": [
-          {
-            "refId": "A",
-            "expr": "sum(aliyun_waf_5xx_ratio_maximum{instance_id=~\"$instance_id\"}) by (instance_id)",
-            "legend": "5xx 环比率"
-          }
-        ],
-        "name": "5xx 环比率",
-        "maxPerRow": 4,
-        "options": {
-          "tooltip": {
-            "mode": "all",
-            "sort": "none"
-          },
-          "legend": {
-            "displayMode": "hidden"
-          },
-          "standardOptions": {},
-          "thresholds": {
-            "steps": [
-              {
-                "color": "#634CD9",
-                "value": null,
-                "type": "base"
-              }
-            ]
-          }
-        },
-        "custom": {
-          "drawStyle": "lines",
-          "lineInterpolation": "smooth",
-          "spanNulls": false,
-          "lineWidth": 1,
-          "fillOpacity": 0.5,
-          "gradientMode": "none",
-          "stack": "off",
-          "scaleDistribution": {
-            "type": "linear"
-          }
-        }
-      },
-      {
-        "type": "timeseries",
-        "id": "0de9271c-7b19-4003-ae56-2e273b4b99c4",
-        "layout": {
-          "h": 4,
-          "w": 12,
-          "x": 0,
-          "y": 8,
-          "i": "0de9271c-7b19-4003-ae56-2e273b4b99c4",
-          "isResizable": true
-        },
-        "version": "2.0.0",
-        "datasourceCate": "prometheus",
-        "targets": [
-          {
-            "refId": "A",
-            "expr": "sum(aliyun_waf_qps_ratio_maximum{instance_id=~\"$instance_id\"}) by (instance_id)",
-            "legend": "{{instance_id}}QPS 环比增长率"
-          }
-        ],
-        "name": "QPS环比增长率",
-        "maxPerRow": 4,
-        "options": {
-          "tooltip": {
-            "mode": "all",
-            "sort": "none"
-          },
-          "legend": {
-            "displayMode": "hidden"
-          },
-          "standardOptions": {},
-          "thresholds": {
-            "steps": [
-              {
-                "color": "#634CD9",
-                "value": null,
-                "type": "base"
-              }
-            ]
-          }
-        },
-        "custom": {
-          "drawStyle": "lines",
-          "lineInterpolation": "smooth",
-          "spanNulls": false,
-          "lineWidth": 1,
-          "fillOpacity": 0.5,
-          "gradientMode": "none",
-          "stack": "off",
-          "scaleDistribution": {
-            "type": "linear"
-          }
-        }
-      },
-      {
-        "type": "timeseries",
-        "id": "ccf2ffc1-6f22-4a13-b795-68072c077e1f",
-        "layout": {
-          "h": 4,
-          "w": 12,
-          "x": 12,
-          "y": 8,
-          "i": "d0320716-f704-4b6e-8671-b58fb77a5d7c",
-          "isResizable": true
-        },
-        "version": "2.0.0",
-        "datasourceCate": "prometheus",
-        "targets": [
-          {
-            "refId": "A",
-            "expr": "sum(aliyun_waf_qps_ratio_down_maximum{instance_id=~\"$instance_id\"}) by (instance_id)",
-            "legend": "{{instance_id}}QPS 环比下降率"
-          }
-        ],
-        "name": "QPS环比下降率",
-        "maxPerRow": 4,
-        "options": {
-          "tooltip": {
-            "mode": "all",
-            "sort": "none"
-          },
-          "legend": {
-            "displayMode": "hidden"
-          },
-          "standardOptions": {},
-          "thresholds": {
-            "steps": [
-              {
-                "color": "#634CD9",
-                "value": null,
-                "type": "base"
-              }
-            ]
-          }
-        },
-        "custom": {
-          "drawStyle": "lines",
-          "lineInterpolation": "smooth",
-          "spanNulls": false,
-          "lineWidth": 1,
-          "fillOpacity": 0.5,
-          "gradientMode": "none",
-          "stack": "off",
-          "scaleDistribution": {
-            "type": "linear"
-          }
-        }
-      }
-    ],
-    "version": "2.0.0"
-  }
-}
--- a/integrations/AliYun/icon/aliyun.png
+++ b/integrations/AliYun/icon/aliyun.png
--- a/integrations/AliYun/markdown/README.md
+++ b/integrations/AliYun/markdown/README.md
@@ -1,58 +0,0 @@
-## AliYun Dashboard & Configurable
-
-使用[categraf](https://github.com/flashcatcloud/categraf)中[input.aliyun](https://github.com/flashcatcloud/categraf/blob/main/conf/input.aliyun/cloud.toml)插件采集Vmware指标数据:
-
-1. 在阿里云控制创建AK/SK，在IAM中赋予阿里云监控的权限；
-2. 把创建好的AK/SK配置到Categraf的阿里云插件配置文件中。
-
-### Categraf中conf/input.aliyun/cloud.toml配置文件：
-
-```toml
-# # categraf采集周期，阿里云指标的粒度一般是60秒，建议设置不要少于60秒
-interval = 60
-[[instances]]
-## 阿里云资源所处的region
-## endpoint region 参考 https://help.aliyun.com/document_detail/28616.html#section-72p-xhs-6qt
-region="cn-beijing"
-#endpoint="metrics.cn-hangzhou.aliyuncs.com"
-endpoint="metrics.aliyuncs.com"
-## 填入你的acces_key_id
-access_key_id="admin"
-## 填入你的access_key_secret
-access_key_secret="admin"
-
-## 可能无法获取当前最新指标，这个指标是指监控指标的截止时间距离现在多久
-delay="2m"
-## 阿里云指标的最小粒度，60s 是推荐值，再小了部分指标不支持
-period="60s"
-## 指标所属的namespace ,为空，则表示所有空间指标都要采集
-## namespace 参考 https://help.aliyun.com/document_detail/163515.htm?spm=a2c4g.11186623.0.0.44d65c58mhgNw3
-#namespaces=["waf"]
-namespaces=["waf","acs_ecs_dashboard","acs_rds_dashboard","acs_slb_dashboard","acs_kvstore"]
-
-# 阿里云查询指标接口的QPS是50， 这里默认设置为一半
-ratelimit=25
-# 查询指定namesapce指标后, namespace/metric_name等meta信息会缓存起来，catch_ttl 是指标的缓存时间
-catch_ttl="1h"
-# 每次请求阿里云endpoint的超时时间
-timeout="5s"
-
-## 过滤某个namespace下的一个或多个指标
-## metric name 参考 https://help.aliyun.com/document_detail/163515.htm?spm=a2c4g.11186623.0.0.401d15c73Z0dZh
-## 参考页面中的Metric Id 填入下面的metricName ,页面中包含中文的Metric Name对应接口中的Description
-#[[instances.metric_filters]]
-#namespace=""
-#metric_names=["cpu_cores","vm.TcpCount", "cpu_idle"]
-```
-
-### 效果图
-
-![ecs](./ecs.png)
-
-![rds](./rds.png)
-
-![redis](./redis.png)
-
-![slb](./slb.png)
-
-![waf](./waf.png)
--- a/integrations/AliYun/markdown/ecs.png
+++ b/integrations/AliYun/markdown/ecs.png
--- a/integrations/AliYun/markdown/rds.png
+++ b/integrations/AliYun/markdown/rds.png
--- a/integrations/AliYun/markdown/redis.png
+++ b/integrations/AliYun/markdown/redis.png
--- a/integrations/AliYun/markdown/slb.png
+++ b/integrations/AliYun/markdown/slb.png
--- a/integrations/AliYun/markdown/waf.png
+++ b/integrations/AliYun/markdown/waf.png
--- a/integrations/Ceph/alerts/ceph_by_categraf.json
+++ b/integrations/Ceph/alerts/ceph_by_categraf.json
--- a/integrations/Ceph/dashboards/ceph_by_categraf.json
+++ b/integrations/Ceph/dashboards/ceph_by_categraf.json
--- a/integrations/Ceph/icon/ceph.png
+++ b/integrations/Ceph/icon/ceph.png
--- a/integrations/Ceph/markdown/README.md
+++ b/integrations/Ceph/markdown/README.md
@@ -1,31 +0,0 @@
-### Ceph Dashboard & Alerts
-开启ceph 默认Prometheus支持
-```bash
-ceph mgr module enable prometheus
-```
-
-### 采集配置
-在categraf中的prometheus插件中加入采集配置
-```yaml
-cat /opt/categraf/conf/input.prometheus/prometheus.toml
-  [[instances]]
-  urls = [
-  "http://192.168.11.181:9283/metrics"
-]
-  url_label_key = "instance"
-  url_label_value = "{{.Host}}"
-  labels = {service="ceph",cluster="ceph"}
-```
-
-
-Dashboard:
-
-[dashboard](../dashboards/ceph_by_categraf.json)
-
-![ceph](./ceph.png)
-
-Alerts:
-
-[alerts](../alerts/ceph_by_categraf.json)
-
-![alert](./alerts.png)
--- a/integrations/Ceph/markdown/alerts.png
+++ b/integrations/Ceph/markdown/alerts.png
--- a/integrations/Ceph/markdown/ceph.png
+++ b/integrations/Ceph/markdown/ceph.png
--- a/integrations/ElasticSearch/alerts/elasticsearch_by_categraf.json
+++ b/integrations/ElasticSearch/alerts/elasticsearch_by_categraf.json
@@ -1,951 +0,0 @@
-[
-  {
-    "cate": "prometheus",
-    "datasource_ids": [
-      52
-    ],
-    "name": "Elastic Cluster Red status",
-    "note": "",
-    "prod": "metric",
-    "algorithm": "",
-    "algo_params": null,
-    "delay": 0,
-    "severity": 1,
-    "severities": [
-      1
-    ],
-    "disabled": 1,
-    "prom_for_duration": 0,
-    "prom_ql": "",
-    "rule_config": {
-      "algo_params": null,
-      "inhibit": false,
-      "prom_ql": "",
-      "queries": [
-        {
-          "prom_ql": " elasticsearch_cluster_health_status{color=\"red\"} == 1",
-          "severity": 1
-        }
-      ],
-      "severity": 0
-    },
-    "prom_eval_interval": 15,
-    "enable_stime": "00:00",
-    "enable_stimes": [
-      "00:00"
-    ],
-    "enable_etime": "23:59",
-    "enable_etimes": [
-      "23:59"
-    ],
-    "enable_days_of_week": [
-      "1",
-      "2",
-      "3",
-      "4",
-      "5",
-      "6",
-      "0"
-    ],
-    "enable_days_of_weeks": [
-      [
-        "1",
-        "2",
-        "3",
-        "4",
-        "5",
-        "6",
-        "0"
-      ]
-    ],
-    "enable_in_bg": 0,
-    "notify_recovered": 1,
-    "notify_channels": [],
-    "notify_repeat_step": 60,
-    "notify_max_number": 0,
-    "recover_duration": 0,
-    "callbacks": [],
-    "runbook_url": "",
-    "append_tags": [
-      "alertname=ElasticsearchClusterRed"
-    ],
-    "annotations": null,
-    "extra_config": null
-  },
-  {
-    "cate": "prometheus",
-    "datasource_ids": [
-      52
-    ],
-    "name": "Elastic Cluster Yellow status",
-    "note": "",
-    "prod": "metric",
-    "algorithm": "",
-    "algo_params": null,
-    "delay": 0,
-    "severity": 2,
-    "severities": [
-      2
-    ],
-    "disabled": 1,
-    "prom_for_duration": 0,
-    "prom_ql": "",
-    "rule_config": {
-      "algo_params": null,
-      "inhibit": false,
-      "prom_ql": "",
-      "queries": [
-        {
-          "prom_ql": "elasticsearch_cluster_health_status{color=\"yellow\"} == 1",
-          "severity": 2
-        }
-      ],
-      "severity": 0
-    },
-    "prom_eval_interval": 15,
-    "enable_stime": "00:00",
-    "enable_stimes": [
-      "00:00"
-    ],
-    "enable_etime": "23:59",
-    "enable_etimes": [
-      "23:59"
-    ],
-    "enable_days_of_week": [
-      "1",
-      "2",
-      "3",
-      "4",
-      "5",
-      "6",
-      "0"
-    ],
-    "enable_days_of_weeks": [
-      [
-        "1",
-        "2",
-        "3",
-        "4",
-        "5",
-        "6",
-        "0"
-      ]
-    ],
-    "enable_in_bg": 0,
-    "notify_recovered": 1,
-    "notify_channels": [],
-    "notify_repeat_step": 60,
-    "notify_max_number": 0,
-    "recover_duration": 0,
-    "callbacks": [],
-    "runbook_url": "",
-    "append_tags": [
-      "alertname=ElasticsearchClusterYellow"
-    ],
-    "annotations": null,
-    "extra_config": null
-  },
-  {
-    "cate": "prometheus",
-    "datasource_ids": [
-      52
-    ],
-    "name": "Elasticsearch disk out of space of the instance",
-    "note": "",
-    "prod": "metric",
-    "algorithm": "",
-    "algo_params": null,
-    "delay": 0,
-    "severity": 1,
-    "severities": [
-      1
-    ],
-    "disabled": 1,
-    "prom_for_duration": 120,
-    "prom_ql": "",
-    "rule_config": {
-      "algo_params": null,
-      "inhibit": false,
-      "prom_ql": "",
-      "queries": [
-        {
-          "prom_ql": "elasticsearch_filesystem_data_available_bytes / elasticsearch_filesystem_data_size_bytes * 100 < 10",
-          "severity": 1
-        }
-      ],
-      "severity": 0
-    },
-    "prom_eval_interval": 15,
-    "enable_stime": "00:00",
-    "enable_stimes": [
-      "00:00"
-    ],
-    "enable_etime": "23:59",
-    "enable_etimes": [
-      "23:59"
-    ],
-    "enable_days_of_week": [
-      "1",
-      "2",
-      "3",
-      "4",
-      "5",
-      "6",
-      "0"
-    ],
-    "enable_days_of_weeks": [
-      [
-        "1",
-        "2",
-        "3",
-        "4",
-        "5",
-        "6",
-        "0"
-      ]
-    ],
-    "enable_in_bg": 0,
-    "notify_recovered": 1,
-    "notify_channels": [],
-    "notify_repeat_step": 60,
-    "notify_max_number": 0,
-    "recover_duration": 0,
-    "callbacks": [],
-    "runbook_url": "",
-    "append_tags": [
-      "alertname=ElasticsearchDiskOutOfSpace"
-    ],
-    "annotations": null,
-    "extra_config": null
-  },
-  {
-    "cate": "prometheus",
-    "datasource_ids": [
-      52
-    ],
-    "name": "Elasticsearch disk space low of the instance",
-    "note": "",
-    "prod": "metric",
-    "algorithm": "",
-    "algo_params": null,
-    "delay": 0,
-    "severity": 2,
-    "severities": [
-      2
-    ],
-    "disabled": 1,
-    "prom_for_duration": 120,
-    "prom_ql": "",
-    "rule_config": {
-      "algo_params": null,
-      "inhibit": false,
-      "prom_ql": "",
-      "queries": [
-        {
-          "prom_ql": "elasticsearch_filesystem_data_available_bytes / elasticsearch_filesystem_data_size_bytes * 100 < 20",
-          "severity": 2
-        }
-      ],
-      "severity": 0
-    },
-    "prom_eval_interval": 15,
-    "enable_stime": "00:00",
-    "enable_stimes": [
-      "00:00"
-    ],
-    "enable_etime": "23:59",
-    "enable_etimes": [
-      "23:59"
-    ],
-    "enable_days_of_week": [
-      "1",
-      "2",
-      "3",
-      "4",
-      "5",
-      "6",
-      "0"
-    ],
-    "enable_days_of_weeks": [
-      [
-        "1",
-        "2",
-        "3",
-        "4",
-        "5",
-        "6",
-        "0"
-      ]
-    ],
-    "enable_in_bg": 0,
-    "notify_recovered": 1,
-    "notify_channels": [],
-    "notify_repeat_step": 60,
-    "notify_max_number": 0,
-    "recover_duration": 0,
-    "callbacks": [],
-    "runbook_url": "",
-    "append_tags": [
-      "alertname=ElasticsearchDiskSpaceLow"
-    ],
-    "annotations": null,
-    "extra_config": null
-  },
-  {
-    "cate": "prometheus",
-    "datasource_ids": [
-      52
-    ],
-    "name": "Elasticsearch Heap Usage Too High of the instance",
-    "note": "",
-    "prod": "metric",
-    "algorithm": "",
-    "algo_params": null,
-    "delay": 0,
-    "severity": 1,
-    "severities": [
-      1
-    ],
-    "disabled": 1,
-    "prom_for_duration": 120,
-    "prom_ql": "",
-    "rule_config": {
-      "algo_params": null,
-      "inhibit": false,
-      "prom_ql": "",
-      "queries": [
-        {
-          "prom_ql": "(elasticsearch_jvm_memory_used_bytes{area=\"heap\"} / elasticsearch_jvm_memory_max_bytes{area=\"heap\"}) * 100 > 90",
-          "severity": 1
-        }
-      ],
-      "severity": 0
-    },
-    "prom_eval_interval": 15,
-    "enable_stime": "00:00",
-    "enable_stimes": [
-      "00:00"
-    ],
-    "enable_etime": "23:59",
-    "enable_etimes": [
-      "23:59"
-    ],
-    "enable_days_of_week": [
-      "1",
-      "2",
-      "3",
-      "4",
-      "5",
-      "6",
-      "0"
-    ],
-    "enable_days_of_weeks": [
-      [
-        "1",
-        "2",
-        "3",
-        "4",
-        "5",
-        "6",
-        "0"
-      ]
-    ],
-    "enable_in_bg": 0,
-    "notify_recovered": 1,
-    "notify_channels": [],
-    "notify_repeat_step": 60,
-    "notify_max_number": 0,
-    "recover_duration": 0,
-    "callbacks": [],
-    "runbook_url": "",
-    "append_tags": [
-      "alertname=ElasticsearchHeapUsageTooHigh"
-    ],
-    "annotations": null,
-    "extra_config": null
-  },
-  {
-    "cate": "prometheus",
-    "datasource_ids": [
-      52
-    ],
-    "name": "Elasticsearch Heap Usage warning of the instance",
-    "note": "",
-    "prod": "metric",
-    "algorithm": "",
-    "algo_params": null,
-    "delay": 0,
-    "severity": 2,
-    "severities": [
-      2
-    ],
-    "disabled": 1,
-    "prom_for_duration": 120,
-    "prom_ql": "",
-    "rule_config": {
-      "algo_params": null,
-      "inhibit": false,
-      "prom_ql": "",
-      "queries": [
-        {
-          "prom_ql": "(elasticsearch_jvm_memory_used_bytes{area=\"heap\"} / elasticsearch_jvm_memory_max_bytes{area=\"heap\"}) * 100 > 80",
-          "severity": 2
-        }
-      ],
-      "severity": 0
-    },
-    "prom_eval_interval": 15,
-    "enable_stime": "00:00",
-    "enable_stimes": [
-      "00:00"
-    ],
-    "enable_etime": "23:59",
-    "enable_etimes": [
-      "23:59"
-    ],
-    "enable_days_of_week": [
-      "1",
-      "2",
-      "3",
-      "4",
-      "5",
-      "6",
-      "0"
-    ],
-    "enable_days_of_weeks": [
-      [
-        "1",
-        "2",
-        "3",
-        "4",
-        "5",
-        "6",
-        "0"
-      ]
-    ],
-    "enable_in_bg": 0,
-    "notify_recovered": 1,
-    "notify_channels": [],
-    "notify_repeat_step": 60,
-    "notify_max_number": 0,
-    "recover_duration": 0,
-    "callbacks": [],
-    "runbook_url": "",
-    "append_tags": [
-      "alertname=ElasticsearchHeapUsageWarning"
-    ],
-    "annotations": null,
-    "extra_config": null
-  },
-  {
-    "cate": "prometheus",
-    "datasource_ids": [
-      52
-    ],
-    "name": "Elasticsearch initializing shards of the instance",
-    "note": "",
-    "prod": "metric",
-    "algorithm": "",
-    "algo_params": null,
-    "delay": 0,
-    "severity": 2,
-    "severities": [
-      2
-    ],
-    "disabled": 1,
-    "prom_for_duration": 900,
-    "prom_ql": "",
-    "rule_config": {
-      "algo_params": null,
-      "inhibit": false,
-      "prom_ql": "",
-      "queries": [
-        {
-          "prom_ql": "elasticsearch_cluster_health_initializing_shards > 0",
-          "severity": 2
-        }
-      ],
-      "severity": 0
-    },
-    "prom_eval_interval": 15,
-    "enable_stime": "00:00",
-    "enable_stimes": [
-      "00:00"
-    ],
-    "enable_etime": "23:59",
-    "enable_etimes": [
-      "23:59"
-    ],
-    "enable_days_of_week": [
-      "1",
-      "2",
-      "3",
-      "4",
-      "5",
-      "6",
-      "0"
-    ],
-    "enable_days_of_weeks": [
-      [
-        "1",
-        "2",
-        "3",
-        "4",
-        "5",
-        "6",
-        "0"
-      ]
-    ],
-    "enable_in_bg": 0,
-    "notify_recovered": 1,
-    "notify_channels": [],
-    "notify_repeat_step": 60,
-    "notify_max_number": 0,
-    "recover_duration": 0,
-    "callbacks": [],
-    "runbook_url": "",
-    "append_tags": [
-      "alertname=ElasticsearchInitializingShards"
-    ],
-    "annotations": null,
-    "extra_config": null
-  },
-  {
-    "cate": "prometheus",
-    "datasource_ids": [
-      52
-    ],
-    "name": "Elasticsearch no new documents of the instance",
-    "note": "",
-    "prod": "metric",
-    "algorithm": "",
-    "algo_params": null,
-    "delay": 0,
-    "severity": 2,
-    "severities": [
-      2
-    ],
-    "disabled": 1,
-    "prom_for_duration": 300,
-    "prom_ql": "",
-    "rule_config": {
-      "algo_params": null,
-      "inhibit": false,
-      "prom_ql": "",
-      "queries": [
-        {
-          "prom_ql": "rate(elasticsearch_indices_docs{es_data_node=\"true\"}[5m]) == 0",
-          "severity": 2
-        }
-      ],
-      "severity": 0
-    },
-    "prom_eval_interval": 15,
-    "enable_stime": "00:00",
-    "enable_stimes": [
-      "00:00"
-    ],
-    "enable_etime": "23:59",
-    "enable_etimes": [
-      "23:59"
-    ],
-    "enable_days_of_week": [
-      "1",
-      "2",
-      "3",
-      "4",
-      "5",
-      "6",
-      "0"
-    ],
-    "enable_days_of_weeks": [
-      [
-        "1",
-        "2",
-        "3",
-        "4",
-        "5",
-        "6",
-        "0"
-      ]
-    ],
-    "enable_in_bg": 0,
-    "notify_recovered": 1,
-    "notify_channels": [],
-    "notify_repeat_step": 60,
-    "notify_max_number": 0,
-    "recover_duration": 0,
-    "callbacks": [],
-    "runbook_url": "",
-    "append_tags": [
-      "alertname=ElasticsearchNoNewDocuments"
-    ],
-    "annotations": null,
-    "extra_config": null
-  },
-  {
-    "cate": "prometheus",
-    "datasource_ids": [
-      52
-    ],
-    "name": "Elasticsearch pending tasks of the instance",
-    "note": "",
-    "prod": "metric",
-    "algorithm": "",
-    "algo_params": null,
-    "delay": 0,
-    "severity": 2,
-    "severities": [
-      2
-    ],
-    "disabled": 1,
-    "prom_for_duration": 900,
-    "prom_ql": "",
-    "rule_config": {
-      "algo_params": null,
-      "inhibit": false,
-      "prom_ql": "",
-      "queries": [
-        {
-          "prom_ql": "elasticsearch_cluster_health_number_of_pending_tasks > 0",
-          "severity": 2
-        }
-      ],
-      "severity": 0
-    },
-    "prom_eval_interval": 15,
-    "enable_stime": "00:00",
-    "enable_stimes": [
-      "00:00"
-    ],
-    "enable_etime": "23:59",
-    "enable_etimes": [
-      "23:59"
-    ],
-    "enable_days_of_week": [
-      "1",
-      "2",
-      "3",
-      "4",
-      "5",
-      "6",
-      "0"
-    ],
-    "enable_days_of_weeks": [
-      [
-        "1",
-        "2",
-        "3",
-        "4",
-        "5",
-        "6",
-        "0"
-      ]
-    ],
-    "enable_in_bg": 0,
-    "notify_recovered": 1,
-    "notify_channels": [],
-    "notify_repeat_step": 60,
-    "notify_max_number": 0,
-    "recover_duration": 0,
-    "callbacks": [],
-    "runbook_url": "",
-    "append_tags": [
-      "alertname=ElasticsearchPendingTasks"
-    ],
-    "annotations": null,
-    "extra_config": null
-  },
-  {
-    "cate": "prometheus",
-    "datasource_ids": [
-      52
-    ],
-    "name": "Elasticsearch relocation shards of the instance",
-    "note": "",
-    "prod": "metric",
-    "algorithm": "",
-    "algo_params": null,
-    "delay": 0,
-    "severity": 1,
-    "severities": [
-      1
-    ],
-    "disabled": 1,
-    "prom_for_duration": 900,
-    "prom_ql": "",
-    "rule_config": {
-      "algo_params": null,
-      "inhibit": false,
-      "prom_ql": "",
-      "queries": [
-        {
-          "prom_ql": "elasticsearch_cluster_health_relocating_shards > 0",
-          "severity": 1
-        }
-      ],
-      "severity": 0
-    },
-    "prom_eval_interval": 15,
-    "enable_stime": "00:00",
-    "enable_stimes": [
-      "00:00"
-    ],
-    "enable_etime": "23:59",
-    "enable_etimes": [
-      "23:59"
-    ],
-    "enable_days_of_week": [
-      "1",
-      "2",
-      "3",
-      "4",
-      "5",
-      "6",
-      "0"
-    ],
-    "enable_days_of_weeks": [
-      [
-        "1",
-        "2",
-        "3",
-        "4",
-        "5",
-        "6",
-        "0"
-      ]
-    ],
-    "enable_in_bg": 0,
-    "notify_recovered": 1,
-    "notify_channels": [],
-    "notify_repeat_step": 60,
-    "notify_max_number": 0,
-    "recover_duration": 0,
-    "callbacks": [],
-    "runbook_url": "",
-    "append_tags": [
-      "alertname=ElasticsearchRelocationShards"
-    ],
-    "annotations": null,
-    "extra_config": null
-  },
-  {
-    "cate": "prometheus",
-    "datasource_ids": [
-      52
-    ],
-    "name": "Elasticsearch unassigned shards of the instance",
-    "note": "",
-    "prod": "metric",
-    "algorithm": "",
-    "algo_params": null,
-    "delay": 0,
-    "severity": 1,
-    "severities": [
-      1
-    ],
-    "disabled": 1,
-    "prom_for_duration": 0,
-    "prom_ql": "",
-    "rule_config": {
-      "algo_params": null,
-      "inhibit": false,
-      "prom_ql": "",
-      "queries": [
-        {
-          "prom_ql": "elasticsearch_cluster_health_unassigned_shards > 0",
-          "severity": 1
-        }
-      ],
-      "severity": 0
-    },
-    "prom_eval_interval": 15,
-    "enable_stime": "00:00",
-    "enable_stimes": [
-      "00:00"
-    ],
-    "enable_etime": "23:59",
-    "enable_etimes": [
-      "23:59"
-    ],
-    "enable_days_of_week": [
-      "1",
-      "2",
-      "3",
-      "4",
-      "5",
-      "6",
-      "0"
-    ],
-    "enable_days_of_weeks": [
-      [
-        "1",
-        "2",
-        "3",
-        "4",
-        "5",
-        "6",
-        "0"
-      ]
-    ],
-    "enable_in_bg": 0,
-    "notify_recovered": 1,
-    "notify_channels": [],
-    "notify_repeat_step": 60,
-    "notify_max_number": 0,
-    "recover_duration": 0,
-    "callbacks": [],
-    "runbook_url": "",
-    "append_tags": [
-      "alertname=ElasticsearchUnassignedShards"
-    ],
-    "annotations": null,
-    "extra_config": null
-  },
-  {
-    "cate": "prometheus",
-    "datasource_ids": [
-      52
-    ],
-    "name": "Elasticsearch Unhealthy Data Nodes",
-    "note": "",
-    "prod": "metric",
-    "algorithm": "",
-    "algo_params": null,
-    "delay": 0,
-    "severity": 1,
-    "severities": [
-      1
-    ],
-    "disabled": 1,
-    "prom_for_duration": 0,
-    "prom_ql": "",
-    "rule_config": {
-      "algo_params": null,
-      "inhibit": false,
-      "prom_ql": "",
-      "queries": [
-        {
-          "prom_ql": "elasticsearch_cluster_health_number_of_data_nodes < number_of_data_nodes",
-          "severity": 1
-        }
-      ],
-      "severity": 0
-    },
-    "prom_eval_interval": 15,
-    "enable_stime": "00:00",
-    "enable_stimes": [
-      "00:00"
-    ],
-    "enable_etime": "23:59",
-    "enable_etimes": [
-      "23:59"
-    ],
-    "enable_days_of_week": [
-      "1",
-      "2",
-      "3",
-      "4",
-      "5",
-      "6",
-      "0"
-    ],
-    "enable_days_of_weeks": [
-      [
-        "1",
-        "2",
-        "3",
-        "4",
-        "5",
-        "6",
-        "0"
-      ]
-    ],
-    "enable_in_bg": 0,
-    "notify_recovered": 1,
-    "notify_channels": [],
-    "notify_repeat_step": 60,
-    "notify_max_number": 0,
-    "recover_duration": 0,
-    "callbacks": [],
-    "runbook_url": "",
-    "append_tags": [
-      "alertname=ElasticsearchHealthyDataNodes"
-    ],
-    "annotations": null,
-    "extra_config": null
-  },
-  {
-    "cate": "prometheus",
-    "datasource_ids": [
-      52
-    ],
-    "name": "Elasticsearch Unhealthy Nodes",
-    "note": "",
-    "prod": "metric",
-    "algorithm": "",
-    "algo_params": null,
-    "delay": 0,
-    "severity": 1,
-    "severities": [
-      1
-    ],
-    "disabled": 1,
-    "prom_for_duration": 0,
-    "prom_ql": "",
-    "rule_config": {
-      "algo_params": null,
-      "inhibit": false,
-      "prom_ql": "",
-      "queries": [
-        {
-          "prom_ql": " elasticsearch_cluster_health_number_of_nodes < number_of_nodes",
-          "severity": 1
-        }
-      ],
-      "severity": 0
-    },
-    "prom_eval_interval": 15,
-    "enable_stime": "00:00",
-    "enable_stimes": [
-      "00:00"
-    ],
-    "enable_etime": "23:59",
-    "enable_etimes": [
-      "23:59"
-    ],
-    "enable_days_of_week": [
-      "1",
-      "2",
-      "3",
-      "4",
-      "5",
-      "6",
-      "0"
-    ],
-    "enable_days_of_weeks": [
-      [
-        "1",
-        "2",
-        "3",
-        "4",
-        "5",
-        "6",
-        "0"
-      ]
-    ],
-    "enable_in_bg": 0,
-    "notify_recovered": 1,
-    "notify_channels": [],
-    "notify_repeat_step": 60,
-    "notify_max_number": 0,
-    "recover_duration": 0,
-    "callbacks": [],
-    "runbook_url": "",
-    "append_tags": [
-      "alertname=ElasticsearchHealthyNodes"
-    ],
-    "annotations": null,
-    "extra_config": null
-  }
-]
--- a/integrations/ElasticSearch/alerts/elasticsearch_by_exporter.json
+++ b/integrations/ElasticSearch/alerts/elasticsearch_by_exporter.json
@@ -1,951 +0,0 @@
-[
-  {
-    "cate": "prometheus",
-    "datasource_ids": [
-      52
-    ],
-    "name": "Elastic Cluster Red status",
-    "note": "",
-    "prod": "metric",
-    "algorithm": "",
-    "algo_params": null,
-    "delay": 0,
-    "severity": 1,
-    "severities": [
-      1
-    ],
-    "disabled": 1,
-    "prom_for_duration": 0,
-    "prom_ql": "",
-    "rule_config": {
-      "algo_params": null,
-      "inhibit": false,
-      "prom_ql": "",
-      "queries": [
-        {
-          "prom_ql": " elasticsearch_cluster_health_status{color=\"red\"} == 1",
-          "severity": 1
-        }
-      ],
-      "severity": 0
-    },
-    "prom_eval_interval": 15,
-    "enable_stime": "00:00",
-    "enable_stimes": [
-      "00:00"
-    ],
-    "enable_etime": "23:59",
-    "enable_etimes": [
-      "23:59"
-    ],
-    "enable_days_of_week": [
-      "1",
-      "2",
-      "3",
-      "4",
-      "5",
-      "6",
-      "0"
-    ],
-    "enable_days_of_weeks": [
-      [
-        "1",
-        "2",
-        "3",
-        "4",
-        "5",
-        "6",
-        "0"
-      ]
-    ],
-    "enable_in_bg": 0,
-    "notify_recovered": 1,
-    "notify_channels": [],
-    "notify_repeat_step": 60,
-    "notify_max_number": 0,
-    "recover_duration": 0,
-    "callbacks": [],
-    "runbook_url": "",
-    "append_tags": [
-      "alertname=ElasticsearchClusterRed"
-    ],
-    "annotations": null,
-    "extra_config": null
-  },
-  {
-    "cate": "prometheus",
-    "datasource_ids": [
-      52
-    ],
-    "name": "Elastic Cluster Yellow status",
-    "note": "",
-    "prod": "metric",
-    "algorithm": "",
-    "algo_params": null,
-    "delay": 0,
-    "severity": 2,
-    "severities": [
-      2
-    ],
-    "disabled": 1,
-    "prom_for_duration": 0,
-    "prom_ql": "",
-    "rule_config": {
-      "algo_params": null,
-      "inhibit": false,
-      "prom_ql": "",
-      "queries": [
-        {
-          "prom_ql": "elasticsearch_cluster_health_status{color=\"yellow\"} == 1",
-          "severity": 2
-        }
-      ],
-      "severity": 0
-    },
-    "prom_eval_interval": 15,
-    "enable_stime": "00:00",
-    "enable_stimes": [
-      "00:00"
-    ],
-    "enable_etime": "23:59",
-    "enable_etimes": [
-      "23:59"
-    ],
-    "enable_days_of_week": [
-      "1",
-      "2",
-      "3",
-      "4",
-      "5",
-      "6",
-      "0"
-    ],
-    "enable_days_of_weeks": [
-      [
-        "1",
-        "2",
-        "3",
-        "4",
-        "5",
-        "6",
-        "0"
-      ]
-    ],
-    "enable_in_bg": 0,
-    "notify_recovered": 1,
-    "notify_channels": [],
-    "notify_repeat_step": 60,
-    "notify_max_number": 0,
-    "recover_duration": 0,
-    "callbacks": [],
-    "runbook_url": "",
-    "append_tags": [
-      "alertname=ElasticsearchClusterYellow"
-    ],
-    "annotations": null,
-    "extra_config": null
-  },
-  {
-    "cate": "prometheus",
-    "datasource_ids": [
-      52
-    ],
-    "name": "Elasticsearch disk out of space of the instance",
-    "note": "",
-    "prod": "metric",
-    "algorithm": "",
-    "algo_params": null,
-    "delay": 0,
-    "severity": 1,
-    "severities": [
-      1
-    ],
-    "disabled": 1,
-    "prom_for_duration": 120,
-    "prom_ql": "",
-    "rule_config": {
-      "algo_params": null,
-      "inhibit": false,
-      "prom_ql": "",
-      "queries": [
-        {
-          "prom_ql": "elasticsearch_filesystem_data_available_bytes / elasticsearch_filesystem_data_size_bytes * 100 < 10",
-          "severity": 1
-        }
-      ],
-      "severity": 0
-    },
-    "prom_eval_interval": 15,
-    "enable_stime": "00:00",
-    "enable_stimes": [
-      "00:00"
-    ],
-    "enable_etime": "23:59",
-    "enable_etimes": [
-      "23:59"
-    ],
-    "enable_days_of_week": [
-      "1",
-      "2",
-      "3",
-      "4",
-      "5",
-      "6",
-      "0"
-    ],
-    "enable_days_of_weeks": [
-      [
-        "1",
-        "2",
-        "3",
-        "4",
-        "5",
-        "6",
-        "0"
-      ]
-    ],
-    "enable_in_bg": 0,
-    "notify_recovered": 1,
-    "notify_channels": [],
-    "notify_repeat_step": 60,
-    "notify_max_number": 0,
-    "recover_duration": 0,
-    "callbacks": [],
-    "runbook_url": "",
-    "append_tags": [
-      "alertname=ElasticsearchDiskOutOfSpace"
-    ],
-    "annotations": null,
-    "extra_config": null
-  },
-  {
-    "cate": "prometheus",
-    "datasource_ids": [
-      52
-    ],
-    "name": "Elasticsearch disk space low of the instance",
-    "note": "",
-    "prod": "metric",
-    "algorithm": "",
-    "algo_params": null,
-    "delay": 0,
-    "severity": 2,
-    "severities": [
-      2
-    ],
-    "disabled": 1,
-    "prom_for_duration": 120,
-    "prom_ql": "",
-    "rule_config": {
-      "algo_params": null,
-      "inhibit": false,
-      "prom_ql": "",
-      "queries": [
-        {
-          "prom_ql": "elasticsearch_filesystem_data_available_bytes / elasticsearch_filesystem_data_size_bytes * 100 < 20",
-          "severity": 2
-        }
-      ],
-      "severity": 0
-    },
-    "prom_eval_interval": 15,
-    "enable_stime": "00:00",
-    "enable_stimes": [
-      "00:00"
-    ],
-    "enable_etime": "23:59",
-    "enable_etimes": [
-      "23:59"
-    ],
-    "enable_days_of_week": [
-      "1",
-      "2",
-      "3",
-      "4",
-      "5",
-      "6",
-      "0"
-    ],
-    "enable_days_of_weeks": [
-      [
-        "1",
-        "2",
-        "3",
-        "4",
-        "5",
-        "6",
-        "0"
-      ]
-    ],
-    "enable_in_bg": 0,
-    "notify_recovered": 1,
-    "notify_channels": [],
-    "notify_repeat_step": 60,
-    "notify_max_number": 0,
-    "recover_duration": 0,
-    "callbacks": [],
-    "runbook_url": "",
-    "append_tags": [
-      "alertname=ElasticsearchDiskSpaceLow"
-    ],
-    "annotations": null,
-    "extra_config": null
-  },
-  {
-    "cate": "prometheus",
-    "datasource_ids": [
-      52
-    ],
-    "name": "Elasticsearch Heap Usage Too High of the instance",
-    "note": "",
-    "prod": "metric",
-    "algorithm": "",
-    "algo_params": null,
-    "delay": 0,
-    "severity": 1,
-    "severities": [
-      1
-    ],
-    "disabled": 1,
-    "prom_for_duration": 120,
-    "prom_ql": "",
-    "rule_config": {
-      "algo_params": null,
-      "inhibit": false,
-      "prom_ql": "",
-      "queries": [
-        {
-          "prom_ql": "(elasticsearch_jvm_memory_used_bytes{area=\"heap\"} / elasticsearch_jvm_memory_max_bytes{area=\"heap\"}) * 100 > 90",
-          "severity": 1
-        }
-      ],
-      "severity": 0
-    },
-    "prom_eval_interval": 15,
-    "enable_stime": "00:00",
-    "enable_stimes": [
-      "00:00"
-    ],
-    "enable_etime": "23:59",
-    "enable_etimes": [
-      "23:59"
-    ],
-    "enable_days_of_week": [
-      "1",
-      "2",
-      "3",
-      "4",
-      "5",
-      "6",
-      "0"
-    ],
-    "enable_days_of_weeks": [
-      [
-        "1",
-        "2",
-        "3",
-        "4",
-        "5",
-        "6",
-        "0"
-      ]
-    ],
-    "enable_in_bg": 0,
-    "notify_recovered": 1,
-    "notify_channels": [],
-    "notify_repeat_step": 60,
-    "notify_max_number": 0,
-    "recover_duration": 0,
-    "callbacks": [],
-    "runbook_url": "",
-    "append_tags": [
-      "alertname=ElasticsearchHeapUsageTooHigh"
-    ],
-    "annotations": null,
-    "extra_config": null
-  },
-  {
-    "cate": "prometheus",
-    "datasource_ids": [
-      52
-    ],
-    "name": "Elasticsearch Heap Usage warning of the instance",
-    "note": "",
-    "prod": "metric",
-    "algorithm": "",
-    "algo_params": null,
-    "delay": 0,
-    "severity": 2,
-    "severities": [
-      2
-    ],
-    "disabled": 1,
-    "prom_for_duration": 120,
-    "prom_ql": "",
-    "rule_config": {
-      "algo_params": null,
-      "inhibit": false,
-      "prom_ql": "",
-      "queries": [
-        {
-          "prom_ql": "(elasticsearch_jvm_memory_used_bytes{area=\"heap\"} / elasticsearch_jvm_memory_max_bytes{area=\"heap\"}) * 100 > 80",
-          "severity": 2
-        }
-      ],
-      "severity": 0
-    },
-    "prom_eval_interval": 15,
-    "enable_stime": "00:00",
-    "enable_stimes": [
-      "00:00"
-    ],
-    "enable_etime": "23:59",
-    "enable_etimes": [
-      "23:59"
-    ],
-    "enable_days_of_week": [
-      "1",
-      "2",
-      "3",
-      "4",
-      "5",
-      "6",
-      "0"
-    ],
-    "enable_days_of_weeks": [
-      [
-        "1",
-        "2",
-        "3",
-        "4",
-        "5",
-        "6",
-        "0"
-      ]
-    ],
-    "enable_in_bg": 0,
-    "notify_recovered": 1,
-    "notify_channels": [],
-    "notify_repeat_step": 60,
-    "notify_max_number": 0,
-    "recover_duration": 0,
-    "callbacks": [],
-    "runbook_url": "",
-    "append_tags": [
-      "alertname=ElasticsearchHeapUsageWarning"
-    ],
-    "annotations": null,
-    "extra_config": null
-  },
-  {
-    "cate": "prometheus",
-    "datasource_ids": [
-      52
-    ],
-    "name": "Elasticsearch initializing shards of the instance",
-    "note": "",
-    "prod": "metric",
-    "algorithm": "",
-    "algo_params": null,
-    "delay": 0,
-    "severity": 2,
-    "severities": [
-      2
-    ],
-    "disabled": 1,
-    "prom_for_duration": 900,
-    "prom_ql": "",
-    "rule_config": {
-      "algo_params": null,
-      "inhibit": false,
-      "prom_ql": "",
-      "queries": [
-        {
-          "prom_ql": "elasticsearch_cluster_health_initializing_shards > 0",
-          "severity": 2
-        }
-      ],
-      "severity": 0
-    },
-    "prom_eval_interval": 15,
-    "enable_stime": "00:00",
-    "enable_stimes": [
-      "00:00"
-    ],
-    "enable_etime": "23:59",
-    "enable_etimes": [
-      "23:59"
-    ],
-    "enable_days_of_week": [
-      "1",
-      "2",
-      "3",
-      "4",
-      "5",
-      "6",
-      "0"
-    ],
-    "enable_days_of_weeks": [
-      [
-        "1",
-        "2",
-        "3",
-        "4",
-        "5",
-        "6",
-        "0"
-      ]
-    ],
-    "enable_in_bg": 0,
-    "notify_recovered": 1,
-    "notify_channels": [],
-    "notify_repeat_step": 60,
-    "notify_max_number": 0,
-    "recover_duration": 0,
-    "callbacks": [],
-    "runbook_url": "",
-    "append_tags": [
-      "alertname=ElasticsearchInitializingShards"
-    ],
-    "annotations": null,
-    "extra_config": null
-  },
-  {
-    "cate": "prometheus",
-    "datasource_ids": [
-      52
-    ],
-    "name": "Elasticsearch no new documents of the instance",
-    "note": "",
-    "prod": "metric",
-    "algorithm": "",
-    "algo_params": null,
-    "delay": 0,
-    "severity": 2,
-    "severities": [
-      2
-    ],
-    "disabled": 1,
-    "prom_for_duration": 300,
-    "prom_ql": "",
-    "rule_config": {
-      "algo_params": null,
-      "inhibit": false,
-      "prom_ql": "",
-      "queries": [
-        {
-          "prom_ql": "rate(elasticsearch_indices_docs{es_data_node=\"true\"}[5m]) == 0",
-          "severity": 2
-        }
-      ],
-      "severity": 0
-    },
-    "prom_eval_interval": 15,
-    "enable_stime": "00:00",
-    "enable_stimes": [
-      "00:00"
-    ],
-    "enable_etime": "23:59",
-    "enable_etimes": [
-      "23:59"
-    ],
-    "enable_days_of_week": [
-      "1",
-      "2",
-      "3",
-      "4",
-      "5",
-      "6",
-      "0"
-    ],
-    "enable_days_of_weeks": [
-      [
-        "1",
-        "2",
-        "3",
-        "4",
-        "5",
-        "6",
-        "0"
-      ]
-    ],
-    "enable_in_bg": 0,
-    "notify_recovered": 1,
-    "notify_channels": [],
-    "notify_repeat_step": 60,
-    "notify_max_number": 0,
-    "recover_duration": 0,
-    "callbacks": [],
-    "runbook_url": "",
-    "append_tags": [
-      "alertname=ElasticsearchNoNewDocuments"
-    ],
-    "annotations": null,
-    "extra_config": null
-  },
-  {
-    "cate": "prometheus",
-    "datasource_ids": [
-      52
-    ],
-    "name": "Elasticsearch pending tasks of the instance",
-    "note": "",
-    "prod": "metric",
-    "algorithm": "",
-    "algo_params": null,
-    "delay": 0,
-    "severity": 2,
-    "severities": [
-      2
-    ],
-    "disabled": 1,
-    "prom_for_duration": 900,
-    "prom_ql": "",
-    "rule_config": {
-      "algo_params": null,
-      "inhibit": false,
-      "prom_ql": "",
-      "queries": [
-        {
-          "prom_ql": "elasticsearch_cluster_health_number_of_pending_tasks > 0",
-          "severity": 2
-        }
-      ],
-      "severity": 0
-    },
-    "prom_eval_interval": 15,
-    "enable_stime": "00:00",
-    "enable_stimes": [
-      "00:00"
-    ],
-    "enable_etime": "23:59",
-    "enable_etimes": [
-      "23:59"
-    ],
-    "enable_days_of_week": [
-      "1",
-      "2",
-      "3",
-      "4",
-      "5",
-      "6",
-      "0"
-    ],
-    "enable_days_of_weeks": [
-      [
-        "1",
-        "2",
-        "3",
-        "4",
-        "5",
-        "6",
-        "0"
-      ]
-    ],
-    "enable_in_bg": 0,
-    "notify_recovered": 1,
-    "notify_channels": [],
-    "notify_repeat_step": 60,
-    "notify_max_number": 0,
-    "recover_duration": 0,
-    "callbacks": [],
-    "runbook_url": "",
-    "append_tags": [
-      "alertname=ElasticsearchPendingTasks"
-    ],
-    "annotations": null,
-    "extra_config": null
-  },
-  {
-    "cate": "prometheus",
-    "datasource_ids": [
-      52
-    ],
-    "name": "Elasticsearch relocation shards of the instance",
-    "note": "",
-    "prod": "metric",
-    "algorithm": "",
-    "algo_params": null,
-    "delay": 0,
-    "severity": 1,
-    "severities": [
-      1
-    ],
-    "disabled": 1,
-    "prom_for_duration": 900,
-    "prom_ql": "",
-    "rule_config": {
-      "algo_params": null,
-      "inhibit": false,
-      "prom_ql": "",
-      "queries": [
-        {
-          "prom_ql": "elasticsearch_cluster_health_relocating_shards > 0",
-          "severity": 1
-        }
-      ],
-      "severity": 0
-    },
-    "prom_eval_interval": 15,
-    "enable_stime": "00:00",
-    "enable_stimes": [
-      "00:00"
-    ],
-    "enable_etime": "23:59",
-    "enable_etimes": [
-      "23:59"
-    ],
-    "enable_days_of_week": [
-      "1",
-      "2",
-      "3",
-      "4",
-      "5",
-      "6",
-      "0"
-    ],
-    "enable_days_of_weeks": [
-      [
-        "1",
-        "2",
-        "3",
-        "4",
-        "5",
-        "6",
-        "0"
-      ]
-    ],
-    "enable_in_bg": 0,
-    "notify_recovered": 1,
-    "notify_channels": [],
-    "notify_repeat_step": 60,
-    "notify_max_number": 0,
-    "recover_duration": 0,
-    "callbacks": [],
-    "runbook_url": "",
-    "append_tags": [
-      "alertname=ElasticsearchRelocationShards"
-    ],
-    "annotations": null,
-    "extra_config": null
-  },
-  {
-    "cate": "prometheus",
-    "datasource_ids": [
-      52
-    ],
-    "name": "Elasticsearch unassigned shards of the instance",
-    "note": "",
-    "prod": "metric",
-    "algorithm": "",
-    "algo_params": null,
-    "delay": 0,
-    "severity": 1,
-    "severities": [
-      1
-    ],
-    "disabled": 1,
-    "prom_for_duration": 0,
-    "prom_ql": "",
-    "rule_config": {
-      "algo_params": null,
-      "inhibit": false,
-      "prom_ql": "",
-      "queries": [
-        {
-          "prom_ql": "elasticsearch_cluster_health_unassigned_shards > 0",
-          "severity": 1
-        }
-      ],
-      "severity": 0
-    },
-    "prom_eval_interval": 15,
-    "enable_stime": "00:00",
-    "enable_stimes": [
-      "00:00"
-    ],
-    "enable_etime": "23:59",
-    "enable_etimes": [
-      "23:59"
-    ],
-    "enable_days_of_week": [
-      "1",
-      "2",
-      "3",
-      "4",
-      "5",
-      "6",
-      "0"
-    ],
-    "enable_days_of_weeks": [
-      [
-        "1",
-        "2",
-        "3",
-        "4",
-        "5",
-        "6",
-        "0"
-      ]
-    ],
-    "enable_in_bg": 0,
-    "notify_recovered": 1,
-    "notify_channels": [],
-    "notify_repeat_step": 60,
-    "notify_max_number": 0,
-    "recover_duration": 0,
-    "callbacks": [],
-    "runbook_url": "",
-    "append_tags": [
-      "alertname=ElasticsearchUnassignedShards"
-    ],
-    "annotations": null,
-    "extra_config": null
-  },
-  {
-    "cate": "prometheus",
-    "datasource_ids": [
-      52
-    ],
-    "name": "Elasticsearch Unhealthy Data Nodes",
-    "note": "",
-    "prod": "metric",
-    "algorithm": "",
-    "algo_params": null,
-    "delay": 0,
-    "severity": 1,
-    "severities": [
-      1
-    ],
-    "disabled": 1,
-    "prom_for_duration": 0,
-    "prom_ql": "",
-    "rule_config": {
-      "algo_params": null,
-      "inhibit": false,
-      "prom_ql": "",
-      "queries": [
-        {
-          "prom_ql": "elasticsearch_cluster_health_number_of_data_nodes < number_of_data_nodes",
-          "severity": 1
-        }
-      ],
-      "severity": 0
-    },
-    "prom_eval_interval": 15,
-    "enable_stime": "00:00",
-    "enable_stimes": [
-      "00:00"
-    ],
-    "enable_etime": "23:59",
-    "enable_etimes": [
-      "23:59"
-    ],
-    "enable_days_of_week": [
-      "1",
-      "2",
-      "3",
-      "4",
-      "5",
-      "6",
-      "0"
-    ],
-    "enable_days_of_weeks": [
-      [
-        "1",
-        "2",
-        "3",
-        "4",
-        "5",
-        "6",
-        "0"
-      ]
-    ],
-    "enable_in_bg": 0,
-    "notify_recovered": 1,
-    "notify_channels": [],
-    "notify_repeat_step": 60,
-    "notify_max_number": 0,
-    "recover_duration": 0,
-    "callbacks": [],
-    "runbook_url": "",
-    "append_tags": [
-      "alertname=ElasticsearchHealthyDataNodes"
-    ],
-    "annotations": null,
-    "extra_config": null
-  },
-  {
-    "cate": "prometheus",
-    "datasource_ids": [
-      52
-    ],
-    "name": "Elasticsearch Unhealthy Nodes",
-    "note": "",
-    "prod": "metric",
-    "algorithm": "",
-    "algo_params": null,
-    "delay": 0,
-    "severity": 1,
-    "severities": [
-      1
-    ],
-    "disabled": 1,
-    "prom_for_duration": 0,
-    "prom_ql": "",
-    "rule_config": {
-      "algo_params": null,
-      "inhibit": false,
-      "prom_ql": "",
-      "queries": [
-        {
-          "prom_ql": " elasticsearch_cluster_health_number_of_nodes < number_of_nodes",
-          "severity": 1
-        }
-      ],
-      "severity": 0
-    },
-    "prom_eval_interval": 15,
-    "enable_stime": "00:00",
-    "enable_stimes": [
-      "00:00"
-    ],
-    "enable_etime": "23:59",
-    "enable_etimes": [
-      "23:59"
-    ],
-    "enable_days_of_week": [
-      "1",
-      "2",
-      "3",
-      "4",
-      "5",
-      "6",
-      "0"
-    ],
-    "enable_days_of_weeks": [
-      [
-        "1",
-        "2",
-        "3",
-        "4",
-        "5",
-        "6",
-        "0"
-      ]
-    ],
-    "enable_in_bg": 0,
-    "notify_recovered": 1,
-    "notify_channels": [],
-    "notify_repeat_step": 60,
-    "notify_max_number": 0,
-    "recover_duration": 0,
-    "callbacks": [],
-    "runbook_url": "",
-    "append_tags": [
-      "alertname=ElasticsearchHealthyNodes"
-    ],
-    "annotations": null,
-    "extra_config": null
-  }
-]
--- a/integrations/ElasticSearch/dashboards/elasticsearch_by_categraf.json
+++ b/integrations/ElasticSearch/dashboards/elasticsearch_by_categraf.json
--- a/integrations/ElasticSearch/markdown/README.md
+++ b/integrations/ElasticSearch/markdown/README.md
@@ -1,26 +0,0 @@
-### 采集方式
-
-使用Categraf插件[elasticsearch](https://github.com/flashcatcloud/categraf/blob/main/conf/input.elasticsearch/elasticsearch.toml)采集ES指标；
-
-### 配置示例
-
-```yaml
-cat conf/input.elasticsearch/elasticsearch.toml | egrep -v "^#|^$"
-[[instances]]
-servers = ["http://192.168.11.177:9200"]
-http_timeout = "5s"
-local = true
-cluster_health = true
-cluster_health_level = "cluster"
-cluster_stats = true
-indices_level = ""
-node_stats = ["jvm", "breaker", "process", "os", "fs", "indices"]
-username = "elastic"
-password = "xxxxxxxx"
-num_most_recent_indices = 1
-labels = { instance="default-es" , service="es" }
-```
-
-### 效果图：
-
-![](./es-dashboard.jpeg)
--- a/integrations/ElasticSearch/markdown/es-dashboard.jpeg
+++ b/integrations/ElasticSearch/markdown/es-dashboard.jpeg
--- a/integrations/Gitlab/alerts/gitlab_by_categraf.json
+++ b/integrations/Gitlab/alerts/gitlab_by_categraf.json
@@ -1,702 +0,0 @@
-[
-  {
-    "cate": "prometheus",
-    "datasource_ids": [
-      0
-    ],
-    "name": "HighgRPCResourceExhaustedRate",
-    "note": "High gRPC ResourceExhausted error rate",
-    "prod": "metric",
-    "algorithm": "",
-    "algo_params": null,
-    "delay": 0,
-    "severity": 2,
-    "severities": [
-      2
-    ],
-    "disabled": 1,
-    "prom_for_duration": 3600,
-    "prom_ql": "sum without (grpc_code, grpc_method, grpc_service, grpc_type) (\n  rate(grpc_server_handled_total{grpc_code=\"ResourceExhausted\"}[5m])\n) / sum without (grpc_code, grpc_method, grpc_service, grpc_type) (\n  rate(grpc_server_handled_total[5m])\n) * 100 > 1\n",
-    "rule_config": {
-      "algo_params": null,
-      "inhibit": false,
-      "prom_ql": "",
-      "queries": [
-        {
-          "prom_ql": "sum without (grpc_code, grpc_method, grpc_service, grpc_type) (\n  rate(grpc_server_handled_total{grpc_code=\"ResourceExhausted\"}[5m])\n) / sum without (grpc_code, grpc_method, grpc_service, grpc_type) (\n  rate(grpc_server_handled_total[5m])\n) * 100 > 1\n",
-          "severity": 2
-        }
-      ],
-      "severity": 0
-    },
-    "prom_eval_interval": 15,
-    "enable_stime": "00:00",
-    "enable_stimes": [
-      "00:00"
-    ],
-    "enable_etime": "23:59",
-    "enable_etimes": [
-      "23:59"
-    ],
-    "enable_days_of_week": [
-      "1",
-      "2",
-      "3",
-      "4",
-      "5",
-      "6",
-      "0"
-    ],
-    "enable_days_of_weeks": [
-      [
-        "1",
-        "2",
-        "3",
-        "4",
-        "5",
-        "6",
-        "0"
-      ]
-    ],
-    "enable_in_bg": 0,
-    "notify_recovered": 1,
-    "notify_channels": [],
-    "notify_repeat_step": 60,
-    "notify_max_number": 0,
-    "recover_duration": 0,
-    "callbacks": [],
-    "runbook_url": "",
-    "append_tags": [],
-    "annotations": null
-  },
-  {
-    "cate": "prometheus",
-    "datasource_ids": [
-      0
-    ],
-    "name": "HighPumaUtilization",
-    "note": "Puma instance {{ $labels.instance }} has more than 90% thread utilization ({{ $value | printf \"%.1f\" }}%) over the last 60 minutes.",
-    "prod": "metric",
-    "algorithm": "",
-    "algo_params": null,
-    "delay": 0,
-    "severity": 2,
-    "severities": [
-      2
-    ],
-    "disabled": 1,
-    "prom_for_duration": 3600,
-    "prom_ql": "instance:puma_utilization:ratio * 100 > 90",
-    "rule_config": {
-      "algo_params": null,
-      "inhibit": false,
-      "prom_ql": "",
-      "queries": [
-        {
-          "prom_ql": "instance:puma_utilization:ratio * 100 > 90",
-          "severity": 2
-        }
-      ],
-      "severity": 0
-    },
-    "prom_eval_interval": 15,
-    "enable_stime": "00:00",
-    "enable_stimes": [
-      "00:00"
-    ],
-    "enable_etime": "23:59",
-    "enable_etimes": [
-      "23:59"
-    ],
-    "enable_days_of_week": [
-      "1",
-      "2",
-      "3",
-      "4",
-      "5",
-      "6",
-      "0"
-    ],
-    "enable_days_of_weeks": [
-      [
-        "1",
-        "2",
-        "3",
-        "4",
-        "5",
-        "6",
-        "0"
-      ]
-    ],
-    "enable_in_bg": 0,
-    "notify_recovered": 1,
-    "notify_channels": [],
-    "notify_repeat_step": 60,
-    "notify_max_number": 0,
-    "recover_duration": 0,
-    "callbacks": [],
-    "runbook_url": "",
-    "append_tags": [],
-    "annotations": null
-  },
-  {
-    "cate": "prometheus",
-    "datasource_ids": [
-      0
-    ],
-    "name": "PostgresDatabaseDeadlockCancels",
-    "note": "Postgres database has queries canceled due to deadlocks",
-    "prod": "metric",
-    "algorithm": "",
-    "algo_params": null,
-    "delay": 0,
-    "severity": 2,
-    "severities": [
-      2
-    ],
-    "disabled": 1,
-    "prom_for_duration": 0,
-    "prom_ql": "increase(pg_stat_database_deadlocks[5m]) > 0",
-    "rule_config": {
-      "algo_params": null,
-      "inhibit": false,
-      "prom_ql": "",
-      "queries": [
-        {
-          "prom_ql": "increase(pg_stat_database_deadlocks[5m]) > 0",
-          "severity": 2
-        }
-      ],
-      "severity": 0
-    },
-    "prom_eval_interval": 15,
-    "enable_stime": "00:00",
-    "enable_stimes": [
-      "00:00"
-    ],
-    "enable_etime": "23:59",
-    "enable_etimes": [
-      "23:59"
-    ],
-    "enable_days_of_week": [
-      "1",
-      "2",
-      "3",
-      "4",
-      "5",
-      "6",
-      "0"
-    ],
-    "enable_days_of_weeks": [
-      [
-        "1",
-        "2",
-        "3",
-        "4",
-        "5",
-        "6",
-        "0"
-      ]
-    ],
-    "enable_in_bg": 0,
-    "notify_recovered": 1,
-    "notify_channels": [],
-    "notify_repeat_step": 60,
-    "notify_max_number": 0,
-    "recover_duration": 0,
-    "callbacks": [],
-    "runbook_url": "",
-    "append_tags": [],
-    "annotations": null
-  },
-  {
-    "cate": "prometheus",
-    "datasource_ids": [
-      0
-    ],
-    "name": "PostgresDatabaseDeadlocks",
-    "note": "Postgres database has deadlocks",
-    "prod": "metric",
-    "algorithm": "",
-    "algo_params": null,
-    "delay": 0,
-    "severity": 2,
-    "severities": [
-      2
-    ],
-    "disabled": 1,
-    "prom_for_duration": 0,
-    "prom_ql": "increase(pg_stat_database_deadlocks[5m]) > 0",
-    "rule_config": {
-      "algo_params": null,
-      "inhibit": false,
-      "prom_ql": "",
-      "queries": [
-        {
-          "prom_ql": "increase(pg_stat_database_deadlocks[5m]) > 0",
-          "severity": 2
-        }
-      ],
-      "severity": 0
-    },
-    "prom_eval_interval": 15,
-    "enable_stime": "00:00",
-    "enable_stimes": [
-      "00:00"
-    ],
-    "enable_etime": "23:59",
-    "enable_etimes": [
-      "23:59"
-    ],
-    "enable_days_of_week": [
-      "1",
-      "2",
-      "3",
-      "4",
-      "5",
-      "6",
-      "0"
-    ],
-    "enable_days_of_weeks": [
-      [
-        "1",
-        "2",
-        "3",
-        "4",
-        "5",
-        "6",
-        "0"
-      ]
-    ],
-    "enable_in_bg": 0,
-    "notify_recovered": 1,
-    "notify_channels": [],
-    "notify_repeat_step": 60,
-    "notify_max_number": 0,
-    "recover_duration": 0,
-    "callbacks": [],
-    "runbook_url": "",
-    "append_tags": [],
-    "annotations": null
-  },
-  {
-    "cate": "prometheus",
-    "datasource_ids": [
-      0
-    ],
-    "name": "PostgresDown",
-    "note": "The Postgres service {{ $labels.job }} instance {{ $labels.instance }} is not responding for more than 50% of the time for 5 minutes.",
-    "prod": "metric",
-    "algorithm": "",
-    "algo_params": null,
-    "delay": 0,
-    "severity": 2,
-    "severities": [
-      2
-    ],
-    "disabled": 1,
-    "prom_for_duration": 0,
-    "prom_ql": "avg_over_time(pg_up[5m]) * 100 < 50",
-    "rule_config": {
-      "algo_params": null,
-      "inhibit": false,
-      "prom_ql": "",
-      "queries": [
-        {
-          "prom_ql": "avg_over_time(pg_up[5m]) * 100 < 50",
-          "severity": 2
-        }
-      ],
-      "severity": 0
-    },
-    "prom_eval_interval": 15,
-    "enable_stime": "00:00",
-    "enable_stimes": [
-      "00:00"
-    ],
-    "enable_etime": "23:59",
-    "enable_etimes": [
-      "23:59"
-    ],
-    "enable_days_of_week": [
-      "1",
-      "2",
-      "3",
-      "4",
-      "5",
-      "6",
-      "0"
-    ],
-    "enable_days_of_weeks": [
-      [
-        "1",
-        "2",
-        "3",
-        "4",
-        "5",
-        "6",
-        "0"
-      ]
-    ],
-    "enable_in_bg": 0,
-    "notify_recovered": 1,
-    "notify_channels": [],
-    "notify_repeat_step": 60,
-    "notify_max_number": 0,
-    "recover_duration": 0,
-    "callbacks": [],
-    "runbook_url": "",
-    "append_tags": [],
-    "annotations": null
-  },
-  {
-    "cate": "prometheus",
-    "datasource_ids": [
-      0
-    ],
-    "name": "PumaQueueing",
-    "note": "Puma instance {{ $labels.instance }} is queueing requests with an average of {{ $value | printf \"%.1f\" }} over the last 30 minutes.",
-    "prod": "metric",
-    "algorithm": "",
-    "algo_params": null,
-    "delay": 0,
-    "severity": 2,
-    "severities": [
-      2
-    ],
-    "disabled": 1,
-    "prom_for_duration": 0,
-    "prom_ql": "avg_over_time(puma_queued_connections[30m]) > 1",
-    "rule_config": {
-      "algo_params": null,
-      "inhibit": false,
-      "prom_ql": "",
-      "queries": [
-        {
-          "prom_ql": "avg_over_time(puma_queued_connections[30m]) > 1",
-          "severity": 2
-        }
-      ],
-      "severity": 0
-    },
-    "prom_eval_interval": 15,
-    "enable_stime": "00:00",
-    "enable_stimes": [
-      "00:00"
-    ],
-    "enable_etime": "23:59",
-    "enable_etimes": [
-      "23:59"
-    ],
-    "enable_days_of_week": [
-      "1",
-      "2",
-      "3",
-      "4",
-      "5",
-      "6",
-      "0"
-    ],
-    "enable_days_of_weeks": [
-      [
-        "1",
-        "2",
-        "3",
-        "4",
-        "5",
-        "6",
-        "0"
-      ]
-    ],
-    "enable_in_bg": 0,
-    "notify_recovered": 1,
-    "notify_channels": [],
-    "notify_repeat_step": 60,
-    "notify_max_number": 0,
-    "recover_duration": 0,
-    "callbacks": [],
-    "runbook_url": "",
-    "append_tags": [],
-    "annotations": null
-  },
-  {
-    "cate": "prometheus",
-    "datasource_ids": [
-      0
-    ],
-    "name": "RedisDown",
-    "note": "The Redis service {{ $labels.job }} instance {{ $labels.instance }} is not responding for more than 50% of the time for 5 minutes.",
-    "prod": "metric",
-    "algorithm": "",
-    "algo_params": null,
-    "delay": 0,
-    "severity": 2,
-    "severities": [
-      2
-    ],
-    "disabled": 1,
-    "prom_for_duration": 0,
-    "prom_ql": "avg_over_time(redis_up[5m]) * 100 < 50",
-    "rule_config": {
-      "algo_params": null,
-      "inhibit": false,
-      "prom_ql": "",
-      "queries": [
-        {
-          "prom_ql": "avg_over_time(redis_up[5m]) * 100 < 50",
-          "severity": 2
-        }
-      ],
-      "severity": 0
-    },
-    "prom_eval_interval": 15,
-    "enable_stime": "00:00",
-    "enable_stimes": [
-      "00:00"
-    ],
-    "enable_etime": "23:59",
-    "enable_etimes": [
-      "23:59"
-    ],
-    "enable_days_of_week": [
-      "1",
-      "2",
-      "3",
-      "4",
-      "5",
-      "6",
-      "0"
-    ],
-    "enable_days_of_weeks": [
-      [
-        "1",
-        "2",
-        "3",
-        "4",
-        "5",
-        "6",
-        "0"
-      ]
-    ],
-    "enable_in_bg": 0,
-    "notify_recovered": 1,
-    "notify_channels": [],
-    "notify_repeat_step": 60,
-    "notify_max_number": 0,
-    "recover_duration": 0,
-    "callbacks": [],
-    "runbook_url": "",
-    "append_tags": [],
-    "annotations": null
-  },
-  {
-    "cate": "prometheus",
-    "datasource_ids": [
-      0
-    ],
-    "name": "ServiceDown",
-    "note": "The service {{ $labels.job }} instance {{ $labels.instance }} is not responding for more than 50% of the time for 5 minutes.",
-    "prod": "metric",
-    "algorithm": "",
-    "algo_params": null,
-    "delay": 0,
-    "severity": 2,
-    "severities": [
-      2
-    ],
-    "disabled": 1,
-    "prom_for_duration": 0,
-    "prom_ql": "avg_over_time(up[5m]) * 100 < 50",
-    "rule_config": {
-      "algo_params": null,
-      "inhibit": false,
-      "prom_ql": "",
-      "queries": [
-        {
-          "prom_ql": "avg_over_time(up[5m]) * 100 < 50",
-          "severity": 2
-        }
-      ],
-      "severity": 0
-    },
-    "prom_eval_interval": 15,
-    "enable_stime": "00:00",
-    "enable_stimes": [
-      "00:00"
-    ],
-    "enable_etime": "23:59",
-    "enable_etimes": [
-      "23:59"
-    ],
-    "enable_days_of_week": [
-      "1",
-      "2",
-      "3",
-      "4",
-      "5",
-      "6",
-      "0"
-    ],
-    "enable_days_of_weeks": [
-      [
-        "1",
-        "2",
-        "3",
-        "4",
-        "5",
-        "6",
-        "0"
-      ]
-    ],
-    "enable_in_bg": 0,
-    "notify_recovered": 1,
-    "notify_channels": [],
-    "notify_repeat_step": 60,
-    "notify_max_number": 0,
-    "recover_duration": 0,
-    "callbacks": [],
-    "runbook_url": "",
-    "append_tags": [],
-    "annotations": null
-  },
-  {
-    "cate": "prometheus",
-    "datasource_ids": [
-      0
-    ],
-    "name": "SidekiqJobsQueuing",
-    "note": "Sidekiq has jobs queued",
-    "prod": "metric",
-    "algorithm": "",
-    "algo_params": null,
-    "delay": 0,
-    "severity": 2,
-    "severities": [
-      2
-    ],
-    "disabled": 1,
-    "prom_for_duration": 3600,
-    "prom_ql": "sum by (name) (sidekiq_queue_size) > 0",
-    "rule_config": {
-      "algo_params": null,
-      "inhibit": false,
-      "prom_ql": "",
-      "queries": [
-        {
-          "prom_ql": "sum by (name) (sidekiq_queue_size) > 0",
-          "severity": 2
-        }
-      ],
-      "severity": 0
-    },
-    "prom_eval_interval": 15,
-    "enable_stime": "00:00",
-    "enable_stimes": [
-      "00:00"
-    ],
-    "enable_etime": "23:59",
-    "enable_etimes": [
-      "23:59"
-    ],
-    "enable_days_of_week": [
-      "1",
-      "2",
-      "3",
-      "4",
-      "5",
-      "6",
-      "0"
-    ],
-    "enable_days_of_weeks": [
-      [
-        "1",
-        "2",
-        "3",
-        "4",
-        "5",
-        "6",
-        "0"
-      ]
-    ],
-    "enable_in_bg": 0,
-    "notify_recovered": 1,
-    "notify_channels": [],
-    "notify_repeat_step": 60,
-    "notify_max_number": 0,
-    "recover_duration": 0,
-    "callbacks": [],
-    "runbook_url": "",
-    "append_tags": [],
-    "annotations": null
-  },
-  {
-    "cate": "prometheus",
-    "datasource_ids": [
-      0
-    ],
-    "name": "WorkhorseHighErrorRate",
-    "note": "Workhorse has high error rates",
-    "prod": "metric",
-    "algorithm": "",
-    "algo_params": null,
-    "delay": 0,
-    "severity": 2,
-    "severities": [
-      2
-    ],
-    "disabled": 1,
-    "prom_for_duration": 0,
-    "prom_ql": "(\n  sum without (job, code) (\n    job_route_method_code:gitlab_workhorse_http_request_duration_seconds_count:rate5m{code=~\"5..\"}\n  ) /\n  sum without (job,code) (\n    job_route_method_code:gitlab_workhorse_http_request_duration_seconds_count:rate5m\n  ) < 10\n) * 100 > 50\n",
-    "rule_config": {
-      "algo_params": null,
-      "inhibit": false,
-      "prom_ql": "",
-      "queries": [
-        {
-          "prom_ql": "(\n  sum without (job, code) (\n    job_route_method_code:gitlab_workhorse_http_request_duration_seconds_count:rate5m{code=~\"5..\"}\n  ) /\n  sum without (job,code) (\n    job_route_method_code:gitlab_workhorse_http_request_duration_seconds_count:rate5m\n  ) < 10\n) * 100 > 50\n",
-          "severity": 2
-        }
-      ],
-      "severity": 0
-    },
-    "prom_eval_interval": 15,
-    "enable_stime": "00:00",
-    "enable_stimes": [
-      "00:00"
-    ],
-    "enable_etime": "23:59",
-    "enable_etimes": [
-      "23:59"
-    ],
-    "enable_days_of_week": [
-      "1",
-      "2",
-      "3",
-      "4",
-      "5",
-      "6",
-      "0"
-    ],
-    "enable_days_of_weeks": [
-      [
-        "1",
-        "2",
-        "3",
-        "4",
-        "5",
-        "6",
-        "0"
-      ]
-    ],
-    "enable_in_bg": 0,
-    "notify_recovered": 1,
-    "notify_channels": [],
-    "notify_repeat_step": 60,
-    "notify_max_number": 0,
-    "recover_duration": 0,
-    "callbacks": [],
-    "runbook_url": "",
-    "append_tags": [],
-    "annotations": null
-  }
-]
--- a/integrations/Gitlab/dashboards/MachinePerformance.json
+++ b/integrations/Gitlab/dashboards/MachinePerformance.json
@@ -1,712 +0,0 @@
-{
-  "name": "GitLab - Machine Performance",
-  "tags": "",
-  "ident": "",
-  "configs": {
-    "version": "3.0.0",
-    "links": [],
-    "var": [
-      {
-        "name": "DS_PROMETHEUS",
-        "type": "datasource",
-        "definition": "prometheus",
-        "defaultValue": 5
-      },
-      {
-        "name": "instance",
-        "type": "query",
-        "datasource": {
-          "cate": "prometheus",
-          "value": "${DS_PROMETHEUS}"
-        },
-        "definition": "query_result(node_boot_time_seconds)",
-        "reg": "/instance=\"(?<text>[^\"]*)/",
-        "multi": false
-      }
-    ],
-    "panels": [
-      {
-        "type": "stat",
-        "id": "a4389d18-8aed-4207-8fa9-4b25da036d6a",
-        "layout": {
-          "h": 3,
-          "w": 5,
-          "x": 0,
-          "y": 0,
-          "i": "a4389d18-8aed-4207-8fa9-4b25da036d6a",
-          "isResizable": true
-        },
-        "version": "3.0.0",
-        "datasourceCate": "prometheus",
-        "datasourceValue": "${DS_PROMETHEUS}",
-        "targets": [
-          {
-            "refId": "B",
-            "expr": "node_boot_time_seconds{instance=~\"$instance\"} / 60 / 60 /24 / 30 / 365",
-            "legend": "Uptime"
-          }
-        ],
-        "transformations": [
-          {
-            "id": "organize",
-            "options": {}
-          }
-        ],
-        "name": "Uptime",
-        "links": [],
-        "maxPerRow": 4,
-        "custom": {
-          "textMode": "value",
-          "graphMode": "none",
-          "colorMode": "value",
-          "calc": "lastNotNull",
-          "valueField": "Value",
-          "colSpan": 1,
-          "textSize": {}
-        },
-        "options": {
-          "valueMappings": [],
-          "standardOptions": {
-            "util": "none",
-            "decimals": 0
-          },
-          "thresholds": {
-            "steps": [
-              {
-                "color": "#73BF69",
-                "value": null,
-                "type": "base"
-              }
-            ]
-          }
-        }
-      },
-      {
-        "type": "stat",
-        "id": "fe9d5645-e775-446e-876b-35852b751961",
-        "layout": {
-          "h": 3,
-          "w": 2,
-          "x": 5,
-          "y": 0,
-          "i": "fe9d5645-e775-446e-876b-35852b751961",
-          "isResizable": true
-        },
-        "version": "3.0.0",
-        "datasourceCate": "prometheus",
-        "datasourceValue": "${DS_PROMETHEUS}",
-        "targets": [
-          {
-            "refId": "B",
-            "expr": "node_boot_time_seconds{instance=~\"$instance\"} / 60 / 60 /24 / 30 / 365",
-            "legend": "Uptime"
-          }
-        ],
-        "transformations": [
-          {
-            "id": "organize",
-            "options": {}
-          }
-        ],
-        "name": "Running",
-        "links": [],
-        "maxPerRow": 4,
-        "custom": {
-          "textMode": "value",
-          "graphMode": "none",
-          "colorMode": "value",
-          "calc": "lastNotNull",
-          "valueField": "service",
-          "colSpan": 1,
-          "textSize": {}
-        },
-        "options": {
-          "valueMappings": [],
-          "standardOptions": {
-            "util": "none"
-          },
-          "thresholds": {
-            "steps": [
-              {
-                "color": "#73BF69",
-                "value": null,
-                "type": "base"
-              }
-            ]
-          }
-        }
-      },
-      {
-        "type": "barGauge",
-        "id": "3190bf4b-c7a3-4044-955c-f488b31a200b",
-        "layout": {
-          "h": 3,
-          "w": 5,
-          "x": 7,
-          "y": 0,
-          "i": "3190bf4b-c7a3-4044-955c-f488b31a200b",
-          "isResizable": true
-        },
-        "version": "3.0.0",
-        "datasourceCate": "prometheus",
-        "datasourceValue": "${DS_PROMETHEUS}",
-        "targets": [
-          {
-            "refId": "A",
-            "expr": "node_timex_sync_status{instance=\"$instance\"}",
-            "legend": "NTP Enabled"
-          },
-          {
-            "refId": "B",
-            "expr": "node_timex_offset_seconds{instance=\"$instance\"}",
-            "legend": "NTP Offset"
-          }
-        ],
-        "transformations": [
-          {
-            "id": "organize",
-            "options": {}
-          }
-        ],
-        "name": "NTP",
-        "links": [],
-        "description": "",
-        "maxPerRow": 4,
-        "custom": {
-          "calc": "avg",
-          "baseColor": "#9470FF",
-          "serieWidth": 20,
-          "sortOrder": "desc"
-        },
-        "options": {
-          "valueMappings": [],
-          "standardOptions": {
-            "util": "milliseconds"
-          }
-        }
-      },
-      {
-        "type": "hexbin",
-        "id": "f1c435fa-8c9d-40cc-96ab-54889f32a178",
-        "layout": {
-          "h": 3,
-          "w": 12,
-          "x": 12,
-          "y": 0,
-          "i": "f1c435fa-8c9d-40cc-96ab-54889f32a178",
-          "isResizable": true
-        },
-        "version": "3.0.0",
-        "datasourceCate": "prometheus",
-        "datasourceValue": "${DS_PROMETHEUS}",
-        "targets": [
-          {
-            "refId": "A",
-            "expr": "count(count(node_cpu_seconds_total{instance=~\"$instance\"}) by (cpu))",
-            "legend": "Core"
-          },
-          {
-            "refId": "B",
-            "expr": "node_memory_MemTotal_bytes{instance=~\"$instance\"}",
-            "legend": "Mem"
-          },
-          {
-            "refId": "C",
-            "expr": "node_memory_SwapTotal_bytes{instance=~\"$instance\"}",
-            "legend": "Swap"
-          },
-          {
-            "refId": "D",
-            "expr": "sum(node_filesystem_size_bytes{instance=~\"$instance\"}) ",
-            "legend": "Disk"
-          },
-          {
-            "refId": "E",
-            "expr": "node_filefd_allocated{instance=~\"$instance\"}",
-            "legend": "Openfiles"
-          },
-          {
-            "refId": "F",
-            "expr": "rate(node_context_switches_total{instance=~\"$instance\"}[1m])",
-            "legend": "ContextSwitch"
-          }
-        ],
-        "transformations": [
-          {
-            "id": "organize",
-            "options": {}
-          }
-        ],
-        "name": "System Info",
-        "links": [],
-        "maxPerRow": 4,
-        "custom": {
-          "textMode": "valueAndName",
-          "calc": "lastNotNull",
-          "colorRange": [
-            "#83c898",
-            "#c2c2c2",
-            "#fc653f"
-          ],
-          "reverseColorOrder": false,
-          "colorDomainAuto": true
-        },
-        "options": {
-          "standardOptions": {}
-        }
-      },
-      {
-        "type": "timeseries",
-        "id": "d0add8e0-c815-4442-8a3b-d86d3bc3d8fd",
-        "layout": {
-          "h": 7,
-          "w": 9,
-          "x": 0,
-          "y": 3,
-          "i": "d0add8e0-c815-4442-8a3b-d86d3bc3d8fd",
-          "isResizable": true
-        },
-        "version": "3.0.0",
-        "datasourceCate": "prometheus",
-        "datasourceValue": "${DS_PROMETHEUS}",
-        "targets": [
-          {
-            "refId": "A",
-            "expr": "max(node_load1{instance=~\"$instance\"}) / max(count(node_cpu_seconds_total{instance=~\"$instance\", mode=~\"system\"}))",
-            "legend": "1m"
-          },
-          {
-            "refId": "B",
-            "expr": "max(node_load5{instance=~\"$instance\"}) / max(count(node_cpu_seconds_total{instance=~\"$instance\", mode=~\"system\"}))",
-            "legend": "5m"
-          },
-          {
-            "refId": "C",
-            "expr": "max(node_load15{instance=~\"$instance\"}) / max(count(node_cpu_seconds_total{instance=~\"$instance\", mode=~\"system\"}))",
-            "legend": "15m"
-          }
-        ],
-        "transformations": [
-          {
-            "id": "organize",
-            "options": {}
-          }
-        ],
-        "name": "Load Average",
-        "links": [],
-        "maxPerRow": 4,
-        "options": {
-          "tooltip": {
-            "mode": "all",
-            "sort": "none"
-          },
-          "legend": {
-            "displayMode": "hidden"
-          },
-          "standardOptions": {},
-          "thresholds": {
-            "steps": [
-              {
-                "color": "#634CD9",
-                "value": null,
-                "type": "base"
-              }
-            ]
-          }
-        },
-        "custom": {
-          "drawStyle": "lines",
-          "lineInterpolation": "smooth",
-          "spanNulls": false,
-          "lineWidth": 1,
-          "fillOpacity": 0.5,
-          "gradientMode": "none",
-          "stack": "off",
-          "scaleDistribution": {
-            "type": "linear"
-          }
-        }
-      },
-      {
-        "type": "timeseries",
-        "id": "83f3134f-1fdb-4bd6-bc2e-7d32222c2660",
-        "layout": {
-          "h": 7,
-          "w": 15,
-          "x": 9,
-          "y": 3,
-          "i": "83f3134f-1fdb-4bd6-bc2e-7d32222c2660",
-          "isResizable": true
-        },
-        "version": "3.0.0",
-        "datasourceCate": "prometheus",
-        "datasourceValue": "${DS_PROMETHEUS}",
-        "targets": [
-          {
-            "refId": "A",
-            "expr": "1 - (avg(irate(node_cpu_seconds_total{instance=~\"$instance\",mode=~\"idle\"}[2m])))",
-            "legend": "CPU"
-          },
-          {
-            "refId": "B",
-            "expr": "(node_memory_MemTotal_bytes{instance=~\"$instance\"} - (node_memory_MemFree_bytes{instance=~\"$instance\"} + node_memory_Buffers_bytes{instance=~\"$instance\"} + node_memory_Cached_bytes{instance=~\"$instance\"})) / node_memory_MemTotal_bytes{instance=~\"$instance\"}",
-            "legend": "MEM"
-          },
-          {
-            "refId": "C",
-            "expr": "avg(irate(node_cpu_seconds_total{instance=~\"$instance\",mode=~\"iowait\"}[2m]))",
-            "legend": "IOWAIT"
-          }
-        ],
-        "transformations": [
-          {
-            "id": "organize",
-            "options": {}
-          }
-        ],
-        "name": "Resource Usage",
-        "links": [],
-        "maxPerRow": 4,
-        "options": {
-          "tooltip": {
-            "mode": "all",
-            "sort": "none"
-          },
-          "legend": {
-            "displayMode": "hidden"
-          },
-          "standardOptions": {},
-          "thresholds": {
-            "steps": [
-              {
-                "color": "#634CD9",
-                "value": null,
-                "type": "base"
-              }
-            ]
-          }
-        },
-        "custom": {
-          "drawStyle": "lines",
-          "lineInterpolation": "smooth",
-          "spanNulls": false,
-          "lineWidth": 1,
-          "fillOpacity": 0.5,
-          "gradientMode": "none",
-          "stack": "off",
-          "scaleDistribution": {
-            "type": "linear"
-          }
-        }
-      },
-      {
-        "type": "timeseries",
-        "id": "2a57ae69-c0e1-447c-825d-bcee2bcb6d3f",
-        "layout": {
-          "h": 5,
-          "w": 24,
-          "x": 0,
-          "y": 10,
-          "i": "2a57ae69-c0e1-447c-825d-bcee2bcb6d3f",
-          "isResizable": true
-        },
-        "version": "3.0.0",
-        "datasourceCate": "prometheus",
-        "datasourceValue": "${DS_PROMETHEUS}",
-        "targets": [
-          {
-            "refId": "A",
-            "expr": "node_memory_MemAvailable_bytes{instance=~\"$instance\"}",
-            "legend": "Available"
-          },
-          {
-            "refId": "B",
-            "expr": "node_memory_Buffers_bytes{instance=~\"$instance\"} + node_memory_Cached_bytes{instance=~\"$instance\"}",
-            "legend": "Buffers/Cached"
-          },
-          {
-            "refId": "C",
-            "expr": "node_memory_MemTotal_bytes{instance=~\"$instance\"} - node_memory_MemAvailable_bytes{instance=~\"$instance\"}",
-            "legend": "Used"
-          },
-          {
-            "refId": "D",
-            "expr": "node_memory_MemFree_bytes{instance=~\"$instance\"}",
-            "legend": "Free"
-          },
-          {
-            "refId": "E",
-            "expr": "node_memory_MemTotal_bytes{instance=~\"$instance\"}",
-            "legend": "Total"
-          }
-        ],
-        "transformations": [
-          {
-            "id": "organize",
-            "options": {}
-          }
-        ],
-        "name": "Memory Usage",
-        "links": [],
-        "maxPerRow": 4,
-        "options": {
-          "tooltip": {
-            "mode": "all",
-            "sort": "desc"
-          },
-          "legend": {
-            "displayMode": "list",
-            "placement": "bottom"
-          },
-          "standardOptions": {},
-          "thresholds": {
-            "steps": [
-              {
-                "color": "#634CD9",
-                "value": null,
-                "type": "base"
-              }
-            ]
-          }
-        },
-        "custom": {
-          "drawStyle": "lines",
-          "lineInterpolation": "smooth",
-          "spanNulls": false,
-          "lineWidth": 1,
-          "fillOpacity": 0.5,
-          "gradientMode": "none",
-          "stack": "off",
-          "scaleDistribution": {
-            "type": "linear"
-          }
-        }
-      },
-      {
-        "type": "timeseries",
-        "id": "f291673f-3b9d-4b4f-a2b1-2ed7131e57f0",
-        "layout": {
-          "h": 9,
-          "w": 15,
-          "x": 0,
-          "y": 15,
-          "i": "f291673f-3b9d-4b4f-a2b1-2ed7131e57f0",
-          "isResizable": true
-        },
-        "version": "3.0.0",
-        "datasourceCate": "prometheus",
-        "datasourceValue": "${DS_PROMETHEUS}",
-        "targets": [
-          {
-            "refId": "A",
-            "expr": "sum by (instance) (irate(node_disk_reads_completed_total{instance=~\"$instance\"}[1m]))",
-            "legend": "{{instance}}-Reads"
-          },
-          {
-            "refId": "B",
-            "expr": "sum by (instance) (irate(node_disk_writes_completed_total{instance=~\"$instance\"}[1m]))",
-            "legend": "{{instance}}-Writes"
-          },
-          {
-            "refId": "C",
-            "expr": "sum by (instance) (node_disk_io_now{instance=~\"$instance\"})",
-            "legend": "{{instance}}-CurrentIO"
-          },
-          {
-            "refId": "D",
-            "expr": "sum by (instance) (irate(node_disk_read_time_seconds_total{instance=~\"$instance\"}[5m])) / sum by (instance) (irate(node_disk_reads_completed_total{instance=~\"$instance\"}[5m]))",
-            "legend": "{{instance}}-Read-consuming"
-          },
-          {
-            "refId": "E",
-            "expr": "sum by (instance) (irate(node_disk_write_time_seconds_total{instance=~\"$instance\"}[5m])) / sum by (instance) (irate(node_disk_writes_completed_total{instance=~\"$instance\"}[5m]))",
-            "legend": "{{instance}}-Write-consuming"
-          }
-        ],
-        "transformations": [
-          {
-            "id": "organize",
-            "options": {}
-          }
-        ],
-        "name": "Disk IO",
-        "links": [],
-        "maxPerRow": 4,
-        "options": {
-          "tooltip": {
-            "mode": "multi"
-          },
-          "legend": {
-            "displayMode": "list",
-            "placement": "bottom"
-          },
-          "standardOptions": {
-            "util": "none"
-          },
-          "thresholds": {
-            "steps": [
-              {
-                "color": "#73BF69",
-                "value": null,
-                "type": "base"
-              }
-            ]
-          }
-        },
-        "custom": {
-          "drawStyle": "lines",
-          "lineInterpolation": "linear",
-          "spanNulls": false,
-          "lineWidth": 1,
-          "fillOpacity": 0.1,
-          "gradientMode": "none",
-          "stack": "off",
-          "scaleDistribution": {
-            "type": "linear"
-          }
-        }
-      },
-      {
-        "type": "timeseries",
-        "id": "8cb012a2-113c-4d06-8bea-da7d14a870d2",
-        "layout": {
-          "h": 9,
-          "w": 9,
-          "x": 15,
-          "y": 15,
-          "i": "8cb012a2-113c-4d06-8bea-da7d14a870d2",
-          "isResizable": true
-        },
-        "version": "3.0.0",
-        "datasourceCate": "prometheus",
-        "datasourceValue": "${DS_PROMETHEUS}",
-        "targets": [
-          {
-            "refId": "A",
-            "expr": "node_filesystem_avail_bytes{instance=~\"$instance\",fstype=~\"ext4|xfs|nfs\"}",
-            "legend": "{{device}}",
-            "instant": false
-          },
-          {
-            "refId": "B",
-            "expr": "1-(node_filesystem_free_bytes{instance=~\"$instance\",fstype=~\"ext4|xfs|nfs\"} / node_filesystem_size_bytes{instance=\"$instance\",fstype=~\"ext4|xfs|nfs\"})",
-            "legend": "{{device}}"
-          },
-          {
-            "refId": "C",
-            "expr": "sum(node_filesystem_size_bytes{instance=~\"$instance\",fstype=~\"ext4|xfs|nfs\"})",
-            "legend": "{{device}}"
-          }
-        ],
-        "transformations": [
-          {
-            "id": "organize",
-            "options": {}
-          }
-        ],
-        "name": "Disk Usage",
-        "links": [],
-        "maxPerRow": 4,
-        "options": {
-          "tooltip": {
-            "mode": "all",
-            "sort": "none"
-          },
-          "legend": {
-            "displayMode": "list",
-            "placement": "bottom"
-          },
-          "standardOptions": {},
-          "thresholds": {
-            "steps": [
-              {
-                "color": "#634CD9",
-                "value": null,
-                "type": "base"
-              }
-            ]
-          }
-        },
-        "custom": {
-          "drawStyle": "lines",
-          "lineInterpolation": "smooth",
-          "spanNulls": false,
-          "lineWidth": 1,
-          "fillOpacity": 0.5,
-          "gradientMode": "none",
-          "stack": "off",
-          "scaleDistribution": {
-            "type": "linear"
-          }
-        }
-      },
-      {
-        "type": "timeseries",
-        "id": "2f11831d-6bdd-4cfa-9b3f-3bc5b1722185",
-        "layout": {
-          "h": 10,
-          "w": 24,
-          "x": 0,
-          "y": 24,
-          "i": "2f11831d-6bdd-4cfa-9b3f-3bc5b1722185",
-          "isResizable": true
-        },
-        "version": "3.0.0",
-        "datasourceCate": "prometheus",
-        "datasourceValue": "${DS_PROMETHEUS}",
-        "targets": [
-          {
-            "refId": "A",
-            "expr": "sum by (instance) (irate(node_network_receive_bytes_total{instance=~\"$instance\",device!~\"tap.*|veth.*|br.*|docker.*|virbr*|lo*|nointernet*\"}[5m]))",
-            "legend": "{{instance}}-{{device}}-receive"
-          },
-          {
-            "refId": "B",
-            "expr": "sum by (instance) (irate(node_network_transmit_bytes_total{instance=~\"$instance\",device!~\"tap.*|veth.*|br.*|docker.*|virbr*|lo*|nointernet*\"}[5m]))",
-            "legend": "{{instance}}-{{device}}-transmit"
-          }
-        ],
-        "transformations": [
-          {
-            "id": "organize",
-            "options": {}
-          }
-        ],
-        "name": "Network Traffic",
-        "links": [],
-        "maxPerRow": 4,
-        "options": {
-          "tooltip": {
-            "mode": "all",
-            "sort": "none"
-          },
-          "legend": {
-            "displayMode": "hidden"
-          },
-          "standardOptions": {},
-          "thresholds": {
-            "steps": [
-              {
-                "color": "#634CD9",
-                "value": null,
-                "type": "base"
-              }
-            ]
-          }
-        },
-        "custom": {
-          "drawStyle": "lines",
-          "lineInterpolation": "linear",
-          "spanNulls": false,
-          "lineWidth": 1,
-          "fillOpacity": 0.5,
-          "gradientMode": "none",
-          "stack": "off",
-          "scaleDistribution": {
-            "type": "linear"
-          }
-        }
-      }
-    ]
-  }
-}
--- a/integrations/Gitlab/dashboards/NGINXVTS.json
+++ b/integrations/Gitlab/dashboards/NGINXVTS.json
@@ -1,501 +0,0 @@
-{
-  "name": "GitLab - NGINX VTS",
-  "tags": "",
-  "ident": "",
-  "configs": {
-    "version": "3.0.0",
-    "links": [],
-    "var": [
-      {
-        "name": "DS_PROMETHEUS",
-        "type": "datasource",
-        "definition": "prometheus",
-        "defaultValue": 5
-      },
-      {
-        "name": "instance",
-        "type": "query",
-        "datasource": {
-          "cate": "prometheus",
-          "value": "${DS_PROMETHEUS}"
-        },
-        "definition": "label_values(up{job=\"nginx\"}, instance)",
-        "reg": "",
-        "multi": true,
-        "allOption": true
-      }
-    ],
-    "panels": [
-      {
-        "type": "timeseries",
-        "id": "ad321a25-c895-4cf0-b5ce-2a60c7f035ac",
-        "layout": {
-          "h": 4,
-          "w": 7,
-          "x": 0,
-          "y": 0,
-          "i": "ad321a25-c895-4cf0-b5ce-2a60c7f035ac"
-        },
-        "version": "3.0.0",
-        "datasourceCate": "prometheus",
-        "datasourceValue": "${DS_PROMETHEUS}",
-        "targets": [
-          {
-            "refId": "B",
-            "expr": "topk(1, count by (hostname) (nginx_vts_info{instance=~\"$instance\"}))",
-            "legend": "hostname: {{hostname}}"
-          },
-          {
-            "refId": "C",
-            "expr": "topk(1, count by (version) (nginx_vts_info{instance=~\"$instance\"}))",
-            "legend": "nginx:  {{version}}"
-          }
-        ],
-        "transformations": [
-          {
-            "id": "organize",
-            "options": {}
-          }
-        ],
-        "name": "Nginx Info",
-        "links": [],
-        "maxPerRow": 4,
-        "options": {
-          "tooltip": {
-            "mode": "all",
-            "sort": "none"
-          },
-          "legend": {
-            "displayMode": "hidden"
-          },
-          "standardOptions": {},
-          "thresholds": {
-            "steps": [
-              {
-                "color": "#634CD9",
-                "value": null,
-                "type": "base"
-              }
-            ]
-          }
-        },
-        "custom": {
-          "drawStyle": "lines",
-          "lineInterpolation": "smooth",
-          "spanNulls": false,
-          "lineWidth": 1,
-          "fillOpacity": 0.5,
-          "gradientMode": "none",
-          "stack": "off",
-          "scaleDistribution": {
-            "type": "linear"
-          }
-        }
-      },
-      {
-        "type": "timeseries",
-        "id": "f6643654-98f5-4d4a-8dd2-943a2f4f8e68",
-        "layout": {
-          "h": 12,
-          "w": 17,
-          "x": 7,
-          "y": 0,
-          "i": "f6643654-98f5-4d4a-8dd2-943a2f4f8e68"
-        },
-        "version": "3.0.0",
-        "datasourceCate": "prometheus",
-        "datasourceValue": "${DS_PROMETHEUS}",
-        "targets": [
-          {
-            "refId": "A",
-            "expr": "sum by (instance) (\n  rate(nginx_vts_upstream_request_seconds_total{instance=~\"$instance\"}[5m])\n) /\nsum by (instance) (\n  rate(nginx_vts_upstream_requests_total{instance=~\"$instance\"}[5m])\n)",
-            "legend": "{{instance}}",
-            "step": 15,
-            "instant": false,
-            "time": {
-              "start": "now-6h",
-              "end": "now"
-            }
-          }
-        ],
-        "transformations": [
-          {
-            "id": "organize",
-            "options": {}
-          }
-        ],
-        "name": "Latency",
-        "links": [],
-        "maxPerRow": 4,
-        "options": {
-          "tooltip": {
-            "mode": "multi"
-          },
-          "legend": {
-            "displayMode": "list",
-            "placement": "bottom"
-          },
-          "standardOptions": {
-            "util": "seconds",
-            "min": 0
-          },
-          "thresholds": {
-            "steps": [
-              {
-                "color": "#73BF69",
-                "value": null,
-                "type": "base"
-              },
-              {
-                "color": "#F2495C",
-                "value": 80
-              }
-            ]
-          }
-        },
-        "custom": {
-          "drawStyle": "lines",
-          "lineInterpolation": "linear",
-          "spanNulls": false,
-          "lineWidth": 1,
-          "fillOpacity": 0.1,
-          "gradientMode": "none",
-          "stack": "off",
-          "scaleDistribution": {
-            "type": "linear"
-          }
-        }
-      },
-      {
-        "type": "timeseries",
-        "id": "cb24fbce-8bb5-425e-89f3-c32e22532b5d",
-        "layout": {
-          "h": 8,
-          "w": 7,
-          "x": 0,
-          "y": 4,
-          "i": "cb24fbce-8bb5-425e-89f3-c32e22532b5d"
-        },
-        "version": "3.0.0",
-        "datasourceCate": "prometheus",
-        "datasourceValue": "${DS_PROMETHEUS}",
-        "targets": [
-          {
-            "refId": "A",
-            "expr": "sum by (shared) (nginx_vts_main_shm_usage_bytes{instance=~\"$instance\", job=~\"nginx\"})",
-            "legend": "{{shared}}"
-          }
-        ],
-        "transformations": [
-          {
-            "id": "organize",
-            "options": {}
-          }
-        ],
-        "name": "Shared Memory Usage",
-        "links": [],
-        "maxPerRow": 4,
-        "options": {
-          "tooltip": {
-            "mode": "all",
-            "sort": "none"
-          },
-          "legend": {
-            "displayMode": "hidden"
-          },
-          "standardOptions": {},
-          "thresholds": {
-            "steps": [
-              {
-                "color": "#634CD9",
-                "value": null,
-                "type": "base"
-              }
-            ]
-          }
-        },
-        "custom": {
-          "drawStyle": "lines",
-          "lineInterpolation": "smooth",
-          "spanNulls": false,
-          "lineWidth": 1,
-          "fillOpacity": 0.5,
-          "gradientMode": "none",
-          "stack": "off",
-          "scaleDistribution": {
-            "type": "linear"
-          }
-        }
-      },
-      {
-        "type": "timeseries",
-        "id": "54c5264a-a596-486f-a4a8-4ab451d91870",
-        "layout": {
-          "h": 8,
-          "w": 12,
-          "x": 0,
-          "y": 13,
-          "i": "54c5264a-a596-486f-a4a8-4ab451d91870"
-        },
-        "version": "3.0.0",
-        "datasourceCate": "prometheus",
-        "datasourceValue": "${DS_PROMETHEUS}",
-        "targets": [
-          {
-            "refId": "A",
-            "expr": "sum without (instance) (\n  rate(nginx_vts_server_bytes_total{instance=~\"$instance\"}[5m])\n)",
-            "legend": "{{direction}}-{{host}}"
-          }
-        ],
-        "transformations": [
-          {
-            "id": "organize",
-            "options": {}
-          }
-        ],
-        "name": "Server - Current total of incoming / outgoing bytes",
-        "links": [],
-        "maxPerRow": 4,
-        "options": {
-          "tooltip": {
-            "mode": "multi"
-          },
-          "legend": {
-            "displayMode": "list",
-            "placement": "bottom"
-          },
-          "standardOptions": {
-            "util": "bytesSI"
-          },
-          "thresholds": {
-            "steps": [
-              {
-                "color": "#73BF69",
-                "value": null,
-                "type": "base"
-              },
-              {
-                "color": "#F2495C",
-                "value": 80
-              }
-            ]
-          }
-        },
-        "custom": {
-          "drawStyle": "lines",
-          "lineInterpolation": "linear",
-          "spanNulls": false,
-          "lineWidth": 1,
-          "fillOpacity": 0.2,
-          "gradientMode": "none",
-          "stack": "off",
-          "scaleDistribution": {
-            "type": "linear"
-          }
-        }
-      },
-      {
-        "type": "timeseries",
-        "id": "d0efa52f-862e-49b0-aa8c-7a9ba4f2af0b",
-        "layout": {
-          "h": 8,
-          "w": 12,
-          "x": 12,
-          "y": 13,
-          "i": "d0efa52f-862e-49b0-aa8c-7a9ba4f2af0b"
-        },
-        "version": "3.0.0",
-        "datasourceCate": "prometheus",
-        "datasourceValue": "${DS_PROMETHEUS}",
-        "targets": [
-          {
-            "refId": "A",
-            "expr": "sum without (instance) (\n  rate(nginx_vts_upstream_bytes_total{instance=~\"$instance\"}[5m])\n)",
-            "legend": "{{direction}}-{{backend}}-{{upstream}}"
-          }
-        ],
-        "transformations": [
-          {
-            "id": "organize",
-            "options": {}
-          }
-        ],
-        "name": "Upstream - Current total of incoming / outgoing bytes",
-        "links": [],
-        "maxPerRow": 4,
-        "options": {
-          "tooltip": {
-            "mode": "multi"
-          },
-          "legend": {
-            "displayMode": "list",
-            "placement": "bottom"
-          },
-          "standardOptions": {
-            "util": "bytesSI"
-          },
-          "thresholds": {
-            "steps": [
-              {
-                "color": "#73BF69",
-                "value": null,
-                "type": "base"
-              },
-              {
-                "color": "#F2495C",
-                "value": 80
-              }
-            ]
-          }
-        },
-        "custom": {
-          "drawStyle": "lines",
-          "lineInterpolation": "linear",
-          "spanNulls": false,
-          "lineWidth": 1,
-          "fillOpacity": 0.1,
-          "gradientMode": "none",
-          "stack": "off",
-          "scaleDistribution": {
-            "type": "linear"
-          }
-        }
-      },
-      {
-        "type": "timeseries",
-        "id": "712b82cd-633a-4088-8695-fa2d75ab37ca",
-        "layout": {
-          "h": 8,
-          "w": 12,
-          "x": 0,
-          "y": 22,
-          "i": "712b82cd-633a-4088-8695-fa2d75ab37ca"
-        },
-        "version": "3.0.0",
-        "datasourceCate": "prometheus",
-        "datasourceValue": "${DS_PROMETHEUS}",
-        "targets": [
-          {
-            "refId": "A",
-            "expr": "sum without (instance) (\n  rate(nginx_vts_server_requests_total{instance=~\"$instance\"}[5m])\n)",
-            "legend": "{{code}} {{host}}"
-          }
-        ],
-        "transformations": [
-          {
-            "id": "organize",
-            "options": {}
-          }
-        ],
-        "name": "Server - Requests by HTTP code",
-        "links": [],
-        "maxPerRow": 4,
-        "options": {
-          "tooltip": {
-            "mode": "multi"
-          },
-          "legend": {
-            "displayMode": "list",
-            "placement": "bottom"
-          },
-          "standardOptions": {
-            "util": "none",
-            "min": 0
-          },
-          "thresholds": {
-            "steps": [
-              {
-                "color": "#73BF69",
-                "value": null,
-                "type": "base"
-              },
-              {
-                "color": "#F2495C",
-                "value": 80
-              }
-            ]
-          }
-        },
-        "custom": {
-          "drawStyle": "lines",
-          "lineInterpolation": "linear",
-          "spanNulls": false,
-          "lineWidth": 1,
-          "fillOpacity": 0.2,
-          "gradientMode": "none",
-          "stack": "off",
-          "scaleDistribution": {
-            "type": "linear"
-          }
-        }
-      },
-      {
-        "type": "timeseries",
-        "id": "09ca96b6-4e23-4db2-bc14-79c5f965d16f",
-        "layout": {
-          "h": 8,
-          "w": 12,
-          "x": 12,
-          "y": 22,
-          "i": "09ca96b6-4e23-4db2-bc14-79c5f965d16f"
-        },
-        "version": "3.0.0",
-        "datasourceCate": "prometheus",
-        "datasourceValue": "${DS_PROMETHEUS}",
-        "targets": [
-          {
-            "refId": "A",
-            "expr": "sum without (instance) (\n  rate(nginx_vts_upstream_requests_total{instance=~\"$instance\"}[5m])\n)",
-            "legend": "{{code}} {{backend}} {{upstream }}"
-          }
-        ],
-        "transformations": [
-          {
-            "id": "organize",
-            "options": {}
-          }
-        ],
-        "name": "Upstream - Requests by HTTP code",
-        "links": [],
-        "maxPerRow": 4,
-        "options": {
-          "tooltip": {
-            "mode": "multi"
-          },
-          "legend": {
-            "displayMode": "list",
-            "placement": "bottom"
-          },
-          "standardOptions": {
-            "util": "none"
-          },
-          "thresholds": {
-            "steps": [
-              {
-                "color": "#73BF69",
-                "value": null,
-                "type": "base"
-              },
-              {
-                "color": "#F2495C",
-                "value": 80
-              }
-            ]
-          }
-        },
-        "custom": {
-          "drawStyle": "lines",
-          "lineInterpolation": "linear",
-          "spanNulls": false,
-          "lineWidth": 1,
-          "fillOpacity": 0.2,
-          "gradientMode": "none",
-          "stack": "off",
-          "scaleDistribution": {
-            "type": "linear"
-          }
-        }
-      }
-    ]
-  }
-}
--- a/integrations/Gitlab/dashboards/Overview.json
+++ b/integrations/Gitlab/dashboards/Overview.json
@@ -1,517 +0,0 @@
-{
-  "name": "GitLab - Overview",
-  "tags": "",
-  "ident": "",
-  "configs": {
-    "version": "3.0.0",
-    "links": [
-      {
-        "title": "GitLab Docs",
-        "url": "https://docs.gitlab.com/"
-      }
-    ],
-    "var": [
-      {
-        "name": "DS_PROMETHEUS",
-        "type": "datasource",
-        "definition": "prometheus",
-        "defaultValue": 5
-      }
-    ],
-    "panels": [
-      {
-        "type": "text",
-        "id": "ffcfeb75-3a21-40b1-8fe7-313aa3e5f4e3",
-        "layout": {
-          "h": 3,
-          "w": 24,
-          "x": 0,
-          "y": 0,
-          "i": "ffcfeb75-3a21-40b1-8fe7-313aa3e5f4e3",
-          "isResizable": true
-        },
-        "version": "3.0.0",
-        "name": "",
-        "links": [],
-        "maxPerRow": 4,
-        "custom": {
-          "textColor": "#000000",
-          "bgColor": "#FFFFFF",
-          "textSize": 12,
-          "justifyContent": "center",
-          "alignItems": "center",
-          "content": "<br><h1><i><font color=#5991A7><b>GitLab Service Status</b></font></i></h1>\n"
-        }
-      },
-      {
-        "type": "text",
-        "id": "9991440f-1e01-4807-8911-2619329af244",
-        "layout": {
-          "h": 3,
-          "w": 2,
-          "x": 0,
-          "y": 3,
-          "i": "9991440f-1e01-4807-8911-2619329af244",
-          "isResizable": true
-        },
-        "version": "3.0.0",
-        "name": "Gitlab",
-        "links": [],
-        "maxPerRow": 4,
-        "custom": {
-          "textColor": "#000000",
-          "bgColor": "#FFFFFF",
-          "textSize": 12,
-          "justifyContent": "center",
-          "alignItems": "center",
-          "content": "<p style=\"text-align:center;\"><img src=\"https://www.cloudfoundry.org/wp-content/uploads/2017/10/icon_gitlab_cf@2x.png\" width=80px/></p>"
-        }
-      },
-      {
-        "type": "stat",
-        "id": "f3fcab1f-d198-48c6-bf1d-44e481a9fa7a",
-        "layout": {
-          "h": 3,
-          "w": 5,
-          "x": 2,
-          "y": 3,
-          "i": "f3fcab1f-d198-48c6-bf1d-44e481a9fa7a",
-          "isResizable": true
-        },
-        "version": "3.0.0",
-        "datasourceCate": "prometheus",
-        "datasourceValue": "${DS_PROMETHEUS}",
-        "targets": [
-          {
-            "refId": "A",
-            "expr": "topk(1, count by (version) (gitlab_build_info{job=~\"gitlab-workhorse\"}))",
-            "legend": ""
-          }
-        ],
-        "transformations": [
-          {
-            "id": "organize",
-            "options": {}
-          }
-        ],
-        "name": "GitLab Version",
-        "links": [],
-        "maxPerRow": 4,
-        "custom": {
-          "textMode": "value",
-          "graphMode": "none",
-          "colorMode": "value",
-          "calc": "first",
-          "valueField": "version",
-          "colSpan": 1,
-          "textSize": {}
-        },
-        "options": {
-          "valueMappings": [
-            {
-              "id": 0,
-              "op": "=",
-              "text": "N/A",
-              "type": 1,
-              "value": "null"
-            }
-          ],
-          "standardOptions": {
-            "util": "none"
-          },
-          "thresholds": {
-            "steps": [
-              {
-                "color": "#73BF69",
-                "value": null,
-                "type": "base"
-              },
-              {
-                "color": "#F2495C",
-                "value": 80
-              }
-            ]
-          }
-        }
-      },
-      {
-        "type": "hexbin",
-        "id": "7a4c7be6-56de-4c76-8c2f-cef5a80e84b5",
-        "layout": {
-          "h": 3,
-          "w": 17,
-          "x": 7,
-          "y": 3,
-          "i": "7a4c7be6-56de-4c76-8c2f-cef5a80e84b5",
-          "isResizable": true
-        },
-        "version": "3.0.0",
-        "datasourceCate": "prometheus",
-        "datasourceValue": "${DS_PROMETHEUS}",
-        "targets": [
-          {
-            "refId": "A",
-            "expr": "sum(up{job!~\"gitlab_exporter.*|node\",instance!~\".*:9168\",service=~\"gitlab\"}) by (job) / count(up{job!~\"gitlab_exporter.*|node\",instance!~\".*:9168\",service=~\"gitlab\"}) by (job) * 100",
-            "legend": "{{job}}"
-          }
-        ],
-        "transformations": [
-          {
-            "id": "organize",
-            "options": {}
-          }
-        ],
-        "name": "Service Status",
-        "links": [],
-        "maxPerRow": 4,
-        "custom": {
-          "textMode": "valueAndName",
-          "calc": "lastNotNull",
-          "colorRange": [
-            "#f0ee6e",
-            "#6ba261",
-            "#306d52"
-          ],
-          "reverseColorOrder": false,
-          "colorDomainAuto": true
-        },
-        "options": {
-          "standardOptions": {}
-        }
-      },
-      {
-        "version": "3.0.0",
-        "id": "9efa19b0-18fd-4f4d-abee-cebe09a36803",
-        "type": "text",
-        "links": [],
-        "layout": {
-          "h": 2,
-          "w": 24,
-          "x": 0,
-          "y": 6,
-          "i": "9efa19b0-18fd-4f4d-abee-cebe09a36803",
-          "isResizable": true
-        },
-        "targets": [],
-        "options": {
-          "thresholds": {
-            "style": "line",
-            "steps": []
-          },
-          "standardOptions": {
-            "util": "none"
-          },
-          "legend": {
-            "displayMode": "list"
-          },
-          "tooltip": {
-            "mode": "multi"
-          }
-        },
-        "custom": {
-          "version": "3.0.0",
-          "content": "<br><h1><i><font color=#5991A7><b>Sidekiq Statistics</b></font></i></h1>\n"
-        },
-        "maxPerRow": 4
-      },
-      {
-        "type": "hexbin",
-        "id": "fd0e96e0-7577-4475-8287-143d9d7e0bc7",
-        "layout": {
-          "h": 4,
-          "w": 12,
-          "x": 0,
-          "y": 8,
-          "i": "fd0e96e0-7577-4475-8287-143d9d7e0bc7",
-          "isResizable": true
-        },
-        "version": "3.0.0",
-        "datasourceCate": "prometheus",
-        "datasourceValue": "${DS_PROMETHEUS}",
-        "targets": [
-          {
-            "refId": "A",
-            "expr": "max(sidekiq_jobs_processed_total)",
-            "legend": "Processed"
-          },
-          {
-            "refId": "B",
-            "expr": "max(sidekiq_jobs_failed_total)",
-            "legend": "Failed"
-          },
-          {
-            "refId": "C",
-            "expr": "max(sidekiq_jobs_enqueued_size)",
-            "legend": "Enqueued"
-          },
-          {
-            "refId": "D",
-            "expr": "max(sidekiq_jobs_scheduled_size)",
-            "legend": "Scheduled"
-          },
-          {
-            "refId": "E",
-            "expr": "max(sidekiq_jobs_retry_size)",
-            "legend": "Retry"
-          },
-          {
-            "refId": "F",
-            "expr": "max(sidekiq_jobs_dead_size)",
-            "legend": "Dead"
-          },
-          {
-            "refId": "G",
-            "expr": "max(sidekiq_processes_size)",
-            "legend": "Processes"
-          }
-        ],
-        "transformations": [
-          {
-            "id": "organize",
-            "options": {}
-          }
-        ],
-        "name": "Background Jobs",
-        "links": [],
-        "maxPerRow": 4,
-        "custom": {
-          "textMode": "valueAndName",
-          "calc": "lastNotNull",
-          "colorRange": [
-            "#83c898",
-            "#c2c2c2",
-            "#fc653f"
-          ],
-          "reverseColorOrder": false,
-          "colorDomainAuto": true
-        },
-        "options": {
-          "standardOptions": {}
-        }
-      },
-      {
-        "type": "timeseries",
-        "id": "1645b734-ef79-4ff5-8be4-a24747cf4e6e",
-        "layout": {
-          "h": 4,
-          "w": 12,
-          "x": 12,
-          "y": 8,
-          "i": "1645b734-ef79-4ff5-8be4-a24747cf4e6e",
-          "isResizable": true
-        },
-        "version": "3.0.0",
-        "datasourceCate": "prometheus",
-        "datasourceValue": "${DS_PROMETHEUS}",
-        "targets": [
-          {
-            "refId": "B",
-            "expr": "topk(10, avg_over_time(sidekiq_queue_size{}[5m]))",
-            "legend": "{{name}}"
-          }
-        ],
-        "transformations": [
-          {
-            "id": "organize",
-            "options": {}
-          }
-        ],
-        "name": "Queue Size Top 10",
-        "links": [],
-        "maxPerRow": 4,
-        "options": {
-          "tooltip": {
-            "mode": "all",
-            "sort": "none"
-          },
-          "legend": {
-            "displayMode": "hidden"
-          },
-          "standardOptions": {},
-          "thresholds": {
-            "steps": [
-              {
-                "color": "#634CD9",
-                "value": null,
-                "type": "base"
-              }
-            ]
-          }
-        },
-        "custom": {
-          "drawStyle": "lines",
-          "lineInterpolation": "linear",
-          "spanNulls": false,
-          "lineWidth": 1,
-          "fillOpacity": 0.5,
-          "gradientMode": "none",
-          "stack": "off",
-          "scaleDistribution": {
-            "type": "linear"
-          }
-        }
-      },
-      {
-        "version": "3.0.0",
-        "id": "e25e6cfb-020b-4743-8de9-ef6240144a94",
-        "type": "text",
-        "links": [],
-        "layout": {
-          "h": 2,
-          "w": 24,
-          "x": 0,
-          "y": 12,
-          "i": "e25e6cfb-020b-4743-8de9-ef6240144a94",
-          "isResizable": true
-        },
-        "targets": [],
-        "options": {
-          "thresholds": {
-            "style": "line",
-            "steps": []
-          },
-          "standardOptions": {
-            "util": "none"
-          },
-          "legend": {
-            "displayMode": "list"
-          },
-          "tooltip": {
-            "mode": "multi"
-          }
-        },
-        "custom": {
-          "version": "3.0.0",
-          "content": "<br><h1><i><font color=#5991A7><b>Workhorse Statistics</b></font></i></h1>"
-        },
-        "maxPerRow": 4
-      },
-      {
-        "type": "timeseries",
-        "id": "dd030993-481d-43e4-887a-3c0dee279ea0",
-        "layout": {
-          "h": 9,
-          "w": 12,
-          "x": 0,
-          "y": 14,
-          "i": "dd030993-481d-43e4-887a-3c0dee279ea0",
-          "isResizable": true
-        },
-        "version": "3.0.0",
-        "datasourceCate": "prometheus",
-        "datasourceValue": "${DS_PROMETHEUS}",
-        "targets": [
-          {
-            "refId": "B",
-            "expr": "sum by (code) (\n  rate(gitlab_workhorse_http_requests_total{instance=~\".*:9229\"}[5m])\n)",
-            "legend": "{{code}}"
-          }
-        ],
-        "transformations": [
-          {
-            "id": "organize",
-            "options": {}
-          }
-        ],
-        "name": "Http Request Total",
-        "links": [],
-        "maxPerRow": 4,
-        "options": {
-          "tooltip": {
-            "mode": "all",
-            "sort": "none"
-          },
-          "legend": {
-            "displayMode": "hidden"
-          },
-          "standardOptions": {},
-          "thresholds": {
-            "steps": [
-              {
-                "color": "#634CD9",
-                "value": null,
-                "type": "base"
-              }
-            ]
-          }
-        },
-        "custom": {
-          "drawStyle": "lines",
-          "lineInterpolation": "linear",
-          "spanNulls": false,
-          "lineWidth": 1,
-          "fillOpacity": 0.5,
-          "gradientMode": "none",
-          "stack": "off",
-          "scaleDistribution": {
-            "type": "linear"
-          }
-        }
-      },
-      {
-        "type": "timeseries",
-        "id": "77343eca-60d3-4be9-b80d-6db471399339",
-        "layout": {
-          "h": 9,
-          "w": 12,
-          "x": 12,
-          "y": 14,
-          "i": "77343eca-60d3-4be9-b80d-6db471399339",
-          "isResizable": true
-        },
-        "version": "3.0.0",
-        "datasourceCate": "prometheus",
-        "datasourceValue": "${DS_PROMETHEUS}",
-        "targets": [
-          {
-            "refId": "B",
-            "expr": "sum by (le) (\n  rate(gitlab_workhorse_http_request_duration_seconds_bucket{instance=~\".*:9229\"}[5m])\n)",
-            "legend": "{{le}}"
-          }
-        ],
-        "transformations": [
-          {
-            "id": "organize",
-            "options": {}
-          }
-        ],
-        "name": "Workhorse Latency",
-        "links": [],
-        "maxPerRow": 4,
-        "options": {
-          "tooltip": {
-            "mode": "all",
-            "sort": "none"
-          },
-          "legend": {
-            "displayMode": "hidden"
-          },
-          "standardOptions": {
-            "util": "seconds"
-          },
-          "thresholds": {
-            "steps": [
-              {
-                "color": "#634CD9",
-                "value": null,
-                "type": "base"
-              }
-            ]
-          }
-        },
-        "custom": {
-          "drawStyle": "lines",
-          "lineInterpolation": "smooth",
-          "spanNulls": false,
-          "lineWidth": 1,
-          "fillOpacity": 0.5,
-          "gradientMode": "none",
-          "stack": "off",
-          "scaleDistribution": {
-            "type": "linear"
-          }
-        }
-      }
-    ]
-  }
-}
--- a/integrations/Gitlab/dashboards/PostgreSQL.json
+++ b/integrations/Gitlab/dashboards/PostgreSQL.json
--- a/Show More
+++ b/Show More
				`@@ -0,0 +1 @@`
				`{{if .IsRecovered}}Recovered{{else}}Triggered{{end}}: {{.RuleName}} {{.TagsJSON}}`