From 819795ab55653b4b179d89642101c058f9a65506 Mon Sep 17 00:00:00 2001 From: yinbinbin Date: Thu, 17 Nov 2022 15:23:45 +0800 Subject: [PATCH 1/2] mservice:fix config file & log file path Signed-off-by: yinbinbin --- Makefile | 2 +- source/tools/monitor/mservice/master/conf/sysakmon.conf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index d11a6847..d9d6a0d0 100644 --- a/Makefile +++ b/Makefile @@ -72,7 +72,7 @@ install: mkdir -p /var/log/sysak cp $(SRC)/../rpm/sysak_server.conf /usr/local/sysak/ ifneq ($(wildcard $(OBJPATH)/.sysak_components/tools/monitor/sysakmon.conf),) - cp $(OBJPATH)/.sysak_components/tools/monitor/sysakmon.conf /etc/sysak/ + cp $(OBJPATH)/.sysak_components/tools/monitor/sysakmon.conf /usr/local/sysak/ cp $(SRC)/../rpm/sysak.service /usr/lib/systemd/system/ endif diff --git a/source/tools/monitor/mservice/master/conf/sysakmon.conf b/source/tools/monitor/mservice/master/conf/sysakmon.conf index 0ebbf80b..7688611c 100644 --- a/source/tools/monitor/mservice/master/conf/sysakmon.conf +++ b/source/tools/monitor/mservice/master/conf/sysakmon.conf @@ -29,7 +29,7 @@ mod_numabalance on output_interface file ####[output_file] original data to store -output_file_path /usr/local/sysak/log/tsar.data +output_file_path /usr/local/sysak/tsar.data ####[output_stdio] these mod will be show as using tsar command output_stdio_mod mod_swap,mod_partition,mod_cpu,mod_mem,mod_lvs,mod_haproxy,mod_traffic,mod_squid,mod_load,mod_tcp,mod_udp,mod_tcpx,mod_apache,mod_pcsw,mod_io,mod_percpu -- Gitee From ae9c67fb251e06bb921ab0ee8683b055fcc6dc3e Mon Sep 17 00:00:00 2001 From: yinbinbin Date: Mon, 21 Nov 2022 11:37:25 +0800 Subject: [PATCH 2/2] reserved memory value Signed-off-by: yinbinbin --- source/tools/detect/mem/memgraph/memgraph.py | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/source/tools/detect/mem/memgraph/memgraph.py b/source/tools/detect/mem/memgraph/memgraph.py index 900f07fb..b2d1c3be 100644 --- a/source/tools/detect/mem/memgraph/memgraph.py +++ b/source/tools/detect/mem/memgraph/memgraph.py @@ -132,7 +132,24 @@ def hugepagesz_supported(hugepagesz): return True return False +def get_reserved_mem(meminfo): + cmd = "cat /proc/iomem | grep -wE 'Reserved|Crash kernel|Kernel code|Kernel data|Kernel bss'" + ret = os.popen(cmd).read().split("\n") + total = 0 + for line in ret: + line = line.strip() + if len(line) < 10: + continue + addr = line.split(":")[0].strip() + start = addr.split("-")[0].strip() + end = addr.split("-")[1].strip() + size = int(end,16) - int(start,16) + total += size + meminfo['res'] = total/1024 + def get_page_used(meminfo): + get_reserved_mem(meminfo) + user = meminfo["Active(anon)"] + meminfo["Inactive(anon)"] user += meminfo["Active(file)"] + meminfo["Inactive(file)"] user += meminfo["Mlocked"] @@ -140,7 +157,7 @@ def get_page_used(meminfo): user += meminfo["2048"] if "1048576" in meminfo: user += meminfo["1048576"] - kernelOther = meminfo["Slab"] + meminfo["KernelStack"] + meminfo["PageTables"] + kernelOther = meminfo["Slab"] + meminfo["KernelStack"] + meminfo["PageTables"] + meminfo['res'] kernelOther += meminfo["VmallocUsed"] pageUsed = meminfo["MemTotal"] - meminfo["MemFree"] - user - kernelOther if pageUsed < 1: @@ -233,6 +250,7 @@ def memgraph_graph(meminfo): user["shmem"] = meminfo["Shmem"] res["user"] = user kernel = {} + kernel["res"] = meminfo["res"] kernel["SReclaimable"] = meminfo["SReclaimable"] kernel["SUnreclaim"] = meminfo["SUnreclaim"] kernel["KernelStack"] = meminfo["KernelStack"] -- Gitee