diff --git a/0001-gen-vmlinx-oe2209-arm.patch b/0001-modify-to-adapt-to-oe2209-arm.patch similarity index 57% rename from 0001-gen-vmlinx-oe2209-arm.patch rename to 0001-modify-to-adapt-to-oe2209-arm.patch index 9c50f60a2ffeff0c45e1b719e3d448500b504fc0..111efd5f049eb34930131f4678ed3312b9868111 100644 --- a/0001-gen-vmlinx-oe2209-arm.patch +++ b/0001-modify-to-adapt-to-oe2209-arm.patch @@ -1,14 +1,15 @@ -From b535f1693db71fba7af3d7b411415ffc2daa4009 Mon Sep 17 00:00:00 2001 +From 82974fc559451d52897053314ffa66e2c9ed7cd6 Mon Sep 17 00:00:00 2001 From: zhaoyuxing -Date: Sat, 30 Jul 2022 17:32:56 +0800 -Subject: [PATCH] gen vmlinux.h of oe-22.09 arm +Date: Wed, 10 Aug 2022 17:12:16 +0800 +Subject: [PATCH] modify vmlinux.h and version infos of oe-22.09 arm --- .../src/probes/extends/ebpf.probe/build.sh | 20 +++---------------- - 1 file changed, 3 insertions(+), 17 deletions(-) + .../probes/extends/ebpf.probe/src/mk/var.mk | 10 ++++------ + 2 files changed, 7 insertions(+), 23 deletions(-) diff --git a/gala-gopher/src/probes/extends/ebpf.probe/build.sh b/gala-gopher/src/probes/extends/ebpf.probe/build.sh -index 3d67a40..1a78ea5 100755 +index ab4aa3e..6a33a1b 100755 --- a/gala-gopher/src/probes/extends/ebpf.probe/build.sh +++ b/gala-gopher/src/probes/extends/ebpf.probe/build.sh @@ -82,23 +82,9 @@ function compile_probe() @@ -38,6 +39,27 @@ index 3d67a40..1a78ea5 100755 cd ${SRC_DIR} echo "=======Begin to compile ebpf-based probes======:" ${EBPF_PROBES} +diff --git a/gala-gopher/src/probes/extends/ebpf.probe/src/mk/var.mk b/gala-gopher/src/probes/extends/ebpf.probe/src/mk/var.mk +index 1a1e8db..d61b124 100644 +--- a/gala-gopher/src/probes/extends/ebpf.probe/src/mk/var.mk ++++ b/gala-gopher/src/probes/extends/ebpf.probe/src/mk/var.mk +@@ -23,12 +23,10 @@ else ifeq ($(ARCH), aarch64) + ARCH = arm64 + endif + +-KER_VER = $(shell uname -r | awk -F'-' '{print $$1}') +-KER_VER_MAJOR = $(shell echo $(KER_VER) | awk -F'.' '{print $$1}') +-KER_VER_MINOR = $(shell echo $(KER_VER) | awk -F'.' '{print $$2}') +-KER_VER_PATCH = $(shell echo $(KER_VER) | awk -F'.' '{print $$3}') +-RELEASE_INFOS = $(shell uname -r | awk -F'-' '{print $$2}') +-KER_RELEASE = $(shell echo $(RELEASE_INFOS) | awk -F'.' '{print $$1}') ++KER_VER_MAJOR = 5 ++KER_VER_MINOR = 10 ++KER_VER_PATCH = 0 ++KER_RELEASE = 106 + + LINK_TARGET ?= -lpthread -lbpf -lelf -llog4cplus -lz + EXTRA_CFLAGS ?= -g -O2 -Wall -fPIC -- 2.36.1 diff --git a/0001-gen-vmlinx-oe2209-x86.patch b/0001-modify-to-adapt-to-oe2209-x86.patch similarity index 57% rename from 0001-gen-vmlinx-oe2209-x86.patch rename to 0001-modify-to-adapt-to-oe2209-x86.patch index 208df4b416e37c4d5892bc2931e5870b9ed9250a..edb6e96067aa01f14312d5774797665e9316d134 100644 --- a/0001-gen-vmlinx-oe2209-x86.patch +++ b/0001-modify-to-adapt-to-oe2209-x86.patch @@ -1,14 +1,15 @@ -From b535f1693db71fba7af3d7b411415ffc2daa4009 Mon Sep 17 00:00:00 2001 +From 82974fc559451d52897053314ffa66e2c9ed7cd6 Mon Sep 17 00:00:00 2001 From: zhaoyuxing -Date: Sat, 30 Jul 2022 17:32:56 +0800 -Subject: [PATCH] gen vmlinux.h of oe-22.09 x86 +Date: Wed, 10 Aug 2022 17:12:16 +0800 +Subject: [PATCH] modify vmlinux.h and version infos of oe-22.09 x86 --- .../src/probes/extends/ebpf.probe/build.sh | 20 +++---------------- - 1 file changed, 3 insertions(+), 17 deletions(-) + .../probes/extends/ebpf.probe/src/mk/var.mk | 10 ++++------ + 2 files changed, 7 insertions(+), 23 deletions(-) diff --git a/gala-gopher/src/probes/extends/ebpf.probe/build.sh b/gala-gopher/src/probes/extends/ebpf.probe/build.sh -index 3d67a40..1a78ea5 100755 +index ab4aa3e..6a33a1b 100755 --- a/gala-gopher/src/probes/extends/ebpf.probe/build.sh +++ b/gala-gopher/src/probes/extends/ebpf.probe/build.sh @@ -82,23 +82,9 @@ function compile_probe() @@ -38,6 +39,27 @@ index 3d67a40..1a78ea5 100755 cd ${SRC_DIR} echo "=======Begin to compile ebpf-based probes======:" ${EBPF_PROBES} +diff --git a/gala-gopher/src/probes/extends/ebpf.probe/src/mk/var.mk b/gala-gopher/src/probes/extends/ebpf.probe/src/mk/var.mk +index 1a1e8db..d61b124 100644 +--- a/gala-gopher/src/probes/extends/ebpf.probe/src/mk/var.mk ++++ b/gala-gopher/src/probes/extends/ebpf.probe/src/mk/var.mk +@@ -23,12 +23,10 @@ else ifeq ($(ARCH), aarch64) + ARCH = arm64 + endif + +-KER_VER = $(shell uname -r | awk -F'-' '{print $$1}') +-KER_VER_MAJOR = $(shell echo $(KER_VER) | awk -F'.' '{print $$1}') +-KER_VER_MINOR = $(shell echo $(KER_VER) | awk -F'.' '{print $$2}') +-KER_VER_PATCH = $(shell echo $(KER_VER) | awk -F'.' '{print $$3}') +-RELEASE_INFOS = $(shell uname -r | awk -F'-' '{print $$2}') +-KER_RELEASE = $(shell echo $(RELEASE_INFOS) | awk -F'.' '{print $$1}') ++KER_VER_MAJOR = 5 ++KER_VER_MINOR = 10 ++KER_VER_PATCH = 0 ++KER_RELEASE = 106 + + LINK_TARGET ?= -lpthread -lbpf -lelf -llog4cplus -lz + EXTRA_CFLAGS ?= -g -O2 -Wall -fPIC -- 2.36.1 diff --git a/0002-fix-anteater-install-requires.patch b/0002-fix-anteater-install-requires.patch deleted file mode 100644 index 2c977345192765bbdb93ab6bbf5c670609626f6a..0000000000000000000000000000000000000000 --- a/0002-fix-anteater-install-requires.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 184a6728e4fe56013fc9718009fa2ed1872a4cf9 Mon Aug 1 20:46:00 2022 -From: zhaoyuxing -Date: Mon, 1 Aug 2022 20:40:48 +0800 -Subject: [PATCH] fix-anteater-depends-on-specified-version-packages - ---- - gala-anteater/setup.py | 16 ++++++++-------- - 1 file changed, 8 insertions(+), 8 deletions(-) - -diff --git a/gala-anteater/setup.py b/gala-anteater/setup.py -index 37be734..9c274f2 100644 ---- a/gala-anteater/setup.py -+++ b/gala-anteater/setup.py -@@ -33,15 +33,15 @@ setup( - ('/usr/lib/systemd/system/', ['service/gala-anteater.service']), - ], - install_requires=[ -- "APScheduler==3.9.1", -+ "APScheduler", - "kafka-python>=2.0.2", -- "joblib==0.14.1", -- "numpy==1.21.6", -- "pandas==1.0.1", -- "requests==2.28.1", -- "scikit_learn==0.24.2", -- "scipy==1.7.3", -- "torch==1.11.0" -+ "joblib", -+ "numpy", -+ "pandas", -+ "requests", -+ "scikit_learn", -+ "scipy", -+ "torch" - ], - entry_points={ - "console_scripts": [ --- -2.36.1 - diff --git a/A-Ops-v1.2.0.tar.gz b/A-Ops-v1.2.1.tar.gz similarity index 80% rename from A-Ops-v1.2.0.tar.gz rename to A-Ops-v1.2.1.tar.gz index 4f7e68b2b87ac1c9fa76cd8b4356352deb1891fc..c5b7767728ba26df541519cbe9c89ea5f9c752f7 100644 Binary files a/A-Ops-v1.2.0.tar.gz and b/A-Ops-v1.2.1.tar.gz differ diff --git a/A-Ops.spec b/A-Ops.spec index 664ad7cb2974f5d68939c3618224a2b11ac5b253..7ab939c0a5793dbddaf85fba8f22803570b4ab7f 100644 --- a/A-Ops.spec +++ b/A-Ops.spec @@ -1,17 +1,16 @@ Name: A-Ops -Version: v1.2.0 -Release: 3 +Version: v1.2.1 +Release: 1 Summary: The intelligent ops toolkit for openEuler License: MulanPSL2 URL: https://gitee.com/openeuler/A-Ops Source0: %{name}-%{version}.tar.gz %ifarch x86_64 -patch0001: 0001-gen-vmlinx-oe2209-x86.patch +patch0001: 0001-modify-to-adapt-to-oe2209-x86.patch %endif %ifarch aarch64 -patch0001: 0001-gen-vmlinx-oe2209-arm.patch +patch0001: 0001-modify-to-adapt-to-oe2209-arm.patch %endif -patch0002: 0002-fix-anteater-install-requires.patch # build for gopher @@ -143,7 +142,7 @@ Python3 package of python3-gala-anteater %setup # %setup -T -D -a 1 %patch0001 -p1 -%patch0002 -p1 + %build # build for aops-agent @@ -398,6 +397,12 @@ fi %changelog +* 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.