From dddd00546aacd4567f6c1526231f5babacadde81 Mon Sep 17 00:00:00 2001
From: GoEdgeLab <goedgecloud@gmail.com>
Date: Thu, 13 May 2021 11:50:15 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8A=82=E7=82=B9=E8=AF=A6=E6=83=85=E4=B8=AD?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=BC=93=E5=AD=98=E7=94=A8=E9=87=8F=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../default/clusters/cluster/node/node.go     | 31 ++++++++++---------
 .../@default/clusters/cluster/node/node.html  | 23 +++++++-------
 2 files changed, 28 insertions(+), 26 deletions(-)

diff --git a/internal/web/actions/default/clusters/cluster/node/node.go b/internal/web/actions/default/clusters/cluster/node/node.go
index 35b3e915..8fbc9f29 100644
--- a/internal/web/actions/default/clusters/cluster/node/node.go
+++ b/internal/web/actions/default/clusters/cluster/node/node.go
@@ -3,6 +3,7 @@ package node
 import (
 	"encoding/json"
 	"fmt"
+	"github.com/TeaOSLab/EdgeAdmin/internal/utils/numberutils"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/clusters/grants/grantutils"
 	"github.com/TeaOSLab/EdgeCommon/pkg/nodeconfigs"
@@ -226,20 +227,22 @@ func (this *NodeAction) RunGet(params struct {
 		"isOn":        node.IsOn,
 
 		"status": maps.Map{
-			"isActive":         status.IsActive,
-			"updatedAt":        status.UpdatedAt,
-			"hostname":         status.Hostname,
-			"cpuUsage":         status.CPUUsage,
-			"cpuUsageText":     fmt.Sprintf("%.2f%%", status.CPUUsage*100),
-			"memUsage":         status.MemoryUsage,
-			"memUsageText":     fmt.Sprintf("%.2f%%", status.MemoryUsage*100),
-			"connectionCount":  status.ConnectionCount,
-			"buildVersion":     status.BuildVersion,
-			"cpuPhysicalCount": status.CPUPhysicalCount,
-			"cpuLogicalCount":  status.CPULogicalCount,
-			"load1m":           fmt.Sprintf("%.2f", status.Load1m),
-			"load5m":           fmt.Sprintf("%.2f", status.Load5m),
-			"load15m":          fmt.Sprintf("%.2f", status.Load15m),
+			"isActive":             status.IsActive,
+			"updatedAt":            status.UpdatedAt,
+			"hostname":             status.Hostname,
+			"cpuUsage":             status.CPUUsage,
+			"cpuUsageText":         fmt.Sprintf("%.2f%%", status.CPUUsage*100),
+			"memUsage":             status.MemoryUsage,
+			"memUsageText":         fmt.Sprintf("%.2f%%", status.MemoryUsage*100),
+			"connectionCount":      status.ConnectionCount,
+			"buildVersion":         status.BuildVersion,
+			"cpuPhysicalCount":     status.CPUPhysicalCount,
+			"cpuLogicalCount":      status.CPULogicalCount,
+			"load1m":               fmt.Sprintf("%.2f", status.Load1m),
+			"load5m":               fmt.Sprintf("%.2f", status.Load5m),
+			"load15m":              fmt.Sprintf("%.2f", status.Load15m),
+			"cacheTotalDiskSize":   numberutils.FormatBytes(status.CacheTotalDiskSize),
+			"cacheTotalMemorySize": numberutils.FormatBytes(status.CacheTotalMemorySize),
 		},
 
 		"group":  groupMap,
diff --git a/web/views/@default/clusters/cluster/node/node.html b/web/views/@default/clusters/cluster/node/node.html
index 921aaa40..bd5039b6 100644
--- a/web/views/@default/clusters/cluster/node/node.html
+++ b/web/views/@default/clusters/cluster/node/node.html
@@ -165,7 +165,7 @@
 		<tbody v-show="node.status.isActive">
 			<tr>
 				<td>CPU用量</td>
-				<td>{{node.status.cpuUsageText}}</td>
+				<td>{{node.status.cpuUsageText}} &nbsp; <span v-if="node.status.cpuPhysicalCount > 0" class="small grey">（{{node.status.cpuPhysicalCount}}核心/{{node.status.cpuLogicalCount}}线程）</span></td>
 			</tr>
 			<tr>
 				<td>内存用量</td>
@@ -175,22 +175,21 @@
 				<td>连接数</td>
 				<td>{{node.status.connectionCount}}</td>
 			</tr>
+            <tr>
+                <td>负载</td>
+                <td>{{node.status.load1m}} &nbsp; {{node.status.load5m}} &nbsp; {{node.status.load15m}} &nbsp; <tip-icon content="三个数字分别代表1分钟、5分钟、15分钟平均负载"></tip-icon></td>
+            </tr>
+            <tr>
+                <td>缓存用量</td>
+                <td>
+                    磁盘：{{node.status.cacheTotalDiskSize}}  &nbsp; 内存：{{node.status.cacheTotalMemorySize}}
+                </td>
+            </tr>
             <tr>
                 <td>版本</td>
                 <td>v{{node.status.buildVersion}}
                     &nbsp; <a :href="'/clusters/cluster/upgradeRemote?clusterId=' + clusterId" v-if="shouldUpgrade"><span class="red">发现新版本v{{newVersion}} &raquo;</span></a>
                 </td>
-            </tr>
-            <tr>
-                <td>CPU</td>
-                <td>
-                    <span v-if="node.status.cpuPhysicalCount > 0">{{node.status.cpuPhysicalCount}}核心/{{node.status.cpuLogicalCount}}线程</span>
-                    <span v-else class="disabled">-/-</span>
-                </td>
-            </tr>
-            <tr>
-                <td>负载</td>
-                <td>{{node.status.load1m}} &nbsp; {{node.status.load5m}} &nbsp; {{node.status.load15m}} &nbsp; <tip-icon content="三个数字分别代表1分钟、5分钟、15分钟平均负载"></tip-icon></td>
             </tr>
 		</tbody>
 	</table>