From fbbe00363fcc5d2b5c5beb940ef4b8aa7076ff49 Mon Sep 17 00:00:00 2001 From: Nimbus318 <136771156+Nimbus318@users.noreply.github.com> Date: Fri, 25 Oct 2024 18:22:48 +0800 Subject: [PATCH] fix(node): update PromQL query for node core and memory totals --- server/internal/service/node.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server/internal/service/node.go b/server/internal/service/node.go index 0f46cac..0dafb37 100644 --- a/server/internal/service/node.go +++ b/server/internal/service/node.go @@ -127,12 +127,12 @@ func (s *NodeService) buildNodeReply(ctx context.Context, node *biz.Node) (*pb.N func (s *NodeService) queryNodeMetrics(ctx context.Context, nodeName string) (int32, int32, error) { coreTotal, memoryTotal := int32(0), int32(0) - resp, err := s.ms.QueryInstant(ctx, &pb.QueryInstantRequest{Query: fmt.Sprintf("avg(hami_core_size{node=~\"%s\"})", nodeName)}) + resp, err := s.ms.QueryInstant(ctx, &pb.QueryInstantRequest{Query: fmt.Sprintf("avg(sum(hami_core_size{node=~\"%s\"}) by (instance))", nodeName)}) if err == nil && len(resp.Data) > 0 { coreTotal = int32(resp.Data[0].Value) } - resp, err = s.ms.QueryInstant(ctx, &pb.QueryInstantRequest{Query: fmt.Sprintf("avg(hami_memory_size{node=~\"%s\"})", nodeName)}) + resp, err = s.ms.QueryInstant(ctx, &pb.QueryInstantRequest{Query: fmt.Sprintf("avg(sum(hami_memory_size{node=~\"%s\"}) by (instance))", nodeName)}) if err == nil && len(resp.Data) > 0 { memoryTotal = int32(resp.Data[0].Value) }