code refactor

* feat: Callback operation adds IM connection function (#1984)

* refactor: change alert sub callback

---------

Co-authored-by: Yang Zhiyan <101268302+Yziyan@users.noreply.github.com>

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -1,67 +0,0 @@
-name: Bug Report
-description: Report a bug encountered while running Nightingale
-labels: ["kind/bug"]
-
-body:
-  - type: markdown
-    attributes:
-      value: |
-        Thanks for taking time to fill out this bug report! 
-        The more detailed the form is filled in, the easier the problem will be solved.
-  - type: textarea
-    id: config
-    attributes:
-      label: Your config.toml
-      description: Place config in the toml code section. This will be automatically formatted into toml, so no need for backticks.
-      render: toml
-    validations:
-      required: true
-  - type: textarea
-    id: logs
-    attributes:
-      label: Relevant logs
-      description: categraf | telegraf | n9e | prometheus | chrome request/response ...
-      render: text
-    validations:
-      required: true
-  - type: input
-    id: system-info
-    attributes:
-      label: System info
-      description: Include nightingale version, operating system, and other relevant details
-      placeholder: ex. n9e 5.9.2, n9e-fe 5.5.0, categraf 0.1.0, Ubuntu 20.04, Docker 20.10.8
-    validations:
-      required: true
-  - type: textarea
-    id: reproduce
-    attributes:
-      label: Steps to reproduce
-      description: Describe the steps to reproduce the bug.
-      value: |
-        1.
-        2.
-        3.
-        ...
-    validations:
-      required: true
-  - type: textarea
-    id: expected-behavior
-    attributes:
-      label: Expected behavior
-      description: Describe what you expected to happen when you performed the above steps.
-    validations:
-      required: true
-  - type: textarea
-    id: actual-behavior
-    attributes:
-      label: Actual behavior
-      description: Describe what actually happened when you performed the above steps.
-    validations:
-      required: true
-  - type: textarea
-    id: additional-info
-    attributes:
-      label: Additional info
-      description: Include gist of relevant config, logs, etc.
-    validations:
-      required: false

.github/ISSUE_TEMPLATE/question.yml

@@ -0,0 +1,33 @@
+name: Bug Report & Usage Question
+description: Reporting a bug or asking a question about how to use Nightingale 
+labels: []
+
+body:
+  - type: markdown
+    attributes:
+      value: |
+        The more detailed the form is filled in, the easier the problem will be solved.
+        提供的信息越详细，问题解决的可能性就越大。另外, 提问之前请先搜索历史 issue (包括 close 的), 以免重复提问。
+  - type: textarea
+    id: question
+    attributes:
+      label: Question and Steps to reproduce
+      description: Describe your question and steps to reproduce the bug. 描述问题以及复现步骤
+    validations:
+      required: true
+  - type: textarea
+    id: logs
+    attributes:
+      label: Relevant logs and configurations
+      description: Relevant logs and configurations. 报错日志（[查看方法](https://flashcat.cloud/docs/content/flashcat-monitor/nightingale-v6/faq/how-to-check-logs/)）以及各个相关组件的配置信息
+      render: text
+    validations:
+      required: true
+  - type: textarea
+    id: system-info
+    attributes:
+      label: Version
+      description: Include nightingale version, operating system, and other relevant details. 请告知夜莺的版本、操作系统的版本、CPU架构等信息
+    validations:
+      required: true
+ 

.github/workflows/n9e.yml

@@ -26,7 +26,8 @@ jobs:
       - name: Run GoReleaser
         uses: goreleaser/goreleaser-action@v3
         with:
-          version: latest
+          distribution: goreleaser
+          version: '~> v1'
           args: release --rm-dist
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

README.md

@@ -36,7 +36,7 @@
 
 ## 快速开始
 - 👉[文档中心](https://flashcat.cloud/docs/) | [下载中心](https://flashcat.cloud/download/nightingale/)
-- ❤️[报告 Bug](https://github.com/ccfos/nightingale/issues/new?assignees=&labels=kind%2Fbug&projects=&template=bug_report.yml)
+- ❤️[报告 Bug](https://github.com/ccfos/nightingale/issues/new?assignees=&labels=&projects=&template=question.yml)
 - ℹ️为了提供更快速的访问体验，上述文档和下载站点托管于 [FlashcatCloud](https://flashcat.cloud)
 
 ## 功能特点
@@ -82,7 +82,7 @@
 
 - [ ] 仪表盘：支持内嵌 Grafana
 - [ ] 告警规则：通知时支持配置过滤标签，避免告警事件中一堆不重要的标签
-- [ ] 告警规则：支持配置恢复时的 Promql，告警恢复通知也可以带上恢复时的值了
+- [x] 告警规则：支持配置恢复时的 Promql，告警恢复通知也可以带上恢复时的值了
 - [ ] 机器管理：自定义标签拆分管理，agent 自动上报的标签和用户在页面自定义的标签分开管理，对于 agent 自动上报的标签，以 agent 为准，直接覆盖服务端 DB 中的数据
 - [ ] 机器管理：机器支持角色字段，即无头标签，用于描述混部场景
 - [ ] 机器管理：把业务组的 busigroup 标签迁移到机器的属性里，让机器支持挂到多个业务组

alert/alert.go

@@ -106,7 +106,7 @@ func Start(alertc aconf.Alert, pushgwc pconf.Pushgw, syncStats *memsto.Stats, al
 		busiGroupCache, alertMuteCache, datasourceCache, promClients, tdendgineClients, naming, ctx, alertStats)
 
 	dp := dispatch.NewDispatch(alertRuleCache, userCache, userGroupCache, alertSubscribeCache, targetCache, notifyConfigCache, taskTplsCache, alertc.Alerting, ctx, alertStats)
-	consumer := dispatch.NewConsumer(alertc.Alerting, ctx, dp)
+	consumer := dispatch.NewConsumer(alertc.Alerting, ctx, dp, promClients)
 
 	go dp.ReloadTpls()
 	go consumer.LoopConsume()

alert/dispatch/consume.go

@@ -1,14 +1,19 @@
 package dispatch
 
 import (
+	"encoding/json"
 	"fmt"
+	"strings"
 	"time"
 
 	"github.com/ccfos/nightingale/v6/alert/aconf"
+	"github.com/ccfos/nightingale/v6/alert/common"
 	"github.com/ccfos/nightingale/v6/alert/queue"
 	"github.com/ccfos/nightingale/v6/models"
 	"github.com/ccfos/nightingale/v6/pkg/ctx"
 	"github.com/ccfos/nightingale/v6/pkg/poster"
+	promsdk "github.com/ccfos/nightingale/v6/pkg/prom"
+	"github.com/ccfos/nightingale/v6/prom"
 
 	"github.com/toolkits/pkg/concurrent/semaphore"
 	"github.com/toolkits/pkg/logger"
@@ -18,15 +23,17 @@ type Consumer struct {
 	alerting aconf.Alerting
 	ctx      *ctx.Context
 
-	dispatch *Dispatch
+	dispatch    *Dispatch
+	promClients *prom.PromClientMap
 }
 
 // 创建一个 Consumer 实例
-func NewConsumer(alerting aconf.Alerting, ctx *ctx.Context, dispatch *Dispatch) *Consumer {
+func NewConsumer(alerting aconf.Alerting, ctx *ctx.Context, dispatch *Dispatch, promClients *prom.PromClientMap) *Consumer {
 	return &Consumer{
-		alerting: alerting,
-		ctx:      ctx,
-		dispatch: dispatch,
+		alerting:    alerting,
+		ctx:         ctx,
+		dispatch:    dispatch,
+		promClients: promClients,
 	}
 }
 
@@ -73,17 +80,19 @@ func (e *Consumer) consumeOne(event *models.AlertCurEvent) {
 		event.RuleName = fmt.Sprintf("failed to parse rule name: %v", err)
 	}
 
-	if err := event.ParseRule("rule_note"); err != nil {
-		logger.Warningf("ruleid:%d failed to parse rule note: %v", event.RuleId, err)
-		event.RuleNote = fmt.Sprintf("failed to parse rule note: %v", err)
-	}
-
 	if err := event.ParseRule("annotations"); err != nil {
 		logger.Warningf("ruleid:%d failed to parse annotations: %v", event.RuleId, err)
 		event.Annotations = fmt.Sprintf("failed to parse annotations: %v", err)
 		event.AnnotationsJSON["error"] = event.Annotations
 	}
 
+	e.queryRecoveryVal(event)
+
+	if err := event.ParseRule("rule_note"); err != nil {
+		logger.Warningf("ruleid:%d failed to parse rule note: %v", event.RuleId, err)
+		event.RuleNote = fmt.Sprintf("failed to parse rule note: %v", err)
+	}
+
 	e.persist(event)
 
 	if event.IsRecovered && event.NotifyRecovered == 0 {
@@ -115,3 +124,68 @@ func (e *Consumer) persist(event *models.AlertCurEvent) {
 		e.dispatch.Astats.CounterRuleEvalErrorTotal.WithLabelValues(fmt.Sprintf("%v", event.DatasourceId), "persist_event").Inc()
 	}
 }
+
+func (e *Consumer) queryRecoveryVal(event *models.AlertCurEvent) {
+	if !event.IsRecovered {
+		return
+	}
+
+	// If the event is a recovery event, execute the recovery_promql query
+	promql, ok := event.AnnotationsJSON["recovery_promql"]
+	if !ok {
+		return
+	}
+
+	promql = strings.TrimSpace(promql)
+	if promql == "" {
+		logger.Warningf("rule_eval:%s promql is blank", getKey(event))
+		return
+	}
+
+	if e.promClients.IsNil(event.DatasourceId) {
+		logger.Warningf("rule_eval:%s error reader client is nil", getKey(event))
+		return
+	}
+
+	readerClient := e.promClients.GetCli(event.DatasourceId)
+
+	var warnings promsdk.Warnings
+	value, warnings, err := readerClient.Query(e.ctx.Ctx, promql, time.Now())
+	if err != nil {
+		logger.Errorf("rule_eval:%s promql:%s, error:%v", getKey(event), promql, err)
+		event.AnnotationsJSON["recovery_promql_error"] = fmt.Sprintf("promql:%s error:%v", promql, err)
+
+		b, err := json.Marshal(event.AnnotationsJSON)
+		if err != nil {
+			event.AnnotationsJSON = make(map[string]string)
+			event.AnnotationsJSON["error"] = fmt.Sprintf("failed to parse annotations: %v", err)
+		} else {
+			event.Annotations = string(b)
+		}
+		return
+	}
+
+	if len(warnings) > 0 {
+		logger.Errorf("rule_eval:%s promql:%s, warnings:%v", getKey(event), promql, warnings)
+	}
+
+	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")
+	} else {
+		event.AnnotationsJSON["recovery_value"] = fmt.Sprintf("%v", anomalyPoints[0].Value)
+	}
+
+	b, err := json.Marshal(event.AnnotationsJSON)
+	if err != nil {
+		event.AnnotationsJSON = make(map[string]string)
+		event.AnnotationsJSON["error"] = fmt.Sprintf("failed to parse annotations: %v", err)
+	} else {
+		event.Annotations = string(b)
+	}
+}
+
+func getKey(event *models.AlertCurEvent) string {
+	return common.RuleKey(event.DatasourceId, event.RuleId)
+}

alert/dispatch/dispatch.go

@@ -4,7 +4,9 @@ import (
 	"bytes"
 	"encoding/json"
 	"html/template"
+	"net/url"
 	"strconv"
+	"strings"
 	"sync"
 	"time"
 
@@ -31,6 +33,7 @@ type Dispatch struct {
 	alerting aconf.Alerting
 
 	Senders          map[string]sender.Sender
+	CallBacks        map[string]sender.CallBacker
 	tpls             map[string]*template.Template
 	ExtraSenders     map[string]sender.Sender
 	BeforeSenderHook func(*models.AlertCurEvent) bool
@@ -99,6 +102,17 @@ func (e *Dispatch) relaodTpls() error {
 		models.FeishuCard: sender.NewSender(models.FeishuCard, tmpTpls),
 	}
 
+	// domain -> Callback()
+	callbacks := map[string]sender.CallBacker{
+		models.DingtalkDomain:   sender.NewCallBacker(models.DingtalkDomain, e.targetCache, e.userCache, e.taskTplsCache, tmpTpls),
+		models.WecomDomain:      sender.NewCallBacker(models.WecomDomain, e.targetCache, e.userCache, e.taskTplsCache, tmpTpls),
+		models.FeishuDomain:     sender.NewCallBacker(models.FeishuDomain, e.targetCache, e.userCache, e.taskTplsCache, tmpTpls),
+		models.TelegramDomain:   sender.NewCallBacker(models.TelegramDomain, e.targetCache, e.userCache, e.taskTplsCache, tmpTpls),
+		models.FeishuCardDomain: sender.NewCallBacker(models.FeishuCardDomain, e.targetCache, e.userCache, e.taskTplsCache, tmpTpls),
+		models.IbexDomain:       sender.NewCallBacker(models.IbexDomain, e.targetCache, e.userCache, e.taskTplsCache, tmpTpls),
+		models.DefaultDomain:    sender.NewCallBacker(models.DefaultDomain, e.targetCache, e.userCache, e.taskTplsCache, tmpTpls),
+	}
+
 	e.RwLock.RLock()
 	for channelName, extraSender := range e.ExtraSenders {
 		senders[channelName] = extraSender
@@ -108,6 +122,7 @@ func (e *Dispatch) relaodTpls() error {
 	e.RwLock.Lock()
 	e.tpls = tmpTpls
 	e.Senders = senders
+	e.CallBacks = callbacks
 	e.RwLock.Unlock()
 	return nil
 }
@@ -243,7 +258,7 @@ func (e *Dispatch) Send(rule *models.AlertRule, event *models.AlertCurEvent, not
 	}
 
 	// handle event callbacks
-	sender.SendCallbacks(e.ctx, notifyTarget.ToCallbackList(), event, e.targetCache, e.userCache, e.taskTplsCache, e.Astats)
+	e.SendCallbacks(rule, notifyTarget, event)
 
 	// handle global webhooks
 	sender.SendWebhooks(notifyTarget.ToWebhookList(), event, e.Astats)
@@ -252,6 +267,47 @@ func (e *Dispatch) Send(rule *models.AlertRule, event *models.AlertCurEvent, not
 	go sender.MayPluginNotify(e.genNoticeBytes(event), e.notifyConfigCache.GetNotifyScript(), e.Astats)
 }
 
+func (e *Dispatch) SendCallbacks(rule *models.AlertRule, notifyTarget *NotifyTarget, event *models.AlertCurEvent) {
+
+	uids := notifyTarget.ToUidList()
+	urls := notifyTarget.ToCallbackList()
+	for _, urlStr := range urls {
+		if len(urlStr) == 0 {
+			continue
+		}
+
+		cbCtx := sender.BuildCallBackContext(e.ctx, urlStr, rule, []*models.AlertCurEvent{event}, uids, e.userCache, e.Astats)
+
+		if strings.HasPrefix(urlStr, "${ibex}") {
+			e.CallBacks[models.IbexDomain].CallBack(cbCtx)
+			continue
+		}
+
+		if !(strings.HasPrefix(urlStr, "http://") || strings.HasPrefix(urlStr, "https://")) {
+			cbCtx.CallBackURL = "http://" + urlStr
+		}
+
+		parsedURL, err := url.Parse(urlStr)
+		if err != nil {
+			logger.Errorf("SendCallbacks: failed to url.Parse(urlStr=%s): %v", urlStr, err)
+			continue
+		}
+
+		// process feishu card
+		if parsedURL.Host == models.FeishuDomain && parsedURL.Query().Get("card") == "1" {
+			e.CallBacks[models.FeishuCardDomain].CallBack(cbCtx)
+			continue
+		}
+
+		callBacker, ok := e.CallBacks[parsedURL.Host]
+		if ok {
+			callBacker.CallBack(cbCtx)
+		} else {
+			e.CallBacks[models.DefaultDomain].CallBack(cbCtx)
+		}
+	}
+}
+
 type Notice struct {
 	Event *models.AlertCurEvent `json:"event"`
 	Tpls  map[string]string     `json:"tpls"`

alert/dispatch/notify_target.go

@@ -84,6 +84,14 @@ func (s *NotifyTarget) ToWebhookList() []*models.Webhook {
 	return webhooks
 }
 
+func (s *NotifyTarget) ToUidList() []int64 {
+	uids := make([]int64, len(s.userMap))
+	for uid, _ := range s.userMap {
+		uids = append(uids, uid)
+	}
+	return uids
+}
+
 // Dispatch 抽象由告警事件到信息接收者的路由策略
 // rule: 告警规则
 // event: 告警事件

alert/sender/callback.go

@@ -1,9 +1,8 @@
 package sender
 
 import (
-	"encoding/json"
-	"fmt"
-	"strconv"
+	"html/template"
+	"net/url"
 	"strings"
 	"time"
 
@@ -13,37 +12,122 @@ import (
 	"github.com/ccfos/nightingale/v6/pkg/ctx"
 	"github.com/ccfos/nightingale/v6/pkg/poster"
 
-	imodels "github.com/flashcatcloud/ibex/src/models"
-	"github.com/flashcatcloud/ibex/src/storage"
 	"github.com/toolkits/pkg/logger"
 )
 
-func SendCallbacks(ctx *ctx.Context, urls []string, event *models.AlertCurEvent, targetCache *memsto.TargetCacheType, userCache *memsto.UserCacheType,
-	taskTplCache *memsto.TaskTplCache, stats *astats.Stats) {
-	for _, url := range urls {
-		if url == "" {
-			continue
-		}
+type (
+	// CallBacker 进行回调的接口
+	CallBacker interface {
+		CallBack(ctx CallBackContext)
+	}
 
-		if strings.HasPrefix(url, "${ibex}") {
-			if !event.IsRecovered {
-				handleIbex(ctx, url, event, targetCache, userCache, taskTplCache)
-			}
-			continue
-		}
+	// CallBackContext 回调时所需的上下文
+	CallBackContext struct {
+		Ctx         *ctx.Context
+		CallBackURL string
+		Users       []*models.User
+		Rule        *models.AlertRule
+		Events      []*models.AlertCurEvent
+		Stats       *astats.Stats
+	}
 
-		if !(strings.HasPrefix(url, "http://") || strings.HasPrefix(url, "https://")) {
-			url = "http://" + url
-		}
+	DefaultCallBacker struct{}
+)
 
-		stats.AlertNotifyTotal.WithLabelValues("rule_callback").Inc()
-		resp, code, err := poster.PostJSON(url, 5*time.Second, event, 3)
-		if err != nil {
-			logger.Errorf("event_callback_fail(rule_id=%d url=%s), resp: %s, err: %v, code: %d", event.RuleId, url, string(resp), err, code)
-			stats.AlertNotifyErrorTotal.WithLabelValues("rule_callback").Inc()
-		} else {
-			logger.Infof("event_callback_succ(rule_id=%d url=%s), resp: %s, code: %d", event.RuleId, url, string(resp), code)
+func BuildCallBackContext(ctx *ctx.Context, callBackURL string, rule *models.AlertRule, events []*models.AlertCurEvent,
+	uids []int64, userCache *memsto.UserCacheType, stats *astats.Stats) CallBackContext {
+	users := userCache.GetByUserIds(uids)
+
+	return CallBackContext{
+		Ctx:         ctx,
+		CallBackURL: callBackURL,
+		Rule:        rule,
+		Events:      events,
+		Users:       users,
+		Stats:       stats,
+	}
+}
+
+func ExtractAtsParams(rawURL string) []string {
+	ans := make([]string, 0, 1)
+	parsedURL, err := url.Parse(rawURL)
+	if err != nil {
+		logger.Errorf("ExtractAtsParams(url=%s), err: %v", rawURL, err)
+		return ans
+	}
+
+	queryParams := parsedURL.Query()
+	atParam := queryParams.Get("ats")
+	if atParam == "" {
+		return ans
+	}
+
+	// Split the atParam by comma and return the result as a slice
+	return strings.Split(atParam, ",")
+}
+
+func NewCallBacker(
+	key string,
+	targetCache *memsto.TargetCacheType,
+	userCache *memsto.UserCacheType,
+	taskTplCache *memsto.TaskTplCache,
+	tpls map[string]*template.Template,
+) CallBacker {
+
+	switch key {
+	case models.IbexDomain: // Distribute to Ibex
+		return &IbexCallBacker{
+			targetCache:  targetCache,
+			userCache:    userCache,
+			taskTplCache: taskTplCache,
 		}
+	case models.DefaultDomain: // default callback
+		return &DefaultCallBacker{}
+	case models.DingtalkDomain:
+		return &DingtalkSender{tpl: tpls[models.Dingtalk]}
+	case models.WecomDomain:
+		return &WecomSender{tpl: tpls[models.Wecom]}
+	case models.FeishuDomain:
+		return &FeishuSender{tpl: tpls[models.Feishu]}
+	case models.FeishuCardDomain:
+		return &FeishuCardSender{tpl: tpls[models.FeishuCard]}
+	//case models.Mm:
+	//	return &MmSender{tpl: tpls[models.Mm]}
+	case models.TelegramDomain:
+		return &TelegramSender{tpl: tpls[models.Telegram]}
+	}
+
+	return nil
+}
+
+func (c *DefaultCallBacker) CallBack(ctx CallBackContext) {
+	if len(ctx.CallBackURL) == 0 || len(ctx.Events) == 0 {
+		return
+	}
+
+	event := ctx.Events[0]
+
+	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), resp: %s, err: %v, code: %d",
+			event.RuleId, ctx.CallBackURL, string(resp), err, code)
+		ctx.Stats.AlertNotifyErrorTotal.WithLabelValues("rule_callback").Inc()
+	} else {
+		logger.Infof("event_callback_succ(rule_id=%d url=%s), resp: %s, code: %d",
+			event.RuleId, ctx.CallBackURL, string(resp), code)
+	}
+}
+
+func doSend(url string, body interface{}, channel string, stats *astats.Stats) {
+	stats.AlertNotifyTotal.WithLabelValues(channel).Inc()
+
+	res, code, err := poster.PostJSON(url, time.Second*5, body, 3)
+	if err != nil {
+		logger.Errorf("%s_sender: result=fail url=%s code=%d error=%v req:%v response=%s", channel, url, code, err, body, string(res))
+		stats.AlertNotifyErrorTotal.WithLabelValues(channel).Inc()
+	} else {
+		logger.Infof("%s_sender: result=succ url=%s code=%d req:%v response=%s", channel, url, code, body, string(res))
 	}
 }
 
@@ -51,226 +135,3 @@ type TaskCreateReply struct {
 	Err string `json:"err"`
 	Dat int64  `json:"dat"` // task.id
 }
-
-func handleIbex(ctx *ctx.Context, url string, event *models.AlertCurEvent, targetCache *memsto.TargetCacheType, userCache *memsto.UserCacheType,
-	taskTplCache *memsto.TaskTplCache) {
-	if imodels.DB() == nil {
-		logger.Warning("event_callback_ibex: db is nil")
-		return
-	}
-
-	arr := strings.Split(url, "/")
-
-	var idstr string
-	var host string
-
-	if len(arr) > 1 {
-		idstr = arr[1]
-	}
-
-	if len(arr) > 2 {
-		host = arr[2]
-	}
-
-	id, err := strconv.ParseInt(idstr, 10, 64)
-	if err != nil {
-		logger.Errorf("event_callback_ibex: failed to parse url: %s", url)
-		return
-	}
-
-	if host == "" {
-		// 用户在callback url中没有传入host，就从event中解析
-		host = event.TargetIdent
-	}
-
-	if host == "" {
-		logger.Error("event_callback_ibex: failed to get host")
-		return
-	}
-
-	tpl := taskTplCache.Get(id)
-	if tpl == nil {
-		logger.Errorf("event_callback_ibex: no such tpl(%d)", id)
-		return
-	}
-
-	// check perm
-	// tpl.GroupId - host - account 三元组校验权限
-	can, err := canDoIbex(tpl.UpdateBy, tpl, host, targetCache, userCache)
-	if err != nil {
-		logger.Errorf("event_callback_ibex: check perm fail: %v", err)
-		return
-	}
-
-	if !can {
-		logger.Errorf("event_callback_ibex: user(%s) no permission", tpl.UpdateBy)
-		return
-	}
-
-	tagsMap := make(map[string]string)
-	for i := 0; i < len(event.TagsJSON); i++ {
-		pair := strings.TrimSpace(event.TagsJSON[i])
-		if pair == "" {
-			continue
-		}
-
-		arr := strings.Split(pair, "=")
-		if len(arr) != 2 {
-			continue
-		}
-
-		tagsMap[arr[0]] = arr[1]
-	}
-	// 附加告警级别  告警触发值标签
-	tagsMap["alert_severity"] = strconv.Itoa(event.Severity)
-	tagsMap["alert_trigger_value"] = event.TriggerValue
-
-	tags, err := json.Marshal(tagsMap)
-	if err != nil {
-		logger.Errorf("event_callback_ibex: failed to marshal tags to json: %v", tagsMap)
-		return
-	}
-
-	// call ibex
-	in := models.TaskForm{
-		Title:          tpl.Title + " FH: " + host,
-		Account:        tpl.Account,
-		Batch:          tpl.Batch,
-		Tolerance:      tpl.Tolerance,
-		Timeout:        tpl.Timeout,
-		Pause:          tpl.Pause,
-		Script:         tpl.Script,
-		Args:           tpl.Args,
-		Stdin:          string(tags),
-		Action:         "start",
-		Creator:        tpl.UpdateBy,
-		Hosts:          []string{host},
-		AlertTriggered: true,
-	}
-
-	id, err = TaskAdd(in, tpl.UpdateBy, ctx.IsCenter)
-	if err != nil {
-		logger.Errorf("event_callback_ibex: call ibex fail: %v", err)
-		return
-	}
-
-	// write db
-	record := models.TaskRecord{
-		Id:        id,
-		EventId:   event.Id,
-		GroupId:   tpl.GroupId,
-		Title:     in.Title,
-		Account:   in.Account,
-		Batch:     in.Batch,
-		Tolerance: in.Tolerance,
-		Timeout:   in.Timeout,
-		Pause:     in.Pause,
-		Script:    in.Script,
-		Args:      in.Args,
-		CreateAt:  time.Now().Unix(),
-		CreateBy:  in.Creator,
-	}
-
-	if err = record.Add(ctx); err != nil {
-		logger.Errorf("event_callback_ibex: persist task_record fail: %v", err)
-	}
-}
-
-func canDoIbex(username string, tpl *models.TaskTpl, host string, targetCache *memsto.TargetCacheType, userCache *memsto.UserCacheType) (bool, error) {
-	user := userCache.GetByUsername(username)
-	if user != nil && user.IsAdmin() {
-		return true, nil
-	}
-
-	target, has := targetCache.Get(host)
-	if !has {
-		return false, nil
-	}
-
-	return target.GroupId == tpl.GroupId, nil
-}
-
-func TaskAdd(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{
-		Title:     f.Title,
-		Account:   f.Account,
-		Batch:     f.Batch,
-		Tolerance: f.Tolerance,
-		Timeout:   f.Timeout,
-		Pause:     f.Pause,
-		Script:    f.Script,
-		Args:      f.Args,
-		Stdin:     f.Stdin,
-		Creator:   f.Creator,
-	}
-
-	err := taskMeta.CleanFields()
-	if err != nil {
-		return 0, err
-	}
-
-	taskMeta.HandleFH(hosts[0])
-
-	// 任务类型分为"告警规则触发"和"n9e center用户下发"两种；
-	// 边缘机房"告警规则触发"的任务不需要规划，并且它可能是失联的，无法使用db资源，所以放入redis缓存中，直接下发给agentd执行
-	if !isCenter && f.AlertTriggered {
-		if err := taskMeta.Create(); err != nil {
-			// 当网络不连通时，生成唯一的id，防止边缘机房中不同任务的id相同；
-			// 方法是，redis自增id去防止同一个机房的不同n9e edge生成的id相同；
-			// 但没法防止不同边缘机房生成同样的id，所以，生成id的数据不会上报存入数据库，只用于闭环执行。
-			taskMeta.Id, err = storage.IdGet()
-			if err != nil {
-				return 0, err
-			}
-		}
-
-		taskHost := imodels.TaskHost{
-			Id:     taskMeta.Id,
-			Host:   hosts[0],
-			Status: "running",
-		}
-		if err = taskHost.Create(); err != nil {
-			logger.Warningf("task_add_fail: authUser=%s title=%s err=%s", authUser, taskMeta.Title, err.Error())
-		}
-
-		// 缓存任务元信息和待下发的任务
-		err = taskMeta.Cache(hosts[0])
-		if err != nil {
-			return 0, err
-		}
-
-	} else {
-		// 如果是中心机房，还是保持之前的逻辑
-		err = taskMeta.Save(hosts, f.Action)
-		if err != nil {
-			return 0, err
-		}
-	}
-
-	logger.Infof("task_add_succ: authUser=%s title=%s", authUser, taskMeta.Title)
-	return taskMeta.Id, nil
-}
-
-func cleanHosts(formHosts []string) []string {
-	cnt := len(formHosts)
-	arr := make([]string, 0, cnt)
-	for i := 0; i < cnt; i++ {
-		item := strings.TrimSpace(formHosts[i])
-		if item == "" {
-			continue
-		}
-
-		if strings.HasPrefix(item, "#") {
-			continue
-		}
-
-		arr = append(arr, item)
-	}
-
-	return arr
-}

alert/sender/dingtalk.go

@@ -1,15 +1,9 @@
 package sender
 
 import (
+	"github.com/ccfos/nightingale/v6/models"
 	"html/template"
 	"strings"
-	"time"
-
-	"github.com/ccfos/nightingale/v6/alert/astats"
-	"github.com/ccfos/nightingale/v6/models"
-	"github.com/ccfos/nightingale/v6/pkg/poster"
-
-	"github.com/toolkits/pkg/logger"
 )
 
 type dingtalkMarkdown struct {
@@ -28,6 +22,10 @@ type dingtalk struct {
 	At       dingtalkAt       `json:"at"`
 }
 
+var (
+	_ CallBacker = (*DingtalkSender)(nil)
+)
+
 type DingtalkSender struct {
 	tpl *template.Template
 }
@@ -72,6 +70,37 @@ func (ds *DingtalkSender) Send(ctx MessageContext) {
 	}
 }
 
+func (ds *DingtalkSender) CallBack(ctx CallBackContext) {
+	if len(ctx.Events) == 0 || len(ctx.CallBackURL) == 0 {
+		return
+	}
+
+	body := dingtalk{
+		Msgtype: "markdown",
+		Markdown: dingtalkMarkdown{
+			Title: ctx.Events[0].RuleName,
+		},
+	}
+
+	ats := ExtractAtsParams(ctx.CallBackURL)
+	message := BuildTplMessage(models.Dingtalk, ds.tpl, ctx.Events)
+
+	if len(ats) > 0 {
+		body.Markdown.Text = message + "\n@" + strings.Join(ats, "@")
+		body.At = dingtalkAt{
+			AtMobiles: ats,
+			IsAtAll:   false,
+		}
+	} else {
+		// NoAt in url
+		body.Markdown.Text = message
+	}
+
+	doSend(ctx.CallBackURL, body, models.Dingtalk, ctx.Stats)
+
+	ctx.Stats.AlertNotifyTotal.WithLabelValues("rule_callback").Inc()
+}
+
 // extract urls and ats from Users
 func (ds *DingtalkSender) extract(users []*models.User) ([]string, []string) {
 	urls := make([]string, 0, len(users))
@@ -91,15 +120,3 @@ func (ds *DingtalkSender) extract(users []*models.User) ([]string, []string) {
 	}
 	return urls, ats
 }
-
-func doSend(url string, body interface{}, channel string, stats *astats.Stats) {
-	stats.AlertNotifyTotal.WithLabelValues(channel).Inc()
-
-	res, code, err := poster.PostJSON(url, time.Second*5, body, 3)
-	if err != nil {
-		logger.Errorf("%s_sender: result=fail url=%s code=%d error=%v req:%v response=%s", channel, url, code, err, body, string(res))
-		stats.AlertNotifyErrorTotal.WithLabelValues(channel).Inc()
-	} else {
-		logger.Infof("%s_sender: result=succ url=%s code=%d req:%v response=%s", channel, url, code, body, string(res))
-	}
-}

alert/sender/feishu.go

@@ -1,6 +1,7 @@
 package sender
 
 import (
+	"fmt"
 	"html/template"
 	"strings"
 
@@ -22,10 +23,41 @@ type feishu struct {
 	At      feishuAt      `json:"at"`
 }
 
+var (
+	_ CallBacker = (*FeishuSender)(nil)
+)
+
 type FeishuSender struct {
 	tpl *template.Template
 }
 
+func (fs *FeishuSender) CallBack(ctx CallBackContext) {
+	if len(ctx.Events) == 0 || len(ctx.CallBackURL) == 0 {
+		return
+	}
+
+	ats := ExtractAtsParams(ctx.CallBackURL)
+	message := BuildTplMessage(models.Feishu, fs.tpl, ctx.Events)
+
+	if len(ats) > 0 {
+		atTags := ""
+		for _, at := range ats {
+			atTags += fmt.Sprintf("<at user_id=\"%s\"></at> ", at)
+		}
+		message = atTags + message
+	}
+
+	body := feishu{
+		Msgtype: "text",
+		Content: feishuContent{
+			Text: message,
+		},
+	}
+
+	doSend(ctx.CallBackURL, body, models.Feishu, ctx.Stats)
+	ctx.Stats.AlertNotifyTotal.WithLabelValues("rule_callback").Inc()
+}
+
 func (fs *FeishuSender) Send(ctx MessageContext) {
 	if len(ctx.Users) == 0 || len(ctx.Events) == 0 {
 		return

alert/sender/feishucard.go

@@ -3,6 +3,7 @@ package sender
 import (
 	"fmt"
 	"html/template"
+	"net/url"
 	"strings"
 
 	"github.com/ccfos/nightingale/v6/models"
@@ -91,6 +92,37 @@ var (
 	}
 )
 
+func (fs *FeishuCardSender) CallBack(ctx CallBackContext) {
+	if len(ctx.Events) == 0 || len(ctx.CallBackURL) == 0 {
+		return
+	}
+
+	message := BuildTplMessage(models.FeishuCard, fs.tpl, ctx.Events)
+	color := "red"
+	lowerUnicode := strings.ToLower(message)
+	if strings.Count(lowerUnicode, Recovered) > 0 && strings.Count(lowerUnicode, Triggered) > 0 {
+		color = "orange"
+	} else if strings.Count(lowerUnicode, Recovered) > 0 {
+		color = "green"
+	}
+
+	SendTitle := fmt.Sprintf("🔔 %s", ctx.Events[0].RuleName)
+	body.Card.Header.Title.Content = SendTitle
+	body.Card.Header.Template = color
+	body.Card.Elements[0].Text.Content = message
+	body.Card.Elements[2].Elements[0].Content = SendTitle
+
+	// This is to be compatible with the feishucard interface, if with query string parameters, the request will fail
+	// Remove query parameters from the URL,
+	parsedURL, err := url.Parse(ctx.CallBackURL)
+	if err != nil {
+		return
+	}
+	parsedURL.RawQuery = ""
+
+	doSend(parsedURL.String(), body, models.FeishuCard, ctx.Stats)
+}
+
 func (fs *FeishuCardSender) Send(ctx MessageContext) {
 	if len(ctx.Users) == 0 || len(ctx.Events) == 0 {
 		return

alert/sender/ibex.go

@@ -0,0 +1,265 @@
+// @Author: Ciusyan 6/5/24
+
+package sender
+
+import (
+	"encoding/json"
+	"fmt"
+	"strconv"
+	"strings"
+	"time"
+
+	"github.com/ccfos/nightingale/v6/memsto"
+	"github.com/ccfos/nightingale/v6/models"
+	"github.com/ccfos/nightingale/v6/pkg/ctx"
+	imodels "github.com/flashcatcloud/ibex/src/models"
+	"github.com/flashcatcloud/ibex/src/storage"
+
+	"github.com/toolkits/pkg/logger"
+)
+
+var (
+	_ CallBacker = (*IbexCallBacker)(nil)
+)
+
+type IbexCallBacker struct {
+	targetCache  *memsto.TargetCacheType
+	userCache    *memsto.UserCacheType
+	taskTplCache *memsto.TaskTplCache
+}
+
+func (c *IbexCallBacker) CallBack(ctx CallBackContext) {
+	if len(ctx.CallBackURL) == 0 || len(ctx.Events) == 0 {
+		return
+	}
+
+	event := ctx.Events[0]
+
+	if event.IsRecovered {
+		return
+	}
+
+	c.handleIbex(ctx.Ctx, ctx.CallBackURL, event)
+}
+
+func (c *IbexCallBacker) handleIbex(ctx *ctx.Context, url string, event *models.AlertCurEvent) {
+	if imodels.DB() == nil && ctx.IsCenter {
+		logger.Warning("event_callback_ibex: db is nil")
+		return
+	}
+
+	arr := strings.Split(url, "/")
+
+	var idstr string
+	var host string
+
+	if len(arr) > 1 {
+		idstr = arr[1]
+	}
+
+	if len(arr) > 2 {
+		host = arr[2]
+	}
+
+	id, err := strconv.ParseInt(idstr, 10, 64)
+	if err != nil {
+		logger.Errorf("event_callback_ibex: failed to parse url: %s", url)
+		return
+	}
+
+	if host == "" {
+		// 用户在callback url中没有传入host，就从event中解析
+		host = event.TargetIdent
+	}
+
+	if host == "" {
+		logger.Error("event_callback_ibex: failed to get host")
+		return
+	}
+
+	tpl := c.taskTplCache.Get(id)
+	if tpl == nil {
+		logger.Errorf("event_callback_ibex: no such tpl(%d)", id)
+		return
+	}
+
+	// check perm
+	// tpl.GroupId - host - account 三元组校验权限
+	can, err := canDoIbex(tpl.UpdateBy, tpl, host, c.targetCache, c.userCache)
+	if err != nil {
+		logger.Errorf("event_callback_ibex: check perm fail: %v", err)
+		return
+	}
+
+	if !can {
+		logger.Errorf("event_callback_ibex: user(%s) no permission", tpl.UpdateBy)
+		return
+	}
+
+	tagsMap := make(map[string]string)
+	for i := 0; i < len(event.TagsJSON); i++ {
+		pair := strings.TrimSpace(event.TagsJSON[i])
+		if pair == "" {
+			continue
+		}
+
+		arr := strings.Split(pair, "=")
+		if len(arr) != 2 {
+			continue
+		}
+
+		tagsMap[arr[0]] = arr[1]
+	}
+	// 附加告警级别  告警触发值标签
+	tagsMap["alert_severity"] = strconv.Itoa(event.Severity)
+	tagsMap["alert_trigger_value"] = event.TriggerValue
+
+	tags, err := json.Marshal(tagsMap)
+	if err != nil {
+		logger.Errorf("event_callback_ibex: failed to marshal tags to json: %v", tagsMap)
+		return
+	}
+
+	// call ibex
+	in := models.TaskForm{
+		Title:          tpl.Title + " FH: " + host,
+		Account:        tpl.Account,
+		Batch:          tpl.Batch,
+		Tolerance:      tpl.Tolerance,
+		Timeout:        tpl.Timeout,
+		Pause:          tpl.Pause,
+		Script:         tpl.Script,
+		Args:           tpl.Args,
+		Stdin:          string(tags),
+		Action:         "start",
+		Creator:        tpl.UpdateBy,
+		Hosts:          []string{host},
+		AlertTriggered: true,
+	}
+
+	id, err = TaskAdd(in, tpl.UpdateBy, ctx.IsCenter)
+	if err != nil {
+		logger.Errorf("event_callback_ibex: call ibex fail: %v", err)
+		return
+	}
+
+	// write db
+	record := models.TaskRecord{
+		Id:        id,
+		EventId:   event.Id,
+		GroupId:   tpl.GroupId,
+		Title:     in.Title,
+		Account:   in.Account,
+		Batch:     in.Batch,
+		Tolerance: in.Tolerance,
+		Timeout:   in.Timeout,
+		Pause:     in.Pause,
+		Script:    in.Script,
+		Args:      in.Args,
+		CreateAt:  time.Now().Unix(),
+		CreateBy:  in.Creator,
+	}
+
+	if err = record.Add(ctx); err != nil {
+		logger.Errorf("event_callback_ibex: persist task_record fail: %v", err)
+	}
+}
+
+func canDoIbex(username string, tpl *models.TaskTpl, host string, targetCache *memsto.TargetCacheType, userCache *memsto.UserCacheType) (bool, error) {
+	user := userCache.GetByUsername(username)
+	if user != nil && user.IsAdmin() {
+		return true, nil
+	}
+
+	target, has := targetCache.Get(host)
+	if !has {
+		return false, nil
+	}
+
+	return target.GroupId == tpl.GroupId, nil
+}
+
+func TaskAdd(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{
+		Title:     f.Title,
+		Account:   f.Account,
+		Batch:     f.Batch,
+		Tolerance: f.Tolerance,
+		Timeout:   f.Timeout,
+		Pause:     f.Pause,
+		Script:    f.Script,
+		Args:      f.Args,
+		Stdin:     f.Stdin,
+		Creator:   f.Creator,
+	}
+
+	err := taskMeta.CleanFields()
+	if err != nil {
+		return 0, err
+	}
+
+	taskMeta.HandleFH(hosts[0])
+
+	// 任务类型分为"告警规则触发"和"n9e center用户下发"两种；
+	// 边缘机房"告警规则触发"的任务不需要规划，并且它可能是失联的，无法使用db资源，所以放入redis缓存中，直接下发给agentd执行
+	if !isCenter && f.AlertTriggered {
+		if err := taskMeta.Create(); err != nil {
+			// 当网络不连通时，生成唯一的id，防止边缘机房中不同任务的id相同；
+			// 方法是，redis自增id去防止同一个机房的不同n9e edge生成的id相同；
+			// 但没法防止不同边缘机房生成同样的id，所以，生成id的数据不会上报存入数据库，只用于闭环执行。
+			taskMeta.Id, err = storage.IdGet()
+			if err != nil {
+				return 0, err
+			}
+		}
+
+		taskHost := imodels.TaskHost{
+			Id:     taskMeta.Id,
+			Host:   hosts[0],
+			Status: "running",
+		}
+		if err = taskHost.Create(); err != nil {
+			logger.Warningf("task_add_fail: authUser=%s title=%s err=%s", authUser, taskMeta.Title, err.Error())
+		}
+
+		// 缓存任务元信息和待下发的任务
+		err = taskMeta.Cache(hosts[0])
+		if err != nil {
+			return 0, err
+		}
+
+	} else {
+		// 如果是中心机房，还是保持之前的逻辑
+		err = taskMeta.Save(hosts, f.Action)
+		if err != nil {
+			return 0, err
+		}
+	}
+
+	logger.Infof("task_add_succ: authUser=%s title=%s", authUser, taskMeta.Title)
+	return taskMeta.Id, nil
+}
+
+func cleanHosts(formHosts []string) []string {
+	cnt := len(formHosts)
+	arr := make([]string, 0, cnt)
+	for i := 0; i < cnt; i++ {
+		item := strings.TrimSpace(formHosts[i])
+		if item == "" {
+			continue
+		}
+
+		if strings.HasPrefix(item, "#") {
+			continue
+		}
+
+		arr = append(arr, item)
+	}
+
+	return arr
+}

alert/sender/mm.go

@@ -45,6 +45,21 @@ func (ms *MmSender) Send(ctx MessageContext) {
 	})
 }
 
+func (ms *MmSender) CallBack(ctx CallBackContext) {
+	if len(ctx.Events) == 0 || len(ctx.CallBackURL) == 0 {
+		return
+	}
+	message := BuildTplMessage(models.Mm, ms.tpl, ctx.Events)
+
+	SendMM(MatterMostMessage{
+		Text:   message,
+		Tokens: []string{ctx.CallBackURL},
+		Stats:  ctx.Stats,
+	})
+
+	ctx.Stats.AlertNotifyTotal.WithLabelValues("rule_callback").Inc()
+}
+
 func (ms *MmSender) extract(users []*models.User) []string {
 	tokens := make([]string, 0, len(users))
 	for _, user := range users {

alert/sender/telegram.go

@@ -21,10 +21,29 @@ type telegram struct {
 	Text      string `json:"text"`
 }
 
+var (
+	_ CallBacker = (*TelegramSender)(nil)
+)
+
 type TelegramSender struct {
 	tpl *template.Template
 }
 
+func (ts *TelegramSender) CallBack(ctx CallBackContext) {
+	if len(ctx.Events) == 0 || len(ctx.CallBackURL) == 0 {
+		return
+	}
+
+	message := BuildTplMessage(models.Telegram, ts.tpl, ctx.Events)
+	SendTelegram(TelegramMessage{
+		Text:   message,
+		Tokens: []string{ctx.CallBackURL},
+		Stats:  ctx.Stats,
+	})
+
+	ctx.Stats.AlertNotifyTotal.WithLabelValues("rule_callback").Inc()
+}
+
 func (ts *TelegramSender) Send(ctx MessageContext) {
 	if len(ctx.Users) == 0 || len(ctx.Events) == 0 {
 		return

alert/sender/wecom.go

@@ -16,10 +16,31 @@ type wecom struct {
 	Markdown wecomMarkdown `json:"markdown"`
 }
 
+var (
+	_ CallBacker = (*WecomSender)(nil)
+)
+
 type WecomSender struct {
 	tpl *template.Template
 }
 
+func (ws *WecomSender) CallBack(ctx CallBackContext) {
+	if len(ctx.Events) == 0 || len(ctx.CallBackURL) == 0 {
+		return
+	}
+
+	message := BuildTplMessage(models.Wecom, ws.tpl, ctx.Events)
+	body := wecom{
+		Msgtype: "markdown",
+		Markdown: wecomMarkdown{
+			Content: message,
+		},
+	}
+
+	doSend(ctx.CallBackURL, body, models.Wecom, ctx.Stats)
+	ctx.Stats.AlertNotifyTotal.WithLabelValues("rule_callback").Inc()
+}
+
 func (ws *WecomSender) Send(ctx MessageContext) {
 	if len(ctx.Users) == 0 || len(ctx.Events) == 0 {
 		return

center/cconf/ops.go

@@ -76,6 +76,8 @@ ops:
     - "/dashboards/add"
     - "/dashboards/put"
     - "/dashboards/del"
+    - "/embedded-dashboards/put"
+    - "/embedded-dashboards"
 
 - name: alert
   cname: 告警规则

center/integration/init.go

@@ -4,15 +4,17 @@ import (
 	"encoding/json"
 	"path"
 	"strings"
+	"time"
 
 	"github.com/ccfos/nightingale/v6/models"
 	"github.com/ccfos/nightingale/v6/pkg/ctx"
 	"github.com/toolkits/pkg/file"
-	"github.com/toolkits/pkg/ginx"
 	"github.com/toolkits/pkg/logger"
 	"github.com/toolkits/pkg/runner"
 )
 
+const SYSTEM = "system"
+
 func Init(ctx *ctx.Context, builtinIntegrationsDir string) {
 	fp := builtinIntegrationsDir
 	if fp == "" {
@@ -21,7 +23,10 @@ func Init(ctx *ctx.Context, builtinIntegrationsDir string) {
 
 	// var fileList []string
 	dirList, err := file.DirsUnder(fp)
-	ginx.Dangerous(err)
+	if err != nil {
+		logger.Warning("read builtin component dir fail ", err)
+		return
+	}
 
 	for _, dir := range dirList {
 		// components icon
@@ -58,11 +63,47 @@ func Init(ctx *ctx.Context, builtinIntegrationsDir string) {
 
 		exists, _ := models.BuiltinComponentExists(ctx, &component)
 		if !exists {
-			err = component.Add(ctx, "system")
+			err = component.Add(ctx, SYSTEM)
 			if err != nil {
 				logger.Warning("add builtin component fail ", component, err)
 				continue
 			}
+		} else {
+			old, err := models.BuiltinComponentGet(ctx, "ident = ?", component.Ident)
+			if err != nil {
+				logger.Warning("get builtin component fail ", component, err)
+				continue
+			}
+
+			if old == nil {
+				logger.Warning("get builtin component nil ", component)
+				continue
+			}
+
+			if old.UpdatedBy == SYSTEM {
+				now := time.Now().Unix()
+				old.CreatedAt = now
+				old.UpdatedAt = now
+				old.Readme = component.Readme
+				old.UpdatedBy = SYSTEM
+
+				err = models.DB(ctx).Model(old).Select("*").Updates(old).Error
+				if err != nil {
+					logger.Warning("update builtin component fail ", old, err)
+				}
+			}
+		}
+
+		// delete uuid is emtpy
+		err = models.DB(ctx).Exec("delete from builtin_payloads where uuid = 0 and type != 'collect' and (updated_by = 'system' or updated_by = '')").Error
+		if err != nil {
+			logger.Warning("delete builtin payloads fail ", err)
+		}
+
+		// delete builtin metrics uuid is emtpy
+		err = models.DB(ctx).Exec("delete from builtin_metrics where uuid = 0 and (updated_by = 'system' or updated_by = '')").Error
+		if err != nil {
+			logger.Warning("delete builtin metrics fail ", err)
 		}
 
 		// alerts
@@ -83,7 +124,15 @@ func Init(ctx *ctx.Context, builtinIntegrationsDir string) {
 					continue
 				}
 
+				newAlerts := []models.AlertRule{}
+				writeAlertFileFlag := false
 				for _, alert := range alerts {
+					if alert.UUID == 0 {
+						writeAlertFileFlag = true
+						alert.UUID = time.Now().UnixNano()
+					}
+
+					newAlerts = append(newAlerts, alert)
 					content, err := json.Marshal(alert)
 					if err != nil {
 						logger.Warning("marshal builtin alert fail ", alert, err)
@@ -98,40 +147,47 @@ func Init(ctx *ctx.Context, builtinIntegrationsDir string) {
 						Name:      alert.Name,
 						Tags:      alert.AppendTags,
 						Content:   string(content),
+						UUID:      alert.UUID,
 					}
 
-					exists, err := models.BuiltinPayloadExists(ctx, &builtinAlert)
+					old, err := models.BuiltinPayloadGet(ctx, "uuid = ?", alert.UUID)
 					if err != nil {
-						logger.Warning("check builtin alert exists fail ", builtinAlert, err)
+						logger.Warning("get builtin alert fail ", builtinAlert, err)
 						continue
 					}
 
-					if exists {
-						old, err := models.BuiltinPayloadGet(ctx, "type = ? AND component = ? AND name = ? AND cate = ?", builtinAlert.Type, builtinAlert.Component, builtinAlert.Name, builtinAlert.Cate)
+					if old == nil {
+						err := builtinAlert.Add(ctx, SYSTEM)
 						if err != nil {
-							logger.Warning("get builtin alert fail ", builtinAlert, err)
-							continue
-						}
-
-						if old.CreatedAt != old.UpdatedAt {
-							// 模板已经被修改过，不再更新
-							continue
-						}
-
-						// 先删除旧的 再添加新的
-						err = models.BuiltinPayloadDels(ctx, []int64{old.ID})
-						if err != nil {
-							logger.Warning("delete old builtin alert fail ", old, err)
-							continue
+							logger.Warning("add builtin alert fail ", builtinAlert, err)
 						}
+						continue
 					}
 
-					err = builtinAlert.Add(ctx, "system")
-					if err != nil {
-						logger.Warningf("add builtin alert:%+v fail %v", builtinAlert, err)
-						continue
+					if old.UpdatedBy == SYSTEM {
+						old.Content = string(content)
+						old.Name = alert.Name
+						old.Tags = alert.AppendTags
+						err = models.DB(ctx).Model(old).Select("*").Updates(old).Error
+						if err != nil {
+							logger.Warningf("update builtin alert:%+v fail %v", builtinAlert, err)
+						}
 					}
 				}
+
+				if writeAlertFileFlag {
+					bs, err = json.MarshalIndent(newAlerts, "", "    ")
+					if err != nil {
+						logger.Warning("marshal builtin alerts fail ", newAlerts, err)
+						continue
+					}
+
+					_, err = file.WriteBytes(fp, bs)
+					if err != nil {
+						logger.Warning("write builtin alerts file fail ", f, err)
+					}
+				}
+
 			}
 		}
 
@@ -153,6 +209,21 @@ func Init(ctx *ctx.Context, builtinIntegrationsDir string) {
 					continue
 				}
 
+				if dashboard.UUID == 0 {
+					dashboard.UUID = time.Now().UnixNano()
+					// 补全文件中的 uuid
+					bs, err = json.MarshalIndent(dashboard, "", "    ")
+					if err != nil {
+						logger.Warning("marshal builtin dashboard fail ", dashboard, err)
+						continue
+					}
+
+					_, err = file.WriteBytes(fp, bs)
+					if err != nil {
+						logger.Warning("write builtin dashboard file fail ", f, err)
+					}
+				}
+
 				content, err := json.Marshal(dashboard)
 				if err != nil {
 					logger.Warning("marshal builtin dashboard fail ", dashboard, err)
@@ -166,38 +237,31 @@ func Init(ctx *ctx.Context, builtinIntegrationsDir string) {
 					Name:      dashboard.Name,
 					Tags:      dashboard.Tags,
 					Content:   string(content),
+					UUID:      dashboard.UUID,
 				}
 
-				exists, err := models.BuiltinPayloadExists(ctx, &builtinDashboard)
+				old, err := models.BuiltinPayloadGet(ctx, "uuid = ?", dashboard.UUID)
 				if err != nil {
-					logger.Warning("check builtin dashboard exists fail ", builtinDashboard, err)
+					logger.Warning("get builtin alert fail ", builtinDashboard, err)
 					continue
 				}
 
-				if exists {
-					old, err := models.BuiltinPayloadGet(ctx, "type = ? AND component = ? AND name = ? AND cate = ?", builtinDashboard.Type, builtinDashboard.Component, builtinDashboard.Name, builtinDashboard.Cate)
+				if old == nil {
+					err := builtinDashboard.Add(ctx, SYSTEM)
 					if err != nil {
-						logger.Warning("get builtin dashboard fail ", builtinDashboard, err)
-						continue
-					}
-
-					if old.CreatedAt != old.UpdatedAt {
-						// 模板已经被修改过，不再更新
-						continue
-					}
-
-					// delete old
-					err = models.BuiltinPayloadDels(ctx, []int64{old.ID})
-					if err != nil {
-						logger.Warning("delete old builtin dashboard fail ", old, err)
-						continue
+						logger.Warning("add builtin alert fail ", builtinDashboard, err)
 					}
+					continue
 				}
 
-				err = builtinDashboard.Add(ctx, "system")
-				if err != nil {
-					logger.Warning("add builtin dashboard fail ", builtinDashboard, err)
-					continue
+				if old.UpdatedBy == SYSTEM {
+					old.Content = string(content)
+					old.Name = dashboard.Name
+					old.Tags = dashboard.Tags
+					err = models.DB(ctx).Model(old).Select("*").Updates(old).Error
+					if err != nil {
+						logger.Warningf("update builtin alert:%+v fail %v", builtinDashboard, err)
+					}
 				}
 			}
 		} else if err != nil {
@@ -216,40 +280,64 @@ func Init(ctx *ctx.Context, builtinIntegrationsDir string) {
 				}
 
 				metrics := []models.BuiltinMetric{}
+				newMetrics := []models.BuiltinMetric{}
 				err = json.Unmarshal(bs, &metrics)
 				if err != nil {
 					logger.Warning("parse builtin component metrics file fail", f, err)
 					continue
 				}
 
+				writeMetricFileFlag := false
 				for _, metric := range metrics {
-					exists, err := models.BuiltinMetricExists(ctx, &metric)
+					if metric.UUID == 0 {
+						writeMetricFileFlag = true
+						metric.UUID = time.Now().UnixNano()
+					}
+					newMetrics = append(newMetrics, metric)
+
+					old, err := models.BuiltinMetricGet(ctx, "uuid = ?", metric.UUID)
 					if err != nil {
-						logger.Warning("check builtin metric exists fail", metric, err)
+						logger.Warning("get builtin metrics fail ", metric, err)
 						continue
 					}
 
-					if exists {
-						old, err := models.BuiltinMetricGet(ctx, "lang = ? and collector = ? and typ = ? and name = ?", metric.Lang, metric.Collector, metric.Typ, metric.Name)
+					if old == nil {
+						err := metric.Add(ctx, SYSTEM)
 						if err != nil {
-							logger.Warning("get builtin metric fail", metric, err)
-							continue
-						}
-
-						// delete old
-						err = models.BuiltinMetricDels(ctx, []int64{old.ID})
-						if err != nil {
-							logger.Warningf("delete old builtin metric fail %v %v", old, err)
-							continue
+							logger.Warning("add builtin metrics fail ", metric, err)
 						}
+						continue
 					}
 
-					err = metric.Add(ctx, "system")
-					if err != nil {
-						logger.Warning("add builtin metric fail", metric, err)
-						continue
+					if old.UpdatedBy == SYSTEM {
+						old.Collector = metric.Collector
+						old.Typ = metric.Typ
+						old.Name = metric.Name
+						old.Unit = metric.Unit
+						old.Note = metric.Note
+						old.Lang = metric.Lang
+						old.Expression = metric.Expression
+
+						err = models.DB(ctx).Model(old).Select("*").Updates(old).Error
+						if err != nil {
+							logger.Warningf("update builtin metric:%+v fail %v", metric, err)
+						}
 					}
 				}
+
+				if writeMetricFileFlag {
+					bs, err = json.MarshalIndent(newMetrics, "", "    ")
+					if err != nil {
+						logger.Warning("marshal builtin metrics fail ", newMetrics, err)
+						continue
+					}
+
+					_, err = file.WriteBytes(fp, bs)
+					if err != nil {
+						logger.Warning("write builtin metrics file fail ", f, err)
+					}
+				}
+
 			}
 		} else if err != nil {
 			logger.Warningf("read builtin component metrics dir fail %s %v", component.Ident, err)
@@ -273,4 +361,5 @@ type BuiltinBoard struct {
 	Bgids      []int64     `json:"bgids" gorm:"-"`
 	BuiltIn    int         `json:"built_in"` // 0: false, 1: true
 	Hide       int         `json:"hide"`     // 0: false, 1: true
+	UUID       int64       `json:"uuid"`
 }

center/router/router_alert_his_event.go

@@ -93,9 +93,16 @@ func (rt *Router) alertHisEventGet(c *gin.Context) {
 func GetBusinessGroupIds(c *gin.Context, ctx *ctx.Context, eventHistoryGroupView bool) ([]int64, error) {
 	bgid := ginx.QueryInt64(c, "bgid", 0)
 	var bgids []int64
-	user := c.MustGet("user").(*models.User)
 
-	if !eventHistoryGroupView || user.IsAdmin() {
+	if !eventHistoryGroupView || strings.HasPrefix(c.Request.URL.Path, "/v1") {
+		if bgid > 0 {
+			return []int64{bgid}, nil
+		}
+		return bgids, nil
+	}
+
+	user := c.MustGet("user").(*models.User)
+	if user.IsAdmin() {
 		if bgid > 0 {
 			return []int64{bgid}, nil
 		}

center/router/router_alert_rule.go

@@ -42,7 +42,7 @@ func (rt *Router) alertRuleGetsByGids(c *gin.Context) {
 			ginx.Dangerous(err)
 
 			if len(gids) == 0 {
-				ginx.Bomb(http.StatusForbidden, "forbidden")
+				ginx.NewRender(c).Data([]int{}, nil)
 				return
 			}
 		}

center/router/router_alert_subscribe.go

@@ -44,7 +44,7 @@ func (rt *Router) alertSubscribeGetsByGids(c *gin.Context) {
 			ginx.Dangerous(err)
 
 			if len(gids) == 0 {
-				ginx.Bomb(http.StatusForbidden, "forbidden")
+				ginx.NewRender(c).Data([]int{}, nil)
 				return
 			}
 		}

center/router/router_board.go

@@ -272,7 +272,7 @@ func (rt *Router) boardGetsByGids(c *gin.Context) {
 			ginx.Dangerous(err)
 
 			if len(gids) == 0 {
-				ginx.Bomb(http.StatusForbidden, "forbidden")
+				ginx.NewRender(c).Data([]int{}, nil)
 				return
 			}
 		}

center/router/router_builtin_metrics.go

@@ -2,11 +2,13 @@ package router
 
 import (
 	"net/http"
+	"time"
 
 	"github.com/ccfos/nightingale/v6/models"
 
 	"github.com/gin-gonic/gin"
 	"github.com/toolkits/pkg/ginx"
+	"github.com/toolkits/pkg/i18n"
 )
 
 // single or import
@@ -27,8 +29,9 @@ func (rt *Router) builtinMetricsAdd(c *gin.Context) {
 	reterr := make(map[string]string)
 	for i := 0; i < count; i++ {
 		lst[i].Lang = lang
+		lst[i].UUID = time.Now().UnixNano()
 		if err := lst[i].Add(rt.Ctx, username); err != nil {
-			reterr[lst[i].Name] = err.Error()
+			reterr[lst[i].Name] = i18n.Sprintf(c.GetHeader("X-Language"), err.Error())
 		}
 	}
 	ginx.NewRender(c).Data(reterr, nil)

center/router/router_builtin_payload.go

@@ -4,16 +4,19 @@ import (
 	"encoding/json"
 	"net/http"
 	"strings"
+	"time"
 
 	"github.com/ccfos/nightingale/v6/models"
 	"github.com/gin-gonic/gin"
 	"github.com/toolkits/pkg/ginx"
+	"github.com/toolkits/pkg/i18n"
 )
 
 type Board struct {
 	Name    string      `json:"name"`
 	Tags    string      `json:"tags"`
 	Configs interface{} `json:"configs"`
+	UUID    int64       `json:"uuid"`
 }
 
 func (rt *Router) builtinPayloadsAdd(c *gin.Context) {
@@ -38,6 +41,10 @@ func (rt *Router) builtinPayloadsAdd(c *gin.Context) {
 				}
 
 				for _, rule := range alertRules {
+					if rule.UUID == 0 {
+						rule.UUID = time.Now().UnixNano()
+					}
+
 					contentBytes, err := json.Marshal(rule)
 					if err != nil {
 						reterr[rule.Name] = err.Error()
@@ -50,13 +57,14 @@ func (rt *Router) builtinPayloadsAdd(c *gin.Context) {
 						Cate:      lst[i].Cate,
 						Name:      rule.Name,
 						Tags:      rule.AppendTags,
+						UUID:      rule.UUID,
 						Content:   string(contentBytes),
 						CreatedBy: username,
 						UpdatedBy: username,
 					}
 
 					if err := bp.Add(rt.Ctx, username); err != nil {
-						reterr[bp.Name] = err.Error()
+						reterr[bp.Name] = i18n.Sprintf(c.GetHeader("X-Language"), err.Error())
 					}
 				}
 				continue
@@ -68,19 +76,24 @@ func (rt *Router) builtinPayloadsAdd(c *gin.Context) {
 				continue
 			}
 
+			if alertRule.UUID == 0 {
+				alertRule.UUID = time.Now().UnixNano()
+			}
+
 			bp := models.BuiltinPayload{
 				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 {
-				reterr[bp.Name] = err.Error()
+				reterr[bp.Name] = i18n.Sprintf(c.GetHeader("X-Language"), err.Error())
 			}
 		} else if lst[i].Type == "dashboard" {
 			if strings.HasPrefix(strings.TrimSpace(lst[i].Content), "[") {
@@ -91,6 +104,10 @@ func (rt *Router) builtinPayloadsAdd(c *gin.Context) {
 				}
 
 				for _, dashboard := range dashboards {
+					if dashboard.UUID == 0 {
+						dashboard.UUID = time.Now().UnixNano()
+					}
+
 					contentBytes, err := json.Marshal(dashboard)
 					if err != nil {
 						reterr[dashboard.Name] = err.Error()
@@ -103,13 +120,14 @@ func (rt *Router) builtinPayloadsAdd(c *gin.Context) {
 						Cate:      lst[i].Cate,
 						Name:      dashboard.Name,
 						Tags:      dashboard.Tags,
+						UUID:      dashboard.UUID,
 						Content:   string(contentBytes),
 						CreatedBy: username,
 						UpdatedBy: username,
 					}
 
 					if err := bp.Add(rt.Ctx, username); err != nil {
-						reterr[bp.Name] = err.Error()
+						reterr[bp.Name] = i18n.Sprintf(c.GetHeader("X-Language"), err.Error())
 					}
 				}
 				continue
@@ -117,27 +135,32 @@ func (rt *Router) builtinPayloadsAdd(c *gin.Context) {
 
 			dashboard := Board{}
 			if err := json.Unmarshal([]byte(lst[i].Content), &dashboard); err != nil {
-				reterr[lst[i].Name] = err.Error()
+				reterr[lst[i].Name] = i18n.Sprintf(c.GetHeader("X-Language"), err.Error())
 				continue
 			}
 
+			if dashboard.UUID == 0 {
+				dashboard.UUID = time.Now().UnixNano()
+			}
+
 			bp := models.BuiltinPayload{
 				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] = err.Error()
+				reterr[bp.Name] = i18n.Sprintf(c.GetHeader("X-Language"), err.Error())
 			}
 		} else {
 			if err := lst[i].Add(rt.Ctx, username); err != nil {
-				reterr[lst[i].Name] = err.Error()
+				reterr[lst[i].Name] = i18n.Sprintf(c.GetHeader("X-Language"), err.Error())
 			}
 		}
 

center/router/router_login.go

@@ -262,6 +262,15 @@ func (rt *Router) loginCallback(c *gin.Context) {
 		user.FullSsoFields("oidc", ret.Username, ret.Nickname, ret.Phone, ret.Email, rt.Sso.OIDC.DefaultRoles)
 		// create user from oidc
 		ginx.Dangerous(user.Add(rt.Ctx))
+
+		if len(rt.Sso.OIDC.DefaultTeams) > 0 {
+			for _, gid := range rt.Sso.OIDC.DefaultTeams {
+				err = models.UserGroupMemberAdd(rt.Ctx, gid, user.Id)
+				if err != nil {
+					logger.Errorf("user:%v UserGroupMemberAdd: %s", user, err)
+				}
+			}
+		}
 	}
 
 	// set user login state

center/router/router_mute.go

@@ -35,7 +35,7 @@ func (rt *Router) alertMuteGetsByGids(c *gin.Context) {
 			ginx.Dangerous(err)
 
 			if len(gids) == 0 {
-				ginx.Bomb(http.StatusForbidden, "forbidden")
+				ginx.NewRender(c).Data([]int{}, nil)
 				return
 			}
 		}

center/router/router_recording_rule.go

@@ -34,7 +34,7 @@ func (rt *Router) recordingRuleGetsByGids(c *gin.Context) {
 			ginx.Dangerous(err)
 
 			if len(gids) == 0 {
-				ginx.Bomb(http.StatusForbidden, "forbidden")
+				ginx.NewRender(c).Data([]int{}, nil)
 				return
 			}
 		}

center/router/router_task.go

@@ -1,7 +1,6 @@
 package router
 
 import (
-	"net/http"
 	"time"
 
 	"github.com/ccfos/nightingale/v6/alert/sender"
@@ -53,7 +52,7 @@ func (rt *Router) taskGetsByGids(c *gin.Context) {
 			ginx.Dangerous(err)
 
 			if len(gids) == 0 {
-				ginx.Bomb(http.StatusForbidden, "forbidden")
+				ginx.NewRender(c).Data([]int{}, nil)
 				return
 			}
 		}

center/router/router_task_tpl.go

@@ -47,7 +47,7 @@ func (rt *Router) taskTplGetsByGids(c *gin.Context) {
 			ginx.Dangerous(err)
 
 			if len(gids) == 0 {
-				ginx.Bomb(http.StatusForbidden, "forbidden")
+				ginx.NewRender(c).Data([]int{}, nil)
 				return
 			}
 		}

center/router/router_user_group.go

@@ -10,6 +10,7 @@ import (
 	"github.com/gin-gonic/gin"
 	"github.com/toolkits/pkg/ginx"
 	"github.com/toolkits/pkg/logger"
+	"github.com/toolkits/pkg/str"
 )
 
 func (rt *Router) checkBusiGroupPerm(c *gin.Context) {
@@ -31,8 +32,36 @@ func (rt *Router) userGroupGets(c *gin.Context) {
 }
 
 func (rt *Router) userGroupGetsByService(c *gin.Context) {
-	lst, err := models.UserGroupGetAll(rt.Ctx)
-	ginx.NewRender(c).Data(lst, err)
+	ids := str.IdsInt64(ginx.QueryStr(c, "ids", ""))
+
+	if len(ids) == 0 {
+		lst, err := models.UserGroupGetAll(rt.Ctx)
+		ginx.Dangerous(err)
+		for i := 0; i < len(lst); i++ {
+			ids, err := models.MemberIds(rt.Ctx, lst[i].Id)
+			ginx.Dangerous(err)
+
+			lst[i].Users, err = models.UserGetsByIds(rt.Ctx, ids)
+			ginx.Dangerous(err)
+		}
+		ginx.NewRender(c).Data(lst, err)
+		return
+	}
+
+	lst := make([]models.UserGroup, 0)
+	for _, id := range ids {
+		ug := UserGroup(rt.Ctx, id)
+
+		ids, err := models.MemberIds(rt.Ctx, ug.Id)
+		ginx.Dangerous(err)
+
+		ug.Users, err = models.UserGetsByIds(rt.Ctx, ids)
+		ginx.Dangerous(err)
+
+		lst = append(lst, *ug)
+	}
+
+	ginx.NewRender(c).Data(lst, nil)
 }
 
 // user group member get by service

etc/config.toml

@@ -75,10 +75,11 @@ OpenRSA = false
 [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)/n9e_v6?charset=utf8mb4&parseTime=True&loc=Local&allowNativePasswords=true"
+# 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
+# mysql postgres sqlite
 DBType = "mysql"
 # unit: s
 MaxLifetime = 7200

go.mod

@@ -8,7 +8,7 @@ require (
 	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.3
+	github.com/flashcatcloud/ibex v1.3.4
 	github.com/gin-contrib/pprof v1.4.0
 	github.com/gin-gonic/gin v1.9.1
 	github.com/go-ldap/ldap/v3 v3.4.4
@@ -39,7 +39,8 @@ require (
 	gopkg.in/yaml.v2 v2.4.0
 	gorm.io/driver/mysql v1.4.4
 	gorm.io/driver/postgres v1.4.5
-	gorm.io/gorm v1.24.2
+	gorm.io/driver/sqlite v1.5.5
+	gorm.io/gorm v1.25.7-0.20240204074919-46816ad31dde
 )
 
 require (
@@ -77,6 +78,7 @@ require (
 	github.com/josharian/intern v1.0.0 // indirect
 	github.com/klauspost/cpuid/v2 v2.2.4 // indirect
 	github.com/leodido/go-urn v1.2.4 // indirect
+	github.com/mattn/go-sqlite3 v1.14.17 // indirect
 	github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect

go.sum

@@ -47,8 +47,8 @@ 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.3 h1:1Bxk5sgpsq4+e9bMchucGttg8Sw4KEpZy9tctFfj/cE=
-github.com/flashcatcloud/ibex v1.3.3/go.mod h1:T8hbMUySK2q6cXUaYp0AUVeKkU9Od2LjzwmB5lmTRBM=
+github.com/flashcatcloud/ibex v1.3.4 h1:s5MgQmDIYR18liBKPNl96kC/h1jOTZjIOlUWeSx0710=
+github.com/flashcatcloud/ibex v1.3.4/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=
@@ -209,6 +209,8 @@ github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Ky
 github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94=
 github.com/mattn/go-isatty v0.0.19 h1:JITubQf0MOLdlGRuRq+jtsDlekdYPia9ZFsB8h/APPA=
 github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
+github.com/mattn/go-sqlite3 v1.14.17 h1:mCRHCLDUBXgpKAqIKsaAaAsrAlbkeomtRFKXh2L6YIM=
+github.com/mattn/go-sqlite3 v1.14.17/go.mod h1:2eHXhiwb8IkHr+BDWZGa96P6+rkvnG63S2DGjv9HUNg=
 github.com/matttproud/golang_protobuf_extensions v1.0.4 h1:mmDVorXM7PCGKw94cs5zkfA9PSy5pEvNWRP0ET0TIVo=
 github.com/matttproud/golang_protobuf_extensions v1.0.4/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4=
 github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
@@ -464,9 +466,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/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.24.2 h1:9wR6CFD+G8nOusLdvkZelOEhpJVwwHzpQOUM+REd6U0=
-gorm.io/gorm v1.24.2/go.mod h1:DVrVomtaYTbqs7gB/x2uVvqnXzv0nqjB396B8cG4dBA=
+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=
 rsc.io/pdf v0.1.1/go.mod h1:n8OzWcQ6Sp37PL01nO98y4iUCRdTGarVfzxY20ICaU4=

integrations/AliYun/dashboards/arms-db.json

@@ -1,95 +1,106 @@
 {
+    "id": 0,
+    "group_id": 0,
     "name": "ARMS-DB",
-    "tags": "ARMS",
     "ident": "",
+    "tags": "ARMS",
+    "create_at": 0,
+    "create_by": "",
+    "update_at": 0,
+    "update_by": "",
     "configs": {
-        "version": "3.0.0",
         "links": [],
-        "var": [
-            {
-                "name": "datasource",
-                "type": "datasource",
-                "definition": "prometheus"
-            },
-            {
-                "type": "query",
-                "name": "service",
-                "definition": "label_values(arms_system_cpu_idle,service)",
-                "allOption": false,
-                "multi": false,
-                "reg": "",
-                "datasource": {
-                    "cate": "prometheus",
-                    "value": "${datasource}"
-                }
-            },
-            {
-                "type": "query",
-                "name": "instance",
-                "definition": "label_values(arms_db_requests_count{service=\"$service\"},endpoint)",
-                "allOption": false,
-                "multi": false,
-                "reg": "",
-                "datasource": {
-                    "cate": "prometheus",
-                    "value": "${datasource}"
-                }
-            },
-            {
-                "type": "query",
-                "name": "db",
-                "definition": "label_values(arms_db_requests_count{endpoint=\"${instance}\"},destId)",
-                "allValue": ".*",
-                "allOption": true,
-                "multi": false,
-                "reg": "",
-                "datasource": {
-                    "cate": "prometheus",
-                    "value": "${datasource}"
-                }
-            }
-        ],
         "panels": [
             {
-                "version": "3.0.0",
-                "id": "bd8c0aac-06df-4b2d-9456-cad8e7389499",
-                "type": "row",
-                "name": "概览(DB级别)",
                 "collapsed": true,
+                "id": "bd8c0aac-06df-4b2d-9456-cad8e7389499",
                 "layout": {
                     "h": 1,
+                    "i": "bd8c0aac-06df-4b2d-9456-cad8e7389499",
                     "w": 24,
                     "x": 0,
-                    "y": 0,
-                    "i": "bd8c0aac-06df-4b2d-9456-cad8e7389499"
+                    "y": 0
                 },
-                "panels": []
+                "name": "概览(DB级别)",
+                "panels": [],
+                "type": "row",
+                "version": "3.0.0"
             },
             {
-                "version": "3.0.0",
+                "custom": {
+                    "drawStyle": "lines",
+                    "fillOpacity": 0.3,
+                    "gradientMode": "opacity",
+                    "lineInterpolation": "linear",
+                    "lineWidth": 2,
+                    "stack": "off",
+                    "version": "3.0.0"
+                },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
                 "id": "8d2da301-e5e8-4b2f-9b31-59aa0835c312",
-                "type": "timeseries",
+                "layout": {
+                    "h": 8,
+                    "i": "8d2da301-e5e8-4b2f-9b31-59aa0835c312",
+                    "w": 12,
+                    "x": 0,
+                    "y": 1
+                },
+                "links": [],
+                "maxPerRow": 4,
                 "name": "请求数/每分钟",
-                "links": [],
-                "layout": {
-                    "h": 8,
-                    "w": 12,
-                    "x": 0,
-                    "y": 1,
-                    "i": "8d2da301-e5e8-4b2f-9b31-59aa0835c312"
+                "options": {
+                    "legend": {
+                        "displayMode": "hidden"
+                    },
+                    "thresholds": {
+                        "steps": [
+                            {
+                                "color": "#634CD9",
+                                "type": "base",
+                                "value": null
+                            }
+                        ]
+                    },
+                    "tooltip": {
+                        "mode": "all",
+                        "sort": "none"
+                    }
                 },
                 "targets": [
                     {
-                        "refId": "B",
                         "expr": "sum by (callType) (sum_over_time(arms_db_requests_count{endpoint=\"${instance}\",destId=~\"${db}\"}[1m]))",
-                        "legend": "{{callType}}入口"
+                        "legend": "{{callType}}入口",
+                        "refId": "B"
                     }
                 ],
+                "type": "timeseries",
+                "version": "3.0.0"
+            },
+            {
+                "custom": {
+                    "drawStyle": "lines",
+                    "fillOpacity": 0.3,
+                    "gradientMode": "opacity",
+                    "lineInterpolation": "linear",
+                    "lineWidth": 2,
+                    "stack": "off",
+                    "version": "3.0.0"
+                },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
+                "id": "ab2b0969-50e7-4e4b-962a-58be133e6aef",
+                "layout": {
+                    "h": 8,
+                    "i": "ab2b0969-50e7-4e4b-962a-58be133e6aef",
+                    "w": 12,
+                    "x": 12,
+                    "y": 1
+                },
+                "links": [],
+                "maxPerRow": 4,
+                "name": "响应时间/每分钟",
                 "options": {
-                    "tooltip": {
-                        "mode": "all",
-                        "sort": "none"
-                    },
                     "legend": {
                         "displayMode": "hidden"
                     },
@@ -97,101 +108,50 @@
                         "steps": [
                             {
                                 "color": "#634CD9",
-                                "value": null,
-                                "type": "base"
+                                "type": "base",
+                                "value": null
                             }
                         ]
+                    },
+                    "tooltip": {
+                        "mode": "all",
+                        "sort": "none"
                     }
                 },
-                "custom": {
-                    "version": "3.0.0",
-                    "drawStyle": "lines",
-                    "lineInterpolation": "linear",
-                    "fillOpacity": 0.3,
-                    "stack": "off",
-                    "lineWidth": 2,
-                    "gradientMode": "opacity"
-                },
-                "maxPerRow": 4,
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${datasource}"
-            },
-            {
-                "version": "3.0.0",
-                "id": "ab2b0969-50e7-4e4b-962a-58be133e6aef",
-                "type": "timeseries",
-                "name": "响应时间/每分钟",
-                "links": [],
-                "layout": {
-                    "h": 8,
-                    "w": 12,
-                    "x": 12,
-                    "y": 1,
-                    "i": "ab2b0969-50e7-4e4b-962a-58be133e6aef"
-                },
                 "targets": [
                     {
-                        "refId": "A",
                         "expr": "sum by (callType) (sum_over_time(arms_db_requests_seconds{endpoint=\"$instance\",destId=~\"^$db$\"}[1m]))/sum by (callType) (sum_over_time(arms_db_requests_count{endpoint=\"$instance\",destId=~\"^$db$\"}[1m]))",
-                        "legend": "{{callType}}入口"
+                        "legend": "{{callType}}入口",
+                        "refId": "A"
                     }
                 ],
-                "options": {
-                    "tooltip": {
-                        "mode": "all",
-                        "sort": "none"
-                    },
-                    "legend": {
-                        "displayMode": "hidden"
-                    },
-                    "thresholds": {
-                        "steps": [
-                            {
-                                "color": "#634CD9",
-                                "value": null,
-                                "type": "base"
-                            }
-                        ]
-                    }
-                },
-                "custom": {
-                    "version": "3.0.0",
-                    "drawStyle": "lines",
-                    "lineInterpolation": "linear",
-                    "fillOpacity": 0.3,
-                    "stack": "off",
-                    "lineWidth": 2,
-                    "gradientMode": "opacity"
-                },
-                "maxPerRow": 4,
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${datasource}"
+                "type": "timeseries",
+                "version": "3.0.0"
             },
             {
-                "version": "3.0.0",
+                "custom": {
+                    "drawStyle": "lines",
+                    "fillOpacity": 0.3,
+                    "gradientMode": "opacity",
+                    "lineInterpolation": "linear",
+                    "lineWidth": 2,
+                    "stack": "off",
+                    "version": "3.0.0"
+                },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
                 "id": "6bd5d219-0a94-4f90-b2e0-93ed3eeca9f0",
-                "type": "timeseries",
-                "name": "错误数/每分钟",
-                "links": [],
                 "layout": {
                     "h": 8,
+                    "i": "6bd5d219-0a94-4f90-b2e0-93ed3eeca9f0",
                     "w": 12,
                     "x": 0,
-                    "y": 9,
-                    "i": "6bd5d219-0a94-4f90-b2e0-93ed3eeca9f0"
+                    "y": 9
                 },
-                "targets": [
-                    {
-                        "refId": "A",
-                        "expr": "sum by (callType) (sum_over_time(arms_db_requests_error_count{endpoint=\"$instance\",destId=~\"$db\"}[1m]))",
-                        "legend": "{{callType}}入口"
-                    }
-                ],
+                "links": [],
+                "maxPerRow": 4,
+                "name": "错误数/每分钟",
                 "options": {
-                    "tooltip": {
-                        "mode": "all",
-                        "sort": "none"
-                    },
                     "legend": {
                         "displayMode": "hidden"
                     },
@@ -199,56 +159,51 @@
                         "steps": [
                             {
                                 "color": "#634CD9",
-                                "value": null,
-                                "type": "base"
+                                "type": "base",
+                                "value": null
                             }
                         ]
+                    },
+                    "tooltip": {
+                        "mode": "all",
+                        "sort": "none"
                     }
                 },
-                "custom": {
-                    "version": "3.0.0",
-                    "drawStyle": "lines",
-                    "lineInterpolation": "linear",
-                    "fillOpacity": 0.3,
-                    "stack": "off",
-                    "lineWidth": 2,
-                    "gradientMode": "opacity"
-                },
-                "maxPerRow": 4,
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${datasource}"
+                "targets": [
+                    {
+                        "expr": "sum by (callType) (sum_over_time(arms_db_requests_error_count{endpoint=\"$instance\",destId=~\"$db\"}[1m]))",
+                        "legend": "{{callType}}入口",
+                        "refId": "A"
+                    }
+                ],
+                "type": "timeseries",
+                "version": "3.0.0"
             },
             {
-                "version": "3.0.0",
-                "id": "d9093b86-5796-471a-a28c-fe1d8daf1721",
-                "type": "timeseries",
-                "name": "性能一览/每分钟",
+                "custom": {
+                    "drawStyle": "lines",
+                    "fillOpacity": 0.3,
+                    "gradientMode": "opacity",
+                    "lineInterpolation": "linear",
+                    "lineWidth": 2,
+                    "stack": "off",
+                    "version": "3.0.0"
+                },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
                 "description": "针对所有SQL的聚和指标",
-                "links": [],
+                "id": "d9093b86-5796-471a-a28c-fe1d8daf1721",
                 "layout": {
                     "h": 8,
+                    "i": "d9093b86-5796-471a-a28c-fe1d8daf1721",
                     "w": 12,
                     "x": 12,
-                    "y": 9,
-                    "i": "d9093b86-5796-471a-a28c-fe1d8daf1721"
+                    "y": 9
                 },
-                "targets": [
-                    {
-                        "refId": "A",
-                        "expr": "sum(sum_over_time(arms_db_requests_count{endpoint=\"$instance\",destId=~\"$db\"}[1m]))",
-                        "legend": "请求次数"
-                    },
-                    {
-                        "refId": "B",
-                        "expr": "sum(sum_over_time(arms_db_requests_seconds{endpoint=\"$instance\",destId=~\"$db\"}[1m]))/sum(sum_over_time(arms_db_requests_count{endpoint=\"$instance\",destId=~\"$db\"}[1m]))",
-                        "legend": "平均耗时"
-                    }
-                ],
+                "links": [],
+                "maxPerRow": 4,
+                "name": "性能一览/每分钟",
                 "options": {
-                    "tooltip": {
-                        "mode": "all",
-                        "sort": "none"
-                    },
                     "legend": {
                         "displayMode": "hidden"
                     },
@@ -256,25 +211,82 @@
                         "steps": [
                             {
                                 "color": "#634CD9",
-                                "value": null,
-                                "type": "base"
+                                "type": "base",
+                                "value": null
                             }
                         ]
+                    },
+                    "tooltip": {
+                        "mode": "all",
+                        "sort": "none"
                     }
                 },
-                "custom": {
-                    "version": "3.0.0",
-                    "drawStyle": "lines",
-                    "lineInterpolation": "linear",
-                    "fillOpacity": 0.3,
-                    "stack": "off",
-                    "lineWidth": 2,
-                    "gradientMode": "opacity"
-                },
-                "maxPerRow": 4,
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${datasource}"
+                "targets": [
+                    {
+                        "expr": "sum(sum_over_time(arms_db_requests_count{endpoint=\"$instance\",destId=~\"$db\"}[1m]))",
+                        "legend": "请求次数",
+                        "refId": "A"
+                    },
+                    {
+                        "expr": "sum(sum_over_time(arms_db_requests_seconds{endpoint=\"$instance\",destId=~\"$db\"}[1m]))/sum(sum_over_time(arms_db_requests_count{endpoint=\"$instance\",destId=~\"$db\"}[1m]))",
+                        "legend": "平均耗时",
+                        "refId": "B"
+                    }
+                ],
+                "type": "timeseries",
+                "version": "3.0.0"
             }
-        ]
-    }
-}
+        ],
+        "var": [
+            {
+                "definition": "prometheus",
+                "name": "datasource",
+                "type": "datasource"
+            },
+            {
+                "allOption": false,
+                "datasource": {
+                    "cate": "prometheus",
+                    "value": "${datasource}"
+                },
+                "definition": "label_values(arms_system_cpu_idle,service)",
+                "multi": false,
+                "name": "service",
+                "reg": "",
+                "type": "query"
+            },
+            {
+                "allOption": false,
+                "datasource": {
+                    "cate": "prometheus",
+                    "value": "${datasource}"
+                },
+                "definition": "label_values(arms_db_requests_count{service=\"$service\"},endpoint)",
+                "multi": false,
+                "name": "instance",
+                "reg": "",
+                "type": "query"
+            },
+            {
+                "allOption": true,
+                "allValue": ".*",
+                "datasource": {
+                    "cate": "prometheus",
+                    "value": "${datasource}"
+                },
+                "definition": "label_values(arms_db_requests_count{endpoint=\"${instance}\"},destId)",
+                "multi": false,
+                "name": "db",
+                "reg": "",
+                "type": "query"
+            }
+        ],
+        "version": "3.0.0"
+    },
+    "public": 0,
+    "public_cate": 0,
+    "bgids": null,
+    "built_in": 0,
+    "hide": 0,
+    "uuid": 1717556327092680000
+}

integrations/AliYun/dashboards/arms-jvm-service.json

@@ -1,7 +1,13 @@
 {
+    "id": 0,
+    "group_id": 0,
     "name": "阿里云 ARMS-JVM-SERVICE",
-    "tags": "JVM ARMS",
     "ident": "",
+    "tags": "JVM ARMS",
+    "create_at": 0,
+    "create_by": "",
+    "update_at": 0,
+    "update_by": "",
     "configs": {
         "panels": [
             {
@@ -770,14 +776,14 @@
                 "type": "datasource"
             },
             {
-                "name": "service",
-                "label": "service",
-                "type": "query",
                 "datasource": {
                     "cate": "prometheus",
                     "value": "${prom}"
                 },
-                "definition": "label_values(arms_jvm_buffer_pool_count, service)"
+                "definition": "label_values(arms_jvm_buffer_pool_count, service)",
+                "label": "service",
+                "name": "service",
+                "type": "query"
             },
             {
                 "datasource": {
@@ -791,5 +797,11 @@
             }
         ],
         "version": "3.0.0"
-    }
-}
+    },
+    "public": 0,
+    "public_cate": 0,
+    "bgids": null,
+    "built_in": 0,
+    "hide": 0,
+    "uuid": 1717556327094704000
+}

integrations/AliYun/dashboards/arms-machine.json

@@ -1,337 +1,304 @@
 {
+    "id": 0,
+    "group_id": 0,
     "name": "ARMS-Machine",
-    "tags": "ARMS",
     "ident": "",
+    "tags": "ARMS",
+    "create_at": 0,
+    "create_by": "",
+    "update_at": 0,
+    "update_by": "",
     "configs": {
-        "version": "3.0.0",
         "links": [],
-        "var": [
-            {
-                "name": "datasource",
-                "type": "datasource",
-                "definition": "prometheus"
-            },
-            {
-                "type": "query",
-                "name": "service",
-                "definition": "label_values(arms_system_cpu_idle,service)",
-                "allOption": false,
-                "multi": false,
-                "reg": "",
-                "datasource": {
-                    "cate": "prometheus",
-                    "value": "${datasource}"
-                }
-            },
-            {
-                "type": "query",
-                "name": "host",
-                "definition": "label_values(arms_system_cpu_idle{service=\"$service\"},host)",
-                "allValue": "*",
-                "allOption": false,
-                "multi": false,
-                "reg": "",
-                "datasource": {
-                    "cate": "prometheus",
-                    "value": "${datasource}"
-                }
-            }
-        ],
         "panels": [
             {
-                "version": "3.0.0",
-                "id": "8865eacb-f0f6-45fa-912a-8494907c48d6",
-                "type": "row",
-                "name": "系统信息",
                 "collapsed": true,
+                "id": "8865eacb-f0f6-45fa-912a-8494907c48d6",
                 "layout": {
                     "h": 1,
+                    "i": "8865eacb-f0f6-45fa-912a-8494907c48d6",
                     "w": 24,
                     "x": 0,
-                    "y": 0,
-                    "i": "8865eacb-f0f6-45fa-912a-8494907c48d6"
+                    "y": 0
                 },
-                "panels": []
+                "name": "系统信息",
+                "panels": [],
+                "type": "row",
+                "version": "3.0.0"
             },
             {
-                "version": "3.0.0",
+                "custom": {
+                    "drawStyle": "lines",
+                    "fillOpacity": 0.3,
+                    "gradientMode": "opacity",
+                    "lineInterpolation": "linear",
+                    "lineWidth": 2,
+                    "stack": "off",
+                    "version": "3.0.0"
+                },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
                 "id": "7fd3186b-6190-44c7-ad05-1c81993f27c9",
-                "type": "timeseries",
+                "layout": {
+                    "h": 9,
+                    "i": "7fd3186b-6190-44c7-ad05-1c81993f27c9",
+                    "w": 24,
+                    "x": 0,
+                    "y": 1
+                },
+                "links": [],
+                "maxPerRow": 4,
                 "name": "CPU",
-                "links": [],
-                "layout": {
-                    "h": 9,
-                    "w": 24,
-                    "x": 0,
-                    "y": 1,
-                    "i": "7fd3186b-6190-44c7-ad05-1c81993f27c9"
+                "options": {
+                    "legend": {
+                        "displayMode": "hidden"
+                    },
+                    "thresholds": {
+                        "steps": [
+                            {
+                                "color": "#634CD9",
+                                "type": "base",
+                                "value": null
+                            }
+                        ]
+                    },
+                    "tooltip": {
+                        "mode": "all",
+                        "sort": "none"
+                    }
                 },
                 "targets": [
                     {
-                        "refId": "A",
                         "expr": "max(arms_system_cpu_system{host=~\"$host\"})",
-                        "legend": "系统CPU使用率"
+                        "legend": "系统CPU使用率",
+                        "refId": "A"
                     },
                     {
-                        "refId": "B",
                         "expr": "max(arms_system_cpu_io_wait{host=~\"$host\"})",
-                        "legend": "等待IO完成的CPU使用率"
+                        "legend": "等待IO完成的CPU使用率",
+                        "refId": "B"
                     },
                     {
-                        "refId": "C",
                         "expr": "max(arms_system_cpu_user{host=~\"$host\"})",
-                        "legend": "用户CPU使用率"
+                        "legend": "用户CPU使用率",
+                        "refId": "C"
                     },
                     {
-                        "refId": "D",
                         "expr": "max(arms_system_cpu_system{host=\"$host\"})+max(arms_system_cpu_io_wait{host=~\"$host\"})+max(arms_system_cpu_user{host=\"$host\"})",
-                        "legend": "总和"
+                        "legend": "总和",
+                        "refId": "D"
                     }
                 ],
-                "options": {
-                    "tooltip": {
-                        "mode": "all",
-                        "sort": "none"
-                    },
-                    "legend": {
-                        "displayMode": "hidden"
-                    },
-                    "thresholds": {
-                        "steps": [
-                            {
-                                "color": "#634CD9",
-                                "value": null,
-                                "type": "base"
-                            }
-                        ]
-                    }
-                },
-                "custom": {
-                    "version": "3.0.0",
-                    "drawStyle": "lines",
-                    "lineInterpolation": "linear",
-                    "fillOpacity": 0.3,
-                    "stack": "off",
-                    "lineWidth": 2,
-                    "gradientMode": "opacity"
-                },
-                "maxPerRow": 4,
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${datasource}"
+                "type": "timeseries",
+                "version": "3.0.0"
             },
             {
-                "version": "3.0.0",
+                "custom": {
+                    "drawStyle": "lines",
+                    "fillOpacity": 0.3,
+                    "gradientMode": "opacity",
+                    "lineInterpolation": "linear",
+                    "lineWidth": 2,
+                    "stack": "off",
+                    "version": "3.0.0"
+                },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
                 "id": "60fc127b-b565-40de-9346-860062d5ea58",
-                "type": "timeseries",
+                "layout": {
+                    "h": 9,
+                    "i": "60fc127b-b565-40de-9346-860062d5ea58",
+                    "w": 24,
+                    "x": 0,
+                    "y": 10
+                },
+                "links": [],
+                "maxPerRow": 4,
                 "name": "内存",
-                "links": [],
-                "layout": {
-                    "h": 9,
-                    "w": 24,
-                    "x": 0,
-                    "y": 10,
-                    "i": "60fc127b-b565-40de-9346-860062d5ea58"
+                "options": {
+                    "legend": {
+                        "displayMode": "hidden"
+                    },
+                    "thresholds": {
+                        "steps": [
+                            {
+                                "color": "#634CD9",
+                                "type": "base",
+                                "value": null
+                            }
+                        ]
+                    },
+                    "tooltip": {
+                        "mode": "all",
+                        "sort": "none"
+                    }
                 },
                 "targets": [
                     {
-                        "refId": "A",
                         "expr": "max(arms_system_mem_used_bytes{host=\"$host\"})",
-                        "legend": "系统的已经使用的内存"
+                        "legend": "系统的已经使用的内存",
+                        "refId": "A"
                     },
                     {
-                        "refId": "C",
                         "expr": "max(arms_system_mem_total_bytes{host=\"$host\"})",
-                        "legend": "总和"
+                        "legend": "总和",
+                        "refId": "C"
                     },
                     {
-                        "refId": "D",
                         "expr": "max(arms_system_mem_buffers_bytes{host=\"$host\"})",
-                        "legend": "系统的BufferCache的内存数"
+                        "legend": "系统的BufferCache的内存数",
+                        "refId": "D"
                     },
                     {
-                        "refId": "E",
                         "expr": "max(arms_system_mem_cached_bytes{host=\"$host\"})",
-                        "legend": "系统的PageCache里的内存数"
+                        "legend": "系统的PageCache里的内存数",
+                        "refId": "E"
                     },
                     {
-                        "refId": "B",
                         "expr": "max(arms_system_mem_free_bytes{host=\"$host\"})",
-                        "legend": "系统的空闲内存"
+                        "legend": "系统的空闲内存",
+                        "refId": "B"
                     }
                 ],
-                "options": {
-                    "tooltip": {
-                        "mode": "all",
-                        "sort": "none"
-                    },
-                    "legend": {
-                        "displayMode": "hidden"
-                    },
-                    "thresholds": {
-                        "steps": [
-                            {
-                                "color": "#634CD9",
-                                "value": null,
-                                "type": "base"
-                            }
-                        ]
-                    }
-                },
-                "custom": {
-                    "version": "3.0.0",
-                    "drawStyle": "lines",
-                    "lineInterpolation": "linear",
-                    "fillOpacity": 0.3,
-                    "stack": "off",
-                    "lineWidth": 2,
-                    "gradientMode": "opacity"
-                },
-                "maxPerRow": 4,
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${datasource}"
+                "type": "timeseries",
+                "version": "3.0.0"
             },
             {
-                "version": "3.0.0",
+                "custom": {
+                    "drawStyle": "lines",
+                    "fillOpacity": 0.3,
+                    "gradientMode": "opacity",
+                    "lineInterpolation": "linear",
+                    "lineWidth": 2,
+                    "stack": "off",
+                    "version": "3.0.0"
+                },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
                 "id": "5229fd8c-3e26-44e6-a091-145c3caef46f",
-                "type": "timeseries",
+                "layout": {
+                    "h": 9,
+                    "i": "5229fd8c-3e26-44e6-a091-145c3caef46f",
+                    "w": 24,
+                    "x": 0,
+                    "y": 19
+                },
+                "links": [],
+                "maxPerRow": 4,
                 "name": "负载",
-                "links": [],
-                "layout": {
-                    "h": 9,
-                    "w": 24,
-                    "x": 0,
-                    "y": 19,
-                    "i": "5229fd8c-3e26-44e6-a091-145c3caef46f"
+                "options": {
+                    "legend": {
+                        "displayMode": "hidden"
+                    },
+                    "thresholds": {
+                        "steps": [
+                            {
+                                "color": "#634CD9",
+                                "type": "base",
+                                "value": null
+                            }
+                        ]
+                    },
+                    "tooltip": {
+                        "mode": "all",
+                        "sort": "none"
+                    }
                 },
                 "targets": [
                     {
-                        "refId": "A",
                         "expr": "max(arms_system_load{host=\"$host\"})",
-                        "legend": "负载"
+                        "legend": "负载",
+                        "refId": "A"
                     }
                 ],
-                "options": {
-                    "tooltip": {
-                        "mode": "all",
-                        "sort": "none"
-                    },
-                    "legend": {
-                        "displayMode": "hidden"
-                    },
-                    "thresholds": {
-                        "steps": [
-                            {
-                                "color": "#634CD9",
-                                "value": null,
-                                "type": "base"
-                            }
-                        ]
-                    }
-                },
-                "custom": {
-                    "version": "3.0.0",
-                    "drawStyle": "lines",
-                    "lineInterpolation": "linear",
-                    "fillOpacity": 0.3,
-                    "stack": "off",
-                    "lineWidth": 2,
-                    "gradientMode": "opacity"
-                },
-                "maxPerRow": 4,
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${datasource}"
+                "type": "timeseries",
+                "version": "3.0.0"
             },
             {
-                "version": "3.0.0",
+                "custom": {
+                    "drawStyle": "lines",
+                    "fillOpacity": 0.3,
+                    "gradientMode": "opacity",
+                    "lineInterpolation": "linear",
+                    "lineWidth": 2,
+                    "stack": "off",
+                    "version": "3.0.0"
+                },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
                 "id": "60872e48-5445-4ee1-b0a2-19be72b6f737",
-                "type": "timeseries",
+                "layout": {
+                    "h": 9,
+                    "i": "60872e48-5445-4ee1-b0a2-19be72b6f737",
+                    "w": 24,
+                    "x": 0,
+                    "y": 28
+                },
+                "links": [],
+                "maxPerRow": 4,
                 "name": "磁盘",
-                "links": [],
-                "layout": {
-                    "h": 9,
-                    "w": 24,
-                    "x": 0,
-                    "y": 28,
-                    "i": "60872e48-5445-4ee1-b0a2-19be72b6f737"
+                "options": {
+                    "legend": {
+                        "displayMode": "hidden"
+                    },
+                    "thresholds": {
+                        "steps": [
+                            {
+                                "color": "#634CD9",
+                                "type": "base",
+                                "value": null
+                            }
+                        ]
+                    },
+                    "tooltip": {
+                        "mode": "all",
+                        "sort": "none"
+                    }
                 },
                 "targets": [
                     {
-                        "refId": "A",
                         "expr": "max(arms_system_disk_free_bytes{host=\"$host\"})",
-                        "legend": "可用磁盘容量"
+                        "legend": "可用磁盘容量",
+                        "refId": "A"
                     },
                     {
-                        "refId": "B",
                         "expr": "max(arms_system_disk_total_bytes{host=\"$host\"})",
-                        "legend": "总磁盘容量"
+                        "legend": "总磁盘容量",
+                        "refId": "B"
                     },
                     {
-                        "refId": "C",
                         "expr": "max(arms_system_disk_total_bytes{host=~\"$host\"})-max(arms_system_disk_free_bytes{host=~\"$host\"})",
-                        "legend": "已使用磁盘容量"
+                        "legend": "已使用磁盘容量",
+                        "refId": "C"
                     }
                 ],
-                "options": {
-                    "tooltip": {
-                        "mode": "all",
-                        "sort": "none"
-                    },
-                    "legend": {
-                        "displayMode": "hidden"
-                    },
-                    "thresholds": {
-                        "steps": [
-                            {
-                                "color": "#634CD9",
-                                "value": null,
-                                "type": "base"
-                            }
-                        ]
-                    }
-                },
-                "custom": {
-                    "version": "3.0.0",
-                    "drawStyle": "lines",
-                    "lineInterpolation": "linear",
-                    "fillOpacity": 0.3,
-                    "stack": "off",
-                    "lineWidth": 2,
-                    "gradientMode": "opacity"
-                },
-                "maxPerRow": 4,
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${datasource}"
+                "type": "timeseries",
+                "version": "3.0.0"
             },
             {
-                "version": "3.0.0",
+                "custom": {
+                    "drawStyle": "lines",
+                    "fillOpacity": 0.3,
+                    "gradientMode": "opacity",
+                    "lineInterpolation": "linear",
+                    "lineWidth": 2,
+                    "stack": "off",
+                    "version": "3.0.0"
+                },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
                 "id": "517cc410-c4a0-4923-a902-3c102f06cd0c",
-                "type": "timeseries",
-                "name": "网络流量(Byte)/每分钟",
-                "links": [],
                 "layout": {
                     "h": 9,
+                    "i": "517cc410-c4a0-4923-a902-3c102f06cd0c",
                     "w": 24,
                     "x": 0,
-                    "y": 37,
-                    "i": "517cc410-c4a0-4923-a902-3c102f06cd0c"
+                    "y": 37
                 },
-                "targets": [
-                    {
-                        "refId": "A",
-                        "expr": "max(max_over_time(arms_system_net_in_bytes{host=~\"$host\"}[1m]))",
-                        "legend": "网络接收的字节数"
-                    },
-                    {
-                        "refId": "B",
-                        "expr": "max(max_over_time(arms_system_net_out_bytes{host=~\"$host\"}[1m]))",
-                        "legend": "网络发送的字节数"
-                    }
-                ],
+                "links": [],
+                "maxPerRow": 4,
+                "name": "网络流量(Byte)/每分钟",
                 "options": {
-                    "tooltip": {
-                        "mode": "all",
-                        "sort": "none"
-                    },
                     "legend": {
                         "displayMode": "hidden"
                     },
@@ -339,65 +306,55 @@
                         "steps": [
                             {
                                 "color": "#634CD9",
-                                "value": null,
-                                "type": "base"
+                                "type": "base",
+                                "value": null
                             }
                         ]
+                    },
+                    "tooltip": {
+                        "mode": "all",
+                        "sort": "none"
                     }
                 },
-                "custom": {
-                    "version": "3.0.0",
-                    "drawStyle": "lines",
-                    "lineInterpolation": "linear",
-                    "fillOpacity": 0.3,
-                    "stack": "off",
-                    "lineWidth": 2,
-                    "gradientMode": "opacity"
-                },
-                "maxPerRow": 4,
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${datasource}"
+                "targets": [
+                    {
+                        "expr": "max(max_over_time(arms_system_net_in_bytes{host=~\"$host\"}[1m]))",
+                        "legend": "网络接收的字节数",
+                        "refId": "A"
+                    },
+                    {
+                        "expr": "max(max_over_time(arms_system_net_out_bytes{host=~\"$host\"}[1m]))",
+                        "legend": "网络发送的字节数",
+                        "refId": "B"
+                    }
+                ],
+                "type": "timeseries",
+                "version": "3.0.0"
             },
             {
-                "version": "3.0.0",
+                "custom": {
+                    "drawStyle": "lines",
+                    "fillOpacity": 0.3,
+                    "gradientMode": "opacity",
+                    "lineInterpolation": "linear",
+                    "lineWidth": 2,
+                    "stack": "off",
+                    "version": "3.0.0"
+                },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
                 "id": "752d89ce-1136-4ddf-b4b9-1a232a8840db",
-                "type": "timeseries",
-                "name": "网络数据包(个)/每分钟",
-                "links": [],
                 "layout": {
                     "h": 9,
+                    "i": "752d89ce-1136-4ddf-b4b9-1a232a8840db",
                     "w": 24,
                     "x": 0,
-                    "y": 46,
-                    "i": "752d89ce-1136-4ddf-b4b9-1a232a8840db"
+                    "y": 46
                 },
-                "targets": [
-                    {
-                        "refId": "A",
-                        "expr": "max(max_over_time(arms_system_net_in_packets{host=~\"$host\"}[1m]))",
-                        "legend": "网络接收的报文数"
-                    },
-                    {
-                        "refId": "C",
-                        "expr": "max(max_over_time(arms_system_net_out_packets{host=~\"$host\"}[1m]))",
-                        "legend": "网络发送的报文数"
-                    },
-                    {
-                        "refId": "D",
-                        "expr": "max(max_over_time(arms_system_net_in_errs{host=~\"$host\"}[1m]))",
-                        "legend": "网络接收的错误数"
-                    },
-                    {
-                        "refId": "E",
-                        "expr": "max(max_over_time(arms_system_net_out_errs{host=~\"$host\"}[1m]))",
-                        "legend": "网络丢弃报文数"
-                    }
-                ],
+                "links": [],
+                "maxPerRow": 4,
+                "name": "网络数据包(个)/每分钟",
                 "options": {
-                    "tooltip": {
-                        "mode": "all",
-                        "sort": "none"
-                    },
                     "legend": {
                         "displayMode": "hidden"
                     },
@@ -405,25 +362,80 @@
                         "steps": [
                             {
                                 "color": "#634CD9",
-                                "value": null,
-                                "type": "base"
+                                "type": "base",
+                                "value": null
                             }
                         ]
+                    },
+                    "tooltip": {
+                        "mode": "all",
+                        "sort": "none"
                     }
                 },
-                "custom": {
-                    "version": "3.0.0",
-                    "drawStyle": "lines",
-                    "lineInterpolation": "linear",
-                    "fillOpacity": 0.3,
-                    "stack": "off",
-                    "lineWidth": 2,
-                    "gradientMode": "opacity"
-                },
-                "maxPerRow": 4,
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${datasource}"
+                "targets": [
+                    {
+                        "expr": "max(max_over_time(arms_system_net_in_packets{host=~\"$host\"}[1m]))",
+                        "legend": "网络接收的报文数",
+                        "refId": "A"
+                    },
+                    {
+                        "expr": "max(max_over_time(arms_system_net_out_packets{host=~\"$host\"}[1m]))",
+                        "legend": "网络发送的报文数",
+                        "refId": "C"
+                    },
+                    {
+                        "expr": "max(max_over_time(arms_system_net_in_errs{host=~\"$host\"}[1m]))",
+                        "legend": "网络接收的错误数",
+                        "refId": "D"
+                    },
+                    {
+                        "expr": "max(max_over_time(arms_system_net_out_errs{host=~\"$host\"}[1m]))",
+                        "legend": "网络丢弃报文数",
+                        "refId": "E"
+                    }
+                ],
+                "type": "timeseries",
+                "version": "3.0.0"
             }
-        ]
-    }
-}
+        ],
+        "var": [
+            {
+                "definition": "prometheus",
+                "name": "datasource",
+                "type": "datasource"
+            },
+            {
+                "allOption": false,
+                "datasource": {
+                    "cate": "prometheus",
+                    "value": "${datasource}"
+                },
+                "definition": "label_values(arms_system_cpu_idle,service)",
+                "multi": false,
+                "name": "service",
+                "reg": "",
+                "type": "query"
+            },
+            {
+                "allOption": false,
+                "allValue": "*",
+                "datasource": {
+                    "cate": "prometheus",
+                    "value": "${datasource}"
+                },
+                "definition": "label_values(arms_system_cpu_idle{service=\"$service\"},host)",
+                "multi": false,
+                "name": "host",
+                "reg": "",
+                "type": "query"
+            }
+        ],
+        "version": "3.0.0"
+    },
+    "public": 0,
+    "public_cate": 0,
+    "bgids": null,
+    "built_in": 0,
+    "hide": 0,
+    "uuid": 1717556327098444000
+}

integrations/AliYun/dashboards/cdn.json

@@ -1,352 +1,364 @@
 {
-  "name": "阿里云CDN",
-  "tags": "CDN",
-  "ident": "",
-  "configs": {
-    "var": [
-      {
-        "name": "datasource",
-        "label": "datasource",
-        "type": "datasource",
-        "definition": "prometheus"
-      },
-      {
-        "name": "instance_id",
-        "label": "instance_id",
-        "type": "query",
-        "datasource": {
-          "cate": "prometheus",
-          "value": "${datasource}"
-        },
-        "definition": "label_values(aliyun_acs_cdn_qps_isp_value, instance_id)"
-      }
-    ],
-    "panels": [
-      {
-        "type": "timeseries",
-        "id": "0430c7e9-7372-45e3-9bb2-c5939baf6bfa",
-        "layout": {
-          "h": 4,
-          "w": 8,
-          "x": 0,
-          "y": 0,
-          "i": "0430c7e9-7372-45e3-9bb2-c5939baf6bfa",
-          "isResizable": true
-        },
-        "version": "3.0.0",
-        "datasourceCate": "prometheus",
-        "datasourceValue": "${datasource}",
-        "targets": [
-          {
-            "refId": "A",
-            "expr": "aliyun_acs_cdn_bps_isp_value{instance_id=\"$instance_id\"}",
-            "legend": "峰值 {{instance_id}"
-          },
-          {
-            "expr": "aliyun_acs_cdn_internet_out_average{instance_id=\"$instance_id\"}",
-            "refId": "B",
-            "legend": "均值 {{instance_id}}"
-          }
+    "id": 0,
+    "group_id": 0,
+    "name": "阿里云CDN",
+    "ident": "",
+    "tags": "CDN",
+    "create_at": 0,
+    "create_by": "",
+    "update_at": 0,
+    "update_by": "",
+    "configs": {
+        "panels": [
+            {
+                "custom": {
+                    "drawStyle": "lines",
+                    "fillOpacity": 0.3,
+                    "gradientMode": "opacity",
+                    "lineInterpolation": "smooth",
+                    "lineWidth": 2,
+                    "scaleDistribution": {
+                        "type": "linear"
+                    },
+                    "spanNulls": true,
+                    "stack": "off"
+                },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
+                "id": "0430c7e9-7372-45e3-9bb2-c5939baf6bfa",
+                "layout": {
+                    "h": 4,
+                    "i": "0430c7e9-7372-45e3-9bb2-c5939baf6bfa",
+                    "isResizable": true,
+                    "w": 8,
+                    "x": 0,
+                    "y": 0
+                },
+                "maxPerRow": 4,
+                "name": "网络带宽(bits/s)",
+                "options": {
+                    "legend": {
+                        "displayMode": "hidden"
+                    },
+                    "standardOptions": {},
+                    "thresholds": {
+                        "steps": [
+                            {
+                                "color": "#634CD9",
+                                "type": "base",
+                                "value": null
+                            }
+                        ]
+                    },
+                    "tooltip": {
+                        "mode": "all",
+                        "sort": "none"
+                    }
+                },
+                "targets": [
+                    {
+                        "expr": "aliyun_acs_cdn_bps_isp_value{instance_id=\"$instance_id\"}",
+                        "legend": "峰值 {{instance_id}",
+                        "refId": "A"
+                    },
+                    {
+                        "expr": "aliyun_acs_cdn_internet_out_average{instance_id=\"$instance_id\"}",
+                        "legend": "均值 {{instance_id}}",
+                        "refId": "B"
+                    }
+                ],
+                "transformations": [
+                    {
+                        "id": "organize",
+                        "options": {}
+                    }
+                ],
+                "type": "timeseries",
+                "version": "3.0.0"
+            },
+            {
+                "custom": {
+                    "drawStyle": "lines",
+                    "fillOpacity": 0.3,
+                    "gradientMode": "opacity",
+                    "lineInterpolation": "smooth",
+                    "lineWidth": 2,
+                    "scaleDistribution": {
+                        "type": "linear"
+                    },
+                    "spanNulls": false,
+                    "stack": "off"
+                },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
+                "id": "b438ae81-3dfc-4ed8-b66f-262a4b507e4b",
+                "layout": {
+                    "h": 4,
+                    "i": "b438ae81-3dfc-4ed8-b66f-262a4b507e4b",
+                    "isResizable": true,
+                    "w": 8,
+                    "x": 8,
+                    "y": 0
+                },
+                "maxPerRow": 4,
+                "name": "下行流量(bytes)",
+                "options": {
+                    "legend": {
+                        "displayMode": "hidden"
+                    },
+                    "standardOptions": {},
+                    "thresholds": {
+                        "steps": [
+                            {
+                                "color": "#634CD9",
+                                "type": "base",
+                                "value": null
+                            }
+                        ]
+                    },
+                    "tooltip": {
+                        "mode": "all",
+                        "sort": "none"
+                    }
+                },
+                "targets": [
+                    {
+                        "expr": "aliyun_acs_cdn_internet_out_isp_value{instance_id=\"$instance_id\"}",
+                        "legend": "{{instance_id}}",
+                        "refId": "A"
+                    }
+                ],
+                "transformations": [
+                    {
+                        "id": "organize",
+                        "options": {}
+                    }
+                ],
+                "type": "timeseries",
+                "version": "3.0.0"
+            },
+            {
+                "custom": {
+                    "drawStyle": "lines",
+                    "fillOpacity": 0.3,
+                    "gradientMode": "opacity",
+                    "lineInterpolation": "smooth",
+                    "lineWidth": 2,
+                    "scaleDistribution": {
+                        "type": "linear"
+                    },
+                    "spanNulls": false,
+                    "stack": "off"
+                },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
+                "id": "af0874c7-3123-437a-93bc-448f6de8b43b",
+                "layout": {
+                    "h": 4,
+                    "i": "c6e41c04-d591-4117-bdf1-5dc6e1f4c084",
+                    "isResizable": true,
+                    "w": 8,
+                    "x": 16,
+                    "y": 0
+                },
+                "maxPerRow": 4,
+                "name": "每秒访问次数(个)",
+                "options": {
+                    "legend": {
+                        "displayMode": "hidden"
+                    },
+                    "standardOptions": {},
+                    "thresholds": {
+                        "steps": [
+                            {
+                                "color": "#634CD9",
+                                "type": "base",
+                                "value": null
+                            }
+                        ]
+                    },
+                    "tooltip": {
+                        "mode": "all",
+                        "sort": "none"
+                    }
+                },
+                "targets": [
+                    {
+                        "expr": "aliyun_acs_cdn_qps_isp_value{instance_id=\"$instance_id\"}",
+                        "legend": "{{instance_id}}",
+                        "refId": "A"
+                    }
+                ],
+                "transformations": [
+                    {
+                        "id": "organize",
+                        "options": {}
+                    }
+                ],
+                "type": "timeseries",
+                "version": "3.0.0"
+            },
+            {
+                "custom": {
+                    "drawStyle": "lines",
+                    "fillOpacity": 0.3,
+                    "gradientMode": "opacity",
+                    "lineInterpolation": "smooth",
+                    "lineWidth": 2,
+                    "scaleDistribution": {
+                        "type": "linear"
+                    },
+                    "spanNulls": true,
+                    "stack": "off"
+                },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
+                "id": "ec8fcf96-1691-4e45-9a5f-2f183021b434",
+                "layout": {
+                    "h": 4,
+                    "i": "ec8fcf96-1691-4e45-9a5f-2f183021b434",
+                    "isResizable": true,
+                    "w": 8,
+                    "x": 0,
+                    "y": 4
+                },
+                "maxPerRow": 4,
+                "name": "边缘状态码4XX占比(%)",
+                "options": {
+                    "legend": {
+                        "displayMode": "hidden"
+                    },
+                    "standardOptions": {
+                        "util": "percent"
+                    },
+                    "thresholds": {
+                        "steps": [
+                            {
+                                "color": "#634CD9",
+                                "type": "base",
+                                "value": null
+                            }
+                        ]
+                    },
+                    "tooltip": {
+                        "mode": "all",
+                        "sort": "none"
+                    }
+                },
+                "targets": [
+                    {
+                        "expr": "aliyun_acs_cdn_code4xx_isp_value{instance_id=\"$instance_id\"}",
+                        "legend": "峰值{{instance_id}}",
+                        "refId": "A"
+                    },
+                    {
+                        "expr": "aliyun_acs_cdn_bps_average{instance_id=\"$instance_id\"}",
+                        "legend": "均值 {{instance_id}}",
+                        "refId": "B"
+                    }
+                ],
+                "transformations": [
+                    {
+                        "id": "organize",
+                        "options": {}
+                    }
+                ],
+                "type": "timeseries",
+                "version": "3.0.0"
+            },
+            {
+                "custom": {
+                    "drawStyle": "lines",
+                    "fillOpacity": 0.3,
+                    "gradientMode": "opacity",
+                    "lineInterpolation": "smooth",
+                    "lineWidth": 2,
+                    "scaleDistribution": {
+                        "type": "linear"
+                    },
+                    "spanNulls": true,
+                    "stack": "off"
+                },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
+                "id": "25b6e3fa-f6dd-4452-8025-3c7d9a9a592c",
+                "layout": {
+                    "h": 4,
+                    "i": "e884b781-1bd4-476c-a807-a68a6417764e",
+                    "isResizable": true,
+                    "w": 8,
+                    "x": 8,
+                    "y": 4
+                },
+                "maxPerRow": 4,
+                "name": "边缘状态码5XX占比(%)",
+                "options": {
+                    "legend": {
+                        "displayMode": "hidden"
+                    },
+                    "standardOptions": {
+                        "util": "percent"
+                    },
+                    "thresholds": {
+                        "steps": [
+                            {
+                                "color": "#634CD9",
+                                "type": "base",
+                                "value": null
+                            }
+                        ]
+                    },
+                    "tooltip": {
+                        "mode": "all",
+                        "sort": "none"
+                    }
+                },
+                "targets": [
+                    {
+                        "expr": "aliyun_acs_cdn_code5xx_isp_value{instance_id=\"$instance_id\"}",
+                        "legend": "峰值{{instance_id}}",
+                        "refId": "A"
+                    },
+                    {
+                        "expr": "aliyun_acs_cdn_bps_average{instance_id=\"$instance_id\"}",
+                        "legend": "均值 {{instance_id}}",
+                        "refId": "B"
+                    }
+                ],
+                "transformations": [
+                    {
+                        "id": "organize",
+                        "options": {}
+                    }
+                ],
+                "type": "timeseries",
+                "version": "3.0.0"
+            }
         ],
-        "transformations": [
-          {
-            "id": "organize",
-            "options": {}
-          }
+        "var": [
+            {
+                "definition": "prometheus",
+                "label": "datasource",
+                "name": "datasource",
+                "type": "datasource"
+            },
+            {
+                "datasource": {
+                    "cate": "prometheus",
+                    "value": "${datasource}"
+                },
+                "definition": "label_values(aliyun_acs_cdn_qps_isp_value, instance_id)",
+                "label": "instance_id",
+                "name": "instance_id",
+                "type": "query"
+            }
         ],
-        "name": "网络带宽(bits/s)",
-        "maxPerRow": 4,
-        "options": {
-          "tooltip": {
-            "mode": "all",
-            "sort": "none"
-          },
-          "legend": {
-            "displayMode": "hidden"
-          },
-          "standardOptions": {},
-          "thresholds": {
-            "steps": [
-              {
-                "color": "#634CD9",
-                "value": null,
-                "type": "base"
-              }
-            ]
-          }
-        },
-        "custom": {
-          "drawStyle": "lines",
-          "lineInterpolation": "smooth",
-          "spanNulls": true,
-          "lineWidth": 2,
-          "fillOpacity": 0.3,
-          "gradientMode": "opacity",
-          "stack": "off",
-          "scaleDistribution": {
-            "type": "linear"
-          }
-        }
-      },
-      {
-        "type": "timeseries",
-        "id": "b438ae81-3dfc-4ed8-b66f-262a4b507e4b",
-        "layout": {
-          "h": 4,
-          "w": 8,
-          "x": 8,
-          "y": 0,
-          "i": "b438ae81-3dfc-4ed8-b66f-262a4b507e4b",
-          "isResizable": true
-        },
-        "version": "3.0.0",
-        "datasourceCate": "prometheus",
-        "datasourceValue": "${datasource}",
-        "targets": [
-          {
-            "refId": "A",
-            "expr": "aliyun_acs_cdn_internet_out_isp_value{instance_id=\"$instance_id\"}",
-            "legend": "{{instance_id}}"
-          }
-        ],
-        "transformations": [
-          {
-            "id": "organize",
-            "options": {}
-          }
-        ],
-        "name": "下行流量(bytes)",
-        "maxPerRow": 4,
-        "options": {
-          "tooltip": {
-            "mode": "all",
-            "sort": "none"
-          },
-          "legend": {
-            "displayMode": "hidden"
-          },
-          "standardOptions": {},
-          "thresholds": {
-            "steps": [
-              {
-                "color": "#634CD9",
-                "value": null,
-                "type": "base"
-              }
-            ]
-          }
-        },
-        "custom": {
-          "drawStyle": "lines",
-          "lineInterpolation": "smooth",
-          "spanNulls": false,
-          "lineWidth": 2,
-          "fillOpacity": 0.3,
-          "gradientMode": "opacity",
-          "stack": "off",
-          "scaleDistribution": {
-            "type": "linear"
-          }
-        }
-      },
-      {
-        "type": "timeseries",
-        "id": "af0874c7-3123-437a-93bc-448f6de8b43b",
-        "layout": {
-          "h": 4,
-          "w": 8,
-          "x": 16,
-          "y": 0,
-          "i": "c6e41c04-d591-4117-bdf1-5dc6e1f4c084",
-          "isResizable": true
-        },
-        "version": "3.0.0",
-        "datasourceCate": "prometheus",
-        "datasourceValue": "${datasource}",
-        "targets": [
-          {
-            "refId": "A",
-            "expr": "aliyun_acs_cdn_qps_isp_value{instance_id=\"$instance_id\"}",
-            "legend": "{{instance_id}}"
-          }
-        ],
-        "transformations": [
-          {
-            "id": "organize",
-            "options": {}
-          }
-        ],
-        "name": "每秒访问次数(个)",
-        "maxPerRow": 4,
-        "options": {
-          "tooltip": {
-            "mode": "all",
-            "sort": "none"
-          },
-          "legend": {
-            "displayMode": "hidden"
-          },
-          "standardOptions": {},
-          "thresholds": {
-            "steps": [
-              {
-                "color": "#634CD9",
-                "value": null,
-                "type": "base"
-              }
-            ]
-          }
-        },
-        "custom": {
-          "drawStyle": "lines",
-          "lineInterpolation": "smooth",
-          "spanNulls": false,
-          "lineWidth": 2,
-          "fillOpacity": 0.3,
-          "gradientMode": "opacity",
-          "stack": "off",
-          "scaleDistribution": {
-            "type": "linear"
-          }
-        }
-      },
-      {
-        "type": "timeseries",
-        "id": "ec8fcf96-1691-4e45-9a5f-2f183021b434",
-        "layout": {
-          "h": 4,
-          "w": 8,
-          "x": 0,
-          "y": 4,
-          "i": "ec8fcf96-1691-4e45-9a5f-2f183021b434",
-          "isResizable": true
-        },
-        "version": "3.0.0",
-        "datasourceCate": "prometheus",
-        "datasourceValue": "${datasource}",
-        "targets": [
-          {
-            "refId": "A",
-            "expr": "aliyun_acs_cdn_code4xx_isp_value{instance_id=\"$instance_id\"}",
-            "legend": "峰值{{instance_id}}"
-          },
-          {
-            "expr": "aliyun_acs_cdn_bps_average{instance_id=\"$instance_id\"}",
-            "refId": "B",
-            "legend": "均值 {{instance_id}}"
-          }
-        ],
-        "transformations": [
-          {
-            "id": "organize",
-            "options": {}
-          }
-        ],
-        "name": "边缘状态码4XX占比(%)",
-        "maxPerRow": 4,
-        "options": {
-          "tooltip": {
-            "mode": "all",
-            "sort": "none"
-          },
-          "legend": {
-            "displayMode": "hidden"
-          },
-          "standardOptions": {
-            "util": "percent"
-          },
-          "thresholds": {
-            "steps": [
-              {
-                "color": "#634CD9",
-                "value": null,
-                "type": "base"
-              }
-            ]
-          }
-        },
-        "custom": {
-          "drawStyle": "lines",
-          "lineInterpolation": "smooth",
-          "spanNulls": true,
-          "lineWidth": 2,
-          "fillOpacity": 0.3,
-          "gradientMode": "opacity",
-          "stack": "off",
-          "scaleDistribution": {
-            "type": "linear"
-          }
-        }
-      },
-      {
-        "type": "timeseries",
-        "id": "25b6e3fa-f6dd-4452-8025-3c7d9a9a592c",
-        "layout": {
-          "h": 4,
-          "w": 8,
-          "x": 8,
-          "y": 4,
-          "i": "e884b781-1bd4-476c-a807-a68a6417764e",
-          "isResizable": true
-        },
-        "version": "3.0.0",
-        "datasourceCate": "prometheus",
-        "datasourceValue": "${datasource}",
-        "targets": [
-          {
-            "refId": "A",
-            "expr": "aliyun_acs_cdn_code5xx_isp_value{instance_id=\"$instance_id\"}",
-            "legend": "峰值{{instance_id}}"
-          },
-          {
-            "expr": "aliyun_acs_cdn_bps_average{instance_id=\"$instance_id\"}",
-            "refId": "B",
-            "legend": "均值 {{instance_id}}"
-          }
-        ],
-        "transformations": [
-          {
-            "id": "organize",
-            "options": {}
-          }
-        ],
-        "name": "边缘状态码5XX占比(%)",
-        "maxPerRow": 4,
-        "options": {
-          "tooltip": {
-            "mode": "all",
-            "sort": "none"
-          },
-          "legend": {
-            "displayMode": "hidden"
-          },
-          "standardOptions": {
-            "util": "percent"
-          },
-          "thresholds": {
-            "steps": [
-              {
-                "color": "#634CD9",
-                "value": null,
-                "type": "base"
-              }
-            ]
-          }
-        },
-        "custom": {
-          "drawStyle": "lines",
-          "lineInterpolation": "smooth",
-          "spanNulls": true,
-          "lineWidth": 2,
-          "fillOpacity": 0.3,
-          "gradientMode": "opacity",
-          "stack": "off",
-          "scaleDistribution": {
-            "type": "linear"
-          }
-        }
-      }
-    ],
-    "version": "3.0.0"
-  }
-}
+        "version": "3.0.0"
+    },
+    "public": 0,
+    "public_cate": 0,
+    "bgids": null,
+    "built_in": 0,
+    "hide": 0,
+    "uuid": 1717556327104499000
+}

integrations/AliYun/dashboards/ecs.json

@@ -1,324 +1,336 @@
 {
-  "name": "阿里云ECS",
-  "tags": "",
-  "ident": "",
-  "configs": {
-    "panels": [
-      {
-        "custom": {
-          "drawStyle": "lines",
-          "fillOpacity": 0.3,
-          "gradientMode": "opacity",
-          "lineInterpolation": "smooth",
-          "lineWidth": 2,
-          "scaleDistribution": {
-            "type": "linear"
-          },
-          "spanNulls": false,
-          "stack": "off"
-        },
-        "datasourceCate": "prometheus",
-        "datasourceName": "Default",
-        "id": "8606d5ad-c3c7-4b1d-86bf-474d3302ee17",
-        "layout": {
-          "h": 4,
-          "i": "8606d5ad-c3c7-4b1d-86bf-474d3302ee17",
-          "isResizable": true,
-          "w": 12,
-          "x": 0,
-          "y": 0
-        },
-        "maxPerRow": 4,
-        "name": "CPU平均使用率",
-        "options": {
-          "legend": {
-            "displayMode": "hidden"
-          },
-          "standardOptions": {},
-          "thresholds": {
-            "steps": [
-              {
-                "color": "#634CD9",
-                "type": "base",
-                "value": null
-              }
-            ]
-          },
-          "tooltip": {
-            "mode": "all",
-            "sort": "none"
-          }
-        },
-        "targets": [
-          {
-            "expr": "sum(aliyun_acs_ecs_dashboard_cpu_utilization_average{ident=~\"$ident\"}) by (ident,instance_id)",
-            "refId": "A"
-          }
-        ],
-        "type": "timeseries",
-        "version": "2.0.0",
-        "datasourceValue": "${datasource}"
-      },
-      {
-        "custom": {
-          "drawStyle": "lines",
-          "fillOpacity": 0.3,
-          "gradientMode": "opacity",
-          "lineInterpolation": "smooth",
-          "lineWidth": 2,
-          "scaleDistribution": {
-            "type": "linear"
-          },
-          "spanNulls": false,
-          "stack": "off"
-        },
-        "datasourceCate": "prometheus",
-        "datasourceName": "Default",
-        "id": "c7034fe3-5521-4867-a8bd-429767cc03a2",
-        "layout": {
-          "h": 4,
-          "i": "55404296-0bd9-409d-aeaf-e9c7cceea0dd",
-          "isResizable": true,
-          "w": 12,
-          "x": 12,
-          "y": 0
-        },
-        "maxPerRow": 4,
-        "name": "内存平均使用率",
-        "options": {
-          "legend": {
-            "displayMode": "hidden"
-          },
-          "standardOptions": {},
-          "thresholds": {
-            "steps": [
-              {
-                "color": "#634CD9",
-                "type": "base",
-                "value": null
-              }
-            ]
-          },
-          "tooltip": {
-            "mode": "all",
-            "sort": "none"
-          }
-        },
-        "targets": [
-          {
-            "expr": "sum(aliyun_acs_ecs_dashboard_memory_usedutilization_average{ident=~\"$ident\"}) by (ident,instance_id)",
-            "refId": "A"
-          }
-        ],
-        "type": "timeseries",
-        "version": "2.0.0",
-        "datasourceValue": "${datasource}"
-      },
-      {
-        "custom": {
-          "drawStyle": "lines",
-          "fillOpacity": 0.3,
-          "gradientMode": "opacity",
-          "lineInterpolation": "smooth",
-          "lineWidth": 2,
-          "scaleDistribution": {
-            "type": "linear"
-          },
-          "spanNulls": false,
-          "stack": "off"
-        },
-        "datasourceCate": "prometheus",
-        "datasourceName": "Default",
-        "id": "e4c11925-b359-4edb-9269-4bdd4d230224",
-        "layout": {
-          "h": 4,
-          "i": "0c7b3a5a-ef12-4349-be9b-7a245bf01418",
-          "isResizable": true,
-          "w": 12,
-          "x": 0,
-          "y": 4
-        },
-        "maxPerRow": 4,
-        "name": "系统负载[5m]",
-        "options": {
-          "legend": {
-            "displayMode": "hidden"
-          },
-          "standardOptions": {
-            "util": "percent"
-          },
-          "thresholds": {
-            "steps": [
-              {
-                "color": "#634CD9",
-                "type": "base",
-                "value": null
-              }
-            ]
-          },
-          "tooltip": {
-            "mode": "all",
-            "sort": "none"
-          }
-        },
-        "targets": [
-          {
-            "expr": "sum(aliyun_acs_ecs_dashboard_load_5m_average{ident=~\"$ident\"}) by (ident,instance_id)",
-            "legend": "{{ident}} {{instance_id}} 5分钟负载",
-            "refId": "B"
-          }
-        ],
-        "type": "timeseries",
-        "version": "2.0.0",
-        "datasourceValue": "${datasource}"
-      },
-      {
-        "custom": {
-          "drawStyle": "lines",
-          "fillOpacity": 0.3,
-          "gradientMode": "opacity",
-          "lineInterpolation": "smooth",
-          "lineWidth": 2,
-          "scaleDistribution": {
-            "type": "linear"
-          },
-          "spanNulls": false,
-          "stack": "off"
-        },
-        "datasourceCate": "prometheus",
-        "datasourceName": "Default",
-        "id": "388d4da6-eb1f-48f1-955d-37579809dfec",
-        "layout": {
-          "h": 4,
-          "i": "5abea3d2-ea82-4bdb-a4f0-4dd1316c0377",
-          "isResizable": true,
-          "w": 12,
-          "x": 12,
-          "y": 5
-        },
-        "maxPerRow": 4,
-        "name": "磁盘平均使用率",
-        "options": {
-          "legend": {
-            "displayMode": "hidden"
-          },
-          "standardOptions": {
-            "util": "percent"
-          },
-          "thresholds": {
-            "steps": [
-              {
-                "color": "#634CD9",
-                "type": "base",
-                "value": null
-              }
-            ]
-          },
-          "tooltip": {
-            "mode": "all",
-            "sort": "none"
-          }
-        },
-        "targets": [
-          {
-            "expr": "sum(aliyun_acs_ecs_dashboard_diskusage_utilization_average{ident=~\"$ident\"}) by (ident,instance_id)",
-            "refId": "A"
-          }
-        ],
-        "type": "timeseries",
-        "version": "2.0.0",
-        "datasourceValue": "${datasource}"
-      },
-      {
-        "custom": {
-          "drawStyle": "lines",
-          "fillOpacity": 0.3,
-          "gradientMode": "opacity",
-          "lineInterpolation": "smooth",
-          "lineWidth": 2,
-          "scaleDistribution": {
-            "type": "linear"
-          },
-          "spanNulls": false,
-          "stack": "off"
-        },
-        "datasourceCate": "prometheus",
-        "id": "f8d19cc9-0168-4c13-b9a9-c7980eced974",
-        "layout": {
-          "h": 4,
-          "i": "f8d19cc9-0168-4c13-b9a9-c7980eced974",
-          "w": 12,
-          "x": 0,
-          "y": 9
-        },
-        "maxPerRow": 4,
-        "name": "网络流量",
-        "options": {
-          "legend": {
-            "displayMode": "hidden"
-          },
-          "standardOptions": {
-            "util": "bitsSI"
-          },
-          "thresholds": {
-            "steps": [
-              {
-                "color": "#634CD9",
-                "type": "base",
-                "value": null
-              }
-            ]
-          },
-          "tooltip": {
-            "mode": "all",
-            "sort": "none"
-          }
-        },
-        "targets": [
-          {
-            "expr": "sum(aliyun_acs_ecs_dashboard_intranet_in_average{ident=~\"$ident\"}) by (ident,instance_id)",
-            "legend": "主机：{{ident}} 实例ID: {{instance_id}} 入流量",
-            "refId": "A",
-            "step": 300,
-            "time": {
-              "end": "now",
-              "start": "now-5m"
+    "id": 0,
+    "group_id": 0,
+    "name": "阿里云ECS",
+    "ident": "",
+    "tags": "",
+    "create_at": 0,
+    "create_by": "",
+    "update_at": 0,
+    "update_by": "",
+    "configs": {
+        "panels": [
+            {
+                "custom": {
+                    "drawStyle": "lines",
+                    "fillOpacity": 0.3,
+                    "gradientMode": "opacity",
+                    "lineInterpolation": "smooth",
+                    "lineWidth": 2,
+                    "scaleDistribution": {
+                        "type": "linear"
+                    },
+                    "spanNulls": false,
+                    "stack": "off"
+                },
+                "datasourceCate": "prometheus",
+                "datasourceName": "Default",
+                "datasourceValue": "${datasource}",
+                "id": "8606d5ad-c3c7-4b1d-86bf-474d3302ee17",
+                "layout": {
+                    "h": 4,
+                    "i": "8606d5ad-c3c7-4b1d-86bf-474d3302ee17",
+                    "isResizable": true,
+                    "w": 12,
+                    "x": 0,
+                    "y": 0
+                },
+                "maxPerRow": 4,
+                "name": "CPU平均使用率",
+                "options": {
+                    "legend": {
+                        "displayMode": "hidden"
+                    },
+                    "standardOptions": {},
+                    "thresholds": {
+                        "steps": [
+                            {
+                                "color": "#634CD9",
+                                "type": "base",
+                                "value": null
+                            }
+                        ]
+                    },
+                    "tooltip": {
+                        "mode": "all",
+                        "sort": "none"
+                    }
+                },
+                "targets": [
+                    {
+                        "expr": "sum(aliyun_acs_ecs_dashboard_cpu_utilization_average{ident=~\"$ident\"}) by (ident,instance_id)",
+                        "refId": "A"
+                    }
+                ],
+                "type": "timeseries",
+                "version": "2.0.0"
+            },
+            {
+                "custom": {
+                    "drawStyle": "lines",
+                    "fillOpacity": 0.3,
+                    "gradientMode": "opacity",
+                    "lineInterpolation": "smooth",
+                    "lineWidth": 2,
+                    "scaleDistribution": {
+                        "type": "linear"
+                    },
+                    "spanNulls": false,
+                    "stack": "off"
+                },
+                "datasourceCate": "prometheus",
+                "datasourceName": "Default",
+                "datasourceValue": "${datasource}",
+                "id": "c7034fe3-5521-4867-a8bd-429767cc03a2",
+                "layout": {
+                    "h": 4,
+                    "i": "55404296-0bd9-409d-aeaf-e9c7cceea0dd",
+                    "isResizable": true,
+                    "w": 12,
+                    "x": 12,
+                    "y": 0
+                },
+                "maxPerRow": 4,
+                "name": "内存平均使用率",
+                "options": {
+                    "legend": {
+                        "displayMode": "hidden"
+                    },
+                    "standardOptions": {},
+                    "thresholds": {
+                        "steps": [
+                            {
+                                "color": "#634CD9",
+                                "type": "base",
+                                "value": null
+                            }
+                        ]
+                    },
+                    "tooltip": {
+                        "mode": "all",
+                        "sort": "none"
+                    }
+                },
+                "targets": [
+                    {
+                        "expr": "sum(aliyun_acs_ecs_dashboard_memory_usedutilization_average{ident=~\"$ident\"}) by (ident,instance_id)",
+                        "refId": "A"
+                    }
+                ],
+                "type": "timeseries",
+                "version": "2.0.0"
+            },
+            {
+                "custom": {
+                    "drawStyle": "lines",
+                    "fillOpacity": 0.3,
+                    "gradientMode": "opacity",
+                    "lineInterpolation": "smooth",
+                    "lineWidth": 2,
+                    "scaleDistribution": {
+                        "type": "linear"
+                    },
+                    "spanNulls": false,
+                    "stack": "off"
+                },
+                "datasourceCate": "prometheus",
+                "datasourceName": "Default",
+                "datasourceValue": "${datasource}",
+                "id": "e4c11925-b359-4edb-9269-4bdd4d230224",
+                "layout": {
+                    "h": 4,
+                    "i": "0c7b3a5a-ef12-4349-be9b-7a245bf01418",
+                    "isResizable": true,
+                    "w": 12,
+                    "x": 0,
+                    "y": 4
+                },
+                "maxPerRow": 4,
+                "name": "系统负载[5m]",
+                "options": {
+                    "legend": {
+                        "displayMode": "hidden"
+                    },
+                    "standardOptions": {
+                        "util": "percent"
+                    },
+                    "thresholds": {
+                        "steps": [
+                            {
+                                "color": "#634CD9",
+                                "type": "base",
+                                "value": null
+                            }
+                        ]
+                    },
+                    "tooltip": {
+                        "mode": "all",
+                        "sort": "none"
+                    }
+                },
+                "targets": [
+                    {
+                        "expr": "sum(aliyun_acs_ecs_dashboard_load_5m_average{ident=~\"$ident\"}) by (ident,instance_id)",
+                        "legend": "{{ident}} {{instance_id}} 5分钟负载",
+                        "refId": "B"
+                    }
+                ],
+                "type": "timeseries",
+                "version": "2.0.0"
+            },
+            {
+                "custom": {
+                    "drawStyle": "lines",
+                    "fillOpacity": 0.3,
+                    "gradientMode": "opacity",
+                    "lineInterpolation": "smooth",
+                    "lineWidth": 2,
+                    "scaleDistribution": {
+                        "type": "linear"
+                    },
+                    "spanNulls": false,
+                    "stack": "off"
+                },
+                "datasourceCate": "prometheus",
+                "datasourceName": "Default",
+                "datasourceValue": "${datasource}",
+                "id": "388d4da6-eb1f-48f1-955d-37579809dfec",
+                "layout": {
+                    "h": 4,
+                    "i": "5abea3d2-ea82-4bdb-a4f0-4dd1316c0377",
+                    "isResizable": true,
+                    "w": 12,
+                    "x": 12,
+                    "y": 5
+                },
+                "maxPerRow": 4,
+                "name": "磁盘平均使用率",
+                "options": {
+                    "legend": {
+                        "displayMode": "hidden"
+                    },
+                    "standardOptions": {
+                        "util": "percent"
+                    },
+                    "thresholds": {
+                        "steps": [
+                            {
+                                "color": "#634CD9",
+                                "type": "base",
+                                "value": null
+                            }
+                        ]
+                    },
+                    "tooltip": {
+                        "mode": "all",
+                        "sort": "none"
+                    }
+                },
+                "targets": [
+                    {
+                        "expr": "sum(aliyun_acs_ecs_dashboard_diskusage_utilization_average{ident=~\"$ident\"}) by (ident,instance_id)",
+                        "refId": "A"
+                    }
+                ],
+                "type": "timeseries",
+                "version": "2.0.0"
+            },
+            {
+                "custom": {
+                    "drawStyle": "lines",
+                    "fillOpacity": 0.3,
+                    "gradientMode": "opacity",
+                    "lineInterpolation": "smooth",
+                    "lineWidth": 2,
+                    "scaleDistribution": {
+                        "type": "linear"
+                    },
+                    "spanNulls": false,
+                    "stack": "off"
+                },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
+                "id": "f8d19cc9-0168-4c13-b9a9-c7980eced974",
+                "layout": {
+                    "h": 4,
+                    "i": "f8d19cc9-0168-4c13-b9a9-c7980eced974",
+                    "w": 12,
+                    "x": 0,
+                    "y": 9
+                },
+                "maxPerRow": 4,
+                "name": "网络流量",
+                "options": {
+                    "legend": {
+                        "displayMode": "hidden"
+                    },
+                    "standardOptions": {
+                        "util": "bitsSI"
+                    },
+                    "thresholds": {
+                        "steps": [
+                            {
+                                "color": "#634CD9",
+                                "type": "base",
+                                "value": null
+                            }
+                        ]
+                    },
+                    "tooltip": {
+                        "mode": "all",
+                        "sort": "none"
+                    }
+                },
+                "targets": [
+                    {
+                        "expr": "sum(aliyun_acs_ecs_dashboard_intranet_in_average{ident=~\"$ident\"}) by (ident,instance_id)",
+                        "legend": "主机：{{ident}} 实例ID: {{instance_id}} 入流量",
+                        "refId": "A",
+                        "step": 300,
+                        "time": {
+                            "end": "now",
+                            "start": "now-5m"
+                        }
+                    },
+                    {
+                        "expr": "sum(aliyun_acs_ecs_dashboard_intranet_out_average{ident=~\"$ident\"}) by (ident,instance_id)",
+                        "legend": "主机：{{ident}} 实例ID: {{instance_id}} 出流量",
+                        "refId": "B",
+                        "step": 300,
+                        "time": {
+                            "end": "now",
+                            "start": "now-5m"
+                        }
+                    }
+                ],
+                "type": "timeseries",
+                "version": "2.0.0"
             }
-          },
-          {
-            "expr": "sum(aliyun_acs_ecs_dashboard_intranet_out_average{ident=~\"$ident\"}) by (ident,instance_id)",
-            "legend": "主机：{{ident}} 实例ID: {{instance_id}} 出流量",
-            "refId": "B",
-            "step": 300,
-            "time": {
-              "end": "now",
-              "start": "now-5m"
-            }
-          }
         ],
-        "type": "timeseries",
-        "version": "2.0.0",
-        "datasourceValue": "${datasource}"
-      }
-    ],
-    "var": [
-      {
-        "name": "datasource",
-        "type": "datasource",
-        "definition": "prometheus"
-      },
-      {
-        "allOption": true,
-        "datasource": {
-          "cate": "prometheus",
-          "value": "${datasource}"
-        },
-        "definition": "label_values(aliyun_acs_ecs_dashboard_cpu_utilization_average,ident)",
-        "multi": true,
-        "name": "ident",
-        "type": "query"
-      }
-    ],
-    "version": "3.0.0"
-  }
-}
+        "var": [
+            {
+                "definition": "prometheus",
+                "name": "datasource",
+                "type": "datasource"
+            },
+            {
+                "allOption": true,
+                "datasource": {
+                    "cate": "prometheus",
+                    "value": "${datasource}"
+                },
+                "definition": "label_values(aliyun_acs_ecs_dashboard_cpu_utilization_average,ident)",
+                "multi": true,
+                "name": "ident",
+                "type": "query"
+            }
+        ],
+        "version": "3.0.0"
+    },
+    "public": 0,
+    "public_cate": 0,
+    "bgids": null,
+    "built_in": 0,
+    "hide": 0,
+    "uuid": 1717556327106006000
+}

integrations/AliYun/dashboards/mse.json

@@ -1,474 +1,486 @@
 {
-  "name": "MSE监控大盘",
-  "tags": "",
-  "ident": "MSE-Monitor",
-  "configs": {
-    "var": [
-      {
-        "name": "datasource",
-        "type": "datasource",
-        "definition": "prometheus"
-      },
-      {
-        "name": "envoy_clusterid",
-        "label": "envoy_clusterid",
-        "type": "query",
-        "hide": false,
-        "definition": "label_values(envoy_cluster_bind_errors, envoy_clusterid)",
-        "multi": false,
-        "datasource": {
-          "cate": "prometheus",
-          "value": "${datasource}"
-        }
-      }
-    ],
-    "panels": [
-      {
-        "type": "stat",
-        "id": "aba69dc0-5a11-4bcd-add9-335b5a677bee",
-        "layout": {
-          "h": 5,
-          "w": 6,
-          "x": 0,
-          "y": 0,
-          "i": "aba69dc0-5a11-4bcd-add9-335b5a677bee",
-          "isResizable": true
-        },
-        "version": "3.0.0",
-        "datasourceCate": "prometheus",
-        "datasourceValue": 7,
-        "targets": [
-          {
-            "refId": "A",
-            "expr": "sum(delta(envoy_http_rq_total{envoy_clusterid=\"$envoy_clusterid\"}[1m]))"
-          }
+    "id": 0,
+    "group_id": 0,
+    "name": "MSE监控大盘",
+    "ident": "MSE-Monitor",
+    "tags": "",
+    "create_at": 0,
+    "create_by": "",
+    "update_at": 0,
+    "update_by": "",
+    "configs": {
+        "panels": [
+            {
+                "custom": {
+                    "calc": "lastNotNull",
+                    "colSpan": 1,
+                    "colorMode": "value",
+                    "graphMode": "none",
+                    "textMode": "valueAndName",
+                    "textSize": {},
+                    "valueField": "Value"
+                },
+                "datasourceCate": "prometheus",
+                "datasourceValue": 7,
+                "id": "aba69dc0-5a11-4bcd-add9-335b5a677bee",
+                "layout": {
+                    "h": 5,
+                    "i": "aba69dc0-5a11-4bcd-add9-335b5a677bee",
+                    "isResizable": true,
+                    "w": 6,
+                    "x": 0,
+                    "y": 0
+                },
+                "maxPerRow": 4,
+                "name": "PV（一分钟）",
+                "options": {
+                    "standardOptions": {},
+                    "thresholds": {
+                        "steps": [
+                            {
+                                "color": "#634CD9",
+                                "type": "base",
+                                "value": null
+                            }
+                        ]
+                    }
+                },
+                "targets": [
+                    {
+                        "expr": "sum(delta(envoy_http_rq_total{envoy_clusterid=\"$envoy_clusterid\"}[1m]))",
+                        "refId": "A"
+                    }
+                ],
+                "transformations": [
+                    {
+                        "id": "organize",
+                        "options": {}
+                    }
+                ],
+                "type": "stat",
+                "version": "3.0.0"
+            },
+            {
+                "custom": {
+                    "calc": "lastNotNull",
+                    "detailName": "详情",
+                    "legengPosition": "right"
+                },
+                "datasourceCate": "prometheus",
+                "datasourceValue": 7,
+                "id": "e34a272e-6125-4afa-a2c1-80d7d9078673",
+                "layout": {
+                    "h": 5,
+                    "i": "116a5607-5860-426e-a560-d3241da88b57",
+                    "isResizable": true,
+                    "w": 9,
+                    "x": 6,
+                    "y": 0
+                },
+                "maxPerRow": 4,
+                "name": "请求成功率",
+                "options": {
+                    "standardOptions": {
+                        "decimals": 0,
+                        "util": "percentUnit"
+                    }
+                },
+                "targets": [
+                    {
+                        "expr": "sum(delta(envoy_http_downstream_rq{envoy_clusterid=\"$envoy_clusterid\"}[3m])) by (response_code_class)",
+                        "legend": "",
+                        "refId": "A"
+                    }
+                ],
+                "transformations": [
+                    {
+                        "id": "organize",
+                        "options": {}
+                    }
+                ],
+                "type": "pie",
+                "version": "3.0.0"
+            },
+            {
+                "custom": {
+                    "drawStyle": "lines",
+                    "fillOpacity": 0.3,
+                    "gradientMode": "opacity",
+                    "lineInterpolation": "smooth",
+                    "lineWidth": 2,
+                    "scaleDistribution": {
+                        "type": "linear"
+                    },
+                    "spanNulls": false,
+                    "stack": "off"
+                },
+                "datasourceCate": "prometheus",
+                "datasourceValue": 7,
+                "id": "a8917108-58a6-479a-8ec4-571f1b5a79c2",
+                "layout": {
+                    "h": 5,
+                    "i": "9be66a1f-c0bb-47dc-a3c0-ad43b588789b",
+                    "isResizable": true,
+                    "w": 9,
+                    "x": 15,
+                    "y": 0
+                },
+                "maxPerRow": 4,
+                "name": "请求量（一分钟）",
+                "options": {
+                    "legend": {
+                        "displayMode": "list"
+                    },
+                    "standardOptions": {
+                        "util": "bytesSI"
+                    },
+                    "thresholds": {
+                        "steps": [
+                            {
+                                "color": "#634CD9",
+                                "type": "base",
+                                "value": null
+                            }
+                        ]
+                    },
+                    "tooltip": {
+                        "mode": "all",
+                        "sort": "none"
+                    }
+                },
+                "targets": [
+                    {
+                        "expr": "sum(delta(envoy_http_downstream_cx_rx_bytes_total{envoy_clusterid=\"$envoy_clusterid\"}[1m]))",
+                        "legend": "",
+                        "refId": "A"
+                    }
+                ],
+                "transformations": [
+                    {
+                        "id": "organize",
+                        "options": {}
+                    }
+                ],
+                "type": "timeseries",
+                "version": "3.0.0"
+            },
+            {
+                "custom": {
+                    "drawStyle": "lines",
+                    "fillOpacity": 0.3,
+                    "gradientMode": "opacity",
+                    "lineInterpolation": "smooth",
+                    "lineWidth": 2,
+                    "scaleDistribution": {
+                        "type": "linear"
+                    },
+                    "spanNulls": false,
+                    "stack": "off"
+                },
+                "datasourceCate": "prometheus",
+                "datasourceValue": 7,
+                "id": "1b102bee-ccc9-49a0-a1d1-cc097bb6a987",
+                "layout": {
+                    "h": 6,
+                    "i": "1b102bee-ccc9-49a0-a1d1-cc097bb6a987",
+                    "isResizable": true,
+                    "w": 8,
+                    "x": 0,
+                    "y": 5
+                },
+                "maxPerRow": 4,
+                "name": "平均延迟",
+                "options": {
+                    "legend": {
+                        "displayMode": "list"
+                    },
+                    "standardOptions": {
+                        "util": "milliseconds"
+                    },
+                    "thresholds": {
+                        "steps": [
+                            {
+                                "color": "#634CD9",
+                                "type": "base",
+                                "value": null
+                            }
+                        ]
+                    },
+                    "tooltip": {
+                        "mode": "all",
+                        "sort": "none"
+                    }
+                },
+                "targets": [
+                    {
+                        "expr": "sum(rate(envoy_http_downstream_rq_time_sum{envoy_clusterid=\"$envoy_clusterid\"}[10m])) / sum(rate(envoy_http_downstream_rq_time_count{envoy_clusterid=\"$envoy_clusterid\"}[10m]))",
+                        "legend": "",
+                        "refId": "A"
+                    }
+                ],
+                "transformations": [
+                    {
+                        "id": "organize",
+                        "options": {}
+                    }
+                ],
+                "type": "timeseries",
+                "version": "3.0.0"
+            },
+            {
+                "custom": {
+                    "drawStyle": "lines",
+                    "fillOpacity": 0.3,
+                    "gradientMode": "opacity",
+                    "lineInterpolation": "smooth",
+                    "lineWidth": 2,
+                    "scaleDistribution": {
+                        "type": "linear"
+                    },
+                    "spanNulls": false,
+                    "stack": "off"
+                },
+                "datasourceCate": "prometheus",
+                "datasourceValue": 7,
+                "id": "b432fc11-2f9d-4b72-826b-6ca787401859",
+                "layout": {
+                    "h": 6,
+                    "i": "ea4c1073-07d3-4adc-a4d3-4812cc55ad7c",
+                    "isResizable": true,
+                    "w": 8,
+                    "x": 8,
+                    "y": 5
+                },
+                "maxPerRow": 4,
+                "name": "P95",
+                "options": {
+                    "legend": {
+                        "displayMode": "list"
+                    },
+                    "standardOptions": {
+                        "util": "milliseconds"
+                    },
+                    "thresholds": {
+                        "steps": [
+                            {
+                                "color": "#634CD9",
+                                "type": "base",
+                                "value": null
+                            }
+                        ]
+                    },
+                    "tooltip": {
+                        "mode": "all",
+                        "sort": "none"
+                    }
+                },
+                "targets": [
+                    {
+                        "expr": "histogram_quantile(0.95, sum(rate(envoy_http_downstream_rq_time_bucket{envoy_clusterid=\"$envoy_clusterid\"}[10m])) by (le, service))",
+                        "legend": "",
+                        "refId": "A"
+                    }
+                ],
+                "transformations": [
+                    {
+                        "id": "organize",
+                        "options": {}
+                    }
+                ],
+                "type": "timeseries",
+                "version": "3.0.0"
+            },
+            {
+                "custom": {
+                    "drawStyle": "lines",
+                    "fillOpacity": 0.3,
+                    "gradientMode": "opacity",
+                    "lineInterpolation": "smooth",
+                    "lineWidth": 2,
+                    "scaleDistribution": {
+                        "type": "linear"
+                    },
+                    "spanNulls": false,
+                    "stack": "off"
+                },
+                "datasourceCate": "prometheus",
+                "datasourceValue": 7,
+                "id": "9062d707-d8a7-4a93-82e5-46f6059e8d70",
+                "layout": {
+                    "h": 6,
+                    "i": "d36246b9-4a9c-4ab0-9171-c5ac330be0ca",
+                    "isResizable": true,
+                    "w": 8,
+                    "x": 16,
+                    "y": 5
+                },
+                "maxPerRow": 4,
+                "name": "QPS",
+                "options": {
+                    "legend": {
+                        "displayMode": "list"
+                    },
+                    "standardOptions": {
+                        "util": "none"
+                    },
+                    "thresholds": {
+                        "steps": [
+                            {
+                                "color": "#634CD9",
+                                "type": "base",
+                                "value": null
+                            }
+                        ]
+                    },
+                    "tooltip": {
+                        "mode": "all",
+                        "sort": "none"
+                    }
+                },
+                "targets": [
+                    {
+                        "expr": "sum(irate(envoy_http_downstream_rq{envoy_clusterid=\"$envoy_clusterid\"}[2m]))",
+                        "legend": "",
+                        "refId": "A"
+                    }
+                ],
+                "transformations": [
+                    {
+                        "id": "organize",
+                        "options": {}
+                    }
+                ],
+                "type": "timeseries",
+                "version": "3.0.0"
+            },
+            {
+                "custom": {
+                    "baseColor": "#9470FF",
+                    "calc": "lastNotNull",
+                    "serieWidth": 40,
+                    "sortOrder": "desc"
+                },
+                "datasourceCate": "prometheus",
+                "datasourceValue": 7,
+                "id": "c3f64cfd-adb2-4316-bb84-55f88ed513a3",
+                "layout": {
+                    "h": 6,
+                    "i": "807c34f9-bd61-4da3-ad88-41bb3e045605",
+                    "isResizable": true,
+                    "w": 24,
+                    "x": 0,
+                    "y": 11
+                },
+                "maxPerRow": 4,
+                "name": "Top Service Request",
+                "options": {
+                    "standardOptions": {}
+                },
+                "targets": [
+                    {
+                        "expr": "label_replace(label_replace(topk(10, sum(delta(envoy_cluster_upstream_rq_total{envoy_clusterid=\"$envoy_clusterid\", cluster_name=~\"outbound_([0-9]+)_(.*)_(.*).svc.cluster.local$\", cluster_name!~\".*waf-proxy.static\", cluster_name!~\"outbound_([0-9]+)_(.*)_kubernetes.default.svc.cluster.local\", cluster_name!~\"outbound_([0-9]+)_(.*)_(.*).kube-system.svc.cluster.local\", cluster_name!~\"outbound_([0-9]+)_(.*)_(.*).arms-prom.svc.cluster.local\"}[1m])) by (cluster_name)), \"service_name\", \"$3\", \"cluster_name\", \"outbound_([0-9]+)_(.*)_(.*).svc.cluster.local$\"), \"port\", \"$1\", \"cluster_name\", \"outbound_([0-9]+)_(.*)_(.*).svc.cluster.local$\")",
+                        "legend": "{{service_name}}:{{port}}",
+                        "refId": "A"
+                    }
+                ],
+                "transformations": [
+                    {
+                        "id": "organize",
+                        "options": {}
+                    }
+                ],
+                "type": "barGauge",
+                "version": "3.0.0"
+            },
+            {
+                "custom": {
+                    "drawStyle": "lines",
+                    "fillOpacity": 0.3,
+                    "gradientMode": "opacity",
+                    "lineInterpolation": "smooth",
+                    "lineWidth": 2,
+                    "scaleDistribution": {
+                        "type": "linear"
+                    },
+                    "spanNulls": false,
+                    "stack": "off"
+                },
+                "datasourceCate": "prometheus",
+                "datasourceValue": 7,
+                "id": "8df57678-ff19-4b63-b768-4dad3f12222b",
+                "layout": {
+                    "h": 5,
+                    "i": "44f413ba-3262-4ccf-a4b1-c1165bafaaff",
+                    "isResizable": true,
+                    "w": 24,
+                    "x": 0,
+                    "y": 17
+                },
+                "maxPerRow": 4,
+                "name": "Top Service RT",
+                "options": {
+                    "legend": {
+                        "displayMode": "hidden"
+                    },
+                    "standardOptions": {
+                        "util": "milliseconds"
+                    },
+                    "thresholds": {
+                        "steps": [
+                            {
+                                "color": "#634CD9",
+                                "type": "base",
+                                "value": null
+                            }
+                        ]
+                    },
+                    "tooltip": {
+                        "mode": "all",
+                        "sort": "none"
+                    }
+                },
+                "targets": [
+                    {
+                        "expr": "label_replace(label_replace(avg(delta(envoy_cluster_upstream_rq_time_sum{envoy_clusterid=\"$envoy_clusterid\", cluster_name=~\"outbound_([0-9]+)_(.*)_(.*)$\"}[3m])) by (cluster_name) / avg(delta(envoy_cluster_upstream_rq_time_count{envoy_clusterid=\"$envoy_clusterid\", cluster_name=~\"outbound_([0-9]+)_(.*)_(.*)$\"}[1m])) by (cluster_name), \"service_name\", \"$3\", \"cluster_name\", \"outbound_([0-9]+)_(.*)_(.*)$\"), \"port\", \"$1\", \"cluster_name\", \"outbound_([0-9]+)_(.*)_(.*)$\")",
+                        "legend": "{{service_name}}:{{port}}",
+                        "refId": "A"
+                    }
+                ],
+                "transformations": [
+                    {
+                        "id": "organize",
+                        "options": {}
+                    }
+                ],
+                "type": "timeseries",
+                "version": "3.0.0"
+            }
         ],
-        "transformations": [
-          {
-            "id": "organize",
-            "options": {}
-          }
+        "var": [
+            {
+                "definition": "prometheus",
+                "name": "datasource",
+                "type": "datasource"
+            },
+            {
+                "datasource": {
+                    "cate": "prometheus",
+                    "value": "${datasource}"
+                },
+                "definition": "label_values(envoy_cluster_bind_errors, envoy_clusterid)",
+                "hide": false,
+                "label": "envoy_clusterid",
+                "multi": false,
+                "name": "envoy_clusterid",
+                "type": "query"
+            }
         ],
-        "name": "PV（一分钟）",
-        "maxPerRow": 4,
-        "custom": {
-          "textMode": "valueAndName",
-          "graphMode": "none",
-          "colorMode": "value",
-          "calc": "lastNotNull",
-          "valueField": "Value",
-          "colSpan": 1,
-          "textSize": {}
-        },
-        "options": {
-          "thresholds": {
-            "steps": [
-              {
-                "color": "#634CD9",
-                "value": null,
-                "type": "base"
-              }
-            ]
-          },
-          "standardOptions": {}
-        }
-      },
-      {
-        "type": "pie",
-        "id": "e34a272e-6125-4afa-a2c1-80d7d9078673",
-        "layout": {
-          "h": 5,
-          "w": 9,
-          "x": 6,
-          "y": 0,
-          "i": "116a5607-5860-426e-a560-d3241da88b57",
-          "isResizable": true
-        },
-        "version": "3.0.0",
-        "datasourceCate": "prometheus",
-        "datasourceValue": 7,
-        "targets": [
-          {
-            "refId": "A",
-            "expr": "sum(delta(envoy_http_downstream_rq{envoy_clusterid=\"$envoy_clusterid\"}[3m])) by (response_code_class)",
-            "legend": ""
-          }
-        ],
-        "transformations": [
-          {
-            "id": "organize",
-            "options": {}
-          }
-        ],
-        "name": "请求成功率",
-        "maxPerRow": 4,
-        "custom": {
-          "calc": "lastNotNull",
-          "legengPosition": "right",
-          "detailName": "详情"
-        },
-        "options": {
-          "standardOptions": {
-            "util": "percentUnit",
-            "decimals": 0
-          }
-        }
-      },
-      {
-        "type": "timeseries",
-        "id": "a8917108-58a6-479a-8ec4-571f1b5a79c2",
-        "layout": {
-          "h": 5,
-          "w": 9,
-          "x": 15,
-          "y": 0,
-          "i": "9be66a1f-c0bb-47dc-a3c0-ad43b588789b",
-          "isResizable": true
-        },
-        "version": "3.0.0",
-        "datasourceCate": "prometheus",
-        "datasourceValue": 7,
-        "targets": [
-          {
-            "refId": "A",
-            "expr": "sum(delta(envoy_http_downstream_cx_rx_bytes_total{envoy_clusterid=\"$envoy_clusterid\"}[1m]))",
-            "legend": ""
-          }
-        ],
-        "transformations": [
-          {
-            "id": "organize",
-            "options": {}
-          }
-        ],
-        "name": "请求量（一分钟）",
-        "maxPerRow": 4,
-        "options": {
-          "tooltip": {
-            "mode": "all",
-            "sort": "none"
-          },
-          "legend": {
-            "displayMode": "list"
-          },
-          "standardOptions": {
-            "util": "bytesSI"
-          },
-          "thresholds": {
-            "steps": [
-              {
-                "color": "#634CD9",
-                "value": null,
-                "type": "base"
-              }
-            ]
-          }
-        },
-        "custom": {
-          "drawStyle": "lines",
-          "lineInterpolation": "smooth",
-          "spanNulls": false,
-          "lineWidth": 2,
-          "fillOpacity": 0.3,
-          "gradientMode": "opacity",
-          "stack": "off",
-          "scaleDistribution": {
-            "type": "linear"
-          }
-        }
-      },
-      {
-        "type": "timeseries",
-        "id": "1b102bee-ccc9-49a0-a1d1-cc097bb6a987",
-        "layout": {
-          "h": 6,
-          "w": 8,
-          "x": 0,
-          "y": 5,
-          "i": "1b102bee-ccc9-49a0-a1d1-cc097bb6a987",
-          "isResizable": true
-        },
-        "version": "3.0.0",
-        "datasourceCate": "prometheus",
-        "datasourceValue": 7,
-        "targets": [
-          {
-            "refId": "A",
-            "expr": "sum(rate(envoy_http_downstream_rq_time_sum{envoy_clusterid=\"$envoy_clusterid\"}[10m])) / sum(rate(envoy_http_downstream_rq_time_count{envoy_clusterid=\"$envoy_clusterid\"}[10m]))",
-            "legend": ""
-          }
-        ],
-        "transformations": [
-          {
-            "id": "organize",
-            "options": {}
-          }
-        ],
-        "name": "平均延迟",
-        "maxPerRow": 4,
-        "options": {
-          "tooltip": {
-            "mode": "all",
-            "sort": "none"
-          },
-          "legend": {
-            "displayMode": "list"
-          },
-          "standardOptions": {
-            "util": "milliseconds"
-          },
-          "thresholds": {
-            "steps": [
-              {
-                "color": "#634CD9",
-                "value": null,
-                "type": "base"
-              }
-            ]
-          }
-        },
-        "custom": {
-          "drawStyle": "lines",
-          "lineInterpolation": "smooth",
-          "spanNulls": false,
-          "lineWidth": 2,
-          "fillOpacity": 0.3,
-          "gradientMode": "opacity",
-          "stack": "off",
-          "scaleDistribution": {
-            "type": "linear"
-          }
-        }
-      },
-      {
-        "type": "timeseries",
-        "id": "b432fc11-2f9d-4b72-826b-6ca787401859",
-        "layout": {
-          "h": 6,
-          "w": 8,
-          "x": 8,
-          "y": 5,
-          "i": "ea4c1073-07d3-4adc-a4d3-4812cc55ad7c",
-          "isResizable": true
-        },
-        "version": "3.0.0",
-        "datasourceCate": "prometheus",
-        "datasourceValue": 7,
-        "targets": [
-          {
-            "refId": "A",
-            "expr": "histogram_quantile(0.95, sum(rate(envoy_http_downstream_rq_time_bucket{envoy_clusterid=\"$envoy_clusterid\"}[10m])) by (le, service))",
-            "legend": ""
-          }
-        ],
-        "transformations": [
-          {
-            "id": "organize",
-            "options": {}
-          }
-        ],
-        "name": "P95",
-        "maxPerRow": 4,
-        "options": {
-          "tooltip": {
-            "mode": "all",
-            "sort": "none"
-          },
-          "legend": {
-            "displayMode": "list"
-          },
-          "standardOptions": {
-            "util": "milliseconds"
-          },
-          "thresholds": {
-            "steps": [
-              {
-                "color": "#634CD9",
-                "value": null,
-                "type": "base"
-              }
-            ]
-          }
-        },
-        "custom": {
-          "drawStyle": "lines",
-          "lineInterpolation": "smooth",
-          "spanNulls": false,
-          "lineWidth": 2,
-          "fillOpacity": 0.3,
-          "gradientMode": "opacity",
-          "stack": "off",
-          "scaleDistribution": {
-            "type": "linear"
-          }
-        }
-      },
-      {
-        "type": "timeseries",
-        "id": "9062d707-d8a7-4a93-82e5-46f6059e8d70",
-        "layout": {
-          "h": 6,
-          "w": 8,
-          "x": 16,
-          "y": 5,
-          "i": "d36246b9-4a9c-4ab0-9171-c5ac330be0ca",
-          "isResizable": true
-        },
-        "version": "3.0.0",
-        "datasourceCate": "prometheus",
-        "datasourceValue": 7,
-        "targets": [
-          {
-            "refId": "A",
-            "expr": "sum(irate(envoy_http_downstream_rq{envoy_clusterid=\"$envoy_clusterid\"}[2m]))",
-            "legend": ""
-          }
-        ],
-        "transformations": [
-          {
-            "id": "organize",
-            "options": {}
-          }
-        ],
-        "name": "QPS",
-        "maxPerRow": 4,
-        "options": {
-          "tooltip": {
-            "mode": "all",
-            "sort": "none"
-          },
-          "legend": {
-            "displayMode": "list"
-          },
-          "standardOptions": {
-            "util": "none"
-          },
-          "thresholds": {
-            "steps": [
-              {
-                "color": "#634CD9",
-                "value": null,
-                "type": "base"
-              }
-            ]
-          }
-        },
-        "custom": {
-          "drawStyle": "lines",
-          "lineInterpolation": "smooth",
-          "spanNulls": false,
-          "lineWidth": 2,
-          "fillOpacity": 0.3,
-          "gradientMode": "opacity",
-          "stack": "off",
-          "scaleDistribution": {
-            "type": "linear"
-          }
-        }
-      },
-      {
-        "type": "barGauge",
-        "id": "c3f64cfd-adb2-4316-bb84-55f88ed513a3",
-        "layout": {
-          "h": 6,
-          "w": 24,
-          "x": 0,
-          "y": 11,
-          "i": "807c34f9-bd61-4da3-ad88-41bb3e045605",
-          "isResizable": true
-        },
-        "version": "3.0.0",
-        "datasourceCate": "prometheus",
-        "datasourceValue": 7,
-        "targets": [
-          {
-            "refId": "A",
-            "expr": "label_replace(label_replace(topk(10, sum(delta(envoy_cluster_upstream_rq_total{envoy_clusterid=\"$envoy_clusterid\", cluster_name=~\"outbound_([0-9]+)_(.*)_(.*).svc.cluster.local$\", cluster_name!~\".*waf-proxy.static\", cluster_name!~\"outbound_([0-9]+)_(.*)_kubernetes.default.svc.cluster.local\", cluster_name!~\"outbound_([0-9]+)_(.*)_(.*).kube-system.svc.cluster.local\", cluster_name!~\"outbound_([0-9]+)_(.*)_(.*).arms-prom.svc.cluster.local\"}[1m])) by (cluster_name)), \"service_name\", \"$3\", \"cluster_name\", \"outbound_([0-9]+)_(.*)_(.*).svc.cluster.local$\"), \"port\", \"$1\", \"cluster_name\", \"outbound_([0-9]+)_(.*)_(.*).svc.cluster.local$\")",
-            "legend": "{{service_name}}:{{port}}"
-          }
-        ],
-        "transformations": [
-          {
-            "id": "organize",
-            "options": {}
-          }
-        ],
-        "name": "Top Service Request",
-        "maxPerRow": 4,
-        "custom": {
-          "calc": "lastNotNull",
-          "baseColor": "#9470FF",
-          "serieWidth": 40,
-          "sortOrder": "desc"
-        },
-        "options": {
-          "standardOptions": {}
-        }
-      },
-      {
-        "type": "timeseries",
-        "id": "8df57678-ff19-4b63-b768-4dad3f12222b",
-        "layout": {
-          "h": 5,
-          "w": 24,
-          "x": 0,
-          "y": 17,
-          "i": "44f413ba-3262-4ccf-a4b1-c1165bafaaff",
-          "isResizable": true
-        },
-        "version": "3.0.0",
-        "datasourceCate": "prometheus",
-        "datasourceValue": 7,
-        "targets": [
-          {
-            "refId": "A",
-            "expr": "label_replace(label_replace(avg(delta(envoy_cluster_upstream_rq_time_sum{envoy_clusterid=\"$envoy_clusterid\", cluster_name=~\"outbound_([0-9]+)_(.*)_(.*)$\"}[3m])) by (cluster_name) / avg(delta(envoy_cluster_upstream_rq_time_count{envoy_clusterid=\"$envoy_clusterid\", cluster_name=~\"outbound_([0-9]+)_(.*)_(.*)$\"}[1m])) by (cluster_name), \"service_name\", \"$3\", \"cluster_name\", \"outbound_([0-9]+)_(.*)_(.*)$\"), \"port\", \"$1\", \"cluster_name\", \"outbound_([0-9]+)_(.*)_(.*)$\")",
-            "legend": "{{service_name}}:{{port}}"
-          }
-        ],
-        "transformations": [
-          {
-            "id": "organize",
-            "options": {}
-          }
-        ],
-        "name": "Top Service RT",
-        "maxPerRow": 4,
-        "options": {
-          "tooltip": {
-            "mode": "all",
-            "sort": "none"
-          },
-          "legend": {
-            "displayMode": "hidden"
-          },
-          "standardOptions": {
-            "util": "milliseconds"
-          },
-          "thresholds": {
-            "steps": [
-              {
-                "color": "#634CD9",
-                "value": null,
-                "type": "base"
-              }
-            ]
-          }
-        },
-        "custom": {
-          "drawStyle": "lines",
-          "lineInterpolation": "smooth",
-          "spanNulls": false,
-          "lineWidth": 2,
-          "fillOpacity": 0.3,
-          "gradientMode": "opacity",
-          "stack": "off",
-          "scaleDistribution": {
-            "type": "linear"
-          }
-        }
-      }
-    ],
-    "version": "3.0.0"
-  }
-}
+        "version": "3.0.0"
+    },
+    "public": 0,
+    "public_cate": 0,
+    "bgids": null,
+    "built_in": 0,
+    "hide": 0,
+    "uuid": 1717556327111860000
+}

integrations/AliYun/dashboards/rds.json

@@ -1,334 +1,346 @@
 {
-  "name": "阿里云RDS",
-  "tags": "",
-  "ident": "",
-  "configs": {
-    "panels": [
-      {
-        "custom": {
-          "drawStyle": "lines",
-          "fillOpacity": 0.3,
-          "gradientMode": "opacity",
-          "lineInterpolation": "smooth",
-          "lineWidth": 2,
-          "scaleDistribution": {
-            "type": "linear"
-          },
-          "spanNulls": false,
-          "stack": "off"
-        },
-        "datasourceCate": "prometheus",
-        "datasourceValue": "${datasource}",
-        "id": "01f4d444-aa2d-466d-9615-c76baf60a40c",
-        "layout": {
-          "h": 4,
-          "i": "01f4d444-aa2d-466d-9615-c76baf60a40c",
-          "isResizable": true,
-          "w": 12,
-          "x": 0,
-          "y": 0
-        },
-        "maxPerRow": 4,
-        "name": "CPU平均使用率",
-        "options": {
-          "legend": {
-            "displayMode": "hidden"
-          },
-          "standardOptions": {},
-          "thresholds": {
-            "steps": [
-              {
-                "color": "#634CD9",
-                "type": "base",
-                "value": null
-              }
-            ]
-          },
-          "tooltip": {
-            "mode": "all",
-            "sort": "none"
-          }
-        },
-        "targets": [
-          {
-            "expr": "sum(aliyun_acs_rds_dashboard_cpu_usage_average{instance_id=\"$instance_id\"}) by (instance_id)",
-            "legend": "",
-            "refId": "A"
-          }
+    "id": 0,
+    "group_id": 0,
+    "name": "阿里云RDS",
+    "ident": "",
+    "tags": "",
+    "create_at": 0,
+    "create_by": "",
+    "update_at": 0,
+    "update_by": "",
+    "configs": {
+        "panels": [
+            {
+                "custom": {
+                    "drawStyle": "lines",
+                    "fillOpacity": 0.3,
+                    "gradientMode": "opacity",
+                    "lineInterpolation": "smooth",
+                    "lineWidth": 2,
+                    "scaleDistribution": {
+                        "type": "linear"
+                    },
+                    "spanNulls": false,
+                    "stack": "off"
+                },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
+                "id": "01f4d444-aa2d-466d-9615-c76baf60a40c",
+                "layout": {
+                    "h": 4,
+                    "i": "01f4d444-aa2d-466d-9615-c76baf60a40c",
+                    "isResizable": true,
+                    "w": 12,
+                    "x": 0,
+                    "y": 0
+                },
+                "maxPerRow": 4,
+                "name": "CPU平均使用率",
+                "options": {
+                    "legend": {
+                        "displayMode": "hidden"
+                    },
+                    "standardOptions": {},
+                    "thresholds": {
+                        "steps": [
+                            {
+                                "color": "#634CD9",
+                                "type": "base",
+                                "value": null
+                            }
+                        ]
+                    },
+                    "tooltip": {
+                        "mode": "all",
+                        "sort": "none"
+                    }
+                },
+                "targets": [
+                    {
+                        "expr": "sum(aliyun_acs_rds_dashboard_cpu_usage_average{instance_id=\"$instance_id\"}) by (instance_id)",
+                        "legend": "",
+                        "refId": "A"
+                    }
+                ],
+                "type": "timeseries",
+                "version": "2.0.0"
+            },
+            {
+                "custom": {
+                    "drawStyle": "lines",
+                    "fillOpacity": 0.3,
+                    "gradientMode": "opacity",
+                    "lineInterpolation": "smooth",
+                    "lineWidth": 2,
+                    "scaleDistribution": {
+                        "type": "linear"
+                    },
+                    "spanNulls": false,
+                    "stack": "off"
+                },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
+                "id": "c43eb882-915f-4c38-a0b5-8f33c21ab44a",
+                "layout": {
+                    "h": 4,
+                    "i": "09903231-6557-42be-9cf3-2873878e9bf2",
+                    "isResizable": true,
+                    "w": 12,
+                    "x": 12,
+                    "y": 0
+                },
+                "maxPerRow": 4,
+                "name": "内存平均使用率",
+                "options": {
+                    "legend": {
+                        "displayMode": "hidden"
+                    },
+                    "standardOptions": {},
+                    "thresholds": {
+                        "steps": [
+                            {
+                                "color": "#634CD9",
+                                "type": "base",
+                                "value": null
+                            }
+                        ]
+                    },
+                    "tooltip": {
+                        "mode": "all",
+                        "sort": "none"
+                    }
+                },
+                "targets": [
+                    {
+                        "expr": "sum(aliyun_acs_rds_dashboard_memory_usage_average{instance_id=\"$instance_id\"}) by (instance_id)",
+                        "legend": "",
+                        "refId": "A"
+                    }
+                ],
+                "type": "timeseries",
+                "version": "2.0.0"
+            },
+            {
+                "custom": {
+                    "drawStyle": "lines",
+                    "fillOpacity": 0.3,
+                    "gradientMode": "opacity",
+                    "lineInterpolation": "smooth",
+                    "lineWidth": 2,
+                    "scaleDistribution": {
+                        "type": "linear"
+                    },
+                    "spanNulls": false,
+                    "stack": "off"
+                },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
+                "id": "37447883-ad79-46bc-888a-1be2835c1c64",
+                "layout": {
+                    "h": 4,
+                    "i": "378a5a26-c28e-4612-af09-f82ec2e11d80",
+                    "isResizable": true,
+                    "w": 12,
+                    "x": 0,
+                    "y": 4
+                },
+                "maxPerRow": 4,
+                "name": "磁盘平均使用率",
+                "options": {
+                    "legend": {
+                        "displayMode": "hidden"
+                    },
+                    "standardOptions": {},
+                    "thresholds": {
+                        "steps": [
+                            {
+                                "color": "#634CD9",
+                                "type": "base",
+                                "value": null
+                            }
+                        ]
+                    },
+                    "tooltip": {
+                        "mode": "all",
+                        "sort": "none"
+                    }
+                },
+                "targets": [
+                    {
+                        "expr": "sum(aliyun_acs_rds_dashboard_disk_usage_average{instance_id=\"$instance_id\"}) by (instance_id)",
+                        "legend": "",
+                        "refId": "A"
+                    }
+                ],
+                "type": "timeseries",
+                "version": "2.0.0"
+            },
+            {
+                "custom": {
+                    "drawStyle": "lines",
+                    "fillOpacity": 0.3,
+                    "gradientMode": "opacity",
+                    "lineInterpolation": "smooth",
+                    "lineWidth": 2,
+                    "scaleDistribution": {
+                        "type": "linear"
+                    },
+                    "spanNulls": false,
+                    "stack": "off"
+                },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
+                "id": "c9735607-3f24-44a7-bbf1-3ad39441c5c9",
+                "layout": {
+                    "h": 4,
+                    "i": "93a4c8a6-ac23-4e26-8a38-781ec1668820",
+                    "isResizable": true,
+                    "w": 12,
+                    "x": 12,
+                    "y": 4
+                },
+                "maxPerRow": 4,
+                "name": "IOPS平均使用率",
+                "options": {
+                    "legend": {
+                        "displayMode": "hidden"
+                    },
+                    "standardOptions": {},
+                    "thresholds": {
+                        "steps": [
+                            {
+                                "color": "#634CD9",
+                                "type": "base",
+                                "value": null
+                            }
+                        ]
+                    },
+                    "tooltip": {
+                        "mode": "all",
+                        "sort": "none"
+                    }
+                },
+                "targets": [
+                    {
+                        "expr": "sum(aliyun_acs_rds_dashboard_iops_usage_average{instance_id=\"$instance_id\"}) by (instance_id)",
+                        "legend": "",
+                        "refId": "A"
+                    }
+                ],
+                "type": "timeseries",
+                "version": "2.0.0"
+            },
+            {
+                "custom": {
+                    "drawStyle": "lines",
+                    "fillOpacity": 0.3,
+                    "gradientMode": "opacity",
+                    "lineInterpolation": "smooth",
+                    "lineWidth": 2,
+                    "scaleDistribution": {
+                        "type": "linear"
+                    },
+                    "spanNulls": false,
+                    "stack": "off"
+                },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
+                "id": "b516e7dc-8022-409d-b907-18c4143df891",
+                "layout": {
+                    "h": 5,
+                    "i": "b516e7dc-8022-409d-b907-18c4143df891",
+                    "isResizable": true,
+                    "w": 24,
+                    "x": 0,
+                    "y": 8
+                },
+                "maxPerRow": 4,
+                "name": "SQL执行量",
+                "options": {
+                    "legend": {
+                        "displayMode": "hidden"
+                    },
+                    "standardOptions": {
+                        "util": "percent"
+                    },
+                    "thresholds": {
+                        "steps": [
+                            {
+                                "color": "#634CD9",
+                                "type": "base",
+                                "value": null
+                            }
+                        ]
+                    },
+                    "tooltip": {
+                        "mode": "all",
+                        "sort": "none"
+                    }
+                },
+                "targets": [
+                    {
+                        "expr": "sum(aliyun_acs_rds_dashboard_my_sql_com_delete_average{instance_id=\"$instance_id\"}) by (instance_id)",
+                        "legend": "delete",
+                        "refId": "A"
+                    },
+                    {
+                        "expr": "sum(aliyun_acs_rds_dashboard_my_sql_com_insert_average{instance_id=\"$instance_id\"}) by (instance_id)",
+                        "legend": "insert",
+                        "refId": "B"
+                    },
+                    {
+                        "expr": "sum(aliyun_acs_rds_dashboard_my_sql_com_insert_select_average{instance_id=\"$instance_id\"}) by (instance_id)",
+                        "legend": "insert_select",
+                        "refId": "C"
+                    },
+                    {
+                        "expr": "sum(aliyun_acs_rds_dashboard_my_sql_com_update_average{instance_id=\"$instance_id\"}) by (instance_id)",
+                        "legend": "update",
+                        "refId": "D"
+                    },
+                    {
+                        "expr": "sum(aliyun_acs_rds_dashboard_my_sql_com_select_average{instance_id=\"$instance_id\"}) by (instance_id)",
+                        "legend": "select",
+                        "refId": "E"
+                    }
+                ],
+                "type": "timeseries",
+                "version": "2.0.0"
+            }
         ],
-        "type": "timeseries",
-        "version": "2.0.0"
-      },
-      {
-        "custom": {
-          "drawStyle": "lines",
-          "fillOpacity": 0.3,
-          "gradientMode": "opacity",
-          "lineInterpolation": "smooth",
-          "lineWidth": 2,
-          "scaleDistribution": {
-            "type": "linear"
-          },
-          "spanNulls": false,
-          "stack": "off"
-        },
-        "datasourceCate": "prometheus",
-        "datasourceValue": "${datasource}",
-        "id": "c43eb882-915f-4c38-a0b5-8f33c21ab44a",
-        "layout": {
-          "h": 4,
-          "i": "09903231-6557-42be-9cf3-2873878e9bf2",
-          "isResizable": true,
-          "w": 12,
-          "x": 12,
-          "y": 0
-        },
-        "maxPerRow": 4,
-        "name": "内存平均使用率",
-        "options": {
-          "legend": {
-            "displayMode": "hidden"
-          },
-          "standardOptions": {},
-          "thresholds": {
-            "steps": [
-              {
-                "color": "#634CD9",
-                "type": "base",
-                "value": null
-              }
-            ]
-          },
-          "tooltip": {
-            "mode": "all",
-            "sort": "none"
-          }
-        },
-        "targets": [
-          {
-            "expr": "sum(aliyun_acs_rds_dashboard_memory_usage_average{instance_id=\"$instance_id\"}) by (instance_id)",
-            "legend": "",
-            "refId": "A"
-          }
+        "var": [
+            {
+                "definition": "prometheus",
+                "name": "datasource",
+                "type": "datasource"
+            },
+            {
+                "datasource": {
+                    "cate": "prometheus",
+                    "value": "${datasource}"
+                },
+                "definition": "label_values(aliyun_acs_rds_dashboard_cpu_usage_average,name)",
+                "multi": false,
+                "name": "name",
+                "type": "query"
+            },
+            {
+                "datasource": {
+                    "cate": "prometheus",
+                    "value": "${datasource}"
+                },
+                "definition": "label_values(aliyun_acs_rds_dashboard_cpu_usage_average{name=\"$name\"},instance_id)",
+                "multi": false,
+                "name": "instance_id",
+                "type": "query"
+            }
         ],
-        "type": "timeseries",
-        "version": "2.0.0"
-      },
-      {
-        "custom": {
-          "drawStyle": "lines",
-          "fillOpacity": 0.3,
-          "gradientMode": "opacity",
-          "lineInterpolation": "smooth",
-          "lineWidth": 2,
-          "scaleDistribution": {
-            "type": "linear"
-          },
-          "spanNulls": false,
-          "stack": "off"
-        },
-        "datasourceCate": "prometheus",
-        "datasourceValue": "${datasource}",
-        "id": "37447883-ad79-46bc-888a-1be2835c1c64",
-        "layout": {
-          "h": 4,
-          "i": "378a5a26-c28e-4612-af09-f82ec2e11d80",
-          "isResizable": true,
-          "w": 12,
-          "x": 0,
-          "y": 4
-        },
-        "maxPerRow": 4,
-        "name": "磁盘平均使用率",
-        "options": {
-          "legend": {
-            "displayMode": "hidden"
-          },
-          "standardOptions": {},
-          "thresholds": {
-            "steps": [
-              {
-                "color": "#634CD9",
-                "type": "base",
-                "value": null
-              }
-            ]
-          },
-          "tooltip": {
-            "mode": "all",
-            "sort": "none"
-          }
-        },
-        "targets": [
-          {
-            "expr": "sum(aliyun_acs_rds_dashboard_disk_usage_average{instance_id=\"$instance_id\"}) by (instance_id)",
-            "legend": "",
-            "refId": "A"
-          }
-        ],
-        "type": "timeseries",
-        "version": "2.0.0"
-      },
-      {
-        "custom": {
-          "drawStyle": "lines",
-          "fillOpacity": 0.3,
-          "gradientMode": "opacity",
-          "lineInterpolation": "smooth",
-          "lineWidth": 2,
-          "scaleDistribution": {
-            "type": "linear"
-          },
-          "spanNulls": false,
-          "stack": "off"
-        },
-        "datasourceCate": "prometheus",
-        "datasourceValue": "${datasource}",
-        "id": "c9735607-3f24-44a7-bbf1-3ad39441c5c9",
-        "layout": {
-          "h": 4,
-          "i": "93a4c8a6-ac23-4e26-8a38-781ec1668820",
-          "isResizable": true,
-          "w": 12,
-          "x": 12,
-          "y": 4
-        },
-        "maxPerRow": 4,
-        "name": "IOPS平均使用率",
-        "options": {
-          "legend": {
-            "displayMode": "hidden"
-          },
-          "standardOptions": {},
-          "thresholds": {
-            "steps": [
-              {
-                "color": "#634CD9",
-                "type": "base",
-                "value": null
-              }
-            ]
-          },
-          "tooltip": {
-            "mode": "all",
-            "sort": "none"
-          }
-        },
-        "targets": [
-          {
-            "expr": "sum(aliyun_acs_rds_dashboard_iops_usage_average{instance_id=\"$instance_id\"}) by (instance_id)",
-            "legend": "",
-            "refId": "A"
-          }
-        ],
-        "type": "timeseries",
-        "version": "2.0.0"
-      },
-      {
-        "custom": {
-          "drawStyle": "lines",
-          "fillOpacity": 0.3,
-          "gradientMode": "opacity",
-          "lineInterpolation": "smooth",
-          "lineWidth": 2,
-          "scaleDistribution": {
-            "type": "linear"
-          },
-          "spanNulls": false,
-          "stack": "off"
-        },
-        "datasourceCate": "prometheus",
-        "datasourceValue": "${datasource}",
-        "id": "b516e7dc-8022-409d-b907-18c4143df891",
-        "layout": {
-          "h": 5,
-          "i": "b516e7dc-8022-409d-b907-18c4143df891",
-          "isResizable": true,
-          "w": 24,
-          "x": 0,
-          "y": 8
-        },
-        "maxPerRow": 4,
-        "name": "SQL执行量",
-        "options": {
-          "legend": {
-            "displayMode": "hidden"
-          },
-          "standardOptions": {
-            "util": "percent"
-          },
-          "thresholds": {
-            "steps": [
-              {
-                "color": "#634CD9",
-                "type": "base",
-                "value": null
-              }
-            ]
-          },
-          "tooltip": {
-            "mode": "all",
-            "sort": "none"
-          }
-        },
-        "targets": [
-          {
-            "expr": "sum(aliyun_acs_rds_dashboard_my_sql_com_delete_average{instance_id=\"$instance_id\"}) by (instance_id)",
-            "legend": "delete",
-            "refId": "A"
-          },
-          {
-            "expr": "sum(aliyun_acs_rds_dashboard_my_sql_com_insert_average{instance_id=\"$instance_id\"}) by (instance_id)",
-            "legend": "insert",
-            "refId": "B"
-          },
-          {
-            "expr": "sum(aliyun_acs_rds_dashboard_my_sql_com_insert_select_average{instance_id=\"$instance_id\"}) by (instance_id)",
-            "legend": "insert_select",
-            "refId": "C"
-          },
-          {
-            "expr": "sum(aliyun_acs_rds_dashboard_my_sql_com_update_average{instance_id=\"$instance_id\"}) by (instance_id)",
-            "legend": "update",
-            "refId": "D"
-          },
-          {
-            "expr": "sum(aliyun_acs_rds_dashboard_my_sql_com_select_average{instance_id=\"$instance_id\"}) by (instance_id)",
-            "legend": "select",
-            "refId": "E"
-          }
-        ],
-        "type": "timeseries",
-        "version": "2.0.0"
-      }
-    ],
-    "var": [
-      {
-        "name": "datasource",
-        "type": "datasource",
-        "definition": "prometheus"
-      },
-      {
-        "name": "name",
-        "type": "query",
-        "datasource": {
-          "cate": "prometheus",
-          "value": "${datasource}"
-        },
-        "definition": "label_values(aliyun_acs_rds_dashboard_cpu_usage_average,name)",
-        "multi": false
-      },
-      {
-        "name": "instance_id",
-        "type": "query",
-        "datasource": {
-          "cate": "prometheus",
-          "value": "${datasource}"
-        },
-        "definition": "label_values(aliyun_acs_rds_dashboard_cpu_usage_average{name=\"$name\"},instance_id)",
-        "multi": false
-      }
-    ],
-    "version": "3.0.0"
-  }
-}
+        "version": "3.0.0"
+    },
+    "public": 0,
+    "public_cate": 0,
+    "bgids": null,
+    "built_in": 0,
+    "hide": 0,
+    "uuid": 1717556327125143000
+}

integrations/AliYun/dashboards/redis.json

@@ -1,319 +1,331 @@
 {
-  "name": "阿里云REDIS",
-  "tags": "",
-  "ident": "",
-  "configs": {
-    "panels": [
-      {
-        "custom": {
-          "drawStyle": "lines",
-          "fillOpacity": 0.3,
-          "gradientMode": "opacity",
-          "lineInterpolation": "smooth",
-          "lineWidth": 2,
-          "scaleDistribution": {
-            "type": "linear"
-          },
-          "spanNulls": false,
-          "stack": "off"
-        },
-        "datasourceCate": "prometheus",
-        "datasourceValue": "${datasource}",
-        "id": "01f4d444-aa2d-466d-9615-c76baf60a40c",
-        "layout": {
-          "h": 4,
-          "i": "01f4d444-aa2d-466d-9615-c76baf60a40c",
-          "isResizable": true,
-          "w": 12,
-          "x": 0,
-          "y": 0
-        },
-        "maxPerRow": 4,
-        "name": "CPU平均使用率",
-        "options": {
-          "legend": {
-            "displayMode": "hidden"
-          },
-          "standardOptions": {},
-          "thresholds": {
-            "steps": [
-              {
-                "color": "#634CD9",
-                "type": "base",
-                "value": null
-              }
-            ]
-          },
-          "tooltip": {
-            "mode": "all",
-            "sort": "none"
-          }
-        },
-        "targets": [
-          {
-            "expr": "sum(aliyun_acs_kvstore_cpu_usage_average{instance_id=\"$instance_id\"}) by (instance_id)",
-            "legend": "",
-            "refId": "A"
-          }
+    "id": 0,
+    "group_id": 0,
+    "name": "阿里云REDIS",
+    "ident": "",
+    "tags": "",
+    "create_at": 0,
+    "create_by": "",
+    "update_at": 0,
+    "update_by": "",
+    "configs": {
+        "panels": [
+            {
+                "custom": {
+                    "drawStyle": "lines",
+                    "fillOpacity": 0.3,
+                    "gradientMode": "opacity",
+                    "lineInterpolation": "smooth",
+                    "lineWidth": 2,
+                    "scaleDistribution": {
+                        "type": "linear"
+                    },
+                    "spanNulls": false,
+                    "stack": "off"
+                },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
+                "id": "01f4d444-aa2d-466d-9615-c76baf60a40c",
+                "layout": {
+                    "h": 4,
+                    "i": "01f4d444-aa2d-466d-9615-c76baf60a40c",
+                    "isResizable": true,
+                    "w": 12,
+                    "x": 0,
+                    "y": 0
+                },
+                "maxPerRow": 4,
+                "name": "CPU平均使用率",
+                "options": {
+                    "legend": {
+                        "displayMode": "hidden"
+                    },
+                    "standardOptions": {},
+                    "thresholds": {
+                        "steps": [
+                            {
+                                "color": "#634CD9",
+                                "type": "base",
+                                "value": null
+                            }
+                        ]
+                    },
+                    "tooltip": {
+                        "mode": "all",
+                        "sort": "none"
+                    }
+                },
+                "targets": [
+                    {
+                        "expr": "sum(aliyun_acs_kvstore_cpu_usage_average{instance_id=\"$instance_id\"}) by (instance_id)",
+                        "legend": "",
+                        "refId": "A"
+                    }
+                ],
+                "type": "timeseries",
+                "version": "2.0.0"
+            },
+            {
+                "custom": {
+                    "drawStyle": "lines",
+                    "fillOpacity": 0.3,
+                    "gradientMode": "opacity",
+                    "lineInterpolation": "smooth",
+                    "lineWidth": 2,
+                    "scaleDistribution": {
+                        "type": "linear"
+                    },
+                    "spanNulls": false,
+                    "stack": "off"
+                },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
+                "id": "c43eb882-915f-4c38-a0b5-8f33c21ab44a",
+                "layout": {
+                    "h": 4,
+                    "i": "09903231-6557-42be-9cf3-2873878e9bf2",
+                    "isResizable": true,
+                    "w": 12,
+                    "x": 12,
+                    "y": 0
+                },
+                "maxPerRow": 4,
+                "name": "内存平均使用率",
+                "options": {
+                    "legend": {
+                        "displayMode": "hidden"
+                    },
+                    "standardOptions": {},
+                    "thresholds": {
+                        "steps": [
+                            {
+                                "color": "#634CD9",
+                                "type": "base",
+                                "value": null
+                            }
+                        ]
+                    },
+                    "tooltip": {
+                        "mode": "all",
+                        "sort": "none"
+                    }
+                },
+                "targets": [
+                    {
+                        "expr": "sum(aliyun_acs_kvstore_memory_usage_average{instance_id=\"$instance_id\"}) by (instance_id)",
+                        "legend": "",
+                        "refId": "A"
+                    }
+                ],
+                "type": "timeseries",
+                "version": "2.0.0"
+            },
+            {
+                "custom": {
+                    "drawStyle": "lines",
+                    "fillOpacity": 0.3,
+                    "gradientMode": "opacity",
+                    "lineInterpolation": "smooth",
+                    "lineWidth": 2,
+                    "scaleDistribution": {
+                        "type": "linear"
+                    },
+                    "spanNulls": false,
+                    "stack": "off"
+                },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
+                "id": "37447883-ad79-46bc-888a-1be2835c1c64",
+                "layout": {
+                    "h": 4,
+                    "i": "378a5a26-c28e-4612-af09-f82ec2e11d80",
+                    "isResizable": true,
+                    "w": 12,
+                    "x": 0,
+                    "y": 4
+                },
+                "maxPerRow": 4,
+                "name": "连接数平均使用率",
+                "options": {
+                    "legend": {
+                        "displayMode": "hidden"
+                    },
+                    "standardOptions": {},
+                    "thresholds": {
+                        "steps": [
+                            {
+                                "color": "#634CD9",
+                                "type": "base",
+                                "value": null
+                            }
+                        ]
+                    },
+                    "tooltip": {
+                        "mode": "all",
+                        "sort": "none"
+                    }
+                },
+                "targets": [
+                    {
+                        "expr": "sum(aliyun_acs_kvstore_connection_usage_average{instance_id=\"$instance_id\"}) by (instance_id)",
+                        "legend": "",
+                        "refId": "A"
+                    }
+                ],
+                "type": "timeseries",
+                "version": "2.0.0"
+            },
+            {
+                "custom": {
+                    "drawStyle": "lines",
+                    "fillOpacity": 0.3,
+                    "gradientMode": "opacity",
+                    "lineInterpolation": "smooth",
+                    "lineWidth": 2,
+                    "scaleDistribution": {
+                        "type": "linear"
+                    },
+                    "spanNulls": false,
+                    "stack": "off"
+                },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
+                "id": "c9735607-3f24-44a7-bbf1-3ad39441c5c9",
+                "layout": {
+                    "h": 4,
+                    "i": "93a4c8a6-ac23-4e26-8a38-781ec1668820",
+                    "isResizable": true,
+                    "w": 12,
+                    "x": 12,
+                    "y": 4
+                },
+                "maxPerRow": 4,
+                "name": "失败统计平均使用率",
+                "options": {
+                    "legend": {
+                        "displayMode": "hidden"
+                    },
+                    "standardOptions": {},
+                    "thresholds": {
+                        "steps": [
+                            {
+                                "color": "#634CD9",
+                                "type": "base",
+                                "value": null
+                            }
+                        ]
+                    },
+                    "tooltip": {
+                        "mode": "all",
+                        "sort": "none"
+                    }
+                },
+                "targets": [
+                    {
+                        "expr": "sum(aliyun_acs_kvstore_failed_count_average{instance_id=\"$instance_id\"}) by (instance_id)",
+                        "legend": "",
+                        "refId": "A"
+                    }
+                ],
+                "type": "timeseries",
+                "version": "2.0.0"
+            },
+            {
+                "custom": {
+                    "drawStyle": "lines",
+                    "fillOpacity": 0.3,
+                    "gradientMode": "opacity",
+                    "lineInterpolation": "smooth",
+                    "lineWidth": 2,
+                    "scaleDistribution": {
+                        "type": "linear"
+                    },
+                    "spanNulls": false,
+                    "stack": "off"
+                },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
+                "id": "b516e7dc-8022-409d-b907-18c4143df891",
+                "layout": {
+                    "h": 5,
+                    "i": "b516e7dc-8022-409d-b907-18c4143df891",
+                    "isResizable": true,
+                    "w": 24,
+                    "x": 0,
+                    "y": 8
+                },
+                "maxPerRow": 4,
+                "name": "网络流量",
+                "options": {
+                    "legend": {
+                        "displayMode": "hidden"
+                    },
+                    "standardOptions": {
+                        "util": "bitsSI"
+                    },
+                    "thresholds": {
+                        "steps": [
+                            {
+                                "color": "#634CD9",
+                                "type": "base",
+                                "value": null
+                            }
+                        ]
+                    },
+                    "tooltip": {
+                        "mode": "all",
+                        "sort": "none"
+                    }
+                },
+                "targets": [
+                    {
+                        "expr": "sum(aliyun_acs_kvstore_intranet_in_average{instance_id=\"$instance_id\"}) by (instance_id)",
+                        "legend": "in",
+                        "refId": "A"
+                    },
+                    {
+                        "expr": "sum(aliyun_acs_kvstore_intranet_out_average{instance_id=\"$instance_id\"}) by (instance_id)",
+                        "legend": "out",
+                        "refId": "B"
+                    }
+                ],
+                "type": "timeseries",
+                "version": "2.0.0"
+            }
         ],
-        "type": "timeseries",
-        "version": "2.0.0"
-      },
-      {
-        "custom": {
-          "drawStyle": "lines",
-          "fillOpacity": 0.3,
-          "gradientMode": "opacity",
-          "lineInterpolation": "smooth",
-          "lineWidth": 2,
-          "scaleDistribution": {
-            "type": "linear"
-          },
-          "spanNulls": false,
-          "stack": "off"
-        },
-        "datasourceCate": "prometheus",
-        "datasourceValue": "${datasource}",
-        "id": "c43eb882-915f-4c38-a0b5-8f33c21ab44a",
-        "layout": {
-          "h": 4,
-          "i": "09903231-6557-42be-9cf3-2873878e9bf2",
-          "isResizable": true,
-          "w": 12,
-          "x": 12,
-          "y": 0
-        },
-        "maxPerRow": 4,
-        "name": "内存平均使用率",
-        "options": {
-          "legend": {
-            "displayMode": "hidden"
-          },
-          "standardOptions": {},
-          "thresholds": {
-            "steps": [
-              {
-                "color": "#634CD9",
-                "type": "base",
-                "value": null
-              }
-            ]
-          },
-          "tooltip": {
-            "mode": "all",
-            "sort": "none"
-          }
-        },
-        "targets": [
-          {
-            "expr": "sum(aliyun_acs_kvstore_memory_usage_average{instance_id=\"$instance_id\"}) by (instance_id)",
-            "legend": "",
-            "refId": "A"
-          }
+        "var": [
+            {
+                "definition": "prometheus",
+                "name": "datasource",
+                "type": "datasource"
+            },
+            {
+                "datasource": {
+                    "cate": "prometheus",
+                    "value": "${datasource}"
+                },
+                "definition": "label_values(aliyun_acs_kvstore_cpu_usage_average,name)",
+                "multi": false,
+                "name": "name",
+                "type": "query"
+            },
+            {
+                "datasource": {
+                    "cate": "prometheus",
+                    "value": "${datasource}"
+                },
+                "definition": "label_values(aliyun_acs_kvstore_cpu_usage_average{name=\"$name\"},instance_id)",
+                "multi": false,
+                "name": "instance_id",
+                "type": "query"
+            }
         ],
-        "type": "timeseries",
-        "version": "2.0.0"
-      },
-      {
-        "custom": {
-          "drawStyle": "lines",
-          "fillOpacity": 0.3,
-          "gradientMode": "opacity",
-          "lineInterpolation": "smooth",
-          "lineWidth": 2,
-          "scaleDistribution": {
-            "type": "linear"
-          },
-          "spanNulls": false,
-          "stack": "off"
-        },
-        "datasourceCate": "prometheus",
-        "datasourceValue": "${datasource}",
-        "id": "37447883-ad79-46bc-888a-1be2835c1c64",
-        "layout": {
-          "h": 4,
-          "i": "378a5a26-c28e-4612-af09-f82ec2e11d80",
-          "isResizable": true,
-          "w": 12,
-          "x": 0,
-          "y": 4
-        },
-        "maxPerRow": 4,
-        "name": "连接数平均使用率",
-        "options": {
-          "legend": {
-            "displayMode": "hidden"
-          },
-          "standardOptions": {},
-          "thresholds": {
-            "steps": [
-              {
-                "color": "#634CD9",
-                "type": "base",
-                "value": null
-              }
-            ]
-          },
-          "tooltip": {
-            "mode": "all",
-            "sort": "none"
-          }
-        },
-        "targets": [
-          {
-            "expr": "sum(aliyun_acs_kvstore_connection_usage_average{instance_id=\"$instance_id\"}) by (instance_id)",
-            "legend": "",
-            "refId": "A"
-          }
-        ],
-        "type": "timeseries",
-        "version": "2.0.0"
-      },
-      {
-        "custom": {
-          "drawStyle": "lines",
-          "fillOpacity": 0.3,
-          "gradientMode": "opacity",
-          "lineInterpolation": "smooth",
-          "lineWidth": 2,
-          "scaleDistribution": {
-            "type": "linear"
-          },
-          "spanNulls": false,
-          "stack": "off"
-        },
-        "datasourceCate": "prometheus",
-        "datasourceValue": "${datasource}",
-        "id": "c9735607-3f24-44a7-bbf1-3ad39441c5c9",
-        "layout": {
-          "h": 4,
-          "i": "93a4c8a6-ac23-4e26-8a38-781ec1668820",
-          "isResizable": true,
-          "w": 12,
-          "x": 12,
-          "y": 4
-        },
-        "maxPerRow": 4,
-        "name": "失败统计平均使用率",
-        "options": {
-          "legend": {
-            "displayMode": "hidden"
-          },
-          "standardOptions": {},
-          "thresholds": {
-            "steps": [
-              {
-                "color": "#634CD9",
-                "type": "base",
-                "value": null
-              }
-            ]
-          },
-          "tooltip": {
-            "mode": "all",
-            "sort": "none"
-          }
-        },
-        "targets": [
-          {
-            "expr": "sum(aliyun_acs_kvstore_failed_count_average{instance_id=\"$instance_id\"}) by (instance_id)",
-            "legend": "",
-            "refId": "A"
-          }
-        ],
-        "type": "timeseries",
-        "version": "2.0.0"
-      },
-      {
-        "custom": {
-          "drawStyle": "lines",
-          "fillOpacity": 0.3,
-          "gradientMode": "opacity",
-          "lineInterpolation": "smooth",
-          "lineWidth": 2,
-          "scaleDistribution": {
-            "type": "linear"
-          },
-          "spanNulls": false,
-          "stack": "off"
-        },
-        "datasourceCate": "prometheus",
-        "datasourceValue": "${datasource}",
-        "id": "b516e7dc-8022-409d-b907-18c4143df891",
-        "layout": {
-          "h": 5,
-          "i": "b516e7dc-8022-409d-b907-18c4143df891",
-          "isResizable": true,
-          "w": 24,
-          "x": 0,
-          "y": 8
-        },
-        "maxPerRow": 4,
-        "name": "网络流量",
-        "options": {
-          "legend": {
-            "displayMode": "hidden"
-          },
-          "standardOptions": {
-            "util": "bitsSI"
-          },
-          "thresholds": {
-            "steps": [
-              {
-                "color": "#634CD9",
-                "type": "base",
-                "value": null
-              }
-            ]
-          },
-          "tooltip": {
-            "mode": "all",
-            "sort": "none"
-          }
-        },
-        "targets": [
-          {
-            "expr": "sum(aliyun_acs_kvstore_intranet_in_average{instance_id=\"$instance_id\"}) by (instance_id)",
-            "legend": "in",
-            "refId": "A"
-          },
-          {
-            "expr": "sum(aliyun_acs_kvstore_intranet_out_average{instance_id=\"$instance_id\"}) by (instance_id)",
-            "legend": "out",
-            "refId": "B"
-          }
-        ],
-        "type": "timeseries",
-        "version": "2.0.0"
-      }
-    ],
-    "var": [
-      {
-        "name": "datasource",
-        "type": "datasource",
-        "definition": "prometheus"
-      },
-      {
-        "name": "name",
-        "type": "query",
-        "datasource": {
-          "cate": "prometheus",
-          "value": "${datasource}"
-        },
-        "definition": "label_values(aliyun_acs_kvstore_cpu_usage_average,name)",
-        "multi": false
-      },
-      {
-        "name": "instance_id",
-        "type": "query",
-        "datasource": {
-          "cate": "prometheus",
-          "value": "${datasource}"
-        },
-        "definition": "label_values(aliyun_acs_kvstore_cpu_usage_average{name=\"$name\"},instance_id)",
-        "multi": false
-      }
-    ],
-    "version": "3.0.0"
-  }
-}
+        "version": "3.0.0"
+    },
+    "public": 0,
+    "public_cate": 0,
+    "bgids": null,
+    "built_in": 0,
+    "hide": 0,
+    "uuid": 1717556327128561000
+}

integrations/AliYun/dashboards/redis_new.json

@@ -1,437 +1,449 @@
 {
-  "name": "阿里云REDIS_N",
-  "tags": "",
-  "ident": "",
-  "configs": {
-    "panels": [
-      {
-        "collapsed": false,
-        "id": "2c38fd30-4c4c-40a9-ad4a-5c945db32947",
-        "layout": {
-          "h": 1,
-          "i": "2c38fd30-4c4c-40a9-ad4a-5c945db32947",
-          "isResizable": false,
-          "w": 24,
-          "x": 0,
-          "y": 0
-        },
-        "name": "默认分组",
-        "type": "row"
-      },
-      {
-        "custom": {
-          "drawStyle": "lines",
-          "fillOpacity": 0.3,
-          "gradientMode": "opacity",
-          "lineInterpolation": "smooth",
-          "lineWidth": 2,
-          "scaleDistribution": {
-            "type": "linear"
-          },
-          "spanNulls": false,
-          "stack": "off"
-        },
-        "datasourceCate": "prometheus",
-        "datasourceValue": "${datasource}",
-        "id": "01f4d444-aa2d-466d-9615-c76baf60a40c",
-        "layout": {
-          "h": 4,
-          "i": "01f4d444-aa2d-466d-9615-c76baf60a40c",
-          "isResizable": true,
-          "w": 8,
-          "x": 0,
-          "y": 1
-        },
-        "maxPerRow": 4,
-        "name": "CPU 使用率(%)",
-        "options": {
-          "legend": {
-            "displayMode": "hidden"
-          },
-          "standardOptions": {
-            "util": "percent"
-          },
-          "thresholds": {
-            "steps": [
-              {
-                "color": "#634CD9",
-                "type": "base",
-                "value": null
-              }
-            ]
-          },
-          "tooltip": {
-            "mode": "all",
-            "sort": "none"
-          }
-        },
-        "targets": [
-          {
-            "expr": "aliyun_acs_kvstore_cpu_usage_average{instance_id=\"$instance_id\"}",
-            "instant": false,
-            "legend": "",
-            "refId": "A",
-            "step": 120
-          }
+    "id": 0,
+    "group_id": 0,
+    "name": "阿里云REDIS_N",
+    "ident": "",
+    "tags": "",
+    "create_at": 0,
+    "create_by": "",
+    "update_at": 0,
+    "update_by": "",
+    "configs": {
+        "panels": [
+            {
+                "collapsed": false,
+                "id": "2c38fd30-4c4c-40a9-ad4a-5c945db32947",
+                "layout": {
+                    "h": 1,
+                    "i": "2c38fd30-4c4c-40a9-ad4a-5c945db32947",
+                    "isResizable": false,
+                    "w": 24,
+                    "x": 0,
+                    "y": 0
+                },
+                "name": "默认分组",
+                "type": "row"
+            },
+            {
+                "custom": {
+                    "drawStyle": "lines",
+                    "fillOpacity": 0.3,
+                    "gradientMode": "opacity",
+                    "lineInterpolation": "smooth",
+                    "lineWidth": 2,
+                    "scaleDistribution": {
+                        "type": "linear"
+                    },
+                    "spanNulls": false,
+                    "stack": "off"
+                },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
+                "id": "01f4d444-aa2d-466d-9615-c76baf60a40c",
+                "layout": {
+                    "h": 4,
+                    "i": "01f4d444-aa2d-466d-9615-c76baf60a40c",
+                    "isResizable": true,
+                    "w": 8,
+                    "x": 0,
+                    "y": 1
+                },
+                "maxPerRow": 4,
+                "name": "CPU 使用率(%)",
+                "options": {
+                    "legend": {
+                        "displayMode": "hidden"
+                    },
+                    "standardOptions": {
+                        "util": "percent"
+                    },
+                    "thresholds": {
+                        "steps": [
+                            {
+                                "color": "#634CD9",
+                                "type": "base",
+                                "value": null
+                            }
+                        ]
+                    },
+                    "tooltip": {
+                        "mode": "all",
+                        "sort": "none"
+                    }
+                },
+                "targets": [
+                    {
+                        "expr": "aliyun_acs_kvstore_cpu_usage_average{instance_id=\"$instance_id\"}",
+                        "instant": false,
+                        "legend": "",
+                        "refId": "A",
+                        "step": 120
+                    }
+                ],
+                "transformations": [
+                    {
+                        "id": "organize",
+                        "options": {}
+                    }
+                ],
+                "type": "timeseries",
+                "version": "3.0.0"
+            },
+            {
+                "custom": {
+                    "drawStyle": "lines",
+                    "fillOpacity": 0.3,
+                    "gradientMode": "opacity",
+                    "lineInterpolation": "smooth",
+                    "lineWidth": 2,
+                    "scaleDistribution": {
+                        "type": "linear"
+                    },
+                    "spanNulls": false,
+                    "stack": "off"
+                },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
+                "id": "c43eb882-915f-4c38-a0b5-8f33c21ab44a",
+                "layout": {
+                    "h": 4,
+                    "i": "09903231-6557-42be-9cf3-2873878e9bf2",
+                    "isResizable": true,
+                    "w": 8,
+                    "x": 8,
+                    "y": 1
+                },
+                "maxPerRow": 4,
+                "name": "内存使用率(%)",
+                "options": {
+                    "legend": {
+                        "displayMode": "hidden"
+                    },
+                    "standardOptions": {
+                        "util": "percent"
+                    },
+                    "thresholds": {
+                        "steps": [
+                            {
+                                "color": "#634CD9",
+                                "type": "base",
+                                "value": null
+                            }
+                        ]
+                    },
+                    "tooltip": {
+                        "mode": "all",
+                        "sort": "none"
+                    }
+                },
+                "targets": [
+                    {
+                        "expr": "aliyun_acs_kvstore_memory_usage_average{instance_id=\"$instance_id\"}",
+                        "legend": "",
+                        "refId": "A",
+                        "step": 120
+                    }
+                ],
+                "transformations": [
+                    {
+                        "id": "organize",
+                        "options": {}
+                    }
+                ],
+                "type": "timeseries",
+                "version": "3.0.0"
+            },
+            {
+                "custom": {
+                    "drawStyle": "lines",
+                    "fillOpacity": 0.3,
+                    "gradientMode": "opacity",
+                    "lineInterpolation": "smooth",
+                    "lineWidth": 2,
+                    "scaleDistribution": {
+                        "type": "linear"
+                    },
+                    "spanNulls": false,
+                    "stack": "off"
+                },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
+                "id": "37447883-ad79-46bc-888a-1be2835c1c64",
+                "layout": {
+                    "h": 4,
+                    "i": "378a5a26-c28e-4612-af09-f82ec2e11d80",
+                    "isResizable": true,
+                    "w": 8,
+                    "x": 16,
+                    "y": 1
+                },
+                "maxPerRow": 4,
+                "name": "连接数使用率(%)",
+                "options": {
+                    "legend": {
+                        "displayMode": "hidden"
+                    },
+                    "standardOptions": {
+                        "util": "percent"
+                    },
+                    "thresholds": {
+                        "steps": [
+                            {
+                                "color": "#634CD9",
+                                "type": "base",
+                                "value": null
+                            }
+                        ]
+                    },
+                    "tooltip": {
+                        "mode": "all",
+                        "sort": "none"
+                    }
+                },
+                "targets": [
+                    {
+                        "expr": "aliyun_acs_kvstore_connection_usage_average{instance_id=\"$instance_id\"}",
+                        "legend": "",
+                        "refId": "A",
+                        "step": 120
+                    }
+                ],
+                "transformations": [
+                    {
+                        "id": "organize",
+                        "options": {}
+                    }
+                ],
+                "type": "timeseries",
+                "version": "3.0.0"
+            },
+            {
+                "custom": {
+                    "drawStyle": "lines",
+                    "fillOpacity": 0.3,
+                    "gradientMode": "opacity",
+                    "lineInterpolation": "smooth",
+                    "lineWidth": 2,
+                    "scaleDistribution": {
+                        "type": "linear"
+                    },
+                    "spanNulls": false,
+                    "stack": "off"
+                },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
+                "id": "2d1c8cdf-538e-48b5-8563-358f242825e5",
+                "layout": {
+                    "h": 4,
+                    "i": "764e188d-d728-44a0-a79d-133d957df9a9",
+                    "isResizable": true,
+                    "w": 8,
+                    "x": 0,
+                    "y": 5
+                },
+                "maxPerRow": 4,
+                "name": "流入带宽使用率(%)",
+                "options": {
+                    "legend": {
+                        "displayMode": "hidden"
+                    },
+                    "standardOptions": {
+                        "util": "percent"
+                    },
+                    "thresholds": {
+                        "steps": [
+                            {
+                                "color": "#634CD9",
+                                "type": "base",
+                                "value": null
+                            }
+                        ]
+                    },
+                    "tooltip": {
+                        "mode": "all",
+                        "sort": "none"
+                    }
+                },
+                "targets": [
+                    {
+                        "expr": "aliyun_acs_kvstore_intranet_in_ratio_average{instance_id=\"$instance_id\"}",
+                        "instant": false,
+                        "legend": "",
+                        "refId": "A",
+                        "step": 120
+                    }
+                ],
+                "transformations": [
+                    {
+                        "id": "organize",
+                        "options": {}
+                    }
+                ],
+                "type": "timeseries",
+                "version": "3.0.0"
+            },
+            {
+                "custom": {
+                    "drawStyle": "lines",
+                    "fillOpacity": 0.3,
+                    "gradientMode": "opacity",
+                    "lineInterpolation": "smooth",
+                    "lineWidth": 2,
+                    "scaleDistribution": {
+                        "type": "linear"
+                    },
+                    "spanNulls": false,
+                    "stack": "off"
+                },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
+                "id": "0577dc0f-887a-4a54-9100-ef5e5e7443a0",
+                "layout": {
+                    "h": 4,
+                    "i": "93955b6b-620c-4407-908c-01ba4f544fef",
+                    "isResizable": true,
+                    "w": 8,
+                    "x": 8,
+                    "y": 5
+                },
+                "maxPerRow": 4,
+                "name": "流出带宽使用率(%)",
+                "options": {
+                    "legend": {
+                        "displayMode": "hidden"
+                    },
+                    "standardOptions": {
+                        "util": "percent"
+                    },
+                    "thresholds": {
+                        "steps": [
+                            {
+                                "color": "#634CD9",
+                                "type": "base",
+                                "value": null
+                            }
+                        ]
+                    },
+                    "tooltip": {
+                        "mode": "all",
+                        "sort": "none"
+                    }
+                },
+                "targets": [
+                    {
+                        "expr": "aliyun_acs_kvstore_intranet_out_ratio_average{instance_id=\"$instance_id\"}",
+                        "instant": false,
+                        "legend": "",
+                        "refId": "A",
+                        "step": 120
+                    }
+                ],
+                "transformations": [
+                    {
+                        "id": "organize",
+                        "options": {}
+                    }
+                ],
+                "type": "timeseries",
+                "version": "3.0.0"
+            },
+            {
+                "custom": {
+                    "drawStyle": "lines",
+                    "fillOpacity": 0.3,
+                    "gradientMode": "opacity",
+                    "lineInterpolation": "smooth",
+                    "lineWidth": 2,
+                    "scaleDistribution": {
+                        "type": "linear"
+                    },
+                    "spanNulls": false,
+                    "stack": "off"
+                },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
+                "id": "a83bd550-3866-4225-9c09-08dd77e1b281",
+                "layout": {
+                    "h": 4,
+                    "i": "7b4d509b-1a8d-4f6a-9df4-f14116c4b9eb",
+                    "isResizable": true,
+                    "w": 8,
+                    "x": 16,
+                    "y": 5
+                },
+                "maxPerRow": 4,
+                "name": "连接数使用率(%)",
+                "options": {
+                    "legend": {
+                        "displayMode": "hidden"
+                    },
+                    "standardOptions": {},
+                    "thresholds": {
+                        "steps": [
+                            {
+                                "color": "#634CD9",
+                                "type": "base",
+                                "value": null
+                            }
+                        ]
+                    },
+                    "tooltip": {
+                        "mode": "all",
+                        "sort": "none"
+                    }
+                },
+                "targets": [
+                    {
+                        "expr": "aliyun_acs_kvstore_connection_usage_average{instance_id=\"$instance_id\"}",
+                        "instant": false,
+                        "legend": "",
+                        "refId": "A",
+                        "step": 120
+                    }
+                ],
+                "transformations": [
+                    {
+                        "id": "organize",
+                        "options": {}
+                    }
+                ],
+                "type": "timeseries",
+                "version": "3.0.0"
+            }
         ],
-        "transformations": [
-          {
-            "id": "organize",
-            "options": {}
-          }
+        "var": [
+            {
+                "definition": "prometheus",
+                "name": "datasource",
+                "type": "datasource"
+            },
+            {
+                "datasource": {
+                    "cate": "prometheus",
+                    "value": "${datasource}"
+                },
+                "definition": "label_values(aliyun_acs_kvstore_cpu_usage_average,name)",
+                "multi": false,
+                "name": "name",
+                "type": "query"
+            },
+            {
+                "datasource": {
+                    "cate": "prometheus",
+                    "value": "${datasource}"
+                },
+                "definition": "label_values(aliyun_acs_kvstore_cpu_usage_average,instance_id)",
+                "multi": false,
+                "name": "instance_id",
+                "type": "query"
+            }
         ],
-        "type": "timeseries",
         "version": "3.0.0"
-      },
-      {
-        "custom": {
-          "drawStyle": "lines",
-          "fillOpacity": 0.3,
-          "gradientMode": "opacity",
-          "lineInterpolation": "smooth",
-          "lineWidth": 2,
-          "scaleDistribution": {
-            "type": "linear"
-          },
-          "spanNulls": false,
-          "stack": "off"
-        },
-        "datasourceCate": "prometheus",
-        "datasourceValue": "${datasource}",
-        "id": "c43eb882-915f-4c38-a0b5-8f33c21ab44a",
-        "layout": {
-          "h": 4,
-          "i": "09903231-6557-42be-9cf3-2873878e9bf2",
-          "isResizable": true,
-          "w": 8,
-          "x": 8,
-          "y": 1
-        },
-        "maxPerRow": 4,
-        "name": "内存使用率(%)",
-        "options": {
-          "legend": {
-            "displayMode": "hidden"
-          },
-          "standardOptions": {
-            "util": "percent"
-          },
-          "thresholds": {
-            "steps": [
-              {
-                "color": "#634CD9",
-                "type": "base",
-                "value": null
-              }
-            ]
-          },
-          "tooltip": {
-            "mode": "all",
-            "sort": "none"
-          }
-        },
-        "targets": [
-          {
-            "expr": "aliyun_acs_kvstore_memory_usage_average{instance_id=\"$instance_id\"}",
-            "legend": "",
-            "refId": "A",
-            "step": 120
-          }
-        ],
-        "transformations": [
-          {
-            "id": "organize",
-            "options": {}
-          }
-        ],
-        "type": "timeseries",
-        "version": "3.0.0"
-      },
-      {
-        "custom": {
-          "drawStyle": "lines",
-          "fillOpacity": 0.3,
-          "gradientMode": "opacity",
-          "lineInterpolation": "smooth",
-          "lineWidth": 2,
-          "scaleDistribution": {
-            "type": "linear"
-          },
-          "spanNulls": false,
-          "stack": "off"
-        },
-        "datasourceCate": "prometheus",
-        "datasourceValue": "${datasource}",
-        "id": "37447883-ad79-46bc-888a-1be2835c1c64",
-        "layout": {
-          "h": 4,
-          "i": "378a5a26-c28e-4612-af09-f82ec2e11d80",
-          "isResizable": true,
-          "w": 8,
-          "x": 16,
-          "y": 1
-        },
-        "maxPerRow": 4,
-        "name": "连接数使用率(%)",
-        "options": {
-          "legend": {
-            "displayMode": "hidden"
-          },
-          "standardOptions": {
-            "util": "percent"
-          },
-          "thresholds": {
-            "steps": [
-              {
-                "color": "#634CD9",
-                "type": "base",
-                "value": null
-              }
-            ]
-          },
-          "tooltip": {
-            "mode": "all",
-            "sort": "none"
-          }
-        },
-        "targets": [
-          {
-            "expr": "aliyun_acs_kvstore_connection_usage_average{instance_id=\"$instance_id\"}",
-            "legend": "",
-            "refId": "A",
-            "step": 120
-          }
-        ],
-        "transformations": [
-          {
-            "id": "organize",
-            "options": {}
-          }
-        ],
-        "type": "timeseries",
-        "version": "3.0.0"
-      },
-      {
-        "custom": {
-          "drawStyle": "lines",
-          "fillOpacity": 0.3,
-          "gradientMode": "opacity",
-          "lineInterpolation": "smooth",
-          "lineWidth": 2,
-          "scaleDistribution": {
-            "type": "linear"
-          },
-          "spanNulls": false,
-          "stack": "off"
-        },
-        "datasourceCate": "prometheus",
-        "datasourceValue": "${datasource}",
-        "id": "2d1c8cdf-538e-48b5-8563-358f242825e5",
-        "layout": {
-          "h": 4,
-          "i": "764e188d-d728-44a0-a79d-133d957df9a9",
-          "isResizable": true,
-          "w": 8,
-          "x": 0,
-          "y": 5
-        },
-        "maxPerRow": 4,
-        "name": "流入带宽使用率(%)",
-        "options": {
-          "legend": {
-            "displayMode": "hidden"
-          },
-          "standardOptions": {
-            "util": "percent"
-          },
-          "thresholds": {
-            "steps": [
-              {
-                "color": "#634CD9",
-                "type": "base",
-                "value": null
-              }
-            ]
-          },
-          "tooltip": {
-            "mode": "all",
-            "sort": "none"
-          }
-        },
-        "targets": [
-          {
-            "expr": "aliyun_acs_kvstore_intranet_in_ratio_average{instance_id=\"$instance_id\"}",
-            "instant": false,
-            "legend": "",
-            "refId": "A",
-            "step": 120
-          }
-        ],
-        "transformations": [
-          {
-            "id": "organize",
-            "options": {}
-          }
-        ],
-        "type": "timeseries",
-        "version": "3.0.0"
-      },
-      {
-        "custom": {
-          "drawStyle": "lines",
-          "fillOpacity": 0.3,
-          "gradientMode": "opacity",
-          "lineInterpolation": "smooth",
-          "lineWidth": 2,
-          "scaleDistribution": {
-            "type": "linear"
-          },
-          "spanNulls": false,
-          "stack": "off"
-        },
-        "datasourceCate": "prometheus",
-        "datasourceValue": "${datasource}",
-        "id": "0577dc0f-887a-4a54-9100-ef5e5e7443a0",
-        "layout": {
-          "h": 4,
-          "i": "93955b6b-620c-4407-908c-01ba4f544fef",
-          "isResizable": true,
-          "w": 8,
-          "x": 8,
-          "y": 5
-        },
-        "maxPerRow": 4,
-        "name": "流出带宽使用率(%)",
-        "options": {
-          "legend": {
-            "displayMode": "hidden"
-          },
-          "standardOptions": {
-            "util": "percent"
-          },
-          "thresholds": {
-            "steps": [
-              {
-                "color": "#634CD9",
-                "type": "base",
-                "value": null
-              }
-            ]
-          },
-          "tooltip": {
-            "mode": "all",
-            "sort": "none"
-          }
-        },
-        "targets": [
-          {
-            "expr": "aliyun_acs_kvstore_intranet_out_ratio_average{instance_id=\"$instance_id\"}",
-            "instant": false,
-            "legend": "",
-            "refId": "A",
-            "step": 120
-          }
-        ],
-        "transformations": [
-          {
-            "id": "organize",
-            "options": {}
-          }
-        ],
-        "type": "timeseries",
-        "version": "3.0.0"
-      },
-      {
-        "custom": {
-          "drawStyle": "lines",
-          "fillOpacity": 0.3,
-          "gradientMode": "opacity",
-          "lineInterpolation": "smooth",
-          "lineWidth": 2,
-          "scaleDistribution": {
-            "type": "linear"
-          },
-          "spanNulls": false,
-          "stack": "off"
-        },
-        "datasourceCate": "prometheus",
-        "datasourceValue": "${datasource}",
-        "id": "a83bd550-3866-4225-9c09-08dd77e1b281",
-        "layout": {
-          "h": 4,
-          "i": "7b4d509b-1a8d-4f6a-9df4-f14116c4b9eb",
-          "isResizable": true,
-          "w": 8,
-          "x": 16,
-          "y": 5
-        },
-        "maxPerRow": 4,
-        "name": "连接数使用率(%)",
-        "options": {
-          "legend": {
-            "displayMode": "hidden"
-          },
-          "standardOptions": {},
-          "thresholds": {
-            "steps": [
-              {
-                "color": "#634CD9",
-                "type": "base",
-                "value": null
-              }
-            ]
-          },
-          "tooltip": {
-            "mode": "all",
-            "sort": "none"
-          }
-        },
-        "targets": [
-          {
-            "expr": "aliyun_acs_kvstore_connection_usage_average{instance_id=\"$instance_id\"}",
-            "instant": false,
-            "legend": "",
-            "refId": "A",
-            "step": 120
-          }
-        ],
-        "transformations": [
-          {
-            "id": "organize",
-            "options": {}
-          }
-        ],
-        "type": "timeseries",
-        "version": "3.0.0"
-      }
-    ],
-    "var": [
-      {
-        "name": "datasource",
-        "type": "datasource",
-        "definition": "prometheus"
-      },
-      {
-        "name": "name",
-        "type": "query",
-        "datasource": {
-          "cate": "prometheus",
-          "value": "${datasource}"
-        },
-        "definition": "label_values(aliyun_acs_kvstore_cpu_usage_average,name)",
-        "multi": false
-      },
-      {
-        "datasource": {
-          "cate": "prometheus",
-          "value": "${datasource}"
-        },
-        "definition": "label_values(aliyun_acs_kvstore_cpu_usage_average,instance_id)",
-        "multi": false,
-        "name": "instance_id",
-        "type": "query"
-      }
-    ],
-    "version": "3.0.0"
-  }
-}
+    },
+    "public": 0,
+    "public_cate": 0,
+    "bgids": null,
+    "built_in": 0,
+    "hide": 0,
+    "uuid": 1717556327133348000
+}

integrations/AliYun/dashboards/slb.json

@@ -1,388 +1,400 @@
 {
-  "name": "阿里云SLB",
-  "tags": "",
-  "ident": "",
-  "configs": {
-    "panels": [
-      {
-        "custom": {
-          "drawStyle": "lines",
-          "fillOpacity": 0.3,
-          "gradientMode": "opacity",
-          "lineInterpolation": "smooth",
-          "lineWidth": 2,
-          "scaleDistribution": {
-            "type": "linear"
-          },
-          "spanNulls": false,
-          "stack": "off"
-        },
-        "datasourceCate": "prometheus",
-        "datasourceName": "Default",
-        "id": "aa8b2623-1e14-43cd-a3c4-33944a61fcc5",
-        "layout": {
-          "h": 4,
-          "i": "aa8b2623-1e14-43cd-a3c4-33944a61fcc5",
-          "isResizable": true,
-          "w": 12,
-          "x": 0,
-          "y": 0
-        },
-        "maxPerRow": 4,
-        "name": "七层实例QPS使用率(%)",
-        "options": {
-          "legend": {
-            "displayMode": "hidden"
-          },
-          "standardOptions": {},
-          "thresholds": {
-            "steps": [
-              {
-                "color": "#634CD9",
-                "type": "base",
-                "value": null
-              }
-            ]
-          },
-          "tooltip": {
-            "mode": "all",
-            "sort": "none"
-          }
-        },
-        "targets": [
-          {
-            "expr": "sum(aliyun_acs_slb_dashboard_instance_qps_utilization_average{instance_id=~\"$instance_id\"}) by (instance_id)",
-            "legend": "{{instance_id}} QPS使用率 ",
-            "refId": "A"
-          }
+    "id": 0,
+    "group_id": 0,
+    "name": "阿里云SLB",
+    "ident": "",
+    "tags": "",
+    "create_at": 0,
+    "create_by": "",
+    "update_at": 0,
+    "update_by": "",
+    "configs": {
+        "panels": [
+            {
+                "custom": {
+                    "drawStyle": "lines",
+                    "fillOpacity": 0.3,
+                    "gradientMode": "opacity",
+                    "lineInterpolation": "smooth",
+                    "lineWidth": 2,
+                    "scaleDistribution": {
+                        "type": "linear"
+                    },
+                    "spanNulls": false,
+                    "stack": "off"
+                },
+                "datasourceCate": "prometheus",
+                "datasourceName": "Default",
+                "datasourceValue": "${datasource}",
+                "id": "aa8b2623-1e14-43cd-a3c4-33944a61fcc5",
+                "layout": {
+                    "h": 4,
+                    "i": "aa8b2623-1e14-43cd-a3c4-33944a61fcc5",
+                    "isResizable": true,
+                    "w": 12,
+                    "x": 0,
+                    "y": 0
+                },
+                "maxPerRow": 4,
+                "name": "七层实例QPS使用率(%)",
+                "options": {
+                    "legend": {
+                        "displayMode": "hidden"
+                    },
+                    "standardOptions": {},
+                    "thresholds": {
+                        "steps": [
+                            {
+                                "color": "#634CD9",
+                                "type": "base",
+                                "value": null
+                            }
+                        ]
+                    },
+                    "tooltip": {
+                        "mode": "all",
+                        "sort": "none"
+                    }
+                },
+                "targets": [
+                    {
+                        "expr": "sum(aliyun_acs_slb_dashboard_instance_qps_utilization_average{instance_id=~\"$instance_id\"}) by (instance_id)",
+                        "legend": "{{instance_id}} QPS使用率 ",
+                        "refId": "A"
+                    }
+                ],
+                "type": "timeseries",
+                "version": "2.0.0"
+            },
+            {
+                "custom": {
+                    "drawStyle": "lines",
+                    "fillOpacity": 0.3,
+                    "gradientMode": "opacity",
+                    "lineInterpolation": "smooth",
+                    "lineWidth": 2,
+                    "scaleDistribution": {
+                        "type": "linear"
+                    },
+                    "spanNulls": false,
+                    "stack": "off"
+                },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
+                "id": "b2002c63-8f0b-436c-b765-5bb65191f3c2",
+                "layout": {
+                    "h": 4,
+                    "i": "b2002c63-8f0b-436c-b765-5bb65191f3c2",
+                    "isResizable": true,
+                    "w": 12,
+                    "x": 12,
+                    "y": 0
+                },
+                "maxPerRow": 4,
+                "name": "7层协议实例Upstream状态码分布",
+                "options": {
+                    "legend": {
+                        "displayMode": "hidden"
+                    },
+                    "standardOptions": {},
+                    "thresholds": {
+                        "steps": [
+                            {
+                                "color": "#634CD9",
+                                "type": "base",
+                                "value": null
+                            }
+                        ]
+                    },
+                    "tooltip": {
+                        "mode": "all",
+                        "sort": "none"
+                    }
+                },
+                "targets": [
+                    {
+                        "expr": "sum(aliyun_acs_slb_dashboard_upstream_code4xx_average{instance_id=~\"$instance_id\"}) by (instance_id)",
+                        "legend": "{{instance_id}} 状态码 4xx ",
+                        "refId": "A"
+                    },
+                    {
+                        "expr": "sum(aliyun_acs_slb_dashboard_upstream_code5xx_average{instance_id=~\"$instance_id\"}) by (instance_id)",
+                        "legend": "{{instance_id}} 状态码 5xx ",
+                        "refId": "B"
+                    }
+                ],
+                "type": "timeseries",
+                "version": "2.0.0"
+            },
+            {
+                "custom": {
+                    "drawStyle": "lines",
+                    "fillOpacity": 0.3,
+                    "gradientMode": "opacity",
+                    "lineInterpolation": "smooth",
+                    "lineWidth": 2,
+                    "scaleDistribution": {
+                        "type": "linear"
+                    },
+                    "spanNulls": false,
+                    "stack": "off"
+                },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
+                "id": "71028d82-4804-468f-92f4-3444953b22cc",
+                "layout": {
+                    "h": 4,
+                    "i": "71028d82-4804-468f-92f4-3444953b22cc",
+                    "isResizable": true,
+                    "w": 12,
+                    "x": 0,
+                    "y": 4
+                },
+                "maxPerRow": 4,
+                "name": "新建连接数",
+                "options": {
+                    "legend": {
+                        "displayMode": "hidden"
+                    },
+                    "standardOptions": {},
+                    "thresholds": {
+                        "steps": [
+                            {
+                                "color": "#634CD9",
+                                "type": "base",
+                                "value": null
+                            }
+                        ]
+                    },
+                    "tooltip": {
+                        "mode": "all",
+                        "sort": "none"
+                    }
+                },
+                "targets": [
+                    {
+                        "expr": "sum(aliyun_acs_slb_dashboard_instance_new_connection_average{instance_id=~\"$instance_id\"}) by (instance_id)",
+                        "legend": "{{instance_id}} 新建连接数",
+                        "refId": "A"
+                    }
+                ],
+                "type": "timeseries",
+                "version": "2.0.0"
+            },
+            {
+                "custom": {
+                    "drawStyle": "lines",
+                    "fillOpacity": 0.3,
+                    "gradientMode": "opacity",
+                    "lineInterpolation": "smooth",
+                    "lineWidth": 2,
+                    "scaleDistribution": {
+                        "type": "linear"
+                    },
+                    "spanNulls": false,
+                    "stack": "off"
+                },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
+                "id": "25f90635-ff68-4dc2-bfb0-c6634f0e6867",
+                "layout": {
+                    "h": 4,
+                    "i": "25f90635-ff68-4dc2-bfb0-c6634f0e6867",
+                    "isResizable": true,
+                    "w": 12,
+                    "x": 12,
+                    "y": 4
+                },
+                "maxPerRow": 4,
+                "name": "并发连接数",
+                "options": {
+                    "legend": {
+                        "displayMode": "hidden"
+                    },
+                    "standardOptions": {},
+                    "thresholds": {
+                        "steps": [
+                            {
+                                "color": "#634CD9",
+                                "type": "base",
+                                "value": null
+                            }
+                        ]
+                    },
+                    "tooltip": {
+                        "mode": "all",
+                        "sort": "none"
+                    }
+                },
+                "targets": [
+                    {
+                        "expr": "sum(aliyun_acs_slb_dashboard_active_connection_average{instance_id=~\"$instance_id\"}) by (instance_id)",
+                        "legend": "{{instance_id}} 活跃连接数",
+                        "refId": "A"
+                    },
+                    {
+                        "expr": "sum(aliyun_acs_slb_dashboard_inactive_connection_average{instance_id=~\"$instance_id\"}) by (instance_id)",
+                        "legend": "{{instance_id}} 非活跃连接数",
+                        "refId": "B"
+                    },
+                    {
+                        "expr": "sum(aliyun_acs_slb_dashboard_max_connection_average{instance_id=~\"$instance_id\"}) by (instance_id)",
+                        "legend": "{{instance_id}} 最大活跃连接数",
+                        "refId": "C"
+                    }
+                ],
+                "type": "timeseries",
+                "version": "2.0.0"
+            },
+            {
+                "custom": {
+                    "drawStyle": "lines",
+                    "fillOpacity": 0.3,
+                    "gradientMode": "opacity",
+                    "lineInterpolation": "smooth",
+                    "lineWidth": 2,
+                    "scaleDistribution": {
+                        "type": "linear"
+                    },
+                    "spanNulls": false,
+                    "stack": "off"
+                },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
+                "id": "fde27e57-bdd6-4fd6-b3c0-75222f736d3b",
+                "layout": {
+                    "h": 4,
+                    "i": "fde27e57-bdd6-4fd6-b3c0-75222f736d3b",
+                    "isResizable": true,
+                    "w": 12,
+                    "x": 0,
+                    "y": 8
+                },
+                "maxPerRow": 4,
+                "name": "数据包数",
+                "options": {
+                    "legend": {
+                        "displayMode": "hidden"
+                    },
+                    "standardOptions": {
+                        "util": "none"
+                    },
+                    "thresholds": {
+                        "steps": [
+                            {
+                                "color": "#634CD9",
+                                "type": "base",
+                                "value": null
+                            }
+                        ]
+                    },
+                    "tooltip": {
+                        "mode": "all",
+                        "sort": "none"
+                    }
+                },
+                "targets": [
+                    {
+                        "expr": "sum(aliyun_acs_slb_dashboard_packet_rx_average{instance_id=~\"$instance_id\"}) by (instance_id)",
+                        "legend": "{{instance_id}} 接受数据包数",
+                        "refId": "A"
+                    },
+                    {
+                        "expr": "sum(aliyun_acs_slb_dashboard_packet_tx_average{instance_id=~\"$instance_id\"}) by (instance_id)",
+                        "legend": "{{instance_id}} 发送数据包数",
+                        "refId": "B"
+                    }
+                ],
+                "type": "timeseries",
+                "version": "2.0.0"
+            },
+            {
+                "custom": {
+                    "drawStyle": "lines",
+                    "fillOpacity": 0.3,
+                    "gradientMode": "opacity",
+                    "lineInterpolation": "smooth",
+                    "lineWidth": 2,
+                    "scaleDistribution": {
+                        "type": "linear"
+                    },
+                    "spanNulls": false,
+                    "stack": "off"
+                },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
+                "id": "a0fd47db-0b49-4b71-ae16-b4108324e35a",
+                "layout": {
+                    "h": 4,
+                    "i": "a0fd47db-0b49-4b71-ae16-b4108324e35a",
+                    "isResizable": true,
+                    "w": 12,
+                    "x": 12,
+                    "y": 8
+                },
+                "maxPerRow": 4,
+                "name": "流量",
+                "options": {
+                    "legend": {
+                        "displayMode": "hidden"
+                    },
+                    "standardOptions": {
+                        "util": "bitsSI"
+                    },
+                    "thresholds": {
+                        "steps": [
+                            {
+                                "color": "#634CD9",
+                                "type": "base",
+                                "value": null
+                            }
+                        ]
+                    },
+                    "tooltip": {
+                        "mode": "all",
+                        "sort": "none"
+                    }
+                },
+                "targets": [
+                    {
+                        "expr": "sum(aliyun_acs_slb_dashboard_instance_traffic_rx_average{instance_id=~\"$instance_id\"}) by (instance_id)",
+                        "legend": "{{instance_id}} 出流量",
+                        "refId": "A"
+                    },
+                    {
+                        "expr": "sum(aliyun_acs_slb_dashboard_instance_traffic_tx_average{instance_id=~\"$instance_id\"}) by (instance_id)",
+                        "legend": "{{instance_id}} 入流量",
+                        "refId": "B"
+                    }
+                ],
+                "type": "timeseries",
+                "version": "2.0.0"
+            }
         ],
-        "type": "timeseries",
-        "version": "2.0.0",
-        "datasourceValue": "${datasource}"
-      },
-      {
-        "custom": {
-          "drawStyle": "lines",
-          "fillOpacity": 0.3,
-          "gradientMode": "opacity",
-          "lineInterpolation": "smooth",
-          "lineWidth": 2,
-          "scaleDistribution": {
-            "type": "linear"
-          },
-          "spanNulls": false,
-          "stack": "off"
-        },
-        "datasourceCate": "prometheus",
-        "id": "b2002c63-8f0b-436c-b765-5bb65191f3c2",
-        "layout": {
-          "h": 4,
-          "i": "b2002c63-8f0b-436c-b765-5bb65191f3c2",
-          "isResizable": true,
-          "w": 12,
-          "x": 12,
-          "y": 0
-        },
-        "maxPerRow": 4,
-        "name": "7层协议实例Upstream状态码分布",
-        "options": {
-          "legend": {
-            "displayMode": "hidden"
-          },
-          "standardOptions": {},
-          "thresholds": {
-            "steps": [
-              {
-                "color": "#634CD9",
-                "type": "base",
-                "value": null
-              }
-            ]
-          },
-          "tooltip": {
-            "mode": "all",
-            "sort": "none"
-          }
-        },
-        "targets": [
-          {
-            "expr": "sum(aliyun_acs_slb_dashboard_upstream_code4xx_average{instance_id=~\"$instance_id\"}) by (instance_id)",
-            "legend": "{{instance_id}} 状态码 4xx ",
-            "refId": "A"
-          },
-          {
-            "expr": "sum(aliyun_acs_slb_dashboard_upstream_code5xx_average{instance_id=~\"$instance_id\"}) by (instance_id)",
-            "legend": "{{instance_id}} 状态码 5xx ",
-            "refId": "B"
-          }
+        "var": [
+            {
+                "definition": "prometheus",
+                "name": "datasource",
+                "type": "datasource"
+            },
+            {
+                "allOption": true,
+                "datasource": {
+                    "cate": "prometheus",
+                    "value": "${datasource}"
+                },
+                "definition": "label_values(aliyun_acs_slb_dashboard_active_connection_average ,instance_id)",
+                "multi": true,
+                "name": "instance_id",
+                "type": "query"
+            }
         ],
-        "type": "timeseries",
-        "version": "2.0.0",
-        "datasourceValue": "${datasource}"
-      },
-      {
-        "custom": {
-          "drawStyle": "lines",
-          "fillOpacity": 0.3,
-          "gradientMode": "opacity",
-          "lineInterpolation": "smooth",
-          "lineWidth": 2,
-          "scaleDistribution": {
-            "type": "linear"
-          },
-          "spanNulls": false,
-          "stack": "off"
-        },
-        "datasourceCate": "prometheus",
-        "id": "71028d82-4804-468f-92f4-3444953b22cc",
-        "layout": {
-          "h": 4,
-          "i": "71028d82-4804-468f-92f4-3444953b22cc",
-          "isResizable": true,
-          "w": 12,
-          "x": 0,
-          "y": 4
-        },
-        "maxPerRow": 4,
-        "name": "新建连接数",
-        "options": {
-          "legend": {
-            "displayMode": "hidden"
-          },
-          "standardOptions": {},
-          "thresholds": {
-            "steps": [
-              {
-                "color": "#634CD9",
-                "type": "base",
-                "value": null
-              }
-            ]
-          },
-          "tooltip": {
-            "mode": "all",
-            "sort": "none"
-          }
-        },
-        "targets": [
-          {
-            "expr": "sum(aliyun_acs_slb_dashboard_instance_new_connection_average{instance_id=~\"$instance_id\"}) by (instance_id)",
-            "legend": "{{instance_id}} 新建连接数",
-            "refId": "A"
-          }
-        ],
-        "type": "timeseries",
-        "version": "2.0.0",
-        "datasourceValue": "${datasource}"
-      },
-      {
-        "custom": {
-          "drawStyle": "lines",
-          "fillOpacity": 0.3,
-          "gradientMode": "opacity",
-          "lineInterpolation": "smooth",
-          "lineWidth": 2,
-          "scaleDistribution": {
-            "type": "linear"
-          },
-          "spanNulls": false,
-          "stack": "off"
-        },
-        "datasourceCate": "prometheus",
-        "id": "25f90635-ff68-4dc2-bfb0-c6634f0e6867",
-        "layout": {
-          "h": 4,
-          "i": "25f90635-ff68-4dc2-bfb0-c6634f0e6867",
-          "isResizable": true,
-          "w": 12,
-          "x": 12,
-          "y": 4
-        },
-        "maxPerRow": 4,
-        "name": "并发连接数",
-        "options": {
-          "legend": {
-            "displayMode": "hidden"
-          },
-          "standardOptions": {},
-          "thresholds": {
-            "steps": [
-              {
-                "color": "#634CD9",
-                "type": "base",
-                "value": null
-              }
-            ]
-          },
-          "tooltip": {
-            "mode": "all",
-            "sort": "none"
-          }
-        },
-        "targets": [
-          {
-            "expr": "sum(aliyun_acs_slb_dashboard_active_connection_average{instance_id=~\"$instance_id\"}) by (instance_id)",
-            "legend": "{{instance_id}} 活跃连接数",
-            "refId": "A"
-          },
-          {
-            "expr": "sum(aliyun_acs_slb_dashboard_inactive_connection_average{instance_id=~\"$instance_id\"}) by (instance_id)",
-            "legend": "{{instance_id}} 非活跃连接数",
-            "refId": "B"
-          },
-          {
-            "expr": "sum(aliyun_acs_slb_dashboard_max_connection_average{instance_id=~\"$instance_id\"}) by (instance_id)",
-            "legend": "{{instance_id}} 最大活跃连接数",
-            "refId": "C"
-          }
-        ],
-        "type": "timeseries",
-        "version": "2.0.0",
-        "datasourceValue": "${datasource}"
-      },
-      {
-        "custom": {
-          "drawStyle": "lines",
-          "fillOpacity": 0.3,
-          "gradientMode": "opacity",
-          "lineInterpolation": "smooth",
-          "lineWidth": 2,
-          "scaleDistribution": {
-            "type": "linear"
-          },
-          "spanNulls": false,
-          "stack": "off"
-        },
-        "datasourceCate": "prometheus",
-        "id": "fde27e57-bdd6-4fd6-b3c0-75222f736d3b",
-        "layout": {
-          "h": 4,
-          "i": "fde27e57-bdd6-4fd6-b3c0-75222f736d3b",
-          "isResizable": true,
-          "w": 12,
-          "x": 0,
-          "y": 8
-        },
-        "maxPerRow": 4,
-        "name": "数据包数",
-        "options": {
-          "legend": {
-            "displayMode": "hidden"
-          },
-          "standardOptions": {
-            "util": "none"
-          },
-          "thresholds": {
-            "steps": [
-              {
-                "color": "#634CD9",
-                "type": "base",
-                "value": null
-              }
-            ]
-          },
-          "tooltip": {
-            "mode": "all",
-            "sort": "none"
-          }
-        },
-        "targets": [
-          {
-            "expr": "sum(aliyun_acs_slb_dashboard_packet_rx_average{instance_id=~\"$instance_id\"}) by (instance_id)",
-            "legend": "{{instance_id}} 接受数据包数",
-            "refId": "A"
-          },
-          {
-            "expr": "sum(aliyun_acs_slb_dashboard_packet_tx_average{instance_id=~\"$instance_id\"}) by (instance_id)",
-            "legend": "{{instance_id}} 发送数据包数",
-            "refId": "B"
-          }
-        ],
-        "type": "timeseries",
-        "version": "2.0.0",
-        "datasourceValue": "${datasource}"
-      },
-      {
-        "custom": {
-          "drawStyle": "lines",
-          "fillOpacity": 0.3,
-          "gradientMode": "opacity",
-          "lineInterpolation": "smooth",
-          "lineWidth": 2,
-          "scaleDistribution": {
-            "type": "linear"
-          },
-          "spanNulls": false,
-          "stack": "off"
-        },
-        "datasourceCate": "prometheus",
-        "id": "a0fd47db-0b49-4b71-ae16-b4108324e35a",
-        "layout": {
-          "h": 4,
-          "i": "a0fd47db-0b49-4b71-ae16-b4108324e35a",
-          "isResizable": true,
-          "w": 12,
-          "x": 12,
-          "y": 8
-        },
-        "maxPerRow": 4,
-        "name": "流量",
-        "options": {
-          "legend": {
-            "displayMode": "hidden"
-          },
-          "standardOptions": {
-            "util": "bitsSI"
-          },
-          "thresholds": {
-            "steps": [
-              {
-                "color": "#634CD9",
-                "type": "base",
-                "value": null
-              }
-            ]
-          },
-          "tooltip": {
-            "mode": "all",
-            "sort": "none"
-          }
-        },
-        "targets": [
-          {
-            "expr": "sum(aliyun_acs_slb_dashboard_instance_traffic_rx_average{instance_id=~\"$instance_id\"}) by (instance_id)",
-            "legend": "{{instance_id}} 出流量",
-            "refId": "A"
-          },
-          {
-            "expr": "sum(aliyun_acs_slb_dashboard_instance_traffic_tx_average{instance_id=~\"$instance_id\"}) by (instance_id)",
-            "legend": "{{instance_id}} 入流量",
-            "refId": "B"
-          }
-        ],
-        "type": "timeseries",
-        "version": "2.0.0",
-        "datasourceValue": "${datasource}"
-      }
-    ],
-    "var": [
-      {
-        "name": "datasource",
-        "type": "datasource",
-        "definition": "prometheus"
-      },
-      {
-        "allOption": true,
-        "datasource": {
-          "cate": "prometheus",
-          "value": "${datasource}"
-        },
-        "definition": "label_values(aliyun_acs_slb_dashboard_active_connection_average ,instance_id)",
-        "multi": true,
-        "name": "instance_id",
-        "type": "query"
-      }
-    ],
-    "version": "3.0.0"
-  }
-}
+        "version": "3.0.0"
+    },
+    "public": 0,
+    "public_cate": 0,
+    "bgids": null,
+    "built_in": 0,
+    "hide": 0,
+    "uuid": 1717556327138375000
+}

integrations/AliYun/dashboards/waf.json

@@ -1,358 +1,370 @@
 {
-  "name": "阿里云WAF",
-  "tags": "",
-  "ident": "",
-  "configs": {
-    "panels": [
-      {
-        "custom": {
-          "drawStyle": "lines",
-          "fillOpacity": 0.3,
-          "gradientMode": "opacity",
-          "lineInterpolation": "smooth",
-          "lineWidth": 2,
-          "scaleDistribution": {
-            "type": "linear"
-          },
-          "spanNulls": false,
-          "stack": "off"
-        },
-        "datasourceCate": "prometheus",
-        "id": "ec46b990-faf5-4ed7-a791-bbac5df91636",
-        "layout": {
-          "h": 4,
-          "i": "ec46b990-faf5-4ed7-a791-bbac5df91636",
-          "isResizable": true,
-          "w": 12,
-          "x": 0,
-          "y": 0
-        },
-        "maxPerRow": 4,
-        "name": "4xx 环比率V3",
-        "options": {
-          "legend": {
-            "displayMode": "hidden"
-          },
-          "standardOptions": {},
-          "thresholds": {
-            "steps": [
-              {
-                "color": "#634CD9",
-                "type": "base",
-                "value": null
-              }
-            ]
-          },
-          "tooltip": {
-            "mode": "all",
-            "sort": "none"
-          }
-        },
-        "targets": [
-          {
-            "expr": "sum(aliyun_waf_4xx_ratio_wafv3_maximum{instance_id=~\"$instance_id\"}) by (instance_id)",
-            "legend": "4xx 环比率V3",
-            "refId": "A"
-          }
+    "id": 0,
+    "group_id": 0,
+    "name": "阿里云WAF",
+    "ident": "",
+    "tags": "",
+    "create_at": 0,
+    "create_by": "",
+    "update_at": 0,
+    "update_by": "",
+    "configs": {
+        "panels": [
+            {
+                "custom": {
+                    "drawStyle": "lines",
+                    "fillOpacity": 0.3,
+                    "gradientMode": "opacity",
+                    "lineInterpolation": "smooth",
+                    "lineWidth": 2,
+                    "scaleDistribution": {
+                        "type": "linear"
+                    },
+                    "spanNulls": false,
+                    "stack": "off"
+                },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
+                "id": "ec46b990-faf5-4ed7-a791-bbac5df91636",
+                "layout": {
+                    "h": 4,
+                    "i": "ec46b990-faf5-4ed7-a791-bbac5df91636",
+                    "isResizable": true,
+                    "w": 12,
+                    "x": 0,
+                    "y": 0
+                },
+                "maxPerRow": 4,
+                "name": "4xx 环比率V3",
+                "options": {
+                    "legend": {
+                        "displayMode": "hidden"
+                    },
+                    "standardOptions": {},
+                    "thresholds": {
+                        "steps": [
+                            {
+                                "color": "#634CD9",
+                                "type": "base",
+                                "value": null
+                            }
+                        ]
+                    },
+                    "tooltip": {
+                        "mode": "all",
+                        "sort": "none"
+                    }
+                },
+                "targets": [
+                    {
+                        "expr": "sum(aliyun_waf_4xx_ratio_wafv3_maximum{instance_id=~\"$instance_id\"}) by (instance_id)",
+                        "legend": "4xx 环比率V3",
+                        "refId": "A"
+                    }
+                ],
+                "type": "timeseries",
+                "version": "2.0.0"
+            },
+            {
+                "custom": {
+                    "drawStyle": "lines",
+                    "fillOpacity": 0.3,
+                    "gradientMode": "opacity",
+                    "lineInterpolation": "smooth",
+                    "lineWidth": 2,
+                    "scaleDistribution": {
+                        "type": "linear"
+                    },
+                    "spanNulls": false,
+                    "stack": "off"
+                },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
+                "id": "efc75e62-5e75-470d-b12b-a98ca44b268a",
+                "layout": {
+                    "h": 4,
+                    "i": "584b5a3c-2b7a-4e11-bee5-c2ed8661933e",
+                    "isResizable": true,
+                    "w": 12,
+                    "x": 12,
+                    "y": 0
+                },
+                "maxPerRow": 4,
+                "name": "5xx 环比率V3",
+                "options": {
+                    "legend": {
+                        "displayMode": "hidden"
+                    },
+                    "standardOptions": {},
+                    "thresholds": {
+                        "steps": [
+                            {
+                                "color": "#634CD9",
+                                "type": "base",
+                                "value": null
+                            }
+                        ]
+                    },
+                    "tooltip": {
+                        "mode": "all",
+                        "sort": "none"
+                    }
+                },
+                "targets": [
+                    {
+                        "expr": "sum(aliyun_waf_5xx_ratio_wafv3_maximum{instance_id=~\"$instance_id\"}) by (instance_id)",
+                        "legend": "5xx 环比率V3",
+                        "refId": "A"
+                    }
+                ],
+                "type": "timeseries",
+                "version": "2.0.0"
+            },
+            {
+                "custom": {
+                    "drawStyle": "lines",
+                    "fillOpacity": 0.3,
+                    "gradientMode": "opacity",
+                    "lineInterpolation": "smooth",
+                    "lineWidth": 2,
+                    "scaleDistribution": {
+                        "type": "linear"
+                    },
+                    "spanNulls": false,
+                    "stack": "off"
+                },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
+                "id": "79aefa1b-5e50-4c0c-980d-e5523b859509",
+                "layout": {
+                    "h": 4,
+                    "i": "fc875397-c1a4-4713-b564-09abf852bcf3",
+                    "isResizable": true,
+                    "w": 12,
+                    "x": 0,
+                    "y": 4
+                },
+                "maxPerRow": 4,
+                "name": "4xx 环比率",
+                "options": {
+                    "legend": {
+                        "displayMode": "hidden"
+                    },
+                    "standardOptions": {},
+                    "thresholds": {
+                        "steps": [
+                            {
+                                "color": "#634CD9",
+                                "type": "base",
+                                "value": null
+                            }
+                        ]
+                    },
+                    "tooltip": {
+                        "mode": "all",
+                        "sort": "none"
+                    }
+                },
+                "targets": [
+                    {
+                        "expr": "sum(aliyun_waf_4xx_ratio_maximum{instance_id=~\"$instance_id\"}) by (instance_id)",
+                        "legend": "4xx 环比率",
+                        "refId": "A"
+                    }
+                ],
+                "type": "timeseries",
+                "version": "2.0.0"
+            },
+            {
+                "custom": {
+                    "drawStyle": "lines",
+                    "fillOpacity": 0.3,
+                    "gradientMode": "opacity",
+                    "lineInterpolation": "smooth",
+                    "lineWidth": 2,
+                    "scaleDistribution": {
+                        "type": "linear"
+                    },
+                    "spanNulls": false,
+                    "stack": "off"
+                },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
+                "id": "60c211d4-d51a-4681-b23b-ec8cc5dce7fe",
+                "layout": {
+                    "h": 4,
+                    "i": "946be0db-32a3-48ea-9473-88fdfa77201d",
+                    "isResizable": true,
+                    "w": 12,
+                    "x": 12,
+                    "y": 4
+                },
+                "maxPerRow": 4,
+                "name": "5xx 环比率",
+                "options": {
+                    "legend": {
+                        "displayMode": "hidden"
+                    },
+                    "standardOptions": {},
+                    "thresholds": {
+                        "steps": [
+                            {
+                                "color": "#634CD9",
+                                "type": "base",
+                                "value": null
+                            }
+                        ]
+                    },
+                    "tooltip": {
+                        "mode": "all",
+                        "sort": "none"
+                    }
+                },
+                "targets": [
+                    {
+                        "expr": "sum(aliyun_waf_5xx_ratio_maximum{instance_id=~\"$instance_id\"}) by (instance_id)",
+                        "legend": "5xx 环比率",
+                        "refId": "A"
+                    }
+                ],
+                "type": "timeseries",
+                "version": "2.0.0"
+            },
+            {
+                "custom": {
+                    "drawStyle": "lines",
+                    "fillOpacity": 0.3,
+                    "gradientMode": "opacity",
+                    "lineInterpolation": "smooth",
+                    "lineWidth": 2,
+                    "scaleDistribution": {
+                        "type": "linear"
+                    },
+                    "spanNulls": false,
+                    "stack": "off"
+                },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
+                "id": "0de9271c-7b19-4003-ae56-2e273b4b99c4",
+                "layout": {
+                    "h": 4,
+                    "i": "0de9271c-7b19-4003-ae56-2e273b4b99c4",
+                    "isResizable": true,
+                    "w": 12,
+                    "x": 0,
+                    "y": 8
+                },
+                "maxPerRow": 4,
+                "name": "QPS环比增长率",
+                "options": {
+                    "legend": {
+                        "displayMode": "hidden"
+                    },
+                    "standardOptions": {},
+                    "thresholds": {
+                        "steps": [
+                            {
+                                "color": "#634CD9",
+                                "type": "base",
+                                "value": null
+                            }
+                        ]
+                    },
+                    "tooltip": {
+                        "mode": "all",
+                        "sort": "none"
+                    }
+                },
+                "targets": [
+                    {
+                        "expr": "sum(aliyun_waf_qps_ratio_maximum{instance_id=~\"$instance_id\"}) by (instance_id)",
+                        "legend": "{{instance_id}}QPS 环比增长率",
+                        "refId": "A"
+                    }
+                ],
+                "type": "timeseries",
+                "version": "2.0.0"
+            },
+            {
+                "custom": {
+                    "drawStyle": "lines",
+                    "fillOpacity": 0.3,
+                    "gradientMode": "opacity",
+                    "lineInterpolation": "smooth",
+                    "lineWidth": 2,
+                    "scaleDistribution": {
+                        "type": "linear"
+                    },
+                    "spanNulls": false,
+                    "stack": "off"
+                },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
+                "id": "ccf2ffc1-6f22-4a13-b795-68072c077e1f",
+                "layout": {
+                    "h": 4,
+                    "i": "d0320716-f704-4b6e-8671-b58fb77a5d7c",
+                    "isResizable": true,
+                    "w": 12,
+                    "x": 12,
+                    "y": 8
+                },
+                "maxPerRow": 4,
+                "name": "QPS环比下降率",
+                "options": {
+                    "legend": {
+                        "displayMode": "hidden"
+                    },
+                    "standardOptions": {},
+                    "thresholds": {
+                        "steps": [
+                            {
+                                "color": "#634CD9",
+                                "type": "base",
+                                "value": null
+                            }
+                        ]
+                    },
+                    "tooltip": {
+                        "mode": "all",
+                        "sort": "none"
+                    }
+                },
+                "targets": [
+                    {
+                        "expr": "sum(aliyun_waf_qps_ratio_down_maximum{instance_id=~\"$instance_id\"}) by (instance_id)",
+                        "legend": "{{instance_id}}QPS 环比下降率",
+                        "refId": "A"
+                    }
+                ],
+                "type": "timeseries",
+                "version": "2.0.0"
+            }
         ],
-        "type": "timeseries",
-        "version": "2.0.0",
-        "datasourceValue": "${datasource}"
-      },
-      {
-        "custom": {
-          "drawStyle": "lines",
-          "fillOpacity": 0.3,
-          "gradientMode": "opacity",
-          "lineInterpolation": "smooth",
-          "lineWidth": 2,
-          "scaleDistribution": {
-            "type": "linear"
-          },
-          "spanNulls": false,
-          "stack": "off"
-        },
-        "datasourceCate": "prometheus",
-        "id": "efc75e62-5e75-470d-b12b-a98ca44b268a",
-        "layout": {
-          "h": 4,
-          "i": "584b5a3c-2b7a-4e11-bee5-c2ed8661933e",
-          "isResizable": true,
-          "w": 12,
-          "x": 12,
-          "y": 0
-        },
-        "maxPerRow": 4,
-        "name": "5xx 环比率V3",
-        "options": {
-          "legend": {
-            "displayMode": "hidden"
-          },
-          "standardOptions": {},
-          "thresholds": {
-            "steps": [
-              {
-                "color": "#634CD9",
-                "type": "base",
-                "value": null
-              }
-            ]
-          },
-          "tooltip": {
-            "mode": "all",
-            "sort": "none"
-          }
-        },
-        "targets": [
-          {
-            "expr": "sum(aliyun_waf_5xx_ratio_wafv3_maximum{instance_id=~\"$instance_id\"}) by (instance_id)",
-            "legend": "5xx 环比率V3",
-            "refId": "A"
-          }
+        "var": [
+            {
+                "definition": "prometheus",
+                "name": "datasource",
+                "type": "datasource"
+            },
+            {
+                "allOption": true,
+                "datasource": {
+                    "cate": "prometheus",
+                    "value": "${datasource}"
+                },
+                "definition": "label_values(aliyun_waf_qps_ratio_maximum,instance_id)",
+                "multi": true,
+                "name": "instance_id",
+                "type": "query"
+            }
         ],
-        "type": "timeseries",
-        "version": "2.0.0",
-        "datasourceValue": "${datasource}"
-      },
-      {
-        "custom": {
-          "drawStyle": "lines",
-          "fillOpacity": 0.3,
-          "gradientMode": "opacity",
-          "lineInterpolation": "smooth",
-          "lineWidth": 2,
-          "scaleDistribution": {
-            "type": "linear"
-          },
-          "spanNulls": false,
-          "stack": "off"
-        },
-        "datasourceCate": "prometheus",
-        "id": "79aefa1b-5e50-4c0c-980d-e5523b859509",
-        "layout": {
-          "h": 4,
-          "i": "fc875397-c1a4-4713-b564-09abf852bcf3",
-          "isResizable": true,
-          "w": 12,
-          "x": 0,
-          "y": 4
-        },
-        "maxPerRow": 4,
-        "name": "4xx 环比率",
-        "options": {
-          "legend": {
-            "displayMode": "hidden"
-          },
-          "standardOptions": {},
-          "thresholds": {
-            "steps": [
-              {
-                "color": "#634CD9",
-                "type": "base",
-                "value": null
-              }
-            ]
-          },
-          "tooltip": {
-            "mode": "all",
-            "sort": "none"
-          }
-        },
-        "targets": [
-          {
-            "expr": "sum(aliyun_waf_4xx_ratio_maximum{instance_id=~\"$instance_id\"}) by (instance_id)",
-            "legend": "4xx 环比率",
-            "refId": "A"
-          }
-        ],
-        "type": "timeseries",
-        "version": "2.0.0",
-        "datasourceValue": "${datasource}"
-      },
-      {
-        "custom": {
-          "drawStyle": "lines",
-          "fillOpacity": 0.3,
-          "gradientMode": "opacity",
-          "lineInterpolation": "smooth",
-          "lineWidth": 2,
-          "scaleDistribution": {
-            "type": "linear"
-          },
-          "spanNulls": false,
-          "stack": "off"
-        },
-        "datasourceCate": "prometheus",
-        "id": "60c211d4-d51a-4681-b23b-ec8cc5dce7fe",
-        "layout": {
-          "h": 4,
-          "i": "946be0db-32a3-48ea-9473-88fdfa77201d",
-          "isResizable": true,
-          "w": 12,
-          "x": 12,
-          "y": 4
-        },
-        "maxPerRow": 4,
-        "name": "5xx 环比率",
-        "options": {
-          "legend": {
-            "displayMode": "hidden"
-          },
-          "standardOptions": {},
-          "thresholds": {
-            "steps": [
-              {
-                "color": "#634CD9",
-                "type": "base",
-                "value": null
-              }
-            ]
-          },
-          "tooltip": {
-            "mode": "all",
-            "sort": "none"
-          }
-        },
-        "targets": [
-          {
-            "expr": "sum(aliyun_waf_5xx_ratio_maximum{instance_id=~\"$instance_id\"}) by (instance_id)",
-            "legend": "5xx 环比率",
-            "refId": "A"
-          }
-        ],
-        "type": "timeseries",
-        "version": "2.0.0",
-        "datasourceValue": "${datasource}"
-      },
-      {
-        "custom": {
-          "drawStyle": "lines",
-          "fillOpacity": 0.3,
-          "gradientMode": "opacity",
-          "lineInterpolation": "smooth",
-          "lineWidth": 2,
-          "scaleDistribution": {
-            "type": "linear"
-          },
-          "spanNulls": false,
-          "stack": "off"
-        },
-        "datasourceCate": "prometheus",
-        "id": "0de9271c-7b19-4003-ae56-2e273b4b99c4",
-        "layout": {
-          "h": 4,
-          "i": "0de9271c-7b19-4003-ae56-2e273b4b99c4",
-          "isResizable": true,
-          "w": 12,
-          "x": 0,
-          "y": 8
-        },
-        "maxPerRow": 4,
-        "name": "QPS环比增长率",
-        "options": {
-          "legend": {
-            "displayMode": "hidden"
-          },
-          "standardOptions": {},
-          "thresholds": {
-            "steps": [
-              {
-                "color": "#634CD9",
-                "type": "base",
-                "value": null
-              }
-            ]
-          },
-          "tooltip": {
-            "mode": "all",
-            "sort": "none"
-          }
-        },
-        "targets": [
-          {
-            "expr": "sum(aliyun_waf_qps_ratio_maximum{instance_id=~\"$instance_id\"}) by (instance_id)",
-            "legend": "{{instance_id}}QPS 环比增长率",
-            "refId": "A"
-          }
-        ],
-        "type": "timeseries",
-        "version": "2.0.0",
-        "datasourceValue": "${datasource}"
-      },
-      {
-        "custom": {
-          "drawStyle": "lines",
-          "fillOpacity": 0.3,
-          "gradientMode": "opacity",
-          "lineInterpolation": "smooth",
-          "lineWidth": 2,
-          "scaleDistribution": {
-            "type": "linear"
-          },
-          "spanNulls": false,
-          "stack": "off"
-        },
-        "datasourceCate": "prometheus",
-        "id": "ccf2ffc1-6f22-4a13-b795-68072c077e1f",
-        "layout": {
-          "h": 4,
-          "i": "d0320716-f704-4b6e-8671-b58fb77a5d7c",
-          "isResizable": true,
-          "w": 12,
-          "x": 12,
-          "y": 8
-        },
-        "maxPerRow": 4,
-        "name": "QPS环比下降率",
-        "options": {
-          "legend": {
-            "displayMode": "hidden"
-          },
-          "standardOptions": {},
-          "thresholds": {
-            "steps": [
-              {
-                "color": "#634CD9",
-                "type": "base",
-                "value": null
-              }
-            ]
-          },
-          "tooltip": {
-            "mode": "all",
-            "sort": "none"
-          }
-        },
-        "targets": [
-          {
-            "expr": "sum(aliyun_waf_qps_ratio_down_maximum{instance_id=~\"$instance_id\"}) by (instance_id)",
-            "legend": "{{instance_id}}QPS 环比下降率",
-            "refId": "A"
-          }
-        ],
-        "type": "timeseries",
-        "version": "2.0.0",
-        "datasourceValue": "${datasource}"
-      }
-    ],
-    "var": [
-      {
-        "name": "datasource",
-        "type": "datasource",
-        "definition": "prometheus"
-      },
-      {
-        "allOption": true,
-        "datasource": {
-          "cate": "prometheus",
-          "value": "${datasource}"
-        },
-        "definition": "label_values(aliyun_waf_qps_ratio_maximum,instance_id)",
-        "multi": true,
-        "name": "instance_id",
-        "type": "query"
-      }
-    ],
-    "version": "3.0.0"
-  }
-}
+        "version": "3.0.0"
+    },
+    "public": 0,
+    "public_cate": 0,
+    "bgids": null,
+    "built_in": 0,
+    "hide": 0,
+    "uuid": 1717556327142143000
+}

integrations/AutoMQ/dashboards/group_metrics.json

@@ -1,226 +1,238 @@
 {
+    "id": 0,
+    "group_id": 0,
     "name": "Group Metrics",
-    "tags": "",
     "ident": "automq-group-metrics",
+    "tags": "",
+    "create_at": 0,
+    "create_by": "",
+    "update_at": 0,
+    "update_by": "",
     "configs": {
-        "version": "3.0.0",
         "links": [],
-        "var": [
+        "panels": [
             {
-                "name": "TSDB",
-                "type": "datasource",
-                "hide": false,
-                "definition": "prometheus"
+                "custom": {
+                    "drawStyle": "lines",
+                    "fillOpacity": 0,
+                    "gradientMode": "none",
+                    "lineInterpolation": "linear",
+                    "lineWidth": 1,
+                    "scaleDistribution": {
+                        "type": "linear"
+                    },
+                    "spanNulls": false,
+                    "stack": "off"
+                },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${TSDB}",
+                "id": "cac8a249-bb61-4c2d-bc90-91a7dac58f3b",
+                "layout": {
+                    "h": 5,
+                    "i": "cac8a249-bb61-4c2d-bc90-91a7dac58f3b",
+                    "isResizable": true,
+                    "w": 12,
+                    "x": 0,
+                    "y": 0
+                },
+                "links": [],
+                "maxPerRow": 4,
+                "name": "Consumer Throughput",
+                "options": {
+                    "legend": {
+                        "behaviour": "showItem",
+                        "displayMode": "hidden",
+                        "placement": "bottom"
+                    },
+                    "standardOptions": {
+                        "util": "none"
+                    },
+                    "thresholds": {
+                        "steps": [
+                            {
+                                "color": "#73BF69",
+                                "type": "base",
+                                "value": null
+                            }
+                        ]
+                    },
+                    "tooltip": {
+                        "mode": "all",
+                        "sort": "desc"
+                    },
+                    "valueMappings": []
+                },
+                "overrides": [
+                    {
+                        "matcher": {
+                            "id": "byFrameRefID"
+                        },
+                        "properties": {
+                            "rightYAxisDisplay": "off"
+                        }
+                    }
+                ],
+                "targets": [
+                    {
+                        "expr": "sum by(consumer_group, topic, partition) (rate(kafka_group_commit_offset{job=\"$cluster_id\", consumer_group=~\"$group_id\", topic=~\"$topic\", partition=~\"$partition\"}[$__rate_interval]))",
+                        "legend": "{{consumer_group}}#{{topic}}-{{partition}}",
+                        "maxDataPoints": 240,
+                        "refId": "A"
+                    }
+                ],
+                "transformations": [
+                    {
+                        "id": "organize",
+                        "options": {}
+                    }
+                ],
+                "type": "timeseries",
+                "version": "3.0.0"
             },
             {
-                "name": "cluster_id",
-                "type": "query",
+                "custom": {
+                    "drawStyle": "lines",
+                    "fillOpacity": 0,
+                    "gradientMode": "none",
+                    "lineInterpolation": "linear",
+                    "lineWidth": 1,
+                    "scaleDistribution": {
+                        "type": "linear"
+                    },
+                    "spanNulls": false,
+                    "stack": "off"
+                },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${TSDB}",
+                "id": "fc0afd7c-0161-4ee4-88de-81c74f432769",
+                "layout": {
+                    "h": 5,
+                    "i": "12e7bb88-2851-44ea-a311-44ebcdb0e7b7",
+                    "isResizable": true,
+                    "w": 12,
+                    "x": 12,
+                    "y": 0
+                },
+                "links": [],
+                "maxPerRow": 4,
+                "name": "Consumer Lag",
+                "options": {
+                    "legend": {
+                        "behaviour": "showItem",
+                        "displayMode": "hidden",
+                        "placement": "bottom"
+                    },
+                    "standardOptions": {
+                        "util": "none"
+                    },
+                    "thresholds": {
+                        "steps": [
+                            {
+                                "color": "#73BF69",
+                                "type": "base",
+                                "value": null
+                            }
+                        ]
+                    },
+                    "tooltip": {
+                        "mode": "all",
+                        "sort": "desc"
+                    },
+                    "valueMappings": []
+                },
+                "overrides": [
+                    {
+                        "matcher": {
+                            "id": "byFrameRefID"
+                        },
+                        "properties": {
+                            "rightYAxisDisplay": "off"
+                        }
+                    }
+                ],
+                "targets": [
+                    {
+                        "expr": "sum by(topic) (max by(topic, partition) (kafka_log_end_offset{job=\"$cluster_id\", topic=~\"$topic\", partition=~\"$partition\"}))\n- on(topic) group_left(consumer_group)\nsum by(consumer_group, topic) (max by(consumer_group, topic, partition) (kafka_group_commit_offset{job=\"$cluster_id\", consumer_group=~\"$group_id\", topic=~\"$topic\", partition=~\"$partition\"}))",
+                        "legend": "{{consumer_group}}#{{topic}}-{{partition}}",
+                        "maxDataPoints": 240,
+                        "refId": "A"
+                    }
+                ],
+                "transformations": [
+                    {
+                        "id": "organize",
+                        "options": {}
+                    }
+                ],
+                "type": "timeseries",
+                "version": "3.0.0"
+            }
+        ],
+        "var": [
+            {
+                "definition": "prometheus",
                 "hide": false,
+                "name": "TSDB",
+                "type": "datasource"
+            },
+            {
                 "datasource": {
                     "cate": "prometheus",
                     "value": "${TSDB}"
                 },
                 "definition": "label_values(process_runtime_jvm_cpu_utilization_ratio,job)",
+                "hide": false,
+                "multi": false,
+                "name": "cluster_id",
                 "reg": "",
-                "multi": false
+                "type": "query"
             },
             {
-                "name": "group_id",
-                "type": "query",
-                "hide": false,
+                "allOption": true,
                 "datasource": {
                     "cate": "prometheus",
                     "value": "${TSDB}"
                 },
                 "definition": "label_values(kafka_group_commit_offset,consumer_group)",
-                "reg": "",
+                "hide": false,
                 "multi": true,
-                "allOption": true
+                "name": "group_id",
+                "reg": "",
+                "type": "query"
             },
             {
-                "name": "topic",
-                "type": "query",
-                "hide": false,
+                "allOption": true,
                 "datasource": {
                     "cate": "prometheus",
                     "value": "${TSDB}"
                 },
                 "definition": "label_values(kafka_group_commit_offset,topic)",
-                "reg": "",
+                "hide": false,
                 "multi": true,
-                "allOption": true
+                "name": "topic",
+                "reg": "",
+                "type": "query"
             },
             {
-                "name": "partition",
-                "type": "query",
-                "hide": false,
+                "allOption": true,
                 "datasource": {
                     "cate": "prometheus",
                     "value": "${TSDB}"
                 },
                 "definition": "label_values(kafka_group_commit_offset,partition)",
-                "reg": "",
+                "hide": false,
                 "multi": true,
-                "allOption": true
+                "name": "partition",
+                "reg": "",
+                "type": "query"
             }
         ],
-        "panels": [
-            {
-                "type": "timeseries",
-                "id": "cac8a249-bb61-4c2d-bc90-91a7dac58f3b",
-                "layout": {
-                    "h": 5,
-                    "w": 12,
-                    "x": 0,
-                    "y": 0,
-                    "i": "cac8a249-bb61-4c2d-bc90-91a7dac58f3b",
-                    "isResizable": true
-                },
-                "version": "3.0.0",
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${TSDB}",
-                "targets": [
-                    {
-                        "refId": "A",
-                        "expr": "sum by(consumer_group, topic, partition) (rate(kafka_group_commit_offset{job=\"$cluster_id\", consumer_group=~\"$group_id\", topic=~\"$topic\", partition=~\"$partition\"}[$__rate_interval]))",
-                        "legend": "{{consumer_group}}#{{topic}}-{{partition}}",
-                        "maxDataPoints": 240
-                    }
-                ],
-                "transformations": [
-                    {
-                        "id": "organize",
-                        "options": {}
-                    }
-                ],
-                "name": "Consumer Throughput",
-                "links": [],
-                "maxPerRow": 4,
-                "options": {
-                    "tooltip": {
-                        "mode": "all",
-                        "sort": "desc"
-                    },
-                    "legend": {
-                        "displayMode": "hidden",
-                        "placement": "bottom",
-                        "behaviour": "showItem"
-                    },
-                    "valueMappings": [],
-                    "standardOptions": {
-                        "util": "none"
-                    },
-                    "thresholds": {
-                        "steps": [
-                            {
-                                "color": "#73BF69",
-                                "value": null,
-                                "type": "base"
-                            }
-                        ]
-                    }
-                },
-                "custom": {
-                    "drawStyle": "lines",
-                    "lineInterpolation": "linear",
-                    "spanNulls": false,
-                    "lineWidth": 1,
-                    "fillOpacity": 0,
-                    "gradientMode": "none",
-                    "stack": "off",
-                    "scaleDistribution": {
-                        "type": "linear"
-                    }
-                },
-                "overrides": [
-                    {
-                        "matcher": {
-                            "id": "byFrameRefID"
-                        },
-                        "properties": {
-                            "rightYAxisDisplay": "off"
-                        }
-                    }
-                ]
-            },
-            {
-                "type": "timeseries",
-                "id": "fc0afd7c-0161-4ee4-88de-81c74f432769",
-                "layout": {
-                    "h": 5,
-                    "w": 12,
-                    "x": 12,
-                    "y": 0,
-                    "i": "12e7bb88-2851-44ea-a311-44ebcdb0e7b7",
-                    "isResizable": true
-                },
-                "version": "3.0.0",
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${TSDB}",
-                "targets": [
-                    {
-                        "refId": "A",
-                        "expr": "sum by(topic) (max by(topic, partition) (kafka_log_end_offset{job=\"$cluster_id\", topic=~\"$topic\", partition=~\"$partition\"}))\n- on(topic) group_left(consumer_group)\nsum by(consumer_group, topic) (max by(consumer_group, topic, partition) (kafka_group_commit_offset{job=\"$cluster_id\", consumer_group=~\"$group_id\", topic=~\"$topic\", partition=~\"$partition\"}))",
-                        "legend": "{{consumer_group}}#{{topic}}-{{partition}}",
-                        "maxDataPoints": 240
-                    }
-                ],
-                "transformations": [
-                    {
-                        "id": "organize",
-                        "options": {}
-                    }
-                ],
-                "name": "Consumer Lag",
-                "links": [],
-                "maxPerRow": 4,
-                "options": {
-                    "tooltip": {
-                        "mode": "all",
-                        "sort": "desc"
-                    },
-                    "legend": {
-                        "displayMode": "hidden",
-                        "placement": "bottom",
-                        "behaviour": "showItem"
-                    },
-                    "valueMappings": [],
-                    "standardOptions": {
-                        "util": "none"
-                    },
-                    "thresholds": {
-                        "steps": [
-                            {
-                                "color": "#73BF69",
-                                "value": null,
-                                "type": "base"
-                            }
-                        ]
-                    }
-                },
-                "custom": {
-                    "drawStyle": "lines",
-                    "lineInterpolation": "linear",
-                    "spanNulls": false,
-                    "lineWidth": 1,
-                    "fillOpacity": 0,
-                    "gradientMode": "none",
-                    "stack": "off",
-                    "scaleDistribution": {
-                        "type": "linear"
-                    }
-                },
-                "overrides": [
-                    {
-                        "matcher": {
-                            "id": "byFrameRefID"
-                        },
-                        "properties": {
-                            "rightYAxisDisplay": "off"
-                        }
-                    }
-                ]
-            }
-        ]
-    }
+        "version": "3.0.0"
+    },
+    "public": 0,
+    "public_cate": 0,
+    "bgids": null,
+    "built_in": 0,
+    "hide": 0,
+    "uuid": 1717556327172992000
 }

integrations/CloudWatch/dashboards/dashboard-by-aws-rds.json

@@ -1,7 +1,13 @@
 {
+    "id": 0,
+    "group_id": 0,
     "name": "AWS RDS Telegraf",
-    "tags": "AWS Cloudwatch Telegraf",
     "ident": "",
+    "tags": "AWS Cloudwatch Telegraf",
+    "create_at": 0,
+    "create_by": "",
+    "update_at": 0,
+    "update_by": "",
     "configs": {
         "panels": [
             {
@@ -26,6 +32,8 @@
                     "lineInterpolation": "smooth",
                     "stack": "off"
                 },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
                 "description": "* Telegraf Gather AWS Cloudwatch RDS\n* cloudwatch aws rds cpu 利用率平均值",
                 "id": "2002c9f5-6177-4239-a0c6-2981edacae5a",
                 "layout": {
@@ -63,9 +71,7 @@
                     }
                 ],
                 "type": "timeseries",
-                "version": "2.0.0",
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${datasource}"
+                "version": "2.0.0"
             },
             {
                 "custom": {
@@ -74,6 +80,8 @@
                     "lineInterpolation": "smooth",
                     "stack": "off"
                 },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
                 "description": "* Telegraf Gather AWS Cloudwatch RDS\n* cloudwatch aws rds 数据库连接平均值",
                 "id": "c54b9dca-88ce-425a-bf75-6d8b363f6ebb",
                 "layout": {
@@ -111,9 +119,7 @@
                     }
                 ],
                 "type": "timeseries",
-                "version": "2.0.0",
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${datasource}"
+                "version": "2.0.0"
             },
             {
                 "custom": {
@@ -122,6 +128,8 @@
                     "lineInterpolation": "smooth",
                     "stack": "off"
                 },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
                 "description": "* Telegraf Gather AWS Cloudwatch RDS\n* cloudwatch aws rds 可用存储空间平均值",
                 "id": "997a6214-2ac0-46c6-a0b9-046810b2b8cf",
                 "layout": {
@@ -159,9 +167,7 @@
                     }
                 ],
                 "type": "timeseries",
-                "version": "2.0.0",
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${datasource}"
+                "version": "2.0.0"
             },
             {
                 "custom": {
@@ -170,6 +176,8 @@
                     "lineInterpolation": "smooth",
                     "stack": "off"
                 },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
                 "description": "* Telegraf Gather AWS Cloudwatch RDS\n* cloudwatch aws rds 可用内存平均值",
                 "id": "6c00311c-e931-487f-b088-3a3bfafc84ef",
                 "layout": {
@@ -207,9 +215,7 @@
                     }
                 ],
                 "type": "timeseries",
-                "version": "2.0.0",
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${datasource}"
+                "version": "2.0.0"
             },
             {
                 "custom": {
@@ -218,6 +224,8 @@
                     "lineInterpolation": "smooth",
                     "stack": "off"
                 },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
                 "description": "* Telegraf Gather AWS Cloudwatch RDS\n* cloudwatch aws rds lvm 写入 iops 平均值",
                 "id": "990ab5a1-4aa5-47c3-b7b7-a65f63459119",
                 "layout": {
@@ -250,9 +258,7 @@
                     }
                 ],
                 "type": "timeseries",
-                "version": "2.0.0",
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${datasource}"
+                "version": "2.0.0"
             },
             {
                 "custom": {
@@ -261,6 +267,8 @@
                     "lineInterpolation": "smooth",
                     "stack": "off"
                 },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
                 "description": "* Telegraf Gather AWS Cloudwatch RDS\n* cloudwatch aws rds 读取 iops 平均值",
                 "id": "a61a80da-7d0a-45a5-a868-bd442b3aa4cf",
                 "layout": {
@@ -293,9 +301,7 @@
                     }
                 ],
                 "type": "timeseries",
-                "version": "2.0.0",
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${datasource}"
+                "version": "2.0.0"
             },
             {
                 "custom": {
@@ -304,6 +310,8 @@
                     "lineInterpolation": "smooth",
                     "stack": "off"
                 },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
                 "description": "* Telegraf Gather AWS Cloudwatch RDS\n* cloudwatch aws rds 写入吞吐量平均值",
                 "id": "2e605342-3413-4004-9fcf-3dbbfa7e7be3",
                 "layout": {
@@ -336,9 +344,7 @@
                     }
                 ],
                 "type": "timeseries",
-                "version": "2.0.0",
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${datasource}"
+                "version": "2.0.0"
             },
             {
                 "custom": {
@@ -347,6 +353,8 @@
                     "lineInterpolation": "smooth",
                     "stack": "off"
                 },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
                 "description": "* Telegraf Gather AWS Cloudwatch RDS\n* cloudwatch aws rds 读取吞吐量平均值",
                 "id": "1ef3f98d-1b54-408a-8cc2-4570c327d705",
                 "layout": {
@@ -379,9 +387,7 @@
                     }
                 ],
                 "type": "timeseries",
-                "version": "2.0.0",
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${datasource}"
+                "version": "2.0.0"
             },
             {
                 "collapsed": true,
@@ -405,6 +411,8 @@
                     "lineInterpolation": "smooth",
                     "stack": "off"
                 },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
                 "description": "* Telegraf Gather AWS Cloudwatch RDS\n* cloudwatch aws rds 网络接收吞吐量平均",
                 "id": "4ba500c9-e87e-41e4-bbc1-82fec507da9d",
                 "layout": {
@@ -437,9 +445,7 @@
                     }
                 ],
                 "type": "timeseries",
-                "version": "2.0.0",
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${datasource}"
+                "version": "2.0.0"
             },
             {
                 "custom": {
@@ -448,6 +454,8 @@
                     "lineInterpolation": "smooth",
                     "stack": "off"
                 },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
                 "description": "* Telegraf Gather AWS Cloudwatch RDS\n* cloudwatch aws rds 网络传输吞吐量平均值",
                 "id": "edee8285-1274-4ddc-b166-fb773c764c2b",
                 "layout": {
@@ -480,9 +488,7 @@
                     }
                 ],
                 "type": "timeseries",
-                "version": "2.0.0",
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${datasource}"
+                "version": "2.0.0"
             },
             {
                 "custom": {
@@ -491,6 +497,8 @@
                     "lineInterpolation": "smooth",
                     "stack": "off"
                 },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
                 "description": "* Telegraf Gather AWS Cloudwatch RDS\n* cloudwatch aws rds 写入延迟平均值",
                 "id": "ecb9b8a5-b168-4a65-b7f6-7912ab6c6b22",
                 "layout": {
@@ -523,9 +531,7 @@
                     }
                 ],
                 "type": "timeseries",
-                "version": "2.0.0",
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${datasource}"
+                "version": "2.0.0"
             },
             {
                 "custom": {
@@ -534,6 +540,8 @@
                     "lineInterpolation": "smooth",
                     "stack": "off"
                 },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
                 "description": "* Telegraf Gather AWS Cloudwatch RDS\n* cloudwatch aws rds 读取延迟平均值",
                 "id": "60d009fa-e547-45be-a862-9b156c15b675",
                 "layout": {
@@ -566,9 +574,7 @@
                     }
                 ],
                 "type": "timeseries",
-                "version": "2.0.0",
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${datasource}"
+                "version": "2.0.0"
             },
             {
                 "collapsed": true,
@@ -592,6 +598,8 @@
                     "lineInterpolation": "smooth",
                     "stack": "off"
                 },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
                 "description": "* Telegraf Gather AWS Cloudwatch RDS\n* cloudwatch aws rds 磁盘队列深度平均值",
                 "id": "7edcf2a8-16f3-49ef-9026-e53dc5e72c69",
                 "layout": {
@@ -624,9 +632,7 @@
                     }
                 ],
                 "type": "timeseries",
-                "version": "2.0.0",
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${datasource}"
+                "version": "2.0.0"
             },
             {
                 "custom": {
@@ -635,6 +641,8 @@
                     "lineInterpolation": "smooth",
                     "stack": "off"
                 },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
                 "description": "* Telegraf Gather AWS Cloudwatch RDS\n* cloudwatch aws rds 二进制日志磁盘使用情况 (MB)",
                 "id": "42143731-22a9-45b4-bb1e-ddb8f2c11a70",
                 "layout": {
@@ -667,9 +675,7 @@
                     }
                 ],
                 "type": "timeseries",
-                "version": "2.0.0",
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${datasource}"
+                "version": "2.0.0"
             },
             {
                 "custom": {
@@ -678,6 +684,8 @@
                     "lineInterpolation": "smooth",
                     "stack": "off"
                 },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
                 "description": "* Telegraf Gather AWS Cloudwatch RDS\n* cloudwatch aws rds 交换分区使用平均值",
                 "id": "51c6f9d9-30db-4514-a54d-712e1a570b23",
                 "layout": {
@@ -710,9 +718,7 @@
                     }
                 ],
                 "type": "timeseries",
-                "version": "2.0.0",
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${datasource}"
+                "version": "2.0.0"
             },
             {
                 "custom": {
@@ -721,6 +727,8 @@
                     "lineInterpolation": "smooth",
                     "stack": "off"
                 },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
                 "description": "* Telegraf Gather AWS Cloudwatch RDS\n* cloudwatch aws rds 突发余额平均值",
                 "id": "767bcc71-3f71-443a-9713-03f587ccc350",
                 "layout": {
@@ -755,37 +763,41 @@
                     }
                 ],
                 "type": "timeseries",
-                "version": "2.0.0",
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${datasource}"
+                "version": "2.0.0"
             }
         ],
         "var": [
             {
+                "definition": "prometheus",
                 "name": "datasource",
-                "type": "datasource",
-                "definition": "prometheus"
+                "type": "datasource"
             },
             {
+                "datasource": {
+                    "cate": "prometheus",
+                    "value": "${datasource}"
+                },
                 "definition": "label_values(cloudwatch_aws_rds_cpu_utilization_average, region)",
                 "multi": false,
                 "name": "region",
-                "type": "query",
-                "datasource": {
-                    "cate": "prometheus",
-                    "value": "${datasource}"
-                }
+                "type": "query"
             },
             {
-                "definition": "label_values(cloudwatch_aws_rds_cpu_utilization_average{region=\"$region\"}, db_instance_identifier)",
-                "name": "instance",
-                "type": "query",
                 "datasource": {
                     "cate": "prometheus",
                     "value": "${datasource}"
-                }
+                },
+                "definition": "label_values(cloudwatch_aws_rds_cpu_utilization_average{region=\"$region\"}, db_instance_identifier)",
+                "name": "instance",
+                "type": "query"
             }
         ],
         "version": "3.0.0"
-    }
+    },
+    "public": 0,
+    "public_cate": 0,
+    "bgids": null,
+    "built_in": 0,
+    "hide": 0,
+    "uuid": 1717556327336057000
 }

integrations/ElasticSearch/dashboards/elasticsearch_by_categraf.json

@@ -1,7 +1,13 @@
 {
+    "id": 0,
+    "group_id": 0,
     "name": "ElasticSearch",
-    "tags": "ElasticSearch Prometheus",
     "ident": "",
+    "tags": "ElasticSearch Prometheus",
+    "create_at": 0,
+    "create_by": "",
+    "update_at": 0,
+    "update_by": "",
     "configs": {
         "panels": [
             {
@@ -14,6 +20,7 @@
                     "valueField": "Value"
                 },
                 "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
                 "id": "f70f4198-dec2-40c0-97d9-6986c7001e73",
                 "layout": {
                     "h": 3,
@@ -84,8 +91,7 @@
                     }
                 ],
                 "type": "stat",
-                "version": "2.0.0",
-                "datasourceValue": "${datasource}"
+                "version": "2.0.0"
             },
             {
                 "custom": {
@@ -95,6 +101,8 @@
                     "textMode": "valueAndName",
                     "textSize": {}
                 },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
                 "id": "7dafe232-ee30-479b-a2f1-e1064572c154",
                 "layout": {
                     "h": 3,
@@ -115,9 +123,7 @@
                     }
                 ],
                 "type": "stat",
-                "version": "2.0.0",
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${datasource}"
+                "version": "2.0.0"
             },
             {
                 "custom": {
@@ -127,6 +133,8 @@
                     "textMode": "valueAndName",
                     "textSize": {}
                 },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
                 "id": "447fb784-a7e4-41cf-820f-6086837590e6",
                 "layout": {
                     "h": 3,
@@ -147,9 +155,7 @@
                     }
                 ],
                 "type": "stat",
-                "version": "2.0.0",
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${datasource}"
+                "version": "2.0.0"
             },
             {
                 "custom": {
@@ -159,6 +165,8 @@
                     "textMode": "valueAndName",
                     "textSize": {}
                 },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
                 "id": "f0375f72-4ca1-474f-81e9-ce6b64f22204",
                 "layout": {
                     "h": 3,
@@ -211,9 +219,7 @@
                     }
                 ],
                 "type": "stat",
-                "version": "2.0.0",
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${datasource}"
+                "version": "2.0.0"
             },
             {
                 "custom": {
@@ -223,6 +229,8 @@
                     "textMode": "valueAndName",
                     "textSize": {}
                 },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
                 "id": "288ee5f1-b484-43f5-86bf-5b81c01b3c2c",
                 "layout": {
                     "h": 3,
@@ -275,9 +283,7 @@
                     }
                 ],
                 "type": "stat",
-                "version": "2.0.0",
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${datasource}"
+                "version": "2.0.0"
             },
             {
                 "custom": {
@@ -287,6 +293,8 @@
                     "textMode": "valueAndName",
                     "textSize": {}
                 },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
                 "id": "4dd345c1-2bc1-474e-83b1-153be10a5b5b",
                 "layout": {
                     "h": 3,
@@ -327,9 +335,7 @@
                     }
                 ],
                 "type": "stat",
-                "version": "2.0.0",
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${datasource}"
+                "version": "2.0.0"
             },
             {
                 "collapsed": true,
@@ -353,6 +359,8 @@
                     "lineInterpolation": "smooth",
                     "stack": "off"
                 },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
                 "id": "15882e6f-0585-4035-bfb6-71cb9caaa0a8",
                 "layout": {
                     "h": 4,
@@ -382,9 +390,7 @@
                     }
                 ],
                 "type": "timeseries",
-                "version": "2.0.0",
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${datasource}"
+                "version": "2.0.0"
             },
             {
                 "custom": {
@@ -400,6 +406,7 @@
                     "stack": "off"
                 },
                 "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
                 "id": "8adbc8e4-f630-4a25-98e3-ee03dec92011",
                 "layout": {
                     "h": 4,
@@ -437,8 +444,7 @@
                     }
                 ],
                 "type": "timeseries",
-                "version": "2.0.0",
-                "datasourceValue": "${datasource}"
+                "version": "2.0.0"
             },
             {
                 "collapsed": true,
@@ -463,6 +469,8 @@
                     "textMode": "valueAndName",
                     "textSize": {}
                 },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
                 "id": "7aec074e-1672-4dbb-8529-28292f9a4221",
                 "layout": {
                     "h": 3,
@@ -483,9 +491,7 @@
                     }
                 ],
                 "type": "stat",
-                "version": "2.0.0",
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${datasource}"
+                "version": "2.0.0"
             },
             {
                 "custom": {
@@ -495,6 +501,8 @@
                     "textMode": "valueAndName",
                     "textSize": {}
                 },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
                 "id": "f138daa7-b98f-4575-89e3-42363a8102c9",
                 "layout": {
                     "h": 3,
@@ -515,9 +523,7 @@
                     }
                 ],
                 "type": "stat",
-                "version": "2.0.0",
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${datasource}"
+                "version": "2.0.0"
             },
             {
                 "custom": {
@@ -527,6 +533,8 @@
                     "textMode": "valueAndName",
                     "textSize": {}
                 },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
                 "id": "7412543a-dba5-4624-96ff-11e30b7e8ff4",
                 "layout": {
                     "h": 3,
@@ -547,9 +555,7 @@
                     }
                 ],
                 "type": "stat",
-                "version": "2.0.0",
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${datasource}"
+                "version": "2.0.0"
             },
             {
                 "custom": {
@@ -559,6 +565,8 @@
                     "textMode": "valueAndName",
                     "textSize": {}
                 },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
                 "id": "2f26f24f-2a79-4552-b79d-60b41fa3aee6",
                 "layout": {
                     "h": 3,
@@ -579,9 +587,7 @@
                     }
                 ],
                 "type": "stat",
-                "version": "2.0.0",
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${datasource}"
+                "version": "2.0.0"
             },
             {
                 "custom": {
@@ -591,6 +597,8 @@
                     "textMode": "valueAndName",
                     "textSize": {}
                 },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
                 "id": "394a83cc-f4e1-467e-83fa-b77d2c2be907",
                 "layout": {
                     "h": 3,
@@ -611,9 +619,7 @@
                     }
                 ],
                 "type": "stat",
-                "version": "2.0.0",
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${datasource}"
+                "version": "2.0.0"
             },
             {
                 "custom": {
@@ -623,6 +629,8 @@
                     "textMode": "valueAndName",
                     "textSize": {}
                 },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
                 "id": "720b9719-5c37-44d9-bce8-539308afa6ae",
                 "layout": {
                     "h": 3,
@@ -643,9 +651,7 @@
                     }
                 ],
                 "type": "stat",
-                "version": "2.0.0",
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${datasource}"
+                "version": "2.0.0"
             },
             {
                 "collapsed": true,
@@ -666,11 +672,13 @@
                 "custom": {
                     "drawStyle": "lines",
                     "fillOpacity": 0.3,
+                    "gradientMode": "opacity",
                     "lineInterpolation": "smooth",
-                    "stack": "off",
                     "lineWidth": 2,
-                    "gradientMode": "opacity"
+                    "stack": "off"
                 },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
                 "id": "ee0c56e0-8f8e-4cbe-ac41-de2afad7b75a",
                 "layout": {
                     "h": 4,
@@ -705,19 +713,19 @@
                     }
                 ],
                 "type": "timeseries",
-                "version": "2.0.0",
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${datasource}"
+                "version": "2.0.0"
             },
             {
                 "custom": {
                     "drawStyle": "lines",
                     "fillOpacity": 0.3,
+                    "gradientMode": "opacity",
                     "lineInterpolation": "smooth",
-                    "stack": "off",
                     "lineWidth": 2,
-                    "gradientMode": "opacity"
+                    "stack": "off"
                 },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
                 "id": "5c361278-8a94-4b16-afdd-e6def804b9ff",
                 "layout": {
                     "h": 4,
@@ -752,9 +760,7 @@
                     }
                 ],
                 "type": "timeseries",
-                "version": "2.0.0",
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${datasource}"
+                "version": "2.0.0"
             },
             {
                 "custom": {
@@ -770,6 +776,7 @@
                     "stack": "off"
                 },
                 "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
                 "id": "ff81d109-79e5-4909-8765-857a75cebf17",
                 "layout": {
                     "h": 4,
@@ -810,8 +817,7 @@
                     }
                 ],
                 "type": "timeseries",
-                "version": "2.0.0",
-                "datasourceValue": "${datasource}"
+                "version": "2.0.0"
             },
             {
                 "custom": {
@@ -827,6 +833,7 @@
                     "stack": "off"
                 },
                 "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
                 "id": "d7c76456-8f34-4e1b-843b-9d174bbdfcee",
                 "layout": {
                     "h": 4,
@@ -867,18 +874,19 @@
                     }
                 ],
                 "type": "timeseries",
-                "version": "2.0.0",
-                "datasourceValue": "${datasource}"
+                "version": "2.0.0"
             },
             {
                 "custom": {
                     "drawStyle": "lines",
                     "fillOpacity": 0.3,
+                    "gradientMode": "opacity",
                     "lineInterpolation": "smooth",
-                    "stack": "off",
                     "lineWidth": 2,
-                    "gradientMode": "opacity"
+                    "stack": "off"
                 },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
                 "id": "a0096936-3790-40a1-b2ad-d7805945b948",
                 "layout": {
                     "h": 4,
@@ -911,9 +919,7 @@
                     }
                 ],
                 "type": "timeseries",
-                "version": "2.0.0",
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${datasource}"
+                "version": "2.0.0"
             },
             {
                 "collapsed": true,
@@ -934,11 +940,13 @@
                 "custom": {
                     "drawStyle": "lines",
                     "fillOpacity": 0.3,
+                    "gradientMode": "opacity",
                     "lineInterpolation": "smooth",
-                    "stack": "off",
                     "lineWidth": 2,
-                    "gradientMode": "opacity"
+                    "stack": "off"
                 },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
                 "id": "45aafb11-c694-4686-89ab-685068f91560",
                 "layout": {
                     "h": 4,
@@ -968,19 +976,19 @@
                     }
                 ],
                 "type": "timeseries",
-                "version": "2.0.0",
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${datasource}"
+                "version": "2.0.0"
             },
             {
                 "custom": {
                     "drawStyle": "lines",
                     "fillOpacity": 0.3,
+                    "gradientMode": "opacity",
                     "lineInterpolation": "smooth",
-                    "stack": "off",
                     "lineWidth": 2,
-                    "gradientMode": "opacity"
+                    "stack": "off"
                 },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
                 "id": "09ca6329-8eec-4a61-b19e-9bbeea2b9712",
                 "layout": {
                     "h": 4,
@@ -1013,9 +1021,7 @@
                     }
                 ],
                 "type": "timeseries",
-                "version": "2.0.0",
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${datasource}"
+                "version": "2.0.0"
             },
             {
                 "collapsed": true,
@@ -1036,11 +1042,13 @@
                 "custom": {
                     "drawStyle": "lines",
                     "fillOpacity": 0.3,
+                    "gradientMode": "opacity",
                     "lineInterpolation": "smooth",
-                    "stack": "off",
                     "lineWidth": 2,
-                    "gradientMode": "opacity"
+                    "stack": "off"
                 },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
                 "id": "6c0d9b3c-dda5-4da9-825e-33f650dbb008",
                 "layout": {
                     "h": 4,
@@ -1072,19 +1080,19 @@
                     }
                 ],
                 "type": "timeseries",
-                "version": "2.0.0",
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${datasource}"
+                "version": "2.0.0"
             },
             {
                 "custom": {
                     "drawStyle": "lines",
                     "fillOpacity": 0.3,
+                    "gradientMode": "opacity",
                     "lineInterpolation": "smooth",
-                    "stack": "off",
                     "lineWidth": 2,
-                    "gradientMode": "opacity"
+                    "stack": "off"
                 },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
                 "id": "4f7ce5a7-2771-4cbf-a569-b1a90b070b93",
                 "layout": {
                     "h": 4,
@@ -1119,9 +1127,7 @@
                     }
                 ],
                 "type": "timeseries",
-                "version": "2.0.0",
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${datasource}"
+                "version": "2.0.0"
             },
             {
                 "collapsed": true,
@@ -1142,11 +1148,13 @@
                 "custom": {
                     "drawStyle": "lines",
                     "fillOpacity": 0.3,
+                    "gradientMode": "opacity",
                     "lineInterpolation": "smooth",
-                    "stack": "off",
                     "lineWidth": 2,
-                    "gradientMode": "opacity"
+                    "stack": "off"
                 },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
                 "id": "e98839c4-e3f3-4e6e-be3a-c44b70e6072c",
                 "layout": {
                     "h": 4,
@@ -1176,19 +1184,19 @@
                     }
                 ],
                 "type": "timeseries",
-                "version": "2.0.0",
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${datasource}"
+                "version": "2.0.0"
             },
             {
                 "custom": {
                     "drawStyle": "lines",
                     "fillOpacity": 0.3,
+                    "gradientMode": "opacity",
                     "lineInterpolation": "smooth",
-                    "stack": "off",
                     "lineWidth": 2,
-                    "gradientMode": "opacity"
+                    "stack": "off"
                 },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
                 "id": "45c4e3d9-90f1-41bd-8169-1d8c0a921ba9",
                 "layout": {
                     "h": 4,
@@ -1218,19 +1226,19 @@
                     }
                 ],
                 "type": "timeseries",
-                "version": "2.0.0",
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${datasource}"
+                "version": "2.0.0"
             },
             {
                 "custom": {
                     "drawStyle": "lines",
                     "fillOpacity": 0.3,
+                    "gradientMode": "opacity",
                     "lineInterpolation": "smooth",
-                    "stack": "off",
                     "lineWidth": 2,
-                    "gradientMode": "opacity"
+                    "stack": "off"
                 },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
                 "id": "3b2a922d-4423-4845-8cfc-95970f3300d6",
                 "layout": {
                     "h": 4,
@@ -1260,19 +1268,19 @@
                     }
                 ],
                 "type": "timeseries",
-                "version": "2.0.0",
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${datasource}"
+                "version": "2.0.0"
             },
             {
                 "custom": {
                     "drawStyle": "lines",
                     "fillOpacity": 0.3,
+                    "gradientMode": "opacity",
                     "lineInterpolation": "smooth",
-                    "stack": "off",
                     "lineWidth": 2,
-                    "gradientMode": "opacity"
+                    "stack": "off"
                 },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
                 "id": "764fbcf7-3056-41ef-b62a-51813a6c315f",
                 "layout": {
                     "h": 4,
@@ -1302,19 +1310,19 @@
                     }
                 ],
                 "type": "timeseries",
-                "version": "2.0.0",
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${datasource}"
+                "version": "2.0.0"
             },
             {
                 "custom": {
                     "drawStyle": "lines",
                     "fillOpacity": 0.3,
+                    "gradientMode": "opacity",
                     "lineInterpolation": "smooth",
-                    "stack": "off",
                     "lineWidth": 2,
-                    "gradientMode": "opacity"
+                    "stack": "off"
                 },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
                 "id": "7cc04ae4-946d-4837-9ea9-764a7cc2eecd",
                 "layout": {
                     "h": 4,
@@ -1347,9 +1355,7 @@
                     }
                 ],
                 "type": "timeseries",
-                "version": "2.0.0",
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${datasource}"
+                "version": "2.0.0"
             },
             {
                 "collapsed": true,
@@ -1370,11 +1376,13 @@
                 "custom": {
                     "drawStyle": "lines",
                     "fillOpacity": 0.3,
+                    "gradientMode": "opacity",
                     "lineInterpolation": "smooth",
-                    "stack": "off",
                     "lineWidth": 2,
-                    "gradientMode": "opacity"
+                    "stack": "off"
                 },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
                 "id": "ad0445b0-8539-440d-bbf4-712450132a7a",
                 "layout": {
                     "h": 4,
@@ -1404,19 +1412,19 @@
                     }
                 ],
                 "type": "timeseries",
-                "version": "2.0.0",
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${datasource}"
+                "version": "2.0.0"
             },
             {
                 "custom": {
                     "drawStyle": "lines",
                     "fillOpacity": 0.3,
+                    "gradientMode": "opacity",
                     "lineInterpolation": "smooth",
-                    "stack": "off",
                     "lineWidth": 2,
-                    "gradientMode": "opacity"
+                    "stack": "off"
                 },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
                 "id": "c3cf6c57-c4ce-4bc2-a150-df32c4951144",
                 "layout": {
                     "h": 4,
@@ -1446,19 +1454,19 @@
                     }
                 ],
                 "type": "timeseries",
-                "version": "2.0.0",
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${datasource}"
+                "version": "2.0.0"
             },
             {
                 "custom": {
                     "drawStyle": "lines",
                     "fillOpacity": 0.3,
+                    "gradientMode": "opacity",
                     "lineInterpolation": "smooth",
-                    "stack": "off",
                     "lineWidth": 2,
-                    "gradientMode": "opacity"
+                    "stack": "off"
                 },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
                 "id": "022db454-70ba-49f5-8c11-f89b76d145cb",
                 "layout": {
                     "h": 4,
@@ -1488,19 +1496,19 @@
                     }
                 ],
                 "type": "timeseries",
-                "version": "2.0.0",
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${datasource}"
+                "version": "2.0.0"
             },
             {
                 "custom": {
                     "drawStyle": "lines",
                     "fillOpacity": 0.3,
+                    "gradientMode": "opacity",
                     "lineInterpolation": "smooth",
-                    "stack": "off",
                     "lineWidth": 2,
-                    "gradientMode": "opacity"
+                    "stack": "off"
                 },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
                 "id": "f20bad4f-656c-428a-a1cf-aafb7d92137c",
                 "layout": {
                     "h": 4,
@@ -1530,9 +1538,7 @@
                     }
                 ],
                 "type": "timeseries",
-                "version": "2.0.0",
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${datasource}"
+                "version": "2.0.0"
             },
             {
                 "collapsed": true,
@@ -1553,11 +1559,13 @@
                 "custom": {
                     "drawStyle": "lines",
                     "fillOpacity": 0.3,
+                    "gradientMode": "opacity",
                     "lineInterpolation": "smooth",
-                    "stack": "off",
                     "lineWidth": 2,
-                    "gradientMode": "opacity"
+                    "stack": "off"
                 },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
                 "id": "cefafeb9-fc8a-4c73-92b3-648cd6f08b11",
                 "layout": {
                     "h": 4,
@@ -1587,19 +1595,19 @@
                     }
                 ],
                 "type": "timeseries",
-                "version": "2.0.0",
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${datasource}"
+                "version": "2.0.0"
             },
             {
                 "custom": {
                     "drawStyle": "lines",
                     "fillOpacity": 0.3,
+                    "gradientMode": "opacity",
                     "lineInterpolation": "smooth",
-                    "stack": "off",
                     "lineWidth": 2,
-                    "gradientMode": "opacity"
+                    "stack": "off"
                 },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
                 "id": "0ab67903-16ea-4001-b784-ae04d8b815c0",
                 "layout": {
                     "h": 4,
@@ -1629,19 +1637,19 @@
                     }
                 ],
                 "type": "timeseries",
-                "version": "2.0.0",
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${datasource}"
+                "version": "2.0.0"
             },
             {
                 "custom": {
                     "drawStyle": "lines",
                     "fillOpacity": 0.3,
+                    "gradientMode": "opacity",
                     "lineInterpolation": "smooth",
-                    "stack": "off",
                     "lineWidth": 2,
-                    "gradientMode": "opacity"
+                    "stack": "off"
                 },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
                 "id": "bb5dc07d-673b-4e2d-b44c-441acfa7c27b",
                 "layout": {
                     "h": 4,
@@ -1671,19 +1679,19 @@
                     }
                 ],
                 "type": "timeseries",
-                "version": "2.0.0",
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${datasource}"
+                "version": "2.0.0"
             },
             {
                 "custom": {
                     "drawStyle": "lines",
                     "fillOpacity": 0.3,
+                    "gradientMode": "opacity",
                     "lineInterpolation": "smooth",
-                    "stack": "off",
                     "lineWidth": 2,
-                    "gradientMode": "opacity"
+                    "stack": "off"
                 },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
                 "id": "4cac1498-c141-483f-97c6-e1177317a2ea",
                 "layout": {
                     "h": 4,
@@ -1713,9 +1721,7 @@
                     }
                 ],
                 "type": "timeseries",
-                "version": "2.0.0",
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${datasource}"
+                "version": "2.0.0"
             },
             {
                 "collapsed": true,
@@ -1736,11 +1742,13 @@
                 "custom": {
                     "drawStyle": "lines",
                     "fillOpacity": 0.3,
+                    "gradientMode": "opacity",
                     "lineInterpolation": "smooth",
-                    "stack": "off",
                     "lineWidth": 2,
-                    "gradientMode": "opacity"
+                    "stack": "off"
                 },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
                 "id": "5247f393-a934-4d9e-be0f-40b177d2be80",
                 "layout": {
                     "h": 4,
@@ -1773,19 +1781,19 @@
                     }
                 ],
                 "type": "timeseries",
-                "version": "2.0.0",
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${datasource}"
+                "version": "2.0.0"
             },
             {
                 "custom": {
                     "drawStyle": "lines",
                     "fillOpacity": 0.3,
+                    "gradientMode": "opacity",
                     "lineInterpolation": "smooth",
-                    "stack": "off",
                     "lineWidth": 2,
-                    "gradientMode": "opacity"
+                    "stack": "off"
                 },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
                 "id": "b87c56f7-4e50-4d15-8bcd-1218fee879d9",
                 "layout": {
                     "h": 4,
@@ -1818,19 +1826,19 @@
                     }
                 ],
                 "type": "timeseries",
-                "version": "2.0.0",
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${datasource}"
+                "version": "2.0.0"
             },
             {
                 "custom": {
                     "drawStyle": "lines",
                     "fillOpacity": 0.3,
+                    "gradientMode": "opacity",
                     "lineInterpolation": "smooth",
-                    "stack": "off",
                     "lineWidth": 2,
-                    "gradientMode": "opacity"
+                    "stack": "off"
                 },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
                 "id": "ae2d0a7a-b6cd-4fd5-99d4-3c4289b8b5a8",
                 "layout": {
                     "h": 4,
@@ -1863,19 +1871,19 @@
                     }
                 ],
                 "type": "timeseries",
-                "version": "2.0.0",
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${datasource}"
+                "version": "2.0.0"
             },
             {
                 "custom": {
                     "drawStyle": "lines",
                     "fillOpacity": 0.3,
+                    "gradientMode": "opacity",
                     "lineInterpolation": "smooth",
-                    "stack": "off",
                     "lineWidth": 2,
-                    "gradientMode": "opacity"
+                    "stack": "off"
                 },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
                 "id": "78e4badc-8d51-4aa6-81c5-d1c9183810a2",
                 "layout": {
                     "h": 4,
@@ -1908,19 +1916,19 @@
                     }
                 ],
                 "type": "timeseries",
-                "version": "2.0.0",
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${datasource}"
+                "version": "2.0.0"
             },
             {
                 "custom": {
                     "drawStyle": "lines",
                     "fillOpacity": 0.3,
+                    "gradientMode": "opacity",
                     "lineInterpolation": "smooth",
-                    "stack": "off",
                     "lineWidth": 2,
-                    "gradientMode": "opacity"
+                    "stack": "off"
                 },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
                 "id": "296b43f1-2f33-492a-bce8-6f0fde1e7b52",
                 "layout": {
                     "h": 4,
@@ -1953,9 +1961,7 @@
                     }
                 ],
                 "type": "timeseries",
-                "version": "2.0.0",
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${datasource}"
+                "version": "2.0.0"
             },
             {
                 "collapsed": true,
@@ -1975,11 +1981,13 @@
                 "custom": {
                     "drawStyle": "lines",
                     "fillOpacity": 0.3,
+                    "gradientMode": "opacity",
                     "lineInterpolation": "smooth",
-                    "stack": "off",
                     "lineWidth": 2,
-                    "gradientMode": "opacity"
+                    "stack": "off"
                 },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
                 "id": "1537acaa-d5ce-48c5-b740-26fd543eb120",
                 "layout": {
                     "h": 4,
@@ -2009,19 +2017,19 @@
                     }
                 ],
                 "type": "timeseries",
-                "version": "2.0.0",
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${datasource}"
+                "version": "2.0.0"
             },
             {
                 "custom": {
                     "drawStyle": "lines",
                     "fillOpacity": 0.3,
+                    "gradientMode": "opacity",
                     "lineInterpolation": "smooth",
-                    "stack": "off",
                     "lineWidth": 2,
-                    "gradientMode": "opacity"
+                    "stack": "off"
                 },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
                 "id": "a1c34fa4-4549-41a6-8d31-d25e7d860106",
                 "layout": {
                     "h": 4,
@@ -2051,16 +2059,14 @@
                     }
                 ],
                 "type": "timeseries",
-                "version": "2.0.0",
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${datasource}"
+                "version": "2.0.0"
             }
         ],
         "var": [
             {
+                "definition": "prometheus",
                 "name": "datasource",
-                "type": "datasource",
-                "definition": "prometheus"
+                "type": "datasource"
             },
             {
                 "datasource": {
@@ -2084,5 +2090,11 @@
             }
         ],
         "version": "3.0.0"
-    }
-}
+    },
+    "public": 0,
+    "public_cate": 0,
+    "bgids": null,
+    "built_in": 0,
+    "hide": 0,
+    "uuid": 1717556327369517000
+}

integrations/ElasticSearch/dashboards/elasticsearch_by_categraf_a.json

@@ -1,7 +1,13 @@
 {
+    "id": 0,
+    "group_id": 0,
     "name": "ElasticSearch, group by service",
-    "tags": "ElasticSearch Prometheus Categraf",
     "ident": "",
+    "tags": "ElasticSearch Prometheus Categraf",
+    "create_at": 0,
+    "create_by": "",
+    "update_at": 0,
+    "update_by": "",
     "configs": {
         "panels": [
             {
@@ -14,6 +20,7 @@
                     "valueField": "Value"
                 },
                 "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
                 "id": "f70f4198-dec2-40c0-97d9-6986c7001e73",
                 "layout": {
                     "h": 3,
@@ -84,8 +91,7 @@
                     }
                 ],
                 "type": "stat",
-                "version": "2.0.0",
-                "datasourceValue": "${datasource}"
+                "version": "2.0.0"
             },
             {
                 "custom": {
@@ -95,6 +101,8 @@
                     "textMode": "valueAndName",
                     "textSize": {}
                 },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
                 "id": "7dafe232-ee30-479b-a2f1-e1064572c154",
                 "layout": {
                     "h": 3,
@@ -115,9 +123,7 @@
                     }
                 ],
                 "type": "stat",
-                "version": "2.0.0",
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${datasource}"
+                "version": "2.0.0"
             },
             {
                 "custom": {
@@ -127,6 +133,8 @@
                     "textMode": "valueAndName",
                     "textSize": {}
                 },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
                 "id": "447fb784-a7e4-41cf-820f-6086837590e6",
                 "layout": {
                     "h": 3,
@@ -147,9 +155,7 @@
                     }
                 ],
                 "type": "stat",
-                "version": "2.0.0",
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${datasource}"
+                "version": "2.0.0"
             },
             {
                 "custom": {
@@ -159,6 +165,8 @@
                     "textMode": "valueAndName",
                     "textSize": {}
                 },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
                 "id": "f0375f72-4ca1-474f-81e9-ce6b64f22204",
                 "layout": {
                     "h": 3,
@@ -211,9 +219,7 @@
                     }
                 ],
                 "type": "stat",
-                "version": "2.0.0",
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${datasource}"
+                "version": "2.0.0"
             },
             {
                 "custom": {
@@ -223,6 +229,8 @@
                     "textMode": "valueAndName",
                     "textSize": {}
                 },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
                 "id": "288ee5f1-b484-43f5-86bf-5b81c01b3c2c",
                 "layout": {
                     "h": 3,
@@ -275,9 +283,7 @@
                     }
                 ],
                 "type": "stat",
-                "version": "2.0.0",
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${datasource}"
+                "version": "2.0.0"
             },
             {
                 "custom": {
@@ -287,6 +293,8 @@
                     "textMode": "valueAndName",
                     "textSize": {}
                 },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
                 "id": "4dd345c1-2bc1-474e-83b1-153be10a5b5b",
                 "layout": {
                     "h": 3,
@@ -327,9 +335,7 @@
                     }
                 ],
                 "type": "stat",
-                "version": "2.0.0",
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${datasource}"
+                "version": "2.0.0"
             },
             {
                 "collapsed": true,
@@ -353,6 +359,8 @@
                     "lineInterpolation": "smooth",
                     "stack": "off"
                 },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
                 "id": "15882e6f-0585-4035-bfb6-71cb9caaa0a8",
                 "layout": {
                     "h": 4,
@@ -382,9 +390,7 @@
                     }
                 ],
                 "type": "timeseries",
-                "version": "2.0.0",
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${datasource}"
+                "version": "2.0.0"
             },
             {
                 "custom": {
@@ -400,6 +406,7 @@
                     "stack": "off"
                 },
                 "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
                 "id": "8adbc8e4-f630-4a25-98e3-ee03dec92011",
                 "layout": {
                     "h": 4,
@@ -437,8 +444,7 @@
                     }
                 ],
                 "type": "timeseries",
-                "version": "2.0.0",
-                "datasourceValue": "${datasource}"
+                "version": "2.0.0"
             },
             {
                 "collapsed": true,
@@ -463,6 +469,8 @@
                     "textMode": "valueAndName",
                     "textSize": {}
                 },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
                 "id": "7aec074e-1672-4dbb-8529-28292f9a4221",
                 "layout": {
                     "h": 3,
@@ -483,9 +491,7 @@
                     }
                 ],
                 "type": "stat",
-                "version": "2.0.0",
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${datasource}"
+                "version": "2.0.0"
             },
             {
                 "custom": {
@@ -495,6 +501,8 @@
                     "textMode": "valueAndName",
                     "textSize": {}
                 },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
                 "id": "f138daa7-b98f-4575-89e3-42363a8102c9",
                 "layout": {
                     "h": 3,
@@ -515,9 +523,7 @@
                     }
                 ],
                 "type": "stat",
-                "version": "2.0.0",
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${datasource}"
+                "version": "2.0.0"
             },
             {
                 "custom": {
@@ -527,6 +533,8 @@
                     "textMode": "valueAndName",
                     "textSize": {}
                 },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
                 "id": "7412543a-dba5-4624-96ff-11e30b7e8ff4",
                 "layout": {
                     "h": 3,
@@ -547,9 +555,7 @@
                     }
                 ],
                 "type": "stat",
-                "version": "2.0.0",
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${datasource}"
+                "version": "2.0.0"
             },
             {
                 "custom": {
@@ -559,6 +565,8 @@
                     "textMode": "valueAndName",
                     "textSize": {}
                 },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
                 "id": "2f26f24f-2a79-4552-b79d-60b41fa3aee6",
                 "layout": {
                     "h": 3,
@@ -579,9 +587,7 @@
                     }
                 ],
                 "type": "stat",
-                "version": "2.0.0",
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${datasource}"
+                "version": "2.0.0"
             },
             {
                 "custom": {
@@ -591,6 +597,8 @@
                     "textMode": "valueAndName",
                     "textSize": {}
                 },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
                 "id": "394a83cc-f4e1-467e-83fa-b77d2c2be907",
                 "layout": {
                     "h": 3,
@@ -611,9 +619,7 @@
                     }
                 ],
                 "type": "stat",
-                "version": "2.0.0",
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${datasource}"
+                "version": "2.0.0"
             },
             {
                 "custom": {
@@ -623,6 +629,8 @@
                     "textMode": "valueAndName",
                     "textSize": {}
                 },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
                 "id": "720b9719-5c37-44d9-bce8-539308afa6ae",
                 "layout": {
                     "h": 3,
@@ -643,9 +651,7 @@
                     }
                 ],
                 "type": "stat",
-                "version": "2.0.0",
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${datasource}"
+                "version": "2.0.0"
             },
             {
                 "collapsed": true,
@@ -666,11 +672,13 @@
                 "custom": {
                     "drawStyle": "lines",
                     "fillOpacity": 0.3,
+                    "gradientMode": "opacity",
                     "lineInterpolation": "smooth",
-                    "stack": "off",
                     "lineWidth": 2,
-                    "gradientMode": "opacity"
+                    "stack": "off"
                 },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
                 "id": "ee0c56e0-8f8e-4cbe-ac41-de2afad7b75a",
                 "layout": {
                     "h": 4,
@@ -705,19 +713,19 @@
                     }
                 ],
                 "type": "timeseries",
-                "version": "2.0.0",
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${datasource}"
+                "version": "2.0.0"
             },
             {
                 "custom": {
                     "drawStyle": "lines",
                     "fillOpacity": 0.3,
+                    "gradientMode": "opacity",
                     "lineInterpolation": "smooth",
-                    "stack": "off",
                     "lineWidth": 2,
-                    "gradientMode": "opacity"
+                    "stack": "off"
                 },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
                 "id": "5c361278-8a94-4b16-afdd-e6def804b9ff",
                 "layout": {
                     "h": 4,
@@ -752,9 +760,7 @@
                     }
                 ],
                 "type": "timeseries",
-                "version": "2.0.0",
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${datasource}"
+                "version": "2.0.0"
             },
             {
                 "custom": {
@@ -770,6 +776,7 @@
                     "stack": "off"
                 },
                 "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
                 "id": "ff81d109-79e5-4909-8765-857a75cebf17",
                 "layout": {
                     "h": 4,
@@ -810,8 +817,7 @@
                     }
                 ],
                 "type": "timeseries",
-                "version": "2.0.0",
-                "datasourceValue": "${datasource}"
+                "version": "2.0.0"
             },
             {
                 "custom": {
@@ -827,6 +833,7 @@
                     "stack": "off"
                 },
                 "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
                 "id": "d7c76456-8f34-4e1b-843b-9d174bbdfcee",
                 "layout": {
                     "h": 4,
@@ -867,18 +874,19 @@
                     }
                 ],
                 "type": "timeseries",
-                "version": "2.0.0",
-                "datasourceValue": "${datasource}"
+                "version": "2.0.0"
             },
             {
                 "custom": {
                     "drawStyle": "lines",
                     "fillOpacity": 0.3,
+                    "gradientMode": "opacity",
                     "lineInterpolation": "smooth",
-                    "stack": "off",
                     "lineWidth": 2,
-                    "gradientMode": "opacity"
+                    "stack": "off"
                 },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
                 "id": "a0096936-3790-40a1-b2ad-d7805945b948",
                 "layout": {
                     "h": 4,
@@ -911,9 +919,7 @@
                     }
                 ],
                 "type": "timeseries",
-                "version": "2.0.0",
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${datasource}"
+                "version": "2.0.0"
             },
             {
                 "collapsed": true,
@@ -934,11 +940,13 @@
                 "custom": {
                     "drawStyle": "lines",
                     "fillOpacity": 0.3,
+                    "gradientMode": "opacity",
                     "lineInterpolation": "smooth",
-                    "stack": "off",
                     "lineWidth": 2,
-                    "gradientMode": "opacity"
+                    "stack": "off"
                 },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
                 "id": "45aafb11-c694-4686-89ab-685068f91560",
                 "layout": {
                     "h": 4,
@@ -968,19 +976,19 @@
                     }
                 ],
                 "type": "timeseries",
-                "version": "2.0.0",
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${datasource}"
+                "version": "2.0.0"
             },
             {
                 "custom": {
                     "drawStyle": "lines",
                     "fillOpacity": 0.3,
+                    "gradientMode": "opacity",
                     "lineInterpolation": "smooth",
-                    "stack": "off",
                     "lineWidth": 2,
-                    "gradientMode": "opacity"
+                    "stack": "off"
                 },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
                 "id": "09ca6329-8eec-4a61-b19e-9bbeea2b9712",
                 "layout": {
                     "h": 4,
@@ -1013,9 +1021,7 @@
                     }
                 ],
                 "type": "timeseries",
-                "version": "2.0.0",
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${datasource}"
+                "version": "2.0.0"
             },
             {
                 "collapsed": true,
@@ -1036,11 +1042,13 @@
                 "custom": {
                     "drawStyle": "lines",
                     "fillOpacity": 0.3,
+                    "gradientMode": "opacity",
                     "lineInterpolation": "smooth",
-                    "stack": "off",
                     "lineWidth": 2,
-                    "gradientMode": "opacity"
+                    "stack": "off"
                 },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
                 "id": "6c0d9b3c-dda5-4da9-825e-33f650dbb008",
                 "layout": {
                     "h": 4,
@@ -1072,19 +1080,19 @@
                     }
                 ],
                 "type": "timeseries",
-                "version": "2.0.0",
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${datasource}"
+                "version": "2.0.0"
             },
             {
                 "custom": {
                     "drawStyle": "lines",
                     "fillOpacity": 0.3,
+                    "gradientMode": "opacity",
                     "lineInterpolation": "smooth",
-                    "stack": "off",
                     "lineWidth": 2,
-                    "gradientMode": "opacity"
+                    "stack": "off"
                 },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
                 "id": "4f7ce5a7-2771-4cbf-a569-b1a90b070b93",
                 "layout": {
                     "h": 4,
@@ -1119,9 +1127,7 @@
                     }
                 ],
                 "type": "timeseries",
-                "version": "2.0.0",
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${datasource}"
+                "version": "2.0.0"
             },
             {
                 "collapsed": true,
@@ -1142,11 +1148,13 @@
                 "custom": {
                     "drawStyle": "lines",
                     "fillOpacity": 0.3,
+                    "gradientMode": "opacity",
                     "lineInterpolation": "smooth",
-                    "stack": "off",
                     "lineWidth": 2,
-                    "gradientMode": "opacity"
+                    "stack": "off"
                 },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
                 "id": "e98839c4-e3f3-4e6e-be3a-c44b70e6072c",
                 "layout": {
                     "h": 4,
@@ -1176,19 +1184,19 @@
                     }
                 ],
                 "type": "timeseries",
-                "version": "2.0.0",
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${datasource}"
+                "version": "2.0.0"
             },
             {
                 "custom": {
                     "drawStyle": "lines",
                     "fillOpacity": 0.3,
+                    "gradientMode": "opacity",
                     "lineInterpolation": "smooth",
-                    "stack": "off",
                     "lineWidth": 2,
-                    "gradientMode": "opacity"
+                    "stack": "off"
                 },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
                 "id": "45c4e3d9-90f1-41bd-8169-1d8c0a921ba9",
                 "layout": {
                     "h": 4,
@@ -1218,19 +1226,19 @@
                     }
                 ],
                 "type": "timeseries",
-                "version": "2.0.0",
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${datasource}"
+                "version": "2.0.0"
             },
             {
                 "custom": {
                     "drawStyle": "lines",
                     "fillOpacity": 0.3,
+                    "gradientMode": "opacity",
                     "lineInterpolation": "smooth",
-                    "stack": "off",
                     "lineWidth": 2,
-                    "gradientMode": "opacity"
+                    "stack": "off"
                 },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
                 "id": "3b2a922d-4423-4845-8cfc-95970f3300d6",
                 "layout": {
                     "h": 4,
@@ -1260,19 +1268,19 @@
                     }
                 ],
                 "type": "timeseries",
-                "version": "2.0.0",
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${datasource}"
+                "version": "2.0.0"
             },
             {
                 "custom": {
                     "drawStyle": "lines",
                     "fillOpacity": 0.3,
+                    "gradientMode": "opacity",
                     "lineInterpolation": "smooth",
-                    "stack": "off",
                     "lineWidth": 2,
-                    "gradientMode": "opacity"
+                    "stack": "off"
                 },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
                 "id": "764fbcf7-3056-41ef-b62a-51813a6c315f",
                 "layout": {
                     "h": 4,
@@ -1302,19 +1310,19 @@
                     }
                 ],
                 "type": "timeseries",
-                "version": "2.0.0",
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${datasource}"
+                "version": "2.0.0"
             },
             {
                 "custom": {
                     "drawStyle": "lines",
                     "fillOpacity": 0.3,
+                    "gradientMode": "opacity",
                     "lineInterpolation": "smooth",
-                    "stack": "off",
                     "lineWidth": 2,
-                    "gradientMode": "opacity"
+                    "stack": "off"
                 },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
                 "id": "7cc04ae4-946d-4837-9ea9-764a7cc2eecd",
                 "layout": {
                     "h": 4,
@@ -1347,9 +1355,7 @@
                     }
                 ],
                 "type": "timeseries",
-                "version": "2.0.0",
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${datasource}"
+                "version": "2.0.0"
             },
             {
                 "collapsed": true,
@@ -1370,11 +1376,13 @@
                 "custom": {
                     "drawStyle": "lines",
                     "fillOpacity": 0.3,
+                    "gradientMode": "opacity",
                     "lineInterpolation": "smooth",
-                    "stack": "off",
                     "lineWidth": 2,
-                    "gradientMode": "opacity"
+                    "stack": "off"
                 },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
                 "id": "ad0445b0-8539-440d-bbf4-712450132a7a",
                 "layout": {
                     "h": 4,
@@ -1404,19 +1412,19 @@
                     }
                 ],
                 "type": "timeseries",
-                "version": "2.0.0",
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${datasource}"
+                "version": "2.0.0"
             },
             {
                 "custom": {
                     "drawStyle": "lines",
                     "fillOpacity": 0.3,
+                    "gradientMode": "opacity",
                     "lineInterpolation": "smooth",
-                    "stack": "off",
                     "lineWidth": 2,
-                    "gradientMode": "opacity"
+                    "stack": "off"
                 },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
                 "id": "c3cf6c57-c4ce-4bc2-a150-df32c4951144",
                 "layout": {
                     "h": 4,
@@ -1446,19 +1454,19 @@
                     }
                 ],
                 "type": "timeseries",
-                "version": "2.0.0",
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${datasource}"
+                "version": "2.0.0"
             },
             {
                 "custom": {
                     "drawStyle": "lines",
                     "fillOpacity": 0.3,
+                    "gradientMode": "opacity",
                     "lineInterpolation": "smooth",
-                    "stack": "off",
                     "lineWidth": 2,
-                    "gradientMode": "opacity"
+                    "stack": "off"
                 },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
                 "id": "022db454-70ba-49f5-8c11-f89b76d145cb",
                 "layout": {
                     "h": 4,
@@ -1488,19 +1496,19 @@
                     }
                 ],
                 "type": "timeseries",
-                "version": "2.0.0",
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${datasource}"
+                "version": "2.0.0"
             },
             {
                 "custom": {
                     "drawStyle": "lines",
                     "fillOpacity": 0.3,
+                    "gradientMode": "opacity",
                     "lineInterpolation": "smooth",
-                    "stack": "off",
                     "lineWidth": 2,
-                    "gradientMode": "opacity"
+                    "stack": "off"
                 },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
                 "id": "f20bad4f-656c-428a-a1cf-aafb7d92137c",
                 "layout": {
                     "h": 4,
@@ -1530,9 +1538,7 @@
                     }
                 ],
                 "type": "timeseries",
-                "version": "2.0.0",
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${datasource}"
+                "version": "2.0.0"
             },
             {
                 "collapsed": true,
@@ -1553,11 +1559,13 @@
                 "custom": {
                     "drawStyle": "lines",
                     "fillOpacity": 0.3,
+                    "gradientMode": "opacity",
                     "lineInterpolation": "smooth",
-                    "stack": "off",
                     "lineWidth": 2,
-                    "gradientMode": "opacity"
+                    "stack": "off"
                 },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
                 "id": "cefafeb9-fc8a-4c73-92b3-648cd6f08b11",
                 "layout": {
                     "h": 4,
@@ -1587,19 +1595,19 @@
                     }
                 ],
                 "type": "timeseries",
-                "version": "2.0.0",
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${datasource}"
+                "version": "2.0.0"
             },
             {
                 "custom": {
                     "drawStyle": "lines",
                     "fillOpacity": 0.3,
+                    "gradientMode": "opacity",
                     "lineInterpolation": "smooth",
-                    "stack": "off",
                     "lineWidth": 2,
-                    "gradientMode": "opacity"
+                    "stack": "off"
                 },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
                 "id": "0ab67903-16ea-4001-b784-ae04d8b815c0",
                 "layout": {
                     "h": 4,
@@ -1629,19 +1637,19 @@
                     }
                 ],
                 "type": "timeseries",
-                "version": "2.0.0",
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${datasource}"
+                "version": "2.0.0"
             },
             {
                 "custom": {
                     "drawStyle": "lines",
                     "fillOpacity": 0.3,
+                    "gradientMode": "opacity",
                     "lineInterpolation": "smooth",
-                    "stack": "off",
                     "lineWidth": 2,
-                    "gradientMode": "opacity"
+                    "stack": "off"
                 },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
                 "id": "bb5dc07d-673b-4e2d-b44c-441acfa7c27b",
                 "layout": {
                     "h": 4,
@@ -1671,19 +1679,19 @@
                     }
                 ],
                 "type": "timeseries",
-                "version": "2.0.0",
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${datasource}"
+                "version": "2.0.0"
             },
             {
                 "custom": {
                     "drawStyle": "lines",
                     "fillOpacity": 0.3,
+                    "gradientMode": "opacity",
                     "lineInterpolation": "smooth",
-                    "stack": "off",
                     "lineWidth": 2,
-                    "gradientMode": "opacity"
+                    "stack": "off"
                 },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
                 "id": "4cac1498-c141-483f-97c6-e1177317a2ea",
                 "layout": {
                     "h": 4,
@@ -1713,9 +1721,7 @@
                     }
                 ],
                 "type": "timeseries",
-                "version": "2.0.0",
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${datasource}"
+                "version": "2.0.0"
             },
             {
                 "collapsed": true,
@@ -1736,11 +1742,13 @@
                 "custom": {
                     "drawStyle": "lines",
                     "fillOpacity": 0.3,
+                    "gradientMode": "opacity",
                     "lineInterpolation": "smooth",
-                    "stack": "off",
                     "lineWidth": 2,
-                    "gradientMode": "opacity"
+                    "stack": "off"
                 },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
                 "id": "5247f393-a934-4d9e-be0f-40b177d2be80",
                 "layout": {
                     "h": 4,
@@ -1773,19 +1781,19 @@
                     }
                 ],
                 "type": "timeseries",
-                "version": "2.0.0",
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${datasource}"
+                "version": "2.0.0"
             },
             {
                 "custom": {
                     "drawStyle": "lines",
                     "fillOpacity": 0.3,
+                    "gradientMode": "opacity",
                     "lineInterpolation": "smooth",
-                    "stack": "off",
                     "lineWidth": 2,
-                    "gradientMode": "opacity"
+                    "stack": "off"
                 },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
                 "id": "b87c56f7-4e50-4d15-8bcd-1218fee879d9",
                 "layout": {
                     "h": 4,
@@ -1818,19 +1826,19 @@
                     }
                 ],
                 "type": "timeseries",
-                "version": "2.0.0",
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${datasource}"
+                "version": "2.0.0"
             },
             {
                 "custom": {
                     "drawStyle": "lines",
                     "fillOpacity": 0.3,
+                    "gradientMode": "opacity",
                     "lineInterpolation": "smooth",
-                    "stack": "off",
                     "lineWidth": 2,
-                    "gradientMode": "opacity"
+                    "stack": "off"
                 },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
                 "id": "ae2d0a7a-b6cd-4fd5-99d4-3c4289b8b5a8",
                 "layout": {
                     "h": 4,
@@ -1863,19 +1871,19 @@
                     }
                 ],
                 "type": "timeseries",
-                "version": "2.0.0",
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${datasource}"
+                "version": "2.0.0"
             },
             {
                 "custom": {
                     "drawStyle": "lines",
                     "fillOpacity": 0.3,
+                    "gradientMode": "opacity",
                     "lineInterpolation": "smooth",
-                    "stack": "off",
                     "lineWidth": 2,
-                    "gradientMode": "opacity"
+                    "stack": "off"
                 },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
                 "id": "78e4badc-8d51-4aa6-81c5-d1c9183810a2",
                 "layout": {
                     "h": 4,
@@ -1908,19 +1916,19 @@
                     }
                 ],
                 "type": "timeseries",
-                "version": "2.0.0",
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${datasource}"
+                "version": "2.0.0"
             },
             {
                 "custom": {
                     "drawStyle": "lines",
                     "fillOpacity": 0.3,
+                    "gradientMode": "opacity",
                     "lineInterpolation": "smooth",
-                    "stack": "off",
                     "lineWidth": 2,
-                    "gradientMode": "opacity"
+                    "stack": "off"
                 },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
                 "id": "296b43f1-2f33-492a-bce8-6f0fde1e7b52",
                 "layout": {
                     "h": 4,
@@ -1953,9 +1961,7 @@
                     }
                 ],
                 "type": "timeseries",
-                "version": "2.0.0",
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${datasource}"
+                "version": "2.0.0"
             },
             {
                 "collapsed": true,
@@ -1975,11 +1981,13 @@
                 "custom": {
                     "drawStyle": "lines",
                     "fillOpacity": 0.3,
+                    "gradientMode": "opacity",
                     "lineInterpolation": "smooth",
-                    "stack": "off",
                     "lineWidth": 2,
-                    "gradientMode": "opacity"
+                    "stack": "off"
                 },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
                 "id": "1537acaa-d5ce-48c5-b740-26fd543eb120",
                 "layout": {
                     "h": 4,
@@ -2009,19 +2017,19 @@
                     }
                 ],
                 "type": "timeseries",
-                "version": "2.0.0",
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${datasource}"
+                "version": "2.0.0"
             },
             {
                 "custom": {
                     "drawStyle": "lines",
                     "fillOpacity": 0.3,
+                    "gradientMode": "opacity",
                     "lineInterpolation": "smooth",
-                    "stack": "off",
                     "lineWidth": 2,
-                    "gradientMode": "opacity"
+                    "stack": "off"
                 },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
                 "id": "a1c34fa4-4549-41a6-8d31-d25e7d860106",
                 "layout": {
                     "h": 4,
@@ -2051,16 +2059,14 @@
                     }
                 ],
                 "type": "timeseries",
-                "version": "2.0.0",
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${datasource}"
+                "version": "2.0.0"
             }
         ],
         "var": [
             {
+                "definition": "prometheus",
                 "name": "datasource",
-                "type": "datasource",
-                "definition": "prometheus"
+                "type": "datasource"
             },
             {
                 "datasource": {
@@ -2084,5 +2090,11 @@
             }
         ],
         "version": "3.0.0"
-    }
-}
+    },
+    "public": 0,
+    "public_cate": 0,
+    "bgids": null,
+    "built_in": 0,
+    "hide": 0,
+    "uuid": 1717556327373675000
+}

integrations/ElasticSearch/dashboards/elasticsearch_by_categraf_b.json

@@ -1,7 +1,13 @@
 {
+    "id": 0,
+    "group_id": 0,
     "name": "ElasticSearch, group by cluster",
-    "tags": "ElasticSearch Categraf",
     "ident": "",
+    "tags": "ElasticSearch Categraf",
+    "create_at": 0,
+    "create_by": "",
+    "update_at": 0,
+    "update_by": "",
     "configs": {
         "panels": [
             {
@@ -14,6 +20,7 @@
                     "valueField": "Value"
                 },
                 "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
                 "id": "f70f4198-dec2-40c0-97d9-6986c7001e73",
                 "layout": {
                     "h": 3,
@@ -84,8 +91,7 @@
                     }
                 ],
                 "type": "stat",
-                "version": "2.0.0",
-                "datasourceValue": "${datasource}"
+                "version": "2.0.0"
             },
             {
                 "custom": {
@@ -95,6 +101,8 @@
                     "textMode": "valueAndName",
                     "textSize": {}
                 },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
                 "id": "7dafe232-ee30-479b-a2f1-e1064572c154",
                 "layout": {
                     "h": 3,
@@ -115,9 +123,7 @@
                     }
                 ],
                 "type": "stat",
-                "version": "2.0.0",
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${datasource}"
+                "version": "2.0.0"
             },
             {
                 "custom": {
@@ -127,6 +133,8 @@
                     "textMode": "valueAndName",
                     "textSize": {}
                 },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
                 "id": "447fb784-a7e4-41cf-820f-6086837590e6",
                 "layout": {
                     "h": 3,
@@ -147,9 +155,7 @@
                     }
                 ],
                 "type": "stat",
-                "version": "2.0.0",
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${datasource}"
+                "version": "2.0.0"
             },
             {
                 "custom": {
@@ -159,6 +165,8 @@
                     "textMode": "valueAndName",
                     "textSize": {}
                 },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
                 "id": "f0375f72-4ca1-474f-81e9-ce6b64f22204",
                 "layout": {
                     "h": 3,
@@ -211,9 +219,7 @@
                     }
                 ],
                 "type": "stat",
-                "version": "2.0.0",
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${datasource}"
+                "version": "2.0.0"
             },
             {
                 "custom": {
@@ -223,6 +229,8 @@
                     "textMode": "valueAndName",
                     "textSize": {}
                 },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
                 "id": "288ee5f1-b484-43f5-86bf-5b81c01b3c2c",
                 "layout": {
                     "h": 3,
@@ -275,9 +283,7 @@
                     }
                 ],
                 "type": "stat",
-                "version": "2.0.0",
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${datasource}"
+                "version": "2.0.0"
             },
             {
                 "custom": {
@@ -287,6 +293,8 @@
                     "textMode": "valueAndName",
                     "textSize": {}
                 },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
                 "id": "4dd345c1-2bc1-474e-83b1-153be10a5b5b",
                 "layout": {
                     "h": 3,
@@ -327,9 +335,7 @@
                     }
                 ],
                 "type": "stat",
-                "version": "2.0.0",
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${datasource}"
+                "version": "2.0.0"
             },
             {
                 "collapsed": true,
@@ -353,6 +359,8 @@
                     "lineInterpolation": "smooth",
                     "stack": "off"
                 },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
                 "id": "15882e6f-0585-4035-bfb6-71cb9caaa0a8",
                 "layout": {
                     "h": 4,
@@ -382,9 +390,7 @@
                     }
                 ],
                 "type": "timeseries",
-                "version": "2.0.0",
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${datasource}"
+                "version": "2.0.0"
             },
             {
                 "custom": {
@@ -400,6 +406,7 @@
                     "stack": "off"
                 },
                 "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
                 "id": "8adbc8e4-f630-4a25-98e3-ee03dec92011",
                 "layout": {
                     "h": 4,
@@ -437,8 +444,7 @@
                     }
                 ],
                 "type": "timeseries",
-                "version": "2.0.0",
-                "datasourceValue": "${datasource}"
+                "version": "2.0.0"
             },
             {
                 "collapsed": true,
@@ -463,6 +469,8 @@
                     "textMode": "valueAndName",
                     "textSize": {}
                 },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
                 "id": "7aec074e-1672-4dbb-8529-28292f9a4221",
                 "layout": {
                     "h": 3,
@@ -483,9 +491,7 @@
                     }
                 ],
                 "type": "stat",
-                "version": "2.0.0",
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${datasource}"
+                "version": "2.0.0"
             },
             {
                 "custom": {
@@ -495,6 +501,8 @@
                     "textMode": "valueAndName",
                     "textSize": {}
                 },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
                 "id": "f138daa7-b98f-4575-89e3-42363a8102c9",
                 "layout": {
                     "h": 3,
@@ -515,9 +523,7 @@
                     }
                 ],
                 "type": "stat",
-                "version": "2.0.0",
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${datasource}"
+                "version": "2.0.0"
             },
             {
                 "custom": {
@@ -527,6 +533,8 @@
                     "textMode": "valueAndName",
                     "textSize": {}
                 },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
                 "id": "7412543a-dba5-4624-96ff-11e30b7e8ff4",
                 "layout": {
                     "h": 3,
@@ -547,9 +555,7 @@
                     }
                 ],
                 "type": "stat",
-                "version": "2.0.0",
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${datasource}"
+                "version": "2.0.0"
             },
             {
                 "custom": {
@@ -559,6 +565,8 @@
                     "textMode": "valueAndName",
                     "textSize": {}
                 },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
                 "id": "2f26f24f-2a79-4552-b79d-60b41fa3aee6",
                 "layout": {
                     "h": 3,
@@ -579,9 +587,7 @@
                     }
                 ],
                 "type": "stat",
-                "version": "2.0.0",
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${datasource}"
+                "version": "2.0.0"
             },
             {
                 "custom": {
@@ -591,6 +597,8 @@
                     "textMode": "valueAndName",
                     "textSize": {}
                 },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
                 "id": "394a83cc-f4e1-467e-83fa-b77d2c2be907",
                 "layout": {
                     "h": 3,
@@ -611,9 +619,7 @@
                     }
                 ],
                 "type": "stat",
-                "version": "2.0.0",
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${datasource}"
+                "version": "2.0.0"
             },
             {
                 "custom": {
@@ -623,6 +629,8 @@
                     "textMode": "valueAndName",
                     "textSize": {}
                 },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
                 "id": "720b9719-5c37-44d9-bce8-539308afa6ae",
                 "layout": {
                     "h": 3,
@@ -643,9 +651,7 @@
                     }
                 ],
                 "type": "stat",
-                "version": "2.0.0",
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${datasource}"
+                "version": "2.0.0"
             },
             {
                 "collapsed": true,
@@ -666,11 +672,13 @@
                 "custom": {
                     "drawStyle": "lines",
                     "fillOpacity": 0.3,
+                    "gradientMode": "opacity",
                     "lineInterpolation": "smooth",
-                    "stack": "off",
                     "lineWidth": 2,
-                    "gradientMode": "opacity"
+                    "stack": "off"
                 },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
                 "id": "ee0c56e0-8f8e-4cbe-ac41-de2afad7b75a",
                 "layout": {
                     "h": 4,
@@ -705,19 +713,19 @@
                     }
                 ],
                 "type": "timeseries",
-                "version": "2.0.0",
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${datasource}"
+                "version": "2.0.0"
             },
             {
                 "custom": {
                     "drawStyle": "lines",
                     "fillOpacity": 0.3,
+                    "gradientMode": "opacity",
                     "lineInterpolation": "smooth",
-                    "stack": "off",
                     "lineWidth": 2,
-                    "gradientMode": "opacity"
+                    "stack": "off"
                 },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
                 "id": "5c361278-8a94-4b16-afdd-e6def804b9ff",
                 "layout": {
                     "h": 4,
@@ -752,9 +760,7 @@
                     }
                 ],
                 "type": "timeseries",
-                "version": "2.0.0",
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${datasource}"
+                "version": "2.0.0"
             },
             {
                 "custom": {
@@ -770,6 +776,7 @@
                     "stack": "off"
                 },
                 "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
                 "id": "ff81d109-79e5-4909-8765-857a75cebf17",
                 "layout": {
                     "h": 4,
@@ -810,8 +817,7 @@
                     }
                 ],
                 "type": "timeseries",
-                "version": "2.0.0",
-                "datasourceValue": "${datasource}"
+                "version": "2.0.0"
             },
             {
                 "custom": {
@@ -827,6 +833,7 @@
                     "stack": "off"
                 },
                 "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
                 "id": "d7c76456-8f34-4e1b-843b-9d174bbdfcee",
                 "layout": {
                     "h": 4,
@@ -867,18 +874,19 @@
                     }
                 ],
                 "type": "timeseries",
-                "version": "2.0.0",
-                "datasourceValue": "${datasource}"
+                "version": "2.0.0"
             },
             {
                 "custom": {
                     "drawStyle": "lines",
                     "fillOpacity": 0.3,
+                    "gradientMode": "opacity",
                     "lineInterpolation": "smooth",
-                    "stack": "off",
                     "lineWidth": 2,
-                    "gradientMode": "opacity"
+                    "stack": "off"
                 },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
                 "id": "a0096936-3790-40a1-b2ad-d7805945b948",
                 "layout": {
                     "h": 4,
@@ -911,9 +919,7 @@
                     }
                 ],
                 "type": "timeseries",
-                "version": "2.0.0",
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${datasource}"
+                "version": "2.0.0"
             },
             {
                 "collapsed": true,
@@ -934,11 +940,13 @@
                 "custom": {
                     "drawStyle": "lines",
                     "fillOpacity": 0.3,
+                    "gradientMode": "opacity",
                     "lineInterpolation": "smooth",
-                    "stack": "off",
                     "lineWidth": 2,
-                    "gradientMode": "opacity"
+                    "stack": "off"
                 },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
                 "id": "45aafb11-c694-4686-89ab-685068f91560",
                 "layout": {
                     "h": 4,
@@ -968,19 +976,19 @@
                     }
                 ],
                 "type": "timeseries",
-                "version": "2.0.0",
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${datasource}"
+                "version": "2.0.0"
             },
             {
                 "custom": {
                     "drawStyle": "lines",
                     "fillOpacity": 0.3,
+                    "gradientMode": "opacity",
                     "lineInterpolation": "smooth",
-                    "stack": "off",
                     "lineWidth": 2,
-                    "gradientMode": "opacity"
+                    "stack": "off"
                 },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
                 "id": "09ca6329-8eec-4a61-b19e-9bbeea2b9712",
                 "layout": {
                     "h": 4,
@@ -1013,9 +1021,7 @@
                     }
                 ],
                 "type": "timeseries",
-                "version": "2.0.0",
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${datasource}"
+                "version": "2.0.0"
             },
             {
                 "collapsed": true,
@@ -1036,11 +1042,13 @@
                 "custom": {
                     "drawStyle": "lines",
                     "fillOpacity": 0.3,
+                    "gradientMode": "opacity",
                     "lineInterpolation": "smooth",
-                    "stack": "off",
                     "lineWidth": 2,
-                    "gradientMode": "opacity"
+                    "stack": "off"
                 },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
                 "id": "6c0d9b3c-dda5-4da9-825e-33f650dbb008",
                 "layout": {
                     "h": 4,
@@ -1072,19 +1080,19 @@
                     }
                 ],
                 "type": "timeseries",
-                "version": "2.0.0",
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${datasource}"
+                "version": "2.0.0"
             },
             {
                 "custom": {
                     "drawStyle": "lines",
                     "fillOpacity": 0.3,
+                    "gradientMode": "opacity",
                     "lineInterpolation": "smooth",
-                    "stack": "off",
                     "lineWidth": 2,
-                    "gradientMode": "opacity"
+                    "stack": "off"
                 },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
                 "id": "4f7ce5a7-2771-4cbf-a569-b1a90b070b93",
                 "layout": {
                     "h": 4,
@@ -1119,9 +1127,7 @@
                     }
                 ],
                 "type": "timeseries",
-                "version": "2.0.0",
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${datasource}"
+                "version": "2.0.0"
             },
             {
                 "collapsed": true,
@@ -1142,11 +1148,13 @@
                 "custom": {
                     "drawStyle": "lines",
                     "fillOpacity": 0.3,
+                    "gradientMode": "opacity",
                     "lineInterpolation": "smooth",
-                    "stack": "off",
                     "lineWidth": 2,
-                    "gradientMode": "opacity"
+                    "stack": "off"
                 },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
                 "id": "e98839c4-e3f3-4e6e-be3a-c44b70e6072c",
                 "layout": {
                     "h": 4,
@@ -1176,19 +1184,19 @@
                     }
                 ],
                 "type": "timeseries",
-                "version": "2.0.0",
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${datasource}"
+                "version": "2.0.0"
             },
             {
                 "custom": {
                     "drawStyle": "lines",
                     "fillOpacity": 0.3,
+                    "gradientMode": "opacity",
                     "lineInterpolation": "smooth",
-                    "stack": "off",
                     "lineWidth": 2,
-                    "gradientMode": "opacity"
+                    "stack": "off"
                 },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
                 "id": "45c4e3d9-90f1-41bd-8169-1d8c0a921ba9",
                 "layout": {
                     "h": 4,
@@ -1218,19 +1226,19 @@
                     }
                 ],
                 "type": "timeseries",
-                "version": "2.0.0",
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${datasource}"
+                "version": "2.0.0"
             },
             {
                 "custom": {
                     "drawStyle": "lines",
                     "fillOpacity": 0.3,
+                    "gradientMode": "opacity",
                     "lineInterpolation": "smooth",
-                    "stack": "off",
                     "lineWidth": 2,
-                    "gradientMode": "opacity"
+                    "stack": "off"
                 },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
                 "id": "3b2a922d-4423-4845-8cfc-95970f3300d6",
                 "layout": {
                     "h": 4,
@@ -1260,19 +1268,19 @@
                     }
                 ],
                 "type": "timeseries",
-                "version": "2.0.0",
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${datasource}"
+                "version": "2.0.0"
             },
             {
                 "custom": {
                     "drawStyle": "lines",
                     "fillOpacity": 0.3,
+                    "gradientMode": "opacity",
                     "lineInterpolation": "smooth",
-                    "stack": "off",
                     "lineWidth": 2,
-                    "gradientMode": "opacity"
+                    "stack": "off"
                 },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
                 "id": "764fbcf7-3056-41ef-b62a-51813a6c315f",
                 "layout": {
                     "h": 4,
@@ -1302,19 +1310,19 @@
                     }
                 ],
                 "type": "timeseries",
-                "version": "2.0.0",
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${datasource}"
+                "version": "2.0.0"
             },
             {
                 "custom": {
                     "drawStyle": "lines",
                     "fillOpacity": 0.3,
+                    "gradientMode": "opacity",
                     "lineInterpolation": "smooth",
-                    "stack": "off",
                     "lineWidth": 2,
-                    "gradientMode": "opacity"
+                    "stack": "off"
                 },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
                 "id": "7cc04ae4-946d-4837-9ea9-764a7cc2eecd",
                 "layout": {
                     "h": 4,
@@ -1347,9 +1355,7 @@
                     }
                 ],
                 "type": "timeseries",
-                "version": "2.0.0",
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${datasource}"
+                "version": "2.0.0"
             },
             {
                 "collapsed": true,
@@ -1370,11 +1376,13 @@
                 "custom": {
                     "drawStyle": "lines",
                     "fillOpacity": 0.3,
+                    "gradientMode": "opacity",
                     "lineInterpolation": "smooth",
-                    "stack": "off",
                     "lineWidth": 2,
-                    "gradientMode": "opacity"
+                    "stack": "off"
                 },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
                 "id": "ad0445b0-8539-440d-bbf4-712450132a7a",
                 "layout": {
                     "h": 4,
@@ -1404,19 +1412,19 @@
                     }
                 ],
                 "type": "timeseries",
-                "version": "2.0.0",
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${datasource}"
+                "version": "2.0.0"
             },
             {
                 "custom": {
                     "drawStyle": "lines",
                     "fillOpacity": 0.3,
+                    "gradientMode": "opacity",
                     "lineInterpolation": "smooth",
-                    "stack": "off",
                     "lineWidth": 2,
-                    "gradientMode": "opacity"
+                    "stack": "off"
                 },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
                 "id": "c3cf6c57-c4ce-4bc2-a150-df32c4951144",
                 "layout": {
                     "h": 4,
@@ -1446,19 +1454,19 @@
                     }
                 ],
                 "type": "timeseries",
-                "version": "2.0.0",
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${datasource}"
+                "version": "2.0.0"
             },
             {
                 "custom": {
                     "drawStyle": "lines",
                     "fillOpacity": 0.3,
+                    "gradientMode": "opacity",
                     "lineInterpolation": "smooth",
-                    "stack": "off",
                     "lineWidth": 2,
-                    "gradientMode": "opacity"
+                    "stack": "off"
                 },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
                 "id": "022db454-70ba-49f5-8c11-f89b76d145cb",
                 "layout": {
                     "h": 4,
@@ -1488,19 +1496,19 @@
                     }
                 ],
                 "type": "timeseries",
-                "version": "2.0.0",
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${datasource}"
+                "version": "2.0.0"
             },
             {
                 "custom": {
                     "drawStyle": "lines",
                     "fillOpacity": 0.3,
+                    "gradientMode": "opacity",
                     "lineInterpolation": "smooth",
-                    "stack": "off",
                     "lineWidth": 2,
-                    "gradientMode": "opacity"
+                    "stack": "off"
                 },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
                 "id": "f20bad4f-656c-428a-a1cf-aafb7d92137c",
                 "layout": {
                     "h": 4,
@@ -1530,9 +1538,7 @@
                     }
                 ],
                 "type": "timeseries",
-                "version": "2.0.0",
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${datasource}"
+                "version": "2.0.0"
             },
             {
                 "collapsed": true,
@@ -1553,11 +1559,13 @@
                 "custom": {
                     "drawStyle": "lines",
                     "fillOpacity": 0.3,
+                    "gradientMode": "opacity",
                     "lineInterpolation": "smooth",
-                    "stack": "off",
                     "lineWidth": 2,
-                    "gradientMode": "opacity"
+                    "stack": "off"
                 },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
                 "id": "cefafeb9-fc8a-4c73-92b3-648cd6f08b11",
                 "layout": {
                     "h": 4,
@@ -1587,19 +1595,19 @@
                     }
                 ],
                 "type": "timeseries",
-                "version": "2.0.0",
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${datasource}"
+                "version": "2.0.0"
             },
             {
                 "custom": {
                     "drawStyle": "lines",
                     "fillOpacity": 0.3,
+                    "gradientMode": "opacity",
                     "lineInterpolation": "smooth",
-                    "stack": "off",
                     "lineWidth": 2,
-                    "gradientMode": "opacity"
+                    "stack": "off"
                 },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
                 "id": "0ab67903-16ea-4001-b784-ae04d8b815c0",
                 "layout": {
                     "h": 4,
@@ -1629,19 +1637,19 @@
                     }
                 ],
                 "type": "timeseries",
-                "version": "2.0.0",
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${datasource}"
+                "version": "2.0.0"
             },
             {
                 "custom": {
                     "drawStyle": "lines",
                     "fillOpacity": 0.3,
+                    "gradientMode": "opacity",
                     "lineInterpolation": "smooth",
-                    "stack": "off",
                     "lineWidth": 2,
-                    "gradientMode": "opacity"
+                    "stack": "off"
                 },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
                 "id": "bb5dc07d-673b-4e2d-b44c-441acfa7c27b",
                 "layout": {
                     "h": 4,
@@ -1671,19 +1679,19 @@
                     }
                 ],
                 "type": "timeseries",
-                "version": "2.0.0",
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${datasource}"
+                "version": "2.0.0"
             },
             {
                 "custom": {
                     "drawStyle": "lines",
                     "fillOpacity": 0.3,
+                    "gradientMode": "opacity",
                     "lineInterpolation": "smooth",
-                    "stack": "off",
                     "lineWidth": 2,
-                    "gradientMode": "opacity"
+                    "stack": "off"
                 },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
                 "id": "4cac1498-c141-483f-97c6-e1177317a2ea",
                 "layout": {
                     "h": 4,
@@ -1713,9 +1721,7 @@
                     }
                 ],
                 "type": "timeseries",
-                "version": "2.0.0",
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${datasource}"
+                "version": "2.0.0"
             },
             {
                 "collapsed": true,
@@ -1736,11 +1742,13 @@
                 "custom": {
                     "drawStyle": "lines",
                     "fillOpacity": 0.3,
+                    "gradientMode": "opacity",
                     "lineInterpolation": "smooth",
-                    "stack": "off",
                     "lineWidth": 2,
-                    "gradientMode": "opacity"
+                    "stack": "off"
                 },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
                 "id": "5247f393-a934-4d9e-be0f-40b177d2be80",
                 "layout": {
                     "h": 4,
@@ -1773,19 +1781,19 @@
                     }
                 ],
                 "type": "timeseries",
-                "version": "2.0.0",
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${datasource}"
+                "version": "2.0.0"
             },
             {
                 "custom": {
                     "drawStyle": "lines",
                     "fillOpacity": 0.3,
+                    "gradientMode": "opacity",
                     "lineInterpolation": "smooth",
-                    "stack": "off",
                     "lineWidth": 2,
-                    "gradientMode": "opacity"
+                    "stack": "off"
                 },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
                 "id": "b87c56f7-4e50-4d15-8bcd-1218fee879d9",
                 "layout": {
                     "h": 4,
@@ -1818,19 +1826,19 @@
                     }
                 ],
                 "type": "timeseries",
-                "version": "2.0.0",
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${datasource}"
+                "version": "2.0.0"
             },
             {
                 "custom": {
                     "drawStyle": "lines",
                     "fillOpacity": 0.3,
+                    "gradientMode": "opacity",
                     "lineInterpolation": "smooth",
-                    "stack": "off",
                     "lineWidth": 2,
-                    "gradientMode": "opacity"
+                    "stack": "off"
                 },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
                 "id": "ae2d0a7a-b6cd-4fd5-99d4-3c4289b8b5a8",
                 "layout": {
                     "h": 4,
@@ -1863,19 +1871,19 @@
                     }
                 ],
                 "type": "timeseries",
-                "version": "2.0.0",
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${datasource}"
+                "version": "2.0.0"
             },
             {
                 "custom": {
                     "drawStyle": "lines",
                     "fillOpacity": 0.3,
+                    "gradientMode": "opacity",
                     "lineInterpolation": "smooth",
-                    "stack": "off",
                     "lineWidth": 2,
-                    "gradientMode": "opacity"
+                    "stack": "off"
                 },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
                 "id": "78e4badc-8d51-4aa6-81c5-d1c9183810a2",
                 "layout": {
                     "h": 4,
@@ -1908,19 +1916,19 @@
                     }
                 ],
                 "type": "timeseries",
-                "version": "2.0.0",
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${datasource}"
+                "version": "2.0.0"
             },
             {
                 "custom": {
                     "drawStyle": "lines",
                     "fillOpacity": 0.3,
+                    "gradientMode": "opacity",
                     "lineInterpolation": "smooth",
-                    "stack": "off",
                     "lineWidth": 2,
-                    "gradientMode": "opacity"
+                    "stack": "off"
                 },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
                 "id": "296b43f1-2f33-492a-bce8-6f0fde1e7b52",
                 "layout": {
                     "h": 4,
@@ -1953,9 +1961,7 @@
                     }
                 ],
                 "type": "timeseries",
-                "version": "2.0.0",
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${datasource}"
+                "version": "2.0.0"
             },
             {
                 "collapsed": true,
@@ -1975,11 +1981,13 @@
                 "custom": {
                     "drawStyle": "lines",
                     "fillOpacity": 0.3,
+                    "gradientMode": "opacity",
                     "lineInterpolation": "smooth",
-                    "stack": "off",
                     "lineWidth": 2,
-                    "gradientMode": "opacity"
+                    "stack": "off"
                 },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
                 "id": "1537acaa-d5ce-48c5-b740-26fd543eb120",
                 "layout": {
                     "h": 4,
@@ -2009,19 +2017,19 @@
                     }
                 ],
                 "type": "timeseries",
-                "version": "2.0.0",
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${datasource}"
+                "version": "2.0.0"
             },
             {
                 "custom": {
                     "drawStyle": "lines",
                     "fillOpacity": 0.3,
+                    "gradientMode": "opacity",
                     "lineInterpolation": "smooth",
-                    "stack": "off",
                     "lineWidth": 2,
-                    "gradientMode": "opacity"
+                    "stack": "off"
                 },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
                 "id": "a1c34fa4-4549-41a6-8d31-d25e7d860106",
                 "layout": {
                     "h": 4,
@@ -2051,38 +2059,42 @@
                     }
                 ],
                 "type": "timeseries",
-                "version": "2.0.0",
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${datasource}"
+                "version": "2.0.0"
             }
         ],
         "var": [
             {
+                "definition": "prometheus",
                 "name": "datasource",
-                "type": "datasource",
-                "definition": "prometheus"
+                "type": "datasource"
             },
             {
-                "definition": "label_values(elasticsearch_up, cluster)",
-                "name": "cluster",
-                "type": "query",
                 "datasource": {
                     "cate": "prometheus",
                     "value": "${datasource}"
-                }
+                },
+                "definition": "label_values(elasticsearch_up, cluster)",
+                "name": "cluster",
+                "type": "query"
             },
             {
                 "allOption": true,
-                "definition": "label_values(elasticsearch_jvm_uptime_in_millis{cluster=\"$cluster\"}, node_host)",
-                "multi": true,
-                "name": "node_host",
-                "type": "query",
                 "datasource": {
                     "cate": "prometheus",
                     "value": "${datasource}"
-                }
+                },
+                "definition": "label_values(elasticsearch_jvm_uptime_in_millis{cluster=\"$cluster\"}, node_host)",
+                "multi": true,
+                "name": "node_host",
+                "type": "query"
             }
         ],
         "version": "3.0.0"
-    }
-}
+    },
+    "public": 0,
+    "public_cate": 0,
+    "bgids": null,
+    "built_in": 0,
+    "hide": 0,
+    "uuid": 1717556327376754000
+}

integrations/ElasticSearch/metrics/categraf-base.json

@@ -1,272 +1,452 @@
 [
-  {
-    "collector": "Categraf",
-    "typ": "ElasticSearch",
-    "name": "Cluster Health delayed unassigned 的分片数",
-    "unit": "sishort",
-    "note": "",
-    "lang": "zh_CN",
-    "expression": "elasticsearch_cluster_health_delayed_unassigned_shards"
-  },
-  {
-    "collector": "Categraf",
-    "typ": "ElasticSearch",
-    "name": "Cluster Health Pending task 数量",
-    "unit": "none",
-    "note": "",
-    "lang": "zh_CN",
-    "expression": "elasticsearch_cluster_health_number_of_pending_tasks"
-  },
-  {
-    "collector": "Categraf",
-    "typ": "ElasticSearch",
-    "name": "Cluster Health relocating 的分片数",
-    "unit": "sishort",
-    "note": "",
-    "lang": "zh_CN",
-    "expression": "elasticsearch_cluster_health_relocating_shards"
-  },
-  {
-    "collector": "Categraf",
-    "typ": "ElasticSearch",
-    "name": "Cluster Health unassigned 的分片数",
-    "unit": "sishort",
-    "note": "",
-    "lang": "zh_CN",
-    "expression": "elasticsearch_cluster_health_unassigned_shards"
-  },
-  {
-    "collector": "Categraf",
-    "typ": "ElasticSearch",
-    "name": "Cluster Health 健康度状态码",
-    "unit": "none",
-    "note": "- 1：Green，绿色状态，表示所有分片都正常\n- 2：Yellow，黄色状态，主分片都正常，从分片有不正常的\n- 3：Red，红色状态，有些主分片不正常",
-    "lang": "zh_CN",
-    "expression": "elasticsearch_cluster_health_status_code"
-  },
-  {
-    "collector": "Categraf",
-    "typ": "ElasticSearch",
-    "name": "Cluster Health 数据节点数量",
-    "unit": "none",
-    "note": "",
-    "lang": "zh_CN",
-    "expression": "elasticsearch_cluster_health_number_of_data_nodes"
-  },
-  {
-    "collector": "Categraf",
-    "typ": "ElasticSearch",
-    "name": "Cluster Health 正在初始化的分片数",
-    "unit": "sishort",
-    "note": "",
-    "lang": "zh_CN",
-    "expression": "elasticsearch_cluster_health_initializing_shards"
-  },
-  {
-    "collector": "Categraf",
-    "typ": "ElasticSearch",
-    "name": "Cluster Health 活跃主分片数",
-    "unit": "sishort",
-    "note": "",
-    "lang": "zh_CN",
-    "expression": "elasticsearch_cluster_health_active_primary_shards"
-  },
-  {
-    "collector": "Categraf",
-    "typ": "ElasticSearch",
-    "name": "Cluster Health 活跃分片数",
-    "unit": "sishort",
-    "note": "",
-    "lang": "zh_CN",
-    "expression": "elasticsearch_cluster_health_active_shards"
-  },
-  {
-    "collector": "Categraf",
-    "typ": "ElasticSearch",
-    "name": "Cluster Health 节点数量",
-    "unit": "none",
-    "note": "",
-    "lang": "zh_CN",
-    "expression": "elasticsearch_cluster_health_number_of_nodes"
-  },
-  {
-    "collector": "Categraf",
-    "typ": "ElasticSearch",
-    "name": "Indexing 平均耗时",
-    "unit": "milliseconds",
-    "note": "",
-    "lang": "zh_CN",
-    "expression": "irate(elasticsearch_indices_indexing_index_time_in_millis[3m])\n/\nirate(elasticsearch_indices_indexing_index_total[3m])"
-  },
-  {
-    "collector": "Categraf",
-    "typ": "ElasticSearch",
-    "name": "Merge 平均耗时",
-    "unit": "milliseconds",
-    "note": "",
-    "lang": "zh_CN",
-    "expression": "irate(elasticsearch_indices_merges_total_time_in_millis[3m])\n/\nirate(elasticsearch_indices_merges_total[3m])"
-  },
-  {
-    "collector": "Categraf",
-    "typ": "ElasticSearch",
-    "name": "Query 平均耗时",
-    "unit": "milliseconds",
-    "note": "",
-    "lang": "zh_CN",
-    "expression": "irate(elasticsearch_indices_search_query_time_in_millis[3m])\n/\nirate(elasticsearch_indices_search_query_total[3m])"
-  },
-  {
-    "collector": "Categraf",
-    "typ": "ElasticSearch",
-    "name": "每秒 indexing 数量",
-    "unit": "sishort",
-    "note": "",
-    "lang": "zh_CN",
-    "expression": "irate(elasticsearch_indices_indexing_index_total[3m])"
-  },
-  {
-    "collector": "Categraf",
-    "typ": "ElasticSearch",
-    "name": "每秒 merge 大小",
-    "unit": "bytesSecIEC",
-    "note": "",
-    "lang": "zh_CN",
-    "expression": "irate(elasticsearch_indices_merges_total_size_in_bytes[3m])"
-  },
-  {
-    "collector": "Categraf",
-    "typ": "ElasticSearch",
-    "name": "每秒 merge 数量",
-    "unit": "sishort",
-    "note": "",
-    "lang": "zh_CN",
-    "expression": "irate(elasticsearch_indices_merges_total_docs[3m])"
-  },
-  {
-    "collector": "Categraf",
-    "typ": "ElasticSearch",
-    "name": "每秒删除 doc 数量",
-    "unit": "sishort",
-    "note": "",
-    "lang": "zh_CN",
-    "expression": "irate(elasticsearch_indices_docs_deleted[3m])"
-  },
-  {
-    "collector": "Categraf",
-    "typ": "ElasticSearch",
-    "name": "硬盘使用率",
-    "unit": "percent",
-    "note": "",
-    "lang": "zh_CN",
-    "expression": "100 - 100 * elasticsearch_fs_total_available_in_bytes / elasticsearch_fs_total_total_in_bytes"
-  },
-  {
-    "collector": "Categraf",
-    "typ": "ElasticSearch",
-    "name": "网络流量 - 入向每秒流量",
-    "unit": "bytesSecIEC",
-    "note": "",
-    "lang": "zh_CN",
-    "expression": "irate(elasticsearch_transport_rx_size_in_bytes[3m])"
-  },
-  {
-    "collector": "Categraf",
-    "typ": "ElasticSearch",
-    "name": "网络流量 - 出向每秒流量",
-    "unit": "bytesSecIEC",
-    "note": "",
-    "lang": "zh_CN",
-    "expression": "irate(elasticsearch_transport_tx_size_in_bytes[3m])"
-  },
-  {
-    "collector": "Categraf",
-    "typ": "ElasticSearch",
-    "name": "进程 CPU 使用率",
-    "unit": "percent",
-    "note": "",
-    "lang": "zh_CN",
-    "expression": "elasticsearch_process_cpu_percent"
-  },
-  {
-    "collector": "Categraf",
-    "typ": "ElasticSearch",
-    "name": "进程 JVM Heap 使用率",
-    "unit": "percent",
-    "note": "",
-    "lang": "zh_CN",
-    "expression": "elasticsearch_jvm_mem_heap_used_percent"
-  },
-  {
-    "collector": "Categraf",
-    "typ": "ElasticSearch",
-    "name": "进程 JVM Heap 区 committed 大小",
-    "unit": "bytesIEC",
-    "note": "",
-    "lang": "zh_CN",
-    "expression": "elasticsearch_jvm_mem_heap_committed_in_bytes"
-  },
-  {
-    "collector": "Categraf",
-    "typ": "ElasticSearch",
-    "name": "进程 JVM Non Heap 区 committed 大小",
-    "unit": "bytesIEC",
-    "note": "",
-    "lang": "zh_CN",
-    "expression": "elasticsearch_jvm_mem_non_heap_committed_in_bytes"
-  },
-  {
-    "collector": "Categraf",
-    "typ": "ElasticSearch",
-    "name": "进程 JVM Old 内存池 used 大小",
-    "unit": "bytesIEC",
-    "note": "",
-    "lang": "zh_CN",
-    "expression": "elasticsearch_jvm_mem_pools_old_used_in_bytes"
-  },
-  {
-    "collector": "Categraf",
-    "typ": "ElasticSearch",
-    "name": "进程 JVM Young 内存池 used 大小",
-    "unit": "bytesIEC",
-    "note": "",
-    "lang": "zh_CN",
-    "expression": "elasticsearch_jvm_mem_pools_young_used_in_bytes"
-  },
-  {
-    "collector": "Categraf",
-    "typ": "ElasticSearch",
-    "name": "进程新生代每秒 GC 次数",
-    "unit": "none",
-    "note": "",
-    "lang": "zh_CN",
-    "expression": "irate(elasticsearch_jvm_gc_collectors_young_collection_count[3m])"
-  },
-  {
-    "collector": "Categraf",
-    "typ": "ElasticSearch",
-    "name": "进程新生代每秒 GC 耗时",
-    "unit": "milliseconds",
-    "note": "",
-    "lang": "zh_CN",
-    "expression": "irate(elasticsearch_jvm_gc_collectors_young_collection_time_in_millis[3m])"
-  },
-  {
-    "collector": "Categraf",
-    "typ": "ElasticSearch",
-    "name": "进程老生代每秒 GC 次数",
-    "unit": "none",
-    "note": "",
-    "lang": "zh_CN",
-    "expression": "irate(elasticsearch_jvm_gc_collectors_old_collection_count[3m])"
-  },
-  {
-    "collector": "Categraf",
-    "typ": "ElasticSearch",
-    "name": "进程老生代每秒 GC 耗时",
-    "unit": "milliseconds",
-    "note": "",
-    "lang": "zh_CN",
-    "expression": "irate(elasticsearch_jvm_gc_collectors_old_collection_time_in_millis[3m])"
-  }
+    {
+        "id": 0,
+        "uuid": 1717556327385727000,
+        "collector": "Categraf",
+        "typ": "ElasticSearch",
+        "name": "Cluster Health delayed unassigned 的分片数",
+        "unit": "sishort",
+        "note": "",
+        "lang": "zh_CN",
+        "expression": "elasticsearch_cluster_health_delayed_unassigned_shards",
+        "created_at": 0,
+        "created_by": "",
+        "updated_at": 0,
+        "updated_by": ""
+    },
+    {
+        "id": 0,
+        "uuid": 1717556327389271000,
+        "collector": "Categraf",
+        "typ": "ElasticSearch",
+        "name": "Cluster Health Pending task 数量",
+        "unit": "none",
+        "note": "",
+        "lang": "zh_CN",
+        "expression": "elasticsearch_cluster_health_number_of_pending_tasks",
+        "created_at": 0,
+        "created_by": "",
+        "updated_at": 0,
+        "updated_by": ""
+    },
+    {
+        "id": 0,
+        "uuid": 1717556327391502000,
+        "collector": "Categraf",
+        "typ": "ElasticSearch",
+        "name": "Cluster Health relocating 的分片数",
+        "unit": "sishort",
+        "note": "",
+        "lang": "zh_CN",
+        "expression": "elasticsearch_cluster_health_relocating_shards",
+        "created_at": 0,
+        "created_by": "",
+        "updated_at": 0,
+        "updated_by": ""
+    },
+    {
+        "id": 0,
+        "uuid": 1717556327393576000,
+        "collector": "Categraf",
+        "typ": "ElasticSearch",
+        "name": "Cluster Health unassigned 的分片数",
+        "unit": "sishort",
+        "note": "",
+        "lang": "zh_CN",
+        "expression": "elasticsearch_cluster_health_unassigned_shards",
+        "created_at": 0,
+        "created_by": "",
+        "updated_at": 0,
+        "updated_by": ""
+    },
+    {
+        "id": 0,
+        "uuid": 1717556327396682000,
+        "collector": "Categraf",
+        "typ": "ElasticSearch",
+        "name": "Cluster Health 健康度状态码",
+        "unit": "none",
+        "note": "- 1：Green，绿色状态，表示所有分片都正常\n- 2：Yellow，黄色状态，主分片都正常，从分片有不正常的\n- 3：Red，红色状态，有些主分片不正常",
+        "lang": "zh_CN",
+        "expression": "elasticsearch_cluster_health_status_code",
+        "created_at": 0,
+        "created_by": "",
+        "updated_at": 0,
+        "updated_by": ""
+    },
+    {
+        "id": 0,
+        "uuid": 1717556327398665000,
+        "collector": "Categraf",
+        "typ": "ElasticSearch",
+        "name": "Cluster Health 数据节点数量",
+        "unit": "none",
+        "note": "",
+        "lang": "zh_CN",
+        "expression": "elasticsearch_cluster_health_number_of_data_nodes",
+        "created_at": 0,
+        "created_by": "",
+        "updated_at": 0,
+        "updated_by": ""
+    },
+    {
+        "id": 0,
+        "uuid": 1717556327400525000,
+        "collector": "Categraf",
+        "typ": "ElasticSearch",
+        "name": "Cluster Health 正在初始化的分片数",
+        "unit": "sishort",
+        "note": "",
+        "lang": "zh_CN",
+        "expression": "elasticsearch_cluster_health_initializing_shards",
+        "created_at": 0,
+        "created_by": "",
+        "updated_at": 0,
+        "updated_by": ""
+    },
+    {
+        "id": 0,
+        "uuid": 1717556327402553000,
+        "collector": "Categraf",
+        "typ": "ElasticSearch",
+        "name": "Cluster Health 活跃主分片数",
+        "unit": "sishort",
+        "note": "",
+        "lang": "zh_CN",
+        "expression": "elasticsearch_cluster_health_active_primary_shards",
+        "created_at": 0,
+        "created_by": "",
+        "updated_at": 0,
+        "updated_by": ""
+    },
+    {
+        "id": 0,
+        "uuid": 1717556327404570000,
+        "collector": "Categraf",
+        "typ": "ElasticSearch",
+        "name": "Cluster Health 活跃分片数",
+        "unit": "sishort",
+        "note": "",
+        "lang": "zh_CN",
+        "expression": "elasticsearch_cluster_health_active_shards",
+        "created_at": 0,
+        "created_by": "",
+        "updated_at": 0,
+        "updated_by": ""
+    },
+    {
+        "id": 0,
+        "uuid": 1717556327406404000,
+        "collector": "Categraf",
+        "typ": "ElasticSearch",
+        "name": "Cluster Health 节点数量",
+        "unit": "none",
+        "note": "",
+        "lang": "zh_CN",
+        "expression": "elasticsearch_cluster_health_number_of_nodes",
+        "created_at": 0,
+        "created_by": "",
+        "updated_at": 0,
+        "updated_by": ""
+    },
+    {
+        "id": 0,
+        "uuid": 1717556327408587000,
+        "collector": "Categraf",
+        "typ": "ElasticSearch",
+        "name": "Indexing 平均耗时",
+        "unit": "milliseconds",
+        "note": "",
+        "lang": "zh_CN",
+        "expression": "irate(elasticsearch_indices_indexing_index_time_in_millis[3m])\n/\nirate(elasticsearch_indices_indexing_index_total[3m])",
+        "created_at": 0,
+        "created_by": "",
+        "updated_at": 0,
+        "updated_by": ""
+    },
+    {
+        "id": 0,
+        "uuid": 1717556327410419000,
+        "collector": "Categraf",
+        "typ": "ElasticSearch",
+        "name": "Merge 平均耗时",
+        "unit": "milliseconds",
+        "note": "",
+        "lang": "zh_CN",
+        "expression": "irate(elasticsearch_indices_merges_total_time_in_millis[3m])\n/\nirate(elasticsearch_indices_merges_total[3m])",
+        "created_at": 0,
+        "created_by": "",
+        "updated_at": 0,
+        "updated_by": ""
+    },
+    {
+        "id": 0,
+        "uuid": 1717556327413133000,
+        "collector": "Categraf",
+        "typ": "ElasticSearch",
+        "name": "Query 平均耗时",
+        "unit": "milliseconds",
+        "note": "",
+        "lang": "zh_CN",
+        "expression": "irate(elasticsearch_indices_search_query_time_in_millis[3m])\n/\nirate(elasticsearch_indices_search_query_total[3m])",
+        "created_at": 0,
+        "created_by": "",
+        "updated_at": 0,
+        "updated_by": ""
+    },
+    {
+        "id": 0,
+        "uuid": 1717556327415242000,
+        "collector": "Categraf",
+        "typ": "ElasticSearch",
+        "name": "每秒 indexing 数量",
+        "unit": "sishort",
+        "note": "",
+        "lang": "zh_CN",
+        "expression": "irate(elasticsearch_indices_indexing_index_total[3m])",
+        "created_at": 0,
+        "created_by": "",
+        "updated_at": 0,
+        "updated_by": ""
+    },
+    {
+        "id": 0,
+        "uuid": 1717556327417739000,
+        "collector": "Categraf",
+        "typ": "ElasticSearch",
+        "name": "每秒 merge 大小",
+        "unit": "bytesSecIEC",
+        "note": "",
+        "lang": "zh_CN",
+        "expression": "irate(elasticsearch_indices_merges_total_size_in_bytes[3m])",
+        "created_at": 0,
+        "created_by": "",
+        "updated_at": 0,
+        "updated_by": ""
+    },
+    {
+        "id": 0,
+        "uuid": 1717556327419933000,
+        "collector": "Categraf",
+        "typ": "ElasticSearch",
+        "name": "每秒 merge 数量",
+        "unit": "sishort",
+        "note": "",
+        "lang": "zh_CN",
+        "expression": "irate(elasticsearch_indices_merges_total_docs[3m])",
+        "created_at": 0,
+        "created_by": "",
+        "updated_at": 0,
+        "updated_by": ""
+    },
+    {
+        "id": 0,
+        "uuid": 1717556327421867000,
+        "collector": "Categraf",
+        "typ": "ElasticSearch",
+        "name": "每秒删除 doc 数量",
+        "unit": "sishort",
+        "note": "",
+        "lang": "zh_CN",
+        "expression": "irate(elasticsearch_indices_docs_deleted[3m])",
+        "created_at": 0,
+        "created_by": "",
+        "updated_at": 0,
+        "updated_by": ""
+    },
+    {
+        "id": 0,
+        "uuid": 1717556327424001000,
+        "collector": "Categraf",
+        "typ": "ElasticSearch",
+        "name": "硬盘使用率",
+        "unit": "percent",
+        "note": "",
+        "lang": "zh_CN",
+        "expression": "100 - 100 * elasticsearch_fs_total_available_in_bytes / elasticsearch_fs_total_total_in_bytes",
+        "created_at": 0,
+        "created_by": "",
+        "updated_at": 0,
+        "updated_by": ""
+    },
+    {
+        "id": 0,
+        "uuid": 1717556327425727000,
+        "collector": "Categraf",
+        "typ": "ElasticSearch",
+        "name": "网络流量 - 入向每秒流量",
+        "unit": "bytesSecIEC",
+        "note": "",
+        "lang": "zh_CN",
+        "expression": "irate(elasticsearch_transport_rx_size_in_bytes[3m])",
+        "created_at": 0,
+        "created_by": "",
+        "updated_at": 0,
+        "updated_by": ""
+    },
+    {
+        "id": 0,
+        "uuid": 1717556327428683000,
+        "collector": "Categraf",
+        "typ": "ElasticSearch",
+        "name": "网络流量 - 出向每秒流量",
+        "unit": "bytesSecIEC",
+        "note": "",
+        "lang": "zh_CN",
+        "expression": "irate(elasticsearch_transport_tx_size_in_bytes[3m])",
+        "created_at": 0,
+        "created_by": "",
+        "updated_at": 0,
+        "updated_by": ""
+    },
+    {
+        "id": 0,
+        "uuid": 1717556327434651000,
+        "collector": "Categraf",
+        "typ": "ElasticSearch",
+        "name": "进程 CPU 使用率",
+        "unit": "percent",
+        "note": "",
+        "lang": "zh_CN",
+        "expression": "elasticsearch_process_cpu_percent",
+        "created_at": 0,
+        "created_by": "",
+        "updated_at": 0,
+        "updated_by": ""
+    },
+    {
+        "id": 0,
+        "uuid": 1717556327437231000,
+        "collector": "Categraf",
+        "typ": "ElasticSearch",
+        "name": "进程 JVM Heap 使用率",
+        "unit": "percent",
+        "note": "",
+        "lang": "zh_CN",
+        "expression": "elasticsearch_jvm_mem_heap_used_percent",
+        "created_at": 0,
+        "created_by": "",
+        "updated_at": 0,
+        "updated_by": ""
+    },
+    {
+        "id": 0,
+        "uuid": 1717556327439234000,
+        "collector": "Categraf",
+        "typ": "ElasticSearch",
+        "name": "进程 JVM Heap 区 committed 大小",
+        "unit": "bytesIEC",
+        "note": "",
+        "lang": "zh_CN",
+        "expression": "elasticsearch_jvm_mem_heap_committed_in_bytes",
+        "created_at": 0,
+        "created_by": "",
+        "updated_at": 0,
+        "updated_by": ""
+    },
+    {
+        "id": 0,
+        "uuid": 1717556327441202000,
+        "collector": "Categraf",
+        "typ": "ElasticSearch",
+        "name": "进程 JVM Non Heap 区 committed 大小",
+        "unit": "bytesIEC",
+        "note": "",
+        "lang": "zh_CN",
+        "expression": "elasticsearch_jvm_mem_non_heap_committed_in_bytes",
+        "created_at": 0,
+        "created_by": "",
+        "updated_at": 0,
+        "updated_by": ""
+    },
+    {
+        "id": 0,
+        "uuid": 1717556327443058000,
+        "collector": "Categraf",
+        "typ": "ElasticSearch",
+        "name": "进程 JVM Old 内存池 used 大小",
+        "unit": "bytesIEC",
+        "note": "",
+        "lang": "zh_CN",
+        "expression": "elasticsearch_jvm_mem_pools_old_used_in_bytes",
+        "created_at": 0,
+        "created_by": "",
+        "updated_at": 0,
+        "updated_by": ""
+    },
+    {
+        "id": 0,
+        "uuid": 1717556327444862000,
+        "collector": "Categraf",
+        "typ": "ElasticSearch",
+        "name": "进程 JVM Young 内存池 used 大小",
+        "unit": "bytesIEC",
+        "note": "",
+        "lang": "zh_CN",
+        "expression": "elasticsearch_jvm_mem_pools_young_used_in_bytes",
+        "created_at": 0,
+        "created_by": "",
+        "updated_at": 0,
+        "updated_by": ""
+    },
+    {
+        "id": 0,
+        "uuid": 1717556327447174000,
+        "collector": "Categraf",
+        "typ": "ElasticSearch",
+        "name": "进程新生代每秒 GC 次数",
+        "unit": "none",
+        "note": "",
+        "lang": "zh_CN",
+        "expression": "irate(elasticsearch_jvm_gc_collectors_young_collection_count[3m])",
+        "created_at": 0,
+        "created_by": "",
+        "updated_at": 0,
+        "updated_by": ""
+    },
+    {
+        "id": 0,
+        "uuid": 1717556327449234000,
+        "collector": "Categraf",
+        "typ": "ElasticSearch",
+        "name": "进程新生代每秒 GC 耗时",
+        "unit": "milliseconds",
+        "note": "",
+        "lang": "zh_CN",
+        "expression": "irate(elasticsearch_jvm_gc_collectors_young_collection_time_in_millis[3m])",
+        "created_at": 0,
+        "created_by": "",
+        "updated_at": 0,
+        "updated_by": ""
+    },
+    {
+        "id": 0,
+        "uuid": 1717556327451371000,
+        "collector": "Categraf",
+        "typ": "ElasticSearch",
+        "name": "进程老生代每秒 GC 次数",
+        "unit": "none",
+        "note": "",
+        "lang": "zh_CN",
+        "expression": "irate(elasticsearch_jvm_gc_collectors_old_collection_count[3m])",
+        "created_at": 0,
+        "created_by": "",
+        "updated_at": 0,
+        "updated_by": ""
+    },
+    {
+        "id": 0,
+        "uuid": 1717556327459172000,
+        "collector": "Categraf",
+        "typ": "ElasticSearch",
+        "name": "进程老生代每秒 GC 耗时",
+        "unit": "milliseconds",
+        "note": "",
+        "lang": "zh_CN",
+        "expression": "irate(elasticsearch_jvm_gc_collectors_old_collection_time_in_millis[3m])",
+        "created_at": 0,
+        "created_by": "",
+        "updated_at": 0,
+        "updated_by": ""
+    }
 ]

integrations/HAProxy/dashboards/dashboard.json

@@ -1,7 +1,13 @@
 {
+    "id": 0,
+    "group_id": 0,
     "name": "HAProxy By Categraf",
-    "tags": "",
     "ident": "",
+    "tags": "",
+    "create_at": 0,
+    "create_by": "",
+    "update_at": 0,
+    "update_by": "",
     "configs": {
         "links": [
             {
@@ -26,6 +32,7 @@
                     "valueField": "Value"
                 },
                 "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
                 "id": "3895acd5-4825-4ea6-b120-383b9b96d8de",
                 "layout": {
                     "h": 6,
@@ -78,8 +85,7 @@
                     }
                 ],
                 "type": "stat",
-                "version": "2.0.0",
-                "datasourceValue": "${datasource}"
+                "version": "2.0.0"
             },
             {
                 "custom": {
@@ -93,6 +99,7 @@
                     "showHeader": true
                 },
                 "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
                 "id": "f98cd0f9-9979-4f4d-807f-757241d72d06",
                 "layout": {
                     "h": 6,
@@ -139,8 +146,7 @@
                     }
                 ],
                 "type": "table",
-                "version": "2.0.0",
-                "datasourceValue": "${datasource}"
+                "version": "2.0.0"
             },
             {
                 "custom": {
@@ -155,6 +161,7 @@
                     "showHeader": true
                 },
                 "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
                 "id": "fb61f168-1f3e-4385-93e8-2bb168e01945",
                 "layout": {
                     "h": 6,
@@ -202,8 +209,7 @@
                     }
                 ],
                 "type": "table",
-                "version": "2.0.0",
-                "datasourceValue": "${datasource}"
+                "version": "2.0.0"
             },
             {
                 "custom": {
@@ -219,6 +225,7 @@
                     "stack": "off"
                 },
                 "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
                 "description": "",
                 "id": "aeeb951c-a4d6-4b0e-918e-2f81c2f3b3be",
                 "layout": {
@@ -266,8 +273,7 @@
                     }
                 ],
                 "type": "timeseries",
-                "version": "2.0.0",
-                "datasourceValue": "${datasource}"
+                "version": "2.0.0"
             },
             {
                 "custom": {
@@ -283,6 +289,7 @@
                     "stack": "off"
                 },
                 "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
                 "description": "",
                 "id": "96ca72c3-745e-458a-902f-fd3841b5453d",
                 "layout": {
@@ -325,8 +332,7 @@
                     }
                 ],
                 "type": "timeseries",
-                "version": "2.0.0",
-                "datasourceValue": "${datasource}"
+                "version": "2.0.0"
             },
             {
                 "custom": {
@@ -342,6 +348,7 @@
                     "stack": "off"
                 },
                 "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
                 "description": "",
                 "id": "cbadd1e1-25e2-41bd-9fe2-f5e932753c02",
                 "layout": {
@@ -384,8 +391,7 @@
                     }
                 ],
                 "type": "timeseries",
-                "version": "2.0.0",
-                "datasourceValue": "${datasource}"
+                "version": "2.0.0"
             },
             {
                 "custom": {
@@ -401,6 +407,7 @@
                     "stack": "off"
                 },
                 "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
                 "description": "",
                 "id": "bb9db80d-7f9c-4b6b-8434-24e3ec480d5b",
                 "layout": {
@@ -448,8 +455,7 @@
                     }
                 ],
                 "type": "timeseries",
-                "version": "2.0.0",
-                "datasourceValue": "${datasource}"
+                "version": "2.0.0"
             },
             {
                 "custom": {
@@ -465,6 +471,7 @@
                     "stack": "off"
                 },
                 "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
                 "description": "",
                 "id": "6ab18da8-c354-4349-b25b-a50cdb02aae8",
                 "layout": {
@@ -512,8 +519,7 @@
                     }
                 ],
                 "type": "timeseries",
-                "version": "2.0.0",
-                "datasourceValue": "${datasource}"
+                "version": "2.0.0"
             },
             {
                 "custom": {
@@ -529,6 +535,7 @@
                     "stack": "off"
                 },
                 "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
                 "description": "",
                 "id": "5805c4b5-66c9-40d2-846d-4acc8a434ecd",
                 "layout": {
@@ -581,8 +588,7 @@
                     }
                 ],
                 "type": "timeseries",
-                "version": "2.0.0",
-                "datasourceValue": "${datasource}"
+                "version": "2.0.0"
             },
             {
                 "custom": {
@@ -598,6 +604,7 @@
                     "stack": "off"
                 },
                 "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
                 "description": "",
                 "id": "d1d2d177-eab6-43f5-a778-7999c6cd646c",
                 "layout": {
@@ -660,15 +667,14 @@
                     }
                 ],
                 "type": "timeseries",
-                "version": "2.0.0",
-                "datasourceValue": "${datasource}"
+                "version": "2.0.0"
             }
         ],
         "var": [
             {
+                "definition": "prometheus",
                 "name": "datasource",
-                "type": "datasource",
-                "definition": "prometheus"
+                "type": "datasource"
             },
             {
                 "datasource": {
@@ -731,5 +737,11 @@
             }
         ],
         "version": "3.0.0"
-    }
+    },
+    "public": 0,
+    "public_cate": 0,
+    "bgids": null,
+    "built_in": 0,
+    "hide": 0,
+    "uuid": 1717556327492256000
 }

integrations/HTTP_Response/alerts/http_response_by_categraf.json

@@ -1,144 +1,164 @@
 [
-  {
-    "cate": "prometheus",
-    "datasource_ids": [
-      52
-    ],
-    "name": "http detect failed",
-    "note": "",
-    "prod": "metric",
-    "algorithm": "",
-    "algo_params": null,
-    "delay": 0,
-    "severity": 2,
-    "severities": [
-      2
-    ],
-    "disabled": 1,
-    "prom_for_duration": 60,
-    "prom_ql": "",
-    "rule_config": {
-      "algo_params": null,
-      "inhibit": false,
-      "prom_ql": "",
-      "queries": [
-        {
-          "prom_ql": "http_response_result_code != 0",
-          "severity": 2
-        }
-      ],
-      "severity": 0
-    },
-    "prom_eval_interval": 15,
-    "enable_stime": "00:00",
-    "enable_stimes": [
-      "00:00"
-    ],
-    "enable_etime": "23:59",
-    "enable_etimes": [
-      "23:59"
-    ],
-    "enable_days_of_week": [
-      "1",
-      "2",
-      "3",
-      "4",
-      "5",
-      "6",
-      "0"
-    ],
-    "enable_days_of_weeks": [
-      [
-        "1",
-        "2",
-        "3",
-        "4",
-        "5",
-        "6",
-        "0"
-      ]
-    ],
-    "enable_in_bg": 0,
-    "notify_recovered": 1,
-    "notify_channels": [],
-    "notify_repeat_step": 60,
-    "notify_max_number": 0,
-    "recover_duration": 0,
-    "callbacks": [],
-    "runbook_url": "",
-    "append_tags": [],
-    "annotations": null,
-    "extra_config": null
-  },
     {
-    "cate": "prometheus",
-    "datasource_ids": [
-      52
-    ],
-    "name": "https certificate will expire within 7 days",
-    "note": "",
-    "prod": "metric",
-    "algorithm": "",
-    "algo_params": null,
-    "delay": 0,
-    "severity": 2,
-    "severities": [
-      2
-    ],
-    "disabled": 1,
-    "prom_for_duration": 60,
-    "prom_ql": "",
-    "rule_config": {
-      "algo_params": null,
-      "inhibit": false,
-      "prom_ql": "",
-      "queries": [
-        {
-          "prom_ql": "(http_response_cert_expire_timestamp - time())/86400 <= 7",
-          "severity": 2
-        }
-      ],
-      "severity": 0
+        "id": 0,
+        "group_id": 0,
+        "cate": "prometheus",
+        "datasource_ids": [
+            52
+        ],
+        "cluster": "",
+        "name": "http detect failed",
+        "note": "",
+        "prod": "metric",
+        "algorithm": "",
+        "algo_params": null,
+        "delay": 0,
+        "severity": 2,
+        "severities": [
+            2
+        ],
+        "disabled": 1,
+        "prom_for_duration": 60,
+        "prom_ql": "",
+        "rule_config": {
+            "algo_params": null,
+            "inhibit": false,
+            "prom_ql": "",
+            "queries": [
+                {
+                    "prom_ql": "http_response_result_code != 0",
+                    "severity": 2
+                }
+            ],
+            "severity": 0
+        },
+        "prom_eval_interval": 15,
+        "enable_stime": "00:00",
+        "enable_stimes": [
+            "00:00"
+        ],
+        "enable_etime": "23:59",
+        "enable_etimes": [
+            "23:59"
+        ],
+        "enable_days_of_week": [
+            "1",
+            "2",
+            "3",
+            "4",
+            "5",
+            "6",
+            "0"
+        ],
+        "enable_days_of_weeks": [
+            [
+                "1",
+                "2",
+                "3",
+                "4",
+                "5",
+                "6",
+                "0"
+            ]
+        ],
+        "enable_in_bg": 0,
+        "notify_recovered": 1,
+        "notify_channels": [],
+        "notify_groups_obj": null,
+        "notify_groups": null,
+        "notify_repeat_step": 60,
+        "notify_max_number": 0,
+        "recover_duration": 0,
+        "callbacks": [],
+        "runbook_url": "",
+        "append_tags": [],
+        "annotations": null,
+        "extra_config": null,
+        "create_at": 0,
+        "create_by": "",
+        "update_at": 0,
+        "update_by": "",
+        "uuid": 1717556327498098000
     },
-    "prom_eval_interval": 15,
-    "enable_stime": "00:00",
-    "enable_stimes": [
-      "00:00"
-    ],
-    "enable_etime": "23:59",
-    "enable_etimes": [
-      "23:59"
-    ],
-    "enable_days_of_week": [
-      "1",
-      "2",
-      "3",
-      "4",
-      "5",
-      "6",
-      "0"
-    ],
-    "enable_days_of_weeks": [
-      [
-        "1",
-        "2",
-        "3",
-        "4",
-        "5",
-        "6",
-        "0"
-      ]
-    ],
-    "enable_in_bg": 0,
-    "notify_recovered": 1,
-    "notify_channels": [],
-    "notify_repeat_step": 60,
-    "notify_max_number": 0,
-    "recover_duration": 0,
-    "callbacks": [],
-    "runbook_url": "",
-    "append_tags": [],
-    "annotations": null,
-    "extra_config": null
-  }
-]
+    {
+        "id": 0,
+        "group_id": 0,
+        "cate": "prometheus",
+        "datasource_ids": [
+            52
+        ],
+        "cluster": "",
+        "name": "https certificate will expire within 7 days",
+        "note": "",
+        "prod": "metric",
+        "algorithm": "",
+        "algo_params": null,
+        "delay": 0,
+        "severity": 2,
+        "severities": [
+            2
+        ],
+        "disabled": 1,
+        "prom_for_duration": 60,
+        "prom_ql": "",
+        "rule_config": {
+            "algo_params": null,
+            "inhibit": false,
+            "prom_ql": "",
+            "queries": [
+                {
+                    "prom_ql": "(http_response_cert_expire_timestamp - time())/86400 \u003c= 7",
+                    "severity": 2
+                }
+            ],
+            "severity": 0
+        },
+        "prom_eval_interval": 15,
+        "enable_stime": "00:00",
+        "enable_stimes": [
+            "00:00"
+        ],
+        "enable_etime": "23:59",
+        "enable_etimes": [
+            "23:59"
+        ],
+        "enable_days_of_week": [
+            "1",
+            "2",
+            "3",
+            "4",
+            "5",
+            "6",
+            "0"
+        ],
+        "enable_days_of_weeks": [
+            [
+                "1",
+                "2",
+                "3",
+                "4",
+                "5",
+                "6",
+                "0"
+            ]
+        ],
+        "enable_in_bg": 0,
+        "notify_recovered": 1,
+        "notify_channels": [],
+        "notify_groups_obj": null,
+        "notify_groups": null,
+        "notify_repeat_step": 60,
+        "notify_max_number": 0,
+        "recover_duration": 0,
+        "callbacks": [],
+        "runbook_url": "",
+        "append_tags": [],
+        "annotations": null,
+        "extra_config": null,
+        "create_at": 0,
+        "create_by": "",
+        "update_at": 0,
+        "update_by": "",
+        "uuid": 1717556327498589000
+    }
+]

integrations/HTTP_Response/dashboards/http_response_by_categraf.json

@@ -1,68 +1,40 @@
 {
+    "id": 0,
+    "group_id": 0,
     "name": "HTTP detect by UlricQin",
-    "tags": "",
     "ident": "",
+    "tags": "",
+    "create_at": 0,
+    "create_by": "",
+    "update_at": 0,
+    "update_by": "",
     "configs": {
         "panels": [
             {
-                "type": "table",
-                "id": "3674dbfa-243a-49f6-baa5-b7f887c1afb0",
-                "layout": {
-                    "h": 15,
-                    "w": 24,
-                    "x": 0,
-                    "y": 0,
-                    "i": "3674dbfa-243a-49f6-baa5-b7f887c1afb0",
-                    "isResizable": true
-                },
-                "version": "3.0.0",
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${Datasource}",
-                "targets": [
-                    {
-                        "expr": "max(http_response_result_code) by (target)",
-                        "legend": "UP?",
-                        "refId": "A",
-                        "instant": true
-                    },
-                    {
-                        "expr": "max(http_response_response_code) by (target)",
-                        "legend": "status code",
-                        "refId": "B",
-                        "instant": true
-                    },
-                    {
-                        "expr": "max(http_response_response_time) by (target) *1000",
-                        "legend": "latency",
-                        "refId": "C",
-                        "instant": true
-                    },
-                    {
-                        "expr": "max(http_response_cert_expire_timestamp) by (target) - time()",
-                        "legend": "cert expire",
-                        "refId": "D",
-                        "instant": true
-                    }
-                ],
-                "transformations": [
-                    {
-                        "id": "organize",
-                        "options": {}
-                    }
-                ],
-                "name": "URL Details",
                 "custom": {
-                    "showHeader": true,
-                    "colorMode": "background",
-                    "calc": "lastNotNull",
-                    "displayMode": "labelValuesToRows",
                     "aggrDimension": "target",
+                    "calc": "lastNotNull",
+                    "colorMode": "background",
+                    "displayMode": "labelValuesToRows",
+                    "showHeader": true,
                     "sortColumn": "target",
                     "sortOrder": "ascend"
                 },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${Datasource}",
+                "id": "3674dbfa-243a-49f6-baa5-b7f887c1afb0",
+                "layout": {
+                    "h": 15,
+                    "i": "3674dbfa-243a-49f6-baa5-b7f887c1afb0",
+                    "isResizable": true,
+                    "w": 24,
+                    "x": 0,
+                    "y": 0
+                },
+                "name": "URL Details",
                 "options": {
-                    "valueMappings": [],
-                    "standardOptions": {}
+                    "standardOptions": {},
+                    "valueMappings": []
                 },
                 "overrides": [
                     {
@@ -106,115 +78,155 @@
                             },
                             "valueMappings": [
                                 {
-                                    "type": "range",
+                                    "match": {
+                                        "to": 604800
+                                    },
                                     "result": {
                                         "color": "#f60c0c"
                                     },
-                                    "match": {
-                                        "to": 604800
-                                    }
+                                    "type": "range"
                                 },
                                 {
-                                    "type": "range",
+                                    "match": {
+                                        "to": 2592000
+                                    },
                                     "result": {
                                         "color": "#ffae39"
                                     },
-                                    "match": {
-                                        "to": 2592000
-                                    }
+                                    "type": "range"
                                 }
                             ]
                         },
                         "type": "special"
                     },
                     {
-                        "type": "special",
                         "matcher": {
                             "value": "B"
                         },
                         "properties": {
+                            "standardOptions": {},
                             "valueMappings": [
                                 {
-                                    "type": "range",
+                                    "match": {
+                                        "to": 399
+                                    },
                                     "result": {
                                         "color": "#2c9d3d"
                                     },
-                                    "match": {
-                                        "to": 399
-                                    }
+                                    "type": "range"
                                 },
                                 {
-                                    "type": "range",
+                                    "match": {
+                                        "to": 499
+                                    },
                                     "result": {
                                         "color": "#ff656b"
                                     },
-                                    "match": {
-                                        "to": 499
-                                    }
+                                    "type": "range"
                                 },
                                 {
-                                    "type": "range",
+                                    "match": {
+                                        "from": 500
+                                    },
                                     "result": {
                                         "color": "#f10808"
                                     },
-                                    "match": {
-                                        "from": 500
-                                    }
+                                    "type": "range"
                                 }
-                            ],
-                            "standardOptions": {}
-                        }
+                            ]
+                        },
+                        "type": "special"
                     },
                     {
-                        "type": "special",
                         "matcher": {
                             "value": "C"
                         },
                         "properties": {
+                            "standardOptions": {
+                                "util": "milliseconds"
+                            },
                             "valueMappings": [
                                 {
-                                    "type": "range",
+                                    "match": {
+                                        "to": 400
+                                    },
                                     "result": {
                                         "color": "#2c9d3d"
                                     },
-                                    "match": {
-                                        "to": 400
-                                    }
+                                    "type": "range"
                                 },
                                 {
-                                    "type": "range",
+                                    "match": {
+                                        "from": 400
+                                    },
                                     "result": {
                                         "color": "#ff656b"
                                     },
-                                    "match": {
-                                        "from": 400
-                                    }
+                                    "type": "range"
                                 },
                                 {
-                                    "type": "range",
+                                    "match": {
+                                        "from": 2000
+                                    },
                                     "result": {
                                         "color": "#f11313"
                                     },
-                                    "match": {
-                                        "from": 2000
-                                    }
+                                    "type": "range"
                                 }
-                            ],
-                            "standardOptions": {
-                                "util": "milliseconds"
-                            }
-                        }
+                            ]
+                        },
+                        "type": "special"
                     }
-                ]
+                ],
+                "targets": [
+                    {
+                        "expr": "max(http_response_result_code) by (target)",
+                        "instant": true,
+                        "legend": "UP?",
+                        "refId": "A"
+                    },
+                    {
+                        "expr": "max(http_response_response_code) by (target)",
+                        "instant": true,
+                        "legend": "status code",
+                        "refId": "B"
+                    },
+                    {
+                        "expr": "max(http_response_response_time) by (target) *1000",
+                        "instant": true,
+                        "legend": "latency",
+                        "refId": "C"
+                    },
+                    {
+                        "expr": "max(http_response_cert_expire_timestamp) by (target) - time()",
+                        "instant": true,
+                        "legend": "cert expire",
+                        "refId": "D"
+                    }
+                ],
+                "transformations": [
+                    {
+                        "id": "organize",
+                        "options": {}
+                    }
+                ],
+                "type": "table",
+                "version": "3.0.0"
             }
         ],
-        "version": "3.0.0",
         "var": [
             {
+                "definition": "prometheus",
                 "name": "Datasource",
-                "type": "datasource",
-                "definition": "prometheus"
+                "type": "datasource"
             }
-        ]
-    }
+        ],
+        "version": "3.0.0"
+    },
+    "public": 0,
+    "public_cate": 0,
+    "bgids": null,
+    "built_in": 0,
+    "hide": 0,
+    "uuid": 1717556327500066000
 }

integrations/HTTP_Response/metrics/categraf.json

@@ -1,101 +1,167 @@
 [
-  {
-    "collector": "Categraf",
-    "typ": "HTTP_Response",
-    "name": "HTTP 探测响应码",
-    "unit": "none",
-    "note": "如果没有拿到 response，这个指标就没有值了",
-    "lang": "zh_CN",
-    "expression": "http_response_response_code"
-  },
-  {
-    "collector": "Categraf",
-    "typ": "HTTP_Response",
-    "name": "HTTP 探测结果状态码",
-    "unit": "none",
-    "note": "0 值表示正常，大于 0 就是异常，各个值的含义如下：\n\n```\nSuccess          = 0\nConnectionFailed = 1\nTimeout          = 2\nDNSError         = 3\nAddressError     = 4\nBodyMismatch     = 5\nCodeMismatch     = 6\n```",
-    "lang": "zh_CN",
-    "expression": "http_response_result_code"
-  },
-  {
-    "collector": "Categraf",
-    "typ": "HTTP_Response",
-    "name": "HTTP 探测耗时",
-    "unit": "seconds",
-    "note": "",
-    "lang": "zh_CN",
-    "expression": "http_response_response_time"
-  },
-  {
-    "collector": "Categraf",
-    "typ": "HTTP_Response",
-    "name": "HTTP 证书过期时间",
-    "unit": "datetimeSeconds",
-    "note": "",
-    "lang": "zh_CN",
-    "expression": "http_response_cert_expire_timestamp"
-  },
-  {
-    "collector": "Categraf",
-    "typ": "HTTP_Response",
-    "name": "拨测 - DNS 请求耗时",
-    "unit": "milliseconds",
-    "note": "",
-    "lang": "zh_CN",
-    "expression": "cdn_dns_request"
-  },
-  {
-    "collector": "Categraf",
-    "typ": "HTTP_Response",
-    "name": "拨测 - TCP建连耗时",
-    "unit": "milliseconds",
-    "note": "",
-    "lang": "zh_CN",
-    "expression": "cdn_tcp_connect"
-  },
-  {
-    "collector": "Categraf",
-    "typ": "HTTP_Response",
-    "name": "拨测 - TLS握手耗时",
-    "unit": "milliseconds",
-    "note": "",
-    "lang": "zh_CN",
-    "expression": "cdn_tls_handshake"
-  },
-  {
-    "collector": "Categraf",
-    "typ": "HTTP_Response",
-    "name": "拨测 - 探测结果状态码",
-    "unit": "none",
-    "note": "探测结果，0 是正常，其他数字有不同含义\n- 0：成功\n- 1：连接失败\n- 2：监测超时\n- 3：DNS解析失败\n- 4：地址格式错误\n- 5：返回内容不匹配\n- 6：返回码不匹配\n- 其他数字为未知错误",
-    "lang": "zh_CN",
-    "expression": "cdn_probe_result_code"
-  },
-  {
-    "collector": "Categraf",
-    "typ": "HTTP_Response",
-    "name": "拨测 - 整体耗时",
-    "unit": "milliseconds",
-    "note": "",
-    "lang": "zh_CN",
-    "expression": "cdn_total_cost"
-  },
-  {
-    "collector": "Categraf",
-    "typ": "HTTP_Response",
-    "name": "拨测 - 返回状态码",
-    "unit": "none",
-    "note": "",
-    "lang": "zh_CN",
-    "expression": "cdn_response_status_code"
-  },
-  {
-    "collector": "Categraf",
-    "typ": "HTTP_Response",
-    "name": "拨测 - 首包耗时",
-    "unit": "milliseconds",
-    "note": "",
-    "lang": "zh_CN",
-    "expression": "cdn_first_byte"
-  }
+    {
+        "id": 0,
+        "uuid": 1717556327501087000,
+        "collector": "Categraf",
+        "typ": "HTTP_Response",
+        "name": "HTTP 探测响应码",
+        "unit": "none",
+        "note": "如果没有拿到 response，这个指标就没有值了",
+        "lang": "zh_CN",
+        "expression": "http_response_response_code",
+        "created_at": 0,
+        "created_by": "",
+        "updated_at": 0,
+        "updated_by": ""
+    },
+    {
+        "id": 0,
+        "uuid": 1717556327503611000,
+        "collector": "Categraf",
+        "typ": "HTTP_Response",
+        "name": "HTTP 探测结果状态码",
+        "unit": "none",
+        "note": "0 值表示正常，大于 0 就是异常，各个值的含义如下：\n\n```\nSuccess          = 0\nConnectionFailed = 1\nTimeout          = 2\nDNSError         = 3\nAddressError     = 4\nBodyMismatch     = 5\nCodeMismatch     = 6\n```",
+        "lang": "zh_CN",
+        "expression": "http_response_result_code",
+        "created_at": 0,
+        "created_by": "",
+        "updated_at": 0,
+        "updated_by": ""
+    },
+    {
+        "id": 0,
+        "uuid": 1717556327506135000,
+        "collector": "Categraf",
+        "typ": "HTTP_Response",
+        "name": "HTTP 探测耗时",
+        "unit": "seconds",
+        "note": "",
+        "lang": "zh_CN",
+        "expression": "http_response_response_time",
+        "created_at": 0,
+        "created_by": "",
+        "updated_at": 0,
+        "updated_by": ""
+    },
+    {
+        "id": 0,
+        "uuid": 1717556327508519000,
+        "collector": "Categraf",
+        "typ": "HTTP_Response",
+        "name": "HTTP 证书过期时间",
+        "unit": "datetimeSeconds",
+        "note": "",
+        "lang": "zh_CN",
+        "expression": "http_response_cert_expire_timestamp",
+        "created_at": 0,
+        "created_by": "",
+        "updated_at": 0,
+        "updated_by": ""
+    },
+    {
+        "id": 0,
+        "uuid": 1717556327511202000,
+        "collector": "Categraf",
+        "typ": "HTTP_Response",
+        "name": "拨测 - DNS 请求耗时",
+        "unit": "milliseconds",
+        "note": "",
+        "lang": "zh_CN",
+        "expression": "cdn_dns_request",
+        "created_at": 0,
+        "created_by": "",
+        "updated_at": 0,
+        "updated_by": ""
+    },
+    {
+        "id": 0,
+        "uuid": 1717556327514018000,
+        "collector": "Categraf",
+        "typ": "HTTP_Response",
+        "name": "拨测 - TCP建连耗时",
+        "unit": "milliseconds",
+        "note": "",
+        "lang": "zh_CN",
+        "expression": "cdn_tcp_connect",
+        "created_at": 0,
+        "created_by": "",
+        "updated_at": 0,
+        "updated_by": ""
+    },
+    {
+        "id": 0,
+        "uuid": 1717556327516118000,
+        "collector": "Categraf",
+        "typ": "HTTP_Response",
+        "name": "拨测 - TLS握手耗时",
+        "unit": "milliseconds",
+        "note": "",
+        "lang": "zh_CN",
+        "expression": "cdn_tls_handshake",
+        "created_at": 0,
+        "created_by": "",
+        "updated_at": 0,
+        "updated_by": ""
+    },
+    {
+        "id": 0,
+        "uuid": 1717556327518519000,
+        "collector": "Categraf",
+        "typ": "HTTP_Response",
+        "name": "拨测 - 探测结果状态码",
+        "unit": "none",
+        "note": "探测结果，0 是正常，其他数字有不同含义\n- 0：成功\n- 1：连接失败\n- 2：监测超时\n- 3：DNS解析失败\n- 4：地址格式错误\n- 5：返回内容不匹配\n- 6：返回码不匹配\n- 其他数字为未知错误",
+        "lang": "zh_CN",
+        "expression": "cdn_probe_result_code",
+        "created_at": 0,
+        "created_by": "",
+        "updated_at": 0,
+        "updated_by": ""
+    },
+    {
+        "id": 0,
+        "uuid": 1717556327521098000,
+        "collector": "Categraf",
+        "typ": "HTTP_Response",
+        "name": "拨测 - 整体耗时",
+        "unit": "milliseconds",
+        "note": "",
+        "lang": "zh_CN",
+        "expression": "cdn_total_cost",
+        "created_at": 0,
+        "created_by": "",
+        "updated_at": 0,
+        "updated_by": ""
+    },
+    {
+        "id": 0,
+        "uuid": 1717556327523493000,
+        "collector": "Categraf",
+        "typ": "HTTP_Response",
+        "name": "拨测 - 返回状态码",
+        "unit": "none",
+        "note": "",
+        "lang": "zh_CN",
+        "expression": "cdn_response_status_code",
+        "created_at": 0,
+        "created_by": "",
+        "updated_at": 0,
+        "updated_by": ""
+    },
+    {
+        "id": 0,
+        "uuid": 1717556327525787000,
+        "collector": "Categraf",
+        "typ": "HTTP_Response",
+        "name": "拨测 - 首包耗时",
+        "unit": "milliseconds",
+        "note": "",
+        "lang": "zh_CN",
+        "expression": "cdn_first_byte",
+        "created_at": 0,
+        "created_by": "",
+        "updated_at": 0,
+        "updated_by": ""
+    }
 ]

integrations/IPMI/alerts/alerts.json

@@ -1,266 +1,310 @@
 [
-  {
-    "cate": "prometheus",
-    "datasource_ids": [
-      0
-    ],
-    "name": "CPU温度超过90",
-    "note": "",
-    "prod": "metric",
-    "algorithm": "",
-    "algo_params": null,
-    "delay": 0,
-    "severity": 0,
-    "severities": [
-      2
-    ],
-    "disabled": 0,
-    "prom_for_duration": 60,
-    "prom_ql": "",
-    "rule_config": {
-      "queries": [
-        {
-          "prom_ql": "ipmi_cpu1_temp{} > 90 or ipmi_cpu2_temp{} > 90",
-          "severity": 2
-        }
-      ]
+    {
+        "id": 0,
+        "group_id": 0,
+        "cate": "prometheus",
+        "datasource_ids": [
+            0
+        ],
+        "cluster": "",
+        "name": "CPU温度超过90",
+        "note": "",
+        "prod": "metric",
+        "algorithm": "",
+        "algo_params": null,
+        "delay": 0,
+        "severity": 0,
+        "severities": [
+            2
+        ],
+        "disabled": 0,
+        "prom_for_duration": 60,
+        "prom_ql": "",
+        "rule_config": {
+            "queries": [
+                {
+                    "prom_ql": "ipmi_cpu1_temp{} \u003e 90 or ipmi_cpu2_temp{} \u003e 90",
+                    "severity": 2
+                }
+            ]
+        },
+        "prom_eval_interval": 30,
+        "enable_stime": "00:00",
+        "enable_stimes": [
+            "00:00"
+        ],
+        "enable_etime": "23:59",
+        "enable_etimes": [
+            "23:59"
+        ],
+        "enable_days_of_week": [
+            "0",
+            "1",
+            "2",
+            "3",
+            "4",
+            "5",
+            "6"
+        ],
+        "enable_days_of_weeks": [
+            [
+                "0",
+                "1",
+                "2",
+                "3",
+                "4",
+                "5",
+                "6"
+            ]
+        ],
+        "enable_in_bg": 0,
+        "notify_recovered": 1,
+        "notify_channels": [],
+        "notify_groups_obj": null,
+        "notify_groups": null,
+        "notify_repeat_step": 60,
+        "notify_max_number": 0,
+        "recover_duration": 0,
+        "callbacks": [],
+        "runbook_url": "",
+        "append_tags": [],
+        "annotations": {},
+        "extra_config": null,
+        "create_at": 0,
+        "create_by": "",
+        "update_at": 0,
+        "update_by": "",
+        "uuid": 1717556327537842000
     },
-    "prom_eval_interval": 30,
-    "enable_stime": "00:00",
-    "enable_stimes": [
-      "00:00"
-    ],
-    "enable_etime": "23:59",
-    "enable_etimes": [
-      "23:59"
-    ],
-    "enable_days_of_week": [
-      "0",
-      "1",
-      "2",
-      "3",
-      "4",
-      "5",
-      "6"
-    ],
-    "enable_days_of_weeks": [
-      [
-        "0",
-        "1",
-        "2",
-        "3",
-        "4",
-        "5",
-        "6"
-      ]
-    ],
-    "enable_in_bg": 0,
-    "notify_recovered": 1,
-    "notify_channels": [],
-    "notify_repeat_step": 60,
-    "notify_max_number": 0,
-    "recover_duration": 0,
-    "callbacks": [],
-    "runbook_url": "",
-    "append_tags": [],
-    "annotations": {}
-  },
-  {
-    "cate": "prometheus",
-    "datasource_ids": [
-      0
-    ],
-    "name": "CPU电压大于10",
-    "note": "",
-    "prod": "metric",
-    "algorithm": "",
-    "algo_params": null,
-    "delay": 0,
-    "severity": 0,
-    "severities": [
-      2
-    ],
-    "disabled": 0,
-    "prom_for_duration": 60,
-    "prom_ql": "",
-    "rule_config": {
-      "queries": [
-        {
-          "prom_ql": "ipmi_vcpu1 > 10 or ipmi_vcpu1 > 10",
-          "severity": 2
-        }
-      ]
+    {
+        "id": 0,
+        "group_id": 0,
+        "cate": "prometheus",
+        "datasource_ids": [
+            0
+        ],
+        "cluster": "",
+        "name": "CPU电压大于10",
+        "note": "",
+        "prod": "metric",
+        "algorithm": "",
+        "algo_params": null,
+        "delay": 0,
+        "severity": 0,
+        "severities": [
+            2
+        ],
+        "disabled": 0,
+        "prom_for_duration": 60,
+        "prom_ql": "",
+        "rule_config": {
+            "queries": [
+                {
+                    "prom_ql": "ipmi_vcpu1 \u003e 10 or ipmi_vcpu1 \u003e 10",
+                    "severity": 2
+                }
+            ]
+        },
+        "prom_eval_interval": 30,
+        "enable_stime": "00:00",
+        "enable_stimes": [
+            "00:00"
+        ],
+        "enable_etime": "23:59",
+        "enable_etimes": [
+            "23:59"
+        ],
+        "enable_days_of_week": [
+            "0",
+            "1",
+            "2",
+            "3",
+            "4",
+            "5",
+            "6"
+        ],
+        "enable_days_of_weeks": [
+            [
+                "0",
+                "1",
+                "2",
+                "3",
+                "4",
+                "5",
+                "6"
+            ]
+        ],
+        "enable_in_bg": 0,
+        "notify_recovered": 1,
+        "notify_channels": [],
+        "notify_groups_obj": null,
+        "notify_groups": null,
+        "notify_repeat_step": 60,
+        "notify_max_number": 0,
+        "recover_duration": 0,
+        "callbacks": [],
+        "runbook_url": "",
+        "append_tags": [],
+        "annotations": {},
+        "extra_config": null,
+        "create_at": 0,
+        "create_by": "",
+        "update_at": 0,
+        "update_by": "",
+        "uuid": 1717556327538351000
     },
-    "prom_eval_interval": 30,
-    "enable_stime": "00:00",
-    "enable_stimes": [
-      "00:00"
-    ],
-    "enable_etime": "23:59",
-    "enable_etimes": [
-      "23:59"
-    ],
-    "enable_days_of_week": [
-      "0",
-      "1",
-      "2",
-      "3",
-      "4",
-      "5",
-      "6"
-    ],
-    "enable_days_of_weeks": [
-      [
-        "0",
-        "1",
-        "2",
-        "3",
-        "4",
-        "5",
-        "6"
-      ]
-    ],
-    "enable_in_bg": 0,
-    "notify_recovered": 1,
-    "notify_channels": [],
-    "notify_repeat_step": 60,
-    "notify_max_number": 0,
-    "recover_duration": 0,
-    "callbacks": [],
-    "runbook_url": "",
-    "append_tags": [],
-    "annotations": {}
-  },
-  {
-    "cate": "prometheus",
-    "datasource_ids": [
-      0
-    ],
-    "name": "CPU风扇转速超过1000",
-    "note": "",
-    "prod": "metric",
-    "algorithm": "",
-    "algo_params": null,
-    "delay": 0,
-    "severity": 0,
-    "severities": [
-      2
-    ],
-    "disabled": 0,
-    "prom_for_duration": 60,
-    "prom_ql": "",
-    "rule_config": {
-      "queries": [
-        {
-          "prom_ql": "ipmi_fan1  > 1000 or ipmi_fan2  > 1000 or ipmi_fan3  > 1000 or ipmi_fan4  > 1000 or ipmi_fan5  > 1000 or ipmi_fan6 > 1000",
-          "severity": 2
-        }
-      ]
+    {
+        "id": 0,
+        "group_id": 0,
+        "cate": "prometheus",
+        "datasource_ids": [
+            0
+        ],
+        "cluster": "",
+        "name": "CPU风扇转速超过1000",
+        "note": "",
+        "prod": "metric",
+        "algorithm": "",
+        "algo_params": null,
+        "delay": 0,
+        "severity": 0,
+        "severities": [
+            2
+        ],
+        "disabled": 0,
+        "prom_for_duration": 60,
+        "prom_ql": "",
+        "rule_config": {
+            "queries": [
+                {
+                    "prom_ql": "ipmi_fan1  \u003e 1000 or ipmi_fan2  \u003e 1000 or ipmi_fan3  \u003e 1000 or ipmi_fan4  \u003e 1000 or ipmi_fan5  \u003e 1000 or ipmi_fan6 \u003e 1000",
+                    "severity": 2
+                }
+            ]
+        },
+        "prom_eval_interval": 30,
+        "enable_stime": "00:00",
+        "enable_stimes": [
+            "00:00"
+        ],
+        "enable_etime": "23:59",
+        "enable_etimes": [
+            "23:59"
+        ],
+        "enable_days_of_week": [
+            "0",
+            "1",
+            "2",
+            "3",
+            "4",
+            "5",
+            "6"
+        ],
+        "enable_days_of_weeks": [
+            [
+                "0",
+                "1",
+                "2",
+                "3",
+                "4",
+                "5",
+                "6"
+            ]
+        ],
+        "enable_in_bg": 0,
+        "notify_recovered": 1,
+        "notify_channels": [],
+        "notify_groups_obj": null,
+        "notify_groups": null,
+        "notify_repeat_step": 60,
+        "notify_max_number": 0,
+        "recover_duration": 0,
+        "callbacks": [],
+        "runbook_url": "",
+        "append_tags": [],
+        "annotations": {},
+        "extra_config": null,
+        "create_at": 0,
+        "create_by": "",
+        "update_at": 0,
+        "update_by": "",
+        "uuid": 1717556327538796000
     },
-    "prom_eval_interval": 30,
-    "enable_stime": "00:00",
-    "enable_stimes": [
-      "00:00"
-    ],
-    "enable_etime": "23:59",
-    "enable_etimes": [
-      "23:59"
-    ],
-    "enable_days_of_week": [
-      "0",
-      "1",
-      "2",
-      "3",
-      "4",
-      "5",
-      "6"
-    ],
-    "enable_days_of_weeks": [
-      [
-        "0",
-        "1",
-        "2",
-        "3",
-        "4",
-        "5",
-        "6"
-      ]
-    ],
-    "enable_in_bg": 0,
-    "notify_recovered": 1,
-    "notify_channels": [],
-    "notify_repeat_step": 60,
-    "notify_max_number": 0,
-    "recover_duration": 0,
-    "callbacks": [],
-    "runbook_url": "",
-    "append_tags": [],
-    "annotations": {}
-  },
-  {
-    "cate": "prometheus",
-    "datasource_ids": [
-      0
-    ],
-    "name": "主板温度超过90",
-    "note": "",
-    "prod": "metric",
-    "algorithm": "",
-    "algo_params": null,
-    "delay": 0,
-    "severity": 0,
-    "severities": [
-      2
-    ],
-    "disabled": 0,
-    "prom_for_duration": 60,
-    "prom_ql": "",
-    "rule_config": {
-      "queries": [
-        {
-          "prom_ql": "ipmi_system_temp > 90 or ipmi_pch_temp > 90",
-          "severity": 2
-        }
-      ]
-    },
-    "prom_eval_interval": 30,
-    "enable_stime": "00:00",
-    "enable_stimes": [
-      "00:00"
-    ],
-    "enable_etime": "23:59",
-    "enable_etimes": [
-      "23:59"
-    ],
-    "enable_days_of_week": [
-      "0",
-      "1",
-      "2",
-      "3",
-      "4",
-      "5",
-      "6"
-    ],
-    "enable_days_of_weeks": [
-      [
-        "0",
-        "1",
-        "2",
-        "3",
-        "4",
-        "5",
-        "6"
-      ]
-    ],
-    "enable_in_bg": 0,
-    "notify_recovered": 1,
-    "notify_channels": [],
-    "notify_repeat_step": 60,
-    "notify_max_number": 0,
-    "recover_duration": 0,
-    "callbacks": [],
-    "runbook_url": "",
-    "append_tags": [],
-    "annotations": {}
-  }
+    {
+        "id": 0,
+        "group_id": 0,
+        "cate": "prometheus",
+        "datasource_ids": [
+            0
+        ],
+        "cluster": "",
+        "name": "主板温度超过90",
+        "note": "",
+        "prod": "metric",
+        "algorithm": "",
+        "algo_params": null,
+        "delay": 0,
+        "severity": 0,
+        "severities": [
+            2
+        ],
+        "disabled": 0,
+        "prom_for_duration": 60,
+        "prom_ql": "",
+        "rule_config": {
+            "queries": [
+                {
+                    "prom_ql": "ipmi_system_temp \u003e 90 or ipmi_pch_temp \u003e 90",
+                    "severity": 2
+                }
+            ]
+        },
+        "prom_eval_interval": 30,
+        "enable_stime": "00:00",
+        "enable_stimes": [
+            "00:00"
+        ],
+        "enable_etime": "23:59",
+        "enable_etimes": [
+            "23:59"
+        ],
+        "enable_days_of_week": [
+            "0",
+            "1",
+            "2",
+            "3",
+            "4",
+            "5",
+            "6"
+        ],
+        "enable_days_of_weeks": [
+            [
+                "0",
+                "1",
+                "2",
+                "3",
+                "4",
+                "5",
+                "6"
+            ]
+        ],
+        "enable_in_bg": 0,
+        "notify_recovered": 1,
+        "notify_channels": [],
+        "notify_groups_obj": null,
+        "notify_groups": null,
+        "notify_repeat_step": 60,
+        "notify_max_number": 0,
+        "recover_duration": 0,
+        "callbacks": [],
+        "runbook_url": "",
+        "append_tags": [],
+        "annotations": {},
+        "extra_config": null,
+        "create_at": 0,
+        "create_by": "",
+        "update_at": 0,
+        "update_by": "",
+        "uuid": 1717556327539285000
+    }
 ]

integrations/JMX/dashboards/jmx_by_exporter.json

@@ -1,7 +1,13 @@
 {
+    "id": 0,
+    "group_id": 0,
     "name": "JMX",
-    "tags": "Prometheus JMX",
     "ident": "",
+    "tags": "Prometheus JMX",
+    "create_at": 0,
+    "create_by": "",
+    "update_at": 0,
+    "update_by": "",
     "configs": {
         "panels": [
             {
@@ -25,6 +31,8 @@
                     "textMode": "value",
                     "textSize": {}
                 },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${prom}",
                 "id": "0721ee76-816b-469f-9c49-2bef94a9299e",
                 "layout": {
                     "h": 3,
@@ -66,9 +74,7 @@
                     }
                 ],
                 "type": "stat",
-                "version": "2.0.0",
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${prom}"
+                "version": "2.0.0"
             },
             {
                 "custom": {
@@ -78,6 +84,8 @@
                     "textMode": "value",
                     "textSize": {}
                 },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${prom}",
                 "id": "a55c40fc-dc25-4d2a-8e99-928e02c5ff5d",
                 "layout": {
                     "h": 3,
@@ -99,9 +107,7 @@
                     }
                 ],
                 "type": "stat",
-                "version": "2.0.0",
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${prom}"
+                "version": "2.0.0"
             },
             {
                 "custom": {
@@ -111,6 +117,8 @@
                     "textMode": "value",
                     "textSize": {}
                 },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${prom}",
                 "id": "60c3389c-808d-4412-b74b-cb762e89a8ad",
                 "layout": {
                     "h": 3,
@@ -130,9 +138,7 @@
                     }
                 ],
                 "type": "stat",
-                "version": "2.0.0",
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${prom}"
+                "version": "2.0.0"
             },
             {
                 "custom": {
@@ -142,6 +148,8 @@
                     "textMode": "value",
                     "textSize": {}
                 },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${prom}",
                 "id": "1c9a8cca-3578-485e-837d-21618d383065",
                 "layout": {
                     "h": 3,
@@ -161,9 +169,7 @@
                     }
                 ],
                 "type": "stat",
-                "version": "2.0.0",
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${prom}"
+                "version": "2.0.0"
             },
             {
                 "collapsed": true,
@@ -182,11 +188,13 @@
                 "custom": {
                     "drawStyle": "lines",
                     "fillOpacity": 0.3,
+                    "gradientMode": "opacity",
                     "lineInterpolation": "smooth",
-                    "stack": "off",
                     "lineWidth": 2,
-                    "gradientMode": "opacity"
+                    "stack": "off"
                 },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${prom}",
                 "id": "5455e2f2-f6bb-4888-9d88-240d7e12cce2",
                 "layout": {
                     "h": 7,
@@ -223,19 +231,19 @@
                     }
                 ],
                 "type": "timeseries",
-                "version": "2.0.0",
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${prom}"
+                "version": "2.0.0"
             },
             {
                 "custom": {
                     "drawStyle": "lines",
                     "fillOpacity": 0.3,
+                    "gradientMode": "opacity",
                     "lineInterpolation": "smooth",
-                    "stack": "off",
                     "lineWidth": 2,
-                    "gradientMode": "opacity"
+                    "stack": "off"
                 },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${prom}",
                 "id": "765b22a9-1ddc-4c08-8758-684e3c13252b",
                 "layout": {
                     "h": 7,
@@ -272,9 +280,7 @@
                     }
                 ],
                 "type": "timeseries",
-                "version": "2.0.0",
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${prom}"
+                "version": "2.0.0"
             },
             {
                 "collapsed": true,
@@ -293,11 +299,13 @@
                 "custom": {
                     "drawStyle": "lines",
                     "fillOpacity": 0.3,
+                    "gradientMode": "opacity",
                     "lineInterpolation": "smooth",
-                    "stack": "off",
                     "lineWidth": 2,
-                    "gradientMode": "opacity"
+                    "stack": "off"
                 },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${prom}",
                 "id": "5ab2434c-a905-43c1-a563-4cee2dc9dce9",
                 "layout": {
                     "h": 7,
@@ -339,19 +347,19 @@
                     }
                 ],
                 "type": "timeseries",
-                "version": "2.0.0",
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${prom}"
+                "version": "2.0.0"
             },
             {
                 "custom": {
                     "drawStyle": "lines",
                     "fillOpacity": 0.3,
+                    "gradientMode": "opacity",
                     "lineInterpolation": "smooth",
-                    "stack": "off",
                     "lineWidth": 2,
-                    "gradientMode": "opacity"
+                    "stack": "off"
                 },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${prom}",
                 "id": "bfe16d07-91ff-44e6-87bc-9d5d93d2ebd6",
                 "layout": {
                     "h": 7,
@@ -393,19 +401,19 @@
                     }
                 ],
                 "type": "timeseries",
-                "version": "2.0.0",
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${prom}"
+                "version": "2.0.0"
             },
             {
                 "custom": {
                     "drawStyle": "lines",
                     "fillOpacity": 0.3,
+                    "gradientMode": "opacity",
                     "lineInterpolation": "smooth",
-                    "stack": "off",
                     "lineWidth": 2,
-                    "gradientMode": "opacity"
+                    "stack": "off"
                 },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${prom}",
                 "id": "18d10f97-5ab2-41c4-a3ad-09f2c7a03e1a",
                 "layout": {
                     "h": 7,
@@ -447,19 +455,19 @@
                     }
                 ],
                 "type": "timeseries",
-                "version": "2.0.0",
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${prom}"
+                "version": "2.0.0"
             },
             {
                 "custom": {
                     "drawStyle": "lines",
                     "fillOpacity": 0.3,
+                    "gradientMode": "opacity",
                     "lineInterpolation": "smooth",
-                    "stack": "off",
                     "lineWidth": 2,
-                    "gradientMode": "opacity"
+                    "stack": "off"
                 },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${prom}",
                 "id": "314a3893-c1d4-4f85-bce0-33ecfda2f521",
                 "layout": {
                     "h": 7,
@@ -501,19 +509,19 @@
                     }
                 ],
                 "type": "timeseries",
-                "version": "2.0.0",
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${prom}"
+                "version": "2.0.0"
             },
             {
                 "custom": {
                     "drawStyle": "lines",
                     "fillOpacity": 0.3,
+                    "gradientMode": "opacity",
                     "lineInterpolation": "smooth",
-                    "stack": "off",
                     "lineWidth": 2,
-                    "gradientMode": "opacity"
+                    "stack": "off"
                 },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${prom}",
                 "id": "1e5f03e7-af5d-447b-9c1b-23d81915e8df",
                 "layout": {
                     "h": 7,
@@ -555,19 +563,19 @@
                     }
                 ],
                 "type": "timeseries",
-                "version": "2.0.0",
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${prom}"
+                "version": "2.0.0"
             },
             {
                 "custom": {
                     "drawStyle": "lines",
                     "fillOpacity": 0.3,
+                    "gradientMode": "opacity",
                     "lineInterpolation": "smooth",
-                    "stack": "off",
                     "lineWidth": 2,
-                    "gradientMode": "opacity"
+                    "stack": "off"
                 },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${prom}",
                 "id": "86a68ff6-238c-4fc9-b77e-3b964e564500",
                 "layout": {
                     "h": 7,
@@ -609,19 +617,19 @@
                     }
                 ],
                 "type": "timeseries",
-                "version": "2.0.0",
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${prom}"
+                "version": "2.0.0"
             },
             {
                 "custom": {
                     "drawStyle": "lines",
                     "fillOpacity": 0.3,
+                    "gradientMode": "opacity",
                     "lineInterpolation": "smooth",
-                    "stack": "off",
                     "lineWidth": 2,
-                    "gradientMode": "opacity"
+                    "stack": "off"
                 },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${prom}",
                 "id": "595af7d1-e53c-43b5-8f62-ddb9b3a4ffcb",
                 "layout": {
                     "h": 7,
@@ -663,19 +671,19 @@
                     }
                 ],
                 "type": "timeseries",
-                "version": "2.0.0",
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${prom}"
+                "version": "2.0.0"
             },
             {
                 "custom": {
                     "drawStyle": "lines",
                     "fillOpacity": 0.3,
+                    "gradientMode": "opacity",
                     "lineInterpolation": "smooth",
-                    "stack": "off",
                     "lineWidth": 2,
-                    "gradientMode": "opacity"
+                    "stack": "off"
                 },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${prom}",
                 "id": "380fdfcb-16a6-4131-abaa-a3911b7de6fa",
                 "layout": {
                     "h": 7,
@@ -717,9 +725,7 @@
                     }
                 ],
                 "type": "timeseries",
-                "version": "2.0.0",
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${prom}"
+                "version": "2.0.0"
             },
             {
                 "collapsed": true,
@@ -738,11 +744,13 @@
                 "custom": {
                     "drawStyle": "lines",
                     "fillOpacity": 0.3,
+                    "gradientMode": "opacity",
                     "lineInterpolation": "smooth",
-                    "stack": "off",
                     "lineWidth": 2,
-                    "gradientMode": "opacity"
+                    "stack": "off"
                 },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${prom}",
                 "id": "5303bda0-47c2-4aca-bb12-1da512500f4a",
                 "layout": {
                     "h": 7,
@@ -772,19 +780,19 @@
                     }
                 ],
                 "type": "timeseries",
-                "version": "2.0.0",
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${prom}"
+                "version": "2.0.0"
             },
             {
                 "custom": {
                     "drawStyle": "lines",
                     "fillOpacity": 0.3,
+                    "gradientMode": "opacity",
                     "lineInterpolation": "smooth",
-                    "stack": "off",
                     "lineWidth": 2,
-                    "gradientMode": "opacity"
+                    "stack": "off"
                 },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${prom}",
                 "id": "cf410459-b5df-4aca-a410-ecda091d6097",
                 "layout": {
                     "h": 7,
@@ -815,18 +823,18 @@
                     }
                 ],
                 "type": "timeseries",
-                "version": "2.0.0",
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${prom}"
+                "version": "2.0.0"
             },
             {
                 "custom": {
                     "drawStyle": "bars",
                     "fillOpacity": 0.3,
-                    "stack": "off",
+                    "gradientMode": "opacity",
                     "lineWidth": 2,
-                    "gradientMode": "opacity"
+                    "stack": "off"
                 },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${prom}",
                 "id": "30feb928-b7c3-4e71-aeeb-cc10994b313c",
                 "layout": {
                     "h": 7,
@@ -857,9 +865,7 @@
                     }
                 ],
                 "type": "timeseries",
-                "version": "2.0.0",
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${prom}"
+                "version": "2.0.0"
             },
             {
                 "collapsed": true,
@@ -878,11 +884,13 @@
                 "custom": {
                     "drawStyle": "lines",
                     "fillOpacity": 0.3,
+                    "gradientMode": "opacity",
                     "lineInterpolation": "smooth",
-                    "stack": "off",
                     "lineWidth": 2,
-                    "gradientMode": "opacity"
+                    "stack": "off"
                 },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${prom}",
                 "id": "65c74a2b-5f01-4491-b45a-dffe4a9b678a",
                 "layout": {
                     "h": 7,
@@ -921,19 +929,19 @@
                     }
                 ],
                 "type": "timeseries",
-                "version": "2.0.0",
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${prom}"
+                "version": "2.0.0"
             },
             {
                 "custom": {
                     "drawStyle": "lines",
                     "fillOpacity": 0.3,
+                    "gradientMode": "opacity",
                     "lineInterpolation": "smooth",
-                    "stack": "off",
                     "lineWidth": 2,
-                    "gradientMode": "opacity"
+                    "stack": "off"
                 },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${prom}",
                 "id": "2da16907-adf7-4561-9338-4254c89a311b",
                 "layout": {
                     "h": 7,
@@ -961,9 +969,7 @@
                     }
                 ],
                 "type": "timeseries",
-                "version": "2.0.0",
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${prom}"
+                "version": "2.0.0"
             },
             {
                 "collapsed": true,
@@ -982,11 +988,13 @@
                 "custom": {
                     "drawStyle": "lines",
                     "fillOpacity": 0.3,
+                    "gradientMode": "opacity",
                     "lineInterpolation": "smooth",
-                    "stack": "off",
                     "lineWidth": 2,
-                    "gradientMode": "opacity"
+                    "stack": "off"
                 },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${prom}",
                 "id": "5a859147-edfc-4dac-9457-8a928213bc00",
                 "layout": {
                     "h": 7,
@@ -1028,36 +1036,40 @@
                     }
                 ],
                 "type": "timeseries",
-                "version": "2.0.0",
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${prom}"
+                "version": "2.0.0"
             }
         ],
         "var": [
             {
+                "definition": "prometheus",
                 "name": "prom",
-                "type": "datasource",
-                "definition": "prometheus"
+                "type": "datasource"
             },
             {
+                "datasource": {
+                    "cate": "prometheus",
+                    "value": "${prom}"
+                },
                 "definition": "jmx_exporter",
                 "name": "job",
-                "type": "query",
-                "datasource": {
-                    "cate": "prometheus",
-                    "value": "${prom}"
-                }
+                "type": "query"
             },
             {
-                "definition": "label_values(jmx_scrape_error,instance)",
-                "name": "instance",
-                "type": "query",
                 "datasource": {
                     "cate": "prometheus",
                     "value": "${prom}"
-                }
+                },
+                "definition": "label_values(jmx_scrape_error,instance)",
+                "name": "instance",
+                "type": "query"
             }
         ],
         "version": "3.0.0"
-    }
-}
+    },
+    "public": 0,
+    "public_cate": 0,
+    "bgids": null,
+    "built_in": 0,
+    "hide": 0,
+    "uuid": 1717556327549739000
+}

integrations/Kafka/alerts/kafka_by_categraf.json

@@ -1,224 +1,254 @@
 [
-  {
-    "cate": "prometheus",
-    "datasource_ids": [
-      52
-    ],
-    "name": "kafka 数据有丢失风险-副本数小于3",
-    "note": "",
-    "prod": "metric",
-    "algorithm": "",
-    "algo_params": null,
-    "delay": 0,
-    "severity": 2,
-    "severities": [
-      2
-    ],
-    "disabled": 1,
-    "prom_for_duration": 60,
-    "prom_ql": "",
-    "rule_config": {
-      "algo_params": null,
-      "inhibit": false,
-      "prom_ql": "",
-      "queries": [
-        {
-          "prom_ql": "sum(kafka_topic_partition_in_sync_replica) by (topic) < 3",
-          "severity": 2
-        }
-      ],
-      "severity": 0
+    {
+        "id": 0,
+        "group_id": 0,
+        "cate": "prometheus",
+        "datasource_ids": [
+            52
+        ],
+        "cluster": "",
+        "name": "kafka 数据有丢失风险-副本数小于3",
+        "note": "",
+        "prod": "metric",
+        "algorithm": "",
+        "algo_params": null,
+        "delay": 0,
+        "severity": 2,
+        "severities": [
+            2
+        ],
+        "disabled": 1,
+        "prom_for_duration": 60,
+        "prom_ql": "",
+        "rule_config": {
+            "algo_params": null,
+            "inhibit": false,
+            "prom_ql": "",
+            "queries": [
+                {
+                    "prom_ql": "sum(kafka_topic_partition_in_sync_replica) by (topic) \u003c 3",
+                    "severity": 2
+                }
+            ],
+            "severity": 0
+        },
+        "prom_eval_interval": 15,
+        "enable_stime": "00:00",
+        "enable_stimes": [
+            "00:00"
+        ],
+        "enable_etime": "23:59",
+        "enable_etimes": [
+            "23:59"
+        ],
+        "enable_days_of_week": [
+            "1",
+            "2",
+            "3",
+            "4",
+            "5",
+            "6",
+            "0"
+        ],
+        "enable_days_of_weeks": [
+            [
+                "1",
+                "2",
+                "3",
+                "4",
+                "5",
+                "6",
+                "0"
+            ]
+        ],
+        "enable_in_bg": 0,
+        "notify_recovered": 1,
+        "notify_channels": [],
+        "notify_groups_obj": null,
+        "notify_groups": null,
+        "notify_repeat_step": 60,
+        "notify_max_number": 0,
+        "recover_duration": 0,
+        "callbacks": [],
+        "runbook_url": "",
+        "append_tags": [
+            "service=kafka",
+            "type=categraf"
+        ],
+        "annotations": null,
+        "extra_config": null,
+        "create_at": 0,
+        "create_by": "",
+        "update_at": 0,
+        "update_by": "",
+        "uuid": 1717556327567317000
     },
-    "prom_eval_interval": 15,
-    "enable_stime": "00:00",
-    "enable_stimes": [
-      "00:00"
-    ],
-    "enable_etime": "23:59",
-    "enable_etimes": [
-      "23:59"
-    ],
-    "enable_days_of_week": [
-      "1",
-      "2",
-      "3",
-      "4",
-      "5",
-      "6",
-      "0"
-    ],
-    "enable_days_of_weeks": [
-      [
-        "1",
-        "2",
-        "3",
-        "4",
-        "5",
-        "6",
-        "0"
-      ]
-    ],
-    "enable_in_bg": 0,
-    "notify_recovered": 1,
-    "notify_channels": [],
-    "notify_repeat_step": 60,
-    "notify_max_number": 0,
-    "recover_duration": 0,
-    "callbacks": [],
-    "runbook_url": "",
-    "append_tags": [
-      "service=kafka",
-      "type=categraf"
-    ],
-    "annotations": null,
-    "extra_config": null
-  },
-  {
-    "cate": "prometheus",
-    "datasource_ids": [
-      52
-    ],
-    "name": "kafka 服务宕机",
-    "note": "",
-    "prod": "metric",
-    "algorithm": "",
-    "algo_params": null,
-    "delay": 0,
-    "severity": 1,
-    "severities": [
-      1
-    ],
-    "disabled": 1,
-    "prom_for_duration": 60,
-    "prom_ql": "",
-    "rule_config": {
-      "algo_params": null,
-      "inhibit": false,
-      "prom_ql": "",
-      "queries": [
-        {
-          "prom_ql": "kafka_broker_info{service=~\"kafka\"} < 1",
-          "severity": 1
-        }
-      ],
-      "severity": 0
+    {
+        "id": 0,
+        "group_id": 0,
+        "cate": "prometheus",
+        "datasource_ids": [
+            52
+        ],
+        "cluster": "",
+        "name": "kafka 服务宕机",
+        "note": "",
+        "prod": "metric",
+        "algorithm": "",
+        "algo_params": null,
+        "delay": 0,
+        "severity": 1,
+        "severities": [
+            1
+        ],
+        "disabled": 1,
+        "prom_for_duration": 60,
+        "prom_ql": "",
+        "rule_config": {
+            "algo_params": null,
+            "inhibit": false,
+            "prom_ql": "",
+            "queries": [
+                {
+                    "prom_ql": "kafka_broker_info{service=~\"kafka\"} \u003c 1",
+                    "severity": 1
+                }
+            ],
+            "severity": 0
+        },
+        "prom_eval_interval": 60,
+        "enable_stime": "00:00",
+        "enable_stimes": [
+            "00:00"
+        ],
+        "enable_etime": "23:59",
+        "enable_etimes": [
+            "23:59"
+        ],
+        "enable_days_of_week": [
+            "1",
+            "2",
+            "3",
+            "4",
+            "5",
+            "6",
+            "0"
+        ],
+        "enable_days_of_weeks": [
+            [
+                "1",
+                "2",
+                "3",
+                "4",
+                "5",
+                "6",
+                "0"
+            ]
+        ],
+        "enable_in_bg": 0,
+        "notify_recovered": 1,
+        "notify_channels": [],
+        "notify_groups_obj": null,
+        "notify_groups": null,
+        "notify_repeat_step": 60,
+        "notify_max_number": 0,
+        "recover_duration": 0,
+        "callbacks": [],
+        "runbook_url": "",
+        "append_tags": [
+            "type=categraf",
+            "service=kafka"
+        ],
+        "annotations": null,
+        "extra_config": null,
+        "create_at": 0,
+        "create_by": "",
+        "update_at": 0,
+        "update_by": "",
+        "uuid": 1717556327568065000
     },
-    "prom_eval_interval": 60,
-    "enable_stime": "00:00",
-    "enable_stimes": [
-      "00:00"
-    ],
-    "enable_etime": "23:59",
-    "enable_etimes": [
-      "23:59"
-    ],
-    "enable_days_of_week": [
-      "1",
-      "2",
-      "3",
-      "4",
-      "5",
-      "6",
-      "0"
-    ],
-    "enable_days_of_weeks": [
-      [
-        "1",
-        "2",
-        "3",
-        "4",
-        "5",
-        "6",
-        "0"
-      ]
-    ],
-    "enable_in_bg": 0,
-    "notify_recovered": 1,
-    "notify_channels": [],
-    "notify_repeat_step": 60,
-    "notify_max_number": 0,
-    "recover_duration": 0,
-    "callbacks": [],
-    "runbook_url": "",
-    "append_tags": [
-      "type=categraf",
-      "service=kafka"
-    ],
-    "annotations": null,
-    "extra_config": null
-  },
-  {
-    "cate": "prometheus",
-    "datasource_ids": [
-      52
-    ],
-    "name": "kafka 消费能力不足-延迟超过5分钟",
-    "note": "",
-    "prod": "metric",
-    "algorithm": "",
-    "algo_params": null,
-    "delay": 0,
-    "severity": 2,
-    "severities": [
-      2
-    ],
-    "disabled": 1,
-    "prom_for_duration": 60,
-    "prom_ql": "",
-    "rule_config": {
-      "algo_params": null,
-      "inhibit": false,
-      "prom_ql": "",
-      "queries": [
-        {
-          "prom_ql": "max(kafka_consumer_lag_millis) by (topic, consumergroup)  / 1000 > 300",
-          "severity": 2
-        }
-      ],
-      "severity": 0
-    },
-    "prom_eval_interval": 15,
-    "enable_stime": "00:00",
-    "enable_stimes": [
-      "00:00"
-    ],
-    "enable_etime": "23:59",
-    "enable_etimes": [
-      "23:59"
-    ],
-    "enable_days_of_week": [
-      "1",
-      "2",
-      "3",
-      "4",
-      "5",
-      "6",
-      "0"
-    ],
-    "enable_days_of_weeks": [
-      [
-        "1",
-        "2",
-        "3",
-        "4",
-        "5",
-        "6",
-        "0"
-      ]
-    ],
-    "enable_in_bg": 0,
-    "notify_recovered": 1,
-    "notify_channels": [],
-    "notify_repeat_step": 60,
-    "notify_max_number": 0,
-    "recover_duration": 0,
-    "callbacks": [],
-    "runbook_url": "",
-    "append_tags": [
-      "service=kafka",
-      "type=categraf"
-    ],
-    "annotations": null,
-    "extra_config": null
-  }
+    {
+        "id": 0,
+        "group_id": 0,
+        "cate": "prometheus",
+        "datasource_ids": [
+            52
+        ],
+        "cluster": "",
+        "name": "kafka 消费能力不足-延迟超过5分钟",
+        "note": "",
+        "prod": "metric",
+        "algorithm": "",
+        "algo_params": null,
+        "delay": 0,
+        "severity": 2,
+        "severities": [
+            2
+        ],
+        "disabled": 1,
+        "prom_for_duration": 60,
+        "prom_ql": "",
+        "rule_config": {
+            "algo_params": null,
+            "inhibit": false,
+            "prom_ql": "",
+            "queries": [
+                {
+                    "prom_ql": "max(kafka_consumer_lag_millis) by (topic, consumergroup)  / 1000 \u003e 300",
+                    "severity": 2
+                }
+            ],
+            "severity": 0
+        },
+        "prom_eval_interval": 15,
+        "enable_stime": "00:00",
+        "enable_stimes": [
+            "00:00"
+        ],
+        "enable_etime": "23:59",
+        "enable_etimes": [
+            "23:59"
+        ],
+        "enable_days_of_week": [
+            "1",
+            "2",
+            "3",
+            "4",
+            "5",
+            "6",
+            "0"
+        ],
+        "enable_days_of_weeks": [
+            [
+                "1",
+                "2",
+                "3",
+                "4",
+                "5",
+                "6",
+                "0"
+            ]
+        ],
+        "enable_in_bg": 0,
+        "notify_recovered": 1,
+        "notify_channels": [],
+        "notify_groups_obj": null,
+        "notify_groups": null,
+        "notify_repeat_step": 60,
+        "notify_max_number": 0,
+        "recover_duration": 0,
+        "callbacks": [],
+        "runbook_url": "",
+        "append_tags": [
+            "service=kafka",
+            "type=categraf"
+        ],
+        "annotations": null,
+        "extra_config": null,
+        "create_at": 0,
+        "create_by": "",
+        "update_at": 0,
+        "update_by": "",
+        "uuid": 1717556327568624000
+    }
 ]

integrations/Kafka/alerts/kafka_by_exporter.json

@@ -1,148 +1,168 @@
 [
-  {
-    "cate": "prometheus",
-    "datasource_ids": [
-      52
-    ],
-    "name": "Insufficient consumption ability - delay exceeds 5 minutes - exporter",
-    "note": "",
-    "prod": "metric",
-    "algorithm": "",
-    "algo_params": null,
-    "delay": 0,
-    "severity": 2,
-    "severities": [
-      2
-    ],
-    "disabled": 1,
-    "prom_for_duration": 60,
-    "prom_ql": "",
-    "rule_config": {
-      "algo_params": null,
-      "inhibit": false,
-      "prom_ql": "",
-      "queries": [
-        {
-          "prom_ql": "kafka_consumer_lag_millis / 1000 > 300",
-          "severity": 2
-        }
-      ],
-      "severity": 0
+    {
+        "id": 0,
+        "group_id": 0,
+        "cate": "prometheus",
+        "datasource_ids": [
+            52
+        ],
+        "cluster": "",
+        "name": "Insufficient consumption ability - delay exceeds 5 minutes - exporter",
+        "note": "",
+        "prod": "metric",
+        "algorithm": "",
+        "algo_params": null,
+        "delay": 0,
+        "severity": 2,
+        "severities": [
+            2
+        ],
+        "disabled": 1,
+        "prom_for_duration": 60,
+        "prom_ql": "",
+        "rule_config": {
+            "algo_params": null,
+            "inhibit": false,
+            "prom_ql": "",
+            "queries": [
+                {
+                    "prom_ql": "kafka_consumer_lag_millis / 1000 \u003e 300",
+                    "severity": 2
+                }
+            ],
+            "severity": 0
+        },
+        "prom_eval_interval": 15,
+        "enable_stime": "00:00",
+        "enable_stimes": [
+            "00:00"
+        ],
+        "enable_etime": "23:59",
+        "enable_etimes": [
+            "23:59"
+        ],
+        "enable_days_of_week": [
+            "1",
+            "2",
+            "3",
+            "4",
+            "5",
+            "6",
+            "0"
+        ],
+        "enable_days_of_weeks": [
+            [
+                "1",
+                "2",
+                "3",
+                "4",
+                "5",
+                "6",
+                "0"
+            ]
+        ],
+        "enable_in_bg": 0,
+        "notify_recovered": 1,
+        "notify_channels": [],
+        "notify_groups_obj": null,
+        "notify_groups": null,
+        "notify_repeat_step": 60,
+        "notify_max_number": 0,
+        "recover_duration": 0,
+        "callbacks": [],
+        "runbook_url": "",
+        "append_tags": [
+            "service=kafka"
+        ],
+        "annotations": null,
+        "extra_config": null,
+        "create_at": 0,
+        "create_by": "",
+        "update_at": 0,
+        "update_by": "",
+        "uuid": 1717556327569664000
     },
-    "prom_eval_interval": 15,
-    "enable_stime": "00:00",
-    "enable_stimes": [
-      "00:00"
-    ],
-    "enable_etime": "23:59",
-    "enable_etimes": [
-      "23:59"
-    ],
-    "enable_days_of_week": [
-      "1",
-      "2",
-      "3",
-      "4",
-      "5",
-      "6",
-      "0"
-    ],
-    "enable_days_of_weeks": [
-      [
-        "1",
-        "2",
-        "3",
-        "4",
-        "5",
-        "6",
-        "0"
-      ]
-    ],
-    "enable_in_bg": 0,
-    "notify_recovered": 1,
-    "notify_channels": [],
-    "notify_repeat_step": 60,
-    "notify_max_number": 0,
-    "recover_duration": 0,
-    "callbacks": [],
-    "runbook_url": "",
-    "append_tags": [
-      "service=kafka"
-    ],
-    "annotations": null,
-    "extra_config": null
-  },
-  {
-    "cate": "prometheus",
-    "datasource_ids": [
-      52
-    ],
-    "name": "Risk of data loss - number of replicas less than 3 - exporter",
-    "note": "",
-    "prod": "metric",
-    "algorithm": "",
-    "algo_params": null,
-    "delay": 0,
-    "severity": 2,
-    "severities": [
-      2
-    ],
-    "disabled": 1,
-    "prom_for_duration": 60,
-    "prom_ql": "",
-    "rule_config": {
-      "algo_params": null,
-      "inhibit": false,
-      "prom_ql": "",
-      "queries": [
-        {
-          "prom_ql": "sum(kafka_topic_partition_in_sync_replica) by (topic) < 3 - exporter",
-          "severity": 2
-        }
-      ],
-      "severity": 0
-    },
-    "prom_eval_interval": 15,
-    "enable_stime": "00:00",
-    "enable_stimes": [
-      "00:00"
-    ],
-    "enable_etime": "23:59",
-    "enable_etimes": [
-      "23:59"
-    ],
-    "enable_days_of_week": [
-      "1",
-      "2",
-      "3",
-      "4",
-      "5",
-      "6",
-      "0"
-    ],
-    "enable_days_of_weeks": [
-      [
-        "1",
-        "2",
-        "3",
-        "4",
-        "5",
-        "6",
-        "0"
-      ]
-    ],
-    "enable_in_bg": 0,
-    "notify_recovered": 1,
-    "notify_channels": [],
-    "notify_repeat_step": 60,
-    "notify_max_number": 0,
-    "recover_duration": 0,
-    "callbacks": [],
-    "runbook_url": "",
-    "append_tags": [
-      "service=kafka"
-    ],
-    "annotations": null,
-    "extra_config": null
-  }
+    {
+        "id": 0,
+        "group_id": 0,
+        "cate": "prometheus",
+        "datasource_ids": [
+            52
+        ],
+        "cluster": "",
+        "name": "Risk of data loss - number of replicas less than 3 - exporter",
+        "note": "",
+        "prod": "metric",
+        "algorithm": "",
+        "algo_params": null,
+        "delay": 0,
+        "severity": 2,
+        "severities": [
+            2
+        ],
+        "disabled": 1,
+        "prom_for_duration": 60,
+        "prom_ql": "",
+        "rule_config": {
+            "algo_params": null,
+            "inhibit": false,
+            "prom_ql": "",
+            "queries": [
+                {
+                    "prom_ql": "sum(kafka_topic_partition_in_sync_replica) by (topic) \u003c 3 - exporter",
+                    "severity": 2
+                }
+            ],
+            "severity": 0
+        },
+        "prom_eval_interval": 15,
+        "enable_stime": "00:00",
+        "enable_stimes": [
+            "00:00"
+        ],
+        "enable_etime": "23:59",
+        "enable_etimes": [
+            "23:59"
+        ],
+        "enable_days_of_week": [
+            "1",
+            "2",
+            "3",
+            "4",
+            "5",
+            "6",
+            "0"
+        ],
+        "enable_days_of_weeks": [
+            [
+                "1",
+                "2",
+                "3",
+                "4",
+                "5",
+                "6",
+                "0"
+            ]
+        ],
+        "enable_in_bg": 0,
+        "notify_recovered": 1,
+        "notify_channels": [],
+        "notify_groups_obj": null,
+        "notify_groups": null,
+        "notify_repeat_step": 60,
+        "notify_max_number": 0,
+        "recover_duration": 0,
+        "callbacks": [],
+        "runbook_url": "",
+        "append_tags": [
+            "service=kafka"
+        ],
+        "annotations": null,
+        "extra_config": null,
+        "create_at": 0,
+        "create_by": "",
+        "update_at": 0,
+        "update_by": "",
+        "uuid": 1717556327570285000
+    }
 ]

integrations/Kafka/dashboards/kafka_by_categraf.json

@@ -1,403 +1,415 @@
 {
-  "name": "Kafka By Categraf",
-  "tags": "Kafka Prometheus Categraf",
-  "ident": "",
-  "configs": {
-    "links": [
-      {
-        "targetBlank": true,
-        "title": "文档",
-        "url": "https://github.com/ccfos/nightingale/tree/main/integrations/kafka/markdown/"
-      }
-    ],
-    "panels": [
-      {
-        "collapsed": true,
-        "id": "51502c3a-dd6f-41c7-b8f1-87b88826c96e",
-        "layout": {
-          "h": 1,
-          "i": "51502c3a-dd6f-41c7-b8f1-87b88826c96e",
-          "isResizable": false,
-          "w": 24,
-          "x": 0,
-          "y": 0
-        },
-        "name": "overview",
-        "type": "row"
-      },
-      {
-        "custom": {
-          "calc": "lastNotNull",
-          "colSpan": 1,
-          "colorMode": "value",
-          "textMode": "value",
-          "textSize": {
-            "value": 50
-          }
-        },
-        "id": "e2c1d271-ec43-4821-aa19-451e856af755",
-        "layout": {
-          "h": 3,
-          "i": "e2c1d271-ec43-4821-aa19-451e856af755",
-          "isResizable": true,
-          "w": 6,
-          "x": 0,
-          "y": 1
-        },
-        "name": "brokers",
-        "options": {
-          "standardOptions": {}
-        },
-        "targets": [
-          {
-            "expr": "kafka_brokers{cluster=\"$cluster\"}",
-            "refId": "A"
-          }
+    "id": 0,
+    "group_id": 0,
+    "name": "Kafka By Categraf",
+    "ident": "",
+    "tags": "Kafka Prometheus Categraf",
+    "create_at": 0,
+    "create_by": "",
+    "update_at": 0,
+    "update_by": "",
+    "configs": {
+        "links": [
+            {
+                "targetBlank": true,
+                "title": "文档",
+                "url": "https://github.com/ccfos/nightingale/tree/main/integrations/kafka/markdown/"
+            }
         ],
-        "type": "stat",
-        "version": "2.0.0",
-        "datasourceCate": "prometheus",
-        "datasourceValue": "${datasource}"
-      },
-      {
-        "custom": {
-          "calc": "lastNotNull",
-          "colSpan": 1,
-          "colorMode": "value",
-          "textMode": "value",
-          "textSize": {
-            "value": 50
-          }
-        },
-        "id": "fd3a0b9f-fd67-4360-a94c-869fee7b5b98",
-        "layout": {
-          "h": 3,
-          "i": "fd3a0b9f-fd67-4360-a94c-869fee7b5b98",
-          "isResizable": true,
-          "w": 6,
-          "x": 6,
-          "y": 1
-        },
-        "name": "topics",
-        "options": {
-          "standardOptions": {}
-        },
-        "targets": [
-          {
-            "expr": "count(count by (topic) (kafka_topic_partitions{cluster=\"$cluster\"}))",
-            "refId": "A"
-          }
+        "panels": [
+            {
+                "collapsed": true,
+                "id": "51502c3a-dd6f-41c7-b8f1-87b88826c96e",
+                "layout": {
+                    "h": 1,
+                    "i": "51502c3a-dd6f-41c7-b8f1-87b88826c96e",
+                    "isResizable": false,
+                    "w": 24,
+                    "x": 0,
+                    "y": 0
+                },
+                "name": "overview",
+                "type": "row"
+            },
+            {
+                "custom": {
+                    "calc": "lastNotNull",
+                    "colSpan": 1,
+                    "colorMode": "value",
+                    "textMode": "value",
+                    "textSize": {
+                        "value": 50
+                    }
+                },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
+                "id": "e2c1d271-ec43-4821-aa19-451e856af755",
+                "layout": {
+                    "h": 3,
+                    "i": "e2c1d271-ec43-4821-aa19-451e856af755",
+                    "isResizable": true,
+                    "w": 6,
+                    "x": 0,
+                    "y": 1
+                },
+                "name": "brokers",
+                "options": {
+                    "standardOptions": {}
+                },
+                "targets": [
+                    {
+                        "expr": "kafka_brokers{cluster=\"$cluster\"}",
+                        "refId": "A"
+                    }
+                ],
+                "type": "stat",
+                "version": "2.0.0"
+            },
+            {
+                "custom": {
+                    "calc": "lastNotNull",
+                    "colSpan": 1,
+                    "colorMode": "value",
+                    "textMode": "value",
+                    "textSize": {
+                        "value": 50
+                    }
+                },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
+                "id": "fd3a0b9f-fd67-4360-a94c-869fee7b5b98",
+                "layout": {
+                    "h": 3,
+                    "i": "fd3a0b9f-fd67-4360-a94c-869fee7b5b98",
+                    "isResizable": true,
+                    "w": 6,
+                    "x": 6,
+                    "y": 1
+                },
+                "name": "topics",
+                "options": {
+                    "standardOptions": {}
+                },
+                "targets": [
+                    {
+                        "expr": "count(count by (topic) (kafka_topic_partitions{cluster=\"$cluster\"}))",
+                        "refId": "A"
+                    }
+                ],
+                "type": "stat",
+                "version": "2.0.0"
+            },
+            {
+                "custom": {
+                    "calc": "lastNotNull",
+                    "colSpan": 1,
+                    "colorMode": "value",
+                    "textMode": "value",
+                    "textSize": {
+                        "value": 50
+                    }
+                },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
+                "id": "e228d857-746b-41b6-8d2d-0152453c46f4",
+                "layout": {
+                    "h": 3,
+                    "i": "e228d857-746b-41b6-8d2d-0152453c46f4",
+                    "isResizable": true,
+                    "w": 6,
+                    "x": 12,
+                    "y": 1
+                },
+                "name": "partitions",
+                "options": {
+                    "standardOptions": {}
+                },
+                "targets": [
+                    {
+                        "expr": "sum(kafka_topic_partitions{cluster=\"$cluster\"})",
+                        "refId": "A"
+                    }
+                ],
+                "type": "stat",
+                "version": "2.0.0"
+            },
+            {
+                "custom": {
+                    "calc": "lastNotNull",
+                    "colSpan": 1,
+                    "colorMode": "value",
+                    "textMode": "valueAndName",
+                    "textSize": {}
+                },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
+                "id": "85438099-8d6b-4817-b9b9-1d0ed36029cd",
+                "layout": {
+                    "h": 3,
+                    "i": "85438099-8d6b-4817-b9b9-1d0ed36029cd",
+                    "isResizable": true,
+                    "w": 6,
+                    "x": 18,
+                    "y": 1
+                },
+                "name": "Replicas",
+                "options": {
+                    "standardOptions": {}
+                },
+                "targets": [
+                    {
+                        "expr": "sum(kafka_topic_partition_replicas{cluster=\"$cluster\"})",
+                        "refId": "A"
+                    }
+                ],
+                "type": "stat",
+                "version": "2.0.0"
+            },
+            {
+                "collapsed": true,
+                "id": "0db4aac4-86cf-44cd-950e-6c6a99be8ff4",
+                "layout": {
+                    "h": 1,
+                    "i": "0db4aac4-86cf-44cd-950e-6c6a99be8ff4",
+                    "isResizable": false,
+                    "w": 24,
+                    "x": 0,
+                    "y": 4
+                },
+                "name": "throughput",
+                "type": "row"
+            },
+            {
+                "custom": {
+                    "drawStyle": "lines",
+                    "fillOpacity": 0.3,
+                    "gradientMode": "opacity",
+                    "lineInterpolation": "smooth",
+                    "lineWidth": 2,
+                    "stack": "off"
+                },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
+                "id": "c2ec4036-3081-45cc-b672-024c6df93833",
+                "layout": {
+                    "h": 7,
+                    "i": "c2ec4036-3081-45cc-b672-024c6df93833",
+                    "isResizable": true,
+                    "w": 8,
+                    "x": 0,
+                    "y": 5
+                },
+                "name": "Messages produced per second",
+                "options": {
+                    "legend": {
+                        "displayMode": "hidden"
+                    },
+                    "standardOptions": {},
+                    "thresholds": {},
+                    "tooltip": {
+                        "mode": "all",
+                        "sort": "none"
+                    }
+                },
+                "targets": [
+                    {
+                        "expr": "sum(rate(kafka_topic_partition_current_offset{cluster=\"$cluster\"}[1m])) by (topic)"
+                    }
+                ],
+                "type": "timeseries",
+                "version": "2.0.0"
+            },
+            {
+                "custom": {
+                    "drawStyle": "lines",
+                    "fillOpacity": 0.3,
+                    "gradientMode": "opacity",
+                    "lineInterpolation": "smooth",
+                    "lineWidth": 2,
+                    "stack": "off"
+                },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
+                "id": "7ad651a6-c12c-4d46-8d01-749fa776faef",
+                "layout": {
+                    "h": 7,
+                    "i": "7ad651a6-c12c-4d46-8d01-749fa776faef",
+                    "isResizable": true,
+                    "w": 8,
+                    "x": 8,
+                    "y": 5
+                },
+                "name": "Messages consumed per second",
+                "options": {
+                    "legend": {
+                        "displayMode": "hidden"
+                    },
+                    "standardOptions": {},
+                    "thresholds": {},
+                    "tooltip": {
+                        "mode": "all",
+                        "sort": "none"
+                    }
+                },
+                "targets": [
+                    {
+                        "expr": "sum(rate(kafka_consumergroup_current_offset{cluster=\"$cluster\"}[1m])) by (topic)"
+                    }
+                ],
+                "type": "timeseries",
+                "version": "2.0.0"
+            },
+            {
+                "custom": {
+                    "drawStyle": "lines",
+                    "fillOpacity": 0.3,
+                    "gradientMode": "opacity",
+                    "lineInterpolation": "smooth",
+                    "lineWidth": 2,
+                    "stack": "off"
+                },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
+                "id": "855aa8f5-0c51-42d4-b9a4-5460b7cd0f5a",
+                "layout": {
+                    "h": 7,
+                    "i": "855aa8f5-0c51-42d4-b9a4-5460b7cd0f5a",
+                    "isResizable": true,
+                    "w": 8,
+                    "x": 16,
+                    "y": 5
+                },
+                "name": "Latency by Consumer Group",
+                "options": {
+                    "legend": {
+                        "displayMode": "hidden"
+                    },
+                    "standardOptions": {
+                        "util": "humantimeMilliseconds"
+                    },
+                    "thresholds": {},
+                    "tooltip": {
+                        "mode": "all",
+                        "sort": "none"
+                    }
+                },
+                "targets": [
+                    {
+                        "expr": "sum(kafka_consumer_lag_millis{cluster=\"$cluster\"}) by (consumergroup, topic)",
+                        "legend": "{{consumergroup}} (topic: {{topic}})"
+                    }
+                ],
+                "type": "timeseries",
+                "version": "2.0.0"
+            },
+            {
+                "collapsed": true,
+                "id": "20166830-7f85-4665-8f39-bf904267af29",
+                "layout": {
+                    "h": 1,
+                    "i": "20166830-7f85-4665-8f39-bf904267af29",
+                    "isResizable": false,
+                    "w": 24,
+                    "x": 0,
+                    "y": 18
+                },
+                "name": "patition/replicate",
+                "type": "row"
+            },
+            {
+                "custom": {
+                    "calc": "lastNotNull",
+                    "colorMode": "value",
+                    "displayMode": "seriesToRows",
+                    "showHeader": true
+                },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
+                "id": "8837a52e-c9eb-4afa-acc1-c3a5dac72d3b",
+                "layout": {
+                    "h": 7,
+                    "i": "8837a52e-c9eb-4afa-acc1-c3a5dac72d3b",
+                    "isResizable": true,
+                    "w": 12,
+                    "x": 0,
+                    "y": 19
+                },
+                "name": "Partitions per Topic",
+                "options": {
+                    "standardOptions": {}
+                },
+                "overrides": [
+                    {}
+                ],
+                "targets": [
+                    {
+                        "expr": "kafka_topic_partitions{cluster=\"$cluster\"}",
+                        "legend": "{{topic}}",
+                        "refId": "A"
+                    }
+                ],
+                "type": "table",
+                "version": "2.0.0"
+            },
+            {
+                "custom": {
+                    "calc": "lastNotNull",
+                    "colorMode": "value",
+                    "displayMode": "seriesToRows",
+                    "showHeader": true
+                },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${datasource}",
+                "description": "副本不同步预案\n1. Restart the Zookeeper leader.\n2. Restart the broker\\brokers that are not replicating some of the partitions.",
+                "id": "dd615767-dda7-4da6-b37f-0d484553aac6",
+                "layout": {
+                    "h": 7,
+                    "i": "dd615767-dda7-4da6-b37f-0d484553aac6",
+                    "isResizable": true,
+                    "w": 12,
+                    "x": 12,
+                    "y": 19
+                },
+                "name": "Partitions Under Replicated",
+                "options": {
+                    "standardOptions": {}
+                },
+                "overrides": [
+                    {}
+                ],
+                "targets": [
+                    {
+                        "expr": "kafka_topic_partition_under_replicated_partition{cluster=\"$cluster\"}",
+                        "legend": "{{topic}}-{{partition}}",
+                        "refId": "A"
+                    }
+                ],
+                "type": "table",
+                "version": "2.0.0"
+            }
         ],
-        "type": "stat",
-        "version": "2.0.0",
-        "datasourceCate": "prometheus",
-        "datasourceValue": "${datasource}"
-      },
-      {
-        "custom": {
-          "calc": "lastNotNull",
-          "colSpan": 1,
-          "colorMode": "value",
-          "textMode": "value",
-          "textSize": {
-            "value": 50
-          }
-        },
-        "id": "e228d857-746b-41b6-8d2d-0152453c46f4",
-        "layout": {
-          "h": 3,
-          "i": "e228d857-746b-41b6-8d2d-0152453c46f4",
-          "isResizable": true,
-          "w": 6,
-          "x": 12,
-          "y": 1
-        },
-        "name": "partitions",
-        "options": {
-          "standardOptions": {}
-        },
-        "targets": [
-          {
-            "expr": "sum(kafka_topic_partitions{cluster=\"$cluster\"})",
-            "refId": "A"
-          }
+        "var": [
+            {
+                "definition": "prometheus",
+                "name": "datasource",
+                "type": "datasource"
+            },
+            {
+                "datasource": {
+                    "cate": "prometheus",
+                    "value": "${datasource}"
+                },
+                "definition": "label_values(kafka_brokers,  cluster)",
+                "name": "cluster",
+                "type": "query"
+            }
         ],
-        "type": "stat",
-        "version": "2.0.0",
-        "datasourceCate": "prometheus",
-        "datasourceValue": "${datasource}"
-      },
-      {
-        "custom": {
-          "calc": "lastNotNull",
-          "colSpan": 1,
-          "colorMode": "value",
-          "textMode": "valueAndName",
-          "textSize": {}
-        },
-        "id": "85438099-8d6b-4817-b9b9-1d0ed36029cd",
-        "layout": {
-          "h": 3,
-          "i": "85438099-8d6b-4817-b9b9-1d0ed36029cd",
-          "isResizable": true,
-          "w": 6,
-          "x": 18,
-          "y": 1
-        },
-        "name": "Replicas",
-        "options": {
-          "standardOptions": {}
-        },
-        "targets": [
-          {
-            "expr": "sum(kafka_topic_partition_replicas{cluster=\"$cluster\"})",
-            "refId": "A"
-          }
-        ],
-        "type": "stat",
-        "version": "2.0.0",
-        "datasourceCate": "prometheus",
-        "datasourceValue": "${datasource}"
-      },
-      {
-        "collapsed": true,
-        "id": "0db4aac4-86cf-44cd-950e-6c6a99be8ff4",
-        "layout": {
-          "h": 1,
-          "i": "0db4aac4-86cf-44cd-950e-6c6a99be8ff4",
-          "isResizable": false,
-          "w": 24,
-          "x": 0,
-          "y": 4
-        },
-        "name": "throughput",
-        "type": "row"
-      },
-      {
-        "custom": {
-          "drawStyle": "lines",
-          "fillOpacity": 0.3,
-          "lineInterpolation": "smooth",
-          "stack": "off",
-          "lineWidth": 2,
-          "gradientMode": "opacity"
-        },
-        "id": "c2ec4036-3081-45cc-b672-024c6df93833",
-        "layout": {
-          "h": 7,
-          "i": "c2ec4036-3081-45cc-b672-024c6df93833",
-          "isResizable": true,
-          "w": 8,
-          "x": 0,
-          "y": 5
-        },
-        "name": "Messages produced per second",
-        "options": {
-          "legend": {
-            "displayMode": "hidden"
-          },
-          "standardOptions": {},
-          "thresholds": {},
-          "tooltip": {
-            "mode": "all",
-            "sort": "none"
-          }
-        },
-        "targets": [
-          {
-            "expr": "sum(rate(kafka_topic_partition_current_offset{cluster=\"$cluster\"}[1m])) by (topic)"
-          }
-        ],
-        "type": "timeseries",
-        "version": "2.0.0",
-        "datasourceCate": "prometheus",
-        "datasourceValue": "${datasource}"
-      },
-      {
-        "custom": {
-          "drawStyle": "lines",
-          "fillOpacity": 0.3,
-          "lineInterpolation": "smooth",
-          "stack": "off",
-          "lineWidth": 2,
-          "gradientMode": "opacity"
-        },
-        "id": "7ad651a6-c12c-4d46-8d01-749fa776faef",
-        "layout": {
-          "h": 7,
-          "i": "7ad651a6-c12c-4d46-8d01-749fa776faef",
-          "isResizable": true,
-          "w": 8,
-          "x": 8,
-          "y": 5
-        },
-        "name": "Messages consumed per second",
-        "options": {
-          "legend": {
-            "displayMode": "hidden"
-          },
-          "standardOptions": {},
-          "thresholds": {},
-          "tooltip": {
-            "mode": "all",
-            "sort": "none"
-          }
-        },
-        "targets": [
-          {
-            "expr": "sum(rate(kafka_consumergroup_current_offset{cluster=\"$cluster\"}[1m])) by (topic)"
-          }
-        ],
-        "type": "timeseries",
-        "version": "2.0.0",
-        "datasourceCate": "prometheus",
-        "datasourceValue": "${datasource}"
-      },
-      {
-        "custom": {
-          "drawStyle": "lines",
-          "fillOpacity": 0.3,
-          "lineInterpolation": "smooth",
-          "stack": "off",
-          "lineWidth": 2,
-          "gradientMode": "opacity"
-        },
-        "id": "855aa8f5-0c51-42d4-b9a4-5460b7cd0f5a",
-        "layout": {
-          "h": 7,
-          "i": "855aa8f5-0c51-42d4-b9a4-5460b7cd0f5a",
-          "isResizable": true,
-          "w": 8,
-          "x": 16,
-          "y": 5
-        },
-        "name": "Latency by Consumer Group",
-        "options": {
-          "legend": {
-            "displayMode": "hidden"
-          },
-          "standardOptions": {
-            "util": "humantimeMilliseconds"
-          },
-          "thresholds": {},
-          "tooltip": {
-            "mode": "all",
-            "sort": "none"
-          }
-        },
-        "targets": [
-          {
-            "expr": "sum(kafka_consumer_lag_millis{cluster=\"$cluster\"}) by (consumergroup, topic)",
-            "legend": "{{consumergroup}} (topic: {{topic}})"
-          }
-        ],
-        "type": "timeseries",
-        "version": "2.0.0",
-        "datasourceCate": "prometheus",
-        "datasourceValue": "${datasource}"
-      },
-      {
-        "collapsed": true,
-        "id": "20166830-7f85-4665-8f39-bf904267af29",
-        "layout": {
-          "h": 1,
-          "i": "20166830-7f85-4665-8f39-bf904267af29",
-          "isResizable": false,
-          "w": 24,
-          "x": 0,
-          "y": 18
-        },
-        "name": "patition/replicate",
-        "type": "row"
-      },
-      {
-        "custom": {
-          "calc": "lastNotNull",
-          "colorMode": "value",
-          "displayMode": "seriesToRows",
-          "showHeader": true
-        },
-        "id": "8837a52e-c9eb-4afa-acc1-c3a5dac72d3b",
-        "layout": {
-          "h": 7,
-          "i": "8837a52e-c9eb-4afa-acc1-c3a5dac72d3b",
-          "isResizable": true,
-          "w": 12,
-          "x": 0,
-          "y": 19
-        },
-        "name": "Partitions per Topic",
-        "options": {
-          "standardOptions": {}
-        },
-        "overrides": [
-          {}
-        ],
-        "targets": [
-          {
-            "expr": "kafka_topic_partitions{cluster=\"$cluster\"}",
-            "legend": "{{topic}}",
-            "refId": "A"
-          }
-        ],
-        "type": "table",
-        "version": "2.0.0",
-        "datasourceCate": "prometheus",
-        "datasourceValue": "${datasource}"
-      },
-      {
-        "custom": {
-          "calc": "lastNotNull",
-          "colorMode": "value",
-          "displayMode": "seriesToRows",
-          "showHeader": true
-        },
-        "description": "副本不同步预案\n1. Restart the Zookeeper leader.\n2. Restart the broker\\brokers that are not replicating some of the partitions.",
-        "id": "dd615767-dda7-4da6-b37f-0d484553aac6",
-        "layout": {
-          "h": 7,
-          "i": "dd615767-dda7-4da6-b37f-0d484553aac6",
-          "isResizable": true,
-          "w": 12,
-          "x": 12,
-          "y": 19
-        },
-        "name": "Partitions Under Replicated",
-        "options": {
-          "standardOptions": {}
-        },
-        "overrides": [
-          {}
-        ],
-        "targets": [
-          {
-            "expr": "kafka_topic_partition_under_replicated_partition{cluster=\"$cluster\"}",
-            "legend": "{{topic}}-{{partition}}",
-            "refId": "A"
-          }
-        ],
-        "type": "table",
-        "version": "2.0.0",
-        "datasourceCate": "prometheus",
-        "datasourceValue": "${datasource}"
-      }
-    ],
-    "var": [
-      {
-        "name": "datasource",
-        "type": "datasource",
-        "definition": "prometheus"
-      },
-      {
-        "definition": "label_values(kafka_brokers,  cluster)",
-        "name": "cluster",
-        "type": "query",
-        "datasource": {
-          "cate": "prometheus",
-          "value": "${datasource}"
-        }
-      }
-    ],
-    "version": "3.0.0"
-  }
-}
+        "version": "3.0.0"
+    },
+    "public": 0,
+    "public_cate": 0,
+    "bgids": null,
+    "built_in": 0,
+    "hide": 0,
+    "uuid": 1717556327571507000
+}

integrations/Kafka/dashboards/kafka_by_exporter.json

@@ -1,7 +1,13 @@
 {
+    "id": 0,
+    "group_id": 0,
     "name": "Kafka - exporter",
-    "tags": "Kafka Prometheus ",
     "ident": "",
+    "tags": "Kafka Prometheus ",
+    "create_at": 0,
+    "create_by": "",
+    "update_at": 0,
+    "update_by": "",
     "configs": {
         "panels": [
             {
@@ -27,6 +33,8 @@
                         "value": 50
                     }
                 },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${prom}",
                 "id": "ed68dc7b-4f01-4aef-ab10-20158aadfab7",
                 "layout": {
                     "h": 3,
@@ -46,9 +54,7 @@
                     }
                 ],
                 "type": "stat",
-                "version": "2.0.0",
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${prom}"
+                "version": "2.0.0"
             },
             {
                 "custom": {
@@ -60,6 +66,8 @@
                         "value": 50
                     }
                 },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${prom}",
                 "id": "3678c9d7-cb0a-4114-a0cd-7a06b976f6b8",
                 "layout": {
                     "h": 3,
@@ -79,9 +87,7 @@
                     }
                 ],
                 "type": "stat",
-                "version": "2.0.0",
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${prom}"
+                "version": "2.0.0"
             },
             {
                 "custom": {
@@ -93,6 +99,8 @@
                         "value": 50
                     }
                 },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${prom}",
                 "id": "8adb0df0-13bc-452a-ac63-209ae3748d77",
                 "layout": {
                     "h": 3,
@@ -112,9 +120,7 @@
                     }
                 ],
                 "type": "stat",
-                "version": "2.0.0",
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${prom}"
+                "version": "2.0.0"
             },
             {
                 "collapsed": true,
@@ -133,11 +139,13 @@
                 "custom": {
                     "drawStyle": "lines",
                     "fillOpacity": 0.3,
+                    "gradientMode": "opacity",
                     "lineInterpolation": "smooth",
-                    "stack": "off",
                     "lineWidth": 2,
-                    "gradientMode": "opacity"
+                    "stack": "off"
                 },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${prom}",
                 "id": "b68719ad-ba54-4326-a956-43acaef10e2e",
                 "layout": {
                     "h": 7,
@@ -164,19 +172,19 @@
                     }
                 ],
                 "type": "timeseries",
-                "version": "2.0.0",
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${prom}"
+                "version": "2.0.0"
             },
             {
                 "custom": {
                     "drawStyle": "lines",
                     "fillOpacity": 0.3,
+                    "gradientMode": "opacity",
                     "lineInterpolation": "smooth",
-                    "stack": "off",
                     "lineWidth": 2,
-                    "gradientMode": "opacity"
+                    "stack": "off"
                 },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${prom}",
                 "id": "bfd08ec7-a539-4c5e-8499-4e5c437b97d7",
                 "layout": {
                     "h": 7,
@@ -206,19 +214,19 @@
                     }
                 ],
                 "type": "timeseries",
-                "version": "2.0.0",
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${prom}"
+                "version": "2.0.0"
             },
             {
                 "custom": {
                     "drawStyle": "lines",
                     "fillOpacity": 0.3,
+                    "gradientMode": "opacity",
                     "lineInterpolation": "smooth",
-                    "stack": "off",
                     "lineWidth": 2,
-                    "gradientMode": "opacity"
+                    "stack": "off"
                 },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${prom}",
                 "id": "9a42427a-0e01-432e-838d-a6baca6c42b2",
                 "layout": {
                     "h": 7,
@@ -245,19 +253,19 @@
                     }
                 ],
                 "type": "timeseries",
-                "version": "2.0.0",
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${prom}"
+                "version": "2.0.0"
             },
             {
                 "custom": {
                     "drawStyle": "lines",
                     "fillOpacity": 0.3,
+                    "gradientMode": "opacity",
                     "lineInterpolation": "smooth",
-                    "stack": "off",
                     "lineWidth": 2,
-                    "gradientMode": "opacity"
+                    "stack": "off"
                 },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${prom}",
                 "id": "7324f196-467b-4590-ae47-d56be683a0c3",
                 "layout": {
                     "h": 7,
@@ -285,9 +293,7 @@
                     }
                 ],
                 "type": "timeseries",
-                "version": "2.0.0",
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${prom}"
+                "version": "2.0.0"
             },
             {
                 "collapsed": true,
@@ -308,6 +314,8 @@
                     "displayMode": "seriesToRows",
                     "showHeader": true
                 },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${prom}",
                 "id": "04d1f6cc-40ec-4584-be17-a4d10cd5b6e9",
                 "layout": {
                     "h": 7,
@@ -331,9 +339,7 @@
                     }
                 ],
                 "type": "table",
-                "version": "2.0.0",
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${prom}"
+                "version": "2.0.0"
             },
             {
                 "custom": {
@@ -341,6 +347,8 @@
                     "displayMode": "seriesToRows",
                     "showHeader": true
                 },
+                "datasourceCate": "prometheus",
+                "datasourceValue": "${prom}",
                 "description": "副本不同步预案\n1. Restart the Zookeeper leader.\n2. Restart the broker\\brokers that are not replicating some of the partitions.",
                 "id": "5b589c1c-fd35-4ce5-8b24-c0e05d307345",
                 "layout": {
@@ -365,36 +373,40 @@
                     }
                 ],
                 "type": "table",
-                "version": "2.0.0",
-                "datasourceCate": "prometheus",
-                "datasourceValue": "${prom}"
+                "version": "2.0.0"
             }
         ],
         "var": [
             {
+                "definition": "prometheus",
                 "name": "prom",
-                "type": "datasource",
-                "definition": "prometheus"
+                "type": "datasource"
             },
             {
+                "datasource": {
+                    "cate": "prometheus",
+                    "value": "${prom}"
+                },
                 "definition": "label_values(kafka_brokers,  instance)",
                 "name": "instance",
-                "type": "query",
-                "datasource": {
-                    "cate": "prometheus",
-                    "value": "${prom}"
-                }
+                "type": "query"
             },
             {
-                "definition": "label_values(kafka_brokers,  job)",
-                "name": "job",
-                "type": "query",
                 "datasource": {
                     "cate": "prometheus",
                     "value": "${prom}"
-                }
+                },
+                "definition": "label_values(kafka_brokers,  job)",
+                "name": "job",
+                "type": "query"
             }
         ],
         "version": "3.0.0"
-    }
-}
+    },
+    "public": 0,
+    "public_cate": 0,
+    "bgids": null,
+    "built_in": 0,
+    "hide": 0,
+    "uuid": 1717556327573482000
+}

integrations/Kafka/metrics/categraf-base.json

@@ -1,56 +1,92 @@
 [
     {
-      "collector": "Categraf",
-      "typ": "Kafka",
-      "name": "Broker 数量",
-      "unit": "none",
-      "note": "",
-      "lang": "zh_CN",
-      "expression": "kafka_brokers"
+        "id": 0,
+        "uuid": 1717556327574937000,
+        "collector": "Categraf",
+        "typ": "Kafka",
+        "name": "Broker 数量",
+        "unit": "none",
+        "note": "",
+        "lang": "zh_CN",
+        "expression": "kafka_brokers",
+        "created_at": 0,
+        "created_by": "",
+        "updated_at": 0,
+        "updated_by": ""
     },
     {
-      "collector": "Categraf",
-      "typ": "Kafka",
-      "name": "Partition 副本不同步的数量",
-      "unit": "none",
-      "note": "",
-      "lang": "zh_CN",
-      "expression": "kafka_topic_partition_under_replicated_partition"
+        "id": 0,
+        "uuid": 1717556327578367000,
+        "collector": "Categraf",
+        "typ": "Kafka",
+        "name": "Partition 副本不同步的数量",
+        "unit": "none",
+        "note": "",
+        "lang": "zh_CN",
+        "expression": "kafka_topic_partition_under_replicated_partition",
+        "created_at": 0,
+        "created_by": "",
+        "updated_at": 0,
+        "updated_by": ""
     },
     {
-      "collector": "Categraf",
-      "typ": "Kafka",
-      "name": "Partition 副本数量",
-      "unit": "none",
-      "note": "",
-      "lang": "zh_CN",
-      "expression": "kafka_topic_partition_replicas"
+        "id": 0,
+        "uuid": 1717556327581728000,
+        "collector": "Categraf",
+        "typ": "Kafka",
+        "name": "Partition 副本数量",
+        "unit": "none",
+        "note": "",
+        "lang": "zh_CN",
+        "expression": "kafka_topic_partition_replicas",
+        "created_at": 0,
+        "created_by": "",
+        "updated_at": 0,
+        "updated_by": ""
     },
     {
-      "collector": "Categraf",
-      "typ": "Kafka",
-      "name": "各个 Topic 每秒消费消息量",
-      "unit": "none",
-      "note": "",
-      "lang": "zh_CN",
-      "expression": "sum(irate(kafka_consumergroup_current_offset[3m])) without (partition)"
+        "id": 0,
+        "uuid": 1717556327584595000,
+        "collector": "Categraf",
+        "typ": "Kafka",
+        "name": "各个 Topic 每秒消费消息量",
+        "unit": "none",
+        "note": "",
+        "lang": "zh_CN",
+        "expression": "sum(irate(kafka_consumergroup_current_offset[3m])) without (partition)",
+        "created_at": 0,
+        "created_by": "",
+        "updated_at": 0,
+        "updated_by": ""
     },
     {
-      "collector": "Categraf",
-      "typ": "Kafka",
-      "name": "各个 Topic 每秒生产消息量",
-      "unit": "none",
-      "note": "",
-      "lang": "zh_CN",
-      "expression": "sum(irate(kafka_topic_partition_current_offset[3m])) without (partition)"
+        "id": 0,
+        "uuid": 1717556327590335000,
+        "collector": "Categraf",
+        "typ": "Kafka",
+        "name": "各个 Topic 每秒生产消息量",
+        "unit": "none",
+        "note": "",
+        "lang": "zh_CN",
+        "expression": "sum(irate(kafka_topic_partition_current_offset[3m])) without (partition)",
+        "created_at": 0,
+        "created_by": "",
+        "updated_at": 0,
+        "updated_by": ""
     },
     {
-      "collector": "Categraf",
-      "typ": "Kafka",
-      "name": "各个 Topic 的 Partition 数量",
-      "unit": "none",
-      "note": "",
-      "lang": "zh_CN",
-      "expression": "kafka_topic_partitions"
+        "id": 0,
+        "uuid": 1717556327592951000,
+        "collector": "Categraf",
+        "typ": "Kafka",
+        "name": "各个 Topic 的 Partition 数量",
+        "unit": "none",
+        "note": "",
+        "lang": "zh_CN",
+        "expression": "kafka_topic_partitions",
+        "created_at": 0,
+        "created_by": "",
+        "updated_at": 0,
+        "updated_by": ""
     }
-  ]
+]

integrations/Kubernetes/alerts/apiserver.json

@@ -1,266 +1,482 @@
 [
-  {
-    "name": "KubeClientCertificateExpiration-S2",
-    "note": "A client certificate used to authenticate to the apiserver is expiring in less than 7.0 days.",
-    "severity": 2,
-    "disabled": 0,
-    "prom_for_duration": 0,
-    "prom_ql": "apiserver_client_certificate_expiration_seconds_count{job=\"apiserver\"} > 0 and on(job) histogram_quantile(0.01, sum by (job, le) (rate(apiserver_client_certificate_expiration_seconds_bucket{job=\"apiserver\"}[5m]))) < 604800\n",
-    "prom_eval_interval": 15,
-    "enable_stime": "00:00",
-    "enable_etime": "23:59",
-    "enable_days_of_week": [
-      "1",
-      "2",
-      "3",
-      "4",
-      "5",
-      "6",
-      "0"
-    ],
-    "enable_in_bg": 0,
-    "notify_recovered": 1,
-    "notify_channels": [],
-    "notify_repeat_step": 60,
-    "recover_duration": 0,
-    "callbacks": [],
-    "runbook_url": "",
-    "append_tags": []
-  },
-  {
-    "name": "KubeClientCertificateExpiration-S1",
-    "note": "A client certificate used to authenticate to the apiserver is expiring in less than 24.0 hours.",
-    "severity": 1,
-    "disabled": 0,
-    "prom_for_duration": 0,
-    "prom_ql": "apiserver_client_certificate_expiration_seconds_count{job=\"apiserver\"} > 0 and on(job) histogram_quantile(0.01, sum by (job, le) (rate(apiserver_client_certificate_expiration_seconds_bucket{job=\"apiserver\"}[5m]))) < 86400\n",
-    "prom_eval_interval": 15,
-    "enable_stime": "00:00",
-    "enable_etime": "23:59",
-    "enable_days_of_week": [
-      "1",
-      "2",
-      "3",
-      "4",
-      "5",
-      "6",
-      "0"
-    ],
-    "enable_in_bg": 0,
-    "notify_recovered": 1,
-    "notify_channels": [],
-    "notify_repeat_step": 60,
-    "recover_duration": 0,
-    "callbacks": [],
-    "runbook_url": "",
-    "append_tags": []
-  },
-  {
-    "name": "AggregatedAPIErrors",
-    "note": "An aggregated API {{ $labels.name }}/{{ $labels.namespace }} has reported errors. The number of errors have increased for it in the past five minutes. High values indicate that the availability of the service changes too often.",
-    "severity": 2,
-    "disabled": 0,
-    "prom_for_duration": 0,
-    "prom_ql": "sum by(name, namespace)(increase(aggregator_unavailable_apiservice_count[5m])) > 2\n",
-    "prom_eval_interval": 15,
-    "enable_stime": "00:00",
-    "enable_etime": "23:59",
-    "enable_days_of_week": [
-      "1",
-      "2",
-      "3",
-      "4",
-      "5",
-      "6",
-      "0"
-    ],
-    "enable_in_bg": 0,
-    "notify_recovered": 1,
-    "notify_channels": [],
-    "notify_repeat_step": 60,
-    "recover_duration": 0,
-    "callbacks": [],
-    "runbook_url": "",
-    "append_tags": []
-  },
-  {
-    "name": "AggregatedAPIDown",
-    "note": "An aggregated API {{ $labels.name }}/{{ $labels.namespace }} has been only {{ $value | humanize }}% available over the last 10m.",
-    "severity": 2,
-    "disabled": 0,
-    "prom_for_duration": 300,
-    "prom_ql": "(1 - max by(name, namespace)(avg_over_time(aggregator_unavailable_apiservice[10m]))) * 100 < 85\n",
-    "prom_eval_interval": 15,
-    "enable_stime": "00:00",
-    "enable_etime": "23:59",
-    "enable_days_of_week": [
-      "1",
-      "2",
-      "3",
-      "4",
-      "5",
-      "6",
-      "0"
-    ],
-    "enable_in_bg": 0,
-    "notify_recovered": 1,
-    "notify_channels": [],
-    "notify_repeat_step": 60,
-    "recover_duration": 0,
-    "callbacks": [],
-    "runbook_url": "",
-    "append_tags": []
-  },
-  {
-    "name": "KubeAPIDown",
-    "note": "KubeAPI has disappeared from Prometheus target discovery.",
-    "severity": 1,
-    "disabled": 0,
-    "prom_for_duration": 900,
-    "prom_ql": "absent(up{job=\"apiserver\"} == 1)\n",
-    "prom_eval_interval": 15,
-    "enable_stime": "00:00",
-    "enable_etime": "23:59",
-    "enable_days_of_week": [
-      "1",
-      "2",
-      "3",
-      "4",
-      "5",
-      "6",
-      "0"
-    ],
-    "enable_in_bg": 0,
-    "notify_recovered": 1,
-    "notify_channels": [],
-    "notify_repeat_step": 60,
-    "recover_duration": 0,
-    "callbacks": [],
-    "runbook_url": "",
-    "append_tags": []
-  },
-  {
-    "name": "KubeAPIErrorBudgetBurn-S1-120秒",
-    "note": "The API server is burning too much error budget.",
-    "severity": 1,
-    "disabled": 0,
-    "prom_for_duration": 120,
-    "prom_ql": "sum(apiserver_request:burnrate1h) > (14.40 * 0.01000)\nand\nsum(apiserver_request:burnrate5m) > (14.40 * 0.01000)\n",
-    "prom_eval_interval": 15,
-    "enable_stime": "00:00",
-    "enable_etime": "23:59",
-    "enable_days_of_week": [
-      "1",
-      "2",
-      "3",
-      "4",
-      "5",
-      "6",
-      "0"
-    ],
-    "enable_in_bg": 0,
-    "notify_recovered": 1,
-    "notify_channels": [],
-    "notify_repeat_step": 60,
-    "recover_duration": 0,
-    "callbacks": [],
-    "runbook_url": "",
-    "append_tags": [
-      "long=1h",
-      "short=5m"
-    ]
-  },
-  {
-    "name": "KubeAPIErrorBudgetBurn-S1-900秒",
-    "note": "The API server is burning too much error budget.",
-    "severity": 1,
-    "disabled": 0,
-    "prom_for_duration": 900,
-    "prom_ql": "sum(apiserver_request:burnrate6h) > (6.00 * 0.01000)\nand\nsum(apiserver_request:burnrate30m) > (6.00 * 0.01000)\n",
-    "prom_eval_interval": 15,
-    "enable_stime": "00:00",
-    "enable_etime": "23:59",
-    "enable_days_of_week": [
-      "1",
-      "2",
-      "3",
-      "4",
-      "5",
-      "6",
-      "0"
-    ],
-    "enable_in_bg": 0,
-    "notify_recovered": 1,
-    "notify_channels": [],
-    "notify_repeat_step": 60,
-    "recover_duration": 0,
-    "callbacks": [],
-    "runbook_url": "",
-    "append_tags": [
-      "long=6h",
-      "short=30m"
-    ]
-  },
-  {
-    "name": "KubeAPIErrorBudgetBurn-S2-3600秒",
-    "note": "The API server is burning too much error budget.",
-    "severity": 2,
-    "disabled": 0,
-    "prom_for_duration": 3600,
-    "prom_ql": "sum(apiserver_request:burnrate1d) > (3.00 * 0.01000)\nand\nsum(apiserver_request:burnrate2h) > (3.00 * 0.01000)\n",
-    "prom_eval_interval": 15,
-    "enable_stime": "00:00",
-    "enable_etime": "23:59",
-    "enable_days_of_week": [
-      "1",
-      "2",
-      "3",
-      "4",
-      "5",
-      "6",
-      "0"
-    ],
-    "enable_in_bg": 0,
-    "notify_recovered": 1,
-    "notify_channels": [],
-    "notify_repeat_step": 60,
-    "recover_duration": 0,
-    "callbacks": [],
-    "runbook_url": "",
-    "append_tags": [
-      "long=1d",
-      "short=2h"
-    ]
-  },
-  {
-    "name": "KubeAPIErrorBudgetBurn-S2-10800秒",
-    "note": "The API server is burning too much error budget.",
-    "severity": 2,
-    "disabled": 0,
-    "prom_for_duration": 10800,
-    "prom_ql": "sum(apiserver_request:burnrate3d) > (1.00 * 0.01000)\nand\nsum(apiserver_request:burnrate6h) > (1.00 * 0.01000)\n",
-    "prom_eval_interval": 15,
-    "enable_stime": "00:00",
-    "enable_etime": "23:59",
-    "enable_days_of_week": [
-      "1",
-      "2",
-      "3",
-      "4",
-      "5",
-      "6",
-      "0"
-    ],
-    "enable_in_bg": 0,
-    "notify_recovered": 1,
-    "notify_channels": [],
-    "notify_repeat_step": 60,
-    "recover_duration": 0,
-    "callbacks": [],
-    "runbook_url": "",
-    "append_tags": [
-      "long=3d",
-      "short=6h"
-    ]
-  }
+    {
+        "id": 0,
+        "group_id": 0,
+        "cate": "",
+        "datasource_ids": null,
+        "cluster": "",
+        "name": "KubeClientCertificateExpiration-S2",
+        "note": "A client certificate used to authenticate to the apiserver is expiring in less than 7.0 days.",
+        "prod": "",
+        "algorithm": "",
+        "algo_params": null,
+        "delay": 0,
+        "severity": 2,
+        "severities": null,
+        "disabled": 0,
+        "prom_for_duration": 0,
+        "prom_ql": "apiserver_client_certificate_expiration_seconds_count{job=\"apiserver\"} \u003e 0 and on(job) histogram_quantile(0.01, sum by (job, le) (rate(apiserver_client_certificate_expiration_seconds_bucket{job=\"apiserver\"}[5m]))) \u003c 604800\n",
+        "rule_config": null,
+        "prom_eval_interval": 15,
+        "enable_stime": "00:00",
+        "enable_stimes": null,
+        "enable_etime": "23:59",
+        "enable_etimes": null,
+        "enable_days_of_week": [
+            "1",
+            "2",
+            "3",
+            "4",
+            "5",
+            "6",
+            "0"
+        ],
+        "enable_days_of_weeks": null,
+        "enable_in_bg": 0,
+        "notify_recovered": 1,
+        "notify_channels": [],
+        "notify_groups_obj": null,
+        "notify_groups": null,
+        "notify_repeat_step": 60,
+        "notify_max_number": 0,
+        "recover_duration": 0,
+        "callbacks": [],
+        "runbook_url": "",
+        "append_tags": [],
+        "annotations": null,
+        "extra_config": null,
+        "create_at": 0,
+        "create_by": "",
+        "update_at": 0,
+        "update_by": "",
+        "uuid": 1717556327602560000
+    },
+    {
+        "id": 0,
+        "group_id": 0,
+        "cate": "",
+        "datasource_ids": null,
+        "cluster": "",
+        "name": "KubeClientCertificateExpiration-S1",
+        "note": "A client certificate used to authenticate to the apiserver is expiring in less than 24.0 hours.",
+        "prod": "",
+        "algorithm": "",
+        "algo_params": null,
+        "delay": 0,
+        "severity": 1,
+        "severities": null,
+        "disabled": 0,
+        "prom_for_duration": 0,
+        "prom_ql": "apiserver_client_certificate_expiration_seconds_count{job=\"apiserver\"} \u003e 0 and on(job) histogram_quantile(0.01, sum by (job, le) (rate(apiserver_client_certificate_expiration_seconds_bucket{job=\"apiserver\"}[5m]))) \u003c 86400\n",
+        "rule_config": null,
+        "prom_eval_interval": 15,
+        "enable_stime": "00:00",
+        "enable_stimes": null,
+        "enable_etime": "23:59",
+        "enable_etimes": null,
+        "enable_days_of_week": [
+            "1",
+            "2",
+            "3",
+            "4",
+            "5",
+            "6",
+            "0"
+        ],
+        "enable_days_of_weeks": null,
+        "enable_in_bg": 0,
+        "notify_recovered": 1,
+        "notify_channels": [],
+        "notify_groups_obj": null,
+        "notify_groups": null,
+        "notify_repeat_step": 60,
+        "notify_max_number": 0,
+        "recover_duration": 0,
+        "callbacks": [],
+        "runbook_url": "",
+        "append_tags": [],
+        "annotations": null,
+        "extra_config": null,
+        "create_at": 0,
+        "create_by": "",
+        "update_at": 0,
+        "update_by": "",
+        "uuid": 1717556327603535000
+    },
+    {
+        "id": 0,
+        "group_id": 0,
+        "cate": "",
+        "datasource_ids": null,
+        "cluster": "",
+        "name": "AggregatedAPIErrors",
+        "note": "An aggregated API {{ $labels.name }}/{{ $labels.namespace }} has reported errors. The number of errors have increased for it in the past five minutes. High values indicate that the availability of the service changes too often.",
+        "prod": "",
+        "algorithm": "",
+        "algo_params": null,
+        "delay": 0,
+        "severity": 2,
+        "severities": null,
+        "disabled": 0,
+        "prom_for_duration": 0,
+        "prom_ql": "sum by(name, namespace)(increase(aggregator_unavailable_apiservice_count[5m])) \u003e 2\n",
+        "rule_config": null,
+        "prom_eval_interval": 15,
+        "enable_stime": "00:00",
+        "enable_stimes": null,
+        "enable_etime": "23:59",
+        "enable_etimes": null,
+        "enable_days_of_week": [
+            "1",
+            "2",
+            "3",
+            "4",
+            "5",
+            "6",
+            "0"
+        ],
+        "enable_days_of_weeks": null,
+        "enable_in_bg": 0,
+        "notify_recovered": 1,
+        "notify_channels": [],
+        "notify_groups_obj": null,
+        "notify_groups": null,
+        "notify_repeat_step": 60,
+        "notify_max_number": 0,
+        "recover_duration": 0,
+        "callbacks": [],
+        "runbook_url": "",
+        "append_tags": [],
+        "annotations": null,
+        "extra_config": null,
+        "create_at": 0,
+        "create_by": "",
+        "update_at": 0,
+        "update_by": "",
+        "uuid": 1717556327604347000
+    },
+    {
+        "id": 0,
+        "group_id": 0,
+        "cate": "",
+        "datasource_ids": null,
+        "cluster": "",
+        "name": "AggregatedAPIDown",
+        "note": "An aggregated API {{ $labels.name }}/{{ $labels.namespace }} has been only {{ $value | humanize }}% available over the last 10m.",
+        "prod": "",
+        "algorithm": "",
+        "algo_params": null,
+        "delay": 0,
+        "severity": 2,
+        "severities": null,
+        "disabled": 0,
+        "prom_for_duration": 300,
+        "prom_ql": "(1 - max by(name, namespace)(avg_over_time(aggregator_unavailable_apiservice[10m]))) * 100 \u003c 85\n",
+        "rule_config": null,
+        "prom_eval_interval": 15,
+        "enable_stime": "00:00",
+        "enable_stimes": null,
+        "enable_etime": "23:59",
+        "enable_etimes": null,
+        "enable_days_of_week": [
+            "1",
+            "2",
+            "3",
+            "4",
+            "5",
+            "6",
+            "0"
+        ],
+        "enable_days_of_weeks": null,
+        "enable_in_bg": 0,
+        "notify_recovered": 1,
+        "notify_channels": [],
+        "notify_groups_obj": null,
+        "notify_groups": null,
+        "notify_repeat_step": 60,
+        "notify_max_number": 0,
+        "recover_duration": 0,
+        "callbacks": [],
+        "runbook_url": "",
+        "append_tags": [],
+        "annotations": null,
+        "extra_config": null,
+        "create_at": 0,
+        "create_by": "",
+        "update_at": 0,
+        "update_by": "",
+        "uuid": 1717556327605135000
+    },
+    {
+        "id": 0,
+        "group_id": 0,
+        "cate": "",
+        "datasource_ids": null,
+        "cluster": "",
+        "name": "KubeAPIDown",
+        "note": "KubeAPI has disappeared from Prometheus target discovery.",
+        "prod": "",
+        "algorithm": "",
+        "algo_params": null,
+        "delay": 0,
+        "severity": 1,
+        "severities": null,
+        "disabled": 0,
+        "prom_for_duration": 900,
+        "prom_ql": "absent(up{job=\"apiserver\"} == 1)\n",
+        "rule_config": null,
+        "prom_eval_interval": 15,
+        "enable_stime": "00:00",
+        "enable_stimes": null,
+        "enable_etime": "23:59",
+        "enable_etimes": null,
+        "enable_days_of_week": [
+            "1",
+            "2",
+            "3",
+            "4",
+            "5",
+            "6",
+            "0"
+        ],
+        "enable_days_of_weeks": null,
+        "enable_in_bg": 0,
+        "notify_recovered": 1,
+        "notify_channels": [],
+        "notify_groups_obj": null,
+        "notify_groups": null,
+        "notify_repeat_step": 60,
+        "notify_max_number": 0,
+        "recover_duration": 0,
+        "callbacks": [],
+        "runbook_url": "",
+        "append_tags": [],
+        "annotations": null,
+        "extra_config": null,
+        "create_at": 0,
+        "create_by": "",
+        "update_at": 0,
+        "update_by": "",
+        "uuid": 1717556327606255000
+    },
+    {
+        "id": 0,
+        "group_id": 0,
+        "cate": "",
+        "datasource_ids": null,
+        "cluster": "",
+        "name": "KubeAPIErrorBudgetBurn-S1-120秒",
+        "note": "The API server is burning too much error budget.",
+        "prod": "",
+        "algorithm": "",
+        "algo_params": null,
+        "delay": 0,
+        "severity": 1,
+        "severities": null,
+        "disabled": 0,
+        "prom_for_duration": 120,
+        "prom_ql": "sum(apiserver_request:burnrate1h) \u003e (14.40 * 0.01000)\nand\nsum(apiserver_request:burnrate5m) \u003e (14.40 * 0.01000)\n",
+        "rule_config": null,
+        "prom_eval_interval": 15,
+        "enable_stime": "00:00",
+        "enable_stimes": null,
+        "enable_etime": "23:59",
+        "enable_etimes": null,
+        "enable_days_of_week": [
+            "1",
+            "2",
+            "3",
+            "4",
+            "5",
+            "6",
+            "0"
+        ],
+        "enable_days_of_weeks": null,
+        "enable_in_bg": 0,
+        "notify_recovered": 1,
+        "notify_channels": [],
+        "notify_groups_obj": null,
+        "notify_groups": null,
+        "notify_repeat_step": 60,
+        "notify_max_number": 0,
+        "recover_duration": 0,
+        "callbacks": [],
+        "runbook_url": "",
+        "append_tags": [
+            "long=1h",
+            "short=5m"
+        ],
+        "annotations": null,
+        "extra_config": null,
+        "create_at": 0,
+        "create_by": "",
+        "update_at": 0,
+        "update_by": "",
+        "uuid": 1717556327608028000
+    },
+    {
+        "id": 0,
+        "group_id": 0,
+        "cate": "",
+        "datasource_ids": null,
+        "cluster": "",
+        "name": "KubeAPIErrorBudgetBurn-S1-900秒",
+        "note": "The API server is burning too much error budget.",
+        "prod": "",
+        "algorithm": "",
+        "algo_params": null,
+        "delay": 0,
+        "severity": 1,
+        "severities": null,
+        "disabled": 0,
+        "prom_for_duration": 900,
+        "prom_ql": "sum(apiserver_request:burnrate6h) \u003e (6.00 * 0.01000)\nand\nsum(apiserver_request:burnrate30m) \u003e (6.00 * 0.01000)\n",
+        "rule_config": null,
+        "prom_eval_interval": 15,
+        "enable_stime": "00:00",
+        "enable_stimes": null,
+        "enable_etime": "23:59",
+        "enable_etimes": null,
+        "enable_days_of_week": [
+            "1",
+            "2",
+            "3",
+            "4",
+            "5",
+            "6",
+            "0"
+        ],
+        "enable_days_of_weeks": null,
+        "enable_in_bg": 0,
+        "notify_recovered": 1,
+        "notify_channels": [],
+        "notify_groups_obj": null,
+        "notify_groups": null,
+        "notify_repeat_step": 60,
+        "notify_max_number": 0,
+        "recover_duration": 0,
+        "callbacks": [],
+        "runbook_url": "",
+        "append_tags": [
+            "long=6h",
+            "short=30m"
+        ],
+        "annotations": null,
+        "extra_config": null,
+        "create_at": 0,
+        "create_by": "",
+        "update_at": 0,
+        "update_by": "",
+        "uuid": 1717556327608676000
+    },
+    {
+        "id": 0,
+        "group_id": 0,
+        "cate": "",
+        "datasource_ids": null,
+        "cluster": "",
+        "name": "KubeAPIErrorBudgetBurn-S2-3600秒",
+        "note": "The API server is burning too much error budget.",
+        "prod": "",
+        "algorithm": "",
+        "algo_params": null,
+        "delay": 0,
+        "severity": 2,
+        "severities": null,
+        "disabled": 0,
+        "prom_for_duration": 3600,
+        "prom_ql": "sum(apiserver_request:burnrate1d) \u003e (3.00 * 0.01000)\nand\nsum(apiserver_request:burnrate2h) \u003e (3.00 * 0.01000)\n",
+        "rule_config": null,
+        "prom_eval_interval": 15,
+        "enable_stime": "00:00",
+        "enable_stimes": null,
+        "enable_etime": "23:59",
+        "enable_etimes": null,
+        "enable_days_of_week": [
+            "1",
+            "2",
+            "3",
+            "4",
+            "5",
+            "6",
+            "0"
+        ],
+        "enable_days_of_weeks": null,
+        "enable_in_bg": 0,
+        "notify_recovered": 1,
+        "notify_channels": [],
+        "notify_groups_obj": null,
+        "notify_groups": null,
+        "notify_repeat_step": 60,
+        "notify_max_number": 0,
+        "recover_duration": 0,
+        "callbacks": [],
+        "runbook_url": "",
+        "append_tags": [
+            "long=1d",
+            "short=2h"
+        ],
+        "annotations": null,
+        "extra_config": null,
+        "create_at": 0,
+        "create_by": "",
+        "update_at": 0,
+        "update_by": "",
+        "uuid": 1717556327609366000
+    },
+    {
+        "id": 0,
+        "group_id": 0,
+        "cate": "",
+        "datasource_ids": null,
+        "cluster": "",
+        "name": "KubeAPIErrorBudgetBurn-S2-10800秒",
+        "note": "The API server is burning too much error budget.",
+        "prod": "",
+        "algorithm": "",
+        "algo_params": null,
+        "delay": 0,
+        "severity": 2,
+        "severities": null,
+        "disabled": 0,
+        "prom_for_duration": 10800,
+        "prom_ql": "sum(apiserver_request:burnrate3d) \u003e (1.00 * 0.01000)\nand\nsum(apiserver_request:burnrate6h) \u003e (1.00 * 0.01000)\n",
+        "rule_config": null,
+        "prom_eval_interval": 15,
+        "enable_stime": "00:00",
+        "enable_stimes": null,
+        "enable_etime": "23:59",
+        "enable_etimes": null,
+        "enable_days_of_week": [
+            "1",
+            "2",
+            "3",
+            "4",
+            "5",
+            "6",
+            "0"
+        ],
+        "enable_days_of_weeks": null,
+        "enable_in_bg": 0,
+        "notify_recovered": 1,
+        "notify_channels": [],
+        "notify_groups_obj": null,
+        "notify_groups": null,
+        "notify_repeat_step": 60,
+        "notify_max_number": 0,
+        "recover_duration": 0,
+        "callbacks": [],
+        "runbook_url": "",
+        "append_tags": [
+            "long=3d",
+            "short=6h"
+        ],
+        "annotations": null,
+        "extra_config": null,
+        "create_at": 0,
+        "create_by": "",
+        "update_at": 0,
+        "update_by": "",
+        "uuid": 1717556327609980000
+    }
 ]