可以批量远程安装和升级节点

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

@@ -19,7 +19,7 @@ func (this *InstallManualAction) Init() {
 func (this *InstallManualAction) RunGet(params struct {
 	ClusterId int64
 }) {
-	this.Data["leftMenuItems"] = LeftMenuItemsForInstall(params.ClusterId, "manual")
+	this.Data["leftMenuItems"] = LeftMenuItemsForInstall(this.AdminContext(), params.ClusterId, "manual")
 
 	nodesResp, err := this.RPC().NodeRPC().FindAllNotInstalledNodesWithClusterId(this.AdminContext(), &pb.FindAllNotInstalledNodesWithClusterIdRequest{NodeClusterId: params.ClusterId})
 	if err != nil {

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

@@ -19,7 +19,7 @@ func (this *InstallNodesAction) Init() {
 func (this *InstallNodesAction) RunGet(params struct {
 	ClusterId int64
 }) {
-	this.Data["leftMenuItems"] = LeftMenuItemsForInstall(params.ClusterId, "register")
+	this.Data["leftMenuItems"] = LeftMenuItemsForInstall(this.AdminContext(), params.ClusterId, "register")
 
 	clusterResp, err := this.RPC().NodeClusterRPC().FindEnabledNodeCluster(this.AdminContext(), &pb.FindEnabledNodeClusterRequest{NodeClusterId: params.ClusterId})
 	if err != nil {

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

@@ -21,7 +21,7 @@ func (this *InstallRemoteAction) Init() {
 func (this *InstallRemoteAction) RunGet(params struct {
 	ClusterId int64
 }) {
-	this.Data["leftMenuItems"] = LeftMenuItemsForInstall(params.ClusterId, "install")
+	this.Data["leftMenuItems"] = LeftMenuItemsForInstall(this.AdminContext(), params.ClusterId, "install")
 
 	nodesResp, err := this.RPC().NodeRPC().FindAllNotInstalledNodesWithClusterId(this.AdminContext(), &pb.FindAllNotInstalledNodesWithClusterIdRequest{NodeClusterId: params.ClusterId})
 	if err != nil {

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

@@ -1,8 +1,8 @@
 package node
 
 import (
-	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 	"github.com/iwind/TeaGo/maps"
 )
 
@@ -34,6 +34,7 @@ func (this *StatusAction) RunPost(params struct {
 			"isOk":       node.InstallStatus.IsOk,
 			"updatedAt":  node.InstallStatus.UpdatedAt,
 			"error":      node.InstallStatus.Error,
+			"errorCode":  node.InstallStatus.ErrorCode,
 		}
 	} else {
 		this.Data["installStatus"] = nil

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

@@ -21,7 +21,7 @@ func (this *UpgradeRemoteAction) Init() {
 func (this *UpgradeRemoteAction) RunGet(params struct {
 	ClusterId int64
 }) {
-	this.Data["leftMenuItems"] = LeftMenuItemsForInstall(params.ClusterId, "upgrade")
+	this.Data["leftMenuItems"] = LeftMenuItemsForInstall(this.AdminContext(), params.ClusterId, "upgrade")
 
 	nodes := []maps.Map{}
 	resp, err := this.RPC().NodeRPC().FindAllUpgradeNodesWithClusterId(this.AdminContext(), &pb.FindAllUpgradeNodesWithClusterIdRequest{NodeClusterId: params.ClusterId})

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

@@ -1,12 +1,34 @@
 package cluster
 
 import (
+	"context"
+	"github.com/TeaOSLab/EdgeAdmin/internal/rpc"
 	"github.com/TeaOSLab/EdgeAdmin/internal/utils/numberutils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 	"github.com/iwind/TeaGo/maps"
+	"strconv"
 )
 
 // 安装升级相关的左侧菜单
-func LeftMenuItemsForInstall(clusterId int64, selectedItem string) []maps.Map {
+func LeftMenuItemsForInstall(ctx context.Context, clusterId int64, selectedItem string) []maps.Map {
+	rpcClient, _ := rpc.SharedRPC()
+	countNotInstalled := int64(0)
+	countUpgrade := int64(0)
+	if rpcClient != nil {
+		{
+			resp, err := rpcClient.NodeRPC().CountAllNotInstalledNodesWithClusterId(ctx, &pb.CountAllNotInstalledNodesWithClusterIdRequest{NodeClusterId: clusterId})
+			if err == nil {
+				countNotInstalled = resp.Count
+			}
+		}
+		{
+			resp, err := rpcClient.NodeRPC().CountAllUpgradeNodesWithClusterId(ctx, &pb.CountAllUpgradeNodesWithClusterIdRequest{NodeClusterId: clusterId})
+			if err == nil {
+				countUpgrade = resp.Count
+			}
+		}
+	}
+
 	return []maps.Map{
 		{
 			"name":     "手动安装",
@@ -19,12 +41,12 @@ func LeftMenuItemsForInstall(clusterId int64, selectedItem string) []maps.Map {
 			"isActive": selectedItem == "register",
 		},
 		{
-			"name":     "远程安装",
+			"name":     "远程安装(" + strconv.FormatInt(countNotInstalled, 10) + ")",
 			"url":      "/clusters/cluster/installRemote?clusterId=" + numberutils.FormatInt64(clusterId),
 			"isActive": selectedItem == "install",
 		},
 		{
-			"name":     "远程升级",
+			"name":     "远程升级(" + strconv.FormatInt(countUpgrade, 10) + ")",
 			"url":      "/clusters/cluster/upgradeRemote?clusterId=" + numberutils.FormatInt64(clusterId),
 			"isActive": selectedItem == "upgrade",
 		},

web/public/js/components/common/checkbox.js

@@ -29,6 +29,13 @@ Vue.component("checkbox", {
 			this.$emit("input", this.newValue)
 		}
 	},
+    watch: {
+	    value: function (v) {
+	        if (typeof v == "boolean") {
+	            this.newValue = v
+            }
+        }
+    },
 	template: `<div class="ui checkbox">
 	<input type="checkbox" :name="name" :value="elementValue" :id="elementId" @change="change" v-model="newValue"/>
 	<label :for="elementId" style="font-size: 0.85em!important;"><slot></slot></label>

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

@@ -24,7 +24,7 @@
 				<td>
 					<input type="hidden" name="dnsDomainId" :value="dnsDomainId"/>
 					<dns-route-selector :v-all-routes="dnsRoutes"></dns-route-selector>
-					<p class="comment">可用线路是根据集群设置的域名获取的，注意DNS服务商可能对这些线路有所限制。</p>
+					<p class="comment">当前节点对应的DNS线路，可用线路是根据集群设置的域名获取的，注意DNS服务商可能对这些线路有其他限制。</p>
 				</td>
 			</tr>
             <tr>

web/views/@default/clusters/cluster/groups/selectPopup.html

@@ -13,7 +13,7 @@
 					<p class="comment">点击可已选中要使用的分组。</p>
 				</div>
 				<div v-else>
-					<p class="comment">暂时还没有可以使用的分组。</p>
+					<p class="comment">当前集群下暂时还没有可以使用的分组。</p>
 				</div>
 			</td>
 		</tr>

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

@@ -4,4 +4,12 @@
 .right-box {
   top: 10em;
 }
+h3 {
+  position: relative;
+}
+h3 button {
+  position: absolute;
+  right: 1em;
+  top: -0.2em;
+}
 /*# sourceMappingURL=installRemote.css.map */

web/views/@default/clusters/cluster/installRemote.css.map

@@ -1 +1 @@
-{"version":3,"sources":["installRemote.less"],"names":[],"mappings":"AAAA;EACC,SAAA;;AAGD;EACC,SAAA","file":"installRemote.css"}
+{"version":3,"sources":["installRemote.less"],"names":[],"mappings":"AAAA;EACC,SAAA;;AAGD;EACC,SAAA;;AAGD;EACC,kBAAA;;AAGD,EAAG;EACF,kBAAA;EACA,UAAA;EACA,WAAA","file":"installRemote.css"}

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

@@ -6,10 +6,15 @@
 	<p class="comment" v-if="nodes.length == 0">暂时没有需要远程安装的节点。</p>
 
 	<div v-if="nodes.length > 0">
-		<h3>所有未安装节点</h3>
+		<h3>所有未安装节点
+            <button class="ui button primary tiny" v-if="countCheckedNodes() > 0" @click.prevent="installBatch()">批量安装({{countCheckedNodes()}})</button>
+        </h3>
 		<table class="ui table selectable celled">
 			<thead>
 				<tr>
+                    <th style="width:3em">
+                        <checkbox @input="checkNodes"></checkbox>
+                    </th>
 					<th>节点名</th>
 					<th>访问IP</th>
 					<th>SSH地址</th>
@@ -19,7 +24,10 @@
 			</thead>
 			<tr v-for="node in nodes">
                 <td>
-					<a :href="'/clusters/cluster/node?clusterId=' + clusterId + '&nodeId=' + node.id">{{node.name}}</a>
+                    <checkbox v-model="node.isChecked" v-if="node.installStatus == null || !node.installStatus.isOk"></checkbox>
+                </td>
+				<td>
+					<link-icon :href="'/clusters/cluster/node?clusterId=' + clusterId + '&nodeId=' + node.id">{{node.name}}</link-icon>
 				</td>
 				<td>
 					<span v-for="addr in node.addresses" v-if="addr.canAccess" class="ui label tiny">{{addr.ip}}</span>

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

@@ -1,13 +1,42 @@
 Tea.context(function () {
     this.isInstalling = false
+    this.isBatch = false
     let installingNode = null
 
+    this.nodes.forEach(function (v) {
+        v.isChecked = false
+    })
+
     this.$delay(function () {
         this.reload()
     })
 
+    let that = this
+
+    this.checkNodes = function (isChecked) {
+        this.nodes.forEach(function (v) {
+            v.isChecked = isChecked
+        })
+    }
+
+    this.countCheckedNodes = function () {
+        return that.nodes.$count(function (k, v) {
+            return v.isChecked
+        })
+    }
+
     this.installNode = function (node) {
         let that = this
+        if (this.isBatch) {
+            installingNode = node
+            that.isInstalling = true
+            node.isInstalling = true
+
+            that.$post("$")
+                .params({
+                    nodeId: node.id
+                })
+        } else {
             teaweb.confirm("确定要开始安装此节点吗？", function () {
                 installingNode = node
                 that.isInstalling = true
@@ -19,7 +48,37 @@ Tea.context(function () {
                     })
             })
         }
+    }
 
+    this.installBatch = function () {
+        let that = this
+        this.isBatch = true
+        teaweb.confirm("确定要批量安装选中的节点吗？", function () {
+            that.installNext()
+        })
+    }
+
+    /**
+     * 安装下一个
+     */
+    this.installNext = function () {
+        let nextNode = this.nodes.$find(function (k, v) {
+            return v.isChecked
+        })
+
+        if (nextNode == null) {
+            teaweb.success("全部安装成功", function () {
+                teaweb.reload()
+            })
+        } else {
+            this.installNode(nextNode)
+        }
+        return
+    }
+
+    /**
+     * 重新加载状态
+     */
     this.reload = function () {
         let that = this
         if (installingNode != null) {
@@ -32,10 +91,15 @@ Tea.context(function () {
                         installingNode.installStatus = resp.data.status
                         if (installingNode.installStatus.isFinished) {
                             if (installingNode.installStatus.isOk) {
+                                installingNode.isChecked = false // 取消选中
                                 installingNode = null
+                                if (that.isBatch) {
+                                    that.installNext()
+                                } else {
                                     teaweb.success("安装成功", function () {
-									window.location.reload()
+                                        teaweb.reload()
                                     })
+                                }
                             } else {
                                 let nodeId = installingNode.id
                                 let errMsg = installingNode.installStatus.error
@@ -56,6 +120,15 @@ Tea.context(function () {
                                             })
                                         })
                                         return
+                                    case "SSH登录失败，请检查设置":
+                                        teaweb.warn("需要填写SSH登录信息", function () {
+                                            teaweb.popup("/clusters/cluster/updateNodeSSH?nodeId=" + nodeId, {
+                                                callback: function () {
+                                                    teaweb.reload()
+                                                }
+                                            })
+                                        })
+                                        return
                                     case "CREATE_ROOT_DIRECTORY_FAILED":
                                         teaweb.warn("创建根目录失败，请检查目录权限或者手工创建：" + errMsg)
                                         return

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

@@ -5,3 +5,13 @@
 .right-box {
 	top: 10em;
 }
+
+h3 {
+	position: relative;
+}
+
+h3 button {
+	position: absolute;
+	right: 1em;
+	top: -0.2em;
+}

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

@@ -1,10 +1,14 @@
 Tea.context(function () {
+    let isInstalling = false
+
     this.$delay(function () {
         this.reloadStatus(this.nodeId)
     })
 
     // 开始安装
     this.install = function () {
+        isInstalling = true
+
         this.$post("$")
             .params({
                 nodeId: this.nodeId
@@ -28,6 +32,8 @@ Tea.context(function () {
 
     // 刷新状态
     this.reloadStatus = function (nodeId) {
+        let that = this
+
         this.$post("/clusters/cluster/node/status")
             .params({
                 nodeId: nodeId
@@ -35,6 +41,58 @@ Tea.context(function () {
             .success(function (resp) {
                 this.installStatus = resp.data.installStatus
                 this.node.isInstalled = resp.data.isInstalled
+
+                if (!isInstalling) {
+                    return
+                }
+
+                let nodeId = this.node.id
+                let errMsg = this.installStatus.error
+
+                if (this.installStatus.errorCode.length > 0) {
+                    isInstalling = false
+                }
+
+                switch (this.installStatus.errorCode) {
+                    case "EMPTY_LOGIN":
+                    case "EMPTY_SSH_HOST":
+                    case "EMPTY_SSH_PORT":
+                    case "EMPTY_GRANT":
+                        teaweb.warn("需要填写SSH登录信息", function () {
+                            teaweb.popup("/clusters/cluster/updateNodeSSH?nodeId=" + nodeId, {
+                                callback: function () {
+                                    that.install()
+                                }
+                            })
+                        })
+                        return
+                    case "SSH_LOGIN_FAILED":
+                        teaweb.warn("SSH登录失败，请检查设置", function () {
+                            teaweb.popup("/clusters/cluster/updateNodeSSH?nodeId=" + nodeId, {
+                                callback: function () {
+                                    that.install()
+                                }
+                            })
+                        })
+                        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:
+                        shouldReload = true
+                    //teaweb.warn("安装失败：" + errMsg)
+                }
             })
             .done(function () {
                 this.$delay(function () {

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

@@ -25,6 +25,7 @@
 				<td>
 					<input type="hidden" name="dnsDomainId" :value="dnsDomainId"/>
 					<dns-route-selector :v-all-routes="allDNSRoutes" :v-routes="dnsRoutes"></dns-route-selector>
+                    <p class="comment">当前节点对应的DNS线路，可用线路是根据集群设置的域名获取的，注意DNS服务商可能对这些线路有其他限制。</p>
 				</td>
 			</tr>
 			<tr>

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

@@ -14,7 +14,7 @@
 			</td>
 		</tr>
 		<tr>
-			<td>SSH主机端口 &</td>
+			<td>SSH主机端口 *</td>
 			<td>
 				<input type="text" name="sshPort" maxlength="5" v-model="params.port" style="width:6em"/>
 				<p class="comment">比如22。</p>

web/views/@default/clusters/cluster/upgradeRemote.css

@@ -4,4 +4,12 @@
 .right-box {
   top: 10em;
 }
+h3 {
+  position: relative;
+}
+h3 button {
+  position: absolute;
+  right: 1em;
+  top: -0.2em;
+}
 /*# sourceMappingURL=upgradeRemote.css.map */

web/views/@default/clusters/cluster/upgradeRemote.css.map

@@ -1 +1 @@
-{"version":3,"sources":["upgradeRemote.less"],"names":[],"mappings":"AAAA;EACC,SAAA;;AAGD;EACC,SAAA","file":"upgradeRemote.css"}
+{"version":3,"sources":["upgradeRemote.less"],"names":[],"mappings":"AAAA;EACC,SAAA;;AAGD;EACC,SAAA;;AAGD;EACC,kBAAA;;AAGD,EAAG;EACF,kBAAA;EACA,UAAA;EACA,WAAA","file":"upgradeRemote.css"}

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

@@ -6,10 +6,15 @@
 	<p class="comment" v-if="nodes.length == 0">暂时没有需要升级的节点。</p>
 
 	<div v-if="nodes.length > 0">
-		<h3>所有需要升级的节点</h3>
+		<h3>所有需要升级的节点
+            <button class="ui button primary tiny" v-if="countCheckedNodes() > 0" @click.prevent="installBatch()">批量安装({{countCheckedNodes()}})</button>
+        </h3>
 		<table class="ui table selectable celled">
 			<thead>
 				<tr>
+                    <th style="width:3em">
+                        <checkbox @input="checkNodes"></checkbox>
+                    </th>
 					<th>节点名</th>
 					<th>访问IP</th>
 					<th>SSH地址</th>
@@ -19,6 +24,9 @@
 				</tr>
 			</thead>
 			<tr v-for="node in nodes">
+                <td>
+                    <checkbox v-model="node.isChecked" v-if="node.installStatus == null || !node.installStatus.isOk"></checkbox>
+                </td>
 				<td>
 					<link-icon :href="'/clusters/cluster/node?clusterId=' + clusterId + '&nodeId=' + node.id">{{node.name}}</link-icon>
 				</td>

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

@@ -1,13 +1,42 @@
 Tea.context(function () {
     this.isInstalling = false
+    this.isBatch = false
     let installingNode = null
 
+    this.nodes.forEach(function (v) {
+        v.isChecked = false
+    })
+
     this.$delay(function () {
         this.reload()
     })
 
+    let that = this
+
+    this.checkNodes = function (isChecked) {
+        this.nodes.forEach(function (v) {
+            v.isChecked = isChecked
+        })
+    }
+
+    this.countCheckedNodes = function () {
+        return that.nodes.$count(function (k, v) {
+            return v.isChecked
+        })
+    }
+
     this.installNode = function (node) {
         let that = this
+        if (this.isBatch) {
+            installingNode = node
+            that.isInstalling = true
+            node.isInstalling = true
+
+            that.$post("$")
+                .params({
+                    nodeId: node.id
+                })
+        } else {
             teaweb.confirm("确定要开始升级此节点吗？", function () {
                 installingNode = node
                 that.isInstalling = true
@@ -19,7 +48,37 @@ Tea.context(function () {
                     })
             })
         }
+    }
 
+    this.installBatch = function () {
+        let that = this
+        this.isBatch = true
+        teaweb.confirm("确定要批量升级选中的节点吗？", function () {
+            that.installNext()
+        })
+    }
+
+    /**
+     * 安装下一个
+     */
+    this.installNext = function () {
+        let nextNode = this.nodes.$find(function (k, v) {
+            return v.isChecked
+        })
+
+        if (nextNode == null) {
+            teaweb.success("全部升级成功", function () {
+                teaweb.reload()
+            })
+        } else {
+            this.installNode(nextNode)
+        }
+        return
+    }
+
+    /**
+     * 重新加载状态
+     */
     this.reload = function () {
         let that = this
         if (installingNode != null) {
@@ -32,10 +91,15 @@ Tea.context(function () {
                         installingNode.installStatus = resp.data.status
                         if (installingNode.installStatus.isFinished) {
                             if (installingNode.installStatus.isOk) {
+                                installingNode.isChecked = false // 取消选中
                                 installingNode = null
+                                if (that.isBatch) {
+                                    that.installNext()
+                                } else {
                                     teaweb.success("升级成功", function () {
-									window.location.reload()
+                                        teaweb.reload()
                                     })
+                                }
                             } else {
                                 let nodeId = installingNode.id
                                 let errMsg = installingNode.installStatus.error

web/views/@default/clusters/cluster/upgradeRemote.less

@@ -5,3 +5,13 @@
 .right-box {
 	top: 10em;
 }
+
+h3 {
+	position: relative;
+}
+
+h3 button {
+	position: absolute;
+	right: 1em;
+	top: -0.2em;
+}

web/views/@default/nodes/ipAddresses/createPopup.html

@@ -17,7 +17,7 @@
 					<input type="checkbox" name="canAccess" value="1" checked="checked"/>
 					<label></label>
 				</div>
-				<p class="comment">是否为可以公开访问的IP。</p>
+				<p class="comment">是否为可以公开访问的IP，如果选中，也会作为DNS解析记录的值使用。</p>
 			</td>
 		</tr>
 		<tr>

web/views/@default/nodes/ipAddresses/updatePopup.html

@@ -18,7 +18,7 @@
 					<input type="checkbox" name="canAccess" value="1" v-model="address.canAccess"/>
 					<label></label>
 				</div>
-				<p class="comment">是否为可以公开访问的IP。</p>
+				<p class="comment">是否为可以公开访问的IP，如果选中，也会作为DNS解析记录的值使用。</p>
 			</td>
 		</tr>
 		<tr>