From 772c628fe14063287ada31c5e434255efe8d5cd4 Mon Sep 17 00:00:00 2001
From: zhangwei <894646498@qq.com>
Date: Mon, 18 Dec 2023 18:29:29 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9B=91=E6=8E=A7=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Former-commit-id: ccdecc6eae18f9bce974c124ccd484d10d28899a
---
 api/internal/config/config.go | 1 -
 pkg/tracker/promql.go         | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/api/internal/config/config.go b/api/internal/config/config.go
index c731d85f..7f4b6dee 100644
--- a/api/internal/config/config.go
+++ b/api/internal/config/config.go
@@ -39,7 +39,6 @@ type Config struct {
 	OpenstackRpcConf    zrpc.RpcClientConf
 	OctopusRpcConf      zrpc.RpcClientConf
 	PcmCoreRpcConf      zrpc.RpcClientConf
-	NexusUrl            string
 	JccScheduleUrl      string
 	MinioConf           struct {
 		Secret    string
diff --git a/pkg/tracker/promql.go b/pkg/tracker/promql.go
index babc2dd8..cbad4c6d 100644
--- a/pkg/tracker/promql.go
+++ b/pkg/tracker/promql.go
@@ -60,8 +60,8 @@ var promQLTemplates = map[string]string{
 	"controller_memory_usage_rate": `round(sum by (owner_name) (sum by (owner_name, pod) (irate(container_memory_usage_bytes{job="kubelet", $1, image!=""}[5m]))/ sum by (owner_name,pod) (kube_pod_container_resource_limits{resource="memory"}))/count(kube_pod_info{$2}) by (owner_name),0.0001)`,
 	// pod
 	"pod_cpu_usage":              `round(sum by (namespace, pod) (irate(container_cpu_usage_seconds_total{job="kubelet", pod!="", image!=""}[5m])) * on (namespace, pod) group_left(owner_kind,owner_name) kube_pod_owner{$1} * on (namespace, pod) group_left(node) kube_pod_info{$2}, 0.001)`,
-	"pod_cpu_usage_rate":         `round(sum by ( pod) (irate(container_cpu_usage_seconds_total{job="kubelet", $1, image!=""}[5m]))/sum by (pod) (kube_pod_container_resource_limits{resource="cpu"}), 0.0001)`,
-	"pod_memory_usage_rate":      `round(sum by ( pod) (irate(container_memory_usage_bytes{job="kubelet", $1, image!=""}[5m]))/sum by (pod) (kube_pod_container_resource_limits{resource="memory"}), 0.0001)`,
+	"pod_cpu_usage_rate":         `sum(node_namespace_pod_container:container_cpu_usage_seconds_total:sum_irate{  $1}) by (pod) / sum(kube_pod_container_resource_limits{ $1,unit="core"}) by (pod)`,
+	"pod_memory_usage_rate":      `sum(container_memory_working_set_bytes{job="kubelet", $1, container!="", image!=""}) by (pod) / sum(kube_pod_container_resource_limits{ $1,unit="byte"}) by (pod)`,
 	"pod_memory_usage":           `sum by (namespace, pod) (container_memory_usage_bytes{job="kubelet", pod!="", image!=""}) * on (namespace, pod) group_left(owner_kind, owner_name) kube_pod_owner{$1} * on (namespace, pod) group_left(node) kube_pod_info{$2}`,
 	"pod_memory_usage_wo_cache":  `sum by (namespace, pod) (container_memory_working_set_bytes{job="kubelet", pod!="", image!=""}) * on (namespace, pod) group_left(owner_kind, owner_name) kube_pod_owner{$1} * on (namespace, pod) group_left(node) kube_pod_info{$2}`,
 	"pod_net_bytes_transmitted":  `sum by (namespace, pod) (irate(container_network_transmit_bytes_total{pod!="", interface!~"^(cali.+|tunl.+|dummy.+|kube.+|flannel.+|cni.+|docker.+|veth.+|lo.*)", job="kubelet"}[5m])) * on (namespace, pod) group_left(owner_kind, owner_name) kube_pod_owner{$1} * on (namespace, pod) group_left(node) kube_pod_info{$2}`,