diff --git a/Makefile b/Makefile
index 51e1154995d69dfb3a3df1b67eeb1e52945d7ab5..b83825401cd104670d2396f337757e2f45aa6d60 100644
--- a/Makefile
+++ b/Makefile
@@ -9,7 +9,6 @@ SYSTEMDDIR	= $(DESTDIR)$(PREFIX)/lib/systemd/system
 INCLUDEDIR      = $(DESTDIR)$(PREFIX)/include
 LIBINSTALLDIR   = $(DESTDIR)$(PREFIX)/lib64
 LOGSAVEDIR	= $(DESTDIR)$(VARDIR)/log/sysSentry
-LOGROTEDIR	= $(DESTDIR)$(ETCDIR)/logrotate.d
 
 SRCVERSION = $(shell git rev-parse --short HEAD 2>/dev/null)
 SHELL = /bin/bash
@@ -31,7 +30,7 @@ else
 	KERNEL_IS_4_19 :=
 endif
 
-all: lib sentry
+all: lib sentry hbm_online_repair
 
 
 install: dirs ilib isentry
@@ -43,7 +42,6 @@ dirs:
 	mkdir -p $(PYDIR)
 	mkdir -p $(SYSTEMDDIR)
 	mkdir -p $(LOGSAVEDIR)
-	mkdir -p $(LOGROTEDIR)
 	install -d -m 700 $(ETCDIR)/sysSentry/
 	install -d -m 700 $(ETCDIR)/sysSentry/tasks/
 	install -d -m 700 $(ETCDIR)/sysSentry/plugins/
@@ -59,10 +57,12 @@ sentry:
 isentry:
 	cd $(CURSRCDIR) && $(PYBIN) setup.py install -O1 --root=build/ --record=SENTRY_FILES
 	find $(CURSRCDIR)/build/ -type d -name '__pycache__' -exec rm -rf {} +
-	install -m 600 $(CURCONFIGDIR)/logrotate $(LOGROTEDIR)/sysSentry
+	install -m 600 $(CURCONFIGDIR)/logrotate-sysSentry.conf $(DESTDIR)$(ETCDIR)/sysSentry/
 	install -m 600 $(CURCONFIGDIR)/inspect.conf $(ETCDIR)/sysSentry/
 	install -m 600 $(CURCONFIGDIR)/xalarm.conf $(ETCDIR)/sysSentry/
 	install -m 600 $(CURCONFIGDIR)/collector.conf $(ETCDIR)/sysSentry/
+	install -m 600 $(CURCONFIGDIR)/env/hbm_online_repair.env $(ETCDIR)
+	install -m 600 $(CURCONFIGDIR)/tasks/hbm_online_repair.mod $(ETCDIR)/sysSentry/tasks
 	install -m 600 $(CURSERVICEDIR)/sysSentry.service $(SYSTEMDDIR)
 	install -m 600 $(CURSERVICEDIR)/xalarmd.service $(SYSTEMDDIR)
 	install -m 600 $(CURSERVICEDIR)/sentryCollector.service $(SYSTEMDDIR)
@@ -77,6 +77,7 @@ isentry:
 	install -m 550 $(CURSRCDIR)/build/usr/local/bin/syssentry $(BINDIR)
 	install -m 550 $(CURSRCDIR)/build/usr/local/bin/xalarmd $(BINDIR)
 	install -m 550 $(CURSRCDIR)/build/usr/local/bin/sentryCollector $(BINDIR)
+	install -m 550 $(CURSRCDIR)/plugins/hbm_online_repair/hbm_online_repair $(BINDIR)
 	@if [ -f "$(CURSRCDIR)/sentryCollector/ebpf_collector/ebpf_collector" ]; then \
 		install -m 550 $(CURSRCDIR)/sentryCollector/ebpf_collector/ebpf_collector $(BINDIR); \
 	fi
@@ -90,6 +91,8 @@ ilib:
 	install -d -m 644 $(INCLUDEDIR)/xalarm
 	install -m 644 $(CURLIBDIR)/libxalarm/register_xalarm.h $(INCLUDEDIR)/xalarm/
 
+hbm_online_repair:
+	cd $(CURSRCDIR)/plugins/hbm_online_repair/ && make
 
 clean-install:
 	rm -rf $(CURLIBDIR)/build
