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

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{}
+		status := &nodeconfigs.NodeStatus{}
-		if len(node.Status) > 0 && node.Status != "null" {
+		if len(node.StatusJSON) > 0 {
-			err = json.Unmarshal([]byte(node.Status), &status)
+			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)
+}

web/public/js/components/common/more-options-indicator.js

@@ -16,5 +16,5 @@ Vue.component("more-options-indicator", {
 			this.$emit("change", this.visible)
 		}
 	},
-	template: '<a href="" style="font-weight: normal" @click.prevent="changeVisible()"><span v-if="!visible">更多选项</span><span v-if="visible">收起选项</span> <i class="icon angle" :class="{down:!visible, up:visible}"></i> </a>'
+	template: '<a href="" style="font-weight: normal" @click.prevent="changeVisible()"><slot><span v-if="!visible">更多选项</span><span v-if="visible">收起选项</span></slot> <i class="icon angle" :class="{down:!visible, up:visible}"></i> </a>'
 });

web/views/@default/@layout.css

@@ -104,6 +104,9 @@ span.red,
 pre.red {
   color: #db2828;
 }
+span.blue {
+  color: #4183c4;
+}
 pre:not(.CodeMirror-line) {
   font-family: Lato, 'Helvetica Neue', Arial, Helvetica, sans-serif !important;
 }

web/views/@default/@layout.less

@@ -33,6 +33,10 @@ span.red, pre.red {
 	color: #db2828;
 }
 
+span.blue {
+	color: #4183c4;
+}
+
 pre:not(.CodeMirror-line) {
 	font-family: Lato, 'Helvetica Neue', Arial, Helvetica, sans-serif !important;
 }

web/views/@default/clusters/cluster/index.html

@@ -1,102 +1,102 @@
 {$layout}
 
-	{$template "menu"}
+{$template "menu"}
 
-	<form class="ui form segment" action="/clusters/cluster">
+<form class="ui form segment" action="/clusters/cluster">
-		<input type="hidden" name="clusterId" :value="clusterId"/>
+	<input type="hidden" name="clusterId" :value="clusterId"/>
-		<div class="ui fields inline">
+	<div class="ui fields inline">
-			<div class="ui field">
+		<div class="ui field">
-				安装状态：
+			安装状态：
-			</div>
-			<div class="ui field">
-				<select class="ui dropdown" name="installedState" v-model="installState">
-					<option value="0">[全部]</option>
-					<option value="1">已安装</option>
-					<option value="2">未安装</option>
-				</select>
-			</div>
-			<div class="ui field">
-				在线状态：
-			</div>
-			<div class="ui field">
-				<select class="ui dropdown" name="activeState" v-model="activeState">
-					<option value="0">[全部]</option>
-					<option value="1">在线</option>
-					<option value="2">不在线</option>
-				</select>
-			</div>
-			<div class="ui field">
-				<button class="ui button" type="submit">搜索</button>
-			</div>
 		</div>
-	</form>
+		<div class="ui field">
+			<select class="ui dropdown" name="installedState" v-model="installState">
+				<option value="0">[全部]</option>
+				<option value="1">已安装</option>
+				<option value="2">未安装</option>
+			</select>
+		</div>
+		<div class="ui field">
+			在线状态：
+		</div>
+		<div class="ui field">
+			<select class="ui dropdown" name="activeState" v-model="activeState">
+				<option value="0">[全部]</option>
+				<option value="1">在线</option>
+				<option value="2">不在线</option>
+			</select>
+		</div>
+		<div class="ui field">
+			<button class="ui button" type="submit">搜索</button>
+		</div>
+	</div>
+</form>
 
-	<p class="comment" v-if="nodes.length == 0">暂时还没有节点。</p>
+<p class="comment" v-if="nodes.length == 0">暂时还没有节点。</p>
 
