ChenKaiLiuG/GoEdgeAdmin
Archived
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

节点根据健康检查自动上下线

Browse Source
This commit is contained in:
刘祥超
2020-11-15 21:17:52 +08:00
parent e09f1575b4
commit 120aff71a5
17 changed files with 213 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
web/public/js/components/common/health-check-config-box.js
+52 -2
View File
@@ -14,7 +14,10 @@ Vue.component("health-check-config-box", {
statusCodes: [200],
timeout: {count: 10, unit: "second"},
countTries: 3,
tryDelay: {count: 100, unit: "ms"}
tryDelay: {count: 100, unit: "ms"},
autoDown: true,
countUp: 1,
countDown: 1
}
let that = this
setTimeout(function () {
@@ -44,7 +47,14 @@ Vue.component("health-check-config-box", {
if (healthCheckConfig.tryDelay == null) {
healthCheckConfig.tryDelay = {count: 100, unit: "ms"}
}
if (healthCheckConfig.countUp == null || healthCheckConfig.countUp < 1) {
healthCheckConfig.countUp = 1
}
if (healthCheckConfig.countDown == null || healthCheckConfig.countDown < 1) {
healthCheckConfig.countDown = 1
}
}
console.log(healthCheckConfig.countUp, healthCheckConfig.countDown)
return {
healthCheck: healthCheckConfig,
advancedVisible: false,
@@ -79,6 +89,22 @@ Vue.component("health-check-config-box", {
} else {
this.healthCheck.countTries = 0
}
},
"healthCheck.countUp": function (v) {
let count = parseInt(v)
if (!isNaN(count)) {
this.healthCheck.countUp = count
} else {
this.healthCheck.countUp = 0
}
},
"healthCheck.countDown": function (v) {
let count = parseInt(v)
if (!isNaN(count)) {
this.healthCheck.countDown = count
} else {
this.healthCheck.countDown = 0
}
}
},
methods: {
@@ -145,6 +171,30 @@ Vue.component("health-check-config-box", {
<time-duration-box :v-value="healthCheck.interval"></time-duration-box>
</td>
</tr>
<tr>
<td>是否自动下线</td>
<td>
<div class="ui checkbox">
<input type="checkbox" value="1" v-model="healthCheck.autoDown"/>
<label></label>
</div>
<p class="comment">选中后系统会根据健康检查的结果自动标记节点的上线/下线状态。</p>
</td>
</tr>
<tr v-show="healthCheck.autoDown">
<td>连续上线次数</td>
<td>
<input type="text" v-model="healthCheck.countUp" style="width:5em" maxlength="6"/>
<p class="comment">连续N次检查成功后自动恢复上线。</p>
</td>
</tr>
<tr v-show="healthCheck.autoDown">
<td>连续下线次数</td>
<td>
<input type="text" v-model="healthCheck.countDown" style="width:5em" maxlength="6"/>
<p class="comment">连续N次检查失败后自动下线。</p>
</td>
</tr>
</tbody>
<tbody v-show="healthCheck.isOn">
<tr>
@@ -176,7 +226,7 @@ Vue.component("health-check-config-box", {
<time-duration-box :v-value="healthCheck.tryDelay"></time-duration-box>
</td>
</tr>
</tbody>
</tbody>
</table>
<div class="margin"></div>
</div>`
web/public/js/components/messages/message-row.js
+7 -1
View File
@@ -31,9 +31,15 @@ Vue.component("message-row", {
<td>
{{message.body}}
<div v-if="message.type == 'HealthCheckFail'" style="margin-top: 0.8em">
<!-- 健康检查 -->
<div v-if="message.type == 'HealthCheckFailed'" style="margin-top: 0.8em">
<a :href="'/clusters/cluster/node?clusterId=' + message.cluster.id + '&nodeId=' + param.node.id" v-for="param in params" class="ui label tiny" style="margin-bottom: 0.5em">{{param.node.name}}: {{param.error}}</a>
</div>
<!-- 集群DNS设置 -->
<div v-if="message.type == 'ClusterDNSSyncFailed'" style="margin-top: 0.8em">
<a :href="'/dns/clusters/cluster?clusterId=' + message.cluster.id">查看问题 &raquo;</a>
</div>
</td>
</tr>
</table>
web/views/@default/clusters/cluster/createNode.html
+35 -21
View File
@@ -16,6 +16,18 @@
<td>IP地址</td>
<td>
<node-ip-addresses-box></node-ip-addresses-box>
<p class="comment">用于访问节点和域名解析等。</p>
</td>
</tr>
<tr v-if="dnsRoutes.length > 0">
<td>DNS线路</td>
<td>
<input type="hidden" name="dnsDomainId" :value="dnsDomainId"/>
<select class="ui dropdown auto-width" name="dnsRoute">
<option value="">[请选择]</option>
<option v-for="route in dnsRoutes" :value="route.code">{{route.name}}</option>
</select>
<p class="comment">可用线路是根据集群设置的域名获取的，注意DNS服务商可能对这些线路有所限制。</p>
</td>
</tr>
<tr>
@@ -25,29 +37,31 @@
</td>
</tr>
<tr>
<td colspan="2"><more-options-indicator></more-options-indicator></td>
<td colspan="2">
<more-options-indicator></more-options-indicator>
</td>
</tr>
<tbody v-show="moreOptionsVisible">
<tr>
<td>SSH主机地址</td>
<td>
<input type="text" name="sshHost" maxlength="64"/>
<p class="comment">比如192.168.1.100</p>
</td>
</tr>
<tr>
<td>SSH主机端口</td>
<td>
<input type="text" name="sshPort" maxlength="5"/>
<p class="comment">常见的比如22。</p>
</td>
</tr>
<tr>
<td>SSH登录认证</td>
<td>
<grant-selector></grant-selector>
</td>
</tr>
<tr>
<td>SSH主机地址</td>
<td>
<input type="text" name="sshHost" maxlength="64"/>
<p class="comment">比如192.168.1.100</p>
</td>
</tr>
<tr>
<td>SSH主机端口</td>
<td>
<input type="text" name="sshPort" maxlength="5"/>
<p class="comment">常见的比如22。</p>
</td>
</tr>
<tr>
<td>SSH登录认证</td>
<td>
<grant-selector></grant-selector>
</td>
</tr>
</tbody>
</table>
<submit-btn></submit-btn>
web/views/@default/clusters/cluster/index.html
+4 -1
View File
@@ -87,7 +87,10 @@
<span v-else class="disabled">-</span>
</td>
<td>
<div v-if="!node.isOn">
<div v-if="!node.isUp">
<span class="red">健康问题</span>
</div>
<div v-else-if="!node.isOn">
<label-on :v-is-on="node.isOn"></label-on>
</div>
<div v-else-if="node.isInstalled">
web/views/@default/clusters/cluster/node/update.html
+1
View File
@@ -17,6 +17,7 @@
<td>IP地址</td>
<td>
<node-ip-addresses-box :v-ip-addresses="ipAddresses"></node-ip-addresses-box>
<p class="comment">用于访问节点和域名解析等。</p>
</td>
</tr>
<tr>
web/views/@default/clusters/cluster/settings/dns/index.html
+23
View File
@@ -25,6 +25,29 @@
<p class="comment">和主域名一起组成子域名。</p>
</td>
</tr>
<tr>
<td colspan="2"><more-options-indicator></more-options-indicator></td>
</tr>
<tbody v-show="moreOptionsVisible">
<tr>
<td>是否同步节点DNS状态</td>
<td>
<div class="ui checkbox">
<input type="checkbox" name="nodesAutoSync" value="1" v-model="nodesAutoSync"/>
<label></label>
</div>
</td>
</tr>
<tr>
<td>是否同步网站服务DNS状态</td>
<td>
<div class="ui checkbox">
<input type="checkbox" name="serversAutoSync" value="1" v-model="serversAutoSync"/>
<label></label>
</div>
</td>
</tr>
</tbody>
</table>
<submit-btn></submit-btn>
web/views/@default/dns/clusters/cluster.html
+1 -1
View File
@@ -9,7 +9,7 @@
<table class="ui table definition selectable">
<tr>
<td class="title">集群</td>
<td>{{cluster.name}}</td>
<td><link-icon :href="'/clusters/cluster?clusterId=' + cluster.id">{{cluster.name}}</link-icon></td>
</tr>
<tr>
<td>子域名</td>
web/views/@default/dns/clusters/cluster.js
+1 -1
View File
@@ -1,7 +1,7 @@
Tea.context(function () {
this.updateCluster = function (clusterId) {
teaweb.popup("/dns/updateClusterPopup?clusterId=" + clusterId, {
height: "22em",
height: "25em",
callback: function () {
teaweb.success("保存成功", function () {
teaweb.reload()
web/views/@default/dns/index.js
+1 -1
View File
@@ -1,7 +1,7 @@
Tea.context(function () {
this.updateCluster = function (clusterId) {
teaweb.popup("/dns/updateClusterPopup?clusterId=" + clusterId, {
height: "22em",
height: "25em",
callback: function () {
teaweb.success("保存成功", function () {
teaweb.reload()
web/views/@default/dns/issues/index.js
+1 -1
View File
@@ -8,7 +8,7 @@ Tea.context(function () {
this.updateCluster = function (clusterId) {
let that = this
teaweb.popup("/dns/updateClusterPopup?clusterId=" + clusterId, {
height: "22em",
height: "25em",
callback: function () {
teaweb.success("保存成功", function () {
that.reload()
web/views/@default/dns/updateClusterPopup.html
+23
View File
@@ -43,6 +43,29 @@
<p class="comment">子域名和主域名共同组成集群的域名。</p>
</td>
</tr>
<tr>
<td colspan="2"><more-options-indicator></more-options-indicator></td>
</tr>
<tbody v-show="moreOptionsVisible">
<tr>
<td>是否同步节点DNS状态</td>
<td>
<div class="ui checkbox">
<input type="checkbox" name="nodesAutoSync" value="1" v-model="nodesAutoSync"/>
<label></label>
</div>
</td>
</tr>
<tr>
<td>是否同步网站服务DNS状态</td>
<td>
<div class="ui checkbox">
<input type="checkbox" name="serversAutoSync" value="1" v-model="serversAutoSync"/>
<label></label>
</div>
</td>
</tr>
</tbody>
</table>
<submit-btn></submit-btn>