From 3615213715d544a1c511650f9c171468b1820272 Mon Sep 17 00:00:00 2001
From: Hailong Liu <liuhailong@linux.alibaba.com>
Date: Thu, 13 Jul 2023 17:30:29 +0800
Subject: [PATCH] unity/etc: Add some metrics for k8s.yaml

Signed-off-by: Hailong Liu <liuhailong@linux.alibaba.com>
---
 source/tools/monitor/unity/etc/k8s.yaml | 36 ++++++++++++++++++++-----
 1 file changed, 29 insertions(+), 7 deletions(-)

diff --git a/source/tools/monitor/unity/etc/k8s.yaml b/source/tools/monitor/unity/etc/k8s.yaml
index 19e6059e..8b9f1690 100644
--- a/source/tools/monitor/unity/etc/k8s.yaml
+++ b/source/tools/monitor/unity/etc/k8s.yaml
@@ -25,7 +25,10 @@ outline:
 
 container:
   mode: "pods"
-  luaPlugin: ["cg_cpu_cfs_quota","cg_mem_drcm_glob_latency","cg_memory_util","cg_cpu_stat_sample", "cg_cpuacct_stat","cg_memory_drcm_latency", "cg_memory_fail_cnt","cg_memory_dcmp_latency"]
+  #"cg_cpuacct_stat" is a substitute of cg_cpuacct_proc_stat
+  luaPlugin: ["cg_memory_fail_cnt", "cg_memory_util", "cg_memory_dcmp_latency",
+             "cg_memory_drcm_latency", "cg_cpuacct_wait_latency", "cg_cpuacct_proc_stat",
+             "cg_cpu_stat", "cg_pmu_events", "cg_cpu_cfs_quota", "cg_mem_drcm_glob_latency"]
   directCgPath:
     - "/"
     - "/kubepods.slice"
@@ -277,13 +280,12 @@ metrics:
     head: value
     help: "sysom_cg_memory_util"
     type: "gauge"
-  - title: sysom_cg_memgdrcm_latency
+  - title: sysak_cg_mem_glob_drcm_latency
     from: cgGlbDrcmLatency
     head: value
     help: "sysom global memory latency"
     type: "gauge"
-
-  - title: sysom_cg_memdrcm_latency
+  - title: sysom_cg_mem_drcm_latency
     from: cg_memdrcm_latency
     head: value
     help: "sysom_cg_memdrcm_latency"
@@ -293,6 +295,26 @@ metrics:
     head: value
     help: "sysom_cg_memmcmp_latency"
     type: "gauge"
+  - title: sysak_cg_mem_dcmp_latency
+    from: cg_memdcmp_latency
+    head: value
+    help: "sysak_cg_mem_dcmp_latency"
+    type: "gauge"
+  - title: sysak_cg_cpuacct_wait_latency
+    from: cg_wait_latency
+    head: value
+    help: "sysak_cg_cpuacct_wait_latency"
+    type: "gauge"
+  - title: sysak_cg_cpuacct_proc_stat
+    from: cg_cpuacct_proc_stat
+    head: value
+    help: "sysak_cg_cpuacct_proc_stat"
+    type: "gauge"
+  - title: sysak_cg_cpu_quota
+    from: cgCpuQuota
+    head: value
+    help: "quota_us,peroid_us and quota/period"
+    type: "gauge"
   - title: sysom_cg_cpu_stat
     from: cg_cpu_stat
     head: value
@@ -303,8 +325,8 @@ metrics:
     head: value
     help: "cpuacct/cpuacct.stat"
     type: "gauge"
-  - title: sysom_cg_cfs_quota
-    from: cgCpuQuota
+  - title: sysak_cg_pmu_events
+    from: pmu_cg_events
     head: value
-    help: "cfs quota"
+    help: "pmu events of cgroups"
     type: "gauge"
-- 
Gitee