From 3973170a67e5e590f7708f4f63651c1b091d0c60 Mon Sep 17 00:00:00 2001 From: yinbinbin Date: Thu, 27 Oct 2022 20:35:18 +0800 Subject: [PATCH 1/3] podmem: add container name Signed-off-by: yinbinbin --- source/tools/detect/mem/podmem/entry/podmem.py | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/source/tools/detect/mem/podmem/entry/podmem.py b/source/tools/detect/mem/podmem/entry/podmem.py index 041abc77..2196c5ea 100644 --- a/source/tools/detect/mem/podmem/entry/podmem.py +++ b/source/tools/detect/mem/podmem/entry/podmem.py @@ -28,6 +28,7 @@ def container_init(con): con["ino"] = 0 con["uid"] = '' con["podname"] = '' + con["cname"] = '' con["files"] = [] con["type"] = 'cgroup' con["rss"] = 0 @@ -63,7 +64,7 @@ def get_container_info(podinfo, cid, con): con['podname'] = res['status']['labels']['io.kubernetes.pod.name'] con['type'] = 'k8s' if con['podname'] == '': - con['podname'] = cid + con['podname'] = con["cname"] def get_container_id(podinfo): podinfo["runtime"] = get_runtime(podinfo) @@ -82,7 +83,13 @@ def get_container_id(podinfo): con = {} container_init(con) con["podid"] = item[-1] + con["cname"] = item[-1] + if podinfo['runtime'].find('crictl') != -1: + con["cname"] = item[-3] con["id"] = item[0] + if len(con["cname"]) == 0: + con["cname"] = con["id"] + if podinfo['args']['mode'] == 'cid': if item[0] != podinfo['args']['cid']: continue @@ -226,6 +233,7 @@ def podmem_to_json(podinfo, cinodes, files): continue new_cid['sort_file'] = cid['files'] new_cid['id'] = cid['id'] + new_cid['cname'] = cid['cname'] new_cid['cache'] = cid['cache'] new_cid['rss'] = cid['rss'] new_cid['shmem'] = cid['shmem'] @@ -330,11 +338,11 @@ def pod_mem_run(podinfo): if mode == 'cgroup': print("cgroup: {}".format(cid)) elif mode == 'pod': - print("container id: {} podname:{}".format(cid, cinfo['podname'])) + print("container name: {} podname:{}".format(cinfo['cname'], cinfo['podname'])) elif mode == 'cid': - print("container id {}".format(cid)) + print("container name {}".format(cinfo['cname'])) elif mode == 'allcgroup': - out = "container id:%s"%(cid) + out = "container name:%s"%(cinfo['cname']) if cinfo['podname'] != '': out += ' podname:%s'%(cinfo['podname']) print(out) -- Gitee From 27ad2d770f4bb367a686a8a6b3c242b50dbfc3d7 Mon Sep 17 00:00:00 2001 From: yinbinbin Date: Tue, 15 Nov 2022 10:21:41 +0800 Subject: [PATCH 2/3] podmem: remove python3 Signed-off-by: yinbinbin --- source/tools/detect/mem/podmem/Makefile | 1 + source/tools/detect/mem/podmem/entry/podmem.py | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/source/tools/detect/mem/podmem/Makefile b/source/tools/detect/mem/podmem/Makefile index 07294fb6..7c0b2f6d 100644 --- a/source/tools/detect/mem/podmem/Makefile +++ b/source/tools/detect/mem/podmem/Makefile @@ -1,2 +1,3 @@ target := podmem +DEPEND := "python-dep{all}" include $(SRC)/mk/sub.mk diff --git a/source/tools/detect/mem/podmem/entry/podmem.py b/source/tools/detect/mem/podmem/entry/podmem.py index 2196c5ea..26a0ade6 100644 --- a/source/tools/detect/mem/podmem/entry/podmem.py +++ b/source/tools/detect/mem/podmem/entry/podmem.py @@ -1,4 +1,3 @@ -#!/usr/bin/env python3 import os import sys import json -- Gitee From 7b6446c2dd56c88f15cc7afd189e8e33b256477b Mon Sep 17 00:00:00 2001 From: yinbinbin Date: Thu, 17 Nov 2022 15:23:45 +0800 Subject: [PATCH 3/3] 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