innov
/
nightingale
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

extract promql to webapi.conf

This commit is contained in:
Ulric Qin 2022-08-09 20:01:54 +08:00
parent 49965fd5d5
commit 9b3a9f29d9
4 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
docker/n9eetc/webapi.conf
View File

@ -175,3 +175,8 @@ BasicAuthUser = "ibex"
BasicAuthPass = "ibex" BasicAuthPass = "ibex"
# unit: ms # unit: ms
Timeout = 3000 Timeout = 3000
[TargetMetrics]
TargetUp = "max(max_over_time(target_up{ident=~"(%s)"}[%dm])) by (ident)"
LoadPerCore = "max(max_over_time(system_load_norm_1{ident=~"(%s)"}[%dm])) by (ident)"
MemUtil = "100-max(max_over_time(mem_available_percent{ident=~"(%s)"}[%dm])) by (ident)"

5
etc/webapi.conf
View File

@ -202,3 +202,8 @@ BasicAuthUser = "ibex"
BasicAuthPass = "ibex" BasicAuthPass = "ibex"
# unit: ms # unit: ms
Timeout = 3000 Timeout = 3000
[TargetMetrics]
TargetUp = "max(max_over_time(target_up{ident=~"(%s)"}[%dm])) by (ident)"
LoadPerCore = "max(max_over_time(system_load_norm_1{ident=~"(%s)"}[%dm])) by (ident)"
MemUtil = "100-max(max_over_time(mem_available_percent{ident=~"(%s)"}[%dm])) by (ident)"

1
src/webapi/config/config.go
View File

@ -99,6 +99,7 @@ type Config struct {
Clusters []ClusterOptions Clusters []ClusterOptions
Ibex Ibex Ibex Ibex
OIDC oidcc.Config OIDC oidcc.Config
TargetMetrics map[string]string
} }
type ClusterOptions struct { type ClusterOptions struct {

11
src/webapi/router/router_target.go
View File

@ -13,13 +13,10 @@ import (
"github.com/didi/nightingale/v5/src/models" "github.com/didi/nightingale/v5/src/models"
"github.com/didi/nightingale/v5/src/server/common/conv" "github.com/didi/nightingale/v5/src/server/common/conv"
"github.com/didi/nightingale/v5/src/webapi/config"
"github.com/didi/nightingale/v5/src/webapi/prom" "github.com/didi/nightingale/v5/src/webapi/prom"
) )
var promqlLoadPerCore = `max(max_over_time(system_load_norm_1{ident=~"(%s)"}[%dm])) by (ident)`
var promqlMemUtil = `100-max(max_over_time(mem_available_percent{ident=~"(%s)"}[%dm])) by (ident)`
var promqlTargetUp = `max(max_over_time(target_up{ident=~"(%s)"}[%dm])) by (ident)`
func targetGets(c *gin.Context) { func targetGets(c *gin.Context) {
bgid := ginx.QueryInt64(c, "bgid", -1) bgid := ginx.QueryInt64(c, "bgid", -1)
query := ginx.QueryStr(c, "query", "") query := ginx.QueryStr(c, "query", "")
@ -62,7 +59,7 @@ func targetGets(c *gin.Context) {
} }
// load per core // load per core
promql := fmt.Sprintf(promqlLoadPerCore, strings.Join(targetArr, "|"), mins) promql := fmt.Sprintf(config.C.TargetMetrics["LoadPerCore"], strings.Join(targetArr, "|"), mins)
values, err := instantQuery(c, cc, promql, now) values, err := instantQuery(c, cc, promql, now)
ginx.Dangerous(err) ginx.Dangerous(err)
@ -75,7 +72,7 @@ func targetGets(c *gin.Context) {
} }
// mem util // mem util
promql = fmt.Sprintf(promqlMemUtil, strings.Join(targetArr, "|"), mins) promql = fmt.Sprintf(config.C.TargetMetrics["MemUtil"], strings.Join(targetArr, "|"), mins)
values, err = instantQuery(c, cc, promql, now) values, err = instantQuery(c, cc, promql, now)
ginx.Dangerous(err) ginx.Dangerous(err)
@ -88,7 +85,7 @@ func targetGets(c *gin.Context) {
} }
// target up // target up
promql = fmt.Sprintf(promqlTargetUp, strings.Join(targetArr, "|"), mins) promql = fmt.Sprintf(config.C.TargetMetrics["TargetUp"], strings.Join(targetArr, "|"), mins)
values, err = instantQuery(c, cc, promql, now) values, err = instantQuery(c, cc, promql, now)
ginx.Dangerous(err) ginx.Dangerous(err)