diff --git a/0001-fix-text-file-sync-bug.patch b/0001-fix-text-file-sync-bug.patch new file mode 100644 index 0000000..0ee7023 --- /dev/null +++ b/0001-fix-text-file-sync-bug.patch @@ -0,0 +1,28 @@ +From 4f0811635664dcc34d8f556d17bb63b5c72ed1a9 Mon Sep 17 00:00:00 2001 +From: smjiao +Date: Tue, 7 Nov 2023 18:26:49 +0800 +Subject: [PATCH] fix text file sync bug + +--- + ragdoll/config_model/text_config.py | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/ragdoll/config_model/text_config.py b/ragdoll/config_model/text_config.py +index 98d8fd1..dadd915 100644 +--- a/ragdoll/config_model/text_config.py ++++ b/ragdoll/config_model/text_config.py +@@ -41,6 +41,8 @@ class TextConfig(BaseHandlerConfig): + + def write_conf(self): + content = "" +- for conf_list in self.conf: +- content += '\t'.join(conf_list) + '\n' ++ for value in self.conf: ++ if value is not None: ++ content = content + value + "\n" ++ content = content + '\n' + return content +\ No newline at end of file +-- +2.38.1.windows.1 + diff --git a/gala-ragdoll-v1.4.0.tar.gz b/gala-ragdoll-v1.4.0.tar.gz deleted file mode 100644 index f6347b5..0000000 Binary files a/gala-ragdoll-v1.4.0.tar.gz and /dev/null differ diff --git a/gala-ragdoll-v1.4.1.tar.gz b/gala-ragdoll-v1.4.1.tar.gz new file mode 100644 index 0000000..6d7a45b Binary files /dev/null and b/gala-ragdoll-v1.4.1.tar.gz differ diff --git a/gala-ragdoll.spec b/gala-ragdoll.spec index 798ae47..0fecf87 100644 --- a/gala-ragdoll.spec +++ b/gala-ragdoll.spec @@ -1,10 +1,11 @@ Name: gala-ragdoll -Version: v1.4.0 -Release: 1 +Version: v1.4.1 +Release: 2 Summary: Configuration traceability License: MulanPSL2 URL: https://gitee.com/openeuler/%{name} Source0: %{name}-%{version}.tar.gz +Patch0001: 0001-fix-text-file-sync-bug.patch %global debug_package %{nil} BuildRequires: python3-setuptools python3-connexion python3-werkzeug python3-libyang @@ -27,7 +28,7 @@ python3 pakcage of gala-ragdoll %prep -%autosetup -n %{name}-%{version} +%autosetup -n %{name}-%{version} -p1 %build @@ -77,134 +78,8 @@ fi %changelog -* Web Oct 25 2023 zhangdaolong - v1.4.0-1 +* Wed Nov 8 2023 smjiao - v1.4.1-2 +- fix text file sync bug + +* Wed Oct 25 2023 zhangdaolong - v1.4.1-1 - gala-ragdoll src init - -* Mon Apr 17 2023 wenxin - v1.3.0-3 -- update the host id validate method for ragdoll - -* Tue Feb 28 2023 zhuyuncheng - v1.3.0-2 -- remove packages which have moved to new repositories. - -* Mon Sep 26 2022 zhuyuncheng - v1.3.0-1 -- update delete host return message -- update add domain return message - -* Wed Sep 14 2022 zhuyuncheng - v1.2.6-1 -- move aops-basedatabase to aops-tools -- rename default scene from 'unknown' to 'normal' - -* Tue Sep 13 2022 zhaoyuxing - v1.2.5-4 -- bug fix: start gala-ragdoll.service when install gala-ragdoll. - -* Fri Sep 9 2022 zhuyuncheng - v1.2.5-3 -- bug fix: add create time attribute of workflow, fix assign model bug of aops-check default mode -- update agent get host info interface and some test cases -- fix gala-ragdoll return code issue -- web fine-tuning for workflow and agent info. - -* Wed Sep 7 2022 zhaoyuxing - v1.2.5-2 -- bug fix: adjust dependent packages for gala-ragdoll. - -* Tue Sep 6 2022 zhuyuncheng - v1.2.5-1 -- bug fix: bugfix of aops-web and aops-check's interaction - -* Fri Sep 2 2022 zhuyuncheng - v1.2.4-1 -- add default mode of aops-check, which can run independently. - -* Mon Aug 29 2022 zhaoyuxing - v1.2.3-3 -- bug fix: gala-spider adapt to abnormal event format change. - -* Mon Aug 29 2022 zhaoyuxing - v1.2.3-2 -- bug fix: bugfix for gopher report metadata to kafka. - -* Sat Aug 27 2022 zhuyuncheng - v1.2.3-1 -- Add requires of aops-check for new features. - -* Tue Aug 23 2022 zhaoyuxing - v1.2.2-2 -- Set user modification of confs will not be overwrite for gala_spider. - -* Wed Aug 10 2022 zhuyuncheng - v1.2.2-1 -- New release 1.2.2, bug fix and add new module. -- add missed requirement python3-PyMySQL -- add new module, check and web - -* Wed Aug 10 2022 zhaoyuxing - v1.2.1-1 -- New release 1.2.1, bug fix. -- modify patch for gala-gopher and rm patch for gala-anteater. -- reduce the operating noise of gala-gopher. -- optimize the module of gala-anteater. - -* Tue Aug 2 2022 zhaoyuxing - v1.2.0-3 -- 1. add patch to modify install_requires of gala-anteater. -- 2. delete redundant dependent packages for gala-spider. - -* Mon Aug 1 2022 zhuyuncheng - v1.2.0-2 -- add base-database executable file into aops-manager to downlaod database. - -* Sun Jul 31 2022 zhaoyuxing - v1.2.0-1 -- modify spec for gala-gopher&gala-spider and add new features. -- 1. gala-gopher & gala-spider adapt to the latest code. -- 2. add new feature gala-anteater. -- add aops-agent module, delete aops-database, aops-cli, aops-web, - and four adoctor modules for new architecture. - -* Thu Sep 30 2021 chemingdao - v1.1.1-5 -- Using image source overwrite instead of patching image binaries. - -* Wed Sep 29 2021 chemingdao - v1.1.1-4 -- switch logo images and modify logo size. - -* Wed Sep 29 2021 orange-snn - v1.1.1-3 -- add permission control in ragdoll. - -* Wed Sep 29 2021 chemingdao - v1.1.1-2 -- fix log info of the task execution. - -* Sun Sep 26 2021 chemingdao - v1.1.1-1 -- New release 1.1.1, bug fix and new features. -- 1. Web issues fix: display fix and domain management modification. -- 2. Fix cli display issues and add loading bar of diag. -- 3. Fix return of gala-ragdoll. -- 4. Fix log level. -- 5. haproxy probe with vport info. - -* Sat Sep 18 2021 zhuyuncheng - v1.1.0-2 -- add missed file and better cli output - -* Fri Sep 17 2021 chemingdao - v1.1.0-1 -- New release 1.1.0, bug fix and UI beautify. -- 1. Simplify gala-spider UI display. -- 2. Beautify cli print with table and highlight json. -- 3. Bug fix: now support check with management host. -- 4. Modify elasticsearch and fluentd default config. - -* Thu Sep 16 2021 chemingdao - v1.0.3-1 -- NEW release 1.0.3. - -* Mon Sep 13 2021 chemingdao - v1.0.2-3 -- modify spec for aops-web build and fix some issues. - -* Sat Sep 11 2021 yangyunyi - v1.0.2-2 -- modify ansible playbook - -* Tue Sep 7 2021 zhaoyuxing - v1.0.2-1 -- add gala-spider in spec - -* Mon Sep 6 2021 Yiru Wang - v1.0.1-2 -- add web build modle of the aops - -* Mon Sep 6 2021 Lostwayzxc - v1.0.1-1 -- update src, add intelligent check and diagnosis module - -* Thu Sep 2 2021 zhaoyuxing - 1.0.0-4 -- add service file in gala-spider - -* Wed Sep 1 2021 orange-snn - 1.0.0-3 -- add service file in gala-ragdoll - -* Tue Aug 24 2021 zhu-yuncheng - 1.0.0-2 -- Update spec - -* Sat Jul 31 2021 orange-snn - 1.0.0-1 -- Package init