增加节点停止、启动、安装测试等功能

internal/configs/nodes/node_status.go

@@ -1,26 +0,0 @@
-package nodes
-
-// 节点状态
-type NodeStatus struct {
-	BuildVersion  string `json:"buildVersion"`  // 编译版本
-	ConfigVersion int64  `json:"configVersion"` // 节点配置版本
-
-	Hostname              string  `json:"hostname"`
-	HostIP                string  `json:"hostIP"`
-	CPUUsage              float64 `json:"cpuUsage"`
-	CPULogicalCount       int     `json:"cpuLogicalCount"`
-	CPUPhysicalCount      int     `json:"cpuPhysicalCount"`
-	MemoryUsage           float64 `json:"memoryUsage"`
-	MemoryTotal           uint64  `json:"memoryTotal"`
-	DiskUsage             float64 `json:"diskUsage"`
-	DiskMaxUsage          float64 `json:"diskMaxUsage"`
-	DiskMaxUsagePartition string  `json:"diskMaxUsagePartition"`
-	DiskTotal             uint64  `json:"diskTotal"`
-	UpdatedAt             int64   `json:"updatedAt"`
-	Load1m                float64 `json:"load1m"`
-	Load5m                float64 `json:"load5m"`
-	Load15m               float64 `json:"load15m"`
-
-	IsActive bool   `json:"isActive"`
-	Error    string `json:"error"`
-}

internal/web/actions/default/clusters/cluster/index.go

@@ -3,8 +3,8 @@ package cluster
 import (
 	"encoding/json"
 	"fmt"
-	"github.com/TeaOSLab/EdgeAdmin/internal/configs/nodes"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/nodeconfigs"
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 	"github.com/iwind/TeaGo/logs"
 	"github.com/iwind/TeaGo/maps"
@@ -53,14 +53,14 @@ func (this *IndexAction) RunGet(params struct {
 	for _, node := range nodesResp.Nodes {
 		// 状态
 		isSynced := false
-		status := &nodes.NodeStatus{}
-		if len(node.Status) > 0 && node.Status != "null" {
-			err = json.Unmarshal([]byte(node.Status), &status)
+		status := &nodeconfigs.NodeStatus{}
+		if len(node.StatusJSON) > 0 {
+			err = json.Unmarshal(node.StatusJSON, &status)
 			if err != nil {
 				logs.Error(err)
 				continue
 			}
-			status.IsActive = time.Now().Unix()-status.UpdatedAt <= 60 // N秒之内认为活跃
+			status.IsActive = status.IsActive && time.Now().Unix()-status.UpdatedAt <= 60 // N秒之内认为活跃
 			isSynced = status.ConfigVersion == node.Version
 		}
 

internal/web/actions/default/clusters/cluster/init.go

@@ -29,6 +29,8 @@ func init() {
 			Post("/node/updateInstallStatus", new(node.UpdateInstallStatusAction)).
 			Post("/node/status", new(node.StatusAction)).
 			Get("/node/logs", new(node.LogsAction)).
+			Post("/node/start", new(node.StartAction)).
+			Post("/node/stop", new(node.StopAction)).
 			EndAll()
 	})
 }

internal/web/actions/default/clusters/cluster/node/node.go

@@ -2,10 +2,13 @@ package node
 
 import (
 	"encoding/json"
+	"fmt"
 	"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"
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 	"github.com/iwind/TeaGo/maps"
+	"time"
 )
 
 type NodeAction struct {
@@ -106,6 +109,17 @@ func (this *NodeAction) RunGet(params struct {
 		}
 	}
 
+	// 运行状态
+	status := &nodeconfigs.NodeStatus{}
+	if len(node.StatusJSON) > 0 {
+		err = json.Unmarshal(node.StatusJSON, &status)
+		if err != nil {
+			this.ErrorPage(err)
+			return
+		}
+		status.IsActive = status.IsActive && time.Now().Unix()-status.UpdatedAt <= 60 // N秒之内认为活跃
+	}
+
 	this.Data["node"] = maps.Map{
 		"id":          node.Id,
 		"name":        node.Name,
@@ -118,6 +132,16 @@ func (this *NodeAction) RunGet(params struct {
 		"secret":      node.Secret,
 		"maxCPU":      node.MaxCPU,
 		"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),
+		},
 	}
 
 	this.Show()

internal/web/actions/default/clusters/cluster/node/start.go

@@ -0,0 +1,25 @@
+package node
+
+import (
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
+)
+
+type StartAction struct {
+	actionutils.ParentAction
+}
+
+func (this *StartAction) RunPost(params struct {
+	NodeId int64
+}) {
+	resp, err := this.RPC().NodeRPC().StartNode(this.AdminContext(), &pb.StartNodeRequest{NodeId: params.NodeId})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	if resp.IsOk {
+		this.Success()
+	}
+
+	this.Fail("启动失败：" + resp.Error)
+}

internal/web/actions/default/clusters/cluster/node/stop.go

@@ -0,0 +1,25 @@
+package node
+
+import (
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
+)
+
+type StopAction struct {
+	actionutils.ParentAction
+}
+
+func (this *StopAction) RunPost(params struct {
+	NodeId int64
+}) {
+	resp, err := this.RPC().NodeRPC().StopNode(this.AdminContext(), &pb.StopNodeRequest{NodeId: params.NodeId})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+	if resp.IsOk {
+		this.Success()
+	}
+
+	this.Fail("执行失败：" + resp.Error)
+}