diff --git a/internal/web/actions/default/clusters/cluster/init.go b/internal/web/actions/default/clusters/cluster/init.go index ed04ec4b..0845f115 100644 --- a/internal/web/actions/default/clusters/cluster/init.go +++ b/internal/web/actions/default/clusters/cluster/init.go @@ -6,7 +6,6 @@ import ( "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/clusters/cluster/groups" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/clusters/cluster/node" nodeboards "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/clusters/cluster/node/boards" - "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/clusters/cluster/node/monitor" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/clusters/cluster/node/thresholds" clusters "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/clusters/clusterutils" "github.com/TeaOSLab/EdgeAdmin/internal/web/helpers" @@ -43,13 +42,6 @@ func init() { Post("/start", new(node.StartAction)). Post("/stop", new(node.StopAction)). Post("/up", new(node.UpAction)). - Get("/monitor", new(monitor.IndexAction)). - Post("/monitor/cpu", new(monitor.CpuAction)). - Post("/monitor/memory", new(monitor.MemoryAction)). - Post("/monitor/load", new(monitor.LoadAction)). - Post("/monitor/trafficIn", new(monitor.TrafficInAction)). - Post("/monitor/trafficOut", new(monitor.TrafficOutAction)). - Post("/monitor/connections", new(monitor.ConnectionsAction)). Get("/thresholds", new(thresholds.IndexAction)). Get("/detail", new(node.DetailAction)). Get("/boards", new(nodeboards.IndexAction)). diff --git a/internal/web/actions/default/clusters/cluster/node/monitor/connections.go b/internal/web/actions/default/clusters/cluster/node/monitor/connections.go deleted file mode 100644 index f4aa111f..00000000 --- a/internal/web/actions/default/clusters/cluster/node/monitor/connections.go +++ /dev/null @@ -1,73 +0,0 @@ -// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved. - -package monitor - -import ( - "encoding/json" - "github.com/TeaOSLab/EdgeAdmin/internal/utils/numberutils" - "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/maps" - timeutil "github.com/iwind/TeaGo/utils/time" - "time" -) - -type ConnectionsAction struct { - actionutils.ParentAction -} - -func (this *ConnectionsAction) RunPost(params struct { - NodeId int64 -}) { - resp, err := this.RPC().NodeValueRPC().ListNodeValues(this.AdminContext(), &pb.ListNodeValuesRequest{ - Role: "node", - NodeId: params.NodeId, - Item: nodeconfigs.NodeValueItemConnections, - Range: nodeconfigs.NodeValueRangeMinute, - }) - if err != nil { - this.ErrorPage(err) - return - } - valuesMap := map[string]int64{} // YmdHi => count - for _, v := range resp.NodeValues { - if len(v.ValueJSON) == 0 { - continue - } - - valueMap := maps.Map{} - err = json.Unmarshal(v.ValueJSON, &valueMap) - if err != nil { - this.ErrorPage(err) - return - } - - valuesMap[timeutil.FormatTime("YmdHi", v.CreatedAt)] = valueMap.GetInt64("total") - } - - // 过去一个小时 - result := []maps.Map{} - for i := 60; i >= 1; i-- { - timestamp := time.Now().Unix() - int64(i)*60 - minute := timeutil.FormatTime("YmdHi", timestamp) - total, ok := valuesMap[minute] - if ok { - result = append(result, maps.Map{ - "label": timeutil.FormatTime("H:i", timestamp), - "value": total, - "text": numberutils.FormatInt64(total), - }) - } else { - result = append(result, maps.Map{ - "label": timeutil.FormatTime("H:i", timestamp), - "value": 0, - "text": "0", - }) - } - } - - this.Data["values"] = result - - this.Success() -} diff --git a/internal/web/actions/default/clusters/cluster/node/monitor/cpu.go b/internal/web/actions/default/clusters/cluster/node/monitor/cpu.go deleted file mode 100644 index c0964918..00000000 --- a/internal/web/actions/default/clusters/cluster/node/monitor/cpu.go +++ /dev/null @@ -1,73 +0,0 @@ -// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved. - -package monitor - -import ( - "encoding/json" - "fmt" - "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/maps" - timeutil "github.com/iwind/TeaGo/utils/time" - "time" -) - -type CpuAction struct { - actionutils.ParentAction -} - -func (this *CpuAction) RunPost(params struct { - NodeId int64 -}) { - resp, err := this.RPC().NodeValueRPC().ListNodeValues(this.AdminContext(), &pb.ListNodeValuesRequest{ - Role: "node", - NodeId: params.NodeId, - Item: nodeconfigs.NodeValueItemCPU, - Range: nodeconfigs.NodeValueRangeMinute, - }) - if err != nil { - this.ErrorPage(err) - return - } - valuesMap := map[string]float32{} // YmdHi => usage - for _, v := range resp.NodeValues { - if len(v.ValueJSON) == 0 { - continue - } - - valueMap := maps.Map{} - err = json.Unmarshal(v.ValueJSON, &valueMap) - if err != nil { - this.ErrorPage(err) - return - } - - valuesMap[timeutil.FormatTime("YmdHi", v.CreatedAt)] = valueMap.GetFloat32("usage") * 100 - } - - // 过去一个小时 - result := []maps.Map{} - for i := 60; i >= 1; i-- { - timestamp := time.Now().Unix() - int64(i)*60 - minute := timeutil.FormatTime("YmdHi", timestamp) - total, ok := valuesMap[minute] - if ok { - result = append(result, maps.Map{ - "label": timeutil.FormatTime("H:i", timestamp), - "value": total, - "text": fmt.Sprintf("%.2f%%", total), - }) - } else { - result = append(result, maps.Map{ - "label": timeutil.FormatTime("H:i", timestamp), - "value": 0, - "text": "0.0%", - }) - } - } - - this.Data["values"] = result - - this.Success() -} diff --git a/internal/web/actions/default/clusters/cluster/node/monitor/index.go b/internal/web/actions/default/clusters/cluster/node/monitor/index.go deleted file mode 100644 index 061cd9c9..00000000 --- a/internal/web/actions/default/clusters/cluster/node/monitor/index.go +++ /dev/null @@ -1,31 +0,0 @@ -// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved. - -package monitor - -import ( - "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" - "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/clusters/cluster/node/nodeutils" -) - -type IndexAction struct { - actionutils.ParentAction -} - -func (this *IndexAction) Init() { - this.Nav("", "node", "monitor") -} - -func (this *IndexAction) RunGet(params struct { - NodeId int64 -}) { - this.Data["nodeId"] = params.NodeId - - // 初始化节点信息(用于菜单) - err := nodeutils.InitNodeInfo(this, params.NodeId) - if err != nil { - this.ErrorPage(err) - return - } - - this.Show() -} diff --git a/internal/web/actions/default/clusters/cluster/node/monitor/load.go b/internal/web/actions/default/clusters/cluster/node/monitor/load.go deleted file mode 100644 index b31c3663..00000000 --- a/internal/web/actions/default/clusters/cluster/node/monitor/load.go +++ /dev/null @@ -1,73 +0,0 @@ -// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved. - -package monitor - -import ( - "encoding/json" - "fmt" - "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/maps" - timeutil "github.com/iwind/TeaGo/utils/time" - "time" -) - -type LoadAction struct { - actionutils.ParentAction -} - -func (this *LoadAction) RunPost(params struct { - NodeId int64 -}) { - resp, err := this.RPC().NodeValueRPC().ListNodeValues(this.AdminContext(), &pb.ListNodeValuesRequest{ - Role: "node", - NodeId: params.NodeId, - Item: nodeconfigs.NodeValueItemLoad, - Range: nodeconfigs.NodeValueRangeMinute, - }) - if err != nil { - this.ErrorPage(err) - return - } - valuesMap := map[string]float32{} // YmdHi => load5m - for _, v := range resp.NodeValues { - if len(v.ValueJSON) == 0 { - continue - } - - valueMap := maps.Map{} - err = json.Unmarshal(v.ValueJSON, &valueMap) - if err != nil { - this.ErrorPage(err) - return - } - - valuesMap[timeutil.FormatTime("YmdHi", v.CreatedAt)] = valueMap.GetFloat32("load5m") - } - - // 过去一个小时 - result := []maps.Map{} - for i := 60; i >= 1; i-- { - timestamp := time.Now().Unix() - int64(i)*60 - minute := timeutil.FormatTime("YmdHi", timestamp) - total, ok := valuesMap[minute] - if ok { - result = append(result, maps.Map{ - "label": timeutil.FormatTime("H:i", timestamp), - "value": total, - "text": fmt.Sprintf("5分钟: %.2f", total), - }) - } else { - result = append(result, maps.Map{ - "label": timeutil.FormatTime("H:i", timestamp), - "value": 0, - "text": "5分钟: 0.0", - }) - } - } - - this.Data["values"] = result - - this.Success() -} diff --git a/internal/web/actions/default/clusters/cluster/node/monitor/memory.go b/internal/web/actions/default/clusters/cluster/node/monitor/memory.go deleted file mode 100644 index 4b4e7255..00000000 --- a/internal/web/actions/default/clusters/cluster/node/monitor/memory.go +++ /dev/null @@ -1,73 +0,0 @@ -// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved. - -package monitor - -import ( - "encoding/json" - "fmt" - "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/maps" - timeutil "github.com/iwind/TeaGo/utils/time" - "time" -) - -type MemoryAction struct { - actionutils.ParentAction -} - -func (this *MemoryAction) RunPost(params struct { - NodeId int64 -}) { - resp, err := this.RPC().NodeValueRPC().ListNodeValues(this.AdminContext(), &pb.ListNodeValuesRequest{ - Role: "node", - NodeId: params.NodeId, - Item: nodeconfigs.NodeValueItemMemory, - Range: nodeconfigs.NodeValueRangeMinute, - }) - if err != nil { - this.ErrorPage(err) - return - } - valuesMap := map[string]float32{} // YmdHi => usage - for _, v := range resp.NodeValues { - if len(v.ValueJSON) == 0 { - continue - } - - valueMap := maps.Map{} - err = json.Unmarshal(v.ValueJSON, &valueMap) - if err != nil { - this.ErrorPage(err) - return - } - - valuesMap[timeutil.FormatTime("YmdHi", v.CreatedAt)] = valueMap.GetFloat32("usage") * 100 - } - - // 过去一个小时 - result := []maps.Map{} - for i := 60; i >= 1; i-- { - timestamp := time.Now().Unix() - int64(i)*60 - minute := timeutil.FormatTime("YmdHi", timestamp) - total, ok := valuesMap[minute] - if ok { - result = append(result, maps.Map{ - "label": timeutil.FormatTime("H:i", timestamp), - "value": total, - "text": fmt.Sprintf("%.2f%%", total), - }) - } else { - result = append(result, maps.Map{ - "label": timeutil.FormatTime("H:i", timestamp), - "value": 0, - "text": "0.0%", - }) - } - } - - this.Data["values"] = result - - this.Success() -} diff --git a/internal/web/actions/default/clusters/cluster/node/monitor/trafficIn.go b/internal/web/actions/default/clusters/cluster/node/monitor/trafficIn.go deleted file mode 100644 index e68c0c43..00000000 --- a/internal/web/actions/default/clusters/cluster/node/monitor/trafficIn.go +++ /dev/null @@ -1,73 +0,0 @@ -// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved. - -package monitor - -import ( - "encoding/json" - "github.com/TeaOSLab/EdgeAdmin/internal/utils/numberutils" - "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/maps" - timeutil "github.com/iwind/TeaGo/utils/time" - "time" -) - -type TrafficInAction struct { - actionutils.ParentAction -} - -func (this *TrafficInAction) RunPost(params struct { - NodeId int64 -}) { - resp, err := this.RPC().NodeValueRPC().ListNodeValues(this.AdminContext(), &pb.ListNodeValuesRequest{ - Role: "node", - NodeId: params.NodeId, - Item: nodeconfigs.NodeValueItemTrafficIn, - Range: nodeconfigs.NodeValueRangeMinute, - }) - if err != nil { - this.ErrorPage(err) - return - } - valuesMap := map[string]int64{} // YmdHi => bytes - for _, v := range resp.NodeValues { - if len(v.ValueJSON) == 0 { - continue - } - - valueMap := maps.Map{} - err = json.Unmarshal(v.ValueJSON, &valueMap) - if err != nil { - this.ErrorPage(err) - return - } - - valuesMap[timeutil.FormatTime("YmdHi", v.CreatedAt)] = valueMap.GetInt64("total") - } - - // 过去一个小时 - result := []maps.Map{} - for i := 60; i >= 1; i-- { - timestamp := time.Now().Unix() - int64(i)*60 - minute := timeutil.FormatTime("YmdHi", timestamp) - total, ok := valuesMap[minute] - if ok { - result = append(result, maps.Map{ - "label": timeutil.FormatTime("H:i", timestamp), - "value": total / 60, - "text": numberutils.FormatBytes(total / 60), - }) - } else { - result = append(result, maps.Map{ - "label": timeutil.FormatTime("H:i", timestamp), - "value": 0, - "text": numberutils.FormatBytes(0), - }) - } - } - - this.Data["values"] = result - - this.Success() -} diff --git a/internal/web/actions/default/clusters/cluster/node/monitor/trafficOut.go b/internal/web/actions/default/clusters/cluster/node/monitor/trafficOut.go deleted file mode 100644 index f0752428..00000000 --- a/internal/web/actions/default/clusters/cluster/node/monitor/trafficOut.go +++ /dev/null @@ -1,73 +0,0 @@ -// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved. - -package monitor - -import ( - "encoding/json" - "github.com/TeaOSLab/EdgeAdmin/internal/utils/numberutils" - "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/maps" - timeutil "github.com/iwind/TeaGo/utils/time" - "time" -) - -type TrafficOutAction struct { - actionutils.ParentAction -} - -func (this *TrafficOutAction) RunPost(params struct { - NodeId int64 -}) { - resp, err := this.RPC().NodeValueRPC().ListNodeValues(this.AdminContext(), &pb.ListNodeValuesRequest{ - Role: "node", - NodeId: params.NodeId, - Item: nodeconfigs.NodeValueItemTrafficOut, - Range: nodeconfigs.NodeValueRangeMinute, - }) - if err != nil { - this.ErrorPage(err) - return - } - valuesMap := map[string]int64{} // YmdHi => bytes - for _, v := range resp.NodeValues { - if len(v.ValueJSON) == 0 { - continue - } - - valueMap := maps.Map{} - err = json.Unmarshal(v.ValueJSON, &valueMap) - if err != nil { - this.ErrorPage(err) - return - } - - valuesMap[timeutil.FormatTime("YmdHi", v.CreatedAt)] = valueMap.GetInt64("total") - } - - // 过去一个小时 - result := []maps.Map{} - for i := 60; i >= 1; i-- { - timestamp := time.Now().Unix() - int64(i)*60 - minute := timeutil.FormatTime("YmdHi", timestamp) - total, ok := valuesMap[minute] - if ok { - result = append(result, maps.Map{ - "label": timeutil.FormatTime("H:i", timestamp), - "value": total / 60, - "text": numberutils.FormatBytes(total / 60), - }) - } else { - result = append(result, maps.Map{ - "label": timeutil.FormatTime("H:i", timestamp), - "value": 0, - "text": numberutils.FormatBytes(0), - }) - } - } - - this.Data["values"] = result - - this.Success() -} diff --git a/web/views/@default/clusters/cluster/node/monitor/index.css b/web/views/@default/clusters/cluster/node/monitor/index.css deleted file mode 100644 index 3007cba5..00000000 --- a/web/views/@default/clusters/cluster/node/monitor/index.css +++ /dev/null @@ -1,4 +0,0 @@ -.chart-box { - height: 20em; -} -/*# sourceMappingURL=index.css.map */ \ No newline at end of file diff --git a/web/views/@default/clusters/cluster/node/monitor/index.css.map b/web/views/@default/clusters/cluster/node/monitor/index.css.map deleted file mode 100644 index 8c66954e..00000000 --- a/web/views/@default/clusters/cluster/node/monitor/index.css.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"sources":["index.less"],"names":[],"mappings":"AAAA;EACC,YAAA","file":"index.css"} \ No newline at end of file diff --git a/web/views/@default/clusters/cluster/node/monitor/index.html b/web/views/@default/clusters/cluster/node/monitor/index.html deleted file mode 100644 index 020dd0c8..00000000 --- a/web/views/@default/clusters/cluster/node/monitor/index.html +++ /dev/null @@ -1,21 +0,0 @@ -{$layout} -{$template "../node_menu"} -{$template "/echarts"} - -