refactor: embedded ibex (#2136)

.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)
 
 ## 功能特点
 
@@ -89,13 +88,12 @@
 - 报告Bug，优先推荐提交[夜莺GitHub Issue](https://github.com/ccfos/nightingale/issues/new?assignees=&labels=kind%2Fbug&projects=&template=bug_report.yml)
 - 推荐完整浏览[夜莺文档站点](https://flashcat.cloud/docs/content/flashcat-monitor/nightingale-v7/introduction/)，了解更多信息
 - 推荐搜索关注夜莺公众号，第一时间获取社区动态：`夜莺监控Nightingale`
-- 日常问题交流：
-  - QQ群：730841964
-  - [加入微信群](https://download.flashcat.cloud/ulric/20241022141621.png)，如果二维码过期了，可以联系我（我的微信：`picobyte`）拉群，备注： `夜莺互助群`
+- 日常问题交流推荐加入[知识星球](https://download.flashcat.cloud/ulric/20240319095409.png)，也可以加我微信 `picobyte`，备注：`夜莺加群-<公司>-<姓名>` 拉入微信群，不过研发人员主要是关注 github issue 和星球，微信群关注较少
 
 ## 广受关注
 [![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

@@ -16,6 +16,7 @@ import (
 	"github.com/ccfos/nightingale/v6/alert/sender"
 	"github.com/ccfos/nightingale/v6/conf"
 	"github.com/ccfos/nightingale/v6/dumper"
+	"github.com/ccfos/nightingale/v6/ibex"
 	"github.com/ccfos/nightingale/v6/memsto"
 	"github.com/ccfos/nightingale/v6/models"
 	"github.com/ccfos/nightingale/v6/pkg/ctx"
@@ -26,8 +27,6 @@ import (
 	"github.com/ccfos/nightingale/v6/pushgw/writer"
 	"github.com/ccfos/nightingale/v6/storage"
 	"github.com/ccfos/nightingale/v6/tdengine"
-
-	"github.com/flashcatcloud/ibex/src/cmd/ibex"
 )
 
 func Initialize(configDir string, cryptoKey string) (func(), error) {
@@ -41,14 +40,14 @@ func Initialize(configDir string, cryptoKey string) (func(), error) {
 		return nil, err
 	}
 
-	ctx := ctx.NewContext(context.Background(), nil, false, config.CenterApi)
-
 	var redis storage.Redis
 	redis, err = storage.NewRedis(config.Redis)
 	if err != nil {
 		return nil, err
 	}
 
+	ctx := ctx.NewContext(context.Background(), nil, redis, false, config.CenterApi)
+
 	syncStats := memsto.NewSyncStats()
 	alertStats := astats.NewSyncStats()
 
@@ -62,28 +61,25 @@ 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 {
-		ibex.ServerStart(false, nil, redis, config.HTTP.APIForService.BasicAuth, config.Alert.Heartbeat, &config.CenterApi, r, nil, config.Ibex, config.HTTP.Port)
+		ibex.ServerStart(ctx, false, nil, redis, config.HTTP.APIForService.BasicAuth, config.Alert.Heartbeat, &config.CenterApi, r, nil, config.Ibex, config.HTTP.Port)
 	}
 
 	rt.Config(r)
 	dumper.ConfigRouter(r)
 
-	httpClean := httpx.Init(config.HTTP, r)
+	httpClean := httpx.Init(config.HTTP, context.Background(), r)
 
 	return func() {
 		logxClean()
@@ -103,7 +99,7 @@ func Start(alertc aconf.Alert, pushgwc pconf.Pushgw, syncStats *memsto.Stats, al
 	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,9 @@ 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,11 +293,6 @@ 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 {
-			logger.Debugf("SendCallbacks: webhook[%s] is in global conf.", cbCtx.CallBackURL)
-			continue
-		}
-
 		if strings.HasPrefix(urlStr, "${ibex}") {
 			e.CallBacks[models.IbexDomain].CallBack(cbCtx)
 			continue

alert/dispatch/notify_target.go

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

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
@@ -132,8 +133,7 @@ func (s *Scheduler) syncAlertRules() {
 		} 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/mute/mute.go

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

alert/process/process.go

@@ -2,7 +2,6 @@ package process
 
 import (
 	"bytes"
-	"encoding/json"
 	"fmt"
 	"html/template"
 	"sort"
@@ -22,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"
 )
@@ -80,9 +78,6 @@ type Processor struct {
 	HandleFireEventHook    HandleEventFunc
 	HandleRecoverEventHook HandleEventFunc
 	EventMuteHook          EventMuteHookFunc
-
-	ScheduleEntry    cron.Entry
-	PromEvalInterval int
 }
 
 func (p *Processor) Key() string {
@@ -94,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,
 	))
@@ -131,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中获取并覆盖
@@ -139,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{}{}
@@ -153,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{}{}
@@ -178,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)
@@ -209,34 +199,18 @@ 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
 	event.Callbacks = p.rule.Callbacks
 	event.CallbacksJSON = p.rule.CallbacksJSON
 	event.Annotations = p.rule.Annotations
+	event.AnnotationsJSON = make(map[string]string)
 	event.RuleConfig = p.rule.RuleConfig
 	event.RuleConfigJson = p.rule.RuleConfigJson
 	event.Severity = anomalyPoint.Severity
 	event.ExtraConfig = p.rule.ExtraConfigJSON
 	event.PromQl = anomalyPoint.Query
-	event.RecoverConfig = anomalyPoint.RecoverConfig
-	event.RuleHash = ruleHash
-
-	if err := json.Unmarshal([]byte(p.rule.Annotations), &event.AnnotationsJSON); err != nil {
-		event.AnnotationsJSON = make(map[string]string) // 解析失败时使用空 map
-		logger.Warningf("unmarshal annotations json failed: %v, rule: %d", err, p.rule.Id)
-	}
-
-	if p.target != "" {
-		if pt, exist := p.TargetCache.Get(p.target); exist {
-			pt.GroupNames = p.BusiGroupCache.GetNamesByBusiGroupIds(pt.GroupIds)
-			event.Target = pt
-		} else {
-			logger.Infof("Target[ident: %s] doesn't exist in cache.", p.target)
-		}
-	}
 
 	if event.TriggerValues != "" && strings.Count(event.TriggerValues, "$") > 1 {
 		// TriggerValues 有多个变量，将多个变量都放到 TriggerValue 中
@@ -308,7 +282,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
 		}
@@ -327,7 +301,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
 	}
@@ -355,11 +329,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
@@ -385,12 +359,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 {
@@ -429,7 +397,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 {
@@ -524,18 +491,17 @@ 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()
 	}
 }
 
 func (p *Processor) RecoverAlertCurEventFromDb() {
 	p.pendings = NewAlertCurEventMap(nil)
-	p.pendingsUseByRecover = NewAlertCurEventMap(nil)
 
 	curEvents, err := models.AlertCurEventGetByRuleIdAndDsId(p.ctx, p.rule.Id, p.datasourceId)
 	if err != nil {
 		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
 	}
@@ -552,12 +518,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
-		}
-
 		fireMap[event.Hash] = event
 		e := *event
 		pendingsUseByRecoverMap[event.Hash] = &e
@@ -569,7 +529,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 {
@@ -659,10 +619,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/prom_rule.go

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

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"
@@ -33,7 +34,7 @@ func (rt *Router) pushEventToQueue(c *gin.Context) {
 			continue
 		}
 
-		arr := strings.SplitN(pair, "=", 2)
+		arr := strings.Split(pair, "=")
 		if len(arr) != 2 {
 			continue
 		}
@@ -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

@@ -56,8 +56,8 @@ const (
 	Triggered = "triggered"
 )
 
-func createFeishuCardBody() feishuCard {
-	return feishuCard{
+var (
+	body = feishuCard{
 		feishu: feishu{Msgtype: "interactive"},
 		Card: Cards{
 			Config: Conf{
@@ -90,7 +90,7 @@ func createFeishuCardBody() feishuCard {
 			},
 		},
 	}
-}
+)
 
 func (fs *FeishuCardSender) CallBack(ctx CallBackContext) {
 	if len(ctx.Events) == 0 || len(ctx.CallBackURL) == 0 {
@@ -121,7 +121,6 @@ func (fs *FeishuCardSender) CallBack(ctx CallBackContext) {
 	}
 
 	SendTitle := fmt.Sprintf("🔔 %s", ctx.Events[0].RuleName)
-	body := createFeishuCardBody()
 	body.Card.Header.Title.Content = SendTitle
 	body.Card.Header.Template = color
 	body.Card.Elements[0].Text.Content = message
@@ -135,7 +134,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) {
@@ -153,13 +153,13 @@ func (fs *FeishuCardSender) Send(ctx MessageContext) {
 	}
 
 	SendTitle := fmt.Sprintf("🔔 %s", ctx.Events[0].RuleName)
-	body := createFeishuCardBody()
 	body.Card.Header.Title.Content = SendTitle
 	body.Card.Header.Template = color
 	body.Card.Elements[0].Text.Content = message
 	body.Card.Elements[2].Elements[0].Content = SendTitle
 	for i, url := range urls {
-		doSendAndRecord(ctx.Ctx, url, tokens[i], body, models.FeishuCard, ctx.Stats, ctx.Events)
+		doSendAndRecord(ctx.Ctx, url, tokens[i], body, models.FeishuCard,
+			ctx.Stats, ctx.Events[0])
 	}
 }
 

alert/sender/ibex.go

@@ -12,8 +12,7 @@ import (
 	"github.com/ccfos/nightingale/v6/memsto"
 	"github.com/ccfos/nightingale/v6/models"
 	"github.com/ccfos/nightingale/v6/pkg/ctx"
-	imodels "github.com/flashcatcloud/ibex/src/models"
-	"github.com/flashcatcloud/ibex/src/storage"
+	"github.com/ccfos/nightingale/v6/storage"
 
 	"github.com/toolkits/pkg/logger"
 )
@@ -43,7 +42,7 @@ func (c *IbexCallBacker) CallBack(ctx CallBackContext) {
 }
 
 func (c *IbexCallBacker) handleIbex(ctx *ctx.Context, url string, event *models.AlertCurEvent) {
-	if imodels.DB() == nil && ctx.IsCenter {
+	if models.DB(ctx) == nil && ctx.IsCenter {
 		logger.Warning("event_callback_ibex: db is nil")
 		return
 	}
@@ -108,7 +107,7 @@ func CallIbex(ctx *ctx.Context, id int64, host string,
 			continue
 		}
 
-		arr := strings.SplitN(pair, "=", 2)
+		arr := strings.Split(pair, "=")
 		if len(arr) != 2 {
 			continue
 		}
@@ -118,7 +117,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 {
@@ -143,7 +141,7 @@ func CallIbex(ctx *ctx.Context, id int64, host string,
 		AlertTriggered: true,
 	}
 
-	id, err = TaskAdd(in, tpl.UpdateBy, ctx.IsCenter)
+	id, err = TaskAdd(ctx, in, tpl.UpdateBy, ctx.IsCenter)
 	if err != nil {
 		logger.Errorf("event_callback_ibex: call ibex fail: %v", err)
 		return
@@ -182,21 +180,16 @@ func canDoIbex(username string, tpl *models.TaskTpl, host string, targetCache *m
 		return false, nil
 	}
 
-	return target.MatchGroupId(tpl.GroupId), nil
+	return target.GroupId == tpl.GroupId, nil
 }
 
-func TaskAdd(f models.TaskForm, authUser string, isCenter bool) (int64, error) {
-	if storage.Cache == nil {
-		logger.Warning("event_callback_ibex: redis cache is nil")
-		return 0, fmt.Errorf("redis cache is nil")
-	}
-
+func TaskAdd(ctx *ctx.Context, f models.TaskForm, authUser string, isCenter bool) (int64, error) {
 	hosts := cleanHosts(f.Hosts)
 	if len(hosts) == 0 {
 		return 0, fmt.Errorf("arg(hosts) empty")
 	}
 
-	taskMeta := &imodels.TaskMeta{
+	taskMeta := &models.TaskMeta{
 		Title:     f.Title,
 		Account:   f.Account,
 		Batch:     f.Batch,
@@ -219,34 +212,34 @@ func TaskAdd(f models.TaskForm, authUser string, isCenter bool) (int64, error) {
 	// 任务类型分为"告警规则触发"和"n9e center用户下发"两种；
 	// 边缘机房"告警规则触发"的任务不需要规划，并且它可能是失联的，无法使用db资源，所以放入redis缓存中，直接下发给agentd执行
 	if !isCenter && f.AlertTriggered {
-		if err := taskMeta.Create(); err != nil {
+		if err := taskMeta.Create(ctx); err != nil {
 			// 当网络不连通时，生成唯一的id，防止边缘机房中不同任务的id相同；
 			// 方法是，redis自增id去防止同一个机房的不同n9e edge生成的id相同；
 			// 但没法防止不同边缘机房生成同样的id，所以，生成id的数据不会上报存入数据库，只用于闭环执行。
-			taskMeta.Id, err = storage.IdGet()
+			taskMeta.Id, err = storage.IdGet(ctx.Redis)
 			if err != nil {
 				return 0, err
 			}
 		}
 
-		taskHost := imodels.TaskHost{
+		taskHost := models.TaskHost{
 			Id:     taskMeta.Id,
 			Host:   hosts[0],
 			Status: "running",
 		}
-		if err = taskHost.Create(); err != nil {
+		if err = taskHost.Create(ctx); err != nil {
 			logger.Warningf("task_add_fail: authUser=%s title=%s err=%s", authUser, taskMeta.Title, err.Error())
 		}
 
 		// 缓存任务元信息和待下发的任务
-		err = taskMeta.Cache(hosts[0])
+		err = taskMeta.Cache(ctx, hosts[0])
 		if err != nil {
 			return 0, err
 		}
 
 	} else {
 		// 如果是中心机房，还是保持之前的逻辑
-		err = taskMeta.Save(hosts, f.Action)
+		err = taskMeta.Save(ctx, hosts, f.Action)
 		if err != nil {
 			return 0, err
 		}

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

@@ -42,7 +42,6 @@ func (fs *LarkCardSender) CallBack(ctx CallBackContext) {
 	}
 
 	SendTitle := fmt.Sprintf("🔔 %s", ctx.Events[0].RuleName)
-	body := createFeishuCardBody()
 	body.Card.Header.Title.Content = SendTitle
 	body.Card.Header.Template = color
 	body.Card.Elements[0].Text.Content = message
@@ -56,14 +55,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)
@@ -74,19 +74,18 @@ func (fs *LarkCardSender) Send(ctx MessageContext) {
 	}
 
 	SendTitle := fmt.Sprintf("🔔 %s", ctx.Events[0].RuleName)
-	body := createFeishuCardBody()
 	body.Card.Header.Title.Content = SendTitle
 	body.Card.Header.Template = color
 	body.Card.Elements[0].Text.Content = message
 	body.Card.Elements[2].Elements[0].Content = SendTitle
-	for i, url := range urls {
-		doSendAndRecord(ctx.Ctx, url, tokens[i], body, models.LarkCard, ctx.Stats, ctx.Events)
+	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 +93,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,13 +166,20 @@ 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)
 				if !needRetry {
 					break
 				}
+				go RecordEvents(ctx, webhook, events, stats, res, err)
 				retryCount++
 				time.Sleep(time.Second * time.Duration(webhook.RetryInterval) * time.Duration(retryCount))
 			}
 		}
 	}
 }
+
+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/cconf/conf.go

@@ -14,7 +14,6 @@ type Center struct {
 	FlashDuty              FlashDuty
 	EventHistoryGroupView  bool
 	CleanNotifyRecordDay   int
-	MigrateBusiGroupLabel  bool
 }
 
 type Plugin struct {

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"
@@ -19,6 +18,7 @@ import (
 	"github.com/ccfos/nightingale/v6/conf"
 	"github.com/ccfos/nightingale/v6/cron"
 	"github.com/ccfos/nightingale/v6/dumper"
+	"github.com/ccfos/nightingale/v6/ibex"
 	"github.com/ccfos/nightingale/v6/memsto"
 	"github.com/ccfos/nightingale/v6/models"
 	"github.com/ccfos/nightingale/v6/models/migrate"
@@ -34,8 +34,6 @@ import (
 	"github.com/ccfos/nightingale/v6/pushgw/writer"
 	"github.com/ccfos/nightingale/v6/storage"
 	"github.com/ccfos/nightingale/v6/tdengine"
-
-	"github.com/flashcatcloud/ibex/src/cmd/ibex"
 )
 
 func Initialize(configDir string, cryptoKey string) (func(), error) {
@@ -49,10 +47,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
@@ -66,9 +60,16 @@ func Initialize(configDir string, cryptoKey string) (func(), error) {
 	if err != nil {
 		return nil, err
 	}
-	ctx := ctx.NewContext(context.Background(), db, true)
+
+	var redis storage.Redis
+	redis, err = storage.NewRedis(config.Redis)
+	if err != nil {
+		return nil, err
+	}
+
+	ctx := ctx.NewContext(context.Background(), db, redis, true)
 	migrate.Migrate(db)
-	isRootInit := models.InitRoot(ctx)
+	models.InitRoot(ctx)
 
 	config.HTTP.JWTAuth.SigningKey = models.InitJWTSigningKey(ctx)
 
@@ -77,12 +78,7 @@ func Initialize(configDir string, cryptoKey string) (func(), error) {
 		return nil, err
 	}
 
-	go integration.Init(ctx, config.Center.BuiltinIntegrationsDir)
-	var redis storage.Redis
-	redis, err = storage.NewRedis(config.Redis)
-	if err != nil {
-		return nil, err
-	}
+	integration.Init(ctx, config.Center.BuiltinIntegrationsDir)
 
 	metas := metas.New(redis)
 	idents := idents.New(ctx, redis)
@@ -100,13 +96,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()
@@ -119,18 +111,11 @@ func Initialize(configDir string, cryptoKey string) (func(), error) {
 	go cron.CleanNotifyRecord(ctx, config.Center.CleanNotifyRecordDay)
 
 	alertrtRouter := alertrt.New(config.HTTP, config.Alert, alertMuteCache, targetCache, busiGroupCache, alertStats, ctx, externalProcessors)
-	centerRouter := centerrt.New(config.HTTP, config.Center, config.Alert, config.Ibex,
-		cconf.Operations, dsCache, notifyConfigCache, promClients, tdengineClients,
+	centerRouter := centerrt.New(config.HTTP, config.Center, config.Alert, config.Ibex, cconf.Operations, dsCache, notifyConfigCache, promClients, tdengineClients,
 		redis, sso, ctx, metas, idents, targetCache, userCache, userGroupCache)
 	pushgwRouter := pushgwrt.New(config.HTTP, config.Pushgw, config.Alert, targetCache, busiGroupCache, idents, metas, writers, ctx)
 
-	go func() {
-		if config.Center.MigrateBusiGroupLabel || models.CanMigrateBg(ctx) {
-			models.MigrateBg(ctx, pushgwRouter.Pushgw.BusiGroupLabelKey)
-		}
-	}()
-
-	r := httpx.GinEngine(config.Global.RunMode, config.HTTP, configCvalCache.PrintBodyPaths, configCvalCache.PrintAccessLog)
+	r := httpx.GinEngine(config.Global.RunMode, config.HTTP)
 
 	centerRouter.Config(r)
 	alertrtRouter.Config(r)
@@ -139,15 +124,10 @@ func Initialize(configDir string, cryptoKey string) (func(), error) {
 
 	if config.Ibex.Enable {
 		migrate.MigrateIbexTables(db)
-		ibex.ServerStart(true, db, redis, config.HTTP.APIForService.BasicAuth, config.Alert.Heartbeat, &config.CenterApi, r, centerRouter, config.Ibex, config.HTTP.Port)
+		ibex.ServerStart(ctx, true, db, redis, config.HTTP.APIForService.BasicAuth, config.Alert.Heartbeat, &config.CenterApi, r, centerRouter, config.Ibex, config.HTTP.Port)
 	}
 
-	httpClean := httpx.Init(config.HTTP, r)
-
-	fmt.Printf("please view n9e at  http://%v:%v\n", config.Alert.Heartbeat.IP, config.HTTP.Port)
-	if isRootInit {
-		fmt.Println("username/password: root/root.2020")
-	}
+	httpClean := httpx.Init(config.HTTP, context.Background(), r)
 
 	return func() {
 		logxClean()

center/integration/init.go

@@ -16,12 +16,6 @@ import (
 const SYSTEM = "system"
 
 func Init(ctx *ctx.Context, builtinIntegrationsDir string) {
-	err := models.InitBuiltinPayloads(ctx)
-	if err != nil {
-		logger.Warning("init old builtinPayloads fail ", err)
-		return
-	}
-
 	fp := builtinIntegrationsDir
 	if fp == "" {
 		fp = path.Join(runner.Cwd, "integrations")
@@ -98,7 +92,6 @@ func Init(ctx *ctx.Context, builtinIntegrationsDir string) {
 					logger.Warning("update builtin component fail ", old, err)
 				}
 			}
-			component.ID = old.ID
 		}
 
 		// delete uuid is emtpy
@@ -113,12 +106,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 {
@@ -154,13 +141,13 @@ func Init(ctx *ctx.Context, builtinIntegrationsDir string) {
 
 					cate := strings.Replace(f, ".json", "", -1)
 					builtinAlert := models.BuiltinPayload{
-						ComponentID: component.ID,
-						Type:        "alert",
-						Cate:        cate,
-						Name:        alert.Name,
-						Tags:        alert.AppendTags,
-						Content:     string(content),
-						UUID:        alert.UUID,
+						Component: component.Ident,
+						Type:      "alert",
+						Cate:      cate,
+						Name:      alert.Name,
+						Tags:      alert.AppendTags,
+						Content:   string(content),
+						UUID:      alert.UUID,
 					}
 
 					old, err := models.BuiltinPayloadGet(ctx, "uuid = ?", alert.UUID)
@@ -178,7 +165,6 @@ func Init(ctx *ctx.Context, builtinIntegrationsDir string) {
 					}
 
 					if old.UpdatedBy == SYSTEM {
-						old.ComponentID = component.ID
 						old.Content = string(content)
 						old.Name = alert.Name
 						old.Tags = alert.AppendTags
@@ -224,8 +210,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 {
@@ -246,13 +231,13 @@ func Init(ctx *ctx.Context, builtinIntegrationsDir string) {
 				}
 
 				builtinDashboard := models.BuiltinPayload{
-					ComponentID: component.ID,
-					Type:        "dashboard",
-					Cate:        "",
-					Name:        dashboard.Name,
-					Tags:        dashboard.Tags,
-					Content:     string(content),
-					UUID:        dashboard.UUID,
+					Component: component.Ident,
+					Type:      "dashboard",
+					Cate:      "",
+					Name:      dashboard.Name,
+					Tags:      dashboard.Tags,
+					Content:   string(content),
+					UUID:      dashboard.UUID,
 				}
 
 				old, err := models.BuiltinPayloadGet(ctx, "uuid = ?", dashboard.UUID)
@@ -270,7 +255,6 @@ func Init(ctx *ctx.Context, builtinIntegrationsDir string) {
 				}
 
 				if old.UpdatedBy == SYSTEM {
-					old.ComponentID = component.ID
 					old.Content = string(content)
 					old.Name = dashboard.Name
 					old.Tags = dashboard.Tags

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,14 +51,9 @@ 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,
-	operations cconf.Operation, ds *memsto.DatasourceCacheType, ncc *memsto.NotifyConfigCacheType,
-	pc *prom.PromClientMap, tdendgineClients *tdengine.TdengineClientMap, redis storage.Redis,
-	sso *sso.SsoClient, ctx *ctx.Context, metaSet *metas.Set, idents *idents.Set,
-	tc *memsto.TargetCacheType, uc *memsto.UserCacheType, ugc *memsto.UserGroupCacheType) *Router {
+func New(httpConfig httpx.Config, center cconf.Center, alert aconf.Alert, ibex conf.Ibex, operations cconf.Operation, ds *memsto.DatasourceCacheType, ncc *memsto.NotifyConfigCacheType, pc *prom.PromClientMap, tdendgineClients *tdengine.TdengineClientMap, redis storage.Redis, sso *sso.SsoClient, ctx *ctx.Context, metaSet *metas.Set, idents *idents.Set, tc *memsto.TargetCacheType, uc *memsto.UserCacheType, ugc *memsto.UserGroupCacheType) *Router {
 	return &Router{
 		HTTP:              httpConfig,
 		Center:            center,
@@ -79,14 +73,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 +173,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 +186,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 +267,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)
@@ -290,7 +276,7 @@ func (rt *Router) Config(r *gin.Engine) {
 		pages.POST("/targets/tags", rt.auth(), rt.user(), rt.perm("/targets/put"), rt.targetBindTagsByFE)
 		pages.DELETE("/targets/tags", rt.auth(), rt.user(), rt.perm("/targets/put"), rt.targetUnbindTagsByFE)
 		pages.PUT("/targets/note", rt.auth(), rt.user(), rt.perm("/targets/put"), rt.targetUpdateNote)
-		pages.PUT("/targets/bgids", rt.auth(), rt.user(), rt.perm("/targets/put"), rt.targetBindBgids)
+		pages.PUT("/targets/bgid", rt.auth(), rt.user(), rt.perm("/targets/put"), rt.targetUpdateBgid)
 
 		pages.POST("/builtin-cate-favorite", rt.auth(), rt.user(), rt.builtinCateFavoriteAdd)
 		pages.DELETE("/builtin-cate-favorite/:name", rt.auth(), rt.user(), rt.builtinCateFavoriteDel)
@@ -311,7 +297,6 @@ func (rt *Router) Config(r *gin.Engine) {
 		pages.POST("/busi-group/:id/board/:bid/clone", rt.auth(), rt.user(), rt.perm("/dashboards/add"), rt.bgrw(), rt.boardClone)
 		pages.POST("/busi-groups/boards/clones", rt.auth(), rt.user(), rt.perm("/dashboards/add"), rt.boardBatchClone)
 
-		pages.GET("/boards", rt.auth(), rt.user(), rt.boardGetsByBids)
 		pages.GET("/board/:bid", rt.boardGet)
 		pages.GET("/board/:bid/pure", rt.boardPureGet)
 		pages.PUT("/board/:bid", rt.auth(), rt.user(), rt.perm("/dashboards/put"), rt.boardPut)
@@ -322,11 +307,6 @@ func (rt *Router) Config(r *gin.Engine) {
 		pages.GET("/share-charts", rt.chartShareGets)
 		pages.POST("/share-charts", rt.auth(), rt.chartShareAdd)
 
-		pages.POST("/dashboard-annotations", rt.auth(), rt.user(), rt.perm("/dashboards/put"), rt.dashAnnotationAdd)
-		pages.GET("/dashboard-annotations", rt.dashAnnotationGets)
-		pages.PUT("/dashboard-annotation/:id", rt.auth(), rt.user(), rt.perm("/dashboards/put"), rt.dashAnnotationPut)
-		pages.DELETE("/dashboard-annotation/:id", rt.auth(), rt.user(), rt.perm("/dashboards/del"), rt.dashAnnotationDel)
-
 		// pages.GET("/alert-rules/builtin/alerts-cates", rt.auth(), rt.user(), rt.builtinAlertCateGets)
 		// pages.GET("/alert-rules/builtin/list", rt.auth(), rt.user(), rt.builtinAlertRules)
 		pages.GET("/alert-rules/callbacks", rt.auth(), rt.user(), rt.alertRuleCallbacks)
@@ -344,7 +324,7 @@ func (rt *Router) Config(r *gin.Engine) {
 		pages.GET("/alert-rule/:arid/pure", rt.auth(), rt.user(), rt.perm("/alert-rules"), rt.alertRulePureGet)
 		pages.PUT("/busi-group/alert-rule/validate", rt.auth(), rt.user(), rt.perm("/alert-rules/put"), rt.alertRuleValidation)
 		pages.POST("/relabel-test", rt.auth(), rt.user(), rt.relabelTest)
-		pages.POST("/busi-group/:id/alert-rules/clone", rt.auth(), rt.user(), rt.perm("/alert-rules/add"), rt.bgrw(), rt.cloneToMachine)
+		pages.POST("/busi-group/:id/alert-rules/clone", rt.auth(), rt.user(), rt.perm("/alert-rules/post"), rt.bgrw(), rt.cloneToMachine)
 
 		pages.GET("/busi-groups/recording-rules", rt.auth(), rt.user(), rt.perm("/recording-rules"), rt.recordingRuleGetsByGids)
 		pages.GET("/busi-group/:id/recording-rules", rt.auth(), rt.user(), rt.perm("/recording-rules"), rt.recordingRuleGets)
@@ -483,8 +463,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) {
@@ -561,7 +539,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)
@@ -582,8 +559,6 @@ func (rt *Router) Config(r *gin.Engine) {
 			service.POST("/notify-record", rt.notificationRecordAdd)
 
 			service.GET("/alert-cur-events-del-by-hash", rt.alertCurEventDelByHash)
-
-			service.POST("/center/heartbeat", rt.heartbeat)
 		}
 	}
 

center/router/router_alert_cur_event.go

@@ -65,8 +65,7 @@ func (rt *Router) alertCurEventsCard(c *gin.Context) {
 	ginx.Dangerous(err)
 
 	// 最多获取50000个，获取太多也没啥意义
-	list, err := models.AlertCurEventsGet(rt.Ctx, prods, bgids, stime, etime, severity, dsIds,
-		cates, 0, query, 50000, 0)
+	list, err := models.AlertCurEventGets(rt.Ctx, prods, bgids, stime, etime, severity, dsIds, cates, query, 50000, 0)
 	ginx.Dangerous(err)
 
 	cardmap := make(map[string]*AlertCard)
@@ -163,17 +162,13 @@ func (rt *Router) alertCurEventsList(c *gin.Context) {
 		cates = strings.Split(cate, ",")
 	}
 
-	ruleId := ginx.QueryInt64(c, "rid", 0)
-
 	bgids, err := GetBusinessGroupIds(c, rt.Ctx, rt.Center.EventHistoryGroupView)
 	ginx.Dangerous(err)
 
-	total, err := models.AlertCurEventTotal(rt.Ctx, prods, bgids, stime, etime, severity, dsIds,
-		cates, ruleId, query)
+	total, err := models.AlertCurEventTotal(rt.Ctx, prods, bgids, stime, etime, severity, dsIds, cates, query)
 	ginx.Dangerous(err)
 
-	list, err := models.AlertCurEventsGet(rt.Ctx, prods, bgids, stime, etime, severity, dsIds,
-		cates, ruleId, query, limit, ginx.Offset(c, limit))
+	list, err := models.AlertCurEventGets(rt.Ctx, prods, bgids, stime, etime, severity, dsIds, cates, query, limit, ginx.Offset(c, limit))
 	ginx.Dangerous(err)
 
 	cache := make(map[int64]*models.UserGroup)
@@ -206,9 +201,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{}{}
@@ -234,7 +227,6 @@ func (rt *Router) alertCurEventGet(c *gin.Context) {
 		event.RuleConfigJson = ruleConfig
 	}
 
-	event.LastEvalTime = event.TriggerTime
 	ginx.NewRender(c).Data(event, nil)
 }
 

center/router/router_alert_his_event.go

@@ -54,17 +54,13 @@ func (rt *Router) alertHisEventsList(c *gin.Context) {
 		cates = strings.Split(cate, ",")
 	}
 
-	ruleId := ginx.QueryInt64(c, "rid", 0)
-
 	bgids, err := GetBusinessGroupIds(c, rt.Ctx, rt.Center.EventHistoryGroupView)
 	ginx.Dangerous(err)
 
-	total, err := models.AlertHisEventTotal(rt.Ctx, prods, bgids, stime, etime, severity,
-		recovered, dsIds, cates, ruleId, query)
+	total, err := models.AlertHisEventTotal(rt.Ctx, prods, bgids, stime, etime, severity, recovered, dsIds, cates, query)
 	ginx.Dangerous(err)
 
-	list, err := models.AlertHisEventGets(rt.Ctx, prods, bgids, stime, etime, severity, recovered,
-		dsIds, cates, ruleId, query, limit, ginx.Offset(c, limit))
+	list, err := models.AlertHisEventGets(rt.Ctx, prods, bgids, stime, etime, severity, recovered, dsIds, cates, query, limit, ginx.Offset(c, limit))
 	ginx.Dangerous(err)
 
 	cache := make(map[int64]*models.UserGroup)

center/router/router_alert_rule.go

@@ -37,18 +37,6 @@ func (rt *Router) alertRuleGets(c *gin.Context) {
 	ginx.NewRender(c).Data(ars, err)
 }
 
-func getAlertCueEventTimeRange(c *gin.Context) (stime, etime int64) {
-	stime = ginx.QueryInt64(c, "stime", 0)
-	etime = ginx.QueryInt64(c, "etime", 0)
-	if etime == 0 {
-		etime = time.Now().Unix()
-	}
-	if stime == 0 || stime >= etime {
-		stime = etime - 30*24*int64(time.Hour.Seconds())
-	}
-	return
-}
-
 func (rt *Router) alertRuleGetsByGids(c *gin.Context) {
 	gids := str.IdsInt64(ginx.QueryStr(c, "gids", ""), ",")
 	if len(gids) > 0 {
@@ -72,35 +60,9 @@ func (rt *Router) alertRuleGetsByGids(c *gin.Context) {
 	ars, err := models.AlertRuleGetsByBGIds(rt.Ctx, gids)
 	if err == nil {
 		cache := make(map[int64]*models.UserGroup)
-		rids := make([]int64, 0, len(ars))
-		names := make([]string, 0, len(ars))
 		for i := 0; i < len(ars); i++ {
 			ars[i].FillNotifyGroups(rt.Ctx, cache)
 			ars[i].FillSeverities()
-
-			if len(ars[i].DatasourceQueries) != 0 {
-				ars[i].DatasourceIdsJson = rt.DatasourceCache.GetIDsByDsCateAndQueries(ars[i].Cate, ars[i].DatasourceQueries)
-			}
-
-			rids = append(rids, ars[i].Id)
-			names = append(names, ars[i].UpdateBy)
-		}
-
-		stime, etime := getAlertCueEventTimeRange(c)
-		cnt := models.AlertCurEventCountByRuleId(rt.Ctx, rids, stime, etime)
-		if cnt != nil {
-			for i := 0; i < len(ars); i++ {
-				ars[i].CurEventCount = cnt[ars[i].Id]
-			}
-		}
-
-		users := models.UserMapGet(rt.Ctx, "username in (?)", names)
-		if users != nil {
-			for i := 0; i < len(ars); i++ {
-				if user, exist := users[ars[i].UpdateBy]; exist {
-					ars[i].UpdateByNickname = user.Nickname
-				}
-			}
 		}
 	}
 	ginx.NewRender(c).Data(ars, err)
@@ -128,10 +90,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 +124,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 +131,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 +152,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 +365,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 +384,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)
 
@@ -556,7 +492,7 @@ func (rt *Router) relabelTest(c *gin.Context) {
 
 	labels := make([]prompb.Label, len(f.Tags))
 	for i, tag := range f.Tags {
-		label := strings.SplitN(tag, "=", 2)
+		label := strings.Split(tag, "=")
 		if len(label) != 2 {
 			ginx.Bomb(http.StatusBadRequest, "tag:%s format error", tag)
 		}
@@ -593,15 +529,6 @@ type identListForm struct {
 	IdentList []string `json:"ident_list"`
 }
 
-func containsIdentOperator(s string) bool {
-	pattern := `ident\s*(!=|!~|=~)`
-	matched, err := regexp.MatchString(pattern, s)
-	if err != nil {
-		return false
-	}
-	return matched
-}
-
 func (rt *Router) cloneToMachine(c *gin.Context) {
 	var f identListForm
 	ginx.BindJSON(c, &f)
@@ -623,17 +550,10 @@ func (rt *Router) cloneToMachine(c *gin.Context) {
 	reterr := make(map[string]map[string]string)
 
 	for i := range alertRules {
-		errMsg := make(map[string]string)
+		reterr[alertRules[i].Name] = make(map[string]string)
 
 		if alertRules[i].Cate != "prometheus" {
-			errMsg["all"] = "Only Prometheus rule can be cloned to machines"
-			reterr[alertRules[i].Name] = errMsg
-			continue
-		}
-
-		if containsIdentOperator(alertRules[i].RuleConfig) {
-			errMsg["all"] = "promql is missing ident"
-			reterr[alertRules[i].Name] = errMsg
+			reterr[alertRules[i].Name]["all"] = "Only Prometheus rules can be cloned to machines"
 			continue
 		}
 
@@ -642,7 +562,7 @@ func (rt *Router) cloneToMachine(c *gin.Context) {
 
 			newRule := &models.AlertRule{}
 			if err := copier.Copy(newRule, alertRules[i]); err != nil {
-				errMsg[f.IdentList[j]] = fmt.Sprintf("fail to clone rule, err: %s", err)
+				reterr[alertRules[i].Name][f.IdentList[j]] = fmt.Sprintf("fail to clone rule, err: %s", err)
 				continue
 			}
 
@@ -654,23 +574,19 @@ 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()
+				reterr[alertRules[i].Name][f.IdentList[j]] = err.Error()
 				continue
 			}
 
 			if exist {
-				errMsg[f.IdentList[j]] = fmt.Sprintf("rule already exists, ruleName: %s", newRule.Name)
+				reterr[alertRules[i].Name][f.IdentList[j]] = fmt.Sprintf("rule already exists, ruleName: %s", newRule.Name)
 				continue
 			}
 
 			newRules = append(newRules, newRule)
 		}
-
-		if len(errMsg) > 0 {
-			reterr[alertRules[i].Name] = errMsg
-		}
 	}
 
 	ginx.NewRender(c).Data(reterr, models.InsertAlertRule(rt.Ctx, newRules))

center/router/router_board.go

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

center/router/router_builtin_componet.go

@@ -4,15 +4,10 @@ import (
 	"net/http"
 
 	"github.com/ccfos/nightingale/v6/models"
-	"github.com/ccfos/nightingale/v6/pkg/ctx"
-
 	"github.com/gin-gonic/gin"
 	"github.com/toolkits/pkg/ginx"
-	"gorm.io/gorm"
 )
 
-const SYSTEM = "system"
-
 func (rt *Router) builtinComponentsAdd(c *gin.Context) {
 	var lst []models.BuiltinComponent
 	ginx.BindJSON(c, &lst)
@@ -36,9 +31,8 @@ func (rt *Router) builtinComponentsAdd(c *gin.Context) {
 
 func (rt *Router) builtinComponentsGets(c *gin.Context) {
 	query := ginx.QueryStr(c, "query", "")
-	disabled := ginx.QueryInt(c, "disabled", -1)
 
-	bc, err := models.BuiltinComponentGets(rt.Ctx, query, disabled)
+	bc, err := models.BuiltinComponentGets(rt.Ctx, query)
 	ginx.Dangerous(err)
 
 	ginx.NewRender(c).Data(bc, nil)
@@ -56,31 +50,10 @@ func (rt *Router) builtinComponentsPut(c *gin.Context) {
 		return
 	}
 
-	if bc.CreatedBy == SYSTEM {
-		req.Ident = bc.Ident
-	}
-
 	username := Username(c)
 	req.UpdatedBy = username
 
-	err = models.DB(rt.Ctx).Transaction(func(tx *gorm.DB) error {
-		tCtx := &ctx.Context{
-			DB: tx,
-		}
-
-		txErr := models.BuiltinMetricBatchUpdateColumn(tCtx, "typ", bc.Ident, req.Ident, req.UpdatedBy)
-		if txErr != nil {
-			return txErr
-		}
-
-		txErr = bc.Update(tCtx, req)
-		if txErr != nil {
-			return txErr
-		}
-		return nil
-	})
-
-	ginx.NewRender(c).Message(err)
+	ginx.NewRender(c).Message(bc.Update(rt.Ctx, req))
 }
 
 func (rt *Router) builtinComponentsDel(c *gin.Context) {

center/router/router_builtin_payload.go

@@ -6,7 +6,6 @@ import (
 	"strings"
 	"time"
 
-	"github.com/BurntSushi/toml"
 	"github.com/ccfos/nightingale/v6/models"
 	"github.com/gin-gonic/gin"
 	"github.com/toolkits/pkg/ginx"
@@ -43,7 +42,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)
@@ -53,15 +52,15 @@ func (rt *Router) builtinPayloadsAdd(c *gin.Context) {
 					}
 
 					bp := models.BuiltinPayload{
-						Type:        lst[i].Type,
-						ComponentID: lst[i].ComponentID,
-						Cate:        lst[i].Cate,
-						Name:        rule.Name,
-						Tags:        rule.AppendTags,
-						UUID:        rule.UUID,
-						Content:     string(contentBytes),
-						CreatedBy:   username,
-						UpdatedBy:   username,
+						Type:      lst[i].Type,
+						Component: lst[i].Component,
+						Cate:      lst[i].Cate,
+						Name:      rule.Name,
+						Tags:      rule.AppendTags,
+						UUID:      rule.UUID,
+						Content:   string(contentBytes),
+						CreatedBy: username,
+						UpdatedBy: username,
 					}
 
 					if err := bp.Add(rt.Ctx, username); err != nil {
@@ -78,25 +77,19 @@ 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{
-				Type:        lst[i].Type,
-				ComponentID: lst[i].ComponentID,
-				Cate:        lst[i].Cate,
-				Name:        alertRule.Name,
-				Tags:        alertRule.AppendTags,
-				UUID:        alertRule.UUID,
-				Content:     string(contentBytes),
-				CreatedBy:   username,
-				UpdatedBy:   username,
+				Type:      lst[i].Type,
+				Component: lst[i].Component,
+				Cate:      lst[i].Cate,
+				Name:      alertRule.Name,
+				Tags:      alertRule.AppendTags,
+				UUID:      alertRule.UUID,
+				Content:   lst[i].Content,
+				CreatedBy: username,
+				UpdatedBy: username,
 			}
 
 			if err := bp.Add(rt.Ctx, username); err != nil {
@@ -112,7 +105,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)
@@ -122,15 +115,15 @@ func (rt *Router) builtinPayloadsAdd(c *gin.Context) {
 					}
 
 					bp := models.BuiltinPayload{
-						Type:        lst[i].Type,
-						ComponentID: lst[i].ComponentID,
-						Cate:        lst[i].Cate,
-						Name:        dashboard.Name,
-						Tags:        dashboard.Tags,
-						UUID:        dashboard.UUID,
-						Content:     string(contentBytes),
-						CreatedBy:   username,
-						UpdatedBy:   username,
+						Type:      lst[i].Type,
+						Component: lst[i].Component,
+						Cate:      lst[i].Cate,
+						Name:      dashboard.Name,
+						Tags:      dashboard.Tags,
+						UUID:      dashboard.UUID,
+						Content:   string(contentBytes),
+						CreatedBy: username,
+						UpdatedBy: username,
 					}
 
 					if err := bp.Add(rt.Ctx, username); err != nil {
@@ -147,39 +140,25 @@ 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{
-				Type:        lst[i].Type,
-				ComponentID: lst[i].ComponentID,
-				Cate:        lst[i].Cate,
-				Name:        dashboard.Name,
-				Tags:        dashboard.Tags,
-				UUID:        dashboard.UUID,
-				Content:     string(contentBytes),
-				CreatedBy:   username,
-				UpdatedBy:   username,
+				Type:      lst[i].Type,
+				Component: lst[i].Component,
+				Cate:      lst[i].Cate,
+				Name:      dashboard.Name,
+				Tags:      dashboard.Tags,
+				UUID:      dashboard.UUID,
+				Content:   lst[i].Content,
+				CreatedBy: username,
+				UpdatedBy: username,
 			}
 
 			if err := bp.Add(rt.Ctx, username); err != nil {
 				reterr[bp.Name] = i18n.Sprintf(c.GetHeader("X-Language"), err.Error())
 			}
 		} else {
-			if lst[i].Type == "collect" {
-				c := make(map[string]interface{})
-				if _, err := toml.Decode(lst[i].Content, &c); err != nil {
-					reterr[lst[i].Name] = err.Error()
-					continue
-				}
-			}
-
 			if err := lst[i].Add(rt.Ctx, username); err != nil {
 				reterr[lst[i].Name] = i18n.Sprintf(c.GetHeader("X-Language"), err.Error())
 			}
@@ -192,20 +171,19 @@ func (rt *Router) builtinPayloadsAdd(c *gin.Context) {
 
 func (rt *Router) builtinPayloadsGets(c *gin.Context) {
 	typ := ginx.QueryStr(c, "type", "")
-	ComponentID := ginx.QueryInt64(c, "component_id", 0)
-
+	component := ginx.QueryStr(c, "component", "")
 	cate := ginx.QueryStr(c, "cate", "")
 	query := ginx.QueryStr(c, "query", "")
 
-	lst, err := models.BuiltinPayloadGets(rt.Ctx, uint64(ComponentID), typ, cate, query)
+	lst, err := models.BuiltinPayloadGets(rt.Ctx, typ, component, cate, query)
 	ginx.NewRender(c).Data(lst, err)
 }
 
 func (rt *Router) builtinPayloadcatesGet(c *gin.Context) {
 	typ := ginx.QueryStr(c, "type", "")
-	ComponentID := ginx.QueryInt64(c, "component_id", 0)
+	component := ginx.QueryStr(c, "component", "")
 
-	cates, err := models.BuiltinPayloadCates(rt.Ctx, typ, uint64(ComponentID))
+	cates, err := models.BuiltinPayloadCates(rt.Ctx, typ, component)
 	ginx.NewRender(c).Data(cates, err)
 }
 
@@ -251,11 +229,6 @@ func (rt *Router) builtinPayloadsPut(c *gin.Context) {
 
 		req.Name = dashboard.Name
 		req.Tags = dashboard.Tags
-	} else if req.Type == "collect" {
-		c := make(map[string]interface{})
-		if _, err := toml.Decode(req.Content, &c); err != nil {
-			ginx.Bomb(http.StatusBadRequest, err.Error())
-		}
 	}
 
 	username := Username(c)
@@ -272,15 +245,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_dash_annotation.go

@@ -1,99 +0,0 @@
-package router
-
-import (
-	"fmt"
-	"net/http"
-	"time"
-
-	"github.com/ccfos/nightingale/v6/models"
-	"github.com/ccfos/nightingale/v6/pkg/ctx"
-
-	"github.com/gin-gonic/gin"
-	"github.com/toolkits/pkg/ginx"
-)
-
-func checkAnnotationPermission(c *gin.Context, ctx *ctx.Context, dashboardId int64) {
-	dashboard, err := models.BoardGetByID(ctx, dashboardId)
-	if err != nil {
-		ginx.Bomb(http.StatusInternalServerError, "failed to get dashboard: %v", err)
-	}
-
-	if dashboard == nil {
-		ginx.Bomb(http.StatusNotFound, "dashboard not found")
-	}
-
-	bg := BusiGroup(ctx, dashboard.GroupId)
-	me := c.MustGet("user").(*models.User)
-	can, err := me.CanDoBusiGroup(ctx, bg, "rw")
-	ginx.Dangerous(err)
-
-	if !can {
-		ginx.Bomb(http.StatusForbidden, "forbidden")
-	}
-}
-
-func (rt *Router) dashAnnotationAdd(c *gin.Context) {
-	var f models.DashAnnotation
-	ginx.BindJSON(c, &f)
-
-	username := c.MustGet("username").(string)
-	now := time.Now().Unix()
-
-	checkAnnotationPermission(c, rt.Ctx, f.DashboardId)
-
-	f.CreateBy = username
-	f.CreateAt = now
-	f.UpdateBy = username
-	f.UpdateAt = now
-
-	ginx.NewRender(c).Data(f.Id, f.Add(rt.Ctx))
-}
-
-func (rt *Router) dashAnnotationGets(c *gin.Context) {
-	dashboardId := ginx.QueryInt64(c, "dashboard_id")
-	from := ginx.QueryInt64(c, "from")
-	to := ginx.QueryInt64(c, "to")
-	limit := ginx.QueryInt(c, "limit", 100)
-
-	lst, err := models.DashAnnotationGets(rt.Ctx, dashboardId, from, to, limit)
-	ginx.NewRender(c).Data(lst, err)
-}
-
-func (rt *Router) dashAnnotationPut(c *gin.Context) {
-	var f models.DashAnnotation
-	ginx.BindJSON(c, &f)
-
-	id := ginx.UrlParamInt64(c, "id")
-	annotation, err := getAnnotationById(rt.Ctx, id)
-	ginx.Dangerous(err)
-
-	checkAnnotationPermission(c, rt.Ctx, annotation.DashboardId)
-
-	f.Id = id
-	f.UpdateAt = time.Now().Unix()
-	f.UpdateBy = c.MustGet("username").(string)
-
-	ginx.NewRender(c).Message(f.Update(rt.Ctx))
-}
-
-func (rt *Router) dashAnnotationDel(c *gin.Context) {
-	id := ginx.UrlParamInt64(c, "id")
-
-	annotation, err := getAnnotationById(rt.Ctx, id)
-	ginx.Dangerous(err)
-	checkAnnotationPermission(c, rt.Ctx, annotation.DashboardId)
-
-	ginx.NewRender(c).Message(models.DashAnnotationDel(rt.Ctx, id))
-}
-
-// 可以提取获取注释的通用方法
-func getAnnotationById(ctx *ctx.Context, id int64) (*models.DashAnnotation, error) {
-	annotation, err := models.DashAnnotationGet(ctx, "id=?", id)
-	if err != nil {
-		return nil, err
-	}
-	if annotation == nil {
-		return nil, fmt.Errorf("annotation not found")
-	}
-	return annotation, nil
-}

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")
 	}
@@ -69,23 +65,6 @@ func queryDatasourceIds(c *gin.Context) []int64 {
 	return ids
 }
 
-func queryStrListField(c *gin.Context, fieldName string, sep ...string) []string {
-	str := ginx.QueryStr(c, fieldName, "")
-	if str == "" {
-		return nil
-	}
-
-	lst := []string{str}
-	for _, s := range sep {
-		var newLst []string
-		for _, str := range lst {
-			newLst = append(newLst, strings.Split(str, s)...)
-		}
-		lst = newLst
-	}
-	return lst
-}
-
 type idsForm struct {
 	Ids               []int64 `json:"ids"`
 	IsSyncToFlashDuty bool    `json:"is_sync_to_flashduty"`

center/router/router_heartbeat.go

@@ -6,7 +6,6 @@ import (
 	"errors"
 	"io/ioutil"
 	"sort"
-	"strconv"
 	"strings"
 	"time"
 
@@ -81,48 +80,16 @@ func HandleHeartbeat(c *gin.Context, ctx *ctx.Context, engineName string, metaSe
 	identSet.MSet(items)
 
 	if target, has := targetCache.Get(req.Hostname); has && target != nil {
-		gidsStr := ginx.QueryStr(c, "gid", "")
-		overwriteGids := ginx.QueryBool(c, "overwrite_gids", false)
+		gid := ginx.QueryInt64(c, "gid", 0)
 		hostIp := strings.TrimSpace(req.HostIp)
-		gids := strings.Split(gidsStr, ",")
-
-		if overwriteGids {
-			groupIds := make([]int64, 0)
-			for i := range gids {
-				if gids[i] == "" {
-					continue
-				}
-				groupId, err := strconv.ParseInt(gids[i], 10, 64)
-				if err != nil {
-					logger.Warningf("update target:%s group ids failed, err: %v", req.Hostname, err)
-					continue
-				}
-				groupIds = append(groupIds, groupId)
-			}
-
-			err := models.TargetOverrideBgids(ctx, []string{target.Ident}, groupIds, nil)
-			if err != nil {
-				logger.Warningf("update target:%s group ids failed, err: %v", target.Ident, err)
-			}
-		} else if gidsStr != "" {
-			for i := range gids {
-				groupId, err := strconv.ParseInt(gids[i], 10, 64)
-				if err != nil {
-					logger.Warningf("update target:%s group ids failed, err: %v", req.Hostname, err)
-					continue
-				}
-
-				if !target.MatchGroupId(groupId) {
-					err := models.TargetBindBgids(ctx, []string{target.Ident}, []int64{groupId}, nil)
-					if err != nil {
-						logger.Warningf("update target:%s group ids failed, err: %v", target.Ident, err)
-					}
-				}
-			}
-		}
 
 		newTarget := models.Target{}
 		targetNeedUpdate := false
+		if gid != 0 && gid != target.GroupId {
+			newTarget.GroupId = gid
+			targetNeedUpdate = true
+		}
+
 		if hostIp != "" && hostIp != target.HostIp {
 			newTarget.HostIp = hostIp
 			targetNeedUpdate = true

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_mw.go

@@ -130,9 +130,9 @@ func (rt *Router) User() gin.HandlerFunc {
 
 func (rt *Router) user() gin.HandlerFunc {
 	return func(c *gin.Context) {
-		username := c.MustGet("username").(string)
+		userid := c.MustGet("userid").(int64)
 
-		user, err := models.UserGetByUsername(rt.Ctx, username)
+		user, err := models.UserGetById(rt.Ctx, userid)
 		if err != nil {
 			ginx.Bomb(http.StatusUnauthorized, "unauthorized")
 		}

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

@@ -138,7 +138,7 @@ func (rt *Router) notifyTplPreview(c *gin.Context) {
 			continue
 		}
 
-		arr := strings.SplitN(pair, "=", 2)
+		arr := strings.Split(pair, "=")
 		if len(arr) != 2 {
 			continue
 		}
@@ -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

@@ -9,7 +9,6 @@ import (
 	"time"
 
 	"github.com/ccfos/nightingale/v6/models"
-	"github.com/ccfos/nightingale/v6/pkg/ctx"
 	"github.com/ccfos/nightingale/v6/storage"
 
 	"github.com/gin-gonic/gin"
@@ -53,8 +52,6 @@ func (rt *Router) targetGets(c *gin.Context) {
 	order := ginx.QueryStr(c, "order", "ident")
 	desc := ginx.QueryBool(c, "desc", false)
 
-	hosts := queryStrListField(c, "hosts", ",", " ", "\n")
-
 	var err error
 	if len(bgids) == 0 {
 		user := c.MustGet("user").(*models.User)
@@ -68,13 +65,11 @@ func (rt *Router) targetGets(c *gin.Context) {
 			bgids = append(bgids, 0)
 		}
 	}
-
 	options := []models.BuildTargetWhereOption{
 		models.BuildTargetWhereWithBgids(bgids),
 		models.BuildTargetWhereWithDsIds(dsIds),
 		models.BuildTargetWhereWithQuery(query),
 		models.BuildTargetWhereWithDowntime(downtime),
-		models.BuildTargetWhereWithHosts(hosts),
 	}
 	total, err := models.TargetTotal(rt.Ctx, options...)
 	ginx.Dangerous(err)
@@ -83,13 +78,6 @@ func (rt *Router) targetGets(c *gin.Context) {
 		ginx.Offset(c, limit), order, desc, options...)
 	ginx.Dangerous(err)
 
-	tgs, err := models.TargetBusiGroupsGetAll(rt.Ctx)
-	ginx.Dangerous(err)
-
-	for _, t := range list {
-		t.GroupIds = tgs[t.Ident]
-	}
-
 	if err == nil {
 		now := time.Now()
 		cache := make(map[int64]*models.BusiGroup)
@@ -170,7 +158,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)
 }
 
@@ -273,9 +261,11 @@ func (rt *Router) validateTags(tags []string) error {
 }
 
 func (rt *Router) addTagsToTarget(target *models.Target, tags []string) error {
+	hostTagsMap := target.GetHostTagsMap()
 	for _, tag := range tags {
 		tagKey := strings.Split(tag, "=")[0]
-		if _, exist := target.TagsMap[tagKey]; exist {
+		if _, ok := hostTagsMap[tagKey]; ok ||
+			strings.Contains(target.Tags, tagKey+"=") {
 			return fmt.Errorf("duplicate tagkey(%s)", tagKey)
 		}
 	}
@@ -392,32 +382,8 @@ type targetBgidForm struct {
 	Bgid    int64    `json:"bgid"`
 }
 
-type targetBgidsForm struct {
-	Idents  []string `json:"idents" binding:"required_without=HostIps"`
-	HostIps []string `json:"host_ips" binding:"required_without=Idents"`
-	Bgids   []int64  `json:"bgids"`
-	Tags    []string `json:"tags"`
-	Action  string   `json:"action"` // add del reset
-}
-
-func haveNeverGroupedIdent(ctx *ctx.Context, idents []string) (bool, error) {
-	for _, ident := range idents {
-		bgids, err := models.TargetGroupIdsGetByIdent(ctx, ident)
-		if err != nil {
-			return false, err
-		}
-		
-		if len(bgids) <= 0 {
-			return true, nil
-		}	
-	}
-
-	return false, nil
-}
-
-
-func (rt *Router) targetBindBgids(c *gin.Context) {
-	var f targetBgidsForm
+func (rt *Router) targetUpdateBgid(c *gin.Context) {
+	var f targetBgidForm
 	var err error
 	var failedResults = make(map[string]string)
 	ginx.BindJSON(c, &f)
@@ -433,24 +399,35 @@ func (rt *Router) targetBindBgids(c *gin.Context) {
 	}
 
 	user := c.MustGet("user").(*models.User)
-	if !user.IsAdmin() {
-		// 普通用户，检查用户是否有权限操作所有请求的业务组
-		existing, _, err := models.SeparateTargetIdents(rt.Ctx, f.Idents)
+	if user.IsAdmin() {
+		ginx.NewRender(c).Data(failedResults, models.TargetUpdateBgid(rt.Ctx, f.Idents, f.Bgid, false))
+		return
+	}
+
+	if f.Bgid > 0 {
+		// 把要操作的机器分成两部分，一部分是bgid为0，需要管理员分配，另一部分bgid>0，说明是业务组内部想调整
+		// 比如原来分配给didiyun的机器，didiyun的管理员想把部分机器调整到didiyun-ceph下
+		// 对于调整的这种情况，当前登录用户要对这批机器有操作权限，同时还要对目标BG有操作权限
+		orphans, err := models.IdentsFilter(rt.Ctx, f.Idents, "group_id = ?", 0)
 		ginx.Dangerous(err)
-		rt.checkTargetPerm(c, existing)
 
-		var groupIds []int64
-		if f.Action == "reset" {
-			// 如果是复写，则需要检查用户是否有权限操作机器之前的业务组
-			bgids, err := models.TargetGroupIdsGetByIdents(rt.Ctx, f.Idents)
+		// 机器里边存在未归组的，登录用户就需要是admin
+		if len(orphans) > 0 && !user.IsAdmin() {
+			can, err := user.CheckPerm(rt.Ctx, "/targets/bind")
 			ginx.Dangerous(err)
-
-			groupIds = append(groupIds, bgids...)
+			if !can {
+				ginx.Bomb(http.StatusForbidden, "No permission. Only admin can assign BG")
+			}
 		}
-		groupIds = append(groupIds, f.Bgids...)
 
-		for _, bgid := range groupIds {
-			bg := BusiGroup(rt.Ctx, bgid)
+		reBelongs, err := models.IdentsFilter(rt.Ctx, f.Idents, "group_id > ?", 0)
+		ginx.Dangerous(err)
+
+		if len(reBelongs) > 0 {
+			// 对于这些要重新分配的机器，操作者要对这些机器本身有权限，同时要对目标bgid有权限
+			rt.checkTargetPerm(c, f.Idents)
+
+			bg := BusiGroup(rt.Ctx, f.Bgid)
 			can, err := user.CanDoBusiGroup(rt.Ctx, bg, "rw")
 			ginx.Dangerous(err)
 
@@ -458,28 +435,14 @@ func (rt *Router) targetBindBgids(c *gin.Context) {
 				ginx.Bomb(http.StatusForbidden, "No permission. You are not admin of BG(%s)", bg.Name)
 			}
 		}
-		isNeverGrouped, checkErr := haveNeverGroupedIdent(rt.Ctx, f.Idents)
-		ginx.Dangerous(checkErr)
-
-		if isNeverGrouped {
-			can, err := user.CheckPerm(rt.Ctx, "/targets/bind")
-			ginx.Dangerous(err)
-			if !can {
-				ginx.Bomb(http.StatusForbidden, "No permission. Only admin can assign BG")
-			}
-		}
+	} else if f.Bgid == 0 {
+		// 退还机器
+		rt.checkTargetPerm(c, f.Idents)
+	} else {
+		ginx.Bomb(http.StatusBadRequest, "invalid bgid")
 	}
 
-	switch f.Action {
-	case "add":
-		ginx.NewRender(c).Data(failedResults, models.TargetBindBgids(rt.Ctx, f.Idents, f.Bgids, f.Tags))
-	case "del":
-		ginx.NewRender(c).Data(failedResults, models.TargetUnbindBgids(rt.Ctx, f.Idents, f.Bgids))
-	case "reset":
-		ginx.NewRender(c).Data(failedResults, models.TargetOverrideBgids(rt.Ctx, f.Idents, f.Bgids, f.Tags))
-	default:
-		ginx.Bomb(http.StatusBadRequest, "invalid action")
-	}
+	ginx.NewRender(c).Data(failedResults, models.TargetUpdateBgid(rt.Ctx, f.Idents, f.Bgid, false))
 }
 
 func (rt *Router) targetUpdateBgidByService(c *gin.Context) {
@@ -498,7 +461,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.TargetUpdateBgid(rt.Ctx, f.Idents, f.Bgid, false))
 }
 
 type identsForm struct {
@@ -522,7 +485,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) {
@@ -541,7 +504,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) {

center/router/router_task.go

@@ -126,7 +126,7 @@ func (rt *Router) taskAdd(c *gin.Context) {
 	rt.checkTargetPerm(c, f.Hosts)
 
 	// call ibex
-	taskId, err := sender.TaskAdd(f, user.Username, rt.Ctx.IsCenter)
+	taskId, err := sender.TaskAdd(rt.Ctx, f, user.Username, rt.Ctx.IsCenter)
 	ginx.Dangerous(err)
 
 	if taskId <= 0 {

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
 	)

cli/upgrade/upgrade.go

@@ -18,7 +18,7 @@ func Upgrade(configFile string) error {
 		return err
 	}
 
-	ctx := ctx.NewContext(context.Background(), db, true)
+	ctx := ctx.NewContext(context.Background(), db, nil, true)
 	for _, cluster := range config.Clusters {
 		count, err := models.GetDatasourcesCountByName(ctx, cluster.Name)
 		if err != nil {

cmd/edge/edge.go

@@ -7,12 +7,12 @@ 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"
 	"github.com/ccfos/nightingale/v6/conf"
 	"github.com/ccfos/nightingale/v6/dumper"
+	"github.com/ccfos/nightingale/v6/ibex"
 	"github.com/ccfos/nightingale/v6/memsto"
 	"github.com/ccfos/nightingale/v6/pkg/ctx"
 	"github.com/ccfos/nightingale/v6/pkg/httpx"
@@ -23,8 +23,6 @@ import (
 	"github.com/ccfos/nightingale/v6/pushgw/writer"
 	"github.com/ccfos/nightingale/v6/storage"
 	"github.com/ccfos/nightingale/v6/tdengine"
-
-	"github.com/flashcatcloud/ibex/src/cmd/ibex"
 )
 
 func Initialize(configDir string, cryptoKey string) (func(), error) {
@@ -41,7 +39,6 @@ func Initialize(configDir string, cryptoKey string) (func(), error) {
 	if len(config.CenterApi.Addrs) < 1 {
 		return nil, errors.New("failed to init config: the CenterApi configuration is missing")
 	}
-	ctx := ctx.NewContext(context.Background(), nil, false, config.CenterApi)
 
 	var redis storage.Redis
 	redis, err = storage.NewRedis(config.Redis)
@@ -49,17 +46,17 @@ func Initialize(configDir string, cryptoKey string) (func(), error) {
 		return nil, err
 	}
 
+	ctx := ctx.NewContext(context.Background(), nil, redis, false, config.CenterApi)
+
 	syncStats := memsto.NewSyncStats()
 
 	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()
 
@@ -88,12 +82,12 @@ func Initialize(configDir string, cryptoKey string) (func(), error) {
 		alertrtRouter.Config(r)
 
 		if config.Ibex.Enable {
-			ibex.ServerStart(false, nil, redis, config.HTTP.APIForService.BasicAuth, config.Alert.Heartbeat, &config.CenterApi, r, nil, config.Ibex, config.HTTP.Port)
+			ibex.ServerStart(ctx, false, nil, redis, config.HTTP.APIForService.BasicAuth, config.Alert.Heartbeat, &config.CenterApi, r, nil, config.Ibex, config.HTTP.Port)
 		}
 	}
 
 	dumper.ConfigRouter(r)
-	httpClean := httpx.Init(config.HTTP, r)
+	httpClean := httpx.Init(config.HTTP, context.Background(), r)
 
 	return func() {
 		logxClean()

cmd/ibex/main.go

@@ -0,0 +1,119 @@
+package main
+
+import (
+	"fmt"
+	"os"
+
+	"github.com/ccfos/nightingale/v6/ibex/agentd"
+	"github.com/ccfos/nightingale/v6/ibex/server"
+
+	"github.com/toolkits/pkg/net/tcpx"
+	"github.com/toolkits/pkg/runner"
+	"github.com/urfave/cli/v2"
+)
+
+// VERSION go build -ldflags "-X main.VERSION=x.x.x"
+var VERSION = "not specified"
+
+func main() {
+	app := cli.NewApp()
+	app.Name = "ibex"
+	app.Version = VERSION
+	app.Usage = "Ibex, running scripts on large scale machines"
+	app.Commands = []*cli.Command{
+		newCenterServerCmd(),
+		newEdgeServerCmd(),
+		newAgentdCmd(),
+	}
+	app.Run(os.Args)
+}
+
+func newCenterServerCmd() *cli.Command {
+	return &cli.Command{
+		Name:  "server",
+		Usage: "Run server",
+		Flags: []cli.Flag{
+			&cli.StringFlag{
+				Name:    "conf",
+				Aliases: []string{"c"},
+				Usage:   "specify configuration file(.json,.yaml,.toml)",
+			},
+		},
+		Action: func(c *cli.Context) error {
+			printEnv()
+
+			tcpx.WaitHosts()
+
+			var opts []server.ServerOption
+			if c.String("conf") != "" {
+				opts = append(opts, server.SetConfigFile(c.String("conf")))
+			}
+			opts = append(opts, server.SetVersion(VERSION))
+
+			server.Run(true, opts...)
+			return nil
+		},
+	}
+}
+
+func newEdgeServerCmd() *cli.Command {
+	return &cli.Command{
+		Name:  "edge server",
+		Usage: "Run edge server",
+		Flags: []cli.Flag{
+			&cli.StringFlag{
+				Name:    "conf",
+				Aliases: []string{"c"},
+				Usage:   "specify configuration file(.json,.yaml,.toml)",
+			},
+		},
+		Action: func(c *cli.Context) error {
+			printEnv()
+
+			tcpx.WaitHosts()
+
+			var opts []server.ServerOption
+			if c.String("conf") != "" {
+				opts = append(opts, server.SetConfigFile(c.String("conf")))
+			}
+			opts = append(opts, server.SetVersion(VERSION))
+
+			server.Run(false, opts...)
+			return nil
+		},
+	}
+}
+
+func newAgentdCmd() *cli.Command {
+	return &cli.Command{
+		Name:  "agentd",
+		Usage: "Run agentd",
+		Flags: []cli.Flag{
+			&cli.StringFlag{
+				Name:    "conf",
+				Aliases: []string{"c"},
+				Usage:   "specify configuration file(.json,.yaml,.toml)",
+			},
+		},
+		Action: func(c *cli.Context) error {
+			printEnv()
+
+			var opts []agentd.AgentdOption
+			if c.String("conf") != "" {
+				opts = append(opts, agentd.SetConfigFile(c.String("conf")))
+			}
+			opts = append(opts, agentd.SetVersion(VERSION))
+
+			agentd.Run(opts...)
+			return nil
+		},
+	}
+}
+
+func printEnv() {
+	runner.Init()
+	fmt.Println("runner.cwd:", runner.Cwd)
+	fmt.Println("runner.hostname:", runner.Hostname)
+	fmt.Println("runner.fd_limits:", runner.FdLimits())
+	fmt.Println("runner.vm_limits:", runner.VMLimits())
+}

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/initsql_for_postgres/a-n9e-for-Postgres.sql

@@ -561,7 +561,7 @@ CREATE TABLE alert_cur_event (
     target_note varchar(191) not null default '' ,
     first_trigger_time bigint,
     trigger_time bigint not null,
-    trigger_value varchar(2048) not null,
+    trigger_value varchar(255) not null,
     annotations text not null ,
     rule_config text not null ,
     tags varchar(1024) not null default '' ,
@@ -621,7 +621,7 @@ CREATE TABLE alert_his_event (
     target_note varchar(191) not null default '' ,
     first_trigger_time bigint,
     trigger_time bigint not null,
-    trigger_value varchar(2048) not null,
+    trigger_value varchar(255) not null,
     recover_time bigint not null default 0,
     last_eval_time bigint not null default 0 ,
     tags varchar(1024) not null default '' ,
@@ -790,7 +790,6 @@ CREATE TABLE es_index_pattern (
     time_field varchar(128) not null default '@timestamp',
     allow_hide_system_indices smallint not null default 0,
     fields_format varchar(4096) not null default '',
-    cross_cluster_enabled int not null default 0,
     create_at bigint default '0',
     create_by varchar(64) default '',
     update_at bigint default '0',
@@ -860,7 +859,6 @@ CREATE TABLE builtin_components (
   ident VARCHAR(191) NOT NULL,
   logo VARCHAR(191) NOT NULL,
   readme TEXT NOT NULL,
-  disabled INT NOT NULL DEFAULT 0,
   created_at BIGINT NOT NULL DEFAULT 0,
   created_by VARCHAR(191) NOT NULL DEFAULT '',
   updated_at BIGINT NOT NULL DEFAULT 0,
@@ -887,20 +885,4 @@ CREATE TABLE builtin_payloads (
 CREATE INDEX idx_component ON builtin_payloads (component);
 CREATE INDEX idx_builtin_payloads_name ON builtin_payloads (name);
 CREATE INDEX idx_cate ON builtin_payloads (cate);
-CREATE INDEX idx_type ON builtin_payloads (type);
-
-
-CREATE TABLE dash_annotation (
-    id bigserial PRIMARY KEY,
-    dashboard_id bigint not null,
-    panel_id varchar(191) not null,
-    tags text,
-    description text,
-    config text,
-    time_start bigint not null default 0,
-    time_end bigint not null default 0,
-    create_at bigint not null default 0,
-    create_by varchar(64) not null default '',
-    update_at bigint not null default 0,
-    update_by varchar(64) not null default ''
-);
+CREATE INDEX idx_type ON builtin_payloads (type);

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/initsql/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);
@@ -412,7 +389,7 @@ CREATE TABLE `alert_cur_event` (
     `target_note` varchar(191) not null default '',
     `first_trigger_time` bigint,
     `trigger_time` bigint not null,
-    `trigger_value` varchar(2048) not null,
+    `trigger_value` varchar(255) not null,
     `annotations` text not null,
     `rule_config` text not null,
     `tags` varchar(1024) not null default ''
@@ -450,10 +427,9 @@ CREATE TABLE `alert_his_event` (
     `target_note` varchar(191) not null default '',
     `first_trigger_time` bigint,
     `trigger_time` bigint not null,
-    `trigger_value` varchar(2048) not null,
+    `trigger_value` varchar(255) not null,
     `recover_time` bigint not null default 0,
     `last_eval_time` bigint not null default 0,
-    `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,
@@ -630,7 +584,6 @@ CREATE TABLE `es_index_pattern` (
     `time_field` varchar(128) not null default '@timestamp',
     `allow_hide_system_indices` tinyint(1) not null default 0,
     `fields_format` varchar(4096) not null default '',
-    `cross_cluster_enabled` int not null default 0,
     `create_at` bigint default '0',
     `create_by` varchar(64) default '',
     `update_at` bigint default '0',
@@ -638,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,
@@ -652,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` (
@@ -675,30 +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 `dash_annotation` (
-    `id` integer primary key autoincrement,
-    `dashboard_id` bigint not null,
-    `panel_id` varchar(191) not null,
-    `tags` text,
-    `description` text,
-    `config` text,
-    `time_start` bigint not null default 0,
-    `time_end` bigint not null default 0,
-    `create_at` bigint not null default 0,
-    `create_by` varchar(64) not null default '',
-    `update_at` bigint not null default 0,
-    `update_by` varchar(64) not null default ''
-);
 
 CREATE TABLE `task_meta`
 (

docker/migratesql/migrate.sql

@@ -103,48 +103,4 @@ CREATE TABLE notification_record (
 
 
 /* v7.3.0 2024-08-26 */
-ALTER TABLE `target` ADD COLUMN `host_tags` TEXT COMMENT 'global labels set in conf file';
-
-/* v7.3.4 2024-08-28 */
-ALTER TABLE `builtin_payloads` ADD COLUMN `component_id` bigint(20) NOT NULL DEFAULT 0 COMMENT 'component_id';
-
-/* v7.4.0 2024-09-20 */
-CREATE TABLE `target_busi_group` (
-  `id` bigint NOT NULL AUTO_INCREMENT,
-  `target_ident` varchar(191) NOT NULL,
-  `group_id` bigint NOT NULL,
-  `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''';
-
-/* v8.0.0-beta.2 2024-12-26 */
-ALTER TABLE `es_index_pattern` ADD COLUMN `cross_cluster_enabled` int not null default 0;
-
-/* v8.0.0-beta.3 2024-01-03 */
-ALTER TABLE `builtin_components` ADD COLUMN `disabled` INT NOT NULL DEFAULT 0 COMMENT 'is disabled or not';
-        
-CREATE TABLE `dash_annotation` (
-    `id` bigint unsigned not null auto_increment,
-    `dashboard_id` bigint not null comment 'dashboard id',
-    `panel_id` varchar(191) not null comment 'panel id',
-    `tags` text comment 'tags array json string',
-    `description` text comment 'annotation description',
-    `config` text comment 'annotation config',
-    `time_start` bigint not null default 0 comment 'start timestamp',
-    `time_end` bigint not null default 0 comment 'end timestamp',
-    `create_at` bigint not null default 0 comment 'create time',
-    `create_by` varchar(64) not null default '' comment 'creator',
-    `update_at` bigint not null default 0 comment 'update time',
-    `update_by` varchar(64) not null default '' comment 'updater',
-    PRIMARY KEY (`id`),
-    KEY `idx_dashboard_id` (`dashboard_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+ALTER TABLE `target` ADD COLUMN `host_tags` TEXT COMMENT 'global labels set in conf file';

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"
 

etc/ibex/agentd.toml

@@ -0,0 +1,38 @@
+# debug, release
+RunMode = "debug"
+
+# task meta storage dir
+MetaDir = "./meta"
+
+[HTTP]
+Enable = true
+# http listening address
+Host = "0.0.0.0"
+# http listening port
+Port = 2090
+# https cert file path
+CertFile = ""
+# https key file path
+KeyFile = ""
+# whether print access log
+PrintAccessLog = true
+# whether enable pprof
+PProf = false
+# http graceful shutdown timeout, unit: s
+ShutdownTimeout = 30
+# max content length: 64M
+MaxContentLength = 67108864
+# http server read timeout, unit: s
+ReadTimeout = 20
+# http server write timeout, unit: s
+WriteTimeout = 40
+# http server idle timeout, unit: s
+IdleTimeout = 120
+
+[Heartbeat]
+# unit: ms
+Interval = 1000
+# rpc servers
+Servers = ["127.0.0.1:20090"]
+# $ip or $hostname or specified string
+Host = "$hostname"

etc/ibex/ibex-agentd.service

@@ -0,0 +1,20 @@
+[Unit]
+Description="ibex-agentd"
+After=network.target
+
+[Service]
+Type=simple
+
+ExecStart=/root/gopath/ibex/ibex agentd
+WorkingDirectory=/root/gopath/ibex
+
+Restart=on-failure
+SuccessExitStatus=0
+LimitNOFILE=65536
+StandardOutput=syslog
+StandardError=syslog
+SyslogIdentifier=ibex-agentd
+
+
+[Install]
+WantedBy=multi-user.target

etc/ibex/ibex-server.service

@@ -0,0 +1,20 @@
+[Unit]
+Description="ibex-server"
+After=network.target
+
+[Service]
+Type=simple
+
+ExecStart=/root/gopath/ibex/ibex server
+WorkingDirectory=/root/gopath/ibex
+
+Restart=on-failure
+SuccessExitStatus=0
+LimitNOFILE=65536
+StandardOutput=syslog
+StandardError=syslog
+SyslogIdentifier=ibex-server
+
+
+[Install]
+WantedBy=multi-user.target

etc/ibex/server.toml

@@ -0,0 +1,86 @@
+# debug, release
+RunMode = "debug"
+
+[Log]
+# log write dir
+Dir = "logs-server"
+# log level: DEBUG INFO WARNING ERROR
+Level = "DEBUG"
+# stdout, stderr, file
+Output = "stdout"
+# # rotate by time
+# KeepHours: 4
+# # rotate by size
+# RotateNum = 3
+# # unit: MB
+# RotateSize = 256
+
+[HTTP]
+Enable = true
+# http listening address
+Host = "0.0.0.0"
+# http listening port
+Port = 10090
+# https cert file path
+CertFile = ""
+# https key file path
+KeyFile = ""
+# whether print access log
+PrintAccessLog = true
+# whether enable pprof
+PProf = false
+# http graceful shutdown timeout, unit: s
+ShutdownTimeout = 30
+# max content length: 64M
+MaxContentLength = 67108864
+# http server read timeout, unit: s
+ReadTimeout = 20
+# http server write timeout, unit: s
+WriteTimeout = 40
+# http server idle timeout, unit: s
+IdleTimeout = 120
+
+[BasicAuth]
+# using when call apis
+ibex = "ibex"
+
+[RPC]
+Listen = "0.0.0.0:20090"
+
+[Heartbeat]
+# auto detect if blank
+IP = ""
+# unit: ms
+Interval = 1000
+
+[Output]
+# database | remote
+ComeFrom = "database"
+AgtdPort = 2090
+
+[DB]
+# postgres: host=%s port=%s user=%s dbname=%s password=%s sslmode=%s
+# postgres: DSN="host=127.0.0.1 port=5432 user=root dbname=n9e_v6 password=1234 sslmode=disable"
+DSN="root:1234@tcp(127.0.0.1:3306)/ibex?charset=utf8mb4&parseTime=True&loc=Local&allowNativePasswords=true"
+# enable debug mode or not
+Debug = false
+# mysql postgres
+DBType = "mysql"
+# unit: s
+MaxLifetime = 7200
+# max open connections
+MaxOpenConns = 150
+# max idle connections
+MaxIdleConns = 50
+# table prefix
+TablePrefix = ""
+
+[Redis]
+# address, ip:port or ip1:port,ip2:port for cluster and sentinel(SentinelAddrs)
+Address = "127.0.0.1:6379"
+# Username = ""
+# Password = ""
+# DB = 0
+# UseTLS = false
+# TLSMinVersion = "1.2"
+# standalone cluster sentinel

go.mod

@@ -1,18 +1,15 @@
 module github.com/ccfos/nightingale/v6
 
-go 1.22
+go 1.18
 
 require (
-	github.com/BurntSushi/toml v0.3.1
-	github.com/VictoriaMetrics/metricsql v0.81.1
+	github.com/BurntSushi/toml v1.3.2
 	github.com/coreos/go-oidc v2.2.1+incompatible
 	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc
 	github.com/dgrijalva/jwt-go v3.2.0+incompatible
 	github.com/expr-lang/expr v1.16.1
-	github.com/flashcatcloud/ibex v1.3.5
 	github.com/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
@@ -34,41 +31,27 @@ 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
+	github.com/urfave/cli/v2 v2.27.4
 	golang.org/x/exp v0.0.0-20230713183714-613f0c0eb8a1
 	golang.org/x/oauth2 v0.10.0
 	gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df
 	gopkg.in/yaml.v2 v2.4.0
 	gorm.io/driver/mysql v1.4.4
-	gorm.io/driver/postgres v1.5.11
+	gorm.io/driver/postgres v1.4.5
 	gorm.io/driver/sqlite v1.5.5
-	gorm.io/gorm v1.25.12
+	gorm.io/gorm v1.25.7-0.20240204074919-46816ad31dde
 )
 
 require (
-	github.com/VictoriaMetrics/metrics v1.34.0 // indirect
-	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/jackc/pgx/v5 v5.7.1 // indirect
-	github.com/jackc/puddle/v2 v2.2.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/valyala/fastrand v1.1.0 // indirect
-	github.com/valyala/histogram v1.2.0 // indirect
-	github.com/yuin/gopher-lua v1.1.1 // indirect
-	golang.org/x/sync v0.10.0 // 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
+	github.com/cpuguy83/go-md2man/v2 v2.0.4 // indirect
+	github.com/russross/blackfriday/v2 v2.1.0 // indirect
+	github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1 // indirect
 )
 
 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
@@ -94,7 +77,7 @@ require (
 	github.com/jackc/pgio v1.0.0 // indirect
 	github.com/jackc/pgpassfile v1.0.0 // indirect
 	github.com/jackc/pgproto3/v2 v2.3.1 // indirect
-	github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 // indirect
+	github.com/jackc/pgservicefile v0.0.0-20200714003250-2b9c44734f2b // indirect
 	github.com/jackc/pgtype v1.12.0 // indirect
 	github.com/jackc/pgx/v4 v4.17.2 // indirect
 	github.com/jinzhu/inflection v1.0.0 // indirect
@@ -110,18 +93,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
+	github.com/ugorji/go/codec v1.2.11
 	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,36 +1,21 @@
 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/BurntSushi/toml v1.3.2 h1:o7IhLm0Msx3BaB+n3Ag7L8EVlByGnpq14C4YWiu/gL8=
+github.com/BurntSushi/toml v1.3.2/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ=
 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/VictoriaMetrics/metrics v1.34.0 h1:0i8k/gdOJdSoZB4Z9pikVnVQXfhcIvnG7M7h2WaQW2w=
-github.com/VictoriaMetrics/metrics v1.34.0/go.mod h1:r7hveu6xMdUACXvB8TYdAj8WEsKzWB0EkpJN+RDtOf8=
-github.com/VictoriaMetrics/metricsql v0.81.1 h1:1gpqI3Mwru1tCM8nZiKxBG0P+DNkjlRwLhRPII3cuho=
-github.com/VictoriaMetrics/metricsql v0.81.1/go.mod h1:1g4hdCwlbJZ851PU9VN65xy9Rdlzupo6fx3SNZ8Z64U=
 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=
@@ -45,6 +30,8 @@ github.com/coreos/go-oidc v2.2.1+incompatible h1:mh48q/BqXqgjVHpy2ZY7WnWAbenxRjs
 github.com/coreos/go-oidc v2.2.1+incompatible/go.mod h1:CgnwVTmzoESiwO9qyAFEMiHoZ1nMCKZlZ9V6mm3/LKc=
 github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
 github.com/coreos/go-systemd v0.0.0-20190719114852-fd7a80b32e1f/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
+github.com/cpuguy83/go-md2man/v2 v2.0.4 h1:wfIWP927BUkWJb2NmU/kNDYIBTh/ziUX91+lVfRxZq4=
+github.com/cpuguy83/go-md2man/v2 v2.0.4/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
 github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY=
 github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@@ -57,16 +44,12 @@ 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=
 github.com/fatih/camelcase v1.0.0/go.mod h1:yN2Sb0lFhZJUdVvtELVWefmrXpuZESvPmqwoZc+/fpc=
 github.com/fatih/structs v1.1.0 h1:Q7juDM0QtcnhCpeyLGQKyg4TOIghuNXrkL32pHAUMxo=
 github.com/fatih/structs v1.1.0/go.mod h1:9NiDSp5zOcgEDl+j00MP/WkGVPOlPRLejGD8Ga6PJ7M=
-github.com/flashcatcloud/ibex v1.3.5 h1:8GOOf5+aJT0TP/MC6izz7CO5JKJSdKVFBwL0vQp93Nc=
-github.com/flashcatcloud/ibex v1.3.5/go.mod h1:T8hbMUySK2q6cXUaYp0AUVeKkU9Od2LjzwmB5lmTRBM=
 github.com/gabriel-vasile/mimetype v1.4.2 h1:w5qFW6JKBz9Y393Y4q372O9A7cUSequkh1Q7OhCmWKU=
 github.com/gabriel-vasile/mimetype v1.4.2/go.mod h1:zApsH/mKG4w07erKIaJPFiX0Tsq9BFQgN3qGY5GnNgA=
 github.com/garyburd/redigo v1.6.2/go.mod h1:NR3MbYisc3/PwhQ00EMzDiPmrwpPxAn5GI05/YaO1SY=
@@ -77,10 +60,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=
@@ -116,7 +95,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=
@@ -128,10 +106,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=
@@ -170,8 +145,6 @@ github.com/jackc/pgproto3/v2 v2.3.1 h1:nwj7qwf0S+Q7ISFfBndqeLwSwxs+4DPsbRFjECT1Y
 github.com/jackc/pgproto3/v2 v2.3.1/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA=
 github.com/jackc/pgservicefile v0.0.0-20200714003250-2b9c44734f2b h1:C8S2+VttkHFdOOCXJe+YGfa4vHYwlt4Zx+IVXQ97jYg=
 github.com/jackc/pgservicefile v0.0.0-20200714003250-2b9c44734f2b/go.mod h1:vsD4gTJCa9TptPL8sPkXrLZ+hDuNrZCnj29CQpr4X1E=
-github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 h1:iCEnooe7UlwOQYpKFhBabPMi4aNAfoODPEFNiAnClxo=
-github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761/go.mod h1:5TJZWKEWniPve33vlWYSoGYefn3gLQRzjfDlhSJ9ZKM=
 github.com/jackc/pgtype v0.0.0-20190421001408-4ed0de4755e0/go.mod h1:hdSHsc1V01CGwFsrv11mJRHWJ6aifDLfdV3aVjFF0zg=
 github.com/jackc/pgtype v0.0.0-20190824184912-ab885b375b90/go.mod h1:KcahbBH1nCMSo2DXpzsoWOAfFkdEtEJpPbVLq8eE+mc=
 github.com/jackc/pgtype v0.0.0-20190828014616-a8802b16cc59/go.mod h1:MWlu30kVJrUS8lot6TQqcg7mtthZ9T0EoIBFiJcmcyw=
@@ -184,15 +157,10 @@ github.com/jackc/pgx/v4 v4.0.0-pre1.0.20190824185557-6972a5742186/go.mod h1:X+GQ
 github.com/jackc/pgx/v4 v4.12.1-0.20210724153913-640aa07df17c/go.mod h1:1QD0+tgSXP7iUjYm9C1NxKhny7lq6ee99u/z+IHFcgs=
 github.com/jackc/pgx/v4 v4.17.2 h1:0Ut0rpeKwvIVbMQ1KbMBU4h6wxehBI535LK6Flheh8E=
 github.com/jackc/pgx/v4 v4.17.2/go.mod h1:lcxIZN44yMIrWI78a5CpucdD14hX0SBDbNRvjDBItsw=
-github.com/jackc/pgx/v5 v5.7.1 h1:x7SYsPBYDkHDksogeSmZZ5xzThcTgRz++I5E+ePFUcs=
-github.com/jackc/pgx/v5 v5.7.1/go.mod h1:e7O26IywZZ+naJtWWos6i6fvWK+29etgITqrqHLfoZA=
 github.com/jackc/puddle v0.0.0-20190413234325-e4ced69a3a2b/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk=
 github.com/jackc/puddle v0.0.0-20190608224051-11cab39313c9/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk=
 github.com/jackc/puddle v1.1.3/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk=
-github.com/jackc/puddle v1.3.0 h1:eHK/5clGOatcjX3oWGBO/MpxpbHzSwud5EWTSCI+MX0=
 github.com/jackc/puddle v1.3.0/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk=
-github.com/jackc/puddle/v2 v2.2.2 h1:PR8nw+E/1w0GLuRFSmiioY6UooMp6KJv0/61nB7icHo=
-github.com/jackc/puddle/v2 v2.2.2/go.mod h1:vriiEXHvEE654aYKXXjOvZM39qJ0q+azkZFrfEOc3H4=
 github.com/jinzhu/copier v0.4.0 h1:w3ciUoD19shMCRargcpm0cm91ytaBhDvuRpz1ODO/U8=
 github.com/jinzhu/copier v0.4.0/go.mod h1:DfbEm0FYsaqBcKcFuvmOZb218JkPGtvSHsKg8S8hyyg=
 github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD/E=
@@ -201,17 +169,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=
@@ -223,14 +188,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=
@@ -261,25 +224,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=
@@ -287,7 +245,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=
@@ -296,9 +253,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=
@@ -306,10 +260,11 @@ 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=
+github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk=
+github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
 github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0=
 github.com/shopspring/decimal v0.0.0-20180709203117-cd690d0c9e24/go.mod h1:M+9NzErvs504Cn4c5DxATwIqPbtswREoFCre64PpcG4=
 github.com/shopspring/decimal v1.2.0 h1:abSATXmQEYyShuxI4/vyW3tV1MrKAJzCZ/0zLUXYbsQ=
@@ -336,30 +291,27 @@ 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=
 github.com/ugorji/go/codec v1.2.7/go.mod h1:WGN1fab3R1fzQlVQTkfxVtIBhWDRqOviHU95kRgeqEY=
 github.com/ugorji/go/codec v1.2.11 h1:BMaWp1Bb6fHwEtbplGBGJ498wD+LKlNSl25MjdZY4dU=
 github.com/ugorji/go/codec v1.2.11/go.mod h1:UNopzCgEMSXjBc6AOMqYvWC1ktqTAfzJZUZgYf6w6lg=
-github.com/valyala/fastrand v1.1.0 h1:f+5HkLW4rsgzdNoleUOB69hyT9IlD2ZQh9GyDMfb5G8=
-github.com/valyala/fastrand v1.1.0/go.mod h1:HWqCzkrkg6QXT8V2EXWvXCoow7vLwOFN002oeRzjapQ=
-github.com/valyala/histogram v1.2.0 h1:wyYGAZZt3CpwUiIb9AU/Zbllg1llXyrtApRS815OLoQ=
-github.com/valyala/histogram v1.2.0/go.mod h1:Hb4kBwb4UxsaNbbbh+RRz8ZR6pdodR57tzWUS3BUzXY=
+github.com/urfave/cli/v2 v2.27.4 h1:o1owoI+02Eb+K107p27wEX9Bb8eqIoZCfLXloLUSWJ8=
+github.com/urfave/cli/v2 v2.27.4/go.mod h1:m4QzxcD2qpra4z7WhzEGn74WZLViBnMpb1ToCAKdGRQ=
+github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1 h1:gEOO8jv9F4OT7lGCjxCBTO/36wtF6j2nSip77qHd4x4=
+github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1/go.mod h1:Ohn+xnUBiLI6FVj/9LpzZWtj1/D6lUovWYBkxHVV3aM=
 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=
@@ -371,7 +323,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=
@@ -396,8 +347,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=
@@ -433,8 +384,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=
@@ -457,10 +407,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.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-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=
@@ -478,8 +426,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=
@@ -530,23 +478,11 @@ gorm.io/driver/mysql v1.4.4 h1:MX0K9Qvy0Na4o7qSC/YI7XxqUw5KDw01umqgID+svdQ=
 gorm.io/driver/mysql v1.4.4/go.mod h1:BCg8cKI+R0j/rZRQxeKis/forqRwRSYOR8OM3Wo6hOM=
 gorm.io/driver/postgres v1.4.5 h1:mTeXTTtHAgnS9PgmhN2YeUbazYpLhUI1doLnw42XUZc=
 gorm.io/driver/postgres v1.4.5/go.mod h1:GKNQYSJ14qvWkvPwXljMGehpKrhlDNsqYRr5HnYGncg=
-gorm.io/driver/postgres v1.5.11 h1:ubBVAfbKEUld/twyKZ0IYn9rSQh448EdelLYk9Mv314=
-gorm.io/driver/postgres v1.5.11/go.mod h1:DX3GReXH+3FPWGrrgffdvCk3DQ1dwDPdmbenSkweRGI=
 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.12 h1:I0u8i2hWQItBq1WfE0o2+WuL9+8L21K9e2HHSTE/0f8=
-gorm.io/gorm v1.25.12/go.mod h1:xh7N7RHfYlNc5EmcI/El95gXusucDrQnHXe0+CgWcLQ=
+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=

ibex/agentd/agentd.go

@@ -0,0 +1,117 @@
+package agentd
+
+import (
+	"context"
+	"fmt"
+	"log"
+	"os"
+	"os/signal"
+	"path/filepath"
+	"syscall"
+
+	"github.com/toolkits/pkg/i18n"
+
+	"github.com/ccfos/nightingale/v6/ibex/agentd/config"
+	"github.com/ccfos/nightingale/v6/ibex/agentd/router"
+	"github.com/ccfos/nightingale/v6/ibex/agentd/timer"
+	"github.com/ccfos/nightingale/v6/pkg/httpx"
+)
+
+type Agentd struct {
+	ConfigFile string
+	Version    string
+}
+
+type AgentdOption func(*Agentd)
+
+func SetConfigFile(f string) AgentdOption {
+	return func(s *Agentd) {
+		s.ConfigFile = f
+	}
+}
+
+func SetVersion(v string) AgentdOption {
+	return func(s *Agentd) {
+		s.Version = v
+	}
+}
+
+// Run run agentd
+func Run(opts ...AgentdOption) {
+	code := 1
+	sc := make(chan os.Signal, 1)
+	signal.Notify(sc, syscall.SIGHUP, syscall.SIGINT, syscall.SIGTERM, syscall.SIGQUIT)
+
+	agentd := Agentd{
+		ConfigFile: filepath.Join("etc", "ibex", "agentd.toml"),
+		Version:    "not specified",
+	}
+
+	for _, opt := range opts {
+		opt(&agentd)
+	}
+
+	cleanFunc, err := agentd.initialize()
+	if err != nil {
+		fmt.Println("agentd init fail:", err)
+		os.Exit(code)
+	}
+
+EXIT:
+	for {
+		sig := <-sc
+		fmt.Println("received signal:", sig.String())
+		switch sig {
+		case syscall.SIGQUIT, syscall.SIGTERM, syscall.SIGINT:
+			code = 0
+			break EXIT
+		case syscall.SIGHUP:
+			// reload configuration?
+		default:
+			break EXIT
+		}
+	}
+
+	cleanFunc()
+	fmt.Println("agentd exited")
+	os.Exit(code)
+}
+
+func (s Agentd) initialize() (func(), error) {
+	fns := Functions{}
+	ctx, cancel := context.WithCancel(context.Background())
+	fns.Add(cancel)
+
+	log.SetFlags(log.Ldate | log.Ltime | log.Lshortfile)
+
+	// parse config file
+	config.MustLoad(s.ConfigFile)
+
+	// init i18n
+	i18n.Init()
+
+	// init http server
+	r := router.New(s.Version)
+	httpClean := httpx.Init(config.C.HTTP, ctx, r)
+	fns.Add(httpClean)
+
+	go timer.Heartbeat(ctx)
+
+	return fns.Ret(), nil
+}
+
+type Functions struct {
+	List []func()
+}
+
+func (fs *Functions) Add(f func()) {
+	fs.List = append(fs.List, f)
+}
+
+func (fs *Functions) Ret() func() {
+	return func() {
+		for i := 0; i < len(fs.List); i++ {
+			fs.List[i]()
+		}
+	}
+}

ibex/agentd/client/cli.go

@@ -0,0 +1,110 @@
+package client
+
+import (
+	"bufio"
+	"io"
+	"log"
+	"net"
+	"net/rpc"
+	"reflect"
+	"time"
+
+	"github.com/toolkits/pkg/net/gobrpc"
+	"github.com/ugorji/go/codec"
+
+	"github.com/ccfos/nightingale/v6/ibex/agentd/config"
+)
+
+var cli *gobrpc.RPCClient
+
+func getCli() *gobrpc.RPCClient {
+	if cli != nil {
+		return cli
+	}
+
+	// detect the fastest server
+	var (
+		address  string
+		client   *rpc.Client
+		duration int64 = 999999999999
+	)
+
+	// auto close other slow server
+	acm := make(map[string]*rpc.Client)
+
+	l := len(config.C.Heartbeat.Servers)
+	for i := 0; i < l; i++ {
+		addr := config.C.Heartbeat.Servers[i]
+		begin := time.Now()
+		conn, err := net.DialTimeout("tcp", addr, time.Second*5)
+		if err != nil {
+			log.Printf("W: dial %s fail: %s", addr, err)
+			continue
+		}
+
+		var bufConn = struct {
+			io.Closer
+			*bufio.Reader
+			*bufio.Writer
+		}{conn, bufio.NewReader(conn), bufio.NewWriter(conn)}
+
+		var mh codec.MsgpackHandle
+		mh.MapType = reflect.TypeOf(map[string]interface{}(nil))
+
+		rpcCodec := codec.MsgpackSpecRpc.ClientCodec(bufConn, &mh)
+		c := rpc.NewClientWithCodec(rpcCodec)
+
+		acm[addr] = c
+
+		var out string
+		err = c.Call("Server.Ping", "", &out)
+		if err != nil {
+			log.Printf("W: ping %s fail: %s", addr, err)
+			continue
+		}
+		use := time.Since(begin).Nanoseconds()
+
+		if use < duration {
+			address = addr
+			client = c
+			duration = use
+		}
+	}
+
+	if address == "" {
+		log.Println("E: no job server found")
+		return nil
+	}
+
+	log.Printf("I: choose server: %s, duration: %dms", address, duration/1000000)
+
+	for addr, c := range acm {
+		if addr == address {
+			continue
+		}
+		c.Close()
+	}
+
+	cli = gobrpc.NewRPCClient(address, client, 5*time.Second)
+	return cli
+}
+
+// GetCli 探测所有server端的延迟，自动选择最快的
+func GetCli() *gobrpc.RPCClient {
+	for {
+		c := getCli()
+		if c != nil {
+			return c
+		}
+
+		time.Sleep(time.Second * 10)
+	}
+}
+
+// CloseCli 关闭客户端连接
+func CloseCli() {
+	if cli != nil {
+		cli.Close()
+		cli = nil
+	}
+}

ibex/agentd/client/meta.go

@@ -0,0 +1,31 @@
+package client
+
+import (
+	"fmt"
+	"log"
+
+	"github.com/ccfos/nightingale/v6/ibex/types"
+)
+
+// Meta 从Server端获取任务元信息
+func Meta(id int64) (script string, args string, account string, stdin string, err error) {
+	var resp types.TaskMetaResponse
+	err = GetCli().Call("Server.GetTaskMeta", id, &resp)
+	if err != nil {
+		log.Println("E: rpc call Server.GetTaskMeta:", err)
+		CloseCli()
+		return
+	}
+
+	if resp.Message != "" {
+		log.Println("E: rpc call Server.GetTaskMeta:", resp.Message)
+		err = fmt.Errorf(resp.Message)
+		return
+	}
+
+	script = resp.Script
+	args = resp.Args
+	account = resp.Account
+	stdin = resp.Stdin
+	return
+}

ibex/agentd/config/config.go

@@ -0,0 +1,140 @@
+package config
+
+import (
+	"fmt"
+	"log"
+	"net"
+	"os"
+	"strings"
+	"sync"
+
+	"github.com/koding/multiconfig"
+	"github.com/toolkits/pkg/file"
+
+	"github.com/ccfos/nightingale/v6/pkg/httpx"
+)
+
+var (
+	C    = new(Config)
+	once sync.Once
+)
+
+func MustLoad(fpaths ...string) {
+	once.Do(func() {
+		loaders := []multiconfig.Loader{
+			&multiconfig.TagLoader{},
+			&multiconfig.EnvironmentLoader{},
+		}
+
+		for _, fpath := range fpaths {
+			handled := false
+
+			if strings.HasSuffix(fpath, "toml") {
+				loaders = append(loaders, &multiconfig.TOMLLoader{Path: fpath})
+				handled = true
+			}
+			if strings.HasSuffix(fpath, "conf") {
+				loaders = append(loaders, &multiconfig.TOMLLoader{Path: fpath})
+				handled = true
+			}
+			if strings.HasSuffix(fpath, "json") {
+				loaders = append(loaders, &multiconfig.JSONLoader{Path: fpath})
+				handled = true
+			}
+			if strings.HasSuffix(fpath, "yaml") {
+				loaders = append(loaders, &multiconfig.YAMLLoader{Path: fpath})
+				handled = true
+			}
+
+			if !handled {
+				fmt.Println("config file invalid, valid file exts: .conf,.yaml,.toml,.json")
+				os.Exit(1)
+			}
+		}
+
+		m := multiconfig.DefaultLoader{
+			Loader:    multiconfig.MultiLoader(loaders...),
+			Validator: multiconfig.MultiValidator(&multiconfig.RequiredValidator{}),
+		}
+
+		m.MustLoad(C)
+
+		if C.Heartbeat.Host == "" {
+			fmt.Println("heartbeat.host is blank")
+			os.Exit(1)
+		}
+
+		if C.Heartbeat.Host == "$ip" {
+			C.Heartbeat.Endpoint = fmt.Sprint(GetOutboundIP())
+			if C.Heartbeat.Endpoint == "" {
+				fmt.Println("ip auto got is blank")
+				os.Exit(1)
+			}
+			fmt.Println("host.ip:", C.Heartbeat.Endpoint)
+		}
+
+		host, err := C.GetHost()
+		if err != nil {
+			log.Println("E: failed to GetHost:", err)
+			os.Exit(1)
+		}
+
+		fmt.Println("host:", host)
+
+		if C.MetaDir == "" {
+			C.MetaDir = "./meta"
+		}
+
+		C.MetaDir, err = file.RealPath(C.MetaDir)
+		if err != nil {
+			log.Println("E: failed to get real path of MetaDir:", err)
+			os.Exit(1)
+		}
+		file.EnsureDir(C.MetaDir)
+		file.EnsureDirRW(C.MetaDir)
+	})
+}
+
+type Config struct {
+	RunMode   string
+	MetaDir   string
+	Heartbeat Heartbeat
+	HTTP      httpx.Config
+}
+
+type Heartbeat struct {
+	Interval int64
+	Servers  []string
+	Host     string
+	Endpoint string
+}
+
+func (c *Config) IsDebugMode() bool {
+	return c.RunMode == "debug"
+}
+
+func (c *Config) GetHost() (string, error) {
+	if c.Heartbeat.Host == "$ip" {
+		return c.Heartbeat.Endpoint, nil
+	}
+
+	if c.Heartbeat.Host == "$hostname" {
+		return os.Hostname()
+	}
+
+	return c.Heartbeat.Host, nil
+}
+
+// Get preferred outbound ip of this machine
+func GetOutboundIP() net.IP {
+	conn, err := net.Dial("udp", "8.8.8.8:80")
+	if err != nil {
+		fmt.Println("auto get outbound ip fail:", err)
+		os.Exit(1)
+	}
+	defer conn.Close()
+
+	localAddr := conn.LocalAddr().(*net.UDPAddr)
+
+	return localAddr.IP
+}

ibex/agentd/router/router.go

@@ -0,0 +1,60 @@
+package router
+
+import (
+	"fmt"
+	"os"
+	"strings"
+
+	"github.com/gin-contrib/pprof"
+	"github.com/gin-gonic/gin"
+
+	"github.com/ccfos/nightingale/v6/ibex/agentd/config"
+	"github.com/ccfos/nightingale/v6/pkg/aop"
+)
+
+func New(version string) *gin.Engine {
+	gin.SetMode(config.C.RunMode)
+
+	loggerMid := aop.Logger()
+	recoveryMid := aop.Recovery()
+
+	if strings.ToLower(config.C.RunMode) == "release" {
+		aop.DisableConsoleColor()
+	}
+
+	r := gin.New()
+
+	r.Use(recoveryMid)
+
+	// whether print access log
+	if config.C.HTTP.PrintAccessLog {
+		r.Use(loggerMid)
+	}
+
+	configRoute(r, version)
+
+	return r
+}
+
+func configRoute(r *gin.Engine, version string) {
+	if config.C.HTTP.PProf {
+		pprof.Register(r, "/debug/pprof")
+	}
+
+	r.GET("/ping", func(c *gin.Context) {
+		c.String(200, "pong")
+	})
+
+	r.GET("/pid", func(c *gin.Context) {
+		c.String(200, fmt.Sprintf("%d", os.Getpid()))
+	})
+
+	r.GET("/addr", func(c *gin.Context) {
+		c.String(200, c.Request.RemoteAddr)
+	})
+
+	r.GET("/version", func(c *gin.Context) {
+		c.String(200, version)
+	})
+
+}

ibex/agentd/timer/cmd_nix.go

@@ -0,0 +1,18 @@
+//go:build !windows
+// +build !windows
+
+package timer
+
+import (
+	"os/exec"
+	"syscall"
+)
+
+func CmdStart(cmd *exec.Cmd) error {
+	cmd.SysProcAttr = &syscall.SysProcAttr{Setpgid: true}
+	return cmd.Start()
+}
+
+func CmdKill(cmd *exec.Cmd) error {
+	return syscall.Kill(-cmd.Process.Pid, syscall.SIGKILL)
+}

ibex/agentd/timer/cmd_windows.go

@@ -0,0 +1,16 @@
+//go:build windows
+// +build windows
+
+package timer
+
+import (
+	"os/exec"
+)
+
+func CmdStart(cmd *exec.Cmd) error {
+	return cmd.Start()
+}
+
+func CmdKill(cmd *exec.Cmd) error {
+	return cmd.Process.Kill()
+}

ibex/agentd/timer/heartbeat.go

@@ -0,0 +1,74 @@
+package timer
+
+import (
+	"context"
+	"log"
+	"time"
+
+	"github.com/ccfos/nightingale/v6/ibex/agentd/client"
+	"github.com/ccfos/nightingale/v6/ibex/agentd/config"
+	"github.com/ccfos/nightingale/v6/ibex/types"
+)
+
+func Heartbeat(ctx context.Context) {
+	interval := time.Duration(config.C.Heartbeat.Interval) * time.Millisecond
+	for {
+		select {
+		case <-ctx.Done():
+			return
+		case <-time.After(interval):
+			heartbeat()
+		}
+	}
+}
+
+func heartbeat() {
+	ident, err := config.C.GetHost()
+	if err != nil {
+		log.Println("E: GetHost fail:", err)
+		return
+	}
+
+	req := types.ReportRequest{
+		Ident:       ident,
+		ReportTasks: Locals.ReportTasks(),
+	}
+
+	var resp types.ReportResponse
+	err = client.GetCli().Call("Server.Report", req, &resp)
+	if err != nil {
+		log.Println("E: rpc call Server.Report fail:", err)
+		client.CloseCli()
+		return
+	}
+
+	if resp.Message != "" {
+		log.Println("E: error from server:", resp.Message)
+		return
+	}
+
+	assigned := make(map[int64]struct{})
+
+	if resp.AssignTasks != nil {
+		count := len(resp.AssignTasks)
+		for i := 0; i < count; i++ {
+			at := resp.AssignTasks[i]
+			assigned[at.Id] = struct{}{}
+			Locals.AssignTask(at)
+		}
+	}
+
+	if len(assigned) > 0 {
+		log.Println("D: assigned tasks:", mapKeys(assigned))
+	}
+
+	Locals.Clean(assigned)
+}
+
+func mapKeys(m map[int64]struct{}) []int64 {
+	lst := make([]int64, 0, len(m))
+	for k := range m {
+		lst = append(lst, k)
+	}
+	return lst
+}

ibex/agentd/timer/task.go

@@ -0,0 +1,333 @@
+package timer
+
+import (
+	"bytes"
+	"fmt"
+	"log"
+	"os/exec"
+	"os/user"
+	"path"
+	"strings"
+	"sync"
+
+	"github.com/toolkits/pkg/file"
+	"github.com/toolkits/pkg/runner"
+	"github.com/toolkits/pkg/sys"
+
+	"github.com/ccfos/nightingale/v6/ibex/agentd/client"
+	"github.com/ccfos/nightingale/v6/ibex/agentd/config"
+)
+
+type Task struct {
+	sync.Mutex
+
+	Id     int64
+	Clock  int64
+	Action string
+	Status string
+
+	alive  bool
+	Cmd    *exec.Cmd
+	Stdout bytes.Buffer
+	Stderr bytes.Buffer
+	Stdin  *bytes.Reader
+
+	Args     string
+	Account  string
+	StdinStr string
+}
+
+func (t *Task) SetStatus(status string) {
+	t.Lock()
+	t.Status = status
+	t.Unlock()
+}
+
+func (t *Task) GetStatus() string {
+	t.Lock()
+	s := t.Status
+	t.Unlock()
+	return s
+}
+
+func (t *Task) GetAlive() bool {
+	t.Lock()
+	pa := t.alive
+	t.Unlock()
+	return pa
+}
+
+func (t *Task) SetAlive(pa bool) {
+	t.Lock()
+	t.alive = pa
+	t.Unlock()
+}
+
+func (t *Task) GetStdout() string {
+	t.Lock()
+	out := t.Stdout.String()
+	t.Unlock()
+	return out
+}
+
+func (t *Task) GetStderr() string {
+	t.Lock()
+	out := t.Stderr.String()
+	t.Unlock()
+	return out
+}
+
+func (t *Task) ResetBuff() {
+	t.Lock()
+	t.Stdout.Reset()
+	t.Stderr.Reset()
+	t.Unlock()
+}
+
+func (t *Task) doneBefore() bool {
+	doneFlag := path.Join(config.C.MetaDir, fmt.Sprint(t.Id), fmt.Sprintf("%d.done", t.Clock))
+	return file.IsExist(doneFlag)
+}
+
+func (t *Task) loadResult() {
+	metadir := config.C.MetaDir
+
+	doneFlag := path.Join(metadir, fmt.Sprint(t.Id), fmt.Sprintf("%d.done", t.Clock))
+	stdoutFile := path.Join(metadir, fmt.Sprint(t.Id), "stdout")
+	stderrFile := path.Join(metadir, fmt.Sprint(t.Id), "stderr")
+
+	var err error
+
+	t.Status, err = file.ReadStringTrim(doneFlag)
+	if err != nil {
+		log.Printf("E: read file %s fail %v", doneFlag, err)
+	}
+	stdout, err := file.ReadString(stdoutFile)
+	if err != nil {
+		log.Printf("E: read file %s fail %v", stdoutFile, err)
+	}
+	stderr, err := file.ReadString(stderrFile)
+	if err != nil {
+		log.Printf("E: read file %s fail %v", stderrFile, err)
+	}
+
+	t.Stdout = *bytes.NewBufferString(stdout)
+	t.Stderr = *bytes.NewBufferString(stderr)
+}
+
+func (t *Task) prepare() error {
+	if t.Account != "" {
+		// already prepared
+		return nil
+	}
+
+	IdDir := path.Join(config.C.MetaDir, fmt.Sprint(t.Id))
+	err := file.EnsureDir(IdDir)
+	if err != nil {
+		log.Printf("E: mkdir -p %s fail: %v", IdDir, err)
+		return err
+	}
+
+	writeFlag := path.Join(IdDir, ".write")
+	if file.IsExist(writeFlag) {
+		// 从磁盘读取
+		argsFile := path.Join(IdDir, "args")
+		args, err := file.ReadStringTrim(argsFile)
+		if err != nil {
+			log.Printf("E: read %s fail %v", argsFile, err)
+			return err
+		}
+
+		accountFile := path.Join(IdDir, "account")
+		account, err := file.ReadStringTrim(accountFile)
+		if err != nil {
+			log.Printf("E: read %s fail %v", accountFile, err)
+			return err
+		}
+
+		stdinFile := path.Join(IdDir, "stdin")
+		stdin, err := file.ReadStringTrim(stdinFile)
+		if err != nil {
+			log.Printf("E: read %s fail %v", stdinFile, err)
+			return err
+		}
+
+		t.Args = args
+		t.Account = account
+		t.StdinStr = stdin
+
+	} else {
+		// 从远端读取，再写入磁盘
+		script, args, account, stdin, err := client.Meta(t.Id)
+		if err != nil {
+			log.Println("E: query task meta fail:", err)
+			return err
+		}
+
+		scriptFile := path.Join(IdDir, "script")
+		_, err = file.WriteString(scriptFile, script)
+		if err != nil {
+			log.Printf("E: write script to %s fail: %v", scriptFile, err)
+			return err
+		}
+
+		out, err := sys.CmdOutTrim("chmod", "+x", scriptFile)
+		if err != nil {
+			log.Printf("E: chmod +x %s fail %v. output: %s", scriptFile, err, out)
+			return err
+		}
+
+		argsFile := path.Join(IdDir, "args")
+		_, err = file.WriteString(argsFile, args)
+		if err != nil {
+			log.Printf("E: write args to %s fail: %v", argsFile, err)
+			return err
+		}
+
+		accountFile := path.Join(IdDir, "account")
+		_, err = file.WriteString(accountFile, account)
+		if err != nil {
+			log.Printf("E: write account to %s fail: %v", accountFile, err)
+			return err
+		}
+
+		stdinFile := path.Join(IdDir, "stdin")
+		_, err = file.WriteString(stdinFile, stdin)
+		if err != nil {
+			log.Printf("E: write tags to %s fail: %v", stdinFile, err)
+			return err
+		}
+
+		_, err = file.WriteString(writeFlag, "")
+		if err != nil {
+			log.Printf("E: create %s flag file fail: %v", writeFlag, err)
+			return err
+		}
+
+		t.Args = args
+		t.Account = account
+		t.StdinStr = stdin
+	}
+
+	t.Stdin = bytes.NewReader([]byte(t.StdinStr))
+
+	return nil
+}
+
+func (t *Task) start() {
+	if t.GetAlive() {
+		return
+	}
+
+	err := t.prepare()
+	if err != nil {
+		return
+	}
+
+	args := t.Args
+	if args != "" {
+		args = strings.Replace(args, ",,", "' '", -1)
+		args = "'" + args + "'"
+	}
+
+	scriptFile := path.Join(config.C.MetaDir, fmt.Sprint(t.Id), "script")
+	if !path.IsAbs(scriptFile) {
+		scriptFile = path.Join(runner.Cwd, scriptFile)
+	}
+
+	sh := fmt.Sprintf("%s %s", scriptFile, args)
+	var cmd *exec.Cmd
+
+	loginUser, err := user.Current()
+	if err != nil {
+		log.Println("E: cannot get current login user:", err)
+		return
+	}
+
+	if loginUser.Username == "root" {
+		// current login user is root
+		if t.Account == "root" {
+			cmd = exec.Command("sh", "-c", sh)
+			cmd.Dir = loginUser.HomeDir
+		} else {
+			cmd = exec.Command("su", "-c", sh, "-", t.Account)
+		}
+	} else {
+		// current login user not root
+		cmd = exec.Command("sh", "-c", sh)
+		cmd.Dir = loginUser.HomeDir
+	}
+
+	cmd.Stdout = &t.Stdout
+	cmd.Stderr = &t.Stderr
+	cmd.Stdin = t.Stdin
+
+	t.Cmd = cmd
+
+	err = CmdStart(cmd)
+	if err != nil {
+		log.Printf("E: cannot start cmd of task[%d]: %v", t.Id, err)
+		return
+	}
+
+	go runProcess(t)
+}
+
+func (t *Task) kill() {
+	go killProcess(t)
+}
+
+func runProcess(t *Task) {
+	t.SetAlive(true)
+	defer t.SetAlive(false)
+
+	err := t.Cmd.Wait()
+	if err != nil {
+		if strings.Contains(err.Error(), "signal: killed") {
+			t.SetStatus("killed")
+			log.Printf("D: process of task[%d] killed", t.Id)
+		} else if strings.Contains(err.Error(), "signal: terminated") {
+			// kill children process manually
+			t.SetStatus("killed")
+			log.Printf("D: process of task[%d] terminated", t.Id)
+		} else {
+			t.SetStatus("failed")
+			log.Printf("D: process of task[%d] return error: %v", t.Id, err)
+		}
+	} else {
+		t.SetStatus("success")
+		log.Printf("D: process of task[%d] done", t.Id)
+	}
+
+	persistResult(t)
+}
+
+func persistResult(t *Task) {
+	metadir := config.C.MetaDir
+
+	stdout := path.Join(metadir, fmt.Sprint(t.Id), "stdout")
+	stderr := path.Join(metadir, fmt.Sprint(t.Id), "stderr")
+	doneFlag := path.Join(metadir, fmt.Sprint(t.Id), fmt.Sprintf("%d.done", t.Clock))
+
+	file.WriteString(stdout, t.GetStdout())
+	file.WriteString(stderr, t.GetStderr())
+	file.WriteString(doneFlag, t.GetStatus())
+}
+
+func killProcess(t *Task) {
+	t.SetAlive(true)
+	defer t.SetAlive(false)
+
+	log.Printf("D: begin kill process of task[%d]", t.Id)
+
+	err := CmdKill(t.Cmd)
+	if err != nil {
+		t.SetStatus("killfailed")
+		log.Printf("D: kill process of task[%d] fail: %v", t.Id, err)
+	} else {
+		t.SetStatus("killed")
+		log.Printf("D: process of task[%d] killed", t.Id)
+	}
+
+	persistResult(t)
+}

ibex/agentd/timer/tasks.go

@@ -0,0 +1,120 @@
+package timer
+
+import (
+	"log"
+
+	"github.com/ccfos/nightingale/v6/ibex/types"
+)
+
+type LocalTasksT struct {
+	M map[int64]*Task
+}
+
+var Locals = &LocalTasksT{M: make(map[int64]*Task)}
+
+func (lt *LocalTasksT) ReportTasks() []types.ReportTask {
+	ret := make([]types.ReportTask, 0, len(lt.M))
+	for id, t := range lt.M {
+		rt := types.ReportTask{Id: id, Clock: t.Clock}
+
+		rt.Status = t.GetStatus()
+		if rt.Status == "running" || rt.Status == "killing" {
+			// intermediate state
+			continue
+		}
+
+		rt.Stdout = t.GetStdout()
+		rt.Stderr = t.GetStderr()
+
+		stdoutLen := len(rt.Stdout)
+		stderrLen := len(rt.Stderr)
+
+		// 输出太长的话，截断，要不然把数据库撑爆了
+		if stdoutLen > 65535 {
+			start := stdoutLen - 65535
+			rt.Stdout = rt.Stdout[start:]
+		}
+
+		if stderrLen > 65535 {
+			start := stderrLen - 65535
+			rt.Stderr = rt.Stderr[start:]
+		}
+
+		ret = append(ret, rt)
+	}
+
+	return ret
+}
+
+func (lt *LocalTasksT) GetTask(id int64) (*Task, bool) {
+	t, found := lt.M[id]
+	return t, found
+}
+
+func (lt *LocalTasksT) SetTask(t *Task) {
+	lt.M[t.Id] = t
+}
+
+func (lt *LocalTasksT) AssignTask(at types.AssignTask) {
+	local, found := lt.GetTask(at.Id)
+	if found {
+		if local.Clock == at.Clock && local.Action == at.Action {
+			// ignore repeat task
+			return
+		}
+
+		local.Clock = at.Clock
+		local.Action = at.Action
+	} else {
+		if at.Action == "kill" {
+			// no process in local, no need kill
+			return
+		}
+		local = &Task{
+			Id:     at.Id,
+			Clock:  at.Clock,
+			Action: at.Action,
+		}
+		lt.SetTask(local)
+
+		if local.doneBefore() {
+			local.loadResult()
+			return
+		}
+	}
+
+	if local.Action == "kill" {
+		local.SetStatus("killing")
+		local.kill()
+	} else if local.Action == "start" {
+		local.SetStatus("running")
+		local.start()
+	} else {
+		log.Printf("W: unknown action: %s of task %d", at.Action, at.Id)
+	}
+}
+
+func (lt *LocalTasksT) Clean(assigned map[int64]struct{}) {
+	del := make(map[int64]struct{})
+
+	for id := range lt.M {
+		if _, found := assigned[id]; !found {
+			del[id] = struct{}{}
+		}
+	}
+
+	for id := range del {
+		// 远端已经不关注这个任务了，但是本地来看，任务还是running的
+		// 可能是远端认为超时了，此时本地不能删除，仍然要继续上报
+		if lt.M[id].GetStatus() == "running" {
+			continue
+		}
+
+		lt.M[id].ResetBuff()
+		cmd := lt.M[id].Cmd
+		delete(lt.M, id)
+		if cmd != nil && cmd.Process != nil {
+			cmd.Process.Release()
+		}
+	}
+}

ibex/ibex.go

@@ -0,0 +1,82 @@
+package ibex
+
+import (
+	"fmt"
+	"github.com/ccfos/nightingale/v6/pkg/ctx"
+	"os"
+	"strings"
+
+	"github.com/ccfos/nightingale/v6/ibex/server/config"
+	"github.com/ccfos/nightingale/v6/ibex/server/router"
+	"github.com/ccfos/nightingale/v6/ibex/server/rpc"
+	"github.com/ccfos/nightingale/v6/ibex/server/timer"
+	"github.com/ccfos/nightingale/v6/storage"
+
+	"github.com/ccfos/nightingale/v6/alert/aconf"
+	n9eRouter "github.com/ccfos/nightingale/v6/center/router"
+	"github.com/ccfos/nightingale/v6/conf"
+	n9eConf "github.com/ccfos/nightingale/v6/conf"
+	"github.com/gin-gonic/gin"
+	"github.com/redis/go-redis/v9"
+	"gorm.io/gorm"
+)
+
+var (
+	HttpPort int
+)
+
+func ServerStart(ctx *ctx.Context, isCenter bool, db *gorm.DB, rc redis.Cmdable, basicAuth gin.Accounts, heartbeat aconf.HeartbeatConfig,
+	api *n9eConf.CenterApi, r *gin.Engine, centerRouter *n9eRouter.Router, ibex conf.Ibex, httpPort int) {
+	config.C.IsCenter = isCenter
+	config.C.BasicAuth = make(gin.Accounts)
+	if len(basicAuth) > 0 {
+		config.C.BasicAuth = basicAuth
+	}
+
+	config.C.Heartbeat.IP = heartbeat.IP
+	config.C.Heartbeat.Interval = heartbeat.Interval
+	config.C.Heartbeat.LocalAddr = schedulerAddrGet(ibex.RPCListen)
+	HttpPort = httpPort
+
+	config.C.Output.ComeFrom = ibex.Output.ComeFrom
+	config.C.Output.AgtdPort = ibex.Output.AgtdPort
+
+	rou := router.NewRouter(ctx)
+
+	if centerRouter != nil {
+		rou.ConfigRouter(r, centerRouter)
+	} else {
+		rou.ConfigRouter(r)
+	}
+
+	ctx.Redis = rc
+	if err := storage.IdInit(ctx.Redis); err != nil {
+		fmt.Println("cannot init id generator: ", err)
+		os.Exit(1)
+	}
+
+	rpc.Start(ibex.RPCListen, ctx)
+
+	if isCenter {
+		go timer.Heartbeat(ctx)
+		go timer.Schedule(ctx)
+		go timer.CleanLong(ctx)
+	} else {
+		config.C.CenterApi = *api
+	}
+
+	timer.CacheHostDoing(ctx)
+	timer.ReportResult(ctx)
+}
+
+func schedulerAddrGet(rpcListen string) string {
+	ip := fmt.Sprint(config.GetOutboundIP())
+	if ip == "" {
+		fmt.Println("heartbeat ip auto got is blank")
+		os.Exit(1)
+	}
+
+	port := strings.Split(rpcListen, ":")[1]
+	localAddr := ip + ":" + port
+	return localAddr
+}

ibex/server/config/config.go

@@ -0,0 +1,135 @@
+package config
+
+import (
+	"fmt"
+	"net"
+	"os"
+	"strings"
+	"sync"
+
+	"github.com/ccfos/nightingale/v6/pkg/httpx"
+	"github.com/ccfos/nightingale/v6/pkg/logx"
+
+	"github.com/ccfos/nightingale/v6/conf"
+	"github.com/ccfos/nightingale/v6/pkg/ormx"
+	"github.com/ccfos/nightingale/v6/storage"
+	"github.com/gin-gonic/gin"
+	"github.com/koding/multiconfig"
+)
+
+var (
+	C    = new(Config)
+	once sync.Once
+)
+
+func MustLoad(fpaths ...string) {
+	once.Do(func() {
+		loaders := []multiconfig.Loader{
+			&multiconfig.TagLoader{},
+			&multiconfig.EnvironmentLoader{},
+		}
+
+		for _, fpath := range fpaths {
+			handled := false
+
+			if strings.HasSuffix(fpath, "toml") {
+				loaders = append(loaders, &multiconfig.TOMLLoader{Path: fpath})
+				handled = true
+			}
+			if strings.HasSuffix(fpath, "conf") {
+				loaders = append(loaders, &multiconfig.TOMLLoader{Path: fpath})
+				handled = true
+			}
+			if strings.HasSuffix(fpath, "json") {
+				loaders = append(loaders, &multiconfig.JSONLoader{Path: fpath})
+				handled = true
+			}
+			if strings.HasSuffix(fpath, "yaml") {
+				loaders = append(loaders, &multiconfig.YAMLLoader{Path: fpath})
+				handled = true
+			}
+
+			if !handled {
+				fmt.Println("config file invalid, valid file exts: .conf,.yaml,.toml,.json")
+				os.Exit(1)
+			}
+		}
+
+		m := multiconfig.DefaultLoader{
+			Loader:    multiconfig.MultiLoader(loaders...),
+			Validator: multiconfig.MultiValidator(&multiconfig.RequiredValidator{}),
+		}
+
+		m.MustLoad(C)
+
+		if C.Heartbeat.IP == "" {
+			// auto detect
+			C.Heartbeat.IP = fmt.Sprint(GetOutboundIP())
+
+			if C.Heartbeat.IP == "" {
+				fmt.Println("heartbeat ip auto got is blank")
+				os.Exit(1)
+			}
+		}
+
+		port := strings.Split(C.RPC.Listen, ":")[1]
+		endpoint := C.Heartbeat.IP + ":" + port
+		C.Heartbeat.LocalAddr = endpoint
+
+		// 正常情况肯定不是127.0.0.1，但是，如果就是单机部署，并且这个机器没有网络，比如本地调试并且本机没网的时候
+		// if C.Heartbeat.IP == "127.0.0.1" {
+		// 	fmt.Println("heartbeat ip is 127.0.0.1 and it is useless, so, exit")
+		// 	os.Exit(1)
+		// }
+
+		fmt.Println("heartbeat.ip:", C.Heartbeat.IP)
+		fmt.Printf("heartbeat.interval: %dms\n", C.Heartbeat.Interval)
+	})
+}
+
+type Config struct {
+	RunMode   string
+	RPC       RPC
+	Heartbeat Heartbeat
+	Output    Output
+	IsCenter  bool
+	CenterApi conf.CenterApi
+	Log       logx.Config
+	HTTP      httpx.Config
+	BasicAuth gin.Accounts
+	DB        ormx.DBConfig
+	Redis     storage.RedisConfig
+}
+
+type RPC struct {
+	Listen string
+}
+
+type Heartbeat struct {
+	IP        string
+	Interval  int64
+	LocalAddr string
+}
+
+type Output struct {
+	ComeFrom string
+	AgtdPort int
+}
+
+func (c *Config) IsDebugMode() bool {
+	return c.RunMode == "debug"
+}
+
+// Get preferred outbound ip of this machine
+func GetOutboundIP() net.IP {
+	conn, err := net.Dial("udp", "8.8.8.8:80")
+	if err != nil {
+		fmt.Println("auto get outbound ip fail:", err)
+		os.Exit(1)
+	}
+	defer conn.Close()
+
+	localAddr := conn.LocalAddr().(*net.UDPAddr)
+
+	return localAddr.IP
+}

ibex/server/logic/logic_scheduler.go

@@ -0,0 +1,144 @@
+package logic
+
+import (
+	"github.com/ccfos/nightingale/v6/models"
+	"github.com/ccfos/nightingale/v6/pkg/ctx"
+	"github.com/toolkits/pkg/logger"
+	"github.com/toolkits/pkg/slice"
+	"github.com/toolkits/pkg/str"
+)
+
+func ScheduleTask(ctx *ctx.Context, id int64) {
+	logger.Debugf("task[%d] scheduling...", id)
+
+	count, err := models.WaitingHostCount(ctx, id)
+	if err != nil {
+		logger.Errorf("cannot get task[%d] waiting host count: %v", id, err)
+		return
+	}
+
+	if count == 0 {
+		cleanDoneTask(ctx, id)
+		return
+	}
+
+	action, err := models.TaskActionGet(ctx, "id=?", id)
+	if err != nil {
+		logger.Errorf("cannot get task[%d] action: %v", id, err)
+		return
+	}
+
+	if action == nil {
+		logger.Errorf("[W] no action found of task[%d]", id)
+		return
+	}
+
+	switch action.Action {
+	case "start":
+		startTask(ctx, id, action)
+	case "pause":
+		return
+	case "cancel":
+		return
+	case "kill":
+		return
+	default:
+		logger.Errorf("unknown action: %s of task[%d]", action.Action, id)
+	}
+}
+
+func cleanDoneTask(ctx *ctx.Context, id int64) {
+	ingCount, err := models.IngStatusHostCount(ctx, id)
+	if err != nil {
+		logger.Errorf("cannot get task[%d] ing status host count: %v", id, err)
+		return
+	}
+
+	if ingCount > 0 {
+		return
+	}
+
+	err = models.CleanDoneTask(ctx, id)
+	if err != nil {
+		logger.Errorf("cannot clean done task[%d]: %v", id, err)
+	}
+
+	logger.Debugf("task[%d] done", id)
+}
+
+func startTask(ctx *ctx.Context, id int64, action *models.TaskAction) {
+	meta, err := models.TaskMetaGetByID(ctx, id)
+	if err != nil {
+		logger.Errorf("cannot get task[%d] meta: %v", id, err)
+		return
+	}
+
+	if meta == nil {
+		logger.Errorf("task[%d] meta lost", id)
+		return
+	}
+
+	count, err := models.UnexpectedHostCount(ctx, id)
+	if err != nil {
+		logger.Errorf("cannot get task[%d] unexpected host count: %v", id, err)
+		return
+	}
+
+	if count > int64(meta.Tolerance) {
+		err = action.Update(ctx, "pause")
+		if err != nil {
+			logger.Errorf("cannot update task[%d] action to 'pause': %v", id, err)
+		}
+
+		return
+	}
+
+	waitings, err := models.WaitingHostList(ctx, id)
+	if err != nil {
+		logger.Errorf("cannot get task[%d] waiting host: %v", id, err)
+		return
+	}
+
+	waitingsCount := len(waitings)
+	if waitingsCount == 0 {
+		return
+	}
+
+	doingsCount, err := models.TableRecordCount(ctx, models.TaskHostDoing{}.TableName(), "id=?", id)
+	if err != nil {
+		logger.Errorf("cannot get task[%d] doing host count: %v", id, err)
+		return
+	}
+
+	need := meta.Batch - int(doingsCount)
+	if meta.Batch == 0 {
+		need = waitingsCount
+	}
+
+	if need <= 0 {
+		return
+	}
+
+	if need > waitingsCount {
+		need = waitingsCount
+	}
+
+	arr := str.ParseCommaTrim(meta.Pause)
+	end := need
+	for i := 0; i < need; i++ {
+		if slice.ContainsString(arr, waitings[i].Host) {
+			end = i + 1
+			err = action.Update(ctx, "pause")
+			if err != nil {
+				logger.Errorf("cannot update task[%d] action to 'pause': %v", id, err)
+				return
+			}
+			break
+		}
+	}
+
+	err = models.RunWaitingHosts(ctx, waitings[:end])
+	if err != nil {
+		logger.Errorf("cannot run waiting hosts: %v", err)
+	}
+}

ibex/server/logic/logic_timeout.go

@@ -0,0 +1,45 @@
+package logic
+
+import (
+	"github.com/ccfos/nightingale/v6/models"
+	"github.com/ccfos/nightingale/v6/pkg/ctx"
+	"time"
+
+	"github.com/toolkits/pkg/logger"
+)
+
+func CheckTimeout(ctx *ctx.Context, id int64) {
+	meta, err := models.TaskMetaGetByID(ctx, id)
+	if err != nil {
+		logger.Errorf("cannot get task[%d] meta: %v", id, err)
+		return
+	}
+
+	if meta == nil {
+		logger.Errorf("task[%d] meta lost", id)
+		return
+	}
+
+	hosts, err := models.TableRecordGets[[]models.TaskHostDoing](ctx, models.TaskHostDoing{}.TableName(), "id=?", id)
+	if err != nil {
+		logger.Errorf("cannot get task[%d] doing host list: %v", id, err)
+		return
+	}
+
+	count := len(hosts)
+	if count == 0 {
+		return
+	}
+
+	// 3s: task dispatch duration: web -> db -> scheduler -> executor
+	timeout := int64(meta.Timeout + 3)
+	now := time.Now().Unix()
+	for i := 0; i < count; i++ {
+		if now-hosts[i].Clock > timeout {
+			err = models.MarkDoneStatus(ctx, hosts[i].Id, hosts[i].Clock, hosts[i].Host, "timeout", "", "")
+			if err != nil {
+				logger.Errorf("cannot mark task[%d] done status: %v", id, err)
+			}
+		}
+	}
+}

ibex/server/router/funcs.go

@@ -0,0 +1,40 @@
+package router
+
+import (
+	"github.com/ccfos/nightingale/v6/models"
+	"github.com/ccfos/nightingale/v6/pkg/ctx"
+	"net/http"
+	"strings"
+
+	"github.com/toolkits/pkg/errorx"
+)
+
+func TaskMeta(ctx *ctx.Context, id int64) *models.TaskMeta {
+	obj, err := models.TaskMetaGet(ctx, "id = ?", id)
+	errorx.Dangerous(err)
+
+	if obj == nil {
+		errorx.Bomb(http.StatusNotFound, "no such task meta")
+	}
+
+	return obj
+}
+
+func cleanHosts(formHosts []string) []string {
+	cnt := len(formHosts)
+	arr := make([]string, 0, cnt)
+	for i := 0; i < cnt; i++ {
+		item := strings.TrimSpace(formHosts[i])
+		if item == "" {
+			continue
+		}
+
+		if strings.HasPrefix(item, "#") {
+			continue
+		}
+
+		arr = append(arr, item)
+	}
+
+	return arr
+}

ibex/server/router/handler.go

@@ -0,0 +1,612 @@
+package router
+
+import (
+	"fmt"
+	"github.com/ccfos/nightingale/v6/models"
+	"github.com/ccfos/nightingale/v6/pkg/ctx"
+	"strconv"
+
+	"io/ioutil"
+	"net/http"
+	"time"
+
+	"github.com/ccfos/nightingale/v6/ibex/server/config"
+	"github.com/ccfos/nightingale/v6/storage"
+
+	"github.com/gin-gonic/gin"
+	"github.com/toolkits/pkg/errorx"
+	"github.com/toolkits/pkg/ginx"
+	"github.com/toolkits/pkg/logger"
+	"github.com/toolkits/pkg/slice"
+	"github.com/toolkits/pkg/str"
+)
+
+func (rou *Router) taskStdout(c *gin.Context) {
+	meta := TaskMeta(rou.ctx, UrlParamsInt64(c, "id"))
+	stdouts, err := meta.Stdouts(rou.ctx)
+	ginx.NewRender(c).Data(stdouts, err)
+}
+
+func (rou *Router) taskStderr(c *gin.Context) {
+	meta := TaskMeta(rou.ctx, UrlParamsInt64(c, "id"))
+	stderrs, err := meta.Stderrs(rou.ctx)
+	ginx.NewRender(c).Data(stderrs, err)
+}
+
+// TODO: 不能只判断task_action，还应该看所有的host执行情况
+func (rou *Router) taskState(c *gin.Context) {
+	action, err := models.TaskActionGet(rou.ctx, "id=?", UrlParamsInt64(c, "id"))
+	if err != nil {
+		ginx.NewRender(c).Data("", err)
+		return
+	}
+
+	state := "done"
+	if action != nil {
+		state = action.Action
+	}
+
+	ginx.NewRender(c).Data(state, err)
+}
+
+func (rou *Router) taskResult(c *gin.Context) {
+	id := UrlParamsInt64(c, "id")
+
+	hosts, err := models.TaskHostStatus(rou.ctx, id)
+	if err != nil {
+		errorx.Bomb(500, "load task hosts of %d occur error %v", id, err)
+	}
+
+	ss := make(map[string][]string)
+	total := len(hosts)
+	for i := 0; i < total; i++ {
+		s := hosts[i].Status
+		ss[s] = append(ss[s], hosts[i].Host)
+	}
+
+	ginx.NewRender(c).Data(ss, nil)
+}
+
+func (rou *Router) taskHostOutput(c *gin.Context) {
+	obj, err := models.TaskHostGet(rou.ctx, UrlParamsInt64(c, "id"), ginx.UrlParamStr(c, "host"))
+	ginx.NewRender(c).Data(obj, err)
+}
+
+func (rou *Router) taskHostStdout(c *gin.Context) {
+	id := UrlParamsInt64(c, "id")
+	host := ginx.UrlParamStr(c, "host")
+
+	if config.C.Output.ComeFrom == "database" || config.C.Output.ComeFrom == "" {
+		obj, err := models.TaskHostGet(rou.ctx, id, host)
+		ginx.NewRender(c).Data(obj.Stdout, err)
+		return
+	}
+
+	if config.C.Output.AgtdPort <= 0 || config.C.Output.AgtdPort > 65535 {
+		ginx.NewRender(c).Message(fmt.Errorf("remotePort(%d) invalid", config.C.Output.AgtdPort))
+		return
+	}
+
+	url := fmt.Sprintf("http://%s:%d/output/%d/stdout.json", host, config.C.Output.AgtdPort, id)
+	client := &http.Client{
+		CheckRedirect: func(req *http.Request, via []*http.Request) error {
+			return http.ErrUseLastResponse
+		},
+	}
+	resp, err := client.Get(url)
+	errorx.Dangerous(err)
+
+	defer resp.Body.Close()
+
+	bs, err := ioutil.ReadAll(resp.Body)
+	errorx.Dangerous(err)
+
+	c.Writer.Header().Set("Content-Type", "application/json; charset=UTF-8")
+	c.Writer.Write(bs)
+}
+
+func (rou *Router) taskHostStderr(c *gin.Context) {
+	id := UrlParamsInt64(c, "id")
+	host := ginx.UrlParamStr(c, "host")
+
+	if config.C.Output.ComeFrom == "database" || config.C.Output.ComeFrom == "" {
+		obj, err := models.TaskHostGet(rou.ctx, id, host)
+		ginx.NewRender(c).Data(obj.Stderr, err)
+		return
+	}
+
+	if config.C.Output.AgtdPort <= 0 || config.C.Output.AgtdPort > 65535 {
+		ginx.NewRender(c).Message(fmt.Errorf("remotePort(%d) invalid", config.C.Output.AgtdPort))
+		return
+	}
+
+	url := fmt.Sprintf("http://%s:%d/output/%d/stderr.json", host, config.C.Output.AgtdPort, id)
+	client := &http.Client{
+		CheckRedirect: func(req *http.Request, via []*http.Request) error {
+			return http.ErrUseLastResponse
+		},
+	}
+	resp, err := client.Get(url)
+	errorx.Dangerous(err)
+
+	defer resp.Body.Close()
+
+	bs, err := ioutil.ReadAll(resp.Body)
+	errorx.Dangerous(err)
+
+	c.Writer.Header().Set("Content-Type", "application/json; charset=UTF-8")
+	c.Writer.Write(bs)
+}
+
+func (rou *Router) taskStdoutTxt(c *gin.Context) {
+	id := UrlParamsInt64(c, "id")
+
+	meta, err := models.TaskMetaGet(rou.ctx, "id = ?", id)
+	if err != nil {
+		c.String(500, err.Error())
+		return
+	}
+
+	if meta == nil {
+		c.String(404, "no such task")
+		return
+	}
+
+	stdouts, err := meta.Stdouts(rou.ctx)
+	if err != nil {
+		c.String(500, err.Error())
+		return
+	}
+
+	w := c.Writer
+
+	w.Header().Set("Content-Type", "text/plain; charset=utf-8")
+	count := len(stdouts)
+	for i := 0; i < count; i++ {
+		if i != 0 {
+			w.Write([]byte("\n\n"))
+		}
+
+		w.Write([]byte(stdouts[i].Host + ":\n"))
+		w.Write([]byte(stdouts[i].Stdout))
+	}
+}
+
+func (rou *Router) taskStderrTxt(c *gin.Context) {
+	id := UrlParamsInt64(c, "id")
+
+	meta, err := models.TaskMetaGet(rou.ctx, "id = ?", id)
+	if err != nil {
+		c.String(500, err.Error())
+		return
+	}
+
+	if meta == nil {
+		c.String(404, "no such task")
+		return
+	}
+
+	stderrs, err := meta.Stderrs(rou.ctx)
+	if err != nil {
+		c.String(500, err.Error())
+		return
+	}
+
+	w := c.Writer
+
+	w.Header().Set("Content-Type", "text/plain; charset=utf-8")
+	count := len(stderrs)
+	for i := 0; i < count; i++ {
+		if i != 0 {
+			w.Write([]byte("\n\n"))
+		}
+
+		w.Write([]byte(stderrs[i].Host + ":\n"))
+		w.Write([]byte(stderrs[i].Stderr))
+	}
+}
+
+type TaskStdoutData struct {
+	Host   string `json:"host"`
+	Stdout string `json:"stdout"`
+}
+
+type TaskStderrData struct {
+	Host   string `json:"host"`
+	Stderr string `json:"stderr"`
+}
+
+func (rou *Router) taskStdoutJSON(c *gin.Context) {
+	task := TaskMeta(rou.ctx, UrlParamsInt64(c, "id"))
+
+	host := ginx.QueryStr(c, "host", "")
+
+	var hostsLen int
+	var ret []TaskStdoutData
+
+	if host != "" {
+		obj, err := models.TaskHostGet(rou.ctx, task.Id, host)
+		if err != nil {
+			ginx.NewRender(c).Data("", err)
+			return
+		} else if obj == nil {
+			ginx.NewRender(c).Data("", fmt.Errorf("task: %d, host(%s) not eixsts", task.Id, host))
+			return
+		} else {
+			ret = append(ret, TaskStdoutData{
+				Host:   host,
+				Stdout: obj.Stdout,
+			})
+		}
+	} else {
+		hosts, err := models.TaskHostGets(rou.ctx, task.Id)
+		if err != nil {
+			ginx.NewRender(c).Data("", err)
+			return
+		}
+
+		hostsLen = len(hosts)
+
+		ret = make([]TaskStdoutData, 0, hostsLen)
+		for i := 0; i < hostsLen; i++ {
+			ret = append(ret, TaskStdoutData{
+				Host:   hosts[i].Host,
+				Stdout: hosts[i].Stdout,
+			})
+		}
+	}
+
+	ginx.NewRender(c).Data(ret, nil)
+}
+
+func (rou *Router) taskStderrJSON(c *gin.Context) {
+	task := TaskMeta(rou.ctx, UrlParamsInt64(c, "id"))
+
+	host := ginx.QueryStr(c, "host", "")
+
+	var hostsLen int
+	var ret []TaskStderrData
+
+	if host != "" {
+		obj, err := models.TaskHostGet(rou.ctx, task.Id, host)
+		if err != nil {
+			ginx.NewRender(c).Data("", err)
+			return
+		} else if obj == nil {
+			ginx.NewRender(c).Data("", fmt.Errorf("task: %d, host(%s) not eixsts", task.Id, host))
+			return
+		} else {
+			ret = append(ret, TaskStderrData{
+				Host:   host,
+				Stderr: obj.Stderr,
+			})
+		}
+	} else {
+		hosts, err := models.TaskHostGets(rou.ctx, task.Id)
+		if err != nil {
+			ginx.NewRender(c).Data("", err)
+			return
+		}
+
+		hostsLen = len(hosts)
+
+		ret = make([]TaskStderrData, 0, hostsLen)
+		for i := 0; i < hostsLen; i++ {
+			ret = append(ret, TaskStderrData{
+				Host:   hosts[i].Host,
+				Stderr: hosts[i].Stderr,
+			})
+		}
+	}
+
+	ginx.NewRender(c).Data(ret, nil)
+}
+
+type taskForm struct {
+	Title          string   `json:"title" binding:"required"`
+	Account        string   `json:"account" binding:"required"`
+	Batch          int      `json:"batch"`
+	Tolerance      int      `json:"tolerance"`
+	Timeout        int      `json:"timeout"`
+	Pause          string   `json:"pause"`
+	Script         string   `json:"script" binding:"required"`
+	Args           string   `json:"args"`
+	Stdin          string   `json:"stdin"`
+	Action         string   `json:"action" binding:"required"`
+	Creator        string   `json:"creator" binding:"required"`
+	Hosts          []string `json:"hosts" binding:"required"`
+	AlertTriggered bool     `json:"alert_triggered"`
+}
+
+func (rou *Router) taskAdd(c *gin.Context) {
+	var f taskForm
+	ginx.BindJSON(c, &f)
+
+	hosts := cleanHosts(f.Hosts)
+	if len(hosts) == 0 {
+		errorx.Bomb(http.StatusBadRequest, "arg(hosts) empty")
+	}
+
+	taskMeta := &models.TaskMeta{
+		Title:     f.Title,
+		Account:   f.Account,
+		Batch:     f.Batch,
+		Tolerance: f.Tolerance,
+		Timeout:   f.Timeout,
+		Pause:     f.Pause,
+		Script:    f.Script,
+		Args:      f.Args,
+		Stdin:     f.Stdin,
+		Creator:   f.Creator,
+	}
+
+	err := taskMeta.CleanFields()
+	ginx.Dangerous(err)
+	taskMeta.HandleFH(hosts[0])
+
+	authUser := c.MustGet(gin.AuthUserKey).(string)
+	// 任务类型分为"告警规则触发"和"n9e center用户下发"两种；
+	// 边缘机房"告警规则触发"的任务不需要规划，并且它可能是失联的，无法使用db资源，所以放入redis缓存中，直接下发给agentd执行
+	if !config.C.IsCenter && f.AlertTriggered {
+		if err := taskMeta.Create(rou.ctx); err != nil {
+			// 当网络不连通时，生成唯一的id，防止边缘机房中不同任务的id相同；
+			// 方法是，redis自增id去防止同一个机房的不同n9e edge生成的id相同；
+			// 但没法防止不同边缘机房生成同样的id，所以，生成id的数据不会上报存入数据库，只用于闭环执行。
+			taskMeta.Id, err = storage.IdGet(rou.ctx.Redis)
+			ginx.Dangerous(err)
+		}
+		if err == nil {
+			taskHost := models.TaskHost{
+				Id:     taskMeta.Id,
+				Host:   hosts[0],
+				Status: "running",
+			}
+			if err = taskHost.Create(rou.ctx); err != nil {
+				logger.Warningf("task_add_fail: authUser=%s title=%s err=%s", authUser, taskMeta.Title, err.Error())
+			}
+		}
+
+		// 缓存任务元信息和待下发的任务
+		err = taskMeta.Cache(rou.ctx, hosts[0])
+		ginx.Dangerous(err)
+
+	} else {
+		// 如果是中心机房，还是保持之前的逻辑
+		err = taskMeta.Save(rou.ctx, hosts, f.Action)
+		ginx.Dangerous(err)
+	}
+
+	logger.Infof("task_add_succ: authUser=%s title=%s", authUser, taskMeta.Title)
+
+	ginx.NewRender(c).Data(taskMeta.Id, err)
+}
+
+func (rou *Router) taskGet(c *gin.Context) {
+	meta := TaskMeta(rou.ctx, UrlParamsInt64(c, "id"))
+
+	hosts, err := meta.Hosts(rou.ctx)
+	errorx.Dangerous(err)
+
+	action, err := meta.Action(rou.ctx)
+	errorx.Dangerous(err)
+
+	actionStr := ""
+	if action != nil {
+		actionStr = action.Action
+	} else {
+		meta.Done = true
+	}
+
+	ginx.NewRender(c).Data(gin.H{
+		"meta":   meta,
+		"hosts":  hosts,
+		"action": actionStr,
+	}, nil)
+}
+
+// 传进来一堆ids，返回已经done的任务的ids
+func (rou *Router) doneIds(c *gin.Context) {
+	ids := ginx.QueryStr(c, "ids", "")
+	if ids == "" {
+		errorx.Dangerous("arg(ids) empty")
+	}
+
+	idsint64 := str.IdsInt64(ids, ",")
+	if len(idsint64) == 0 {
+		errorx.Dangerous("arg(ids) empty")
+	}
+
+	exists, err := models.TaskActionExistsIds(rou.ctx, idsint64)
+	errorx.Dangerous(err)
+
+	dones := slice.SubInt64(idsint64, exists)
+	ginx.NewRender(c).Data(gin.H{
+		"list": dones,
+	}, nil)
+}
+
+func (rou *Router) taskGets(c *gin.Context) {
+	query := ginx.QueryStr(c, "query", "")
+	limit := ginx.QueryInt(c, "limit", 20)
+	creator := ginx.QueryStr(c, "creator", "")
+	days := ginx.QueryInt64(c, "days", 7)
+
+	before := time.Unix(time.Now().Unix()-days*24*3600, 0)
+
+	total, err := models.TaskMetaTotal(rou.ctx, creator, query, before)
+	errorx.Dangerous(err)
+
+	list, err := models.TaskMetaGets(rou.ctx, creator, query, before, limit, ginx.Offset(c, limit))
+	errorx.Dangerous(err)
+
+	cnt := len(list)
+	ids := make([]int64, cnt)
+	for i := 0; i < cnt; i++ {
+		ids[i] = list[i].Id
+	}
+
+	exists, err := models.TaskActionExistsIds(rou.ctx, ids)
+	errorx.Dangerous(err)
+
+	for i := 0; i < cnt; i++ {
+		if slice.ContainsInt64(exists, list[i].Id) {
+			list[i].Done = false
+		} else {
+			list[i].Done = true
+		}
+	}
+
+	ginx.NewRender(c).Data(gin.H{
+		"total": total,
+		"list":  list,
+	}, nil)
+}
+
+type actionForm struct {
+	Action string `json:"action"`
+}
+
+func (rou *Router) taskAction(c *gin.Context) {
+	meta := TaskMeta(rou.ctx, UrlParamsInt64(c, "id"))
+
+	var f actionForm
+	ginx.BindJSON(c, &f)
+
+	action, err := models.TaskActionGet(rou.ctx, "id=?", meta.Id)
+	errorx.Dangerous(err)
+
+	if action == nil {
+		errorx.Bomb(200, "task already finished, no more action can do")
+	}
+
+	ginx.NewRender(c).Message(action.Update(rou.ctx, f.Action))
+}
+
+func (rou *Router) taskHostAction(c *gin.Context) {
+	host := ginx.UrlParamStr(c, "host")
+	meta := TaskMeta(rou.ctx, UrlParamsInt64(c, "id"))
+
+	noopWhenDone(rou.ctx, meta.Id)
+
+	var f actionForm
+	ginx.BindJSON(c, &f)
+
+	if f.Action == "ignore" {
+		errorx.Dangerous(meta.IgnoreHost(rou.ctx, host))
+
+		action, err := models.TaskActionGet(rou.ctx, "id=?", meta.Id)
+		errorx.Dangerous(err)
+
+		if action != nil && action.Action == "pause" {
+			ginx.NewRender(c).Data("you can click start to run the task", nil)
+			return
+		}
+	}
+
+	if f.Action == "kill" {
+		errorx.Dangerous(meta.KillHost(rou.ctx, host))
+	}
+
+	if f.Action == "redo" {
+		errorx.Dangerous(meta.RedoHost(rou.ctx, host))
+	}
+
+	ginx.NewRender(c).Message(nil)
+}
+
+func noopWhenDone(ctx *ctx.Context, id int64) {
+	action, err := models.TaskActionGet(ctx, "id=?", id)
+	errorx.Dangerous(err)
+
+	if action == nil {
+		errorx.Bomb(200, "task already finished, no more taskAction can do")
+	}
+}
+
+type sqlCondForm struct {
+	Table string
+	Where string
+	Args  []interface{}
+}
+
+func (rou *Router) tableRecordListGet(c *gin.Context) {
+	var f sqlCondForm
+	ginx.BindJSON(c, &f)
+	switch f.Table {
+	case models.TaskHostDoing{}.TableName():
+		lst, err := models.TableRecordGets[[]models.TaskHostDoing](rou.ctx, f.Table, f.Where, f.Args)
+		ginx.NewRender(c).Data(lst, err)
+	case models.TaskMeta{}.TableName():
+		lst, err := models.TableRecordGets[[]models.TaskMeta](rou.ctx, f.Table, f.Where, f.Args)
+		ginx.NewRender(c).Data(lst, err)
+	default:
+		ginx.Bomb(http.StatusBadRequest, "table[%v] not support", f.Table)
+	}
+}
+
+func (rou *Router) tableRecordCount(c *gin.Context) {
+	var f sqlCondForm
+	ginx.BindJSON(c, &f)
+	ginx.NewRender(c).Data(models.TableRecordCount(rou.ctx, f.Table, f.Where, f.Args))
+}
+
+type markDoneForm struct {
+	Id     int64
+	Clock  int64
+	Host   string
+	Status string
+	Stdout string
+	Stderr string
+}
+
+func (rou *Router) markDone(c *gin.Context) {
+	var f markDoneForm
+	ginx.BindJSON(c, &f)
+	ginx.NewRender(c).Message(models.MarkDoneStatus(rou.ctx, f.Id, f.Clock, f.Host, f.Status, f.Stdout, f.Stderr))
+}
+
+func (rou *Router) taskMetaAdd(c *gin.Context) {
+	var f models.TaskMeta
+	ginx.BindJSON(c, &f)
+	err := f.Create(rou.ctx)
+	ginx.NewRender(c).Data(f.Id, err)
+}
+
+func (rou *Router) taskHostAdd(c *gin.Context) {
+	var f models.TaskHost
+	ginx.BindJSON(c, &f)
+	ginx.NewRender(c).Message(f.Upsert(rou.ctx))
+}
+
+func (rou *Router) taskHostUpsert(c *gin.Context) {
+	var f []models.TaskHost
+	ginx.BindJSON(c, &f)
+	ginx.NewRender(c).Data(models.TaskHostUpserts(rou.ctx, f))
+}
+
+func UrlParamsInt64(c *gin.Context, field string) int64 {
+
+	var params []gin.Param
+	for _, p := range c.Params {
+		if p.Key == "id" {
+			params = append(params, p)
+		}
+	}
+
+	var strval string
+	if len(params) == 1 {
+		strval = ginx.UrlParamStr(c, field)
+	} else if len(params) == 2 {
+		strval = params[1].Value
+	} else {
+		logger.Warningf("url param[%+v] not ok", params)
+		errorx.Bomb(http.StatusBadRequest, "url param[%s] is blank", field)
+	}
+
+	intval, err := strconv.ParseInt(strval, 10, 64)
+	if err != nil {
+		errorx.Bomb(http.StatusBadRequest, "cannot convert %s to int64", strval)
+	}
+
+	return intval
+}

ibex/server/router/router.go

@@ -0,0 +1,132 @@
+package router
+
+import (
+	"fmt"
+	"github.com/ccfos/nightingale/v6/pkg/ctx"
+
+	"os"
+	"strings"
+
+	"github.com/ccfos/nightingale/v6/ibex/server/config"
+	"github.com/ccfos/nightingale/v6/pkg/aop"
+
+	"github.com/ccfos/nightingale/v6/center/router"
+	"github.com/gin-contrib/pprof"
+	"github.com/gin-gonic/gin"
+)
+
+func New(ctx *ctx.Context, version string) *gin.Engine {
+	gin.SetMode(config.C.RunMode)
+
+	loggerMid := aop.Logger()
+	recoveryMid := aop.Recovery()
+
+	if strings.ToLower(config.C.RunMode) == "release" {
+		aop.DisableConsoleColor()
+	}
+
+	r := gin.New()
+
+	r.Use(recoveryMid)
+
+	// whether print access log
+	if config.C.HTTP.PrintAccessLog {
+		r.Use(loggerMid)
+	}
+
+	rou := NewRouter(ctx)
+
+	rou.configBaseRouter(r, version)
+	rou.ConfigRouter(r)
+
+	return r
+}
+
+type Router struct {
+	ctx *ctx.Context
+}
+
+func NewRouter(ctx *ctx.Context) *Router {
+	return &Router{
+		ctx: ctx,
+	}
+}
+
+func (rou *Router) configBaseRouter(r *gin.Engine, version string) {
+	if config.C.HTTP.PProf {
+		pprof.Register(r, "/debug/pprof")
+	}
+
+	r.GET("/ping", func(c *gin.Context) {
+		c.String(200, "pong")
+	})
+
+	r.GET("/pid", func(c *gin.Context) {
+		c.String(200, fmt.Sprintf("%d", os.Getpid()))
+	})
+
+	r.GET("/addr", func(c *gin.Context) {
+		c.String(200, c.Request.RemoteAddr)
+	})
+
+	r.GET("/version", func(c *gin.Context) {
+		c.String(200, version)
+	})
+}
+
+func (rou *Router) ConfigRouter(r *gin.Engine, rts ...*router.Router) {
+
+	if len(rts) > 0 {
+		rt := rts[0]
+		pagesPrefix := "/api/n9e/busi-group/:id"
+		pages := r.Group(pagesPrefix)
+		{
+			pages.GET("/task/:id", rt.Auth(), rt.User(), rt.Perm("/job-tasks"), rou.taskGet)
+			pages.PUT("/task/:id/action", rt.Auth(), rt.User(), rt.Perm("/job-tasks/put"), rt.Bgrw(), rou.taskAction)
+			pages.GET("/task/:id/stdout", rt.Auth(), rt.User(), rt.Perm("/job-tasks"), rou.taskStdout)
+			pages.GET("/task/:id/stderr", rt.Auth(), rt.User(), rt.Perm("/job-tasks"), rou.taskStderr)
+			pages.GET("/task/:id/state", rt.Auth(), rt.User(), rt.Perm("/job-tasks"), rou.taskState)
+			pages.GET("/task/:id/result", rt.Auth(), rt.User(), rt.Perm("/job-tasks"), rou.taskResult)
+			pages.PUT("/task/:id/host/:host/action", rt.Auth(), rt.User(), rt.Perm("/job-tasks/put"), rt.Bgrw(), rou.taskHostAction)
+			pages.GET("/task/:id/host/:host/output", rt.Auth(), rt.User(), rt.Perm("/job-tasks"), rou.taskHostOutput)
+			pages.GET("/task/:id/host/:host/stdout", rt.Auth(), rt.User(), rt.Perm("/job-tasks"), rou.taskHostStdout)
+			pages.GET("/task/:id/host/:host/stderr", rt.Auth(), rt.User(), rt.Perm("/job-tasks"), rou.taskHostStderr)
+			pages.GET("/task/:id/stdout.txt", rt.Auth(), rt.User(), rt.Perm("/job-tasks"), rou.taskStdoutTxt)
+			pages.GET("/task/:id/stderr.txt", rt.Auth(), rt.User(), rt.Perm("/job-tasks"), rou.taskStderrTxt)
+			pages.GET("/task/:id/stdout.json", rt.Auth(), rt.User(), rt.Perm("/job-tasks"), rou.taskStdoutJSON)
+			pages.GET("/task/:id/stderr.json", rt.Auth(), rt.User(), rt.Perm("/job-tasks"), rou.taskStderrJSON)
+		}
+	}
+
+	api := r.Group("/ibex/v1")
+	if len(config.C.BasicAuth) > 0 {
+		api = r.Group("/ibex/v1", gin.BasicAuth(config.C.BasicAuth))
+	}
+	{
+		api.POST("/tasks", rou.taskAdd)
+		api.GET("/tasks", rou.taskGets)
+		api.GET("/tasks/done-ids", rou.doneIds)
+		api.GET("/task/:id", rou.taskGet)
+		api.PUT("/task/:id/action", rou.taskAction)
+		api.GET("/task/:id/stdout", rou.taskStdout)
+		api.GET("/task/:id/stderr", rou.taskStderr)
+		api.GET("/task/:id/state", rou.taskState)
+		api.GET("/task/:id/result", rou.taskResult)
+		api.PUT("/task/:id/host/:host/action", rou.taskHostAction)
+		api.GET("/task/:id/host/:host/output", rou.taskHostOutput)
+		api.GET("/task/:id/host/:host/stdout", rou.taskHostStdout)
+		api.GET("/task/:id/host/:host/stderr", rou.taskHostStderr)
+		api.GET("/task/:id/stdout.txt", rou.taskStdoutTxt)
+		api.GET("/task/:id/stderr.txt", rou.taskStderrTxt)
+		api.GET("/task/:id/stdout.json", rou.taskStdoutJSON)
+		api.GET("/task/:id/stderr.json", rou.taskStderrJSON)
+
+		// api for edge server
+		api.POST("/table/record/list", rou.tableRecordListGet)
+		api.POST("/table/record/count", rou.tableRecordCount)
+		api.POST("/mark/done", rou.markDone)
+		api.POST("/task/meta", rou.taskMetaAdd)
+		api.POST("/task/host/", rou.taskHostAdd)
+		api.POST("/task/hosts/upsert", rou.taskHostUpsert)
+	}
+}