-	<table class="ui table selectable" v-if="nodes.length > 0">
+<table class="ui table selectable" v-if="nodes.length > 0">
-		<thead>
+	<thead>
-		<tr>
+	<tr>
-			<th>ID</th>
+		<th class="one wide">ID</th>
-			<th>节点名称</th>
+		<th>节点名称</th>
-			<th>主机名</th>
+		<th>主机名</th>
-			<th>IP</th>
+		<th>IP</th>
-			<th>CPU</th>
+		<th class="two wide">CPU</th>
-			<th>内存</th>
+		<th class="two wide">内存</th>
-			<!--<th>流量</th>
+		<!--<th>流量</th>
-			<th>连接数</th>-->
+		<th>连接数</th>-->
-			<th>状态</th>
+		<th class="two wide">状态</th>
-			<th class="two op">操作</th>
+		<th class="two op">操作</th>
-		</tr>
+	</tr>
-		</thead>
+	</thead>
-		<tr v-for="node in nodes">
+	<tr v-for="node in nodes">
-			<td>{{node.id}}</td>
+		<td>{{node.id}}</td>
-			<td>{{node.name}}</td>
+		<td>{{node.name}}</td>
-			<td>
+		<td>
-				<span v-if="node.status.hostname != null && node.status.hostname.length > 0">{{node.status.hostname}}</span>
+			<span v-if="node.status.hostname != null && node.status.hostname.length > 0">{{node.status.hostname}}</span>
-				<span v-else>-</span>
+			<span v-else>-</span>
-			</td>
+		</td>
-			<td>
+		<td>
-				<span v-if="node.ipAddresses.length == 0">-</span>
+			<span v-if="node.ipAddresses.length == 0">-</span>
-				<div v-else class="address-box">
+			<div v-else class="address-box">
-					<div v-for="addr in node.ipAddresses" style="margin-bottom:0.3em">
+				<div v-for="addr in node.ipAddresses" style="margin-bottom:0.3em">
-						<div class="ui label tiny">{{addr.ip}}
+					<div class="ui label tiny">{{addr.ip}}
-							<span class="small" v-if="addr.name.length > 0">（{{addr.name}}<span v-if="!addr.canAccess">，不可访问</span>）</span>
+						<span class="small" v-if="addr.name.length > 0">（{{addr.name}}<span v-if="!addr.canAccess">，不可访问</span>）</span>
-							<span class="small" v-if="addr.name.length == 0 && !addr.canAccess">（不可访问）</span>
+						<span class="small" v-if="addr.name.length == 0 && !addr.canAccess">（不可访问）</span>
-						</div>
 					</div>
 				</div>
-			</td>
+			</div>
-			<td>
+		</td>
-				<span v-if="node.status.isActive" :class="{red:node.status.cpuUsage > 0.80}">{{node.status.cpuUsageText}}</span>
+		<td>
-				<span v-else>-</span>
+			<span v-if="node.status.isActive" :class="{red:node.status.cpuUsage > 0.80}">{{node.status.cpuUsageText}}</span>
-			</td>
+			<span v-else>-</span>
-			<td>
+		</td>
-				<span v-if="node.status.isActive" :class="{red:node.status.memUsage > 0.80}">{{node.status.memUsageText}}</span>
+		<td>
-				<span v-else>-</span>
+			<span v-if="node.status.isActive" :class="{red:node.status.memUsage > 0.80}">{{node.status.memUsageText}}</span>
-			</td>
+			<span v-else>-</span>
-			<td>
+		</td>
-				<div v-if="!node.isOn">
+		<td>
-					<label-on :v-is-on="node.isOn"></label-on>
+			<div v-if="!node.isOn">
+				<label-on :v-is-on="node.isOn"></label-on>
+			</div>
+			<div v-else-if="node.isInstalled">
+				<div v-if="node.status.isActive">
+					<span v-if="!node.isSynced" class="red">同步中</span>
+					<span v-else class="green">运行中</span>
 				</div>
