diff --git a/gala-gopher-2.0.1.tar.gz b/gala-gopher-2.0.2.tar.gz similarity index 77% rename from gala-gopher-2.0.1.tar.gz rename to gala-gopher-2.0.2.tar.gz index 4964a4ff7bd0990219a8739c7cf5eadc51644459..2c4bfc223091a385160ea2bfe49bccfa49292cc5 100644 Binary files a/gala-gopher-2.0.1.tar.gz and b/gala-gopher-2.0.2.tar.gz differ diff --git a/gala-gopher.spec b/gala-gopher.spec index 1d8863c19cc5fb02a24303af46757018ecb9692b..a9869acd83d88e38ac2cebc6d491b2cda3fec098 100644 --- a/gala-gopher.spec +++ b/gala-gopher.spec @@ -1,4 +1,5 @@ %define __os_install_post %{nil} +%define gopher_state_dir %{_rundir}/gala_gopher %define without_baseinfo 0 %define without_virt 0 @@ -11,13 +12,15 @@ %define without_jvm 0 %define without_postgre_sli 0 %define without_opengauss_sli 0 -%define without_nginx 0 +%define without_nginx 1 %define without_tprofiling 0 -%define without_kafka 0 -%define without_hw 0 +%define without_kafka 1 +%define without_hw 1 %define without_ksli 0 %define without_container 0 -%define without_sermant 0 +%define without_sermant 1 +%define without_sli 0 +%define without_flowtracer 1 %define disable_report_event 0 %define disable_kafka_channel 0 @@ -26,7 +29,7 @@ Summary: Intelligent ops toolkit for openEuler Name: gala-gopher -Version: 2.0.1 +Version: 2.0.2 Release: 1 License: Mulan PSL v2 URL: https://gitee.com/openeuler/gala-gopher @@ -81,7 +84,7 @@ Requires: libcurl Requires: python3-psycopg2 python3-yaml net-tools %endif %if !0%{?without_container} -Requires: cadvisor python3-libconf python3-requests net-tools util-linux +Requires: cadvisor python3-requests util-linux %endif %if !0%{?without_postgre_sli} Requires: iproute @@ -109,7 +112,7 @@ BUILD_OPTS=( -DENABLE_FLAMEGRAPH=%[0%{?without_flamegraph}?0:1] -DENABLE_L7=%[0%{?without_l7}?0:1] -DENABLE_TCP=%[0%{?without_tcp}?0:1] - -DENABLE_SOCKET=%[0%{?without_tcp}?0:1] + -DENABLE_SOCKET=%[0%{?without_socket}?0:1] -DENABLE_IO=%[0%{?without_io}?0:1] -DENABLE_PROC=%[0%{?without_proc}?0:1] -DENABLE_JVM=%[0%{?without_jvm}?0:1] @@ -122,6 +125,8 @@ BUILD_OPTS=( -DENABLE_KSLI=%[0%{?without_ksli}?0:1] -DENABLE_CONTAINER=%[0%{?without_cadvisor}?0:1] -DENABLE_SERMANT=%[0%{?without_sermant}?0:1] + -DENABLE_SLI=%[0%{?without_sli}?0:1] + -DENABLE_FLOWTRACER=%[0%{?without_flowtracer}?0:1] -DENABLE_REPORT_EVENT=%[0%{?disable_report_event}?0:1] -DKAFKA_CHANNEL=%[0%{?disable_kafka_channel}?0:1] @@ -145,20 +150,16 @@ install -d %{buildroot}%{_bindir} install -d %{buildroot}/usr/libexec/gala-gopher/ mkdir -p %{buildroot}/usr/lib/systemd/system install -m 0600 service/gala-gopher.service %{buildroot}/usr/lib/systemd/system/gala-gopher.service +install -d %{buildroot}/%{gopher_state_dir} +install -d %{buildroot}/var/log/gala-gopher pushd build sh install.sh %{buildroot}%{_bindir} %{buildroot}/opt/gala-gopher %{buildroot}/etc/gala-gopher %{buildroot}/usr/libexec/gala-gopher/ %{buildroot}/opt/gala-gopher popd +%pre + %post %systemd_post gala-gopher.service -if [ -d /var/log/gala-gopher ]; then - othermode=$(expr $(stat -L -c "%a" /var/log/gala-gopher) % 10) - if [ $othermode -ne 0 ]; then - chmod 750 /var/log/gala-gopher - chmod 750 /var/log/gala-gopher/debug - chmod 640 /var/log/gala-gopher/debug/gopher.log - fi -fi %preun %systemd_preun gala-gopher.service @@ -166,10 +167,13 @@ fi %postun if [ $1 -eq 0 ]; then rm -rf /sys/fs/bpf/gala-gopher > /dev/null + rm -rf /opt/gala-gopher > /dev/null fi %systemd_postun_with_restart gala-gopher.service %files +%attr(0750,root,root) %dir /var/log/gala-gopher +%attr(0750,root,root) %dir %{gopher_state_dir} %attr(0750,root,root) %dir /opt/gala-gopher %attr(0550,root,root) %dir /opt/gala-gopher/extend_probes %attr(0750,root,root) %dir /opt/gala-gopher/meta @@ -185,22 +189,49 @@ fi %attr(0640,root,root) %config(noreplace) /etc/gala-gopher/extend_probes/*.conf %attr(0600,root,root) /usr/lib/systemd/system/gala-gopher.service %attr(0550,root,root) /usr/libexec/gala-gopher/init_probes.sh +%attr(0550,root,root) /usr/libexec/gala-gopher/start_pre.sh %changelog -* Tue Oct 08 2024 zhaosai - 2.0.1-1 -- update to the latest stable version 2.0.1 - -* Mon Mar 18 2024 panchenbo - 2.0.0-4 -- fix build error : modify clang12 to clang - -* Mon Sep 18 2023 Tangxin Xie - 2.0.0-3 -- sync bugfix from openeuler/gala-gopher pr-536 - -* Fri Sep 15 2023 algorithmofdish - 2.0.0-2 -- fix: syscall 'waitpid' not exist in aarch64 arch - -* Wed Aug 23 2023 Tangxin Xie - 2.0.0-1 -- update to 2.0.0 +* Wed Aug 21 2024 wocow - 2.0.2-1 +- Update to 2.0.2-1 + +* Wed Apr 24 2024 Tangxin Xie - 2.0.0-1 +- Update to 2.0.1 + +* Fri Mar 8 2024 Zhen Chen - 1.0.2-4 +- fix command injection in ioprobe + +* Fri Jun 9 2023 Tangxin Xie - 1.0.2-3 +- fix httpprobe find libssl path + Fix segmentation fault of gala-gopher cmd + fix prepare_dependence + bugfix:The log time is not the local time + fix: fix fd leakage problem + cadvisor_probe:convert container_id type to bytes + adapt block_rq_issue tracepoint args in kernel-5.10 + modify desc from chinese to english + bugfix: fix gala-gopher -h print err + fix: change license software name + fix: fix install error + bugfix: zombie task. + fix:add default data of event conf + fix access violation + +* Fri Apr 7 2023 Tangxin Xie - 1.0.2-2 +- bugfix add check whether cadvisor is installed + bugfix fix system_proc collect data err + change return type of uprobe from void to int + Fix for popen cannot get stderr + fix modify unit of some metrics to second + refactor modify jvmprobe to support pod + stackprobe fix inaccurate call stack count add samp + add python3-libconf and python3-request deps + +* Fri Mar 3 2023 Tangxin Xie - 1.0.2-1 +- update to 1.0.2 + +* Wed Feb 22 2023 Tangxin Xie - 1.0.1-5 +- fix testcase compile and run errs * Tue Jan 31 2023 Zhen Chen - 1.0.1-4 - add net-tools and ethtool to Requires @@ -221,6 +252,23 @@ fi * Mon Dec 12 2022 Zhen Chen - 1.0.1-1 - Update to 1.0.1 +* Mon Dec 12 2022 Zhen Chen - 1.0.0-12 +- remove debug_package %{nil} to strip files and provide debug packages + +* Tue Dec 6 2022 Zhen Chen - 1.0.0-11 +- add %config(noreplace) to conf files of extend_probes + +* Tue Dec 6 2022 Zhen Chen - 1.0.0-10 +- simplify vmlinux.h management with different kernel versions + +* Wed Nov 30 2022 Zhen Chen - 1.0.0-9 +- fix java.probe build error caused by a typo in build.sh + Only check the installation of dep when building ebpf.probes + Remove unused BuildRequires and add java-1.8.0-openjdk-devel + +* Mon Nov 28 2022 wo_cow - 1.0.0-8 +- fix issues raised during 22.03 test + * Thu Nov 17 2022 wo_cow - 1.0.0-7 - resolve patch conflict diff --git a/gala-gopher.yaml b/gala-gopher.yaml deleted file mode 100644 index 668f0aa927df45b20a0887f5374cd428916996db..0000000000000000000000000000000000000000 --- a/gala-gopher.yaml +++ /dev/null @@ -1,4 +0,0 @@ -seperator: . -src_repo: openeuler/gala -tag_prefix: ^ -version_control: gitee.com