From a294f54de7363dab97622e45a305903b7ddce7d9 Mon Sep 17 00:00:00 2001
From: shixuantong <shixuantong1@huawei.com>
Date: Mon, 16 Dec 2024 20:51:53 +0800
Subject: [PATCH] remove cpu_sentry

---
 remove-cpu_sentry.patch | 24 ++++++++++++++++++++++++
 sysSentry.spec          | 39 ++++++++-------------------------------
 2 files changed, 32 insertions(+), 31 deletions(-)
 create mode 100644 remove-cpu_sentry.patch

diff --git a/remove-cpu_sentry.patch b/remove-cpu_sentry.patch
new file mode 100644
index 0000000..b3b63a0
--- /dev/null
+++ b/remove-cpu_sentry.patch
@@ -0,0 +1,24 @@
+From 07f4a32803070c8b736fac22f0203db9daf91e5f Mon Sep 17 00:00:00 2001
+From: shixuantong <shixuantong1@huawei.com>
+Date: Mon, 16 Dec 2024 20:49:47 +0800
+Subject: [PATCH] remove cpu_sentry
+
+---
+ src/python/setup.py | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/src/python/setup.py b/src/python/setup.py
+index 9e26a10..d332e36 100644
+--- a/src/python/setup.py
++++ b/src/python/setup.py
+@@ -29,7 +29,6 @@ setup(
+     ],
+     entry_points={
+         'console_scripts': [
+-            'cpu_sentry=syssentry.cpu_sentry:main',
+             'syssentry=syssentry.syssentry:main',
+             'xalarmd=xalarm.xalarm_daemon:alarm_process_create',
+             'sentryCollector=sentryCollector.collectd:main',
+-- 
+2.27.0
+
diff --git a/sysSentry.spec b/sysSentry.spec
index 1d2bd6a..c31718b 100644
--- a/sysSentry.spec
+++ b/sysSentry.spec
@@ -4,7 +4,7 @@
 Summary: System Inspection Framework
 Name: sysSentry
 Version: 1.0.2
-Release: 68
+Release: 69
 License: Mulan PSL v2
 Group: System Environment/Daemons
 Source0: https://gitee.com/openeuler/sysSentry/releases/download/v%{version}/%{name}-%{version}.tar.gz
@@ -84,6 +84,7 @@ Patch71:   change-avg_block_io-config.patch
 Patch72:   update-nvme-config.patch
 Patch73:   fix-absolute-threshold-not-be-used.patch
 Patch74:   add-debug-log-and-modify-disk-type-for-ebpf.patch
+Patch75:   remove-cpu_sentry.patch
 
 BuildRequires: cmake gcc-c++
 BuildRequires: python3 python3-setuptools
@@ -113,15 +114,6 @@ Provides:       libxalarm-devel = %{version}
 %description -n libxalarm-devel
 This package provides developer tools for the libxalarm.
 
-%package -n cpu_sentry
-Summary:        CPU fault inspection program
-Requires:       procps-ng
-Recommends:     sysSentry = %{version}-%{release}
-Recommends:     ipmitool
-
-%description -n cpu_sentry
-This package provides CPU fault detection
-
 %package -n avg_block_io
 Summary:        Supports slow I/O detection
 Requires:       sysSentry = %{version}-%{release}
@@ -213,15 +205,6 @@ install -m 644 src/libso/xalarm/register_xalarm.h %{buildroot}%{_includedir}/xal
 install -m 600 config/collector.conf %{buildroot}%{_sysconfdir}/sysSentry
 install -m 600 service/sentryCollector.service %{buildroot}%{_unitdir}
 
-# cpu sentry
-install config/tasks/cpu_sentry.mod %{buildroot}/etc/sysSentry/tasks/
-install config/plugins/cpu_sentry.ini %{buildroot}/etc/sysSentry/plugins/cpu_sentry.ini
-install src/c/catcli/catlib/build/cat-cli %{buildroot}%{_bindir}/cat-cli
-install src/c/catcli/catlib/build/plugin/cpu_patrol/libcpu_patrol.so %{buildroot}%{_libdir}
-
-chrpath -d %{buildroot}%{_bindir}/cat-cli
-chrpath -d %{buildroot}%{_libdir}/libcpu_patrol.so
-
 # avg_block_io
 install config/tasks/avg_block_io.mod %{buildroot}/etc/sysSentry/tasks/
 install config/plugins/avg_block_io.ini %{buildroot}/etc/sysSentry/plugins/avg_block_io.ini
@@ -286,10 +269,6 @@ rm -rf %{buildroot}
 %attr(0600,root,root) %{_unitdir}/xalarmd.service
 
 # cpu inspection module
-%exclude %{_sysconfdir}/sysSentry/tasks/cpu_sentry.mod
-%exclude %{_sysconfdir}/sysSentry/plugins/cpu_sentry.ini
-%exclude %{_bindir}/cpu_sentry
-%exclude %{_bindir}/cat-cli
 %exclude %{python3_sitelib}/syssentry/cpu_*
 %exclude %{python3_sitelib}/syssentry/*/cpu_*
 
@@ -330,14 +309,6 @@ rm -rf %{buildroot}
 %attr(0550,root,root) %{python3_sitelib}/xalarm/sentry_notify.py
 %attr(0550,root,root) %{python3_sitelib}/xalarm/__pycache__/sentry_notify*
 
-%files -n cpu_sentry
-%attr(0500,root,root) %{_bindir}/cat-cli
-%attr(0500,root,root) %{_bindir}/cpu_sentry
-%attr(0550,root,root) %{_libdir}/libcpu_patrol.so
-%attr(0600,root,root) %config(noreplace) %{_sysconfdir}/sysSentry/tasks/cpu_sentry.mod
-%attr(0600,root,root) %{_sysconfdir}/sysSentry/plugins/cpu_sentry.ini
-%attr(0550,root,root) %{python3_sitelib}/syssentry/cpu_*
-
 %files -n avg_block_io
 %attr(0500,root,root) %{_bindir}/avg_block_io
 %attr(0600,root,root) %config(noreplace) %{_sysconfdir}/sysSentry/tasks/avg_block_io.mod
@@ -355,6 +326,12 @@ rm -rf %{buildroot}
 %attr(0550,root,root) %{python3_sitelib}/sentryCollector/__pycache__/collect_plugin*
 
 %changelog
+* Mon Dec 16 2024 shixuantong <shixuantong1@huawei.com> - 1.0.2-69
+- Type:bugfix
+- CVE:NA
+- SUG:NA
+- DESC:unpack cpu_sentry
+
 * Fri Dec 13 2024 zhuofeng <zhuofeng2@huawei.com> - 1.0.2-68
 - Type:bugfix
 - CVE:NA