diff --git a/0004-update-the-template-file-contents-for-adding-hosts.patch b/0004-update-the-template-file-contents-for-adding-hosts.patch new file mode 100644 index 0000000000000000000000000000000000000000..ca6c95daa91791c2276f736f2ed14d7c4e63efeb --- /dev/null +++ b/0004-update-the-template-file-contents-for-adding-hosts.patch @@ -0,0 +1,33 @@ +From 36d5b7a26f9f470e0b9a593edb7f198cd9022c47 Mon Sep 17 00:00:00 2001 +From: rabbitali +Date: Thu, 26 Oct 2023 18:43:37 +0800 +Subject: [PATCH] update the template file contents for adding hosts + +--- + zeus/conf/constant.py | 10 ++++++++-- + 1 file changed, 8 insertions(+), 2 deletions(-) + +diff --git a/zeus/conf/constant.py b/zeus/conf/constant.py +index bf8792a..df2948d 100644 +--- a/zeus/conf/constant.py ++++ b/zeus/conf/constant.py +@@ -91,8 +91,14 @@ CHECK_WORKFLOW_HOST_EXIST = '/check/workflow/host/exist' + + # host template file content + HOST_TEMPLATE_FILE_CONTENT = """host_ip,ssh_port,ssh_user,password,ssh_pkey,host_name,host_group_name,management +-test_ip_1,22,root,password,ssh_pkey,test_host,test_host_group,False +-test_ip_2,22,root,password,ssh_pkey,test_host,test_host_group,False ++127.0.0.1,22,root,password,private key,test_host,test_host_group,FALSE ++127.0.0.1,23,root,password,private key,test_host,test_host_group,FALSE ++,,,,,,, ++"提示:",,,,,,, ++"1. 除登录密码与SSH登录秘钥外,其余信息都应提供有效值",,,,,,, ++"2. 登录密码与SSH登录秘钥可选择一种填入,当两者都提供时,以SSH登录秘钥为准",,,,,,, ++"3. 添加的主机信息不应存在重复信息(主机名称重复或者主机IP+端口重复)",,,,,,, ++"4. 上传本文件前,请删除此部分提示内容",,,,,,, + """ + + +-- +2.33.0 + diff --git a/aops-zeus.spec b/aops-zeus.spec index a2052c3fe42435fbd6378664c446be28b80eae9c..fb55b9243272a5cbff05fd00c62344d7220858cb 100644 --- a/aops-zeus.spec +++ b/aops-zeus.spec @@ -1,6 +1,6 @@ Name: aops-zeus Version: v1.3.1 -Release: 2 +Release: 3 Summary: A host and user manager service which is the foundation of aops. License: MulanPSL2 URL: https://gitee.com/openeuler/%{name} @@ -8,6 +8,7 @@ Source0: %{name}-%{version}.tar.gz Patch0001: 0001-fix-metric-proxy-init-failed-error.patch Patch0002: 0002-add-key-authentication-for-add-host-api.patch Patch0003: 0003-fix-python-prometheus-api-client-import-error.patch +Patch0004: 0004-update-the-template-file-contents-for-adding-hosts.patch BuildRequires: python3-setuptools @@ -48,6 +49,9 @@ cp -r database %{buildroot}/opt/aops/ %changelog +* Thu Oct 26 2023 wenxin - v1.3.1-3 +- update the template file contents for adding hosts + * Wed Oct 18 2023 wenxin - v1.3.1-2 - fix bug: metric proxy init failed - add a way about key authentication for add host api