From a4686f42b86100a6fbb852657fc613ac85ae4d68 Mon Sep 17 00:00:00 2001 From: Hang Zhao Date: Fri, 18 Feb 2022 14:28:43 +0800 Subject: [PATCH 1/2] fix compile error for python tools Signed-off-by: Hang Zhao --- .../tools/combine/ossre_client/ossre_set/tools/cgroupcheck.py | 2 +- .../tools/combine/ossre_client/ossre_set/tools/newoomcheck.py | 2 +- source/tools/combine/ossre_client/ossre_set/tools/oomcheck.py | 2 +- source/tools/detect/cgtool/cgcheck/cgcheck.py | 2 +- source/tools/detect/sysconf/confcheck/confcheck.py | 4 ++-- source/tools/monitor/mmaptrace/mmaptrace.py | 2 +- source/tools/monitor/sched/schedtrace/schedtrace.py | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/source/tools/combine/ossre_client/ossre_set/tools/cgroupcheck.py b/source/tools/combine/ossre_client/ossre_set/tools/cgroupcheck.py index 2b9d00df..6b843e48 100644 --- a/source/tools/combine/ossre_client/ossre_set/tools/cgroupcheck.py +++ b/source/tools/combine/ossre_client/ossre_set/tools/cgroupcheck.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python2 # -*- coding: utf-8 -*- # @Author: shiyan diff --git a/source/tools/combine/ossre_client/ossre_set/tools/newoomcheck.py b/source/tools/combine/ossre_client/ossre_set/tools/newoomcheck.py index 0eb3e383..df53fa5f 100644 --- a/source/tools/combine/ossre_client/ossre_set/tools/newoomcheck.py +++ b/source/tools/combine/ossre_client/ossre_set/tools/newoomcheck.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python2 # -*- coding: utf-8 -*- # @Author: changjun diff --git a/source/tools/combine/ossre_client/ossre_set/tools/oomcheck.py b/source/tools/combine/ossre_client/ossre_set/tools/oomcheck.py index 9dd57610..3c0b3aab 100644 --- a/source/tools/combine/ossre_client/ossre_set/tools/oomcheck.py +++ b/source/tools/combine/ossre_client/ossre_set/tools/oomcheck.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python2 # -*- coding: utf-8 -*- # @Author: shiyan diff --git a/source/tools/detect/cgtool/cgcheck/cgcheck.py b/source/tools/detect/cgtool/cgcheck/cgcheck.py index 8ca41d6b..06c56297 100755 --- a/source/tools/detect/cgtool/cgcheck/cgcheck.py +++ b/source/tools/detect/cgtool/cgcheck/cgcheck.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python2 # -*- coding: utf-8 -*- # @Author: shiyan diff --git a/source/tools/detect/sysconf/confcheck/confcheck.py b/source/tools/detect/sysconf/confcheck/confcheck.py index 24bd1323..c536c6de 100755 --- a/source/tools/detect/sysconf/confcheck/confcheck.py +++ b/source/tools/detect/sysconf/confcheck/confcheck.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python2 #coding:utf-8 import re @@ -119,4 +119,4 @@ def main(): check_pagecache_config() if __name__ == '__main__': - main() \ No newline at end of file + main() diff --git a/source/tools/monitor/mmaptrace/mmaptrace.py b/source/tools/monitor/mmaptrace/mmaptrace.py index a2241e27..1e450692 100644 --- a/source/tools/monitor/mmaptrace/mmaptrace.py +++ b/source/tools/monitor/mmaptrace/mmaptrace.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python2 #coding:utf-8 import re diff --git a/source/tools/monitor/sched/schedtrace/schedtrace.py b/source/tools/monitor/sched/schedtrace/schedtrace.py index e4c583fb..de1ae812 100755 --- a/source/tools/monitor/sched/schedtrace/schedtrace.py +++ b/source/tools/monitor/sched/schedtrace/schedtrace.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python2 # -*- coding: UTF-8 -*- import sys,os -- Gitee From 22458537a6a09c4af1ba3d43815f2ac512d2a702 Mon Sep 17 00:00:00 2001 From: Hang Zhao Date: Fri, 18 Feb 2022 14:40:12 +0800 Subject: [PATCH 2/2] confcheck:detect duplicate configuration of /var/log/messages Signed-off-by: Hang Zhao --- source/tools/detect/sysconf/confcheck/confcheck.py | 7 +++++++ 1 file changed, 7 insertions(+) mode change 100755 => 100644 source/tools/detect/sysconf/confcheck/confcheck.py diff --git a/source/tools/detect/sysconf/confcheck/confcheck.py b/source/tools/detect/sysconf/confcheck/confcheck.py old mode 100755 new mode 100644 index c536c6de..1d24a120 --- a/source/tools/detect/sysconf/confcheck/confcheck.py +++ b/source/tools/detect/sysconf/confcheck/confcheck.py @@ -21,6 +21,8 @@ pagecache_bk_dirty_bytes = "/proc/sys/vm/dirty_background_bytes" pagecache_bk_dirty_ratio = "/proc/sys/vm/dirty_background_ratio" meminfo = "/proc/meminfo" +syslog_conf_dir = "/etc/syslog-ng" + def exectue_cmd(command): command=command.replace("\n", "") command_fd = os.popen(command, "r") @@ -90,6 +92,11 @@ def check_etc_config(): if dict_paraments[parament] == match_parament.group(1): print("kernel.unprivileged_bpf_disabled应该配置成1") alinux3_etc_fd.close() + + syslog_conf_cmd = 'grep "/var/log/messages" -rn /etc/syslog-ng |wc -l' + syslog_conf_num = exectue_cmd(syslog_conf_cmd) + if syslog_conf_num.strip('\n') != "1": + print("syslog重复配置/var/log/messages，可能导致重复打印日志!") return def check_file_config(): -- Gitee