@@ -98,17 +101,18 @@ clean-install:
 	rm -rf $(CURSRCDIR)/sentryCollector/ebpf_collector/output
 	rm -rf $(CURSRCDIR)/syssentry.egg-info
 	rm -rf $(CURSRCDIR)/SENTRY_FILES
+	rm -rf $(CURSRCDIR)/plugins/hbm_online_repair/hbm_online_repair
 
 clean: clean-install
 	rm -rf $(BINDIR)/sentryctl
 	rm -rf $(BINDIR)/syssentry
 	rm -rf $(BINDIR)/xalarmd
 	rm -rf $(BINDIR)/sentryCollector
+	rm -rf $(BINDIR)/hbm_online_repair
 	rm -rf $(BINDIR)/ebpf_collector
 	rm -rf $(LIBINSTALLDIR)/libxalarm.so
 	rm -rf $(INCLUDEDIR)/xalarm
 	rm -rf $(ETCDIR)/sysSentry
-	rm -rf $(LOGROTEDIR)/sysSentry
 	rm -rf $(LOGSAVEDIR)/sysSentry
 	rm -rf $(PYDIR)/syssentry
 	rm -rf $(PYDIR)/xalarm
diff --git a/src/plugins/cpu_sentry/catlib/plugin/cpu_patrol/CMakeLists.txt b/src/plugins/cpu_sentry/catlib/plugin/cpu_patrol/CMakeLists.txt
index e11e5e71eb41280a22fd6311d5ef1b06ff3d782c..d925a0aa90b7ae163dfa33f1bfd63911f6f46544 100644
--- a/src/plugins/cpu_sentry/catlib/plugin/cpu_patrol/CMakeLists.txt
+++ b/src/plugins/cpu_sentry/catlib/plugin/cpu_patrol/CMakeLists.txt
@@ -4,8 +4,8 @@ file(GLOB CPU_PATROL_SRC *.c)
 
 add_library(cpu_patrol SHARED ${CPU_PATROL_SRC})
 
-include_directories(${CMAKE_SOURCE_DIR}/../../../libso/)
-link_directories(${CMAKE_SOURCE_DIR}/../../../libso/build/xalarm/)
+include_directories(${CMAKE_SOURCE_DIR}/../../../../libs/)
+link_directories(${CMAKE_SOURCE_DIR}/../../../../libs/build/libxalarm/)
 
-TARGET_LINK_LIBRARIES(cpu_patrol pthread -ldl ${CMAKE_SOURCE_DIR}/../../../libso/build/xalarm/libxalarm.so)
+TARGET_LINK_LIBRARIES(cpu_patrol pthread -ldl ${CMAKE_SOURCE_DIR}/../../../../libs/build/libxalarm/libxalarm.so)
 
diff --git a/src/plugins/cpu_sentry/catlib/plugin/cpu_patrol/cpu_patrol_result.c b/src/plugins/cpu_sentry/catlib/plugin/cpu_patrol/cpu_patrol_result.c
index 8e313124493bc4de05e696264ee99baf346d3669..b0bb9486354d95aa42ed3d796c1640100e10fec9 100644
--- a/src/plugins/cpu_sentry/catlib/plugin/cpu_patrol/cpu_patrol_result.c
+++ b/src/plugins/cpu_sentry/catlib/plugin/cpu_patrol/cpu_patrol_result.c
@@ -6,7 +6,7 @@
 #include <stdlib.h>
 #include <errno.h>
 #include <stdbool.h>
-#include <xalarm/register_xalarm.h>
+#include <libxalarm/register_xalarm.h>
 
 #include "cat_structs.h"
 #include "cpu_patrol_result.h"
diff --git a/src/setup.py b/src/setup.py
index 6bd49e8662b2116d36001b78df7834802cf5f7ea..15c8c5c2cdc203e10416c537e6080ea27a80d1ee 100644
--- a/src/setup.py
+++ b/src/setup.py
@@ -26,6 +26,8 @@ setup(
         'Programming Language :: Python :: 3.7',
         'Programming Language :: Python :: 3.8',
         'Programming Language :: Python :: 3.9',
+        'Programming Language :: Python :: 3.10',
+        'Programming Language :: Python :: 3.11'
     ],
     entry_points={
         'console_scripts': [