diff --git a/0007-update-query-host-info-command.patch b/0007-update-query-host-info-command.patch new file mode 100644 index 0000000000000000000000000000000000000000..7aff88d847a82b362e82337369cc8b9aeaa2be77 --- /dev/null +++ b/0007-update-query-host-info-command.patch @@ -0,0 +1,70 @@ +From 485dcd1449e2843bdfbb5f8f0d5fb98cafe03e6c Mon Sep 17 00:00:00 2001 +From: rabbitali +Date: Wed, 28 Aug 2024 14:14:42 +0800 +Subject: [PATCH 1/1] update query host info command + +--- + ceres/manages/collect_manage.py | 27 +++++++++++++++++++++++++++ + 1 file changed, 27 insertions(+) + +diff --git a/ceres/manages/collect_manage.py b/ceres/manages/collect_manage.py +index b2ba350..0901e4f 100644 +--- a/ceres/manages/collect_manage.py ++++ b/ceres/manages/collect_manage.py +@@ -12,6 +12,7 @@ + # ******************************************************************************/ + import grp + import os ++import platform + import pwd + import re + from socket import AF_INET, SOCK_DGRAM, socket +@@ -54,6 +55,8 @@ class Collect: + 'os_version': os_version, + 'bios_version': bios_version, + 'kernel': kernel_version ++ 'os_name': os_name, ++ "os_arch": arch_info + }, + "cpu": { + "architecture": string, +@@ -126,12 +129,36 @@ class Collect: + kernel_info = re.search(r'[\d\.]+-[\d\.]+[\d]', self.get_current_kernel_version()) + + res = { ++ 'os_arch': platform.machine(), ++ 'os_name': self.get_os_name(), + 'os_version': self.get_os_version(), + 'bios_version': self.__get_bios_version(), + 'kernel': kernel_info.group() if kernel_info else "", + } + return res + ++ @staticmethod ++ def get_os_name() -> str: ++ """ ++ get os name ++ ++ Returns: ++ str ++ """ ++ os_release_path = "/etc/os-release" ++ name_value = None ++ ++ try: ++ with open(os_release_path, "r") as file: ++ for line in file: ++ if line.startswith("NAME="): ++ name_value = line.strip().split("=")[1].strip('"') ++ break ++ except OSError as error: ++ LOGGER.error(f"Error reading {os_release_path}: {error}") ++ ++ return name_value ++ + @staticmethod + def __get_bios_version() -> str: + """ +-- +2.33.0 + diff --git a/aops-ceres.spec b/aops-ceres.spec index 687f7bebcb330cb96a2c91e5cbdbd9fd3552df12..e1cc47d3fb5e7381abdf78aadc5fed5bb368b3e2 100644 --- a/aops-ceres.spec +++ b/aops-ceres.spec @@ -2,7 +2,7 @@ Name: aops-ceres Version: v1.4.1 -Release: 7 +Release: 8 Summary: An agent which needs to be adopted in client, it managers some plugins, such as gala-gopher(kpi collection), fluentd(log collection) and so on. License: MulanPSL2 URL: https://gitee.com/openeuler/%{name} @@ -19,6 +19,7 @@ Patch0003: 0003-remove-installed-rpm-if-unreboot-and-improve-log-for-rollback.p Patch0004: 0004-fix-cve-2021-33633.patch Patch0005: 0005-override-list-file-method.patch Patch0006: 0006-update-register-template-file.patch +Patch0007: 0007-update-query-host-info-command.patch %description @@ -92,6 +93,9 @@ install -b -m500 ./extra-tools/da-tool/script/da-tool.sh ${RPM_BUILD_ROOT} %attr(0500, root, root) %{_bindir}/da-tool-analysis %changelog +* Wed Aug 28 2024 wenxin - v1.4.1-8 +- update query host info command + * Wed Jun 05 2024 wenxin - v1.4.1-7 - update register template file