-				<div v-else-if="node.isInstalled">
+				<span v-else-if="node.status.updatedAt > 0" class="red">已断开</span>
-					<div v-if="node.status.isActive">
+				<span v-else-if="node.status.updatedAt == 0" class="red">未连接</span>
-						<span v-if="!node.isSynced" class="red">同步中</span>
+			</div>
-						<span v-else class="green">运行中</span>
+			<div v-else>
-					</div>
+				<span v-if="node.installStatus.isRunning" class="red">安装中</span>
-					<span v-else-if="node.status.updatedAt > 0" class="red">已断开</span>
+				<a v-if="node.installStatus.isFinished && !node.installStatus.isOk" :href="'/clusters/cluster/node/install?clusterId=' + clusterId + '&nodeId=' + node.id" title="点击看安装错误"><span class="red">安装出错</span></a>
-					<span v-else-if="node.status.updatedAt == 0" class="red">未连接</span>
+				<a v-else class="red" :href="'/clusters/cluster/node/install?clusterId=' + clusterId + '&nodeId=' + node.id" title="点击进安装界面"><span class="red">未安装</span></a>
-				</div>
+			</div>
-				<div v-else>
+		</td>
-					<span v-if="node.installStatus.isRunning" class="red">安装中</span>
+		<td>
-					<a v-if="node.installStatus.isFinished && !node.installStatus.isOk" :href="'/clusters/cluster/node/install?clusterId=' + clusterId + '&nodeId=' + node.id" title="点击看安装错误"><span class="red">安装出错</span></a>
+			<a :href="'/clusters/cluster/node?clusterId=' + clusterId + '&nodeId=' + node.id">详情</a> &nbsp; <a href="" @click.prevent="deleteNode(node.id)">删除</a>
-					<a v-else class="red" :href="'/clusters/cluster/node/install?clusterId=' + clusterId + '&nodeId=' + node.id" title="点击进安装界面"><span class="red">未安装</span></a>
+		</td>
-				</div>
+	</tr>
-			</td>
+</table>
-			<td>
-				<a :href="'/clusters/cluster/node?clusterId=' + clusterId + '&nodeId=' + node.id">详情</a> &nbsp; <a href="" @click.prevent="deleteNode(node.id)">删除</a>
-			</td>
-		</tr>
-	</table>
 
 
-	<div class="page" v-html="page"></div>
+<div class="page" v-html="page"></div>

web/views/@default/clusters/cluster/installRemote.js

@@ -56,6 +56,20 @@ Tea.context(function () {
 											})
 										})
 										return
+									case "CREATE_ROOT_DIRECTORY_FAILED":
+										teaweb.warn("创建根目录失败，请检查目录权限或者手工创建：" + errMsg)
+										return
+									case "INSTALL_HELPER_FAILED":
+										teaweb.warn("安装助手失败：" + errMsg)
+										return
+									case "TEST_FAILED":
+										teaweb.warn("环境测试失败：" + errMsg)
+										return
+									case "RPC_TEST_FAILED":
+										teaweb.confirm("html:要安装的节点到API服务之间的RPC通讯测试失败，具体错误：" + errMsg + "，<br/>现在修改API信息？", function () {
+											window.location = "/api"
+										})
+										return
 									default:
 										teaweb.warn("安装失败：" + errMsg)
 								}

web/views/@default/clusters/cluster/node/node.html

@@ -30,49 +30,84 @@
 			</td>
 		</tr>
 		<tr>
-			<td>SSH主机地址</td>
+			<td colspan="2"><more-options-indicator>SSH等更多选项</more-options-indicator></td>
+		</tr>
+		<tbody v-show="moreOptionsVisible">
+			<tr>
+				<td>SSH主机地址</td>
+				<td>
+					<div v-if="node.login != null && node.login.params != null && node.login.params.host != null">
+						<span v-if="node.login.params.host.length > 0">{{node.login.params.host}}</span>
+						<span v-else class="disabled">尚未设置</span>
+					</div>
+					<div v-else class="disabled">
+						尚未设置
+					</div>
+				</td>
+			</tr>
+			<tr>
+				<td>SSH主机端口</td>
+				<td>
+					<div v-if="node.login != null && node.login.params != null && node.login.params.host != null">
+						<span v-if="node.login.params.port > 0">{{node.login.params.port}}</span>
+						<span v-else class="disabled">尚未设置</span>
+					</div>
+					<span v-else class="disabled">
+						尚未设置
+					</span>
+				</td>
+			</tr>
+			<tr>
+				<td>SSH登录认证</td>
+				<td>
+					<div v-if="node.login != null && node.login.grant != null && node.login.grant.id > 0">
+						<a :href="'/clusters/grants/grant?grantId=' + node.login.grant.id">{{node.login.grant.name}}<span class="small">（{{node.login.grant.methodName}}）</span></a>
+					</div>
+					<span v-else class="disabled">
+						尚未设置
+					</span>
+				</td>
+			</tr>
+			<tr>
+				<td>CPU线程数</td>
+				<td>
+					<span v-if="node.maxCPU > 0">{{node.maxCPU}}线程</span>
+					<span v-else class="disabled">没有限制。</span>
+				</td>
+			</tr>
+		</tbody>
+	</table>
+	<div class="ui divider"></div>
+
+	<h3>运行状态</h3>
+	<table class="ui table definition selectable">
+		<tr>
+			<td class="title">是否在运行</td>
 			<td>
