fix: node incorrect information acquisition (#1537)

goodrain · Feb 3, 2023 · 5963578 · 5963578
1 parent 5f0bd8c
commit 5963578
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/api/handler/nodes.go b/api/handler/nodes.go
@@ -161,13 +161,13 @@ func (n *nodesHandle) HandleNodeInfo(node v1.Node) (nodeinfo model.NodeInfo, err
 	}
 	// req resource from Prometheus
 	var query string
-	query = fmt.Sprintf(`sum(rbd_api_exporter_cluster_pod_memory{node_name="%v"})`, node.Name)
+	query = fmt.Sprintf(`sum(rbd_api_exporter_cluster_pod_memory{node_name="%v"}) by (instance)`, node.Name)
 	podMemoryMetric := n.prometheusCli.GetMetric(query, time.Now())
 
-	query = fmt.Sprintf(`sum(rbd_api_exporter_cluster_pod_cpu{node_name="%v"})`, node.Name)
+	query = fmt.Sprintf(`sum(rbd_api_exporter_cluster_pod_cpu{node_name="%v"}) by (instance)`, node.Name)
 	podCPUMetric := n.prometheusCli.GetMetric(query, time.Now())
 
-	query = fmt.Sprintf(`sum(rbd_api_exporter_cluster_pod_ephemeral_storage{node_name="%v"})`, node.Name)
+	query = fmt.Sprintf(`sum(rbd_api_exporter_cluster_pod_ephemeral_storage{node_name="%v"}) by (instance)`, node.Name)
 	podEphemeralStorageMetric := n.prometheusCli.GetMetric(query, time.Now())
 
 	for i, memory := range podMemoryMetric.MetricData.MetricValues {