diff --git a/internal/web/actions/default/servers/metrics/stats.go b/internal/web/actions/default/servers/metrics/stats.go index d6c4c89f..b042c494 100644 --- a/internal/web/actions/default/servers/metrics/stats.go +++ b/internal/web/actions/default/servers/metrics/stats.go @@ -3,6 +3,7 @@ package metrics import ( + "fmt" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs" @@ -49,6 +50,12 @@ func (this *StatsAction) RunGet(params struct { } var statMaps = []maps.Map{} for _, stat := range statsResp.MetricStats { + // 占比 + var ratio float32 + if stat.SumTotal > 0 { + ratio = stat.Value * 100 / stat.SumTotal + } + statMaps = append(statMaps, maps.Map{ "id": stat.Id, "time": serverconfigs.HumanMetricTime(item.PeriodUnit, stat.Time), @@ -57,6 +64,7 @@ func (this *StatsAction) RunGet(params struct { "cluster": maps.Map{"id": stat.NodeCluster.Id, "name": stat.NodeCluster.Name}, "node": maps.Map{"id": stat.Node.Id, "name": stat.Node.Name}, "server": maps.Map{"id": stat.Server.Id, "name": stat.Server.Name}, + "ratio": fmt.Sprintf("%.2f", ratio), }) } this.Data["stats"] = statMaps diff --git a/web/views/@default/servers/metrics/stats.html b/web/views/@default/servers/metrics/stats.html index d01e5016..b1f57e54 100644 --- a/web/views/@default/servers/metrics/stats.html +++ b/web/views/@default/servers/metrics/stats.html @@ -8,6 +8,7 @@ 指标对象 指标值 + 占比 时间 集群 节点 @@ -17,6 +18,7 @@ {{stat.keys}} {{stat.value}} + {{stat.ratio}}% {{stat.time}} {{stat.cluster.name}} {{stat.node.name}} diff --git a/web/views/@default/servers/metrics/update.html b/web/views/@default/servers/metrics/update.html index 4723c138..e7905150 100644 --- a/web/views/@default/servers/metrics/update.html +++ b/web/views/@default/servers/metrics/update.html @@ -1,7 +1,7 @@ {$layout "layout"} {$template "item_menu"} -修改统计对象、统计周期、统计数值等参数后,将重新记录数据。 +修改统计对象、统计周期、统计数值等任一参数时,将重新记录数据。