Merge branch 'stable' into optimize-oauth2

.github/workflows/n9e.yml

@@ -5,7 +5,7 @@ on:
     tags:
       - 'v*'
 env:
-  GO_VERSION: 1.23
+  GO_VERSION: 1.18
 
 jobs:
   goreleaser:

.gitignore

@@ -9,7 +9,6 @@
 *.o
 *.a
 *.so
-*.db
 *.sw[po]
 *.tar.gz
 *.[568vq]

README.md

@@ -38,7 +38,6 @@
 - 👉 [文档中心](https://flashcat.cloud/docs/) | [下载中心](https://flashcat.cloud/download/nightingale/)
 - ❤️ [报告 Bug](https://github.com/ccfos/nightingale/issues/new?assignees=&labels=&projects=&template=question.yml)
 - ℹ️ 为了提供更快速的访问体验，上述文档和下载站点托管于 [FlashcatCloud](https://flashcat.cloud)
-- 💡 前后端代码分离，前端代码仓库：[https://github.com/n9e/fe](https://github.com/n9e/fe)
 
 ## 功能特点
 
@@ -91,11 +90,12 @@
 - 推荐搜索关注夜莺公众号，第一时间获取社区动态：`夜莺监控Nightingale`
 - 日常问题交流：
   - QQ群：730841964
-  - [加入微信群](https://download.flashcat.cloud/ulric/20241022141621.png)，如果二维码过期了，可以联系我（我的微信：`picobyte`）拉群，备注： `夜莺互助群`
+  - [加入微信群](https://download.flashcat.cloud/ulric/20240926101321.png)，如果二维码过期了，可以联系我（我的微信：`picobyte`）拉群，备注： `夜莺互助群`
 
 ## 广受关注
 [![Stargazers over time](https://api.star-history.com/svg?repos=ccfos/nightingale&type=Date)](https://star-history.com/#ccfos/nightingale&Date)
 
+
 ## 社区共建
 - ❇️ 请阅读浏览[夜莺开源项目和社区治理架构草案](./doc/community-governance.md)，真诚欢迎每一位用户、开发者、公司以及组织，使用夜莺监控、积极反馈 Bug、提交功能需求、分享最佳实践，共建专业、活跃的夜莺开源社区。
 - ❤️ 夜莺贡献者

alert/aconf/conf.go

@@ -60,6 +60,10 @@ func (a *Alert) PreCheck(configDir string) {
 		a.Heartbeat.Interval = 1000
 	}
 
+	if a.Heartbeat.EngineName == "" {
+		a.Heartbeat.EngineName = "default"
+	}
+
 	if a.EngineDelay == 0 {
 		a.EngineDelay = 30
 	}

alert/alert.go

@@ -62,18 +62,15 @@ func Initialize(configDir string, cryptoKey string) (func(), error) {
 	userCache := memsto.NewUserCache(ctx, syncStats)
 	userGroupCache := memsto.NewUserGroupCache(ctx, syncStats)
 	taskTplsCache := memsto.NewTaskTplCache(ctx)
-	configCvalCache := memsto.NewCvalCache(ctx, syncStats)
 
 	promClients := prom.NewPromClient(ctx)
-	dispatch.InitRegisterQueryFunc(promClients)
 	tdengineClients := tdengine.NewTdengineClient(ctx, config.Alert.Heartbeat)
 
 	externalProcessors := process.NewExternalProcessors()
 
 	Start(config.Alert, config.Pushgw, syncStats, alertStats, externalProcessors, targetCache, busiGroupCache, alertMuteCache, alertRuleCache, notifyConfigCache, taskTplsCache, dsCache, ctx, promClients, tdengineClients, userCache, userGroupCache)
 
-	r := httpx.GinEngine(config.Global.RunMode, config.HTTP,
-		configCvalCache.PrintBodyPaths, configCvalCache.PrintAccessLog)
+	r := httpx.GinEngine(config.Global.RunMode, config.HTTP)
 	rt := router.New(config.HTTP, config.Alert, alertMuteCache, targetCache, busiGroupCache, alertStats, ctx, externalProcessors)
 
 	if config.Ibex.Enable {
@@ -96,14 +93,14 @@ func Start(alertc aconf.Alert, pushgwc pconf.Pushgw, syncStats *memsto.Stats, al
 	promClients *prom.PromClientMap, tdendgineClients *tdengine.TdengineClientMap, userCache *memsto.UserCacheType, userGroupCache *memsto.UserGroupCacheType) {
 	alertSubscribeCache := memsto.NewAlertSubscribeCache(ctx, syncStats)
 	recordingRuleCache := memsto.NewRecordingRuleCache(ctx, syncStats)
-	targetsOfAlertRulesCache := memsto.NewTargetOfAlertRuleCache(ctx, alertc.Heartbeat.EngineName, syncStats, targetCache)
+	targetsOfAlertRulesCache := memsto.NewTargetOfAlertRuleCache(ctx, alertc.Heartbeat.EngineName, syncStats)
 
 	go models.InitNotifyConfig(ctx, alertc.Alerting.TemplatesDir)
 
 	naming := naming.NewNaming(ctx, alertc.Heartbeat, alertStats)
 
 	writers := writer.NewWriters(pushgwc)
-	record.NewScheduler(alertc, recordingRuleCache, promClients, writers, alertStats, datasourceCache)
+	record.NewScheduler(alertc, recordingRuleCache, promClients, writers, alertStats)
 
 	eval.NewScheduler(alertc, externalProcessors, alertRuleCache, targetCache, targetsOfAlertRulesCache,
 		busiGroupCache, alertMuteCache, datasourceCache, promClients, tdendgineClients, naming, ctx, alertStats)

alert/astats/stats.go

@@ -38,7 +38,7 @@ func NewSyncStats() *Stats {
 		Subsystem: subsystem,
 		Name:      "rule_eval_error_total",
 		Help:      "Number of rule eval error.",
-	}, []string{"datasource", "stage", "busi_group", "rule_id"})
+	}, []string{"datasource", "stage"})
 
 	CounterQueryDataErrorTotal := prometheus.NewCounterVec(prometheus.CounterOpts{
 		Namespace: namespace,

alert/common/conv.go

@@ -1,25 +1,22 @@
-package models
+package common
 
 import (
 	"fmt"
 	"math"
 	"strings"
 
-	"github.com/ccfos/nightingale/v6/pkg/unit"
 	"github.com/prometheus/common/model"
 )
 
 type AnomalyPoint struct {
-	Key           string                         `json:"key"`
-	Labels        model.Metric                   `json:"labels"`
-	Timestamp     int64                          `json:"timestamp"`
-	Value         float64                        `json:"value"`
-	Severity      int                            `json:"severity"`
-	Triggered     bool                           `json:"triggered"`
-	Query         string                         `json:"query"`
-	Values        string                         `json:"values"`
-	ValuesUnit    map[string]unit.FormattedValue `json:"values_unit"`
-	RecoverConfig RecoverConfig                  `json:"recover_config"`
+	Key       string       `json:"key"`
+	Labels    model.Metric `json:"labels"`
+	Timestamp int64        `json:"timestamp"`
+	Value     float64      `json:"value"`
+	Severity  int          `json:"severity"`
+	Triggered bool         `json:"triggered"`
+	Query     string       `json:"query"`
+	Values    string       `json:"values"`
 }
 
 func NewAnomalyPoint(key string, labels map[string]string, ts int64, value float64, severity int) AnomalyPoint {

alert/dispatch/consume.go

@@ -1,7 +1,6 @@
 package dispatch
 
 import (
-	"context"
 	"encoding/json"
 	"fmt"
 	"strings"
@@ -14,10 +13,8 @@ import (
 	"github.com/ccfos/nightingale/v6/pkg/ctx"
 	"github.com/ccfos/nightingale/v6/pkg/poster"
 	promsdk "github.com/ccfos/nightingale/v6/pkg/prom"
-	"github.com/ccfos/nightingale/v6/pkg/tplx"
 	"github.com/ccfos/nightingale/v6/prom"
 
-	"github.com/prometheus/common/model"
 	"github.com/toolkits/pkg/concurrent/semaphore"
 	"github.com/toolkits/pkg/logger"
 )
@@ -30,18 +27,6 @@ type Consumer struct {
 	promClients *prom.PromClientMap
 }
 
-func InitRegisterQueryFunc(promClients *prom.PromClientMap) {
-	tplx.RegisterQueryFunc(func(datasourceID int64, promql string) model.Value {
-		if promClients.IsNil(datasourceID) {
-			return nil
-		}
-
-		readerClient := promClients.GetCli(datasourceID)
-		value, _, _ := readerClient.Query(context.Background(), promql, time.Now())
-		return value
-	})
-}
-
 // 创建一个 Consumer 实例
 func NewConsumer(alerting aconf.Alerting, ctx *ctx.Context, dispatch *Dispatch, promClients *prom.PromClientMap) *Consumer {
 	return &Consumer{
@@ -128,7 +113,7 @@ func (e *Consumer) persist(event *models.AlertCurEvent) {
 		event.Id, err = poster.PostByUrlsWithResp[int64](e.ctx, "/v1/n9e/event-persist", event)
 		if err != nil {
 			logger.Errorf("event:%+v persist err:%v", event, err)
-			e.dispatch.Astats.CounterRuleEvalErrorTotal.WithLabelValues(fmt.Sprintf("%v", event.DatasourceId), "persist_event", event.GroupName, fmt.Sprintf("%v", event.RuleId)).Inc()
+			e.dispatch.Astats.CounterRuleEvalErrorTotal.WithLabelValues(fmt.Sprintf("%v", event.DatasourceId), "persist_event").Inc()
 		}
 		return
 	}
@@ -136,7 +121,7 @@ func (e *Consumer) persist(event *models.AlertCurEvent) {
 	err := models.EventPersist(e.ctx, event)
 	if err != nil {
 		logger.Errorf("event%+v persist err:%v", event, err)
-		e.dispatch.Astats.CounterRuleEvalErrorTotal.WithLabelValues(fmt.Sprintf("%v", event.DatasourceId), "persist_event", event.GroupName, fmt.Sprintf("%v", event.RuleId)).Inc()
+		e.dispatch.Astats.CounterRuleEvalErrorTotal.WithLabelValues(fmt.Sprintf("%v", event.DatasourceId), "persist_event").Inc()
 	}
 }
 
@@ -184,7 +169,7 @@ func (e *Consumer) queryRecoveryVal(event *models.AlertCurEvent) {
 		logger.Errorf("rule_eval:%s promql:%s, warnings:%v", getKey(event), promql, warnings)
 	}
 
-	anomalyPoints := models.ConvertAnomalyPoints(value)
+	anomalyPoints := common.ConvertAnomalyPoints(value)
 	if len(anomalyPoints) == 0 {
 		logger.Warningf("rule_eval:%s promql:%s, result is empty", getKey(event), promql)
 		event.AnnotationsJSON["recovery_promql_error"] = fmt.Sprintf("promql:%s error:%s", promql, "result is empty")

alert/dispatch/dispatch.go

@@ -139,12 +139,6 @@ func (e *Dispatch) HandleEventNotify(event *models.AlertCurEvent, isSubscribe bo
 	if rule == nil {
 		return
 	}
-
-	if e.blockEventNotify(rule, event) {
-		logger.Infof("block event notify: rule_id:%d event:%+v", rule.Id, event)
-		return
-	}
-
 	fillUsers(event, e.userCache, e.userGroupCache)
 
 	var (
@@ -181,25 +175,6 @@ func (e *Dispatch) HandleEventNotify(event *models.AlertCurEvent, isSubscribe bo
 	}
 }
 
-func (e *Dispatch) blockEventNotify(rule *models.AlertRule, event *models.AlertCurEvent) bool {
-	ruleType := rule.GetRuleType()
-
-	// 若为机器则先看机器是否删除
-	if ruleType == models.HOST {
-		host, ok := e.targetCache.Get(event.TagsMap["ident"])
-		if !ok || host == nil {
-			return true
-		}
-	}
-
-	// 恢复通知，检测规则配置是否改变
-	// if event.IsRecovered && event.RuleHash != rule.Hash() {
-	// 	return true
-	// }
-
-	return false
-}
-
 func (e *Dispatch) handleSubs(event *models.AlertCurEvent) {
 	// handle alert subscribes
 	subscribes := make([]*models.AlertSubscribe, 0)
@@ -291,12 +266,10 @@ func (e *Dispatch) Send(rule *models.AlertRule, event *models.AlertCurEvent, not
 	e.SendCallbacks(rule, notifyTarget, event)
 
 	// handle global webhooks
-	if !event.OverrideGlobalWebhook() {
-		if e.alerting.WebhookBatchSend {
-			sender.BatchSendWebhooks(e.ctx, notifyTarget.ToWebhookMap(), event, e.Astats)
-		} else {
-			sender.SingleSendWebhooks(e.ctx, notifyTarget.ToWebhookMap(), event, e.Astats)
-		}
+	if e.alerting.WebhookBatchSend {
+		sender.BatchSendWebhooks(e.ctx, notifyTarget.ToWebhookList(), event, e.Astats)
+	} else {
+		sender.SingleSendWebhooks(e.ctx, notifyTarget.ToWebhookList(), event, e.Astats)
 	}
 
 	// handle plugin call
@@ -310,10 +283,10 @@ func (e *Dispatch) Send(rule *models.AlertRule, event *models.AlertCurEvent, not
 }
 
 func (e *Dispatch) SendCallbacks(rule *models.AlertRule, notifyTarget *NotifyTarget, event *models.AlertCurEvent) {
+
 	uids := notifyTarget.ToUidList()
 	urls := notifyTarget.ToCallbackList()
 	whMap := notifyTarget.ToWebhookMap()
-	ogw := event.OverrideGlobalWebhook()
 	for _, urlStr := range urls {
 		if len(urlStr) == 0 {
 			continue
@@ -321,7 +294,7 @@ func (e *Dispatch) SendCallbacks(rule *models.AlertRule, notifyTarget *NotifyTar
 
 		cbCtx := sender.BuildCallBackContext(e.ctx, urlStr, rule, []*models.AlertCurEvent{event}, uids, e.userCache, e.alerting.WebhookBatchSend, e.Astats)
 
-		if wh, ok := whMap[cbCtx.CallBackURL]; !ogw && ok && wh.Enable {
+		if wh, ok := whMap[cbCtx.CallBackURL]; ok && wh.Enable {
 			logger.Debugf("SendCallbacks: webhook[%s] is in global conf.", cbCtx.CallBackURL)
 			continue
 		}

alert/dispatch/notify_target.go

@@ -76,8 +76,52 @@ func (s *NotifyTarget) ToCallbackList() []string {
 	return callbacks
 }
 
+func (s *NotifyTarget) ToWebhookList() []*models.Webhook {
+	webhooks := make([]*models.Webhook, 0, len(s.webhooks))
+	for _, wh := range s.webhooks {
+		if wh.Batch == 0 {
+			wh.Batch = 1000
+		}
+
+		if wh.Timeout == 0 {
+			wh.Timeout = 10
+		}
+
+		if wh.RetryCount == 0 {
+			wh.RetryCount = 10
+		}
+
+		if wh.RetryInterval == 0 {
+			wh.RetryInterval = 10
+		}
+
+		webhooks = append(webhooks, wh)
+	}
+	return webhooks
+}
+
 func (s *NotifyTarget) ToWebhookMap() map[string]*models.Webhook {
-	return s.webhooks
+	webhookMap := make(map[string]*models.Webhook, len(s.webhooks))
+	for _, wh := range s.webhooks {
+		if wh.Batch == 0 {
+			wh.Batch = 1000
+		}
+
+		if wh.Timeout == 0 {
+			wh.Timeout = 10
+		}
+
+		if wh.RetryCount == 0 {
+			wh.RetryCount = 10
+		}
+
+		if wh.RetryInterval == 0 {
+			wh.RetryInterval = 10
+		}
+
+		webhookMap[wh.Url] = wh
+	}
+	return webhookMap
 }
 
 func (s *NotifyTarget) ToUidList() []int64 {

alert/eval/alert_rule.go

@@ -96,7 +96,8 @@ func (s *Scheduler) syncAlertRules() {
 
 		ruleType := rule.GetRuleType()
 		if rule.IsPrometheusRule() || rule.IsLokiRule() || rule.IsTdengineRule() {
-			datasourceIds := s.datasourceCache.GetIDsByDsCateAndQueries(rule.Cate, rule.DatasourceQueries)
+			datasourceIds := s.promClients.Hit(rule.DatasourceIdsJson)
+			datasourceIds = append(datasourceIds, s.tdengineClients.Hit(rule.DatasourceIdsJson)...)
 			for _, dsId := range datasourceIds {
 				if !naming.DatasourceHashRing.IsHit(strconv.FormatInt(dsId, 10), fmt.Sprintf("%d", rule.Id), s.aconf.Heartbeat.Endpoint) {
 					continue
@@ -118,7 +119,7 @@ func (s *Scheduler) syncAlertRules() {
 				}
 				processor := process.NewProcessor(s.aconf.Heartbeat.EngineName, rule, dsId, s.alertRuleCache, s.targetCache, s.targetsOfAlertRuleCache, s.busiGroupCache, s.alertMuteCache, s.datasourceCache, s.ctx, s.stats)
 
-				alertRule := NewAlertRuleWorker(s.ctx, rule, dsId, processor, s.promClients, s.tdengineClients, s.targetCache)
+				alertRule := NewAlertRuleWorker(rule, dsId, processor, s.promClients, s.tdengineClients, s.ctx)
 				alertRuleWorkers[alertRule.Hash()] = alertRule
 			}
 		} else if rule.IsHostRule() {
@@ -127,13 +128,12 @@ func (s *Scheduler) syncAlertRules() {
 				continue
 			}
 			processor := process.NewProcessor(s.aconf.Heartbeat.EngineName, rule, 0, s.alertRuleCache, s.targetCache, s.targetsOfAlertRuleCache, s.busiGroupCache, s.alertMuteCache, s.datasourceCache, s.ctx, s.stats)
-			alertRule := NewAlertRuleWorker(s.ctx, rule, 0, processor, s.promClients, s.tdengineClients, s.targetCache)
+			alertRule := NewAlertRuleWorker(rule, 0, processor, s.promClients, s.tdengineClients, s.ctx)
 			alertRuleWorkers[alertRule.Hash()] = alertRule
 		} else {
 			// 如果 rule 不是通过 prometheus engine 来告警的，则创建为 externalRule
 			// if rule is not processed by prometheus engine, create it as externalRule
-			dsIds := s.datasourceCache.GetIDsByDsCateAndQueries(rule.Cate, rule.DatasourceQueries)
-			for _, dsId := range dsIds {
+			for _, dsId := range rule.DatasourceIdsJson {
 				ds := s.datasourceCache.GetById(dsId)
 				if ds == nil {
 					logger.Debugf("datasource %d not found", dsId)

alert/eval/eval_test.go

@@ -269,190 +269,3 @@ func allValueDeepEqual(got, want map[uint64][]uint64) bool {
 	}
 	return true
 }
-
-// allValueDeepEqualOmitOrder 判断两个字符串切片是否相等，不考虑顺序
-func allValueDeepEqualOmitOrder(got, want []string) bool {
-	if len(got) != len(want) {
-		return false
-	}
-	slices.Sort(got)
-	slices.Sort(want)
-	for i := range got {
-		if got[i] != want[i] {
-			return false
-		}
-	}
-	return true
-}
-
-func Test_removeVal(t *testing.T) {
-	type args struct {
-		promql string
-	}
-	tests := []struct {
-		name string
-		args args
-		want string
-	}{
-		// TODO: Add test cases.
-		{
-			name: "removeVal1",
-			args: args{
-				promql: "mem{test1=\"$test1\",test2=\"$test2\",test3=\"$test3\"} > $val",
-			},
-			want: "mem{} > $val",
-		},
-		{
-			name: "removeVal2",
-			args: args{
-				promql: "mem{test1=\"test1\",test2=\"$test2\",test3=\"$test3\"} > $val",
-			},
-			want: "mem{test1=\"test1\"} > $val",
-		},
-		{
-			name: "removeVal3",
-			args: args{
-				promql: "mem{test1=\"$test1\",test2=\"test2\",test3=\"$test3\"} > $val",
-			},
-			want: "mem{test2=\"test2\"} > $val",
-		},
-		{
-			name: "removeVal4",
-			args: args{
-				promql: "mem{test1=\"$test1\",test2=\"$test2\",test3=\"test3\"} > $val",
-			},
-			want: "mem{test3=\"test3\"} > $val",
-		},
-		{
-			name: "removeVal5",
-			args: args{
-				promql: "mem{test1=\"$test1\",test2=\"test2\",test3=\"test3\"} > $val",
-			},
-			want: "mem{test2=\"test2\",test3=\"test3\"} > $val",
-		},
-		{
-			name: "removeVal6",
-			args: args{
-				promql: "mem{test1=\"test1\",test2=\"$test2\",test3=\"test3\"} > $val",
-			},
-			want: "mem{test1=\"test1\",test3=\"test3\"} > $val",
-		},
-		{
-			name: "removeVal7",
-			args: args{
-				promql: "mem{test1=\"test1\",test2=\"test2\",test3='$test3'} > $val",
-			},
-			want: "mem{test1=\"test1\",test2=\"test2\"} > $val",
-		},
-		{
-			name: "removeVal8",
-			args: args{
-				promql: "mem{test1=\"test1\",test2=\"test2\",test3=\"test3\"} > $val",
-			},
-			want: "mem{test1=\"test1\",test2=\"test2\",test3=\"test3\"} > $val",
-		},
-		{
-			name: "removeVal9",
-			args: args{
-				promql: "mem{test1=\"$test1\",test2=\"test2\"} > $val1 and mem{test3=\"test3\",test4=\"test4\"} > $val2",
-			},
-			want: "mem{test2=\"test2\"} > $val1 and mem{test3=\"test3\",test4=\"test4\"} > $val2",
-		},
-		{
-			name: "removeVal10",
-			args: args{
-				promql: "mem{test1=\"test1\",test2='$test2'} > $val1 and mem{test3=\"test3\",test4=\"test4\"} > $val2",
-			},
-			want: "mem{test1=\"test1\"} > $val1 and mem{test3=\"test3\",test4=\"test4\"} > $val2",
-		},
-		{
-			name: "removeVal11",
-			args: args{
-				promql: "mem{test1='test1',test2=\"test2\"} > $val1 and mem{test3=\"$test3\",test4=\"test4\"} > $val2",
-			},
-			want: "mem{test1='test1',test2=\"test2\"} > $val1 and mem{test4=\"test4\"} > $val2",
-		},
-		{
-			name: "removeVal12",
-			args: args{
-				promql: "mem{test1=\"test1\",test2=\"test2\"} > $val1 and mem{test3=\"test3\",test4=\"$test4\"} > $val2",
-			},
-			want: "mem{test1=\"test1\",test2=\"test2\"} > $val1 and mem{test3=\"test3\"} > $val2",
-		},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			if got := removeVal(tt.args.promql); got != tt.want {
-				t.Errorf("removeVal() = %v, want %v", got, tt.want)
-			}
-		})
-	}
-}
-
-func TestExtractVarMapping(t *testing.T) {
-	tests := []struct {
-		name   string
-		promql string
-		want   map[string]string
-	}{
-		{
-			name:   "单个花括号单个变量",
-			promql: `mem_used_percent{host="$my_host"} > $val`,
-			want:   map[string]string{"my_host": "host"},
-		},
-		{
-			name:   "单个花括号多个变量",
-			promql: `mem_used_percent{host="$my_host",region="$region",env="prod"} > $val`,
-			want:   map[string]string{"my_host": "host", "region": "region"},
-		},
-		{
-			name:   "多个花括号多个变量",
-			promql: `sum(rate(mem_used_percent{host="$my_host"})) by (instance) + avg(node_load1{region="$region"}) > $val`,
-			want:   map[string]string{"my_host": "host", "region": "region"},
-		},
-		{
-			name:   "相同变量出现多次",
-			promql: `sum(rate(mem_used_percent{host="$my_host"})) + avg(node_load1{host="$my_host"}) > $val`,
-			want:   map[string]string{"my_host": "host"},
-		},
-		{
-			name:   "没有变量",
-			promql: `mem_used_percent{host="localhost",region="cn"} > 80`,
-			want:   map[string]string{},
-		},
-		{
-			name:   "没有花括号",
-			promql: `80 > $val`,
-			want:   map[string]string{},
-		},
-		{
-			name:   "格式不规范的标签",
-			promql: `mem_used_percent{host=$my_host,region = $region} > $val`,
-			want:   map[string]string{"my_host": "host", "region": "region"},
-		},
-		{
-			name:   "空花括号",
-			promql: `mem_used_percent{} > $val`,
-			want:   map[string]string{},
-		},
-		{
-			name:   "不完整的花括号",
-			promql: `mem_used_percent{host="$my_host"`,
-			want:   map[string]string{},
-		},
-		{
-			name:   "复杂表达式",
-			promql: `sum(rate(http_requests_total{handler="$handler",code="$code"}[5m])) by (handler) / sum(rate(http_requests_total{handler="$handler"}[5m])) by (handler) * 100 > $threshold`,
-			want:   map[string]string{"handler": "handler", "code": "code"},
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			got := ExtractVarMapping(tt.promql)
-			if !reflect.DeepEqual(got, tt.want) {
-				t.Errorf("ExtractVarMapping() = %v, want %v", got, tt.want)
-			}
-		})
-	}
-}

alert/process/process.go

@@ -21,7 +21,6 @@ import (
 	"github.com/ccfos/nightingale/v6/pushgw/writer"
 
 	"github.com/prometheus/prometheus/prompb"
-	"github.com/robfig/cron/v3"
 	"github.com/toolkits/pkg/logger"
 	"github.com/toolkits/pkg/str"
 )
@@ -79,9 +78,6 @@ type Processor struct {
 	HandleFireEventHook    HandleEventFunc
 	HandleRecoverEventHook HandleEventFunc
 	EventMuteHook          EventMuteHookFunc
-
-	ScheduleEntry    cron.Entry
-	PromEvalInterval int
 }
 
 func (p *Processor) Key() string {
@@ -93,9 +89,9 @@ func (p *Processor) DatasourceId() int64 {
 }
 
 func (p *Processor) Hash() string {
-	return str.MD5(fmt.Sprintf("%d_%s_%s_%d",
+	return str.MD5(fmt.Sprintf("%d_%d_%s_%d",
 		p.rule.Id,
-		p.rule.CronPattern,
+		p.rule.PromEvalInterval,
 		p.rule.RuleConfig,
 		p.datasourceId,
 	))
@@ -130,7 +126,7 @@ func NewProcessor(engineName string, rule *models.AlertRule, datasourceId int64,
 	return p
 }
 
-func (p *Processor) Handle(anomalyPoints []models.AnomalyPoint, from string, inhibit bool) {
+func (p *Processor) Handle(anomalyPoints []common.AnomalyPoint, from string, inhibit bool) {
 	// 有可能rule的一些配置已经发生变化，比如告警接收人、callbacks等
 	// 这些信息的修改是不会引起worker restart的，但是确实会影响告警处理逻辑
 	// 所以，这里直接从memsto.AlertRuleCache中获取并覆盖
@@ -138,13 +134,10 @@ func (p *Processor) Handle(anomalyPoints []models.AnomalyPoint, from string, inh
 	cachedRule := p.alertRuleCache.Get(p.rule.Id)
 	if cachedRule == nil {
 		logger.Errorf("rule not found %+v", anomalyPoints)
-		p.Stats.CounterRuleEvalErrorTotal.WithLabelValues(fmt.Sprintf("%v", p.DatasourceId()), "handle_event", p.BusiGroupCache.GetNameByBusiGroupId(p.rule.GroupId), fmt.Sprintf("%v", p.rule.Id)).Inc()
+		p.Stats.CounterRuleEvalErrorTotal.WithLabelValues(fmt.Sprintf("%v", p.DatasourceId()), "handle_event").Inc()
 		return
 	}
 
-	// 在 rule 变化之前取到 ruleHash
-	ruleHash := p.rule.Hash()
-
 	p.rule = cachedRule
 	now := time.Now().Unix()
 	alertingKeys := map[string]struct{}{}
@@ -152,7 +145,7 @@ func (p *Processor) Handle(anomalyPoints []models.AnomalyPoint, from string, inh
 	// 根据 event 的 tag 将 events 分组，处理告警抑制的情况
 	eventsMap := make(map[string][]*models.AlertCurEvent)
 	for _, anomalyPoint := range anomalyPoints {
-		event := p.BuildEvent(anomalyPoint, from, now, ruleHash)
+		event := p.BuildEvent(anomalyPoint, from, now)
 		// 如果 event 被 mute 了,本质也是 fire 的状态,这里无论如何都添加到 alertingKeys 中,防止 fire 的事件自动恢复了
 		hash := event.Hash
 		alertingKeys[hash] = struct{}{}
@@ -177,12 +170,10 @@ func (p *Processor) Handle(anomalyPoints []models.AnomalyPoint, from string, inh
 		p.handleEvent(events)
 	}
 
-	if from == "inner" {
-		p.HandleRecover(alertingKeys, now, inhibit)
-	}
+	p.HandleRecover(alertingKeys, now, inhibit)
 }
 
-func (p *Processor) BuildEvent(anomalyPoint models.AnomalyPoint, from string, now int64, ruleHash string) *models.AlertCurEvent {
+func (p *Processor) BuildEvent(anomalyPoint common.AnomalyPoint, from string, now int64) *models.AlertCurEvent {
 	p.fillTags(anomalyPoint)
 	p.mayHandleIdent()
 	hash := Hash(p.rule.Id, p.datasourceId, anomalyPoint)
@@ -208,7 +199,6 @@ func (p *Processor) BuildEvent(anomalyPoint models.AnomalyPoint, from string, no
 	event.TargetNote = p.targetNote
 	event.TriggerValue = anomalyPoint.ReadableValue()
 	event.TriggerValues = anomalyPoint.Values
-	event.TriggerValuesJson = models.EventTriggerValues{ValuesWithUnit: anomalyPoint.ValuesUnit}
 	event.TagsJSON = p.tagsArr
 	event.Tags = strings.Join(p.tagsArr, ",,")
 	event.IsRecovered = false
@@ -221,12 +211,9 @@ func (p *Processor) BuildEvent(anomalyPoint models.AnomalyPoint, from string, no
 	event.Severity = anomalyPoint.Severity
 	event.ExtraConfig = p.rule.ExtraConfigJSON
 	event.PromQl = anomalyPoint.Query
-	event.RecoverConfig = anomalyPoint.RecoverConfig
-	event.RuleHash = ruleHash
 
 	if p.target != "" {
 		if pt, exist := p.TargetCache.Get(p.target); exist {
-			pt.GroupNames = p.BusiGroupCache.GetNamesByBusiGroupIds(pt.GroupIds)
 			event.Target = pt
 		} else {
 			logger.Infof("Target[ident: %s] doesn't exist in cache.", p.target)
@@ -303,7 +290,7 @@ func (p *Processor) HandleRecover(alertingKeys map[string]struct{}, now int64, i
 	}
 
 	hashArr := make([]string, 0, len(alertingKeys))
-	for hash, _ := range p.fires.GetAll() {
+	for hash := range p.fires.GetAll() {
 		if _, has := alertingKeys[hash]; has {
 			continue
 		}
@@ -322,7 +309,7 @@ func (p *Processor) HandleRecoverEvent(hashArr []string, now int64, inhibit bool
 
 	if !inhibit {
 		for _, hash := range hashArr {
-			p.RecoverSingle(false, hash, now, nil)
+			p.RecoverSingle(hash, now, nil)
 		}
 		return
 	}
@@ -350,11 +337,11 @@ func (p *Processor) HandleRecoverEvent(hashArr []string, now int64, inhibit bool
 	}
 
 	for _, event := range eventMap {
-		p.RecoverSingle(false, event.Hash, now, nil)
+		p.RecoverSingle(event.Hash, now, nil)
 	}
 }
 
-func (p *Processor) RecoverSingle(byRecover bool, hash string, now int64, value *string, values ...string) {
+func (p *Processor) RecoverSingle(hash string, now int64, value *string, values ...string) {
 	cachedRule := p.rule
 	if cachedRule == nil {
 		return
@@ -380,12 +367,6 @@ func (p *Processor) RecoverSingle(byRecover bool, hash string, now int64, value
 		}
 	}
 
-	// 如果设置了恢复条件，则不能在此处恢复，必须依靠 recoverPoint 来恢复
-	if event.RecoverConfig.JudgeType != models.Origin && !byRecover {
-		logger.Debugf("rule_eval:%s event:%v not recover", p.Key(), event)
-		return
-	}
-
 	if value != nil {
 		event.TriggerValue = *value
 		if len(values) > 0 {
@@ -424,7 +405,6 @@ func (p *Processor) handleEvent(events []*models.AlertCurEvent) {
 			p.pendingsUseByRecover.Set(event.Hash, event)
 		}
 
-		event.PromEvalInterval = p.PromEvalInterval
 		if p.rule.PromForDuration == 0 {
 			fireEvents = append(fireEvents, event)
 			if severity > event.Severity {
@@ -519,7 +499,7 @@ func (p *Processor) pushEventToQueue(e *models.AlertCurEvent) {
 	dispatch.LogEvent(e, "push_queue")
 	if !queue.EventQueue.PushFront(e) {
 		logger.Warningf("event_push_queue: queue is full, event:%+v", e)
-		p.Stats.CounterRuleEvalErrorTotal.WithLabelValues(fmt.Sprintf("%v", p.DatasourceId()), "push_event_queue", p.BusiGroupCache.GetNameByBusiGroupId(p.rule.GroupId), fmt.Sprintf("%v", p.rule.Id)).Inc()
+		p.Stats.CounterRuleEvalErrorTotal.WithLabelValues(fmt.Sprintf("%v", p.DatasourceId()), "push_event_queue").Inc()
 	}
 }
 
@@ -530,7 +510,7 @@ func (p *Processor) RecoverAlertCurEventFromDb() {
 	curEvents, err := models.AlertCurEventGetByRuleIdAndDsId(p.ctx, p.rule.Id, p.datasourceId)
 	if err != nil {
 		logger.Errorf("recover event from db for rule:%s failed, err:%s", p.Key(), err)
-		p.Stats.CounterRuleEvalErrorTotal.WithLabelValues(fmt.Sprintf("%v", p.DatasourceId()), "get_recover_event", p.BusiGroupCache.GetNameByBusiGroupId(p.rule.GroupId), fmt.Sprintf("%v", p.rule.Id)).Inc()
+		p.Stats.CounterRuleEvalErrorTotal.WithLabelValues(fmt.Sprintf("%v", p.DatasourceId()), "get_recover_event").Inc()
 		p.fires = NewAlertCurEventMap(nil)
 		return
 	}
@@ -549,7 +529,6 @@ func (p *Processor) RecoverAlertCurEventFromDb() {
 		event.DB2Mem()
 		target, exists := p.TargetCache.Get(event.TargetIdent)
 		if exists {
-			target.GroupNames = p.BusiGroupCache.GetNamesByBusiGroupIds(target.GroupIds)
 			event.Target = target
 		}
 
@@ -564,7 +543,7 @@ func (p *Processor) RecoverAlertCurEventFromDb() {
 	p.pendingsUseByRecover = NewAlertCurEventMap(pendingsUseByRecoverMap)
 }
 
-func (p *Processor) fillTags(anomalyPoint models.AnomalyPoint) {
+func (p *Processor) fillTags(anomalyPoint common.AnomalyPoint) {
 	// handle series tags
 	tagsMap := make(map[string]string)
 	for label, value := range anomalyPoint.Labels {
@@ -654,10 +633,10 @@ func labelMapToArr(m map[string]string) []string {
 	return labelStrings
 }
 
-func Hash(ruleId, datasourceId int64, vector models.AnomalyPoint) 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))
 }
 
-func TagHash(vector models.AnomalyPoint) string {
+func TagHash(vector common.AnomalyPoint) string {
 	return str.MD5(vector.Labels.String())
 }

alert/record/scheduler.go

@@ -26,11 +26,9 @@ type Scheduler struct {
 	writers     *writer.WritersType
 
 	stats *astats.Stats
-
-	datasourceCache *memsto.DatasourceCacheType
 }
 
-func NewScheduler(aconf aconf.Alert, rrc *memsto.RecordingRuleCacheType, promClients *prom.PromClientMap, writers *writer.WritersType, stats *astats.Stats, datasourceCache *memsto.DatasourceCacheType) *Scheduler {
+func NewScheduler(aconf aconf.Alert, rrc *memsto.RecordingRuleCacheType, promClients *prom.PromClientMap, writers *writer.WritersType, stats *astats.Stats) *Scheduler {
 	scheduler := &Scheduler{
 		aconf:       aconf,
 		recordRules: make(map[string]*RecordRuleContext),
@@ -41,8 +39,6 @@ func NewScheduler(aconf aconf.Alert, rrc *memsto.RecordingRuleCacheType, promCli
 		writers:     writers,
 
 		stats: stats,
-
-		datasourceCache: datasourceCache,
 	}
 
 	go scheduler.LoopSyncRules(context.Background())
@@ -71,7 +67,7 @@ func (s *Scheduler) syncRecordRules() {
 			continue
 		}
 
-		datasourceIds := s.datasourceCache.GetIDsByDsCateAndQueries("prometheus", rule.DatasourceQueries)
+		datasourceIds := s.promClients.Hit(rule.DatasourceIdsJson)
 		for _, dsId := range datasourceIds {
 			if !naming.DatasourceHashRing.IsHit(strconv.FormatInt(dsId, 10), fmt.Sprintf("%d", rule.Id), s.aconf.Heartbeat.Endpoint) {
 				continue

alert/router/router_event.go

@@ -6,6 +6,7 @@ import (
 	"strings"
 	"time"
 
+	"github.com/ccfos/nightingale/v6/alert/common"
 	"github.com/ccfos/nightingale/v6/alert/dispatch"
 	"github.com/ccfos/nightingale/v6/alert/mute"
 	"github.com/ccfos/nightingale/v6/alert/naming"
@@ -91,7 +92,7 @@ func (rt *Router) eventPersist(c *gin.Context) {
 
 type eventForm struct {
 	Alert         bool                  `json:"alert"`
-	AnomalyPoints []models.AnomalyPoint `json:"vectors"`
+	AnomalyPoints []common.AnomalyPoint `json:"vectors"`
 	RuleId        int64                 `json:"rule_id"`
 	DatasourceId  int64                 `json:"datasource_id"`
 	Inhibit       bool                  `json:"inhibit"`
@@ -128,7 +129,7 @@ func (rt *Router) makeEvent(c *gin.Context) {
 		} else {
 			for _, vector := range events[i].AnomalyPoints {
 				readableString := vector.ReadableValue()
-				go ruleWorker.RecoverSingle(false, process.Hash(events[i].RuleId, events[i].DatasourceId, vector), vector.Timestamp, &readableString)
+				go ruleWorker.RecoverSingle(process.Hash(events[i].RuleId, events[i].DatasourceId, vector), vector.Timestamp, &readableString)
 			}
 		}
 	}

alert/sender/callback.go

@@ -129,39 +129,43 @@ func (c *DefaultCallBacker) CallBack(ctx CallBackContext) {
 		return
 	}
 
-	doSendAndRecord(ctx.Ctx, ctx.CallBackURL, ctx.CallBackURL, event, "callback", ctx.Stats, ctx.Events)
+	ctx.Stats.AlertNotifyTotal.WithLabelValues("rule_callback").Inc()
+	resp, code, err := poster.PostJSON(ctx.CallBackURL, 5*time.Second, event, 3)
+	if err != nil {
+		logger.Errorf("event_callback_fail(rule_id=%d url=%s), event:%+v, resp: %s, err: %v, code: %d",
+			event.RuleId, ctx.CallBackURL, event, string(resp), err, code)
+		ctx.Stats.AlertNotifyErrorTotal.WithLabelValues("rule_callback").Inc()
+	} else {
+		logger.Infof("event_callback_succ(rule_id=%d url=%s), event:%+v, resp: %s, code: %d",
+			event.RuleId, ctx.CallBackURL, event, string(resp), code)
+	}
 }
 
 func doSendAndRecord(ctx *ctx.Context, url, token string, body interface{}, channel string,
-	stats *astats.Stats, events []*models.AlertCurEvent) {
+	stats *astats.Stats, event *models.AlertCurEvent) {
 	res, err := doSend(url, body, channel, stats)
-	NotifyRecord(ctx, events, channel, token, res, err)
+	NotifyRecord(ctx, event, channel, token, res, err)
 }
 
-func NotifyRecord(ctx *ctx.Context, evts []*models.AlertCurEvent, channel, target, res string, err error) {
-	// 一个通知可能对应多个 event，都需要记录
-	notis := make([]*models.NotificaitonRecord, 0, len(evts))
-	for _, evt := range evts {
-		noti := models.NewNotificationRecord(evt, channel, target)
-		if err != nil {
-			noti.SetStatus(models.NotiStatusFailure)
-			noti.SetDetails(err.Error())
-		} else if res != "" {
-			noti.SetDetails(string(res))
-		}
-		notis = append(notis, noti)
+func NotifyRecord(ctx *ctx.Context, evt *models.AlertCurEvent, channel, target, res string, err error) {
+	noti := models.NewNotificationRecord(evt, channel, target)
+	if err != nil {
+		noti.SetStatus(models.NotiStatusFailure)
+		noti.SetDetails(err.Error())
+	} else if res != "" {
+		noti.SetDetails(string(res))
 	}
 
 	if !ctx.IsCenter {
-		_, err := poster.PostByUrlsWithResp[[]int64](ctx, "/v1/n9e/notify-record", notis)
+		_, err := poster.PostByUrlsWithResp[int64](ctx, "/v1/n9e/notify-record", noti)
 		if err != nil {
-			logger.Errorf("add notis:%v failed, err: %v", notis, err)
+			logger.Errorf("add noti:%v failed, err: %v", noti, err)
 		}
 		return
 	}
 
-	if err := models.DB(ctx).CreateInBatches(notis, 100).Error; err != nil {
-		logger.Errorf("add notis:%v failed, err: %v", notis, err)
+	if err := noti.Add(ctx); err != nil {
+		logger.Errorf("add noti:%v failed, err: %v", noti, err)
 	}
 }
 
@@ -191,8 +195,8 @@ func PushCallbackEvent(ctx *ctx.Context, webhook *models.Webhook, event *models.
 
 	if queue == nil {
 		queue = &WebhookQueue{
-			eventQueue: NewSafeEventQueue(QueueMaxSize),
-			closeCh:    make(chan struct{}),
+			list:    NewSafeListLimited(QueueMaxSize),
+			closeCh: make(chan struct{}),
 		}
 
 		CallbackEventQueueLock.Lock()
@@ -202,8 +206,8 @@ func PushCallbackEvent(ctx *ctx.Context, webhook *models.Webhook, event *models.
 		StartConsumer(ctx, queue, webhook.Batch, webhook, stats)
 	}
 
-	succ := queue.eventQueue.Push(event)
+	succ := queue.list.PushFront(event)
 	if !succ {
-		logger.Warningf("Write channel(%s) full, current channel size: %d event:%v", webhook.Url, queue.eventQueue.Len(), event)
+		logger.Warningf("Write channel(%s) full, current channel size: %d event:%v", webhook.Url, queue.list.Len(), event)
 	}
 }

alert/sender/dingtalk.go

@@ -67,7 +67,7 @@ func (ds *DingtalkSender) Send(ctx MessageContext) {
 			}
 		}
 
-		doSendAndRecord(ctx.Ctx, url, tokens[i], body, models.Dingtalk, ctx.Stats, ctx.Events)
+		doSendAndRecord(ctx.Ctx, url, tokens[i], body, models.Dingtalk, ctx.Stats, ctx.Events[0])
 	}
 }
 
@@ -97,7 +97,10 @@ func (ds *DingtalkSender) CallBack(ctx CallBackContext) {
 		body.Markdown.Text = message
 	}
 
-	doSendAndRecord(ctx.Ctx, ctx.CallBackURL, ctx.CallBackURL, body, "callback", ctx.Stats, ctx.Events)
+	doSendAndRecord(ctx.Ctx, ctx.CallBackURL, ctx.CallBackURL, body,
+		"callback", ctx.Stats, ctx.Events[0])
+
+	ctx.Stats.AlertNotifyTotal.WithLabelValues("rule_callback").Inc()
 }
 
 // extract urls and ats from Users

alert/sender/email.go

@@ -25,8 +25,8 @@ type EmailSender struct {
 }
 
 type EmailContext struct {
-	events []*models.AlertCurEvent
-	mail   *gomail.Message
+	event *models.AlertCurEvent
+	mail  *gomail.Message
 }
 
 func (es *EmailSender) Send(ctx MessageContext) {
@@ -42,7 +42,7 @@ func (es *EmailSender) Send(ctx MessageContext) {
 		subject = ctx.Events[0].RuleName
 	}
 	content := BuildTplMessage(models.Email, es.contentTpl, ctx.Events)
-	es.WriteEmail(subject, content, tos, ctx.Events)
+	es.WriteEmail(subject, content, tos, ctx.Events[0])
 
 	ctx.Stats.AlertNotifyTotal.WithLabelValues(models.Email).Add(float64(len(tos)))
 }
@@ -79,7 +79,8 @@ func SendEmail(subject, content string, tos []string, stmp aconf.SMTPConfig) err
 	return nil
 }
 
-func (es *EmailSender) WriteEmail(subject, content string, tos []string, events []*models.AlertCurEvent) {
+func (es *EmailSender) WriteEmail(subject, content string, tos []string,
+	event *models.AlertCurEvent) {
 	m := gomail.NewMessage()
 
 	m.SetHeader("From", es.smtp.From)
@@ -87,7 +88,7 @@ func (es *EmailSender) WriteEmail(subject, content string, tos []string, events
 	m.SetHeader("Subject", subject)
 	m.SetBody("text/html", content)
 
-	mailch <- &EmailContext{events, m}
+	mailch <- &EmailContext{event, m}
 }
 
 func dialSmtp(d *gomail.Dialer) gomail.SendCloser {
@@ -122,7 +123,7 @@ func InitEmailSender(ctx *ctx.Context, ncc *memsto.NotifyConfigCacheType) {
 	mailch = make(chan *EmailContext, 100000)
 	go updateSmtp(ctx, ncc)
 	smtpConfig = ncc.GetSMTP()
-	go startEmailSender(ctx, smtpConfig)
+	startEmailSender(ctx, smtpConfig)
 }
 
 func updateSmtp(ctx *ctx.Context, ncc *memsto.NotifyConfigCacheType) {
@@ -142,7 +143,6 @@ func startEmailSender(ctx *ctx.Context, smtp aconf.SMTPConfig) {
 	conf := smtp
 	if conf.Host == "" || conf.Port == 0 {
 		logger.Warning("SMTP configurations invalid")
-		<-mailQuit
 		return
 	}
 	logger.Infof("start email sender... conf.Host:%+v,conf.Port:%+v", conf.Host, conf.Port)
@@ -201,11 +201,7 @@ func startEmailSender(ctx *ctx.Context, smtp aconf.SMTPConfig) {
 			}
 
 			for _, to := range m.mail.GetHeader("To") {
-				msg := ""
-				if err == nil {
-					msg = "ok"
-				}
-				NotifyRecord(ctx, m.events, models.Email, to, msg, err)
+				NotifyRecord(ctx, m.event, models.Email, to, "", err)
 			}
 
 			size++

alert/sender/feishu.go

@@ -54,7 +54,9 @@ func (fs *FeishuSender) CallBack(ctx CallBackContext) {
 		},
 	}
 
-	doSendAndRecord(ctx.Ctx, ctx.CallBackURL, ctx.CallBackURL, body, "callback", ctx.Stats, ctx.Events)
+	doSendAndRecord(ctx.Ctx, ctx.CallBackURL, ctx.CallBackURL, body, "callback",
+		ctx.Stats, ctx.Events[0])
+	ctx.Stats.AlertNotifyTotal.WithLabelValues("rule_callback").Inc()
 }
 
 func (fs *FeishuSender) Send(ctx MessageContext) {
@@ -76,7 +78,7 @@ func (fs *FeishuSender) Send(ctx MessageContext) {
 				IsAtAll:   false,
 			}
 		}
-		doSendAndRecord(ctx.Ctx, url, tokens[i], body, models.Feishu, ctx.Stats, ctx.Events)
+		doSendAndRecord(ctx.Ctx, url, tokens[i], body, models.Feishu, ctx.Stats, ctx.Events[0])
 	}
 }
 

alert/sender/feishucard.go

@@ -135,7 +135,8 @@ func (fs *FeishuCardSender) CallBack(ctx CallBackContext) {
 	}
 	parsedURL.RawQuery = ""
 
-	doSendAndRecord(ctx.Ctx, parsedURL.String(), parsedURL.String(), body, "callback", ctx.Stats, ctx.Events)
+	doSendAndRecord(ctx.Ctx, parsedURL.String(), parsedURL.String(), body, "callback",
+		ctx.Stats, ctx.Events[0])
 }
 
 func (fs *FeishuCardSender) Send(ctx MessageContext) {
@@ -159,7 +160,8 @@ func (fs *FeishuCardSender) Send(ctx MessageContext) {
 	body.Card.Elements[0].Text.Content = message
 	body.Card.Elements[2].Elements[0].Content = SendTitle
 	for i, url := range urls {
-		doSendAndRecord(ctx.Ctx, url, tokens[i], body, models.FeishuCard, ctx.Stats, ctx.Events)
+		doSendAndRecord(ctx.Ctx, url, tokens[i], body, models.FeishuCard,
+			ctx.Stats, ctx.Events[0])
 	}
 }
 

alert/sender/ibex.go

@@ -118,7 +118,6 @@ func CallIbex(ctx *ctx.Context, id int64, host string,
 	// 附加告警级别  告警触发值标签
 	tagsMap["alert_severity"] = strconv.Itoa(event.Severity)
 	tagsMap["alert_trigger_value"] = event.TriggerValue
-	tagsMap["is_recovered"] = strconv.FormatBool(event.IsRecovered)
 
 	tags, err := json.Marshal(tagsMap)
 	if err != nil {
@@ -186,11 +185,6 @@ func canDoIbex(username string, tpl *models.TaskTpl, host string, targetCache *m
 }
 
 func TaskAdd(f models.TaskForm, authUser string, isCenter bool) (int64, error) {
-	if storage.Cache == nil {
-		logger.Warning("event_callback_ibex: redis cache is nil")
-		return 0, fmt.Errorf("redis cache is nil")
-	}
-
 	hosts := cleanHosts(f.Hosts)
 	if len(hosts) == 0 {
 		return 0, fmt.Errorf("arg(hosts) empty")

alert/sender/lark.go

@@ -27,29 +27,30 @@ func (lk *LarkSender) CallBack(ctx CallBackContext) {
 		},
 	}
 
-	doSendAndRecord(ctx.Ctx, ctx.CallBackURL, ctx.CallBackURL, body, "callback", ctx.Stats, ctx.Events)
+	doSendAndRecord(ctx.Ctx, ctx.CallBackURL, ctx.CallBackURL, body, "callback",
+		ctx.Stats, ctx.Events[0])
+	ctx.Stats.AlertNotifyTotal.WithLabelValues("rule_callback").Inc()
 }
 
 func (lk *LarkSender) Send(ctx MessageContext) {
 	if len(ctx.Users) == 0 || len(ctx.Events) == 0 {
 		return
 	}
-	urls, tokens := lk.extract(ctx.Users)
+	urls := lk.extract(ctx.Users)
 	message := BuildTplMessage(models.Lark, lk.tpl, ctx.Events)
-	for i, url := range urls {
+	for _, url := range urls {
 		body := feishu{
 			Msgtype: "text",
 			Content: feishuContent{
 				Text: message,
 			},
 		}
-		doSendAndRecord(ctx.Ctx, url, tokens[i], body, models.Lark, ctx.Stats, ctx.Events)
+		doSend(url, body, models.Lark, ctx.Stats)
 	}
 }
 
-func (lk *LarkSender) extract(users []*models.User) ([]string, []string) {
+func (lk *LarkSender) extract(users []*models.User) []string {
 	urls := make([]string, 0, len(users))
-	tokens := make([]string, 0, len(users))
 
 	for _, user := range users {
 		if token, has := user.ExtractToken(models.Lark); has {
@@ -58,8 +59,7 @@ func (lk *LarkSender) extract(users []*models.User) ([]string, []string) {
 				url = "https://open.larksuite.com/open-apis/bot/v2/hook/" + token
 			}
 			urls = append(urls, url)
-			tokens = append(tokens, token)
 		}
 	}
-	return urls, tokens
+	return urls
 }

alert/sender/larkcard.go

@@ -56,14 +56,15 @@ func (fs *LarkCardSender) CallBack(ctx CallBackContext) {
 	}
 	parsedURL.RawQuery = ""
 
-	doSendAndRecord(ctx.Ctx, ctx.CallBackURL, ctx.CallBackURL, body, "callback", ctx.Stats, ctx.Events)
+	doSendAndRecord(ctx.Ctx, ctx.CallBackURL, ctx.CallBackURL, body, "callback",
+		ctx.Stats, ctx.Events[0])
 }
 
 func (fs *LarkCardSender) Send(ctx MessageContext) {
 	if len(ctx.Users) == 0 || len(ctx.Events) == 0 {
 		return
 	}
-	urls, tokens := fs.extract(ctx.Users)
+	urls, _ := fs.extract(ctx.Users)
 	message := BuildTplMessage(models.LarkCard, fs.tpl, ctx.Events)
 	color := "red"
 	lowerUnicode := strings.ToLower(message)
@@ -79,14 +80,14 @@ func (fs *LarkCardSender) Send(ctx MessageContext) {
 	body.Card.Header.Template = color
 	body.Card.Elements[0].Text.Content = message
 	body.Card.Elements[2].Elements[0].Content = SendTitle
-	for i, url := range urls {
-		doSendAndRecord(ctx.Ctx, url, tokens[i], body, models.LarkCard, ctx.Stats, ctx.Events)
+	for _, url := range urls {
+		doSend(url, body, models.LarkCard, ctx.Stats)
 	}
 }
 
 func (fs *LarkCardSender) extract(users []*models.User) ([]string, []string) {
 	urls := make([]string, 0, len(users))
-	tokens := make([]string, 0)
+	ats := make([]string, 0)
 	for i := range users {
 		if token, has := users[i].ExtractToken(models.Lark); has {
 			url := token
@@ -94,8 +95,7 @@ func (fs *LarkCardSender) extract(users []*models.User) ([]string, []string) {
 				url = "https://open.larksuite.com/open-apis/bot/v2/hook/" + strings.TrimSpace(token)
 			}
 			urls = append(urls, url)
-			tokens = append(tokens, token)
 		}
 	}
-	return urls, tokens
+	return urls, ats
 }

alert/sender/mm.go

@@ -43,7 +43,7 @@ func (ms *MmSender) Send(ctx MessageContext) {
 		Text:   message,
 		Tokens: urls,
 		Stats:  ctx.Stats,
-	}, ctx.Events, models.Mm)
+	}, ctx.Events[0])
 }
 
 func (ms *MmSender) CallBack(ctx CallBackContext) {
@@ -56,7 +56,9 @@ func (ms *MmSender) CallBack(ctx CallBackContext) {
 		Text:   message,
 		Tokens: []string{ctx.CallBackURL},
 		Stats:  ctx.Stats,
-	}, ctx.Events, "callback")
+	}, ctx.Events[0])
+
+	ctx.Stats.AlertNotifyTotal.WithLabelValues("rule_callback").Inc()
 }
 
 func (ms *MmSender) extract(users []*models.User) []string {
@@ -69,12 +71,11 @@ func (ms *MmSender) extract(users []*models.User) []string {
 	return tokens
 }
 
-func SendMM(ctx *ctx.Context, message MatterMostMessage, events []*models.AlertCurEvent, channel string) {
+func SendMM(ctx *ctx.Context, message MatterMostMessage, event *models.AlertCurEvent) {
 	for i := 0; i < len(message.Tokens); i++ {
 		u, err := url.Parse(message.Tokens[i])
 		if err != nil {
 			logger.Errorf("mm_sender: failed to parse error=%v", err)
-			NotifyRecord(ctx, events, channel, message.Tokens[i], "", err)
 			continue
 		}
 
@@ -103,7 +104,7 @@ func SendMM(ctx *ctx.Context, message MatterMostMessage, events []*models.AlertC
 				Username: username,
 				Text:     txt + message.Text,
 			}
-			doSendAndRecord(ctx, ur, message.Tokens[i], body, channel, message.Stats, events)
+			doSendAndRecord(ctx, ur, message.Tokens[i], body, models.Mm, message.Stats, event)
 		}
 	}
 }

alert/sender/plugin.go

@@ -85,7 +85,7 @@ func alertingCallScript(ctx *ctx.Context, stdinBytes []byte, notifyScript models
 	}
 
 	err, isTimeout := sys.WrapTimeout(cmd, time.Duration(config.Timeout)*time.Second)
-	NotifyRecord(ctx, []*models.AlertCurEvent{event}, channel, cmd.String(), "", buildErr(err, isTimeout))
+	NotifyRecord(ctx, event, channel, cmd.String(), "", buildErr(err, isTimeout))
 
 	if isTimeout {
 		if err == nil {

alert/sender/telegram.go

@@ -1,7 +1,6 @@
 package sender
 
 import (
-	"errors"
 	"html/template"
 	"strings"
 
@@ -41,7 +40,9 @@ func (ts *TelegramSender) CallBack(ctx CallBackContext) {
 		Text:   message,
 		Tokens: []string{ctx.CallBackURL},
 		Stats:  ctx.Stats,
-	}, ctx.Events, "callback")
+	}, ctx.Events[0])
+
+	ctx.Stats.AlertNotifyTotal.WithLabelValues("rule_callback").Inc()
 }
 
 func (ts *TelegramSender) Send(ctx MessageContext) {
@@ -55,7 +56,7 @@ func (ts *TelegramSender) Send(ctx MessageContext) {
 		Text:   message,
 		Tokens: tokens,
 		Stats:  ctx.Stats,
-	}, ctx.Events, models.Telegram)
+	}, ctx.Events[0])
 }
 
 func (ts *TelegramSender) extract(users []*models.User) []string {
@@ -68,11 +69,10 @@ func (ts *TelegramSender) extract(users []*models.User) []string {
 	return tokens
 }
 
-func SendTelegram(ctx *ctx.Context, message TelegramMessage, events []*models.AlertCurEvent, channel string) {
+func SendTelegram(ctx *ctx.Context, message TelegramMessage, event *models.AlertCurEvent) {
 	for i := 0; i < len(message.Tokens); i++ {
 		if !strings.Contains(message.Tokens[i], "/") && !strings.HasPrefix(message.Tokens[i], "https://") {
 			logger.Errorf("telegram_sender: result=fail invalid token=%s", message.Tokens[i])
-			NotifyRecord(ctx, events, channel, message.Tokens[i], "", errors.New("invalid token"))
 			continue
 		}
 		var url string
@@ -93,6 +93,6 @@ func SendTelegram(ctx *ctx.Context, message TelegramMessage, events []*models.Al
 			Text:      message.Text,
 		}
 
-		doSendAndRecord(ctx, url, message.Tokens[i], body, channel, message.Stats, events)
+		doSendAndRecord(ctx, url, message.Tokens[i], body, models.Telegram, message.Stats, event)
 	}
 }

alert/sender/webhook.go

@@ -59,21 +59,17 @@ func sendWebhook(webhook *models.Webhook, event interface{}, stats *astats.Stats
 	if webhook != nil {
 		insecureSkipVerify = webhook.SkipVerify
 	}
-
-	if conf.Client == nil {
-		logger.Warningf("event_%s, event:%s, url: [%s], error: [%s]", channel, string(bs), conf.Url, "client is nil")
-		conf.Client = &http.Client{
-			Timeout: time.Duration(conf.Timeout) * time.Second,
-			Transport: &http.Transport{
-				TLSClientConfig: &tls.Config{InsecureSkipVerify: insecureSkipVerify},
-			},
-		}
+	client := http.Client{
+		Timeout: time.Duration(conf.Timeout) * time.Second,
+		Transport: &http.Transport{
+			TLSClientConfig: &tls.Config{InsecureSkipVerify: insecureSkipVerify},
+		},
 	}
 
 	stats.AlertNotifyTotal.WithLabelValues(channel).Inc()
 	var resp *http.Response
 	var body []byte
-	resp, err = conf.Client.Do(req)
+	resp, err = client.Do(req)
 
 	if err != nil {
 		stats.AlertNotifyErrorTotal.WithLabelValues(channel).Inc()
@@ -95,12 +91,12 @@ func sendWebhook(webhook *models.Webhook, event interface{}, stats *astats.Stats
 	return false, string(body), nil
 }
 
-func SingleSendWebhooks(ctx *ctx.Context, webhooks map[string]*models.Webhook, event *models.AlertCurEvent, stats *astats.Stats) {
+func SingleSendWebhooks(ctx *ctx.Context, webhooks []*models.Webhook, event *models.AlertCurEvent, stats *astats.Stats) {
 	for _, conf := range webhooks {
 		retryCount := 0
 		for retryCount < 3 {
 			needRetry, res, err := sendWebhook(conf, event, stats)
-			NotifyRecord(ctx, []*models.AlertCurEvent{event}, "webhook", conf.Url, res, err)
+			NotifyRecord(ctx, event, "webhook", conf.Url, res, err)
 			if !needRetry {
 				break
 			}
@@ -110,7 +106,7 @@ func SingleSendWebhooks(ctx *ctx.Context, webhooks map[string]*models.Webhook, e
 	}
 }
 
-func BatchSendWebhooks(ctx *ctx.Context, webhooks map[string]*models.Webhook, event *models.AlertCurEvent, stats *astats.Stats) {
+func BatchSendWebhooks(ctx *ctx.Context, webhooks []*models.Webhook, event *models.AlertCurEvent, stats *astats.Stats) {
 	for _, conf := range webhooks {
 		logger.Infof("push event:%+v to queue:%v", event, conf)
 		PushEvent(ctx, conf, event, stats)
@@ -125,8 +121,8 @@ var EventQueueLock sync.RWMutex
 const QueueMaxSize = 100000
 
 type WebhookQueue struct {
-	eventQueue *SafeEventQueue
-	closeCh    chan struct{}
+	list    *SafeListLimited
+	closeCh chan struct{}
 }
 
 func PushEvent(ctx *ctx.Context, webhook *models.Webhook, event *models.AlertCurEvent, stats *astats.Stats) {
@@ -136,8 +132,8 @@ func PushEvent(ctx *ctx.Context, webhook *models.Webhook, event *models.AlertCur
 
 	if queue == nil {
 		queue = &WebhookQueue{
-			eventQueue: NewSafeEventQueue(QueueMaxSize),
-			closeCh:    make(chan struct{}),
+			list:    NewSafeListLimited(QueueMaxSize),
+			closeCh: make(chan struct{}),
 		}
 
 		EventQueueLock.Lock()
@@ -147,10 +143,10 @@ func PushEvent(ctx *ctx.Context, webhook *models.Webhook, event *models.AlertCur
 		StartConsumer(ctx, queue, webhook.Batch, webhook, stats)
 	}
 
-	succ := queue.eventQueue.Push(event)
+	succ := queue.list.PushFront(event)
 	if !succ {
 		stats.AlertNotifyErrorTotal.WithLabelValues("push_event_queue").Inc()
-		logger.Warningf("Write channel(%s) full, current channel size: %d event:%v", webhook.Url, queue.eventQueue.Len(), event)
+		logger.Warningf("Write channel(%s) full, current channel size: %d event:%v", webhook.Url, queue.list.Len(), event)
 	}
 }
 
@@ -161,7 +157,7 @@ func StartConsumer(ctx *ctx.Context, queue *WebhookQueue, popSize int, webhook *
 			logger.Infof("event queue:%v closed", queue)
 			return
 		default:
-			events := queue.eventQueue.PopN(popSize)
+			events := queue.list.PopBack(popSize)
 			if len(events) == 0 {
 				time.Sleep(time.Millisecond * 400)
 				continue
@@ -170,7 +166,7 @@ func StartConsumer(ctx *ctx.Context, queue *WebhookQueue, popSize int, webhook *
 			retryCount := 0
 			for retryCount < webhook.RetryCount {
 				needRetry, res, err := sendWebhook(webhook, events, stats)
-				go NotifyRecord(ctx, events, "webhook", webhook.Url, res, err)
+				go RecordEvents(ctx, webhook, events, stats, res, err)
 				if !needRetry {
 					break
 				}
@@ -180,3 +176,10 @@ func StartConsumer(ctx *ctx.Context, queue *WebhookQueue, popSize int, webhook *
 		}
 	}
 }
+
+func RecordEvents(ctx *ctx.Context, webhook *models.Webhook, events []*models.AlertCurEvent, stats *astats.Stats, res string, err error) {
+	for _, event := range events {
+		time.Sleep(time.Millisecond * 10)
+		NotifyRecord(ctx, event, "webhook", webhook.Url, res, err)
+	}
+}

alert/sender/webhook_event_queue.go

@@ -1,109 +0,0 @@
-package sender
-
-import (
-	"container/list"
-	"sync"
-
-	"github.com/ccfos/nightingale/v6/models"
-)
-
-type SafeEventQueue struct {
-	lock        sync.RWMutex
-	maxSize     int
-	queueHigh   *list.List
-	queueMiddle *list.List
-	queueLow    *list.List
-}
-
-const (
-	High   = 1
-	Middle = 2
-	Low    = 3
-)
-
-func NewSafeEventQueue(maxSize int) *SafeEventQueue {
-	return &SafeEventQueue{
-		maxSize:     maxSize,
-		lock:        sync.RWMutex{},
-		queueHigh:   list.New(),
-		queueMiddle: list.New(),
-		queueLow:    list.New(),
-	}
-}
-
-func (spq *SafeEventQueue) Len() int {
-	spq.lock.RLock()
-	defer spq.lock.RUnlock()
-	return spq.queueHigh.Len() + spq.queueMiddle.Len() + spq.queueLow.Len()
-}
-
-// len 无锁读取长度，不要在本文件外调用
-func (spq *SafeEventQueue) len() int {
-	return spq.queueHigh.Len() + spq.queueMiddle.Len() + spq.queueLow.Len()
-}
-
-func (spq *SafeEventQueue) Push(event *models.AlertCurEvent) bool {
-	spq.lock.Lock()
-	defer spq.lock.Unlock()
-
-	for spq.len() > spq.maxSize {
-		return false
-	}
-
-	switch event.Severity {
-	case High:
-		spq.queueHigh.PushBack(event)
-	case Middle:
-		spq.queueMiddle.PushBack(event)
-	case Low:
-		spq.queueLow.PushBack(event)
-	default:
-		return false
-	}
-
-	return true
-}
-
-// pop 无锁弹出事件，不要在本文件外调用
-func (spq *SafeEventQueue) pop() *models.AlertCurEvent {
-	if spq.len() == 0 {
-		return nil
-	}
-
-	var elem interface{}
-
-	if spq.queueHigh.Len() > 0 {
-		elem = spq.queueHigh.Remove(spq.queueHigh.Front())
-	} else if spq.queueMiddle.Len() > 0 {
-		elem = spq.queueMiddle.Remove(spq.queueMiddle.Front())
-	} else {
-		elem = spq.queueLow.Remove(spq.queueLow.Front())
-	}
-	event, ok := elem.(*models.AlertCurEvent)
-	if !ok {
-		return nil
-	}
-	return event
-}
-
-func (spq *SafeEventQueue) Pop() *models.AlertCurEvent {
-	spq.lock.Lock()
-	defer spq.lock.Unlock()
-	return spq.pop()
-}
-
-func (spq *SafeEventQueue) PopN(n int) []*models.AlertCurEvent {
-	spq.lock.Lock()
-	defer spq.lock.Unlock()
-
-	events := make([]*models.AlertCurEvent, 0, n)
-	count := 0
-	for count < n && spq.len() > 0 {
-		event := spq.pop()
-		if event != nil {
-			events = append(events, event)
-		}
-		count++
-	}
-	return events
-}

alert/sender/webhook_event_queue_test.go

@@ -1,157 +0,0 @@
-package sender
-
-import (
-	"sync"
-	"testing"
-	"time"
-
-	"github.com/ccfos/nightingale/v6/models"
-	"github.com/stretchr/testify/assert"
-)
-
-func TestSafePriorityQueue_ConcurrentPushPop(t *testing.T) {
-	spq := NewSafeEventQueue(100000)
-
-	var wg sync.WaitGroup
-	numGoroutines := 100
-	numEvents := 1000
-
-	// 并发 Push
-	wg.Add(numGoroutines)
-	for i := 0; i < numGoroutines; i++ {
-		go func(goroutineID int) {
-			defer wg.Done()
-			for j := 0; j < numEvents; j++ {
-				event := &models.AlertCurEvent{
-					Severity:    goroutineID%3 + 1,
-					TriggerTime: time.Now().UnixNano(),
-				}
-				spq.Push(event)
-			}
-		}(i)
-	}
-	wg.Wait()
-
-	// 检查队列长度是否正确
-	expectedLen := numGoroutines * numEvents
-	assert.Equal(t, expectedLen, spq.Len(), "Queue length mismatch after concurrent pushes")
-
-	// 并发 Pop
-	wg.Add(numGoroutines)
-	for i := 0; i < numGoroutines; i++ {
-		go func() {
-			defer wg.Done()
-			for {
-				event := spq.Pop()
-				if event == nil {
-					return
-				}
-			}
-		}()
-	}
-	wg.Wait()
-
-	// 最终队列应该为空
-	assert.Equal(t, 0, spq.Len(), "Queue should be empty after concurrent pops")
-}
-
-func TestSafePriorityQueue_ConcurrentPopMax(t *testing.T) {
-	spq := NewSafeEventQueue(100000)
-
-	// 添加初始数据
-	for i := 0; i < 1000; i++ {
-		spq.Push(&models.AlertCurEvent{
-			Severity:    i%3 + 1,
-			TriggerTime: time.Now().UnixNano(),
-		})
-	}
-
-	var wg sync.WaitGroup
-	numGoroutines := 10
-	popMax := 100
-
-	// 并发 PopN
-	wg.Add(numGoroutines)
-	for i := 0; i < numGoroutines; i++ {
-		go func() {
-			defer wg.Done()
-			events := spq.PopN(popMax)
-			assert.LessOrEqual(t, len(events), popMax, "PopN exceeded maximum")
-		}()
-	}
-	wg.Wait()
-
-	// 检查队列长度是否正确
-	expectedRemaining := 1000 - (numGoroutines * popMax)
-	if expectedRemaining < 0 {
-		expectedRemaining = 0
-	}
-	assert.Equal(t, expectedRemaining, spq.Len(), "Queue length mismatch after concurrent PopN")
-}
-
-func TestSafePriorityQueue_ConcurrentPushPopWithDifferentSeverities(t *testing.T) {
-	spq := NewSafeEventQueue(100000)
-
-	var wg sync.WaitGroup
-	numGoroutines := 50
-	numEvents := 500
-
-	// 并发 Push 不同优先级的事件
-	wg.Add(numGoroutines)
-	for i := 0; i < numGoroutines; i++ {
-		go func(goroutineID int) {
-			defer wg.Done()
-			for j := 0; j < numEvents; j++ {
-				event := &models.AlertCurEvent{
-					Severity:    goroutineID%3 + 1, // 模拟不同的 Severity
-					TriggerTime: time.Now().UnixNano(),
-				}
-				spq.Push(event)
-			}
-		}(i)
-	}
-	wg.Wait()
-
-	// 检查队列长度是否正确
-	expectedLen := numGoroutines * numEvents
-	assert.Equal(t, expectedLen, spq.Len(), "Queue length mismatch after concurrent pushes")
-
-	// 检查事件的顺序是否按照优先级排列
-	var lastEvent *models.AlertCurEvent
-	for spq.Len() > 0 {
-		event := spq.Pop()
-		if lastEvent != nil {
-			assert.LessOrEqual(t, lastEvent.Severity, event.Severity, "Events are not in correct priority order")
-		}
-		lastEvent = event
-	}
-}
-
-func TestSafePriorityQueue_ExceedMaxSize(t *testing.T) {
-	spq := NewSafeEventQueue(5)
-
-	// 插入超过最大容量的事件
-	for i := 0; i < 10; i++ {
-		spq.Push(&models.AlertCurEvent{
-			Severity:    i % 3,
-			TriggerTime: int64(i),
-		})
-	}
-
-	// 验证队列的长度是否不超过 maxSize
-	assert.LessOrEqual(t, spq.Len(), spq.maxSize)
-
-	// 验证队列中剩余事件的内容
-	expectedEvents := 5
-	if spq.Len() < 5 {
-		expectedEvents = spq.Len()
-	}
-
-	// 检查最后存入的事件是否是按优先级排序
-	for i := 0; i < expectedEvents; i++ {
-		event := spq.Pop()
-		if event != nil {
-			assert.LessOrEqual(t, event.Severity, 2)
-		}
-	}
-}

alert/sender/wecom.go

@@ -37,7 +37,9 @@ func (ws *WecomSender) CallBack(ctx CallBackContext) {
 		},
 	}
 
-	doSendAndRecord(ctx.Ctx, ctx.CallBackURL, ctx.CallBackURL, body, "callback", ctx.Stats, ctx.Events)
+	doSendAndRecord(ctx.Ctx, ctx.CallBackURL, ctx.CallBackURL, body, "callback",
+		ctx.Stats, ctx.Events[0])
+	ctx.Stats.AlertNotifyTotal.WithLabelValues("rule_callback").Inc()
 }
 
 func (ws *WecomSender) Send(ctx MessageContext) {
@@ -53,7 +55,7 @@ func (ws *WecomSender) Send(ctx MessageContext) {
 				Content: message,
 			},
 		}
-		doSendAndRecord(ctx.Ctx, url, tokens[i], body, models.Wecom, ctx.Stats, ctx.Events)
+		doSendAndRecord(ctx.Ctx, url, tokens[i], body, models.Wecom, ctx.Stats, ctx.Events[0])
 	}
 }
 

center/center.go

@@ -6,7 +6,6 @@ import (
 
 	"github.com/ccfos/nightingale/v6/alert"
 	"github.com/ccfos/nightingale/v6/alert/astats"
-	"github.com/ccfos/nightingale/v6/alert/dispatch"
 	"github.com/ccfos/nightingale/v6/alert/process"
 	alertrt "github.com/ccfos/nightingale/v6/alert/router"
 	"github.com/ccfos/nightingale/v6/center/cconf"
@@ -49,10 +48,6 @@ func Initialize(configDir string, cryptoKey string) (func(), error) {
 
 	cconf.MergeOperationConf()
 
-	if config.Alert.Heartbeat.EngineName == "" {
-		config.Alert.Heartbeat.EngineName = "default"
-	}
-
 	logxClean, err := logx.Init(config.Log)
 	if err != nil {
 		return nil, err
@@ -68,7 +63,7 @@ func Initialize(configDir string, cryptoKey string) (func(), error) {
 	}
 	ctx := ctx.NewContext(context.Background(), db, true)
 	migrate.Migrate(db)
-	isRootInit := models.InitRoot(ctx)
+	models.InitRoot(ctx)
 
 	config.HTTP.JWTAuth.SigningKey = models.InitJWTSigningKey(ctx)
 
@@ -77,7 +72,7 @@ func Initialize(configDir string, cryptoKey string) (func(), error) {
 		return nil, err
 	}
 
-	go integration.Init(ctx, config.Center.BuiltinIntegrationsDir)
+	integration.Init(ctx, config.Center.BuiltinIntegrationsDir)
 	var redis storage.Redis
 	redis, err = storage.NewRedis(config.Redis)
 	if err != nil {
@@ -100,13 +95,9 @@ func Initialize(configDir string, cryptoKey string) (func(), error) {
 	userCache := memsto.NewUserCache(ctx, syncStats)
 	userGroupCache := memsto.NewUserGroupCache(ctx, syncStats)
 	taskTplCache := memsto.NewTaskTplCache(ctx)
-	configCvalCache := memsto.NewCvalCache(ctx, syncStats)
 
 	sso := sso.Init(config.Center, ctx, configCache)
 	promClients := prom.NewPromClient(ctx)
-
-	dispatch.InitRegisterQueryFunc(promClients)
-
 	tdengineClients := tdengine.NewTdengineClient(ctx, config.Alert.Heartbeat)
 
 	externalProcessors := process.NewExternalProcessors()
@@ -124,13 +115,12 @@ func Initialize(configDir string, cryptoKey string) (func(), error) {
 		redis, sso, ctx, metas, idents, targetCache, userCache, userGroupCache)
 	pushgwRouter := pushgwrt.New(config.HTTP, config.Pushgw, config.Alert, targetCache, busiGroupCache, idents, metas, writers, ctx)
 
-	go func() {
-		if config.Center.MigrateBusiGroupLabel || models.CanMigrateBg(ctx) {
-			models.MigrateBg(ctx, pushgwRouter.Pushgw.BusiGroupLabelKey)
-		}
-	}()
+	models.MigrateBg(ctx, pushgwRouter.Pushgw.BusiGroupLabelKey)
+	if config.Center.MigrateBusiGroupLabel {
+		models.DoMigrateBg(ctx, config.Pushgw.BusiGroupLabelKey)
+	}
 
-	r := httpx.GinEngine(config.Global.RunMode, config.HTTP, configCvalCache.PrintBodyPaths, configCvalCache.PrintAccessLog)
+	r := httpx.GinEngine(config.Global.RunMode, config.HTTP)
 
 	centerRouter.Config(r)
 	alertrtRouter.Config(r)
@@ -144,11 +134,6 @@ func Initialize(configDir string, cryptoKey string) (func(), error) {
 
 	httpClean := httpx.Init(config.HTTP, r)
 
-	fmt.Printf("please view n9e at  http://%v:%v\n", config.Alert.Heartbeat.IP, config.HTTP.Port)
-	if isRootInit {
-		fmt.Println("username/password: root/root.2020")
-	}
-
 	return func() {
 		logxClean()
 		httpClean()

center/integration/init.go

@@ -113,12 +113,6 @@ func Init(ctx *ctx.Context, builtinIntegrationsDir string) {
 			logger.Warning("delete builtin metrics fail ", err)
 		}
 
-		// 删除 uuid%1000 不为 0 uuid > 1000000000000000000 且 type 为 dashboard 的记录
-		err = models.DB(ctx).Exec("delete from builtin_payloads where uuid%1000 != 0 and uuid > 1000000000000000000 and type = 'dashboard' and updated_by = 'system'").Error
-		if err != nil {
-			logger.Warning("delete builtin payloads fail ", err)
-		}
-
 		// alerts
 		files, err = file.FilesUnder(componentDir + "/alerts")
 		if err == nil && len(files) > 0 {
@@ -224,8 +218,7 @@ func Init(ctx *ctx.Context, builtinIntegrationsDir string) {
 				}
 
 				if dashboard.UUID == 0 {
-					time.Sleep(time.Microsecond)
-					dashboard.UUID = time.Now().UnixMicro()
+					dashboard.UUID = time.Now().UnixNano()
 					// 补全文件中的 uuid
 					bs, err = json.MarshalIndent(dashboard, "", "    ")
 					if err != nil {

center/router/router.go

@@ -16,7 +16,6 @@ import (
 	"github.com/ccfos/nightingale/v6/conf"
 	_ "github.com/ccfos/nightingale/v6/front/statik"
 	"github.com/ccfos/nightingale/v6/memsto"
-	"github.com/ccfos/nightingale/v6/models"
 	"github.com/ccfos/nightingale/v6/pkg/aop"
 	"github.com/ccfos/nightingale/v6/pkg/ctx"
 	"github.com/ccfos/nightingale/v6/pkg/httpx"
@@ -52,7 +51,6 @@ type Router struct {
 	UserGroupCache    *memsto.UserGroupCacheType
 	Ctx               *ctx.Context
 	HeartbeatHook     HeartbeatHookFunc
-	TargetDeleteHook  models.TargetDeleteHookFunc
 }
 
 func New(httpConfig httpx.Config, center cconf.Center, alert aconf.Alert, ibex conf.Ibex,
@@ -79,14 +77,9 @@ func New(httpConfig httpx.Config, center cconf.Center, alert aconf.Alert, ibex c
 		UserGroupCache:    ugc,
 		Ctx:               ctx,
 		HeartbeatHook:     func(ident string) map[string]interface{} { return nil },
-		TargetDeleteHook:  emptyDeleteHook,
 	}
 }
 
-func emptyDeleteHook(ctx *ctx.Context, idents []string) error {
-	return nil
-}
-
 func stat() gin.HandlerFunc {
 	return func(c *gin.Context) {
 		start := time.Now()
@@ -184,7 +177,6 @@ func (rt *Router) Config(r *gin.Engine) {
 			pages.POST("/query-range-batch", rt.promBatchQueryRange)
 			pages.POST("/query-instant-batch", rt.promBatchQueryInstant)
 			pages.GET("/datasource/brief", rt.datasourceBriefs)
-			pages.POST("/datasource/query", rt.datasourceQuery)
 
 			pages.POST("/ds-query", rt.QueryData)
 			pages.POST("/logs-query", rt.QueryLog)
@@ -198,7 +190,6 @@ func (rt *Router) Config(r *gin.Engine) {
 			pages.POST("/query-range-batch", rt.auth(), rt.promBatchQueryRange)
 			pages.POST("/query-instant-batch", rt.auth(), rt.promBatchQueryInstant)
 			pages.GET("/datasource/brief", rt.auth(), rt.user(), rt.datasourceBriefs)
-			pages.POST("/datasource/query", rt.auth(), rt.user(), rt.datasourceQuery)
 
 			pages.POST("/ds-query", rt.auth(), rt.QueryData)
 			pages.POST("/logs-query", rt.auth(), rt.QueryLog)
@@ -280,7 +271,6 @@ func (rt *Router) Config(r *gin.Engine) {
 		pages.DELETE("/busi-group/:id/members", rt.auth(), rt.user(), rt.perm("/busi-groups/put"), rt.bgrw(), rt.busiGroupMemberDel)
 		pages.DELETE("/busi-group/:id", rt.auth(), rt.user(), rt.perm("/busi-groups/del"), rt.bgrw(), rt.busiGroupDel)
 		pages.GET("/busi-group/:id/perm/:perm", rt.auth(), rt.user(), rt.checkBusiGroupPerm)
-		pages.GET("/busi-groups/tags", rt.auth(), rt.user(), rt.busiGroupsGetTags)
 
 		pages.GET("/targets", rt.auth(), rt.user(), rt.targetGets)
 		pages.GET("/target/extra-meta", rt.auth(), rt.user(), rt.targetExtendInfoByIdent)
@@ -478,7 +468,6 @@ func (rt *Router) Config(r *gin.Engine) {
 		pages.GET("/builtin-payload/:id", rt.auth(), rt.user(), rt.perm("/built-in-components"), rt.builtinPayloadGet)
 		pages.PUT("/builtin-payloads", rt.auth(), rt.user(), rt.perm("/built-in-components/put"), rt.builtinPayloadsPut)
 		pages.DELETE("/builtin-payloads", rt.auth(), rt.user(), rt.perm("/built-in-components/del"), rt.builtinPayloadsDel)
-		pages.GET("/builtin-payload", rt.auth(), rt.user(), rt.builtinPayloadsGetByUUIDOrID)
 	}
 
 	r.GET("/api/n9e/versions", func(c *gin.Context) {
@@ -555,7 +544,6 @@ func (rt *Router) Config(r *gin.Engine) {
 			service.GET("/config/:id", rt.configGet)
 			service.GET("/configs", rt.configsGet)
 			service.GET("/config", rt.configGetByKey)
-			service.GET("/all-configs", rt.configGetAll)
 			service.PUT("/configs", rt.configsPut)
 			service.POST("/configs", rt.configsPost)
 			service.DELETE("/configs", rt.configsDel)

center/router/router_alert_cur_event.go

@@ -206,9 +206,7 @@ func (rt *Router) checkCurEventBusiGroupRWPermission(c *gin.Context, ids []int64
 	for i := 0; i < len(ids); i++ {
 		event, err := models.AlertCurEventGetById(rt.Ctx, ids[i])
 		ginx.Dangerous(err)
-		if event == nil {
-			continue
-		}
+
 		if _, has := set[event.GroupId]; !has {
 			rt.bgrwCheck(c, event.GroupId)
 			set[event.GroupId] = struct{}{}

center/router/router_alert_rule.go

@@ -73,17 +73,10 @@ func (rt *Router) alertRuleGetsByGids(c *gin.Context) {
 	if err == nil {
 		cache := make(map[int64]*models.UserGroup)
 		rids := make([]int64, 0, len(ars))
-		names := make([]string, 0, len(ars))
 		for i := 0; i < len(ars); i++ {
 			ars[i].FillNotifyGroups(rt.Ctx, cache)
 			ars[i].FillSeverities()
-
-			if len(ars[i].DatasourceQueries) != 0 {
-				ars[i].DatasourceIdsJson = rt.DatasourceCache.GetIDsByDsCateAndQueries(ars[i].Cate, ars[i].DatasourceQueries)
-			}
-
 			rids = append(rids, ars[i].Id)
-			names = append(names, ars[i].UpdateBy)
 		}
 
 		stime, etime := getAlertCueEventTimeRange(c)
@@ -93,15 +86,6 @@ func (rt *Router) alertRuleGetsByGids(c *gin.Context) {
 				ars[i].CurEventCount = cnt[ars[i].Id]
 			}
 		}
-
-		users := models.UserMapGet(rt.Ctx, "username in (?)", names)
-		if users != nil {
-			for i := 0; i < len(ars); i++ {
-				if user, exist := users[ars[i].UpdateBy]; exist {
-					ars[i].UpdateByNickname = user.Nickname
-				}
-			}
-		}
 	}
 	ginx.NewRender(c).Data(ars, err)
 }
@@ -128,10 +112,6 @@ func (rt *Router) alertRulesGetByService(c *gin.Context) {
 		cache := make(map[int64]*models.UserGroup)
 		for i := 0; i < len(ars); i++ {
 			ars[i].FillNotifyGroups(rt.Ctx, cache)
-
-			if len(ars[i].DatasourceQueries) != 0 {
-				ars[i].DatasourceIdsJson = rt.DatasourceCache.GetIDsByDsCateAndQueries(ars[i].Cate, ars[i].DatasourceQueries)
-			}
 		}
 	}
 	ginx.NewRender(c).Data(ars, err)
@@ -166,14 +146,6 @@ func (rt *Router) alertRuleAddByImport(c *gin.Context) {
 		ginx.Bomb(http.StatusBadRequest, "input json is empty")
 	}
 
-	for i := range lst {
-		if len(lst[i].DatasourceQueries) == 0 {
-			lst[i].DatasourceQueries = []models.DatasourceQuery{
-				models.DataSourceQueryAll,
-			}
-		}
-	}
-
 	bgid := ginx.UrlParamInt64(c, "id")
 	reterr := rt.alertRuleAdd(lst, username, bgid, c.GetHeader("X-Language"))
 
@@ -181,9 +153,9 @@ func (rt *Router) alertRuleAddByImport(c *gin.Context) {
 }
 
 type promRuleForm struct {
-	Payload           string                   `json:"payload" binding:"required"`
-	DatasourceQueries []models.DatasourceQuery `json:"datasource_queries" binding:"required"`
-	Disabled          int                      `json:"disabled" binding:"gte=0,lte=1"`
+	Payload       string  `json:"payload" binding:"required"`
+	DatasourceIds []int64 `json:"datasource_ids" binding:"required"`
+	Disabled      int     `json:"disabled" binding:"gte=0,lte=1"`
 }
 
 func (rt *Router) alertRuleAddByImportPromRule(c *gin.Context) {
@@ -202,7 +174,7 @@ func (rt *Router) alertRuleAddByImportPromRule(c *gin.Context) {
 		ginx.Bomb(http.StatusBadRequest, "input yaml is empty")
 	}
 
-	lst := models.DealPromGroup(pr.Groups, f.DatasourceQueries, f.Disabled)
+	lst := models.DealPromGroup(pr.Groups, f.DatasourceIds, f.Disabled)
 	username := c.MustGet("username").(string)
 	bgid := ginx.UrlParamInt64(c, "id")
 	ginx.NewRender(c).Data(rt.alertRuleAdd(lst, username, bgid, c.GetHeader("X-Language")), nil)
@@ -415,16 +387,6 @@ func (rt *Router) alertRulePutFields(c *gin.Context) {
 			}
 		}
 
-		if f.Action == "datasource_change" {
-			// 修改数据源
-			if datasourceQueries, has := f.Fields["datasource_queries"]; has {
-				bytes, err := json.Marshal(datasourceQueries)
-				ginx.Dangerous(err)
-				ginx.Dangerous(ar.UpdateFieldsMap(rt.Ctx, map[string]interface{}{"datasource_queries": bytes}))
-				continue
-			}
-		}
-
 		for k, v := range f.Fields {
 			ginx.Dangerous(ar.UpdateColumn(rt.Ctx, k, v))
 		}
@@ -444,10 +406,6 @@ func (rt *Router) alertRuleGet(c *gin.Context) {
 		return
 	}
 
-	if len(ar.DatasourceQueries) != 0 {
-		ar.DatasourceIdsJson = rt.DatasourceCache.GetIDsByDsCateAndQueries(ar.Cate, ar.DatasourceQueries)
-	}
-
 	err = ar.FillNotifyGroups(rt.Ctx, make(map[int64]*models.UserGroup))
 	ginx.Dangerous(err)
 
@@ -654,7 +612,7 @@ func (rt *Router) cloneToMachine(c *gin.Context) {
 			newRule.CreateAt = now
 			newRule.RuleConfig = alertRules[i].RuleConfig
 
-			exist, err := models.AlertRuleExists(rt.Ctx, 0, newRule.GroupId, newRule.Name)
+			exist, err := models.AlertRuleExists(rt.Ctx, 0, newRule.GroupId, newRule.DatasourceIdsJson, newRule.Name)
 			if err != nil {
 				errMsg[f.IdentList[j]] = err.Error()
 				continue

center/router/router_builtin_payload.go

@@ -43,7 +43,7 @@ func (rt *Router) builtinPayloadsAdd(c *gin.Context) {
 
 				for _, rule := range alertRules {
 					if rule.UUID == 0 {
-						rule.UUID = time.Now().UnixMicro()
+						rule.UUID = time.Now().UnixNano()
 					}
 
 					contentBytes, err := json.Marshal(rule)
@@ -78,13 +78,7 @@ func (rt *Router) builtinPayloadsAdd(c *gin.Context) {
 			}
 
 			if alertRule.UUID == 0 {
-				alertRule.UUID = time.Now().UnixMicro()
-			}
-
-			contentBytes, err := json.Marshal(alertRule)
-			if err != nil {
-				reterr[alertRule.Name] = err.Error()
-				continue
+				alertRule.UUID = time.Now().UnixNano()
 			}
 
 			bp := models.BuiltinPayload{
@@ -94,7 +88,7 @@ func (rt *Router) builtinPayloadsAdd(c *gin.Context) {
 				Name:        alertRule.Name,
 				Tags:        alertRule.AppendTags,
 				UUID:        alertRule.UUID,
-				Content:     string(contentBytes),
+				Content:     lst[i].Content,
 				CreatedBy:   username,
 				UpdatedBy:   username,
 			}
@@ -112,7 +106,7 @@ func (rt *Router) builtinPayloadsAdd(c *gin.Context) {
 
 				for _, dashboard := range dashboards {
 					if dashboard.UUID == 0 {
-						dashboard.UUID = time.Now().UnixMicro()
+						dashboard.UUID = time.Now().UnixNano()
 					}
 
 					contentBytes, err := json.Marshal(dashboard)
@@ -147,13 +141,7 @@ func (rt *Router) builtinPayloadsAdd(c *gin.Context) {
 			}
 
 			if dashboard.UUID == 0 {
-				dashboard.UUID = time.Now().UnixMicro()
-			}
-
-			contentBytes, err := json.Marshal(dashboard)
-			if err != nil {
-				reterr[dashboard.Name] = err.Error()
-				continue
+				dashboard.UUID = time.Now().UnixNano()
 			}
 
 			bp := models.BuiltinPayload{
@@ -163,7 +151,7 @@ func (rt *Router) builtinPayloadsAdd(c *gin.Context) {
 				Name:        dashboard.Name,
 				Tags:        dashboard.Tags,
 				UUID:        dashboard.UUID,
-				Content:     string(contentBytes),
+				Content:     lst[i].Content,
 				CreatedBy:   username,
 				UpdatedBy:   username,
 			}
@@ -272,15 +260,3 @@ func (rt *Router) builtinPayloadsDel(c *gin.Context) {
 
 	ginx.NewRender(c).Message(models.BuiltinPayloadDels(rt.Ctx, req.Ids))
 }
-
-func (rt *Router) builtinPayloadsGetByUUIDOrID(c *gin.Context) {
-	uuid := ginx.QueryInt64(c, "uuid", 0)
-	// 优先以 uuid 为准
-	if uuid != 0 {
-		ginx.NewRender(c).Data(models.BuiltinPayloadGet(rt.Ctx, "uuid = ?", uuid))
-		return
-	}
-
-	id := ginx.QueryInt64(c, "id", 0)
-	ginx.NewRender(c).Data(models.BuiltinPayloadGet(rt.Ctx, "id = ?", id))
-}

center/router/router_busi_group.go

@@ -140,12 +140,3 @@ func (rt *Router) busiGroupGet(c *gin.Context) {
 	ginx.Dangerous(bg.FillUserGroups(rt.Ctx))
 	ginx.NewRender(c).Data(bg, nil)
 }
-
-func (rt *Router) busiGroupsGetTags(c *gin.Context) {
-	bgids := str.IdsInt64(ginx.QueryStr(c, "gids", ""), ",")
-	targetIdents, err := models.TargetIndentsGetByBgids(rt.Ctx, bgids)
-	ginx.Dangerous(err)
-	tags, err := models.TargetGetTags(rt.Ctx, targetIdents, true, "busigroup")
-	ginx.Dangerous(err)
-	ginx.NewRender(c).Data(tags, nil)
-}

center/router/router_configs.go

@@ -24,11 +24,6 @@ func (rt *Router) configGet(c *gin.Context) {
 	ginx.NewRender(c).Data(configs, err)
 }
 
-func (rt *Router) configGetAll(c *gin.Context) {
-	config, err := models.ConfigsGetAll(rt.Ctx)
-	ginx.NewRender(c).Data(config, err)
-}
-
 func (rt *Router) configGetByKey(c *gin.Context) {
 	config, err := models.ConfigsGet(rt.Ctx, ginx.QueryStr(c, "key"))
 	ginx.NewRender(c).Data(config, err)

center/router/router_datasource.go

@@ -92,12 +92,10 @@ func (rt *Router) datasourceUpsert(c *gin.Context) {
 	var err error
 	var count int64
 
-	if !req.ForceSave {
-		err = DatasourceCheck(req)
-		if err != nil {
-			Dangerous(c, err)
-			return
-		}
+	err = DatasourceCheck(req)
+	if err != nil {
+		Dangerous(c, err)
+		return
 	}
 
 	if req.Id == 0 {
@@ -122,14 +120,12 @@ func (rt *Router) datasourceUpsert(c *gin.Context) {
 }
 
 func DatasourceCheck(ds models.Datasource) error {
-	if ds.PluginType != models.ELASTICSEARCH {
-		if ds.HTTPJson.Url == "" {
-			return fmt.Errorf("url is empty")
-		}
+	if ds.HTTPJson.Url == "" {
+		return fmt.Errorf("url is empty")
+	}
 
-		if !strings.HasPrefix(ds.HTTPJson.Url, "http") {
-			return fmt.Errorf("url must start with http or https")
-		}
+	if !strings.HasPrefix(ds.HTTPJson.Url, "http") {
+		return fmt.Errorf("url must start with http or https")
 	}
 
 	client := &http.Client{
@@ -140,11 +136,11 @@ func DatasourceCheck(ds models.Datasource) error {
 		},
 	}
 
-	var fullURL string
-	req, err := ds.HTTPJson.NewReq(&fullURL)
+	fullURL := ds.HTTPJson.Url
+	req, err := http.NewRequest("GET", fullURL, nil)
 	if err != nil {
 		logger.Errorf("Error creating request: %v", err)
-		return fmt.Errorf("request urls:%v failed", ds.HTTPJson.GetUrls())
+		return fmt.Errorf("request url:%s failed", fullURL)
 	}
 
 	if ds.PluginType == models.PROMETHEUS {
@@ -251,37 +247,3 @@ func (rt *Router) getDatasourceIds(c *gin.Context) {
 
 	ginx.NewRender(c).Data(datasourceIds, err)
 }
-
-type datasourceQueryForm struct {
-	Cate              string                   `json:"datasource_cate"`
-	DatasourceQueries []models.DatasourceQuery `json:"datasource_queries"`
-}
-
-type datasourceQueryResp struct {
-	ID   int64  `json:"id"`
-	Name string `json:"name"`
-}
-
-func (rt *Router) datasourceQuery(c *gin.Context) {
-	var dsf datasourceQueryForm
-	ginx.BindJSON(c, &dsf)
-	datasources, err := models.GetDatasourcesGetsByTypes(rt.Ctx, []string{dsf.Cate})
-	ginx.Dangerous(err)
-
-	nameToID := make(map[string]int64)
-	IDToName := make(map[int64]string)
-	for _, ds := range datasources {
-		nameToID[ds.Name] = ds.Id
-		IDToName[ds.Id] = ds.Name
-	}
-
-	ids := models.GetDatasourceIDsByDatasourceQueries(dsf.DatasourceQueries, IDToName, nameToID)
-	var req []datasourceQueryResp
-	for _, id := range ids {
-		req = append(req, datasourceQueryResp{
-			ID:   id,
-			Name: IDToName[id],
-		})
-	}
-	ginx.NewRender(c).Data(req, err)
-}

center/router/router_funcs.go

@@ -45,10 +45,6 @@ func (rt *Router) statistic(c *gin.Context) {
 		statistics, err = models.ConfigsUserVariableStatistics(rt.Ctx)
 		ginx.NewRender(c).Data(statistics, err)
 		return
-	case "cval":
-		statistics, err = models.ConfigCvalStatistics(rt.Ctx)
-		ginx.NewRender(c).Data(statistics, err)
-		return
 	default:
 		ginx.Bomb(http.StatusBadRequest, "invalid name")
 	}

center/router/router_heartbeat.go

@@ -100,7 +100,7 @@ func HandleHeartbeat(c *gin.Context, ctx *ctx.Context, engineName string, metaSe
 				groupIds = append(groupIds, groupId)
 			}
 
-			err := models.TargetOverrideBgids(ctx, []string{target.Ident}, groupIds, nil)
+			err := models.TargetOverrideBgids(ctx, []string{target.Ident}, groupIds)
 			if err != nil {
 				logger.Warningf("update target:%s group ids failed, err: %v", target.Ident, err)
 			}
@@ -113,7 +113,7 @@ func HandleHeartbeat(c *gin.Context, ctx *ctx.Context, engineName string, metaSe
 				}
 
 				if !target.MatchGroupId(groupId) {
-					err := models.TargetBindBgids(ctx, []string{target.Ident}, []int64{groupId}, nil)
+					err := models.TargetBindBgids(ctx, []string{target.Ident}, []int64{groupId})
 					if err != nil {
 						logger.Warningf("update target:%s group ids failed, err: %v", target.Ident, err)
 					}

center/router/router_mute.go

@@ -50,8 +50,7 @@ func (rt *Router) alertMuteGets(c *gin.Context) {
 	prods := strings.Fields(ginx.QueryStr(c, "prods", ""))
 	bgid := ginx.QueryInt64(c, "bgid", -1)
 	query := ginx.QueryStr(c, "query", "")
-	disabled := ginx.QueryInt(c, "disabled", -1)
-	lst, err := models.AlertMuteGets(rt.Ctx, prods, bgid, disabled, query)
+	lst, err := models.AlertMuteGets(rt.Ctx, prods, bgid, query)
 
 	ginx.NewRender(c).Data(lst, err)
 }

center/router/router_notification_record.go

@@ -35,18 +35,11 @@ type Record struct {
 
 // notificationRecordAdd
 func (rt *Router) notificationRecordAdd(c *gin.Context) {
-	var req []*models.NotificaitonRecord
+	var req models.NotificaitonRecord
 	ginx.BindJSON(c, &req)
-	err := models.DB(rt.Ctx).CreateInBatches(req, 100).Error
-	var ids []int64
-	if err == nil {
-		ids = make([]int64, len(req))
-		for i, noti := range req {
-			ids[i] = noti.Id
-		}
-	}
+	err := req.Add(rt.Ctx)
 
-	ginx.NewRender(c).Data(ids, err)
+	ginx.NewRender(c).Data(req.Id, err)
 }
 
 func (rt *Router) notificationRecordList(c *gin.Context) {

center/router/router_notify_tpl.go

@@ -161,11 +161,7 @@ func (rt *Router) notifyTplPreview(c *gin.Context) {
 func (rt *Router) notifyTplAdd(c *gin.Context) {
 	var f models.NotifyTpl
 	ginx.BindJSON(c, &f)
-
-        user := c.MustGet("user").(*models.User)
-        f.CreateBy = user.Username
-	
-        f.Channel = strings.TrimSpace(f.Channel)
+	f.Channel = strings.TrimSpace(f.Channel)
 	ginx.Dangerous(templateValidate(f))
 
 	count, err := models.Count(models.DB(rt.Ctx).Model(&models.NotifyTpl{}).Where("channel = ? or name = ?", f.Channel, f.Name))
@@ -173,8 +169,6 @@ func (rt *Router) notifyTplAdd(c *gin.Context) {
 	if count != 0 {
 		ginx.Bomb(200, "Refuse to create duplicate channel(unique)")
 	}
-
-        f.CreateAt = time.Now().Unix()
 	ginx.NewRender(c).Message(f.Create(rt.Ctx))
 }
 

center/router/router_proxy.go

@@ -7,6 +7,7 @@ import (
 	"net"
 	"net/http"
 	"net/http/httputil"
+	"net/url"
 	"strings"
 	"sync"
 	"time"
@@ -111,9 +112,9 @@ func (rt *Router) dsProxy(c *gin.Context) {
 		return
 	}
 
-	target, err := ds.HTTPJson.ParseUrl()
+	target, err := url.Parse(ds.HTTPJson.Url)
 	if err != nil {
-		c.String(http.StatusInternalServerError, "invalid urls: %s", ds.HTTPJson.GetUrls())
+		c.String(http.StatusInternalServerError, "invalid  url: %s", ds.HTTPJson.Url)
 		return
 	}
 

center/router/router_recording_rule.go

@@ -3,6 +3,8 @@ package router
 import (
 	"encoding/json"
 	"net/http"
+	"strconv"
+	"strings"
 	"time"
 
 	"github.com/ccfos/nightingale/v6/models"
@@ -72,14 +74,6 @@ func (rt *Router) recordingRuleAddByFE(c *gin.Context) {
 		ginx.Bomb(http.StatusBadRequest, "input json is empty")
 	}
 
-	for i := range lst {
-		if len(lst[i].DatasourceQueries) == 0 {
-			lst[i].DatasourceQueries = []models.DatasourceQuery{
-				models.DataSourceQueryAll,
-			}
-		}
-	}
-
 	bgid := ginx.UrlParamInt64(c, "id")
 	reterr := make(map[string]string)
 	for i := 0; i < count; i++ {
@@ -143,10 +137,23 @@ func (rt *Router) recordingRulePutFields(c *gin.Context) {
 	f.Fields["update_by"] = c.MustGet("username").(string)
 	f.Fields["update_at"] = time.Now().Unix()
 
-	if datasourceQueries, ok := f.Fields["datasource_queries"]; ok {
-		bytes, err := json.Marshal(datasourceQueries)
-		ginx.Dangerous(err)
-		f.Fields["datasource_queries"] = string(bytes)
+	if _, ok := f.Fields["datasource_ids"]; ok {
+		// datasource_ids = "1 2 3"
+		idsStr := strings.Fields(f.Fields["datasource_ids"].(string))
+		ids := make([]int64, 0)
+		for _, idStr := range idsStr {
+			id, err := strconv.ParseInt(idStr, 10, 64)
+			if err != nil {
+				ginx.Bomb(http.StatusBadRequest, "datasource_ids error")
+			}
+			ids = append(ids, id)
+		}
+
+		bs, err := json.Marshal(ids)
+		if err != nil {
+			ginx.Bomb(http.StatusBadRequest, "datasource_ids error")
+		}
+		f.Fields["datasource_ids"] = string(bs)
 	}
 
 	for i := 0; i < len(f.Ids); i++ {

center/router/router_target.go

@@ -28,19 +28,17 @@ func (rt *Router) targetGetsByHostFilter(c *gin.Context) {
 	var f TargetQuery
 	ginx.BindJSON(c, &f)
 
-	// todo 这里也走缓存吗？有 limit 和 offset
-	hosts := rt.TargetCache.GetHostIdentsQuery(f.Filters)
-	//query := models.GetHostsQuery(f.Filters)
-	//
-	//hosts, err := models.TargetGetsByFilter(rt.Ctx, query, f.Limit, (f.P-1)*f.Limit)
-	//ginx.Dangerous(err)
-	//
-	//total, err := models.TargetCountByFilter(rt.Ctx, query)
-	//ginx.Dangerous(err)
+	query := models.GetHostsQuery(f.Filters)
+
+	hosts, err := models.TargetGetsByFilter(rt.Ctx, query, f.Limit, (f.P-1)*f.Limit)
+	ginx.Dangerous(err)
+
+	total, err := models.TargetCountByFilter(rt.Ctx, query)
+	ginx.Dangerous(err)
 
 	ginx.NewRender(c).Data(gin.H{
 		"list":  hosts,
-		"total": len(hosts),
+		"total": total,
 	}, nil)
 }
 
@@ -171,7 +169,7 @@ func (rt *Router) targetGetTags(c *gin.Context) {
 	idents := ginx.QueryStr(c, "idents", "")
 	idents = strings.ReplaceAll(idents, ",", " ")
 	ignoreHostTag := ginx.QueryBool(c, "ignore_host_tag", false)
-	lst, err := models.TargetGetTags(rt.Ctx, strings.Fields(idents), ignoreHostTag, "")
+	lst, err := models.TargetGetTags(rt.Ctx, strings.Fields(idents), ignoreHostTag)
 	ginx.NewRender(c).Data(lst, err)
 }
 
@@ -399,7 +397,6 @@ type targetBgidsForm struct {
 	Idents  []string `json:"idents" binding:"required_without=HostIps"`
 	HostIps []string `json:"host_ips" binding:"required_without=Idents"`
 	Bgids   []int64  `json:"bgids"`
-	Tags    []string `json:"tags"`
 	Action  string   `json:"action"` // add del reset
 }
 
@@ -455,11 +452,11 @@ func (rt *Router) targetBindBgids(c *gin.Context) {
 
 	switch f.Action {
 	case "add":
-		ginx.NewRender(c).Data(failedResults, models.TargetBindBgids(rt.Ctx, f.Idents, f.Bgids, f.Tags))
+		ginx.NewRender(c).Data(failedResults, models.TargetBindBgids(rt.Ctx, f.Idents, f.Bgids))
 	case "del":
 		ginx.NewRender(c).Data(failedResults, models.TargetUnbindBgids(rt.Ctx, f.Idents, f.Bgids))
 	case "reset":
-		ginx.NewRender(c).Data(failedResults, models.TargetOverrideBgids(rt.Ctx, f.Idents, f.Bgids, f.Tags))
+		ginx.NewRender(c).Data(failedResults, models.TargetOverrideBgids(rt.Ctx, f.Idents, f.Bgids))
 	default:
 		ginx.Bomb(http.StatusBadRequest, "invalid action")
 	}
@@ -481,7 +478,7 @@ func (rt *Router) targetUpdateBgidByService(c *gin.Context) {
 		ginx.Bomb(http.StatusBadRequest, err.Error())
 	}
 
-	ginx.NewRender(c).Data(failedResults, models.TargetOverrideBgids(rt.Ctx, f.Idents, []int64{f.Bgid}, nil))
+	ginx.NewRender(c).Data(failedResults, models.TargetOverrideBgids(rt.Ctx, f.Idents, []int64{f.Bgid}))
 }
 
 type identsForm struct {
@@ -505,7 +502,7 @@ func (rt *Router) targetDel(c *gin.Context) {
 		ginx.Bomb(http.StatusBadRequest, err.Error())
 	}
 
-	ginx.NewRender(c).Data(failedResults, models.TargetDel(rt.Ctx, f.Idents, rt.TargetDeleteHook))
+	ginx.NewRender(c).Data(failedResults, models.TargetDel(rt.Ctx, f.Idents))
 }
 
 func (rt *Router) targetDelByService(c *gin.Context) {
@@ -524,7 +521,7 @@ func (rt *Router) targetDelByService(c *gin.Context) {
 		ginx.Bomb(http.StatusBadRequest, err.Error())
 	}
 
-	ginx.NewRender(c).Data(failedResults, models.TargetDel(rt.Ctx, f.Idents, rt.TargetDeleteHook))
+	ginx.NewRender(c).Data(failedResults, models.TargetDel(rt.Ctx, f.Idents))
 }
 
 func (rt *Router) checkTargetPerm(c *gin.Context, idents []string) {
@@ -539,7 +536,7 @@ func (rt *Router) checkTargetPerm(c *gin.Context, idents []string) {
 
 func (rt *Router) targetsOfAlertRule(c *gin.Context) {
 	engineName := ginx.QueryStr(c, "engine_name", "")
-	m, err := models.GetTargetsOfHostAlertRule(rt.Ctx, engineName, rt.TargetCache.GetHostIdentsQuery)
+	m, err := models.GetTargetsOfHostAlertRule(rt.Ctx, engineName)
 	ret := make(map[string]map[int64][]string)
 	for en, v := range m {
 		if en != engineName {

cli/upgrade/config.go

@@ -33,7 +33,7 @@ type ClusterOptions struct {
 	MaxIdleConnsPerHost int
 }
 
-func Parse(fpath string, configPtr *Config) error {
+func Parse(fpath string, configPtr interface{}) error {
 	var (
 		tBuf []byte
 	)

cmd/edge/edge.go

@@ -7,7 +7,6 @@ import (
 
 	"github.com/ccfos/nightingale/v6/alert"
 	"github.com/ccfos/nightingale/v6/alert/astats"
-	"github.com/ccfos/nightingale/v6/alert/dispatch"
 	"github.com/ccfos/nightingale/v6/alert/process"
 	alertrt "github.com/ccfos/nightingale/v6/alert/router"
 	"github.com/ccfos/nightingale/v6/center/metas"
@@ -53,13 +52,11 @@ func Initialize(configDir string, cryptoKey string) (func(), error) {
 
 	targetCache := memsto.NewTargetCache(ctx, syncStats, redis)
 	busiGroupCache := memsto.NewBusiGroupCache(ctx, syncStats)
-	configCvalCache := memsto.NewCvalCache(ctx, syncStats)
 	idents := idents.New(ctx, redis)
 	metas := metas.New(redis)
 	writers := writer.NewWriters(config.Pushgw)
 	pushgwRouter := pushgwrt.New(config.HTTP, config.Pushgw, config.Alert, targetCache, busiGroupCache, idents, metas, writers, ctx)
-	r := httpx.GinEngine(config.Global.RunMode, config.HTTP, configCvalCache.PrintBodyPaths, configCvalCache.PrintAccessLog)
-
+	r := httpx.GinEngine(config.Global.RunMode, config.HTTP)
 	pushgwRouter.Config(r)
 
 	if !config.Alert.Disable {
@@ -74,9 +71,6 @@ func Initialize(configDir string, cryptoKey string) (func(), error) {
 		taskTplsCache := memsto.NewTaskTplCache(ctx)
 
 		promClients := prom.NewPromClient(ctx)
-
-		dispatch.InitRegisterQueryFunc(promClients)
-
 		tdengineClients := tdengine.NewTdengineClient(ctx, config.Alert.Heartbeat)
 		externalProcessors := process.NewExternalProcessors()
 

docker/compose-bridge/docker-compose.yaml

@@ -1,3 +1,5 @@
+version: "3.7"
+
 networks:
   nightingale:
     driver: bridge

docker/compose-bridge/etc-categraf/config.toml

@@ -19,8 +19,8 @@ precision = "ms"
 # global collect interval
 interval = 15
 
-# [global.labels]
-# source="categraf"
+[global.labels]
+source="categraf"
 # region = "shanghai"
 # env = "localhost"
 

docker/compose-bridge/etc-categraf/input.mysql/mysql.toml

@@ -1,42 +0,0 @@
-[[instances]]
-address = "mysql:3306"
-username = "root"
-password = "1234"
-
-# # set tls=custom to enable tls
-# parameters = "tls=false"
-
-# extra_status_metrics = true
-# extra_innodb_metrics = false
-# gather_processlist_processes_by_state = false
-# gather_processlist_processes_by_user = false
-# gather_schema_size = true
-# gather_table_size = false
-# gather_system_table_size = false
-# gather_slave_status = true
-
-# # timeout
-# timeout_seconds = 3
-
-# # interval = global.interval * interval_times
-# interval_times = 1
-
-# important! use global unique string to specify instance
-labels = { instance="docker-compose-mysql" }
-
-## Optional TLS Config
-# use_tls = false
-# tls_min_version = "1.2"
-# tls_ca = "/etc/categraf/ca.pem"
-# tls_cert = "/etc/categraf/cert.pem"
-# tls_key = "/etc/categraf/key.pem"
-## Use TLS but skip chain & host verification
-# insecure_skip_verify = true
-
-#[[instances.queries]]
-# mesurement = "lock_wait"
-# metric_fields = [ "total" ]
-# timeout = "3s"
-# request = '''
-#SELECT count(*) as total FROM information_schema.innodb_trx WHERE trx_state='LOCK WAIT'
-#'''

docker/compose-bridge/etc-categraf/input.redis/redis.toml

@@ -1,37 +0,0 @@
-[[instances]]
-address = "redis:6379"
-username = ""
-password = ""
-# pool_size = 2
-
-## 是否开启slowlog 收集
-# gather_slowlog = true
-## 最多收集少条slowlog
-# slowlog_max_len = 100
-## 收集距离现在多少秒以内的slowlog
-## 注意插件的采集周期,该参数不要小于采集周期，否则会有slowlog查不到
-# slowlog_time_window=30
-
-# 指标
-# redis_slow_log{ident=dev-01 client_addr=127.0.0.1:56364 client_name= cmd="info ALL" log_id=983} 74 (单位微秒)
-
-# # Optional. Specify redis commands to retrieve values
-# commands = [
-#     {command = ["get", "sample-key1"], metric = "custom_metric_name1"},
-#     {command = ["get", "sample-key2"], metric = "custom_metric_name2"}
-# ]
-
-# # interval = global.interval * interval_times
-# interval_times = 1
-
-# important! use global unique string to specify instance
-labels = { instance="docker-compose-redis" }
-
-## Optional TLS Config
-# use_tls = false
-# tls_min_version = "1.2"
-# tls_ca = "/etc/categraf/ca.pem"
-# tls_cert = "/etc/categraf/cert.pem"
-# tls_key = "/etc/categraf/key.pem"
-## Use TLS but skip chain & host verification
-# insecure_skip_verify = true

docker/compose-bridge/etc-nightingale/config.toml

@@ -50,7 +50,7 @@ Enable = true
 # user001 = "ccc26da7b9aba533cbb263a36c07dcc5"
 
 [HTTP.APIForService]
-Enable = false
+Enable = true 
 [HTTP.APIForService.BasicAuth]
 user001 = "ccc26da7b9aba533cbb263a36c07dcc5"
 

docker/compose-host-network-metric-log/etc-nightingale/config.toml

@@ -50,7 +50,7 @@ Enable = true
 # user001 = "ccc26da7b9aba533cbb263a36c07dcc5"
 
 [HTTP.APIForService]
-Enable = false
+Enable = true 
 [HTTP.APIForService.BasicAuth]
 user001 = "ccc26da7b9aba533cbb263a36c07dcc5"
 

docker/compose-host-network/docker-compose.yaml

@@ -25,7 +25,7 @@ services:
     network_mode: host
 
   prometheus:
-    image: prom/prometheus:v2.55.1
+    image: prom/prometheus
     container_name: prometheus
     hostname: prometheus
     restart: always

docker/compose-host-network/etc-nightingale/config.toml

@@ -50,7 +50,7 @@ Enable = true
 # user001 = "ccc26da7b9aba533cbb263a36c07dcc5"
 
 [HTTP.APIForService]
-Enable = false
+Enable = true 
 [HTTP.APIForService.BasicAuth]
 user001 = "ccc26da7b9aba533cbb263a36c07dcc5"
 

docker/compose-postgres/n9eetc_pg/config.toml

@@ -50,7 +50,7 @@ Enable = true
 # user001 = "ccc26da7b9aba533cbb263a36c07dcc5"
 
 [HTTP.APIForService]
-Enable = false
+Enable = true 
 [HTTP.APIForService.BasicAuth]
 user001 = "ccc26da7b9aba533cbb263a36c07dcc5"
 

docker/initsql/c-init.sql

@@ -1,10 +1,3 @@
-CREATE USER IF NOT EXISTS 'root'@'127.0.0.1' IDENTIFIED BY '1234';
-GRANT ALL PRIVILEGES ON *.* TO 'root'@'127.0.0.1' WITH GRANT OPTION;
-
-CREATE USER IF NOT EXISTS 'root'@'localhost' IDENTIFIED BY '1234';
-GRANT ALL PRIVILEGES ON *.* TO 'root'@'localhost' WITH GRANT OPTION;
-
-CREATE USER IF NOT EXISTS 'root'@'%' IDENTIFIED BY '1234';
-GRANT ALL PRIVILEGES ON *.* TO 'root'@'%' WITH GRANT OPTION;
-
-FLUSH PRIVILEGES;
+GRANT ALL ON *.* TO 'root'@'127.0.0.1' IDENTIFIED BY '1234';
+GRANT ALL ON *.* TO 'root'@'localhost' IDENTIFIED BY '1234';
+GRANT ALL ON *.* TO 'root'@'%' IDENTIFIED BY '1234';

docker/migratesql/migrate.sql

@@ -116,12 +116,4 @@ CREATE TABLE `target_busi_group` (
   `update_at` bigint NOT NULL,
   PRIMARY KEY (`id`),
   UNIQUE KEY `idx_target_group` (`target_ident`,`group_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
-
-/* v7.7.2 2024-12-02 */
-ALTER TABLE alert_subscribe MODIFY COLUMN rule_ids varchar(1024);
-ALTER TABLE alert_subscribe MODIFY COLUMN busi_groups varchar(4096);
-
-/* v8.0.0-beta.1 2024-12-13 */
-ALTER TABLE `alert_rule` ADD COLUMN `cron_pattern` VARCHAR(64);
-ALTER TABLE `builtin_components` MODIFY COLUMN `logo` mediumtext COMMENT '''logo of component''';
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;

docker/sqlite.sql

@@ -17,8 +17,6 @@ CREATE TABLE `users` (
     `update_by` varchar(64) not null default ''
 );
 
-CREATE UNIQUE INDEX idx_users_username ON `users` (username);
-
 insert into `users`(id, username, nickname, password, roles, create_at, create_by, update_at, update_by) values(1, 'root', '超管', 'root.2020', 'Admin', strftime('%s', 'now'), 'system', strftime('%s', 'now'), 'system');
 
 CREATE TABLE `user_group` (
@@ -184,9 +182,8 @@ CREATE TABLE `board` (
     `create_by` varchar(64) not null default '',
     `update_at` bigint not null default 0,
     `update_by` varchar(64) not null default '',
-    `public_cate` bigint not null default 0
+    unique (`group_id`, `name`)
 );
-CREATE UNIQUE INDEX idx_board_group_id_name ON `board` (group_id, name);
 CREATE INDEX `idx_board_ident` ON `board` (`ident` asc);
 
 -- for dashboard new version
@@ -195,15 +192,6 @@ CREATE TABLE `board_payload` (
     `payload` mediumtext not null
 );
 
-CREATE TABLE `chart` (
-    `id` integer primary key autoincrement,
-    `group_id` integer not null,
-    `configs` text,
-    `weight` integer not null default 0
-);
-
-CREATE INDEX idx_chart_group_id ON `chart` (group_id);
-
 CREATE TABLE `chart_share` (
     `id` integer primary key autoincrement,
     `cluster` varchar(128) not null,
@@ -250,9 +238,7 @@ CREATE TABLE `alert_rule` (
     `create_at` bigint not null default 0,
     `create_by` varchar(64) not null default '',
     `update_at` bigint not null default 0,
-    `update_by` varchar(64) not null default '',
-    `cron_pattern` varchar(64),
-    `datasource_queries` text
+    `update_by` varchar(64) not null default ''
 );
 CREATE INDEX `idx_alert_rule_group_id` ON `alert_rule` (`group_id` asc);
 CREATE INDEX `idx_alert_rule_update_at` ON `alert_rule` (`update_at` asc);
@@ -322,18 +308,11 @@ CREATE TABLE `target` (
     `tags` varchar(512) not null default '',
     `host_ip` varchar(15) default '',
     `agent_version` varchar(255) default '',
-    `host_tags` text,
     `engine_name` varchar(255) default '',
-    `os` varchar(31) default '',
     `update_at` bigint not null default 0
 );
-
 CREATE INDEX `idx_target_group_id` ON `target` (`group_id` asc);
-CREATE UNIQUE INDEX idx_target_ident ON `target` (ident);
-CREATE INDEX idx_host_ip ON `target` (host_ip);
-CREATE INDEX idx_agent_version ON `target` (agent_version);
-CREATE INDEX idx_engine_name ON `target` (engine_name);
-CREATE INDEX idx_os ON `target` (os);
+
 
 CREATE TABLE `metric_view` (
     `id` integer primary key autoincrement,
@@ -358,14 +337,12 @@ CREATE TABLE `recording_rule` (
     `disabled` tinyint(1) not null default 0,
     `prom_ql` varchar(8192) not null,
     `prom_eval_interval` int not null,
-    `cron_pattern` varchar(255) default '',
     `append_tags` varchar(255) default '',
     `query_configs` text not null,
     `create_at` bigint default '0',
     `create_by` varchar(64) default '',
     `update_at` bigint default '0',
-    `update_by` varchar(64) default '',
-    `datasource_queries` text
+    `update_by` varchar(64) default ''
 );
 CREATE INDEX `idx_recording_rule_group_id` ON `recording_rule` (`group_id` asc);
 CREATE INDEX `idx_recording_rule_update_at` ON `recording_rule` (`update_at` asc);
@@ -453,7 +430,6 @@ CREATE TABLE `alert_his_event` (
     `trigger_value` varchar(2048) not null,
     `recover_time` bigint not null default 0,
     `last_eval_time` bigint not null default 0,
-    `original_tags` varchar(8192),
     `tags` varchar(1024) not null default '',
     `annotations` text not null,
     `rule_config` text not null
@@ -483,8 +459,6 @@ CREATE INDEX `idx_builtin_components_ident` ON `builtin_components` (`ident` asc
 
 CREATE TABLE `builtin_payloads` (
   `id` integer primary key autoincrement,
-  `component_id` integer not null default 0,
-  `uuid` integer not null,
   `type` varchar(191) not null,
   `component` varchar(191) not null,
   `cate` varchar(191) not null,
@@ -500,20 +474,6 @@ CREATE INDEX `idx_builtin_payloads_component` ON `builtin_payloads` (`component`
 CREATE INDEX `idx_builtin_payloads_name` ON `builtin_payloads` (`name` asc);
 CREATE INDEX `idx_builtin_payloads_cate` ON `builtin_payloads` (`cate` asc);
 CREATE INDEX `idx_builtin_payloads_type` ON `builtin_payloads` (`type` asc);
-CREATE INDEX idx_uuid ON `builtin_payloads` (uuid);
-
-
-CREATE TABLE `notification_record` (
-    `id` integer primary key autoincrement,
-    `event_id` integer not null,
-    `sub_id` integer,
-    `channel` varchar(255) not null,
-    `status` integer,
-    `target` varchar(1024) not null,
-    `details` varchar(2048) default '',
-    `created_at` integer not null
-);
-CREATE INDEX idx_evt ON notification_record (event_id);
 
 CREATE TABLE `task_tpl` (
     `id`        integer primary key autoincrement,
@@ -593,8 +553,6 @@ CREATE TABLE `datasource`
     `updated_by` varchar(64) not null default ''
 );
 
-CREATE UNIQUE INDEX idx_datasource_name ON datasource (name);
-
 CREATE TABLE `builtin_cate` (
     `id` integer primary key autoincrement,
     `name` varchar(191) not null,
@@ -612,8 +570,6 @@ CREATE TABLE `notify_tpl` (
     `update_by` varchar(64) not null default ''
 );
 
-CREATE UNIQUE INDEX idx_notify_tpl_channel ON notify_tpl (channel);
-
 CREATE TABLE `sso_config` (
     `id` integer primary key autoincrement,
     `name` varchar(191) not null unique,
@@ -621,8 +577,6 @@ CREATE TABLE `sso_config` (
     `update_at` bigint not null default 0
 );
 
-CREATE UNIQUE INDEX idx_sso_config_name ON sso_config (name);
-
 CREATE TABLE `es_index_pattern` (
     `id` integer primary key autoincrement,
     `datasource_id` bigint not null default 0,
@@ -637,8 +591,6 @@ CREATE TABLE `es_index_pattern` (
     unique (`datasource_id`, `name`)
 );
 
-CREATE UNIQUE INDEX idx_es_index_pattern_datasource_id_name ON es_index_pattern (datasource_id, name);
-
 CREATE TABLE `builtin_metrics` (
     `id` integer primary key autoincrement,
     `collector` varchar(191) NOT NULL,
@@ -651,15 +603,13 @@ CREATE TABLE `builtin_metrics` (
     `created_at` bigint NOT NULL DEFAULT 0,
     `created_by` varchar(191) NOT NULL DEFAULT '',
     `updated_at` bigint NOT NULL DEFAULT 0,
-    `updated_by` varchar(191) NOT NULL DEFAULT '',
-    `uuid integer` not null default 0
+    `updated_by` varchar(191) NOT NULL DEFAULT ''
 );
-
-CREATE UNIQUE INDEX idx_collector_typ_name ON builtin_metrics (lang, collector, typ, name);
-CREATE INDEX idx_collector ON builtin_metrics (collector);
-CREATE INDEX idx_typ ON builtin_metrics (typ);
-CREATE INDEX idx_builtinmetric_name ON builtin_metrics (name);
-CREATE INDEX idx_lang ON builtin_metrics (lang);
+-- CREATE UNIQUE INDEX `idx_builtin_metrics_collector_typ_name` ON `builtin_metrics` (`lang`,`collector`, `typ`, `name` asc);
+-- CREATE INDEX `idx_builtin_metrics_collector` ON `builtin_metrics` (`collector` asc);
+-- CREATE INDEX `idx_builtin_metrics_typ` ON `builtin_metrics` (`typ` asc);
+-- CREATE INDEX `idx_builtin_metrics_name` ON `builtin_metrics` (`name` asc);
+-- CREATE INDEX `idx_builtin_metrics_lang` ON `builtin_metrics` (`lang` asc);
 
 
 CREATE TABLE `metric_filter` (
@@ -674,14 +624,6 @@ CREATE TABLE `metric_filter` (
 );
 CREATE INDEX `idx_metric_filter_name` ON `metric_filter` (`name` asc);
 
-CREATE TABLE `target_busi_group` (
-    `id` integer primary key autoincrement,
-    `target_ident` varchar(191) not null,
-    `group_id` integer not null,
-    `update_at` integer not null
-);
-
-CREATE UNIQUE INDEX idx_target_busi_group ON target_busi_group (target_ident, group_id);
 
 CREATE TABLE `task_meta`
 (

etc/config.toml

@@ -50,7 +50,7 @@ Enable = true
 # user001 = "ccc26da7b9aba533cbb263a36c07dcc5"
 
 [HTTP.APIForService]
-Enable = false
+Enable = true 
 [HTTP.APIForService.BasicAuth]
 user001 = "ccc26da7b9aba533cbb263a36c07dcc5"
 
@@ -73,14 +73,14 @@ DefaultRoles = ["Standard"]
 OpenRSA = false
 
 [DB]
-# mysql postgres sqlite
-DBType = "sqlite"
 # postgres: host=%s port=%s user=%s dbname=%s password=%s sslmode=%s
 # postgres: DSN="host=127.0.0.1 port=5432 user=root dbname=n9e_v6 password=1234 sslmode=disable"
-# mysql: DSN="root:1234@tcp(localhost:3306)/n9e_v6?charset=utf8mb4&parseTime=True&loc=Local"
-DSN = "n9e.db"
+# sqlite: DSN="/path/to/filename.db"
+DSN = "root:1234@tcp(127.0.0.1:3306)/n9e_v6?charset=utf8mb4&parseTime=True&loc=Local&allowNativePasswords=true"
 # enable debug mode or not
 Debug = false
+# mysql postgres sqlite
+DBType = "mysql"
 # unit: s
 MaxLifetime = 7200
 # max open connections
@@ -98,8 +98,8 @@ Address = "127.0.0.1:6379"
 # DB = 0
 # UseTLS = false
 # TLSMinVersion = "1.2"
-# standalone cluster sentinel miniredis
-RedisType = "miniredis"
+# standalone cluster sentinel
+RedisType = "standalone"
 # Mastername for sentinel type
 # MasterName = "mymaster"
 # SentinelUsername = ""
@@ -138,9 +138,6 @@ ForceUseServerTS = true
 # [Pushgw.WriterOpt]
 # QueueMaxSize = 1000000
 # QueuePopSize = 1000
-# AllQueueMaxSize = 1000000
-# fresh time, unit ms
-# AllQueueMaxSizeInterval = 200
 
 [[Pushgw.Writers]] 
 # Url = "http://127.0.0.1:8480/insert/0/prometheus/api/v1/write"

etc/edge/edge.toml

@@ -54,7 +54,7 @@ Enable = true
 # user001 = "ccc26da7b9aba533cbb263a36c07dcc5"
 
 [HTTP.APIForService]
-Enable = false
+Enable = true 
 [HTTP.APIForService.BasicAuth]
 user001 = "ccc26da7b9aba533cbb263a36c07dcc5"
 

go.mod

@@ -1,6 +1,6 @@
 module github.com/ccfos/nightingale/v6
 
-go 1.22
+go 1.18
 
 require (
 	github.com/BurntSushi/toml v0.3.1
@@ -11,7 +11,6 @@ require (
 	github.com/flashcatcloud/ibex v1.3.5
 	github.com/gin-contrib/pprof v1.4.0
 	github.com/gin-gonic/gin v1.9.1
-	github.com/glebarez/sqlite v1.11.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
@@ -33,9 +32,8 @@ require (
 	github.com/rakyll/statik v0.1.7
 	github.com/redis/go-redis/v9 v9.0.2
 	github.com/spaolacci/murmur3 v1.1.0
-	github.com/stretchr/testify v1.8.4
 	github.com/tidwall/gjson v1.14.0
-	github.com/toolkits/pkg v1.3.8
+	github.com/toolkits/pkg v1.3.6
 	golang.org/x/exp v0.0.0-20230713183714-613f0c0eb8a1
 	golang.org/x/oauth2 v0.10.0
 	gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df
@@ -43,25 +41,11 @@ require (
 	gorm.io/driver/mysql v1.4.4
 	gorm.io/driver/postgres v1.4.5
 	gorm.io/driver/sqlite v1.5.5
-	gorm.io/gorm v1.25.7
-)
-
-require (
-	github.com/alicebob/gopher-json v0.0.0-20200520072559-a9ecdc9d1d3a // indirect
-	github.com/dustin/go-humanize v1.0.1 // indirect
-	github.com/glebarez/go-sqlite v1.21.2 // indirect
-	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
-	github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
-	github.com/yuin/gopher-lua v1.1.1 // indirect
-	modernc.org/libc v1.22.5 // indirect
-	modernc.org/mathutil v1.5.0 // indirect
-	modernc.org/memory v1.5.0 // indirect
-	modernc.org/sqlite v1.23.1 // indirect
+	gorm.io/gorm v1.25.7-0.20240204074919-46816ad31dde
 )
 
 require (
 	github.com/Azure/go-ntlmssp v0.0.0-20220621081337-cb9428e4ac1e // indirect
-	github.com/alicebob/miniredis/v2 v2.33.0
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/bytedance/sonic v1.9.1 // indirect
 	github.com/cespare/xxhash/v2 v2.2.0 // indirect
@@ -103,18 +87,18 @@ require (
 	github.com/prometheus/client_model v0.4.0 // indirect
 	github.com/prometheus/procfs v0.11.0 // indirect
 	github.com/robfig/cron/v3 v3.0.1
-	github.com/tidwall/match v1.1.1
+	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
 	go.uber.org/atomic v1.11.0 // indirect
 	go.uber.org/automaxprocs v1.5.2 // indirect
 	golang.org/x/arch v0.3.0 // indirect
-	golang.org/x/crypto v0.31.0 // indirect
+	golang.org/x/crypto v0.21.0 // indirect
 	golang.org/x/image v0.18.0 // indirect
 	golang.org/x/net v0.23.0 // indirect
-	golang.org/x/sys v0.28.0 // indirect
-	golang.org/x/text v0.21.0 // indirect
+	golang.org/x/sys v0.18.0 // indirect
+	golang.org/x/text v0.16.0 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
 	google.golang.org/protobuf v1.33.0 // indirect
 	gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc // indirect

go.sum

@@ -1,32 +1,20 @@
 github.com/Azure/azure-sdk-for-go v65.0.0+incompatible h1:HzKLt3kIwMm4KeJYTdx9EbjRYTySD/t8i1Ee/W5EGXw=
 github.com/Azure/azure-sdk-for-go/sdk/azcore v1.7.0 h1:8q4SaHjFsClSvuVne0ID/5Ka8u3fcIHyqkLjcFpNRHQ=
-github.com/Azure/azure-sdk-for-go/sdk/azcore v1.7.0/go.mod h1:bjGvMhVMb+EEm3VRNQawDMUyMMjo+S5ewNjflkep/0Q=
 github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.3.0 h1:vcYCAze6p19qBW7MhZybIsqD8sMV8js0NyQM8JDnVtg=
-github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.3.0/go.mod h1:OQeznEEkTZ9OrhHJoDD8ZDq51FHgXjqtP9z6bEwBq9U=
 github.com/Azure/azure-sdk-for-go/sdk/internal v1.3.0 h1:sXr+ck84g/ZlZUOZiNELInmMgOsuGwdjjVkEIde0OtY=
-github.com/Azure/azure-sdk-for-go/sdk/internal v1.3.0/go.mod h1:okt5dMMTOFjX/aovMlrjvvXoPMBVSPzk9185BT0+eZM=
 github.com/Azure/go-ntlmssp v0.0.0-20220621081337-cb9428e4ac1e h1:NeAW1fUYUEWhft7pkxDf6WoUvEZJ/uOKsvtpjLnn8MU=
 github.com/Azure/go-ntlmssp v0.0.0-20220621081337-cb9428e4ac1e/go.mod h1:chxPXzSsl7ZWRAuOIE23GDNzjWuZquvFlgA8xmpunjU=
 github.com/AzureAD/microsoft-authentication-library-for-go v1.0.0 h1:OBhqkivkhkMqLPymWEppkm7vgPQY2XsHoEkaMQ0AdZY=
-github.com/AzureAD/microsoft-authentication-library-for-go v1.0.0/go.mod h1:kgDmCTgBzIEPFElEF+FK0SdjAor06dRq2Go927dnQ6o=
 github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/Masterminds/semver/v3 v3.1.1 h1:hLg3sBzpNErnxhQtUy/mmLR2I9foDujNK030IGemrRc=
 github.com/Masterminds/semver/v3 v3.1.1/go.mod h1:VPu/7SZ7ePZ3QOrcuXROw5FAcLl4a0cBrbBpGY/8hQs=
 github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137 h1:s6gZFSlWYmbqAuRjVTiNNhvNRfY2Wxp9nhfyel4rklc=
-github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137/go.mod h1:OMCwj8VM1Kc9e19TLln2VL61YJF0x1XFtfdL4JdbSyE=
-github.com/alicebob/gopher-json v0.0.0-20200520072559-a9ecdc9d1d3a h1:HbKu58rmZpUGpz5+4FfNmIU+FmZg2P3Xaj2v2bfNWmk=
-github.com/alicebob/gopher-json v0.0.0-20200520072559-a9ecdc9d1d3a/go.mod h1:SGnFV6hVsYE877CKEZ6tDNTjaSXYUk6QqoIK6PrAtcc=
-github.com/alicebob/miniredis/v2 v2.33.0 h1:uvTF0EDeu9RLnUEG27Db5I68ESoIxTiXbNUiji6lZrA=
-github.com/alicebob/miniredis/v2 v2.33.0/go.mod h1:MhP4a3EU7aENRi9aO+tHfTBZicLqQevyi/DJpoj6mi0=
 github.com/aws/aws-sdk-go v1.44.302 h1:ST3ko6GrJKn3Xi+nAvxjG3uk/V1pW8KC52WLeIxqqNk=
-github.com/aws/aws-sdk-go v1.44.302/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI=
 github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
 github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
 github.com/bsm/ginkgo/v2 v2.5.0 h1:aOAnND1T40wEdAtkGSkvSICWeQ8L3UASX7YVCqQx+eQ=
-github.com/bsm/ginkgo/v2 v2.5.0/go.mod h1:AiKlXPm7ItEHNc/2+OkrNG4E0ITzojb9/xWzvQ9XZ9w=
 github.com/bsm/gomega v1.20.0 h1:JhAwLmtRzXFTx2AkALSLa8ijZafntmhSoU63Ok18Uq8=
-github.com/bsm/gomega v1.20.0/go.mod h1:JifAceMQ4crZIWYUKrlGcmbN3bqHogVTADMD2ATsbwk=
 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=
@@ -53,8 +41,6 @@ github.com/dgrijalva/jwt-go v3.2.0+incompatible h1:7qlOGliEKZXTDg6OTjfoBKDXWrumC
 github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
 github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78=
 github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc=
-github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY=
-github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto=
 github.com/expr-lang/expr v1.16.1 h1:Na8CUcMdyGbnNpShY7kzcHCU7WqxuL+hnxgHZ4vaz/A=
 github.com/expr-lang/expr v1.16.1/go.mod h1:uCkhfG+x7fcZ5A5sXHKuQ07jGZRl6J0FCAaf2k4PtVQ=
 github.com/fatih/camelcase v1.0.0 h1:hxNvNX/xYBp0ovncs8WyWZrOrpBNub/JfaMvbURyft8=
@@ -73,10 +59,6 @@ github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm
 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/glebarez/go-sqlite v1.21.2 h1:3a6LFC4sKahUunAmynQKLZceZCOzUthkRkEAl9gAXWo=
-github.com/glebarez/go-sqlite v1.21.2/go.mod h1:sfxdZyhQjTM2Wry3gVYWaW072Ri1WMdWJi0k6+3382k=
-github.com/glebarez/sqlite v1.11.0 h1:wSG0irqzP6VurnMEpFGer5Li19RpIRi2qvQz++w0GMw=
-github.com/glebarez/sqlite v1.11.0/go.mod h1:h8/o8j5wiAsqSPoWELDUdJXhjAhsVliSn7bWZjOhrgQ=
 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=
@@ -112,7 +94,6 @@ github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69
 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-jwt/jwt/v4 v4.5.0 h1:7cYmW1XlMY7h7ii7UhUyChSgS5wUJEnm9uZVTGqOWzg=
-github.com/golang-jwt/jwt/v4 v4.5.0/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0=
 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/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
@@ -124,10 +105,7 @@ github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM=
 github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
 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.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
-github.com/google/pprof v0.0.0-20230705174524-200ffdc848b8 h1:n6vlPhxsA+BW/XsS5+uqi7GyzaLa5MH7qlSLBZtRdiA=
-github.com/google/pprof v0.0.0-20230705174524-200ffdc848b8/go.mod h1:Jh3hGz2jkYak8qXPD19ryItVnUgpgeqzdkY/D0EaeuA=
 github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
 github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
 github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
@@ -190,17 +168,14 @@ github.com/jinzhu/now v1.1.4/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/
 github.com/jinzhu/now v1.1.5 h1:/o9tlHleP7gOFmsnYNz3RGnqzefHA47wQpKrrdTIwXQ=
 github.com/jinzhu/now v1.1.5/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8=
 github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg=
-github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo=
 github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY=
 github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y=
 github.com/jpillora/backoff v1.0.0 h1:uvFg412JmmHBHw7iwprIxkPMI+sGQ4kzOWsMeHnm2EA=
-github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4=
 github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
 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/compress v1.16.7 h1:2mk3MPGNzKyxErAw8YaohYh69+pa4sIQSC0fPGCFR9I=
-github.com/klauspost/compress v1.16.7/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE=
 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=
@@ -212,14 +187,12 @@ github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORN
 github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
 github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk=
 github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
-github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/pty v1.1.8/go.mod h1:O1sed60cT9XZ5uDucP5qwvh+TE3NnUj51EiZO/lmSfw=
 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/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc=
-github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw=
 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=
@@ -250,25 +223,20 @@ github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjY
 github.com/mojocn/base64Captcha v1.3.6 h1:gZEKu1nsKpttuIAQgWHO+4Mhhls8cAKyiV2Ew03H+Tw=
 github.com/mojocn/base64Captcha v1.3.6/go.mod h1:i5CtHvm+oMbj1UzEPXaA8IH/xHFZ3DGY3Wh3dBpZ28E=
 github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f h1:KUppIJq7/+SVif2QVs3tOP0zanoHgBEVAwHxUSIzRqU=
-github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
 github.com/oklog/ulid v1.3.1 h1:EGfNDEx6MqHz8B3uNV6QAib1UR2Lm97sHi3ocA6ESJ4=
-github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U=
 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/pkg/browser v0.0.0-20210911075715-681adbf594b8 h1:KoWmjvw+nsYOo29YJK9vDA65RGE3NrOnUtO7a+RF9HU=
-github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8/go.mod h1:HKlIX3XHQyzLZPlr7++PzdhaXEj94dEiJgZDTsxEqUI=
 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=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U=
-github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/pquerna/cachecontrol v0.1.0 h1:yJMy84ti9h/+OEWa752kBTKv4XC30OtVVHYv/8cTqKc=
 github.com/pquerna/cachecontrol v0.1.0/go.mod h1:NrUG3Z7Rdu85UNR3vm7SOsl1nFIeSiQnrHV5K9mBcUI=
 github.com/prashantv/gostub v1.1.0 h1:BTyx3RfQjRHnUWaGF9oQos79AlQ5k8WNktv7VGvVH4g=
-github.com/prashantv/gostub v1.1.0/go.mod h1:A5zLQHz7ieHGG7is6LLXLz7I8+3LZzsrV0P1IAHhP5U=
 github.com/prometheus/client_golang v1.16.0 h1:yk/hx9hDbrGHovbci4BY+pRMfSuuat626eFsHb7tmT8=
 github.com/prometheus/client_golang v1.16.0/go.mod h1:Zsulrv/L9oM40tJ7T815tM89lFEugiJ9HzIqaAx4LKc=
 github.com/prometheus/client_model v0.4.0 h1:5lQXD3cAg1OXBf4Wq03gTrXHeaV0TQvGfUooCfx1yqY=
@@ -276,7 +244,6 @@ github.com/prometheus/client_model v0.4.0/go.mod h1:oMQmHW1/JoDwqLtg57MGgP/Fb1CJ
 github.com/prometheus/common v0.44.0 h1:+5BrQJwiBB9xsMygAB3TNvpQKOwlkc25LbISbrdOOfY=
 github.com/prometheus/common v0.44.0/go.mod h1:ofAIvZbQ1e/nugmZGz4/qCb9Ap1VoSTIO7x0VV9VvuY=
 github.com/prometheus/common/sigv4 v0.1.0 h1:qoVebwtwwEhS85Czm2dSROY5fTo2PAPEVdDeppTwGX4=
-github.com/prometheus/common/sigv4 v0.1.0/go.mod h1:2Jkxxk9yYvCkE5G1sQT7GuEXm57JrvHu9k5YwTjsNtI=
 github.com/prometheus/procfs v0.11.0 h1:5EAgkfkMl659uZPbe9AS2N68a7Cc1TJbPEuGzFuRbyk=
 github.com/prometheus/procfs v0.11.0/go.mod h1:nwNm2aOCAYw8uTR/9bWRREkZFxAUcWzPHWJq+XBB/FM=
 github.com/prometheus/prometheus v0.47.1 h1:bd2LiZyxzHn9Oo2Ei4eK2D86vz/L/OiqR1qYo0XmMBo=
@@ -285,9 +252,6 @@ github.com/rakyll/statik v0.1.7 h1:OF3QCZUuyPxuGEP7B4ypUa7sB/iHtqOTDYZXGM8KOdQ=
 github.com/rakyll/statik v0.1.7/go.mod h1:AlZONWzMtEnMs7W4e/1LURLiI49pIMmp6V9Unghqrcc=
 github.com/redis/go-redis/v9 v9.0.2 h1:BA426Zqe/7r56kCcvxYLWe1mkaz71LKF77GwgFzSxfE=
 github.com/redis/go-redis/v9 v9.0.2/go.mod h1:/xDTe9EF1LM61hek62Poq2nzQSGj0xSrEtEHbBQevps=
-github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo=
-github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec h1:W09IVJc94icq4NjY3clb7Lk8O1qJ8BdBEF8z0ibU0rE=
-github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo=
 github.com/robfig/cron/v3 v3.0.1 h1:WdRxkvbJztn8LMz/QEvLN5sBU+xKpSqwwUO1Pjr4qDs=
 github.com/robfig/cron/v3 v3.0.1/go.mod h1:eQICP3HwyT7UooqI/z+Ov+PtYAWygg1TEWWzGIFLtro=
 github.com/robfig/go-cache v0.0.0-20130306151617-9fc39e0dbf62/go.mod h1:65XQgovT59RWatovFwnwocoUxiI/eENTnOY5GK3STuY=
@@ -295,7 +259,6 @@ github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFR
 github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc=
 github.com/rogpeppe/go-internal v1.8.0/go.mod h1:WmiCO8CzOY8rg0OYDC4/i/2WRWAB6poM+XZ2dLUbcbE=
 github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ=
-github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog=
 github.com/rs/xid v1.2.1/go.mod h1:+uKXf+4Djp6Md1KODXJxgGQPKngRmWyn10oCKFzNHOQ=
 github.com/rs/zerolog v1.13.0/go.mod h1:YbFCdg8HfsridGWAh22vktObvhZbQsZXe4/zB0OKkWU=
 github.com/rs/zerolog v1.15.0/go.mod h1:xYTKnLHcpfU2225ny5qZjxnj9NvkumZYjJHlAThCjNc=
@@ -325,15 +288,14 @@ github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o
 github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
 github.com/stretchr/testify v1.8.3/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
 github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
-github.com/stretchr/testify v1.8.4/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=
 github.com/tidwall/match v1.1.1/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM=
 github.com/tidwall/pretty v1.2.0 h1:RWIZEg2iJ8/g6fDDYzMpobmaoGh5OLl4AXtGUGPcqCs=
 github.com/tidwall/pretty v1.2.0/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU=
-github.com/toolkits/pkg v1.3.8 h1:2yamC20c5mHRtbcGiLY99Lm/2mVitFn6onE8KKvMT1o=
-github.com/toolkits/pkg v1.3.8/go.mod h1:M9ecwFGW1vxCTUFM9sr2ZjXSKb04N+1sTQ6SA3RNAIU=
+github.com/toolkits/pkg v1.3.6 h1:47e1amsY6mJmcnF3Y2lIpkJXfoYY2RmgI09PtwdAEMU=
+github.com/toolkits/pkg v1.3.6/go.mod h1:M9ecwFGW1vxCTUFM9sr2ZjXSKb04N+1sTQ6SA3RNAIU=
 github.com/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS4MhqMhdFk5YI=
 github.com/twitchyliquid64/golang-asm v0.15.1/go.mod h1:a1lVb/DtPvCB8fslRZhAngC2+aY1QWCk3Cedj/Gdt08=
 github.com/ugorji/go v1.2.7/go.mod h1:nF9osbDWLy6bDVv/Rtoh6QgnvNDpmCalQV5urGCCS6M=
@@ -343,8 +305,6 @@ github.com/ugorji/go/codec v1.2.11/go.mod h1:UNopzCgEMSXjBc6AOMqYvWC1ktqTAfzJZUZ
 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=
-github.com/yuin/gopher-lua v1.1.1 h1:kYKnWBjvbNP4XLT3+bPEwAXJx262OhaHDWDVOPjL46M=
-github.com/yuin/gopher-lua v1.1.1/go.mod h1:GBR0iDaNXjAgGg9zfCvksxSRnQx76gclCIb7kdAd1Pw=
 github.com/zenazn/goji v0.9.0/go.mod h1:7S9M489iMyHBNxwZnk9/EHS098H4/F6TATF2mIxtB1Q=
 go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
 go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
@@ -356,7 +316,6 @@ go.uber.org/automaxprocs v1.4.0/go.mod h1:/mTEdr7LvHhs0v7mjdxDreTz1OG5zdZGqgOnhW
 go.uber.org/automaxprocs v1.5.2 h1:2LxUOGiR3O6tw8ui5sZa2LAaHnsviZdVOUZw4fvbnME=
 go.uber.org/automaxprocs v1.5.2/go.mod h1:eRbA25aqJrxAbsLO0xy5jVwPt7FQnRgjW+efnwa1WM0=
 go.uber.org/goleak v1.2.1 h1:NBol2c7O1ZokfZ0LEU9K6Whx/KnwvepVetCUhtKja4A=
-go.uber.org/goleak v1.2.1/go.mod h1:qlT2yGI9QafXHhZZLxlSuNsMw3FFLxBr+tBRlmO1xH4=
 go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0=
 go.uber.org/multierr v1.3.0/go.mod h1:VgVr7evmIr6uPjLBxg28wmKNXyqE9akIJ5XnfpiKl+4=
 go.uber.org/multierr v1.5.0/go.mod h1:FeouvMocqHpRaaGuG9EjoKcStLC43Zu/fmqdUMPcKYU=
@@ -381,8 +340,8 @@ golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0
 golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
 golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU=
 golang.org/x/crypto v0.9.0/go.mod h1:yrmDGqONDYtNj3tH8X9dzUun2m2lzPa9ngI6/RUPGR0=
-golang.org/x/crypto v0.31.0 h1:ihbySMvVjLAeSH1IbfcRTkD/iNscyz8rGzjF/E5hV6U=
-golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk=
+golang.org/x/crypto v0.21.0 h1:X31++rzVUdKhX5sWmSOFZxx8UW/ldWx55cbf08iNAMA=
+golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOMs=
 golang.org/x/exp v0.0.0-20230713183714-613f0c0eb8a1 h1:MGwJjxBy0HJshjDNfLsYO8xppfqWlA5ZT9OhtUUhTNw=
 golang.org/x/exp v0.0.0-20230713183714-613f0c0eb8a1/go.mod h1:FXUEEKJgO7OQYeo8N01OfiKP8RXMtf6e8aTskBGqWdc=
 golang.org/x/image v0.13.0/go.mod h1:6mmbMOeV28HuMTgA6OSRkdXKYw/t5W9Uwn2Yv1r3Yxk=
@@ -418,8 +377,7 @@ golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJ
 golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.10.0 h1:3NQrjDixjgGwUOCaF8w2+VYHv0Ve/vGYSbdkTa98gmQ=
-golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
+golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M=
 golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -442,8 +400,8 @@ golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA=
-golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4=
+golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 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=
@@ -461,8 +419,8 @@ golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
 golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
 golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
 golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
-golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo=
-golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
+golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4=
+golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190425163242-31fd60d6bfdc/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
@@ -517,15 +475,7 @@ gorm.io/driver/sqlite v1.5.5 h1:7MDMtUZhV065SilG62E0MquljeArQZNfJnjd9i9gx3E=
 gorm.io/driver/sqlite v1.5.5/go.mod h1:6NgQ7sQWAIFsPrJJl1lSNSu2TABh0ZZ/zm5fosATavE=
 gorm.io/gorm v1.23.8/go.mod h1:l2lP/RyAtc1ynaTjFksBde/O8v9oOGIApu2/xRitmZk=
 gorm.io/gorm v1.24.1-0.20221019064659-5dd2bb482755/go.mod h1:DVrVomtaYTbqs7gB/x2uVvqnXzv0nqjB396B8cG4dBA=
-gorm.io/gorm v1.25.7 h1:VsD6acwRjz2zFxGO50gPO6AkNs7KKnvfzUjHQhZDz/A=
-gorm.io/gorm v1.25.7/go.mod h1:hbnx/Oo0ChWMn1BIhpy1oYozzpM15i4YPuHDmfYtwg8=
+gorm.io/gorm v1.25.7-0.20240204074919-46816ad31dde h1:9DShaph9qhkIYw7QF91I/ynrr4cOO2PZra2PFD7Mfeg=
+gorm.io/gorm v1.25.7-0.20240204074919-46816ad31dde/go.mod h1:hbnx/Oo0ChWMn1BIhpy1oYozzpM15i4YPuHDmfYtwg8=
 honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
-modernc.org/libc v1.22.5 h1:91BNch/e5B0uPbJFgqbxXuOnxBQjlS//icfQEGmvyjE=
-modernc.org/libc v1.22.5/go.mod h1:jj+Z7dTNX8fBScMVNRAYZ/jF91K8fdT2hYMThc3YjBY=
-modernc.org/mathutil v1.5.0 h1:rV0Ko/6SfM+8G+yKiyI830l3Wuz1zRutdslNoQ0kfiQ=
-modernc.org/mathutil v1.5.0/go.mod h1:mZW8CKdRPY1v87qxC/wUdX5O1qDzXMP5TH3wjfpga6E=
-modernc.org/memory v1.5.0 h1:N+/8c5rE6EqugZwHii4IFsaJ7MUhoWX07J5tC/iI5Ds=
-modernc.org/memory v1.5.0/go.mod h1:PkUhL0Mugw21sHPeskwZW4D6VscE/GQJOnIpCnW6pSU=
-modernc.org/sqlite v1.23.1 h1:nrSBg4aRQQwq59JpvGEQ15tNxoO5pX/kUjcRNwSAGQM=
-modernc.org/sqlite v1.23.1/go.mod h1:OrDj17Mggn6MhE+iPbBNf7RGKODDE9NFT0f3EwDzJqk=
 rsc.io/pdf v0.1.1/go.mod h1:n8OzWcQ6Sp37PL01nO98y4iUCRdTGarVfzxY20ICaU4=

integrations/Appdynamics/markdown/README.md

@@ -1,6 +1,6 @@
-## AppDynamics
+## Appdynamics
 
-AppDynamics 采集插件， 采集 AppDynamics 数据
+Appdynamics 采集插件， 采集 Appdynamics 数据
 
 ## Configuration
 

integrations/AutoMQ/dashboards/cluster_overview.json

@@ -584,7 +584,7 @@
                     "links": [
                         {
                             "title": "下钻",
-                            "url": "/built-in-components/dashboard/detail?__uuid__=1717556327172992000&TSDB=${DS_PROMETHEUS}\u0026cluster_id=${cluster_id}\u0026group_id=${__field.labels.consumer_group}\u0026partition=all\u0026topic=${__field.labels.topic}"
+                            "url": "/dashboards/automq-group-metrics?TSDB=${DS_PROMETHEUS}\u0026cluster_id=${cluster_id}\u0026group_id=${__field.labels.consumer_group}\u0026partition=all\u0026topic=${__field.labels.topic}"
                         }
                     ],
                     "showHeader": true
@@ -669,7 +669,7 @@
                     "links": [
                         {
                             "title": "下钻",
-                            "url": "/built-in-components/dashboard/detail?__uuid__=1717556327174664000&TSDB=${DS_PROMETHEUS}\u0026cluster_id=${cluster_id}\u0026topic=${__field.labels.topic}"
+                            "url": "/dashboards/automq-topic-metrics?TSDB=${DS_PROMETHEUS}\u0026cluster_id=${cluster_id}\u0026topic=${__field.labels.topic}"
                         }
                     ],
                     "showHeader": true
@@ -781,7 +781,7 @@
                     "links": [
                         {
                             "title": "下钻",
-                            "url": "/built-in-components/dashboard/detail?__uuid__=1717556327159415000&DS_PROMETHEUS=${DS_PROMETHEUS}\u0026cluster_id=${cluster_id}\u0026node_id=${__field.labels.instance}"
+                            "url": "/dashboards/automq-broker-metrics?DS_PROMETHEUS=${DS_PROMETHEUS}\u0026cluster_id=${cluster_id}\u0026node_id=${__field.labels.instance}"
                         }
                     ],
                     "showHeader": true

integrations/Bind/collect/bind/bind.toml

@@ -1,8 +0,0 @@
-[[instances]]
-urls = [
-    # "http://localhost:8053/xml/v3",
-]
-gather_memory_contexts = true
-gather_views = true
-timeout = "5s"
-# labels={app="bind"}

integrations/Bind/markdown/README.md

@@ -1,13 +0,0 @@
-forked from [telegraf/snmp](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/bind)
-
-配置示例
-```
-[[instances]]
-urls = [
- #"http://localhost:8053/xml/v3",
-]
-
-timeout = "5s"
-gather_memory_contexts = true
-gather_views = true
-```

integrations/Canal/markdown/README.md

@@ -1,3 +0,0 @@
-## canal
-
-canal 默认提供了 prometheus 格式指标的接口 [Prometheus-QuickStart](https://github.com/alibaba/canal/wiki/Prometheus-QuickStart) ，所以可以直接通过[ prometheus 插件](https://flashcat.cloud/docs/content/flashcat-monitor/categraf/plugin/prometheus)采集。

integrations/Doris/collect/prometheus/collect_doris_examples.toml

@@ -1,22 +0,0 @@
-# doris_fe
-[[instances]]
-# 配置 fe metrics 服务地址
-urls = [
-     "http://127.0.0.1:8030/metrics"
-]
-
-url_label_key = "instance"
-url_label_value = "{{.Host}}"
-# 指定 fe 服务 group 和 job 标签，这里是仪表盘变量调用，可根据实际需求修改。
-labels = { group = "fe",job = "doris_cluster01"}
-
-# doris_be
-[[instances]]
-# 配置 be metrics 服务地址
-urls = [
-     "http://127.0.0.1:8040/metrics"
-]
-url_label_key = "instance"
-url_label_value = "{{.Host}}"
-# 指定 be 服务 group 和 job 标签，这里是仪表盘变量调用，可根据实际需求修改。
-labels = { group = "be",job = "doris_cluster01"}

integrations/Doris/icon/doris.svg

@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 27.6.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 30 30" style="enable-background:new 0 0 30 30;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#00A5CA;}
-	.st1{fill:#3ACA9B;}
-	.st2{fill:#405AAD;}
-</style>
-<g>
-	<g>
-		<g>
-			<path class="st0" d="M17.4,4.6l-3.3-3.3c-0.4-0.4-0.9-0.8-1.5-1C12.1,0.1,11.5,0,11,0C9.9,0,8.8,0.4,8,1.2C7.6,1.6,7.3,2,7.1,2.6
-				c-0.3,0.5-0.4,1-0.4,1.6S6.8,5.3,7,5.9c0.2,0.5,0.5,1,0.9,1.4l5.9,5.9c0.1,0.1,0.3,0.2,0.5,0.2s0.3-0.1,0.5-0.2l2.6-2.6
-				C17.6,10.5,20.2,7.4,17.4,4.6z"/>
-			<path class="st1" d="M22.8,9.8c-0.6-0.6-1.3-1.2-1.9-1.9l0,0c0,0.1,0,0.1,0,0.2c-0.2,1.4-0.9,2.7-2,3.7
-				c-3.4,3.4-6.9,6.9-10.3,10.3l-0.5,0.5c-0.7,0.6-1.2,1.5-1.3,2.4c-0.1,0.7,0,1.3,0.2,2c0.2,0.6,0.5,1.2,1,1.7
-				c0.4,0.4,0.9,0.8,1.4,1c0.5,0.2,1.1,0.3,1.7,0.3c1.3,0,2-0.2,3-1.1c3.9-3.8,7.8-7.7,10.8-10.6c1.4-1.4,1.7-3.7,0.7-5.2
-				C24.8,11.8,23.8,10.8,22.8,9.8z"/>
-			<path class="st2" d="M3.8,7.8v14.5c0,0.2,0,0.3,0.1,0.4C4,22.8,4.1,22.9,4.3,23c0.1,0,0.3,0,0.5,0c0.2,0,0.3-0.1,0.4-0.2l7.3-7.3
-				c0.1-0.1,0.2-0.3,0.2-0.5s-0.1-0.4-0.2-0.5L5.2,7.2C5.1,7.1,5,7.1,4.9,7C4.8,7,4.7,7,4.6,7C4.4,7,4.2,7.1,4,7.2
-				C3.9,7.4,3.8,7.6,3.8,7.8z"/>
-		</g>
-	</g>
-</g>
-</svg>

integrations/Doris/markdown/README.md

@@ -1,39 +0,0 @@
-# Doris
-
-Doris 的进程都会暴露 `/metrics` 接口，通过这个接口暴露 Prometheus 协议的监控数据。
-
-## 采集配置
-
-categraf 的 `conf/input.prometheus/prometheus.toml`。因为 Doris 是暴露的 Prometheus 协议的监控数据，所以使用 categraf 的 prometheus 插件即可采集。
-
-```toml
-# doris_fe
-[[instances]]
-urls = [
-     "http://127.0.0.1:8030/metrics"
-]
-
-url_label_key = "instance"
-url_label_value = "{{.Host}}"
-
-labels = { group = "fe",job = "doris_cluster01"}
-
-# doris_be
-[[instances]]
-urls = [
-     "http://127.0.0.1:8040/metrics"
-]
-url_label_key = "instance"
-url_label_value = "{{.Host}}"
-labels = { group = "be",job = "doris_cluster01"}
-```
-
-## 告警规则
-
-夜莺内置了 Doris 的告警规则，克隆到自己的业务组下即可使用。
-
-## 仪表盘
-
-夜莺内置了 Doris 的仪表盘，克隆到自己的业务组下即可使用。
-
-

integrations/IPMI/dashboards/IPMI_by_prometheus.json

@@ -1,463 +0,0 @@
-{
-    "name": "IPMI for Prometheus",
-    "ident": "",
-    "configs": {
-        "version": "2.0.0",
-        "links": [],
-        "var": [
-            {
-                "name": "node",
-                "type": "query",
-                "datasource": {
-                    "cate": "prometheus"
-                },
-                "definition": "label_values(ipmi_bmc_info, ident)",
-                "reg": "",
-                "multi": false
-            }
-        ],
-        "panels": [
-            {
-                "type": "gauge",
-                "id": "f975fded-f57e-4a6e-80b4-50d5be6dd84c",
-                "layout": {
-                    "h": 7,
-                    "w": 24,
-                    "x": 0,
-                    "y": 0,
-                    "i": "f975fded-f57e-4a6e-80b4-50d5be6dd84c",
-                    "isResizable": true
-                },
-                "version": "2.0.0",
-                "datasourceCate": "prometheus",
-                "targets": [
-                    {
-                        "refId": "A",
-                        "expr": "ipmi_temperature_celsius{ident='$node'}",
-                        "legend": "{{name}}"
-                    }
-                ],
-                "transformations": [
-                    {
-                        "id": "organize",
-                        "options": {}
-                    }
-                ],
-                "name": "Temperatures",
-                "links": [],
-                "custom": {
-                    "textMode": "valueAndName",
-                    "calc": "avg"
-                },
-                "options": {
-                    "valueMappings": [],
-                    "standardOptions": {
-                        "util": "none"
-                    },
-                    "thresholds": {
-                        "steps": [
-                            {
-                                "color": "green",
-                                "value": null,
-                                "type": "base"
-                            },
-                            {
-                                "color": "red",
-                                "value": 80
-                            }
-                        ]
-                    }
-                }
-            },
-            {
-                "type": "timeseries",
-                "id": "681f1191-4777-4377-8b77-404d9f036406",
-                "layout": {
-                    "h": 5,
-                    "w": 12,
-                    "x": 0,
-                    "y": 7,
-                    "i": "681f1191-4777-4377-8b77-404d9f036406",
-                    "isResizable": true
-                },
-                "version": "2.0.0",
-                "datasourceCate": "prometheus",
-                "targets": [
-                    {
-                        "refId": "A",
-                        "expr": "ipmi_power_watts{ident='$node'}",
-                        "legend": "{{name}}"
-                    }
-                ],
-                "transformations": [
-                    {
-                        "id": "organize",
-                        "options": {}
-                    }
-                ],
-                "name": "Power",
-                "links": [],
-                "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": "feede24c-8296-4127-982e-08cfc4151933",
-                "layout": {
-                    "h": 5,
-                    "w": 12,
-                    "x": 12,
-                    "y": 7,
-                    "i": "feede24c-8296-4127-982e-08cfc4151933",
-                    "isResizable": true
-                },
-                "version": "2.0.0",
-                "datasourceCate": "prometheus",
-                "targets": [
-                    {
-                        "refId": "A",
-                        "expr": "ipmi_power_watts{ident='$node'} * 30 * 24 ",
-                        "legend": "{{name}}"
-                    }
-                ],
-                "transformations": [
-                    {
-                        "id": "organize",
-                        "options": {}
-                    }
-                ],
-                "name": "Power usage 30d",
-                "links": [],
-                "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": "9e11e7f5-ed3c-49eb-8a72-ee76c8700c24",
-                "layout": {
-                    "h": 7,
-                    "w": 12,
-                    "x": 0,
-                    "y": 12,
-                    "i": "9e11e7f5-ed3c-49eb-8a72-ee76c8700c24",
-                    "isResizable": true
-                },
-                "version": "2.0.0",
-                "datasourceCate": "prometheus",
-                "targets": [
-                    {
-                        "refId": "A",
-                        "expr": "ipmi_temperature_celsius{ident='$node'}",
-                        "legend": "{{name}}"
-                    }
-                ],
-                "transformations": [
-                    {
-                        "id": "organize",
-                        "options": {}
-                    }
-                ],
-                "name": "Temperatures",
-                "links": [],
-                "description": "",
-                "options": {
-                    "tooltip": {
-                        "mode": "multi"
-                    },
-                    "legend": {
-                        "displayMode": "list",
-                        "placement": "bottom"
-                    },
-                    "standardOptions": {
-                        "util": "none"
-                    },
-                    "thresholds": {
-                        "steps": [
-                            {
-                                "color": "green",
-                                "value": null,
-                                "type": "base"
-                            },
-                            {
-                                "color": "red",
-                                "value": 80
-                            }
-                        ]
-                    }
-                },
-                "custom": {
-                    "drawStyle": "lines",
-                    "lineInterpolation": "linear",
-                    "spanNulls": false,
-                    "lineWidth": 1,
-                    "fillOpacity": 0.5,
-                    "gradientMode": "none",
-                    "stack": "off",
-                    "scaleDistribution": {
-                        "type": "linear"
-                    }
-                }
-            },
-            {
-                "type": "timeseries",
-                "id": "95c734f7-26cb-41a7-8376-49332cc220c2",
-                "layout": {
-                    "h": 7,
-                    "w": 12,
-                    "x": 12,
-                    "y": 12,
-                    "i": "95c734f7-26cb-41a7-8376-49332cc220c2",
-                    "isResizable": true
-                },
-                "version": "2.0.0",
-                "datasourceCate": "prometheus",
-                "targets": [
-                    {
-                        "refId": "A",
-                        "expr": "ipmi_power_watts{ident='$node'}",
-                        "legend": "{{name}}"
-                    }
-                ],
-                "transformations": [
-                    {
-                        "id": "organize",
-                        "options": {}
-                    }
-                ],
-                "name": "Power",
-                "links": [],
-                "description": "",
-                "options": {
-                    "tooltip": {
-                        "mode": "multi"
-                    },
-                    "legend": {
-                        "displayMode": "list",
-                        "placement": "bottom"
-                    },
-                    "standardOptions": {
-                        "util": "none"
-                    },
-                    "thresholds": {
-                        "steps": [
-                            {
-                                "color": "green",
-                                "value": null,
-                                "type": "base"
-                            },
-                            {
-                                "color": "red",
-                                "value": 80
-                            }
-                        ]
-                    }
-                },
-                "custom": {
-                    "drawStyle": "lines",
-                    "lineInterpolation": "linear",
-                    "spanNulls": false,
-                    "lineWidth": 1,
-                    "fillOpacity": 0.01,
-                    "gradientMode": "none",
-                    "stack": "off",
-                    "scaleDistribution": {
-                        "type": "linear"
-                    }
-                }
-            },
-            {
-                "type": "timeseries",
-                "id": "0313f34f-afcf-41e9-8f69-9a3dbd4b2e56",
-                "layout": {
-                    "h": 7,
-                    "w": 12,
-                    "x": 0,
-                    "y": 19,
-                    "i": "0313f34f-afcf-41e9-8f69-9a3dbd4b2e56",
-                    "isResizable": true
-                },
-                "version": "2.0.0",
-                "datasourceCate": "prometheus",
-                "targets": [
-                    {
-                        "refId": "A",
-                        "expr": "ipmi_fan_speed_rpm{ident='$node'}",
-                        "legend": "{{name}}"
-                    }
-                ],
-                "transformations": [
-                    {
-                        "id": "organize",
-                        "options": {}
-                    }
-                ],
-                "name": "Fans",
-                "links": [],
-                "description": "",
-                "options": {
-                    "tooltip": {
-                        "mode": "multi"
-                    },
-                    "legend": {
-                        "displayMode": "list",
-                        "placement": "bottom"
-                    },
-                    "standardOptions": {
-                        "util": "none"
-                    },
-                    "thresholds": {
-                        "steps": [
-                            {
-                                "color": "green",
-                                "value": null,
-                                "type": "base"
-                            },
-                            {
-                                "color": "red",
-                                "value": 80
-                            }
-                        ]
-                    }
-                },
-                "custom": {
-                    "drawStyle": "lines",
-                    "lineInterpolation": "linear",
-                    "spanNulls": false,
-                    "lineWidth": 1,
-                    "fillOpacity": 0.5,
-                    "gradientMode": "none",
-                    "stack": "off",
-                    "scaleDistribution": {
-                        "type": "linear"
-                    }
-                }
-            },
-            {
-                "type": "timeseries",
-                "id": "29ee004d-a95c-405d-97d1-d715fab4e1de",
-                "layout": {
-                    "h": 7,
-                    "w": 12,
-                    "x": 12,
-                    "y": 19,
-                    "i": "29ee004d-a95c-405d-97d1-d715fab4e1de",
-                    "isResizable": true
-                },
-                "version": "2.0.0",
-                "datasourceCate": "prometheus",
-                "targets": [
-                    {
-                        "refId": "A",
-                        "expr": "ipmi_voltage_volts{ident='$node',name!~\"Voltage 1|Voltage 2\"}",
-                        "legend": "{{name}}"
-                    }
-                ],
-                "transformations": [
-                    {
-                        "id": "organize",
-                        "options": {}
-                    }
-                ],
-                "name": "Voltages",
-                "links": [],
-                "description": "",
-                "options": {
-                    "tooltip": {
-                        "mode": "multi"
-                    },
-                    "legend": {
-                        "displayMode": "list",
-                        "placement": "bottom"
-                    },
-                    "standardOptions": {
-                        "util": "none"
-                    },
-                    "thresholds": {
-                        "steps": [
-                            {
-                                "color": "green",
-                                "value": null,
-                                "type": "base"
-                            },
-                            {
-                                "color": "red",
-                                "value": 80
-                            }
-                        ]
-                    }
-                },
-                "custom": {
-                    "drawStyle": "lines",
-                    "lineInterpolation": "linear",
-                    "spanNulls": false,
-                    "lineWidth": 1,
-                    "fillOpacity": 0.5,
-                    "gradientMode": "none",
-                    "stack": "off",
-                    "scaleDistribution": {
-                        "type": "linear"
-                    }
-                }
-            }
-        ]
-    },
-    "uuid": 1727587308068775000
-}

integrations/Ldap/collect/ldap/ldap.toml

@@ -1,37 +0,0 @@
-# # collect interval
-# interval = 15
-
-[[instances]]
-# # append some labels for series
-# labels = { region="cloud", product="n9e" }
-
-# # interval = global.interval * interval_times
-# interval_times = 1
-
-## Server to monitor
-## The scheme determines the mode to use for connection with
-##    ldap://...      -- unencrypted (non-TLS) connection
-##    ldaps://...     -- TLS connection
-##    starttls://...  --  StartTLS connection
-## If no port is given, the default ports, 389 for ldap and starttls and
-## 636 for ldaps, are used.
-#server = "ldap://localhost"
-
-## Server dialect, can be "openldap" or "389ds"
-# dialect = "openldap"
-
-# DN and password to bind with
-## If bind_dn is empty an anonymous bind is performed.
-bind_dn = ""
-bind_password = ""
-
-## Reverse the field names constructed from the monitoring DN
-# reverse_field_names = false
-
-## Optional TLS Config
-# use_tls = false
-# tls_ca = "/etc/categraf/ca.pem"
-# tls_cert = "/etc/categraf/cert.pem"
-# tls_key = "/etc/categraf/key.pem"
-## Use TLS but skip chain & host verification
-# insecure_skip_verify = false

integrations/Ldap/markdown/README.md

@@ -1,113 +0,0 @@
-# LDAP Input Plugin
-
-This plugin gathers metrics from LDAP servers' monitoring (`cn=Monitor`)
-backend. Currently this plugin supports [OpenLDAP](https://www.openldap.org/)
-and [389ds](https://www.port389.org/) servers.
-
-To use this plugin you must enable the monitoring backend/plugin of your LDAP
-server. See
-[OpenLDAP](https://www.openldap.org/devel/admin/monitoringslapd.html) or 389ds
-documentation for details.
-
-## Metrics
-
-Depending on the server dialect, different metrics are produced. The metrics
-are usually named according to the selected dialect.
-
-### Tags
-
-- server -- Server name or IP
-- port   -- Port used for connecting
-
-## Example Output
-
-Using the `openldap` dialect
-
-```text
-openldap_modify_operations_completed agent_hostname=zy-fat port=389 server=localhost 0
-openldap_referrals_statistics agent_hostname=zy-fat port=389 server=localhost 0
-openldap_unbind_operations_initiated agent_hostname=zy-fat port=389 server=localhost 0
-openldap_delete_operations_completed agent_hostname=zy-fat port=389 server=localhost 0
-openldap_extended_operations_completed agent_hostname=zy-fat port=389 server=localhost 0
-openldap_pdu_statistics agent_hostname=zy-fat port=389 server=localhost 42
-openldap_starting_threads agent_hostname=zy-fat port=389 server=localhost 0
-openldap_active_threads agent_hostname=zy-fat port=389 server=localhost 1
-openldap_uptime_time agent_hostname=zy-fat port=389 server=localhost 102
-openldap_bytes_statistics agent_hostname=zy-fat port=389 server=localhost 3176
-openldap_compare_operations_completed agent_hostname=zy-fat port=389 server=localhost 0
-openldap_bind_operations_completed agent_hostname=zy-fat port=389 server=localhost 1
-openldap_total_connections agent_hostname=zy-fat port=389 server=localhost 1002
-openldap_search_operations_completed agent_hostname=zy-fat port=389 server=localhost 1
-openldap_abandon_operations_initiated agent_hostname=zy-fat port=389 server=localhost 0
-openldap_add_operations_initiated agent_hostname=zy-fat port=389 server=localhost 0
-openldap_open_threads agent_hostname=zy-fat port=389 server=localhost 1
-openldap_add_operations_completed agent_hostname=zy-fat port=389 server=localhost 0
-openldap_operations_initiated agent_hostname=zy-fat port=389 server=localhost 3
-openldap_write_waiters agent_hostname=zy-fat port=389 server=localhost 0
-openldap_entries_statistics agent_hostname=zy-fat port=389 server=localhost 41
-openldap_modrdn_operations_completed agent_hostname=zy-fat port=389 server=localhost 0
-openldap_pending_threads agent_hostname=zy-fat port=389 server=localhost 0
-openldap_max_pending_threads agent_hostname=zy-fat port=389 server=localhost 0
-openldap_bind_operations_initiated agent_hostname=zy-fat port=389 server=localhost 1
-openldap_max_file_descriptors_connections agent_hostname=zy-fat port=389 server=localhost 1024
-openldap_compare_operations_initiated agent_hostname=zy-fat port=389 server=localhost 0
-openldap_search_operations_initiated agent_hostname=zy-fat port=389 server=localhost 2
-openldap_modrdn_operations_initiated agent_hostname=zy-fat port=389 server=localhost 0
-openldap_read_waiters agent_hostname=zy-fat port=389 server=localhost 1
-openldap_backload_threads agent_hostname=zy-fat port=389 server=localhost 1
-openldap_current_connections agent_hostname=zy-fat port=389 server=localhost 1
-openldap_unbind_operations_completed agent_hostname=zy-fat port=389 server=localhost 0
-openldap_delete_operations_initiated agent_hostname=zy-fat port=389 server=localhost 0
-openldap_extended_operations_initiated agent_hostname=zy-fat port=389 server=localhost 0
-openldap_modify_operations_initiated agent_hostname=zy-fat port=389 server=localhost 0
-openldap_max_threads agent_hostname=zy-fat port=389 server=localhost 16
-openldap_abandon_operations_completed agent_hostname=zy-fat port=389 server=localhost 0
-openldap_operations_completed agent_hostname=zy-fat port=389 server=localhost 2
-openldap_database_2_databases agent_hostname=zy-fat port=389 server=localhost 0
-```
-
-Using the `389ds` dialect
-
-```text
-389ds_current_connections_at_max_threads agent_hostname=zy-fat port=389 server=localhost 0
-389ds_connections_max_threads agent_hostname=zy-fat port=389 server=localhost 0
-389ds_add_operations agent_hostname=zy-fat port=389 server=localhost 0
-389ds_dtablesize agent_hostname=zy-fat port=389 server=localhost 63936
-389ds_strongauth_binds agent_hostname=zy-fat port=389 server=localhost 13
-389ds_modrdn_operations agent_hostname=zy-fat port=389 server=localhost 0
-389ds_maxthreads_per_conn_hits agent_hostname=zy-fat port=389 server=localhost 0
-389ds_current_connections agent_hostname=zy-fat port=389 server=localhost 2
-389ds_security_errors agent_hostname=zy-fat port=389 server=localhost 0
-389ds_entries_sent agent_hostname=zy-fat port=389 server=localhost 13
-389ds_cache_entries agent_hostname=zy-fat port=389 server=localhost 0
-389ds_backends agent_hostname=zy-fat port=389 server=localhost 0
-389ds_threads agent_hostname=zy-fat port=389 server=localhost 17
-389ds_connections agent_hostname=zy-fat port=389 server=localhost 2
-389ds_read_operations agent_hostname=zy-fat port=389 server=localhost 0
-389ds_entries_returned agent_hostname=zy-fat port=389 server=localhost 13
-389ds_unauth_binds agent_hostname=zy-fat port=389 server=localhost 0
-389ds_search_operations agent_hostname=zy-fat port=389 server=localhost 14
-389ds_simpleauth_binds agent_hostname=zy-fat port=389 server=localhost 0
-389ds_operations_completed agent_hostname=zy-fat port=389 server=localhost 51
-389ds_connections_in_max_threads agent_hostname=zy-fat port=389 server=localhost 0
-389ds_modify_operations agent_hostname=zy-fat port=389 server=localhost 0
-389ds_wholesubtree_search_operations agent_hostname=zy-fat port=389 server=localhost 1
-389ds_read_waiters agent_hostname=zy-fat port=389 server=localhost 0
-389ds_compare_operations agent_hostname=zy-fat port=389 server=localhost 0
-389ds_errors agent_hostname=zy-fat port=389 server=localhost 13
-389ds_in_operations agent_hostname=zy-fat port=389 server=localhost 52
-389ds_total_connections agent_hostname=zy-fat port=389 server=localhost 15
-389ds_cache_hits agent_hostname=zy-fat port=389 server=localhost 0
-389ds_list_operations agent_hostname=zy-fat port=389 server=localhost 0
-389ds_referrals_returned agent_hostname=zy-fat port=389 server=localhost 0
-389ds_copy_entries agent_hostname=zy-fat port=389 server=localhost 0
-389ds_operations_initiated agent_hostname=zy-fat port=389 server=localhost 52
-389ds_chainings agent_hostname=zy-fat port=389 server=localhost 0
-389ds_bind_security_errors agent_hostname=zy-fat port=389 server=localhost 0
-389ds_onelevel_search_operations agent_hostname=zy-fat port=389 server=localhost 0
-389ds_bytes_sent agent_hostname=zy-fat port=389 server=localhost 1702
-389ds_bytes_received agent_hostname=zy-fat port=389 server=localhost 0
-389ds_referrals agent_hostname=zy-fat port=389 server=localhost 0
-389ds_delete_operations agent_hostname=zy-fat port=389 server=localhost 0
-389ds_anonymous_binds agent_hostname=zy-fat port=389 server=localhost 0
-```

integrations/Linux/dashboards/host_table_view_demo.json

@@ -1,6 +1,13 @@
 {
+    "id": 0,
+    "group_id": 0,
     "name": "机器台账表格视图",
+    "ident": "",
     "tags": "",
+    "create_at": 0,
+    "create_by": "",
+    "update_at": 0,
+    "update_by": "",
     "configs": {
         "links": [
             {
@@ -21,7 +28,7 @@
                     "colorRange": [
                         "thresholds"
                     ],
-                    "detailUrl": "/built-in-components/dashboard/detail?__uuid__=1717556327744505000&ident=${__field.labels.ident}",
+                    "detailUrl": "/dashboards-built-in/detail?__built-in-cate=Linux\u0026__built-in-name=Linux%20Host%20by%20Categraf%20v2\u0026ident=${__field.labels.ident}",
                     "textMode": "valueAndName",
                     "valueField": "Value"
                 },
@@ -91,7 +98,7 @@
                     "colorRange": [
                         "thresholds"
                     ],
-                    "detailUrl": "/built-in-components/dashboard/detail?__uuid__=1717556327744505000&ident=${__field.labels.ident}",
+                    "detailUrl": "/dashboards-built-in/detail?__built-in-cate=Linux\u0026__built-in-name=Linux%20Host%20by%20Categraf%20v2\u0026ident=${__field.labels.ident}",
                     "textMode": "valueAndName",
                     "valueField": "Value"
                 },
@@ -164,16 +171,13 @@
                     "linkMode": "appendLinkColumn",
                     "links": [
                         {
-                            "targetBlank": true,
                             "title": "详情",
-                            "url": "/built-in-components/dashboard/detail?__uuid__=1717556327744505000&ident=${__field.labels.ident}"
+                            "url": "/dashboards-built-in/detail?__built-in-cate=Linux\u0026__built-in-name=Linux%20Host%20by%20Categraf%20v2\u0026ident=${__field.labels.ident}"
                         }
                     ],
-                    "nowrap": false,
                     "showHeader": true,
                     "sortColumn": "ident",
-                    "sortOrder": "ascend",
-                    "tableLayout": "fixed"
+                    "sortOrder": "ascend"
                 },
                 "datasourceCate": "prometheus",
                 "datasourceValue": "${prom}",
@@ -381,5 +385,10 @@
         ],
         "version": "3.0.0"
     },
+    "public": 0,
+    "public_cate": 0,
+    "bgids": null,
+    "built_in": 0,
+    "hide": 0,
     "uuid": 1717556327742611000
 }

integrations/MongoDB/dashboards/mongo_by_exporter.json

@@ -1,7 +1,13 @@
 {
+    "id": 0,
+    "group_id": 0,
     "name": "MongoDB Overview by exporter",
-    "tags": "Prometheus MongoDB",
     "ident": "",
+    "tags": "Prometheus MongoDB",
+    "create_at": 0,
+    "create_by": "",
+    "update_at": 0,
+    "update_by": "",
     "configs": {
         "panels": [
             {
@@ -144,7 +150,21 @@
                 "version": "2.0.0"
             },
             {
-                "type": "timeseries",
+                "custom": {
+                    "drawStyle": "lines",
+                    "fillOpacity": 0.3,
+                    "gradientMode": "opacity",
+                    "lineInterpolation": "smooth",
+                    "lineWidth": 2,
+                    "scaleDistribution": {
+                        "type": "linear"
+                    },
+                    "spanNulls": false,
+                    "stack": "off"
+                },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${prom}",
+                "description": "Memory usage (MiB)",
                 "id": "8446dded-9e11-4ee9-bdad-769b193ddf3e",
                 "layout": {
                     "h": 7,
@@ -154,37 +174,10 @@
                     "x": 12,
                     "y": 1
                 },
-                "version": "3.0.0",
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${prom}",
-                "targets": [
-                    {
-                        "expr": "mongodb_ss_mem_resident{instance='$instance'} * 1024 * 1024",
-                        "legend": "{{type}}",
-                        "refId": "A",
-                        "maxDataPoints": 240
-                    }
-                ],
-                "transformations": [
-                    {
-                        "id": "organize",
-                        "options": {}
-                    }
-                ],
                 "name": "Memory",
-                "description": "Memory usage (MiB)",
-                "maxPerRow": 4,
                 "options": {
-                    "tooltip": {
-                        "mode": "all",
-                        "sort": "desc"
-                    },
                     "legend": {
-                        "displayMode": "hidden",
-                        "heightInPercentage": 30,
-                        "placement": "bottom",
-                        "behaviour": "showItem",
-                        "selectMode": "single"
+                        "displayMode": "hidden"
                     },
                     "standardOptions": {
                         "util": "bytesIEC"
@@ -193,36 +186,25 @@
                         "steps": [
                             {
                                 "color": "#634CD9",
-                                "value": null,
-                                "type": "base"
+                                "type": "base",
+                                "value": null
                             }
                         ]
-                    }
-                },
-                "custom": {
-                    "drawStyle": "lines",
-                    "lineInterpolation": "smooth",
-                    "spanNulls": false,
-                    "lineWidth": 2,
-                    "fillOpacity": 0.3,
-                    "gradientMode": "opacity",
-                    "stack": "off",
-                    "scaleDistribution": {
-                        "type": "linear"
                     },
-                    "showPoints": "none",
-                    "pointSize": 5
-                },
-                "overrides": [
-                    {
-                        "matcher": {
-                            "id": "byFrameRefID"
-                        },
-                        "properties": {
-                            "rightYAxisDisplay": "off"
-                        }
+                    "tooltip": {
+                        "mode": "all",
+                        "sort": "desc"
                     }
-                ]
+                },
+                "targets": [
+                    {
+                        "expr": "mongodb_ss_mem_resident{cluster='$cluster'} * 1024 * 1024",
+                        "legend": "{{type}}",
+                        "refId": "A"
+                    }
+                ],
+                "type": "timeseries",
+                "version": "2.0.0"
             },
             {
                 "custom": {
@@ -589,7 +571,21 @@
                 "version": "2.0.0"
             },
             {
-                "type": "timeseries",
+                "custom": {
+                    "drawStyle": "lines",
+                    "fillOpacity": 0.3,
+                    "gradientMode": "opacity",
+                    "lineInterpolation": "smooth",
+                    "lineWidth": 2,
+                    "scaleDistribution": {
+                        "type": "linear"
+                    },
+                    "spanNulls": false,
+                    "stack": "off"
+                },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${prom}",
+                "description": "Number of document operations When used in combination with 'Command Operations', this graph can help identify write amplification. For example, when one insert or update command actually inserts or updates hundreds, thousands, or even millions of documents.",
                 "id": "7030d97a-d69f-4916-a415-ec57503ab1ed",
                 "layout": {
                     "h": 7,
@@ -599,76 +595,52 @@
                     "x": 12,
                     "y": 16
                 },
-                "version": "3.0.0",
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${prom}",
-                "targets": [
-                    {
-                        "expr": "rate(mongodb_ss_metrics_document{instance=\"$instance\"}[5m])",
-                        "legend": "",
-                        "refId": "A",
-                        "maxDataPoints": 240
-                    }
-                ],
-                "transformations": [
-                    {
-                        "id": "organize",
-                        "options": {}
-                    }
-                ],
                 "name": "Document Operations",
-                "description": "Number of document operations When used in combination with 'Command Operations', this graph can help identify write amplification. For example, when one insert or update command actually inserts or updates hundreds, thousands, or even millions of documents.",
-                "maxPerRow": 4,
                 "options": {
-                    "tooltip": {
-                        "mode": "all",
-                        "sort": "none"
-                    },
                     "legend": {
-                        "displayMode": "hidden",
-                        "heightInPercentage": 30,
-                        "placement": "bottom",
-                        "behaviour": "showItem",
-                        "selectMode": "single"
+                        "displayMode": "hidden"
                     },
                     "standardOptions": {},
                     "thresholds": {
                         "steps": [
                             {
                                 "color": "#634CD9",
-                                "value": null,
-                                "type": "base"
+                                "type": "base",
+                                "value": null
                             }
                         ]
+                    },
+                    "tooltip": {
+                        "mode": "all",
+                        "sort": "none"
                     }
                 },
+                "targets": [
+                    {
+                        "expr": "rate(mongodb_ss_metric_document{instance=\"$instance\"}[5m])",
+                        "legend": "",
+                        "refId": "A"
+                    }
+                ],
+                "type": "timeseries",
+                "version": "2.0.0"
+            },
+            {
                 "custom": {
                     "drawStyle": "lines",
-                    "lineInterpolation": "smooth",
-                    "spanNulls": false,
-                    "lineWidth": 2,
                     "fillOpacity": 0.3,
                     "gradientMode": "opacity",
-                    "stack": "off",
+                    "lineInterpolation": "smooth",
+                    "lineWidth": 2,
                     "scaleDistribution": {
                         "type": "linear"
                     },
-                    "showPoints": "none",
-                    "pointSize": 5
+                    "spanNulls": false,
+                    "stack": "off"
                 },
-                "overrides": [
-                    {
-                        "matcher": {
-                            "id": "byFrameRefID"
-                        },
-                        "properties": {
-                            "rightYAxisDisplay": "off"
-                        }
-                    }
-                ]
-            },
-            {
-                "type": "timeseries",
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${prom}",
+                "description": "Operation detail processing time (milliseconds)",
                 "id": "1c3b73d5-c25c-449f-995d-26acc9c621e1",
                 "layout": {
                     "h": 7,
@@ -678,37 +650,10 @@
                     "x": 0,
                     "y": 23
                 },
-                "version": "3.0.0",
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${prom}",
-                "targets": [
-                    {
-                        "expr": "rate(mongodb_ss_opLatencies_latency{instance='$instance'}[5m]) / rate(mongodb_ss_opLatencies_latency{instance='$instance'}[5m]) / 1000",
-                        "legend": "{{op_type}}",
-                        "refId": "A",
-                        "maxDataPoints": 240
-                    }
-                ],
-                "transformations": [
-                    {
-                        "id": "organize",
-                        "options": {}
-                    }
-                ],
                 "name": "Response Time",
-                "description": "Operation detail processing time (milliseconds)",
-                "maxPerRow": 4,
                 "options": {
-                    "tooltip": {
-                        "mode": "all",
-                        "sort": "none"
-                    },
                     "legend": {
-                        "displayMode": "hidden",
-                        "heightInPercentage": 30,
-                        "placement": "bottom",
-                        "behaviour": "showItem",
-                        "selectMode": "single"
+                        "displayMode": "hidden"
                     },
                     "standardOptions": {
                         "util": "milliseconds"
@@ -717,36 +662,25 @@
                         "steps": [
                             {
                                 "color": "#634CD9",
-                                "value": null,
-                                "type": "base"
+                                "type": "base",
+                                "value": null
                             }
                         ]
-                    }
-                },
-                "custom": {
-                    "drawStyle": "lines",
-                    "lineInterpolation": "smooth",
-                    "spanNulls": false,
-                    "lineWidth": 2,
-                    "fillOpacity": 0.3,
-                    "gradientMode": "opacity",
-                    "stack": "off",
-                    "scaleDistribution": {
-                        "type": "linear"
                     },
-                    "showPoints": "none",
-                    "pointSize": 5
-                },
-                "overrides": [
-                    {
-                        "matcher": {
-                            "id": "byFrameRefID"
-                        },
-                        "properties": {
-                            "rightYAxisDisplay": "off"
-                        }
+                    "tooltip": {
+                        "mode": "all",
+                        "sort": "none"
                     }
-                ]
+                },
+                "targets": [
+                    {
+                        "expr": "rate(mongodb_ss_opLatencies_latency{cluster='$cluster'}[5m]) / rate(mongodb_ss_opLatencies_latency{cluster='$cluster'}[5m]) / 1000",
+                        "legend": "{{op_type}}",
+                        "refId": "A"
+                    }
+                ],
+                "type": "timeseries",
+                "version": "2.0.0"
             },
             {
                 "custom": {
@@ -881,7 +815,21 @@
                 "type": "row"
             },
             {
-                "type": "timeseries",
+                "custom": {
+                    "drawStyle": "lines",
+                    "fillOpacity": 0.3,
+                    "gradientMode": "opacity",
+                    "lineInterpolation": "smooth",
+                    "lineWidth": 2,
+                    "scaleDistribution": {
+                        "type": "linear"
+                    },
+                    "spanNulls": false,
+                    "stack": "off"
+                },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${prom}",
+                "description": "cache size (byte)",
                 "id": "bb0ae571-43a1-430b-8f63-256f6f1ebee6",
                 "layout": {
                     "h": 7,
@@ -891,55 +839,10 @@
                     "x": 0,
                     "y": 31
                 },
-                "version": "3.0.0",
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${prom}",
-                "targets": [
-                    {
-                        "expr": "mongodb_ss_wt_cache_bytes_currently_in_the_cache{instance='$instance'}",
-                        "legend": "total",
-                        "refId": "A",
-                        "maxDataPoints": 240
-                    },
-                    {
-                        "expr": "mongodb_ss_wt_cache_tracked_dirty_bytes_in_the_cache{cluster='$cluster'}",
-                        "legend": "dirty",
-                        "refId": "B",
-                        "maxDataPoints": 240
-                    },
-                    {
-                        "expr": "mongodb_ss_wt_cache_tracked_bytes_belonging_to_internal_pages_in_the_cache{cluster='$cluster'}",
-                        "legend": "internal_pages",
-                        "refId": "C",
-                        "maxDataPoints": 240
-                    },
-                    {
-                        "expr": "mongodb_ss_wt_cache_tracked_bytes_belonging_to_leaf_pages_in_the_cache{cluster='$cluster'}",
-                        "legend": "leaf_pages",
-                        "refId": "D",
-                        "maxDataPoints": 240
-                    }
-                ],
-                "transformations": [
-                    {
-                        "id": "organize",
-                        "options": {}
-                    }
-                ],
                 "name": "Cache Size",
-                "description": "cache size (byte)",
-                "maxPerRow": 4,
                 "options": {
-                    "tooltip": {
-                        "mode": "all",
-                        "sort": "none"
-                    },
                     "legend": {
-                        "displayMode": "hidden",
-                        "heightInPercentage": 30,
-                        "placement": "bottom",
-                        "behaviour": "showItem",
-                        "selectMode": "single"
+                        "displayMode": "hidden"
                     },
                     "standardOptions": {
                         "util": "bytesIEC"
@@ -948,39 +851,57 @@
                         "steps": [
                             {
                                 "color": "#634CD9",
-                                "value": null,
-                                "type": "base"
+                                "type": "base",
+                                "value": null
                             }
                         ]
+                    },
+                    "tooltip": {
+                        "mode": "all",
+                        "sort": "none"
                     }
                 },
+                "targets": [
+                    {
+                        "expr": "mongodb_ss_wt_cache_bytes_currently_in_the_cache{cluster='$cluster'}",
+                        "legend": "total",
+                        "refId": "A"
+                    },
+                    {
+                        "expr": "mongodb_ss_wt_cache_tracked_dirty_bytes_in_the_cache{cluster='$cluster'}",
+                        "legend": "dirty",
+                        "refId": "B"
+                    },
+                    {
+                        "expr": "mongodb_ss_wt_cache_tracked_bytes_belonging_to_internal_pages_in_the_cache{cluster='$cluster'}",
+                        "legend": "internal_pages",
+                        "refId": "C"
+                    },
+                    {
+                        "expr": "mongodb_ss_wt_cache_tracked_bytes_belonging_to_leaf_pages_in_the_cache{cluster='$cluster'}",
+                        "legend": "leaf_pages",
+                        "refId": "D"
+                    }
+                ],
+                "type": "timeseries",
+                "version": "2.0.0"
+            },
+            {
                 "custom": {
                     "drawStyle": "lines",
-                    "lineInterpolation": "smooth",
-                    "spanNulls": false,
-                    "lineWidth": 2,
                     "fillOpacity": 0.3,
                     "gradientMode": "opacity",
-                    "stack": "off",
+                    "lineInterpolation": "smooth",
+                    "lineWidth": 2,
                     "scaleDistribution": {
                         "type": "linear"
                     },
-                    "showPoints": "none",
-                    "pointSize": 5
+                    "spanNulls": false,
+                    "stack": "off"
                 },
-                "overrides": [
-                    {
-                        "matcher": {
-                            "id": "byFrameRefID"
-                        },
-                        "properties": {
-                            "rightYAxisDisplay": "off"
-                        }
-                    }
-                ]
-            },
-            {
-                "type": "timeseries",
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${prom}",
+                "description": "size of cached data written or read (in bytes)",
                 "id": "f1ffd169-2a1a-42bc-9647-0e6621be0fef",
                 "layout": {
                     "h": 7,
@@ -990,43 +911,10 @@
                     "x": 6,
                     "y": 31
                 },
-                "version": "3.0.0",
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${prom}",
-                "targets": [
-                    {
-                        "expr": "rate(mongodb_ss_wt_cache_bytes_read_into_cache{instance='$instance'}[5m])",
-                        "legend": "read",
-                        "refId": "A",
-                        "maxDataPoints": 240
-                    },
-                    {
-                        "expr": "rate(mongodb_ss_wt_cache_bytes_written_from_cache{cluster='$cluster'}[5m])",
-                        "legend": "written",
-                        "refId": "B",
-                        "maxDataPoints": 240
-                    }
-                ],
-                "transformations": [
-                    {
-                        "id": "organize",
-                        "options": {}
-                    }
-                ],
                 "name": "Cache I/O",
-                "description": "size of cached data written or read (in bytes)",
-                "maxPerRow": 4,
                 "options": {
-                    "tooltip": {
-                        "mode": "all",
-                        "sort": "none"
-                    },
                     "legend": {
-                        "displayMode": "hidden",
-                        "heightInPercentage": 30,
-                        "placement": "bottom",
-                        "behaviour": "showItem",
-                        "selectMode": "single"
+                        "displayMode": "hidden"
                     },
                     "standardOptions": {
                         "util": "bytesSI"
@@ -1035,39 +923,47 @@
                         "steps": [
                             {
                                 "color": "#634CD9",
-                                "value": null,
-                                "type": "base"
+                                "type": "base",
+                                "value": null
                             }
                         ]
+                    },
+                    "tooltip": {
+                        "mode": "all",
+                        "sort": "none"
                     }
                 },
+                "targets": [
+                    {
+                        "expr": "rate(mongodb_ss_wt_cache_bytes_read_into_cache{cluster='$cluster'}[5m])",
+                        "legend": "read",
+                        "refId": "A"
+                    },
+                    {
+                        "expr": "rate(mongodb_ss_wt_cache_bytes_written_from_cache{cluster='$cluster'}[5m])",
+                        "legend": "written",
+                        "refId": "B"
+                    }
+                ],
+                "type": "timeseries",
+                "version": "2.0.0"
+            },
+            {
                 "custom": {
                     "drawStyle": "lines",
-                    "lineInterpolation": "smooth",
-                    "spanNulls": false,
-                    "lineWidth": 2,
                     "fillOpacity": 0.3,
                     "gradientMode": "opacity",
-                    "stack": "off",
+                    "lineInterpolation": "smooth",
+                    "lineWidth": 2,
                     "scaleDistribution": {
                         "type": "linear"
                     },
-                    "showPoints": "none",
-                    "pointSize": 5
+                    "spanNulls": false,
+                    "stack": "off"
                 },
-                "overrides": [
-                    {
-                        "matcher": {
-                            "id": "byFrameRefID"
-                        },
-                        "properties": {
-                            "rightYAxisDisplay": "off"
-                        }
-                    }
-                ]
-            },
-            {
-                "type": "timeseries",
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${prom}",
+                "description": "",
                 "id": "43ee140d-ae6d-474a-9892-fa4743d7f97e",
                 "layout": {
                     "h": 7,
@@ -1077,37 +973,10 @@
                     "x": 12,
                     "y": 31
                 },
-                "version": "3.0.0",
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${prom}",
-                "targets": [
-                    {
-                        "expr": "100 * sum(mongodb_ss_wt_cache_tracked_dirty_pages_in_the_cache{instance='$instance'}) / sum(mongodb_ss_wt_cache_pages_currently_held_in_the_cache{instance='$instance'})",
-                        "legend": "dirty rate",
-                        "refId": "A",
-                        "maxDataPoints": 240
-                    }
-                ],
-                "transformations": [
-                    {
-                        "id": "organize",
-                        "options": {}
-                    }
-                ],
                 "name": "Cache Dirty Pages Rate",
-                "description": "",
-                "maxPerRow": 4,
                 "options": {
-                    "tooltip": {
-                        "mode": "all",
-                        "sort": "none"
-                    },
                     "legend": {
-                        "displayMode": "hidden",
-                        "heightInPercentage": 30,
-                        "placement": "bottom",
-                        "behaviour": "showItem",
-                        "selectMode": "single"
+                        "displayMode": "hidden"
                     },
                     "standardOptions": {
                         "util": "percent"
@@ -1116,39 +985,42 @@
                         "steps": [
                             {
                                 "color": "#634CD9",
-                                "value": null,
-                                "type": "base"
+                                "type": "base",
+                                "value": null
                             }
                         ]
+                    },
+                    "tooltip": {
+                        "mode": "all",
+                        "sort": "none"
                     }
                 },
+                "targets": [
+                    {
+                        "expr": "100 * sum(mongodb_ss_wt_cache_tracked_dirty_pages_in_the_cache{cluster='$cluster'}) / sum(mongodb_ss_wt_cache_pages_currently_held_in_the_cache{cluster='$cluster'})",
+                        "legend": "dirty rate",
+                        "refId": "A"
+                    }
+                ],
+                "type": "timeseries",
+                "version": "2.0.0"
+            },
+            {
                 "custom": {
                     "drawStyle": "lines",
-                    "lineInterpolation": "smooth",
-                    "spanNulls": false,
-                    "lineWidth": 2,
                     "fillOpacity": 0.3,
                     "gradientMode": "opacity",
-                    "stack": "off",
+                    "lineInterpolation": "smooth",
+                    "lineWidth": 2,
                     "scaleDistribution": {
                         "type": "linear"
                     },
-                    "showPoints": "none",
-                    "pointSize": 5
+                    "spanNulls": false,
+                    "stack": "off"
                 },
-                "overrides": [
-                    {
-                        "matcher": {
-                            "id": "byFrameRefID"
-                        },
-                        "properties": {
-                            "rightYAxisDisplay": "off"
-                        }
-                    }
-                ]
-            },
-            {
-                "type": "timeseries",
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${prom}",
+                "description": "",
                 "id": "1a22c31a-859a-400c-af2a-ae83c308d0f2",
                 "layout": {
                     "h": 7,
@@ -1158,73 +1030,35 @@
                     "x": 18,
                     "y": 31
                 },
-                "version": "3.0.0",
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${prom}",
-                "targets": [
-                    {
-                        "expr": "rate(mongodb_mongod_wiredtiger_cache_evicted_total{instance='$instance'}[5m])",
-                        "legend": "evicted pages",
-                        "refId": "A",
-                        "maxDataPoints": 240
-                    }
-                ],
-                "transformations": [
-                    {
-                        "id": "organize",
-                        "options": {}
-                    }
-                ],
                 "name": "Cache Evicted Pages",
-                "description": "",
-                "maxPerRow": 4,
                 "options": {
-                    "tooltip": {
-                        "mode": "all",
-                        "sort": "none"
-                    },
                     "legend": {
-                        "displayMode": "hidden",
-                        "heightInPercentage": 30,
-                        "placement": "bottom",
-                        "behaviour": "showItem",
-                        "selectMode": "single"
+                        "displayMode": "hidden"
                     },
                     "standardOptions": {},
                     "thresholds": {
                         "steps": [
                             {
                                 "color": "#634CD9",
-                                "value": null,
-                                "type": "base"
+                                "type": "base",
+                                "value": null
                             }
                         ]
-                    }
-                },
-                "custom": {
-                    "drawStyle": "lines",
-                    "lineInterpolation": "smooth",
-                    "spanNulls": false,
-                    "lineWidth": 2,
-                    "fillOpacity": 0.3,
-                    "gradientMode": "opacity",
-                    "stack": "off",
-                    "scaleDistribution": {
-                        "type": "linear"
                     },
-                    "showPoints": "none",
-                    "pointSize": 5
-                },
-                "overrides": [
-                    {
-                        "matcher": {
-                            "id": "byFrameRefID"
-                        },
-                        "properties": {
-                            "rightYAxisDisplay": "off"
-                        }
+                    "tooltip": {
+                        "mode": "all",
+                        "sort": "none"
                     }
-                ]
+                },
+                "targets": [
+                    {
+                        "expr": "rate(mongodb_mongod_wiredtiger_cache_evicted_total{cluster='$cluster'}[5m])",
+                        "legend": "evicted pages",
+                        "refId": "A"
+                    }
+                ],
+                "type": "timeseries",
+                "version": "2.0.0"
             },
             {
                 "collapsed": true,
@@ -1370,5 +1204,10 @@
         ],
         "version": "3.0.0"
     },
+    "public": 0,
+    "public_cate": 0,
+    "bgids": null,
+    "built_in": 0,
+    "hide": 0,
     "uuid": 1717556328065329000
-}
+}