Merge pull request kubesphere#4711 from junotx/proc-monitor

add container processes/threads metrics
dkeven · Mar 7, 2022 · 7281996 · 7281996
2 parents 19048d5 + b205529
commit 7281996
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/pkg/models/monitoring/named_metrics.go b/pkg/models/monitoring/named_metrics.go
@@ -264,6 +264,8 @@ var ContainerMetrics = []string{
 	"container_cpu_usage",
 	"container_memory_usage",
 	"container_memory_usage_wo_cache",
+	"container_processes_usage",
+	"container_threads_usage",
 }
 
 var PVCMetrics = []string{

diff --git a/pkg/simple/client/monitoring/prometheus/promql.go b/pkg/simple/client/monitoring/prometheus/promql.go
@@ -214,6 +214,8 @@ var promQLTemplates = map[string]string{
 	"container_cpu_usage":             `round(sum by (namespace, pod, container) (irate(container_cpu_usage_seconds_total{job="kubelet", container!="POD", container!="", image!="", $1}[5m])), 0.001)`,
 	"container_memory_usage":          `sum by (namespace, pod, container) (container_memory_usage_bytes{job="kubelet", container!="POD", container!="", image!="", $1})`,
 	"container_memory_usage_wo_cache": `sum by (namespace, pod, container) (container_memory_working_set_bytes{job="kubelet", container!="POD", container!="", image!="", $1})`,
+	"container_processes_usage":       `sum by (namespace, pod, container) (container_processes{job="kubelet", container!="POD", container!="", image!="", $1})`,
+	"container_threads_usage":         `sum by (namespace, pod, container) (container_threads {job="kubelet", container!="POD", container!="", image!="", $1})`,
 
 	// pvc
 	"pvc_inodes_available":   `max by (namespace, persistentvolumeclaim) (kubelet_volume_stats_inodes_free) * on (namespace, persistentvolumeclaim) group_left (storageclass) kube_persistentvolumeclaim_info{$1}`,