floraachy
/
pcm-coordinator
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

alert 

Former-commit-id: b59e446af73f3fdbdfc9bcff0f7a6beaf6bac935
This commit is contained in:
zhangwei 2024-04-08 09:16:52 +08:00
parent a46bd191d0
commit 2929b6e0f3
5 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/desc/monitoring/pcm-monitoring.api
View File

@ -33,6 +33,8 @@ type (
Metrics string `form:"metrics"`
}
nodesLoadTopResp {
code int `json:"code"`
data interface{} `json:"data"`
msg string `json:"msg"`
}
)

7
api/internal/handler/monitoring/nodesloadtophandler.go
View File

@ -1,6 +1,7 @@
package monitoring
import (
"gitlink.org.cn/JointCloud/pcm-coordinator/pkg/repository/result"
"net/http"
"github.com/zeromicro/go-zero/rest/httpx"
@ -19,10 +20,6 @@ func NodesLoadTopHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
l := monitoring.NewNodesLoadTopLogic(r.Context(), svcCtx)
resp, err := l.NodesLoadTop(&req)
if err != nil {
httpx.ErrorCtx(r.Context(), w, err)
} else {
httpx.OkJsonCtx(r.Context(), w, resp)
}
result.HttpResult(r, w, resp, err)
}
}

4
api/internal/logic/monitoring/alertruleslogic.go
View File

@ -25,6 +25,8 @@ func NewAlertRulesLogic(ctx context.Context, svcCtx *svc.ServiceContext) *AlertR
func (l *AlertRulesLogic) AlertRules() (resp *types.AlertRulesResp, err error) {
resp = &types.AlertRulesResp{}
l.svcCtx.DbEngin.Raw("SELECT ar.id,ar.*,GROUP_CONCAT(tc.`name` ORDER BY tc.`name` ASC SEPARATOR ',') as cluster_name FROM alert_rule ar JOIN t_cluster tc ON ar.cluster_id = tc.id WHERE ar.deleted_at IS NULL AND tc.deleted_at IS NULL GROUP BY ar.id;").Scan(&resp)
var alertRules []types.AlertRule
l.svcCtx.DbEngin.Raw("SELECT ar.id,ar.*,GROUP_CONCAT(tc.`name` ORDER BY tc.`name` ASC SEPARATOR ',') as cluster_name FROM alert_rule ar JOIN t_cluster tc ON ar.cluster_id = tc.id WHERE ar.deleted_at IS NULL AND tc.deleted_at IS NULL GROUP BY ar.id").Scan(&alertRules)
resp.AlertRules = alertRules
return resp, nil
}

2
api/internal/logic/monitoring/nodesloadtoplogic.go
View File

@ -38,7 +38,7 @@ func (l *NodesLoadTopLogic) NodesLoadTop(req *types.NodesLoadTopReq) (resp *type
ForceContentType("application/json").
Get(server + "/api/v1/monitoring/node")
if err != nil || response.IsError() {
return nil, err
}
return resp, nil
}

2
api/internal/types/types.go
View File

@ -5464,5 +5464,7 @@ type NodesLoadTopReq struct {
}
type NodesLoadTopResp struct {
Code int `json:"code"`
Data interface{} `json:"data"`
Msg string `json:"msg"`
}