From eb265bc9bf7d62d21eb2fe74cbbc2a09f09785e0 Mon Sep 17 00:00:00 2001 From: jinsaihang Date: Mon, 28 Oct 2024 10:08:13 +0800 Subject: [PATCH] get_alarm -d abnormal display Signed-off-by: jinsaihang --- get_alarm-d-abnomal-display.patch | 26 ++++++++++++++++++++++++++ sysSentry.spec | 9 ++++++++- 2 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 get_alarm-d-abnomal-display.patch diff --git a/get_alarm-d-abnomal-display.patch b/get_alarm-d-abnomal-display.patch new file mode 100644 index 0000000..8a7924a --- /dev/null +++ b/get_alarm-d-abnomal-display.patch @@ -0,0 +1,26 @@ +From 132334913c4afebefd6afa835f790fa8a5fbf123 Mon Sep 17 00:00:00 2001 +From: jinsaihang +Date: Mon, 28 Oct 2024 09:22:53 +0800 +Subject: [PATCH] get_alarm -d abnomal display + +Signed-off-by: jinsaihang +--- + sysSentry-1.0.2/src/python/syssentry/alarm.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/python/syssentry/alarm.py b/src/python/syssentry/alarm.py +index b35a126..e5cc313 100644 +--- a/src/python/syssentry/alarm.py ++++ b/src/python/syssentry/alarm.py +@@ -184,7 +184,7 @@ def get_alarm_result(task_name: str, time_range: int, detailed: bool) -> List[Di + # dump each {key,value} of details in one line + if 'details' in alarm_info and isinstance(alarm_info['details'], dict): + for key in alarm_info['details']: +- alarm_info['details'][key] = json.dumps(alarm_info['details'][key], indent=None) ++ alarm_info['details'][key] = str(alarm_info['details'][key]) + + alarm['alarm_info'] = alarm_info + alarm_list = [alarm for alarm in alarm_list if 'alarm_source' in alarm['alarm_info'] and alarm['alarm_info']['alarm_source'] == task_name] +-- +2.27.0 + diff --git a/sysSentry.spec b/sysSentry.spec index 3da6a3f..72b6c86 100644 --- a/sysSentry.spec +++ b/sysSentry.spec @@ -4,7 +4,7 @@ Summary: System Inspection Framework Name: sysSentry Version: 1.0.2 -Release: 51 +Release: 52 License: Mulan PSL v2 Group: System Environment/Daemons Source0: https://gitee.com/openeuler/sysSentry/releases/download/v%{version}/%{name}-%{version}.tar.gz @@ -71,6 +71,7 @@ Patch58: fix-frequency-param-check-bug.patch Patch59: ai_block_io-support-iodump.patch Patch60: fix-get_alarm-error.patch Patch61: fix-alarm_info-newline-break-error.patch +Patch62: get_alarm-d-abnomal-display.patch BuildRequires: cmake gcc-c++ BuildRequires: python3 python3-setuptools @@ -332,6 +333,12 @@ rm -rf %{buildroot} %attr(0550,root,root) %{python3_sitelib}/sentryCollector/__pycache__/collect_plugin* %changelog +* Mon Oct 28 2024 jinsaihang - 1.0.2-52 +- Type:bugfix +- CVE:NA +- SUG:NA +- DES:get_alarm -d abnormal display + * Sat Oct 26 2024 jinsaihang - 1.0.2-51 - Type:bugfix - CVE:NA -- Gitee