diff --git a/internal/web/actions/default/clusters/cluster/init.go b/internal/web/actions/default/clusters/cluster/init.go index 0845f115..6499fb57 100644 --- a/internal/web/actions/default/clusters/cluster/init.go +++ b/internal/web/actions/default/clusters/cluster/init.go @@ -44,7 +44,7 @@ func init() { Post("/up", new(node.UpAction)). Get("/thresholds", new(thresholds.IndexAction)). Get("/detail", new(node.DetailAction)). - Get("/boards", new(nodeboards.IndexAction)). + GetPost("/boards", new(nodeboards.IndexAction)). // 分组相关 Prefix("/clusters/cluster/groups"). diff --git a/internal/web/actions/default/clusters/cluster/node/boards/index.go b/internal/web/actions/default/clusters/cluster/node/boards/index.go index 0f61b31d..33602374 100644 --- a/internal/web/actions/default/clusters/cluster/node/boards/index.go +++ b/internal/web/actions/default/clusters/cluster/node/boards/index.go @@ -178,3 +178,31 @@ func (this *IndexAction) RunGet(params struct { this.Show() } + +func (this *IndexAction) RunPost(params struct { + ClusterId int64 + NodeId int64 +}) { + resp, err := this.RPC().ServerStatBoardRPC().ComposeServerStatNodeBoard(this.AdminContext(), &pb.ComposeServerStatNodeBoardRequest{NodeId: params.NodeId}) + if err != nil { + this.ErrorPage(err) + return + } + + this.Data["board"] = maps.Map{ + "isActive": resp.IsActive, + "trafficInBytes": resp.TrafficInBytes, + "trafficOutBytes": resp.TrafficOutBytes, + "countConnections": resp.CountConnections, + "countRequests": resp.CountRequests, + "countAttackRequests": resp.CountAttackRequests, + "cpuUsage": resp.CpuUsage, + "memoryUsage": resp.MemoryUsage, + "memoryTotalSize": resp.MemoryTotalSize, + "load": resp.Load, + "cacheDiskSize": resp.CacheDiskSize, + "cacheMemorySize": resp.CacheMemorySize, + } + + this.Success() +} diff --git a/internal/web/actions/default/clusters/cluster/nodes.go b/internal/web/actions/default/clusters/cluster/nodes.go index 953d234a..bf64b49b 100644 --- a/internal/web/actions/default/clusters/cluster/nodes.go +++ b/internal/web/actions/default/clusters/cluster/nodes.go @@ -29,6 +29,11 @@ func (this *NodesAction) RunGet(params struct { InstalledState int ActiveState int Keyword string + + CpuOrder string + MemoryOrder string + TrafficInOrder string + TrafficOutOrder string }) { this.Data["groupId"] = params.GroupId this.Data["regionId"] = params.RegionId @@ -61,7 +66,7 @@ func (this *NodesAction) RunGet(params struct { page := this.NewPage(countResp.Count) this.Data["page"] = page.AsHTML() - nodesResp, err := this.RPC().NodeRPC().ListEnabledNodesMatch(this.AdminContext(), &pb.ListEnabledNodesMatchRequest{ + var req = &pb.ListEnabledNodesMatchRequest{ Offset: page.Offset, Size: page.Size, NodeClusterId: params.ClusterId, @@ -70,7 +75,25 @@ func (this *NodesAction) RunGet(params struct { InstallState: types.Int32(params.InstalledState), ActiveState: types.Int32(params.ActiveState), Keyword: params.Keyword, - }) + } + if params.CpuOrder == "asc" { + req.CpuAsc = true + } else if params.CpuOrder == "desc" { + req.CpuDesc = true + } else if params.MemoryOrder == "asc" { + req.MemoryAsc = true + } else if params.MemoryOrder == "desc" { + req.MemoryDesc = true + } else if params.TrafficInOrder == "asc" { + req.TrafficInAsc = true + } else if params.TrafficInOrder == "desc" { + req.TrafficInDesc = true + } else if params.TrafficOutOrder == "asc" { + req.TrafficOutAsc = true + } else if params.TrafficOutOrder == "desc" { + req.TrafficOutDesc = true + } + nodesResp, err := this.RPC().NodeRPC().ListEnabledNodesMatch(this.AdminContext(), req) if err != nil { this.ErrorPage(err) return @@ -146,13 +169,15 @@ func (this *NodesAction) RunGet(params struct { "error": node.InstallStatus.Error, }, "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), + "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), + "trafficInBytes": status.TrafficInBytes, + "trafficOutBytes": status.TrafficOutBytes, }, "cluster": maps.Map{ "id": node.NodeCluster.Id, diff --git a/web/public/js/components/common/sort-arrow.js b/web/public/js/components/common/sort-arrow.js new file mode 100644 index 00000000..5f11f0c1 --- /dev/null +++ b/web/public/js/components/common/sort-arrow.js @@ -0,0 +1,48 @@ +// 排序使用的箭头 +Vue.component("sort-arrow", { + props: ["name"], + data: function () { + let url = window.location.toString() + let order = "" + let newArgs = [] + if (window.location.search != null && window.location.search.length > 0) { + let queryString = window.location.search.substring(1) + let pieces = queryString.split("&") + let that = this + pieces.forEach(function (v) { + let eqIndex = v.indexOf("=") + if (eqIndex > 0) { + let argName = v.substring(0, eqIndex) + let argValue = v.substring(eqIndex + 1) + if (argName == that.name) { + order = argValue + } else if (argValue != "asc" && argValue != "desc") { + newArgs.push(v) + } + } else { + newArgs.push(v) + } + }) + } + if (order == "asc") { + newArgs.push(this.name + "=") + } else if (order == "desc") { + newArgs.push(this.name + "=asc") + } else { + newArgs.push(this.name + "=desc") + } + + let qIndex = url.indexOf("?") + if (qIndex > 0) { + url = url.substring(0, qIndex) + "?" + newArgs.join("&") + } else { + url = url + "?" + newArgs.join("&") + } + + return { + order: order, + url: url + } + }, + template: `  ` +}) \ No newline at end of file diff --git a/web/views/@default/@layout_override.css b/web/views/@default/@layout_override.css index 5426edf4..1647a0f7 100644 --- a/web/views/@default/@layout_override.css +++ b/web/views/@default/@layout_override.css @@ -21,6 +21,8 @@ form .fields { table th.center, table td.center { text-align: center !important; + padding-left: 0 !important; + padding-right: 0 !important; } table th.width10 { width: 10em; diff --git a/web/views/@default/@layout_override.css.map b/web/views/@default/@layout_override.css.map index d809cb19..91bb244d 100644 --- a/web/views/@default/@layout_override.css.map +++ b/web/views/@default/@layout_override.css.map @@ -1 +1 @@ -{"version":3,"sources":["@layout_override.less"],"names":[],"mappings":"AACA,GAAG,OAAO,SAAU,MAAK,MAAM,QAAS,OAAM;AAAS,GAAG,OAAO,SAAU,MAAK,MAAM,QAAS,QAAO;EACrG,oCAAA;;AAGD,GAAG,OAAO,SAAU,MAAK,QAAS,OAAM;AAAS,GAAG,OAAO,SAAU,MAAK,QAAS,QAAO;EACzF,oCAAA;;AAGD,GAAG,MAAM;EACR,kCAAA;;AAID,IACC;EACC,2BAAA;;AAKF,KAAK;EACJ,sBAAA;;AAGD,KAAK,KAAK;EACT,yBAAA;;AAID,KACC,GAAE;AADH,KACY,GAAE;EACZ,6BAAA;;AAFF,KAKC,GAAE;EACD,WAAA;;AANF,KASC,GAAE;EACD,UAAA;;AAVF,KAaC,GAAE;EACD,UAAA;;AAKF,QAAQ;EACP,qBAAA;;AAID,MAAM;EACL,uBAAA","file":"@layout_override.css"} \ No newline at end of file +{"version":3,"sources":["@layout_override.less"],"names":[],"mappings":"AACA,GAAG,OAAO,SAAU,MAAK,MAAM,QAAS,OAAM;AAAS,GAAG,OAAO,SAAU,MAAK,MAAM,QAAS,QAAO;EACrG,oCAAA;;AAGD,GAAG,OAAO,SAAU,MAAK,QAAS,OAAM;AAAS,GAAG,OAAO,SAAU,MAAK,QAAS,QAAO;EACzF,oCAAA;;AAGD,GAAG,MAAM;EACR,kCAAA;;AAID,IACC;EACC,2BAAA;;AAKF,KAAK;EACJ,sBAAA;;AAGD,KAAK,KAAK;EACT,yBAAA;;AAID,KACC,GAAE;AADH,KACY,GAAE;EACZ,6BAAA;EACA,0BAAA;EACA,2BAAA;;AAJF,KAOC,GAAE;EACD,WAAA;;AARF,KAWC,GAAE;EACD,UAAA;;AAZF,KAeC,GAAE;EACD,UAAA;;AAKF,QAAQ;EACP,qBAAA;;AAID,MAAM;EACL,uBAAA","file":"@layout_override.css"} \ No newline at end of file diff --git a/web/views/@default/@layout_override.less b/web/views/@default/@layout_override.less index 3298b30c..da974cd3 100644 --- a/web/views/@default/@layout_override.less +++ b/web/views/@default/@layout_override.less @@ -31,6 +31,8 @@ form { table { th.center, td.center { text-align: center !important; + padding-left: 0 !important; + padding-right: 0 !important; } th.width10 { diff --git a/web/views/@default/clusters/cluster/node/boards/index.js b/web/views/@default/clusters/cluster/node/boards/index.js index c37d2f95..cc536a74 100644 --- a/web/views/@default/clusters/cluster/node/boards/index.js +++ b/web/views/@default/clusters/cluster/node/boards/index.js @@ -9,17 +9,21 @@ Tea.context(function () { return (Math.round(count / 1000 / 1000 * 100) / 100) + "M" } - this.board.trafficInBytes = teaweb.formatBytes(this.board.trafficInBytes) - this.board.trafficOutBytes = teaweb.formatBytes(this.board.trafficOutBytes) - this.board.countConnections = this.formatCount(this.board.countConnections) - this.board.countRequests = this.formatCount(this.board.countRequests) - this.board.countAttackRequests = this.formatCount(this.board.countAttackRequests) - this.board.cpuUsage = Math.round(this.board.cpuUsage * 100 * 100) / 100 - this.board.memoryUsage = Math.round(this.board.memoryUsage * 100 * 100) / 100 - this.board.memoryTotalSize = Math.round(this.board.memoryTotalSize / 1024 / 1024 / 1024) - this.board.load = Math.round(this.board.load * 100) / 100 - this.board.cacheDiskSize = teaweb.formatBytes(this.board.cacheDiskSize) - this.board.cacheMemorySize = teaweb.formatBytes(this.board.cacheMemorySize) + this.loadBoard = function () { + this.board.trafficInBytes = teaweb.formatBytes(this.board.trafficInBytes) + this.board.trafficOutBytes = teaweb.formatBytes(this.board.trafficOutBytes) + this.board.countConnections = this.formatCount(this.board.countConnections) + this.board.countRequests = this.formatCount(this.board.countRequests) + this.board.countAttackRequests = this.formatCount(this.board.countAttackRequests) + this.board.cpuUsage = Math.round(this.board.cpuUsage * 100 * 100) / 100 + this.board.memoryUsage = Math.round(this.board.memoryUsage * 100 * 100) / 100 + this.board.memoryTotalSize = Math.round(this.board.memoryTotalSize / 1024 / 1024 / 1024) + this.board.load = Math.round(this.board.load * 100) / 100 + this.board.cacheDiskSize = teaweb.formatBytes(this.board.cacheDiskSize) + this.board.cacheMemorySize = teaweb.formatBytes(this.board.cacheMemorySize) + } + this.loadBoard() + /** * 流量统计 @@ -32,6 +36,26 @@ Tea.context(function () { this.reloadTopDomainsChart() this.reloadCPUChart() }) + this.$delay(function() { + this.refreshBoard() + }, 30000) + + this.refreshBoard = function() { + this.$post("$") + .params({ + clusterId: this.clusterId, + nodeId: this.node.id + }) + .success(function (resp) { + this.board = resp.data.board + this.loadBoard() + }) + .done(function () { + this.$delay(function () { + this.refreshBoard() + }, 60000) + }) + } this.selectTrafficTab = function (tab) { this.trafficTab = tab diff --git a/web/views/@default/clusters/cluster/nodes.html b/web/views/@default/clusters/cluster/nodes.html index 71bff8e0..01cad8bd 100644 --- a/web/views/@default/clusters/cluster/nodes.html +++ b/web/views/@default/clusters/cluster/nodes.html @@ -2,7 +2,7 @@ {$template "menu"} -
+
@@ -35,7 +35,8 @@
- +   + [清除条件]
@@ -55,28 +56,24 @@ 节点名称 - 所属区域 - 所属分组 IP DNS线路 - CPU - 内存 - + CPU + 内存 + 下行流量 状态 操作 - {{node.name}} - - {{node.region.name}} - - + {{node.name}} +
+ 区域：{{node.region.name}} +
+
+ 分组：{{node.group.name}} +
- - {{node.group.name}} - - - -
@@ -104,6 +101,10 @@ {{node.status.memUsageText}} - + + {{teaweb.formatBytes(node.status.trafficOutBytes)}}
/分钟 + - +
健康问题下线 diff --git a/web/views/@default/clusters/cluster/nodes.js b/web/views/@default/clusters/cluster/nodes.js index a5f8ce0e..6e626ee5 100644 --- a/web/views/@default/clusters/cluster/nodes.js +++ b/web/views/@default/clusters/cluster/nodes.js @@ -1,21 +1,23 @@ Tea.context(function () { - this.deleteNode = function (nodeId) { - teaweb.confirm("确定要删除这个节点吗？", function () { - this.$post("/nodes/delete") - .params({ - nodeId: nodeId - }) - .refresh(); - }) - } + this.teaweb = teaweb - this.upNode = function (nodeId) { - teaweb.confirm("确定要手动上线此节点吗？", function () { - this.$post("/clusters/cluster/node/up") - .params({ - nodeId: nodeId - }) - .refresh() - }) - } + this.deleteNode = function (nodeId) { + teaweb.confirm("确定要删除这个节点吗？", function () { + this.$post("/nodes/delete") + .params({ + nodeId: nodeId + }) + .refresh(); + }) + } + + this.upNode = function (nodeId) { + teaweb.confirm("确定要手动上线此节点吗？", function () { + this.$post("/clusters/cluster/node/up") + .params({ + nodeId: nodeId + }) + .refresh() + }) + } }) \ No newline at end of file