TRKJ/EdgeAPI
2
0
Fork 0
mirror of https://github.com/TeaOSLab/EdgeAPI.git synced 2025-11-14 16:30:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

TCP/UDP服务看板只显示对应的指标图表

Browse Source
This commit is contained in:
刘祥超
2021-10-08 14:59:51 +08:00
parent 42c53b47dc
commit 9a40100fd7
4 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
internal/rpc/services/service_admin.go
View File

@@ -755,7 +755,7 @@ func (this *AdminService) UpdateAdminTheme(ctx context.Context, req *pb.UpdateAd
// 查找集群、节点和服务的指标数据
func (this *AdminService) findMetricDataCharts(tx *dbs.Tx) (result []*pb.MetricDataChart, err error) {
// 集群指标
items, err := models.SharedMetricItemDAO.FindAllPublicItems(tx)
items, err := models.SharedMetricItemDAO.FindAllPublicItems(tx, serverconfigs.MetricItemCategoryHTTP)
if err != nil {
return nil, err
}

16
internal/rpc/services/service_server_stat_board.go
View File

@@ -519,7 +519,19 @@ func (this *ServerStatBoardService) ComposeServerStatBoard(ctx context.Context,
if err != nil {
return nil, err
}
charts, err := this.findNodeClusterMetricDataCharts(tx, clusterId, 0, req.ServerId, serverconfigs.MetricItemCategoryHTTP)
var metricCategory = serverconfigs.MetricItemCategoryHTTP
serverType, err := models.SharedServerDAO.FindEnabledServerType(tx, req.ServerId)
if err != nil {
return nil, err
}
switch serverType {
case serverconfigs.ServerTypeTCPProxy:
metricCategory = serverconfigs.MetricItemCategoryTCP
case serverconfigs.ServerTypeUDPProxy:
metricCategory = serverconfigs.MetricItemCategoryUDP
}
charts, err := this.findNodeClusterMetricDataCharts(tx, clusterId, 0, req.ServerId, metricCategory)
if err != nil {
return nil, err
}
@@ -554,7 +566,7 @@ func (this *ServerStatBoardService) findNodeClusterMetricDataCharts(tx *dbs.Tx,
metricItemIds = append(metricItemIds, itemId)
}
publicMetricItems, err := models.SharedMetricItemDAO.FindAllPublicItems(tx)
publicMetricItems, err := models.SharedMetricItemDAO.FindAllPublicItems(tx, category)
if err != nil {
return nil, err
}