Modify cpu query for rancher cluster

Signed-off-by: Arnob kumar saha <[email protected]>
kubeops · Oct 1, 2024 · 1118772 · 1118772
1 parent e1f40a3
commit 1118772
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 5 deletions.
diff --git a/go.mod b/go.mod
@@ -48,7 +48,7 @@ require (
 	kmodules.xyz/client-go v0.30.17
 	kmodules.xyz/custom-resources v0.30.0
 	kmodules.xyz/go-containerregistry v0.0.12
-	kmodules.xyz/monitoring-agent-api v0.30.1-0.20240922035723-c44bae62658a
+	kmodules.xyz/monitoring-agent-api v0.30.2-0.20241001043315-b98120efea48
 	kmodules.xyz/offshoot-api v0.30.1
 	kmodules.xyz/resource-metadata v0.18.16-0.20240929130110-f5f4e27aae5b
 	kmodules.xyz/resource-metrics v0.30.4

diff --git a/go.sum b/go.sum
@@ -930,8 +930,8 @@ kmodules.xyz/custom-resources v0.30.0 h1:vR3CbseHMLwR4GvtcJJuRuwIV8voKqFqNii27rM
 kmodules.xyz/custom-resources v0.30.0/go.mod h1:ZsTuI2mLG2s3byre7bHmpxJ9w0HDqAkRTL1+izGFI24=
 kmodules.xyz/go-containerregistry v0.0.12 h1:Tl32QGmSqRVm9PUEb/f3dgDeu9zW5fVzt3qmAFIE37I=
 kmodules.xyz/go-containerregistry v0.0.12/go.mod h1:KgeNg0hDsgeda+qc0NzWk0iVRdF0+ZIg/oRzGoYh78I=
-kmodules.xyz/monitoring-agent-api v0.30.1-0.20240922035723-c44bae62658a h1:R31pYtGoDiHWsDwPCGJ3Gt7UBn2QBRAdTfYyAxsC6/w=
-kmodules.xyz/monitoring-agent-api v0.30.1-0.20240922035723-c44bae62658a/go.mod h1:wNJna790BXspkN1ior9J+RI3pr+3B8LFtiumOvh8qKg=
+kmodules.xyz/monitoring-agent-api v0.30.2-0.20241001043315-b98120efea48 h1:kJdO71ku1oU+IckB9myBvUi55PL5fcQ6vQXyZb9ljKk=
+kmodules.xyz/monitoring-agent-api v0.30.2-0.20241001043315-b98120efea48/go.mod h1:oR3tk5O4koYar4cD9N3AjbBFr9XTwBU3sw9qD2NdNQc=
 kmodules.xyz/offshoot-api v0.30.1 h1:TrulAYO+oBsXe9sZZGTmNWIuI8qD2izMpgcTSPvgAmI=
 kmodules.xyz/offshoot-api v0.30.1/go.mod h1:T3mpjR6fui0QzOcmQvIuANytW48fe9ytmy/1cgx6D4g=
 kmodules.xyz/resource-metadata v0.18.16-0.20240929130110-f5f4e27aae5b h1:lnjpyQOfirCPMq5lgLJMUPnPqMRgHQLqHaZCkBk+dm8=

diff --git a/vendor/kmodules.xyz/monitoring-agent-api/client/resource.go b/vendor/kmodules.xyz/monitoring-agent-api/client/resource.go
@@ -35,7 +35,18 @@ import (
 func GetPodResourceUsage(pc promv1.API, obj metav1.ObjectMeta) core.ResourceList {
 	resUsage := core.ResourceList{}
 
-	promCPUQuery := fmt.Sprintf(`sum(node_namespace_pod_container:container_cpu_usage_seconds_total:sum_irate{namespace="%s", pod="%s", container!=""})`, obj.Namespace, obj.Name)
+	// Previous way: sum(node_namespace_pod_container:container_cpu_usage_seconds_total:sum_irate{namespace="%s", pod="%s", container!=""})
+	promCPUQuery := fmt.Sprintf(`sum(
+		sum by (namespace, pod, container) (
+			irate(container_cpu_usage_seconds_total{image!="",metrics_path="/metrics/cadvisor",namespace="%s", pod="%s"}[5m])
+		)
+		* on (namespace, pod) group_left (node)
+		topk by (namespace, pod) (1,
+			max by (namespace, pod, node) (
+				kube_pod_info{node!="",namespace="%s", pod="%s"}
+			)
+		)
+	) by (pod)`, obj.Namespace, obj.Name, obj.Namespace, obj.Name)
 	promMemoryQuery := fmt.Sprintf(`sum(container_memory_working_set_bytes{namespace="%s", pod="%s", container!="", image!=""})`, obj.Namespace, obj.Name)
 	promStorageQuery := fmt.Sprintf(`avg(container_blkio_device_usage_total{namespace="%s", pod="%s"})`, obj.Namespace, obj.Name)
 

diff --git a/vendor/modules.txt b/vendor/modules.txt
@@ -2027,7 +2027,7 @@ kmodules.xyz/custom-resources/crds
 # kmodules.xyz/go-containerregistry v0.0.12
 ## explicit; go 1.21.5
 kmodules.xyz/go-containerregistry/name
-# kmodules.xyz/monitoring-agent-api v0.30.1-0.20240922035723-c44bae62658a
+# kmodules.xyz/monitoring-agent-api v0.30.2-0.20241001043315-b98120efea48
 ## explicit; go 1.22.0
 kmodules.xyz/monitoring-agent-api/api/v1
 kmodules.xyz/monitoring-agent-api/client