-				<div v-if="node.login != null && node.login.params != null && node.login.params.host != null">
+				<div  v-if="node.status.isActive">
-					<span v-if="node.login.params.host.length > 0">{{node.login.params.host}}</span>
+					<span class="green">运行中</span> &nbsp; 
-					<span v-else class="disabled">尚未设置</span>
+					<a href="" @click.prevent="stopNode()" v-if="!isStopping"><span>[通过SSH停止]</span></a>
+					<span v-if="isStopping">[停止中...]</span>
 				</div>
-				<div v-else class="disabled">
+				<div v-else>
-					尚未设置
+					<span class="red">已断开</span> &nbsp;
+					<a href="" @click.prevent="startNode()" v-if="node.isInstalled && !isStarting"><span>[通过SSH启动]</span></a>
+					<span v-if="node.isInstalled && isStarting">[启动中...]</span>
+					<a v-if="!node.isInstalled" :href="'/clusters/cluster/node/install?clusterId=' + clusterId + '&nodeId=' + node.id" ><span>去安装&gt;</span></a>
 				</div>
 			</td>
 		</tr>
-		<tr>
+		<tr v-show="node.status.isActive">
-			<td>SSH主机端口</td>
+			<td>CPU</td>
-			<td>
+			<td>{{node.status.cpuUsageText}}</td>
-				<div v-if="node.login != null && node.login.params != null && node.login.params.host != null">
-					<span v-if="node.login.params.port > 0">{{node.login.params.port}}</span>
-					<span v-else class="disabled">尚未设置</span>
-				</div>
-				<span v-else class="disabled">
-					尚未设置
-				</span>
-			</td>
 		</tr>
-		<tr>
+		<tr v-show="node.status.isActive">
-			<td>SSH登录认证</td>
+			<td>内存</td>
-			<td>
+			<td>{{node.status.memUsageText}}</td>
-				<div v-if="node.login != null && node.login.grant != null && node.login.grant.id > 0">
-					<a :href="'/clusters/grants/grant?grantId=' + node.login.grant.id">{{node.login.grant.name}}<span class="small">（{{node.login.grant.methodName}}）</span></a>
-				</div>
-				<span v-else class="disabled">
-					尚未设置
-				</span>
-			</td>
-		</tr>
-		<tr>
-			<td>CPU线程数</td>
-			<td>
-				<span v-if="node.maxCPU > 0">{{node.maxCPU}}线程</span>
-				<span v-else class="disabled">没有限制。</span>
-			</td>
 		</tr>
 	</table>
 
+	<div class="ui divider"></div>
 	<h3>安装信息</h3>
 	<table class="ui table definition selectable">
 		<tr>

web/views/@default/clusters/cluster/node/node.js

@@ -0,0 +1,35 @@
+Tea.context(function () {
+	this.isStarting = false
+	this.startNode = function () {
+		this.isStarting = true
+		this.$post("/clusters/cluster/node/start")
+			.params({
+				nodeId: this.node.id
+			})
+			.success(function () {
+				teaweb.success("启动成功", function () {
+					teaweb.reload()
+				})
+			})
+			.done(function () {
+				this.isStarting = false
+			})
+	}
+
+	this.isStopping = false
+	this.stopNode = function () {
+		this.isStopping = true
+		this.$post("/clusters/cluster/node/stop")
+			.params({
+				nodeId: this.node.id
+			})
+			.success(function () {
+				teaweb.success("执行成功", function () {
+					teaweb.reload()
+				})
+			})
+			.done(function () {
+				this.isStopping = false
+			})
+	}
+})