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

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

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
}