From 6ea3d4feef8761c6a9fddbfb09b5466c1f15b988 Mon Sep 17 00:00:00 2001 From: zhuofeng Date: Tue, 7 Jan 2025 14:39:08 +0800 Subject: [PATCH] refactor the syssentry directory Signed-off-by: zhuofeng <1107893276@qq.com> --- build/build.sh | 70 ------------------- changlog | 8 +++ .../service}/sentryCollector.service | 0 {service => config/service}/sysSentry.service | 0 {service => config/service}/xalarmd.service | 0 selftest/mod/test_config.mod | 7 -- selftest/{mod => test/sysSentry}/test_task.c | 0 selftest/{ => test}/xalarm/CMakeLists.txt | 0 selftest/{ => test}/xalarm/reg_demo.c | 0 selftest/{ => test}/xalarm/send_demo.c | 0 selftest/{ => test}/xalarm/unreg_demo.c | 0 selftest/{ => test}/xalarm/upgrade_demo.c | 0 {libs => src/libs}/CMakeLists.txt | 0 {libs => src/libs}/libxalarm/CMakeLists.txt | 0 .../libs}/libxalarm/register_xalarm.c | 0 .../libs}/libxalarm/register_xalarm.h | 0 .../libs}/pyxalarm/register_xalarm.py | 0 .../pySentryCollector/collect_plugin.py | 0 .../pySentryNotify/sentry_notify.py | 0 .../sh/log}/logrotate-sysSentry.cron | 0 .../sentryCollector/__init__.py | 0 .../sentryCollector/__main__.py | 0 .../sentryCollector/collect_config.py | 0 .../sentryCollector/collect_io.py | 0 .../sentryCollector/collect_server.py | 0 .../sentryCollector/collectd.py | 0 .../sentryCollector/ebpf_collector/Makefile | 0 .../ebpf_collector/bpf_helpers.h | 0 .../sentryCollector/ebpf_collector/bpf_load.c | 0 .../ebpf_collector/ebpf_collector.bpf.c | 0 .../ebpf_collector/ebpf_collector.c | 0 .../ebpf_collector/ebpf_collector.h | 0 src/{ => services}/syssentry/__init__.py | 0 src/{ => services}/syssentry/__main__.py | 0 src/{ => services}/syssentry/alarm.py | 0 src/{ => services}/syssentry/bmc_alarm.py | 0 src/{ => services}/syssentry/callbacks.py | 0 src/{ => services}/syssentry/cron_process.py | 0 src/{ => services}/syssentry/global_values.py | 0 src/{ => services}/syssentry/heartbeat.py | 0 src/{ => services}/syssentry/load_mods.py | 0 src/{ => services}/syssentry/mod_status.py | 0 src/{ => services}/syssentry/result.py | 0 src/{ => services}/syssentry/sentry_config.py | 0 src/{ => services}/syssentry/sentryctl | 0 src/{ => services}/syssentry/syssentry.py | 0 src/{ => services}/syssentry/task_map.py | 0 src/{ => services}/syssentry/utils.py | 0 src/{ => services}/xalarm/__init__.py | 0 src/{ => services}/xalarm/xalarm_api.py | 0 src/{ => services}/xalarm/xalarm_config.py | 0 src/{ => services}/xalarm/xalarm_daemon.py | 0 src/{ => services}/xalarm/xalarm_server.py | 0 src/{ => services}/xalarm/xalarm_transfer.py | 0 54 files changed, 8 insertions(+), 77 deletions(-) delete mode 100644 build/build.sh create mode 100644 changlog rename {service => config/service}/sentryCollector.service (100%) rename {service => config/service}/sysSentry.service (100%) rename {service => config/service}/xalarmd.service (100%) delete mode 100644 selftest/mod/test_config.mod rename selftest/{mod => test/sysSentry}/test_task.c (100%) rename selftest/{ => test}/xalarm/CMakeLists.txt (100%) rename selftest/{ => test}/xalarm/reg_demo.c (100%) rename selftest/{ => test}/xalarm/send_demo.c (100%) rename selftest/{ => test}/xalarm/unreg_demo.c (100%) rename selftest/{ => test}/xalarm/upgrade_demo.c (100%) rename {libs => src/libs}/CMakeLists.txt (100%) rename {libs => src/libs}/libxalarm/CMakeLists.txt (100%) rename {libs => src/libs}/libxalarm/register_xalarm.c (100%) rename {libs => src/libs}/libxalarm/register_xalarm.h (100%) rename {libs => src/libs}/pyxalarm/register_xalarm.py (100%) rename src/libsentry/{ => python}/pySentryCollector/collect_plugin.py (100%) rename src/libsentry/{ => python}/pySentryNotify/sentry_notify.py (100%) rename src/{sh => libsentry/sh/log}/logrotate-sysSentry.cron (100%) rename src/{ => services}/sentryCollector/__init__.py (100%) rename src/{ => services}/sentryCollector/__main__.py (100%) rename src/{ => services}/sentryCollector/collect_config.py (100%) rename src/{ => services}/sentryCollector/collect_io.py (100%) rename src/{ => services}/sentryCollector/collect_server.py (100%) rename src/{ => services}/sentryCollector/collectd.py (100%) rename src/{ => services}/sentryCollector/ebpf_collector/Makefile (100%) rename src/{ => services}/sentryCollector/ebpf_collector/bpf_helpers.h (100%) rename src/{ => services}/sentryCollector/ebpf_collector/bpf_load.c (100%) rename src/{ => services}/sentryCollector/ebpf_collector/ebpf_collector.bpf.c (100%) rename src/{ => services}/sentryCollector/ebpf_collector/ebpf_collector.c (100%) rename src/{ => services}/sentryCollector/ebpf_collector/ebpf_collector.h (100%) rename src/{ => services}/syssentry/__init__.py (100%) rename src/{ => services}/syssentry/__main__.py (100%) rename src/{ => services}/syssentry/alarm.py (100%) rename src/{ => services}/syssentry/bmc_alarm.py (100%) rename src/{ => services}/syssentry/callbacks.py (100%) rename src/{ => services}/syssentry/cron_process.py (100%) rename src/{ => services}/syssentry/global_values.py (100%) rename src/{ => services}/syssentry/heartbeat.py (100%) rename src/{ => services}/syssentry/load_mods.py (100%) rename src/{ => services}/syssentry/mod_status.py (100%) rename src/{ => services}/syssentry/result.py (100%) rename src/{ => services}/syssentry/sentry_config.py (100%) rename src/{ => services}/syssentry/sentryctl (100%) rename src/{ => services}/syssentry/syssentry.py (100%) rename src/{ => services}/syssentry/task_map.py (100%) rename src/{ => services}/syssentry/utils.py (100%) rename src/{ => services}/xalarm/__init__.py (100%) rename src/{ => services}/xalarm/xalarm_api.py (100%) rename src/{ => services}/xalarm/xalarm_config.py (100%) rename src/{ => services}/xalarm/xalarm_daemon.py (100%) rename src/{ => services}/xalarm/xalarm_server.py (100%) rename src/{ => services}/xalarm/xalarm_transfer.py (100%) diff --git a/build/build.sh b/build/build.sh deleted file mode 100644 index e2442e6..0000000 --- a/build/build.sh +++ /dev/null @@ -1,70 +0,0 @@ -#!/bin/bash -# Copyright (c), 2023-2024, Huawei Tech. Co., Ltd. - -PRJ_DIR=$(dirname $(readlink -f "$0")) -SRC_DIR=${PRJ_DIR}/../src/libso - -function print_help() -{ - echo "Usage: $0 OPERATOR OPTIONS" - echo "OPERATOR: " - echo " -i build and install" - echo " -b build" - echo " -c clean" - -} - -function clean() -{ - cd ${SRC_DIR} - rm -rf ./build -} - -function build() -{ - echo "start compile" - cd ${SRC_DIR} - cmake . -DXD_INSTALL_BINDIR=$1 -B build - cd build - make -} - -function install() -{ - cd ${SRC_DIR} - cmake . -DXD_INSTALL_BINDIR=$1 -B build - cd build - make install -} - -[ "$1" == "-c" ] && { - clean - exit 0 -} - -[ "$1" == "-b" ] && { - INSTALL_DIR=$2 - [ -z $2 ] && { - INSTALL_DIR=/usr/lib64 - mkdir -p ${INSTALL_DIR} - } - - build ${INSTALL_DIR} - exit 0 -} - -[ "$1" == "-i" ] && { - INSTALL_DIR=$2 - [ -z $2 ] && { - INSTALL_DIR=/usr/lib64 - mkdir -p ${INSTALL_DIR} - } - install ${INSTALL_DIR} - exit 0 -} - -if [ -z $1 ] || [ $1 == "-h" ] - then - print_help - exit 0 -fi diff --git a/changlog b/changlog new file mode 100644 index 0000000..ea8f502 --- /dev/null +++ b/changlog @@ -0,0 +1,8 @@ +2025-01-07 +主要重构syssentry的目录结构： +1、删除build目录 +2、libsentry按语言分为各个目录，目前是python和sh(shell)，各自不同的语言分别放置，pySentryCollector和pySentryNotify放到python中 +3、selftest目录下的mod和xlarm目录移动到test下，并且将mod目录下test_config.mod删除，并且将mod目录重命名为sysSentry +4、src目录下新建一个services目录，将三个服务sentryCollector、syssentry和xalarm都移动到该services目录下重构后的目录结构 +5、service目录(服务的配置文件)移动到config目录下 + diff --git a/service/sentryCollector.service b/config/service/sentryCollector.service similarity index 100% rename from service/sentryCollector.service rename to config/service/sentryCollector.service diff --git a/service/sysSentry.service b/config/service/sysSentry.service similarity index 100% rename from service/sysSentry.service rename to config/service/sysSentry.service diff --git a/service/xalarmd.service b/config/service/xalarmd.service similarity index 100% rename from service/xalarmd.service rename to config/service/xalarmd.service diff --git a/selftest/mod/test_config.mod b/selftest/mod/test_config.mod deleted file mode 100644 index bdef475..0000000 --- a/selftest/mod/test_config.mod +++ /dev/null @@ -1,7 +0,0 @@ -[common] -enabled=yes -task_start=test_task -task_stop=pkill test_task -type=oneshot -interval=60 -heartbeat_interval=3600 \ No newline at end of file diff --git a/selftest/mod/test_task.c b/selftest/test/sysSentry/test_task.c similarity index 100% rename from selftest/mod/test_task.c rename to selftest/test/sysSentry/test_task.c diff --git a/selftest/xalarm/CMakeLists.txt b/selftest/test/xalarm/CMakeLists.txt similarity index 100% rename from selftest/xalarm/CMakeLists.txt rename to selftest/test/xalarm/CMakeLists.txt diff --git a/selftest/xalarm/reg_demo.c b/selftest/test/xalarm/reg_demo.c similarity index 100% rename from selftest/xalarm/reg_demo.c rename to selftest/test/xalarm/reg_demo.c diff --git a/selftest/xalarm/send_demo.c b/selftest/test/xalarm/send_demo.c similarity index 100% rename from selftest/xalarm/send_demo.c rename to selftest/test/xalarm/send_demo.c diff --git a/selftest/xalarm/unreg_demo.c b/selftest/test/xalarm/unreg_demo.c similarity index 100% rename from selftest/xalarm/unreg_demo.c rename to selftest/test/xalarm/unreg_demo.c diff --git a/selftest/xalarm/upgrade_demo.c b/selftest/test/xalarm/upgrade_demo.c similarity index 100% rename from selftest/xalarm/upgrade_demo.c rename to selftest/test/xalarm/upgrade_demo.c diff --git a/libs/CMakeLists.txt b/src/libs/CMakeLists.txt similarity index 100% rename from libs/CMakeLists.txt rename to src/libs/CMakeLists.txt diff --git a/libs/libxalarm/CMakeLists.txt b/src/libs/libxalarm/CMakeLists.txt similarity index 100% rename from libs/libxalarm/CMakeLists.txt rename to src/libs/libxalarm/CMakeLists.txt diff --git a/libs/libxalarm/register_xalarm.c b/src/libs/libxalarm/register_xalarm.c similarity index 100% rename from libs/libxalarm/register_xalarm.c rename to src/libs/libxalarm/register_xalarm.c diff --git a/libs/libxalarm/register_xalarm.h b/src/libs/libxalarm/register_xalarm.h similarity index 100% rename from libs/libxalarm/register_xalarm.h rename to src/libs/libxalarm/register_xalarm.h diff --git a/libs/pyxalarm/register_xalarm.py b/src/libs/pyxalarm/register_xalarm.py similarity index 100% rename from libs/pyxalarm/register_xalarm.py rename to src/libs/pyxalarm/register_xalarm.py diff --git a/src/libsentry/pySentryCollector/collect_plugin.py b/src/libsentry/python/pySentryCollector/collect_plugin.py similarity index 100% rename from src/libsentry/pySentryCollector/collect_plugin.py rename to src/libsentry/python/pySentryCollector/collect_plugin.py diff --git a/src/libsentry/pySentryNotify/sentry_notify.py b/src/libsentry/python/pySentryNotify/sentry_notify.py similarity index 100% rename from src/libsentry/pySentryNotify/sentry_notify.py rename to src/libsentry/python/pySentryNotify/sentry_notify.py diff --git a/src/sh/logrotate-sysSentry.cron b/src/libsentry/sh/log/logrotate-sysSentry.cron similarity index 100% rename from src/sh/logrotate-sysSentry.cron rename to src/libsentry/sh/log/logrotate-sysSentry.cron diff --git a/src/sentryCollector/__init__.py b/src/services/sentryCollector/__init__.py similarity index 100% rename from src/sentryCollector/__init__.py rename to src/services/sentryCollector/__init__.py diff --git a/src/sentryCollector/__main__.py b/src/services/sentryCollector/__main__.py similarity index 100% rename from src/sentryCollector/__main__.py rename to src/services/sentryCollector/__main__.py diff --git a/src/sentryCollector/collect_config.py b/src/services/sentryCollector/collect_config.py similarity index 100% rename from src/sentryCollector/collect_config.py rename to src/services/sentryCollector/collect_config.py diff --git a/src/sentryCollector/collect_io.py b/src/services/sentryCollector/collect_io.py similarity index 100% rename from src/sentryCollector/collect_io.py rename to src/services/sentryCollector/collect_io.py diff --git a/src/sentryCollector/collect_server.py b/src/services/sentryCollector/collect_server.py similarity index 100% rename from src/sentryCollector/collect_server.py rename to src/services/sentryCollector/collect_server.py diff --git a/src/sentryCollector/collectd.py b/src/services/sentryCollector/collectd.py similarity index 100% rename from src/sentryCollector/collectd.py rename to src/services/sentryCollector/collectd.py diff --git a/src/sentryCollector/ebpf_collector/Makefile b/src/services/sentryCollector/ebpf_collector/Makefile similarity index 100% rename from src/sentryCollector/ebpf_collector/Makefile rename to src/services/sentryCollector/ebpf_collector/Makefile diff --git a/src/sentryCollector/ebpf_collector/bpf_helpers.h b/src/services/sentryCollector/ebpf_collector/bpf_helpers.h similarity index 100% rename from src/sentryCollector/ebpf_collector/bpf_helpers.h rename to src/services/sentryCollector/ebpf_collector/bpf_helpers.h diff --git a/src/sentryCollector/ebpf_collector/bpf_load.c b/src/services/sentryCollector/ebpf_collector/bpf_load.c similarity index 100% rename from src/sentryCollector/ebpf_collector/bpf_load.c rename to src/services/sentryCollector/ebpf_collector/bpf_load.c diff --git a/src/sentryCollector/ebpf_collector/ebpf_collector.bpf.c b/src/services/sentryCollector/ebpf_collector/ebpf_collector.bpf.c similarity index 100% rename from src/sentryCollector/ebpf_collector/ebpf_collector.bpf.c rename to src/services/sentryCollector/ebpf_collector/ebpf_collector.bpf.c diff --git a/src/sentryCollector/ebpf_collector/ebpf_collector.c b/src/services/sentryCollector/ebpf_collector/ebpf_collector.c similarity index 100% rename from src/sentryCollector/ebpf_collector/ebpf_collector.c rename to src/services/sentryCollector/ebpf_collector/ebpf_collector.c diff --git a/src/sentryCollector/ebpf_collector/ebpf_collector.h b/src/services/sentryCollector/ebpf_collector/ebpf_collector.h similarity index 100% rename from src/sentryCollector/ebpf_collector/ebpf_collector.h rename to src/services/sentryCollector/ebpf_collector/ebpf_collector.h diff --git a/src/syssentry/__init__.py b/src/services/syssentry/__init__.py similarity index 100% rename from src/syssentry/__init__.py rename to src/services/syssentry/__init__.py diff --git a/src/syssentry/__main__.py b/src/services/syssentry/__main__.py similarity index 100% rename from src/syssentry/__main__.py rename to src/services/syssentry/__main__.py diff --git a/src/syssentry/alarm.py b/src/services/syssentry/alarm.py similarity index 100% rename from src/syssentry/alarm.py rename to src/services/syssentry/alarm.py diff --git a/src/syssentry/bmc_alarm.py b/src/services/syssentry/bmc_alarm.py similarity index 100% rename from src/syssentry/bmc_alarm.py rename to src/services/syssentry/bmc_alarm.py diff --git a/src/syssentry/callbacks.py b/src/services/syssentry/callbacks.py similarity index 100% rename from src/syssentry/callbacks.py rename to src/services/syssentry/callbacks.py diff --git a/src/syssentry/cron_process.py b/src/services/syssentry/cron_process.py similarity index 100% rename from src/syssentry/cron_process.py rename to src/services/syssentry/cron_process.py diff --git a/src/syssentry/global_values.py b/src/services/syssentry/global_values.py similarity index 100% rename from src/syssentry/global_values.py rename to src/services/syssentry/global_values.py diff --git a/src/syssentry/heartbeat.py b/src/services/syssentry/heartbeat.py similarity index 100% rename from src/syssentry/heartbeat.py rename to src/services/syssentry/heartbeat.py diff --git a/src/syssentry/load_mods.py b/src/services/syssentry/load_mods.py similarity index 100% rename from src/syssentry/load_mods.py rename to src/services/syssentry/load_mods.py diff --git a/src/syssentry/mod_status.py b/src/services/syssentry/mod_status.py similarity index 100% rename from src/syssentry/mod_status.py rename to src/services/syssentry/mod_status.py diff --git a/src/syssentry/result.py b/src/services/syssentry/result.py similarity index 100% rename from src/syssentry/result.py rename to src/services/syssentry/result.py diff --git a/src/syssentry/sentry_config.py b/src/services/syssentry/sentry_config.py similarity index 100% rename from src/syssentry/sentry_config.py rename to src/services/syssentry/sentry_config.py diff --git a/src/syssentry/sentryctl b/src/services/syssentry/sentryctl similarity index 100% rename from src/syssentry/sentryctl rename to src/services/syssentry/sentryctl diff --git a/src/syssentry/syssentry.py b/src/services/syssentry/syssentry.py similarity index 100% rename from src/syssentry/syssentry.py rename to src/services/syssentry/syssentry.py diff --git a/src/syssentry/task_map.py b/src/services/syssentry/task_map.py similarity index 100% rename from src/syssentry/task_map.py rename to src/services/syssentry/task_map.py diff --git a/src/syssentry/utils.py b/src/services/syssentry/utils.py similarity index 100% rename from src/syssentry/utils.py rename to src/services/syssentry/utils.py diff --git a/src/xalarm/__init__.py b/src/services/xalarm/__init__.py similarity index 100% rename from src/xalarm/__init__.py rename to src/services/xalarm/__init__.py diff --git a/src/xalarm/xalarm_api.py b/src/services/xalarm/xalarm_api.py similarity index 100% rename from src/xalarm/xalarm_api.py rename to src/services/xalarm/xalarm_api.py diff --git a/src/xalarm/xalarm_config.py b/src/services/xalarm/xalarm_config.py similarity index 100% rename from src/xalarm/xalarm_config.py rename to src/services/xalarm/xalarm_config.py diff --git a/src/xalarm/xalarm_daemon.py b/src/services/xalarm/xalarm_daemon.py similarity index 100% rename from src/xalarm/xalarm_daemon.py rename to src/services/xalarm/xalarm_daemon.py diff --git a/src/xalarm/xalarm_server.py b/src/services/xalarm/xalarm_server.py similarity index 100% rename from src/xalarm/xalarm_server.py rename to src/services/xalarm/xalarm_server.py diff --git a/src/xalarm/xalarm_transfer.py b/src/services/xalarm/xalarm_transfer.py similarity index 100% rename from src/xalarm/xalarm_transfer.py rename to src/services/xalarm/xalarm_transfer.py -- Gitee