From db6b7f57bb5b7b97c139bfbc68166ff5c6c4d02c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E7=A5=A5=E8=B6=85?= Date: Sat, 16 Apr 2022 22:22:05 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=9C=8B=E6=9D=BF=E4=B8=AD?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E6=95=B0=E6=8D=AE=E5=8F=AF=E8=83=BD=E4=B8=8D?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- internal/db/models/node_value_dao.go | 33 +++++++++++++++ .../rpc/services/nameservers/service_ns.go | 22 ++-------- .../rpc/services/service_server_stat_board.go | 40 ++++--------------- internal/rpc/services/service_user.go | 20 ++-------- 4 files changed, 48 insertions(+), 67 deletions(-) diff --git a/internal/db/models/node_value_dao.go b/internal/db/models/node_value_dao.go index e7b9daf8..6aef01df 100644 --- a/internal/db/models/node_value_dao.go +++ b/internal/db/models/node_value_dao.go @@ -122,6 +122,17 @@ func (this *NodeValueDAO) ListValuesWithClusterId(tx *dbs.Tx, role string, clust _, err = query.Slice(&result). FindAll() + + if err != nil { + return nil, err + } + + for _, nodeValue := range result { + nodeValue.Value, _ = json.Marshal(maps.Map{ + key: types.Float32(string(nodeValue.Value)), + }) + } + return } @@ -146,6 +157,17 @@ func (this *NodeValueDAO) ListValuesForUserNodes(tx *dbs.Tx, item string, key st _, err = query.Slice(&result). FindAll() + + if err != nil { + return nil, err + } + + for _, nodeValue := range result { + nodeValue.Value, _ = json.Marshal(maps.Map{ + key: types.Float32(string(nodeValue.Value)), + }) + } + return } @@ -170,6 +192,17 @@ func (this *NodeValueDAO) ListValuesForNSNodes(tx *dbs.Tx, item string, key stri _, err = query.Slice(&result). FindAll() + + if err != nil { + return nil, err + } + + for _, nodeValue := range result { + nodeValue.Value, _ = json.Marshal(maps.Map{ + key: types.Float32(string(nodeValue.Value)), + }) + } + return } diff --git a/internal/rpc/services/nameservers/service_ns.go b/internal/rpc/services/nameservers/service_ns.go index 8af9eeaf..fccea9fa 100644 --- a/internal/rpc/services/nameservers/service_ns.go +++ b/internal/rpc/services/nameservers/service_ns.go @@ -4,13 +4,11 @@ package nameservers import ( "context" - "encoding/json" "github.com/TeaOSLab/EdgeAPI/internal/db/models" "github.com/TeaOSLab/EdgeAPI/internal/db/models/nameservers" "github.com/TeaOSLab/EdgeAPI/internal/rpc/services" "github.com/TeaOSLab/EdgeCommon/pkg/nodeconfigs" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" - "github.com/iwind/TeaGo/types" timeutil "github.com/iwind/TeaGo/utils/time" "time" ) @@ -144,12 +142,8 @@ func (this *NSService) ComposeNSBoard(ctx context.Context, req *pb.ComposeNSBoar return nil, err } for _, v := range cpuValues { - valueJSON, err := json.Marshal(types.Float32(v.Value)) - if err != nil { - return nil, err - } result.CpuNodeValues = append(result.CpuNodeValues, &pb.NodeValue{ - ValueJSON: valueJSON, + ValueJSON: v.Value, CreatedAt: int64(v.CreatedAt), }) } @@ -159,27 +153,19 @@ func (this *NSService) ComposeNSBoard(ctx context.Context, req *pb.ComposeNSBoar return nil, err } for _, v := range memoryValues { - valueJSON, err := json.Marshal(types.Float32(v.Value)) - if err != nil { - return nil, err - } result.MemoryNodeValues = append(result.MemoryNodeValues, &pb.NodeValue{ - ValueJSON: valueJSON, + ValueJSON: v.Value, CreatedAt: int64(v.CreatedAt), }) } - loadValues, err := models.SharedNodeValueDAO.ListValuesForNSNodes(tx, nodeconfigs.NodeValueItemLoad, "load5m", nodeconfigs.NodeValueRangeMinute) + loadValues, err := models.SharedNodeValueDAO.ListValuesForNSNodes(tx, nodeconfigs.NodeValueItemLoad, "load1m", nodeconfigs.NodeValueRangeMinute) if err != nil { return nil, err } for _, v := range loadValues { - valueJSON, err := json.Marshal(types.Float32(v.Value)) - if err != nil { - return nil, err - } result.LoadNodeValues = append(result.LoadNodeValues, &pb.NodeValue{ - ValueJSON: valueJSON, + ValueJSON: v.Value, CreatedAt: int64(v.CreatedAt), }) } diff --git a/internal/rpc/services/service_server_stat_board.go b/internal/rpc/services/service_server_stat_board.go index b058635a..4b6cc71e 100644 --- a/internal/rpc/services/service_server_stat_board.go +++ b/internal/rpc/services/service_server_stat_board.go @@ -4,7 +4,6 @@ package services import ( "context" - "encoding/json" "github.com/TeaOSLab/EdgeAPI/internal/db/models" "github.com/TeaOSLab/EdgeAPI/internal/db/models/regions" "github.com/TeaOSLab/EdgeAPI/internal/db/models/stats" @@ -14,7 +13,6 @@ import ( "github.com/TeaOSLab/EdgeCommon/pkg/nodeconfigs" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs" - "github.com/iwind/TeaGo/types" timeutil "github.com/iwind/TeaGo/utils/time" "time" ) @@ -151,12 +149,8 @@ func (this *ServerStatBoardService) ComposeServerStatNodeClusterBoard(ctx contex return nil, err } for _, v := range cpuValues { - valueJSON, err := json.Marshal(types.Float32(v.Value)) - if err != nil { - return nil, err - } result.CpuNodeValues = append(result.CpuNodeValues, &pb.NodeValue{ - ValueJSON: valueJSON, + ValueJSON: v.Value, CreatedAt: int64(v.CreatedAt), }) } @@ -166,27 +160,19 @@ func (this *ServerStatBoardService) ComposeServerStatNodeClusterBoard(ctx contex return nil, err } for _, v := range memoryValues { - valueJSON, err := json.Marshal(types.Float32(v.Value)) - if err != nil { - return nil, err - } result.MemoryNodeValues = append(result.MemoryNodeValues, &pb.NodeValue{ - ValueJSON: valueJSON, + ValueJSON: v.Value, CreatedAt: int64(v.CreatedAt), }) } - loadValues, err := models.SharedNodeValueDAO.ListValuesWithClusterId(tx, "node", req.NodeClusterId, nodeconfigs.NodeValueItemLoad, "load5m", nodeconfigs.NodeValueRangeMinute) + loadValues, err := models.SharedNodeValueDAO.ListValuesWithClusterId(tx, "node", req.NodeClusterId, nodeconfigs.NodeValueItemLoad, "load1m", nodeconfigs.NodeValueRangeMinute) if err != nil { return nil, err } for _, v := range loadValues { - valueJSON, err := json.Marshal(types.Float32(v.Value)) - if err != nil { - return nil, err - } result.LoadNodeValues = append(result.LoadNodeValues, &pb.NodeValue{ - ValueJSON: valueJSON, + ValueJSON: v.Value, CreatedAt: int64(v.CreatedAt), }) } @@ -360,12 +346,8 @@ func (this *ServerStatBoardService) ComposeServerStatNodeBoard(ctx context.Conte return nil, err } for _, v := range cpuValues { - valueJSON, err := json.Marshal(types.Float32(v.DecodeMapValue().GetFloat32("usage"))) - if err != nil { - return nil, err - } result.CpuNodeValues = append(result.CpuNodeValues, &pb.NodeValue{ - ValueJSON: valueJSON, + ValueJSON: v.Value, CreatedAt: int64(v.CreatedAt), }) } @@ -375,12 +357,8 @@ func (this *ServerStatBoardService) ComposeServerStatNodeBoard(ctx context.Conte return nil, err } for _, v := range memoryValues { - valueJSON, err := json.Marshal(types.Float32(v.DecodeMapValue().GetFloat32("usage"))) - if err != nil { - return nil, err - } result.MemoryNodeValues = append(result.MemoryNodeValues, &pb.NodeValue{ - ValueJSON: valueJSON, + ValueJSON: v.Value, CreatedAt: int64(v.CreatedAt), }) } @@ -390,12 +368,8 @@ func (this *ServerStatBoardService) ComposeServerStatNodeBoard(ctx context.Conte return nil, err } for _, v := range loadValues { - valueJSON, err := json.Marshal(types.Float32(v.DecodeMapValue().GetFloat32("load5m"))) - if err != nil { - return nil, err - } result.LoadNodeValues = append(result.LoadNodeValues, &pb.NodeValue{ - ValueJSON: valueJSON, + ValueJSON: v.Value, CreatedAt: int64(v.CreatedAt), }) } diff --git a/internal/rpc/services/service_user.go b/internal/rpc/services/service_user.go index 3eee37ab..2a63b805 100644 --- a/internal/rpc/services/service_user.go +++ b/internal/rpc/services/service_user.go @@ -610,12 +610,8 @@ func (this *UserService) ComposeUserGlobalBoard(ctx context.Context, req *pb.Com return nil, err } for _, v := range cpuValues { - valueJSON, err := json.Marshal(types.Float32(v.Value)) - if err != nil { - return nil, err - } result.CpuNodeValues = append(result.CpuNodeValues, &pb.NodeValue{ - ValueJSON: valueJSON, + ValueJSON: v.Value, CreatedAt: int64(v.CreatedAt), }) } @@ -625,27 +621,19 @@ func (this *UserService) ComposeUserGlobalBoard(ctx context.Context, req *pb.Com return nil, err } for _, v := range memoryValues { - valueJSON, err := json.Marshal(types.Float32(v.Value)) - if err != nil { - return nil, err - } result.MemoryNodeValues = append(result.MemoryNodeValues, &pb.NodeValue{ - ValueJSON: valueJSON, + ValueJSON: v.Value, CreatedAt: int64(v.CreatedAt), }) } - loadValues, err := models.SharedNodeValueDAO.ListValuesForUserNodes(tx, nodeconfigs.NodeValueItemLoad, "load5m", nodeconfigs.NodeValueRangeMinute) + loadValues, err := models.SharedNodeValueDAO.ListValuesForUserNodes(tx, nodeconfigs.NodeValueItemLoad, "load1m", nodeconfigs.NodeValueRangeMinute) if err != nil { return nil, err } for _, v := range loadValues { - valueJSON, err := json.Marshal(types.Float32(v.Value)) - if err != nil { - return nil, err - } result.LoadNodeValues = append(result.LoadNodeValues, &pb.NodeValue{ - ValueJSON: valueJSON, + ValueJSON: v.Value, CreatedAt: int64(v.CreatedAt), }) }