diff --git a/0001-modify-to-adapt-to-oe2209-arm.patch b/0001-modify-to-adapt-to-oe2209-arm.patch deleted file mode 100644 index 111efd5f049eb34930131f4678ed3312b9868111..0000000000000000000000000000000000000000 --- a/0001-modify-to-adapt-to-oe2209-arm.patch +++ /dev/null @@ -1,65 +0,0 @@ -From 82974fc559451d52897053314ffa66e2c9ed7cd6 Mon Sep 17 00:00:00 2001 -From: zhaoyuxing -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 +++---------------- - .../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 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() - MATCH_VMLINUX=linux_${LINUX_VER}.h - - cd ${VMLINUX_DIR} -- if [ -f ${MATCH_VMLINUX} ];then -- rm -f vmlinux.h -- ln -s ${MATCH_VMLINUX} vmlinux.h -- echo "debug: match vmlinux :" ${MATCH_VMLINUX} -- elif [ -f "vmlinux.h" ];then -- echo "debug: vmlinux.h is already here, continue compile." -- else -- echo "======================================ERROR===============================================" -- echo "there no match vmlinux :" ${MATCH_VMLINUX} -- echo "please create vmlinux.h manually." -- echo "methods:" -- echo " 1. generate linux_xxx.h by compile the kernel, refer to gen_vmlinux_h.sh;" -- echo " 2. ln -s vmlinux.h linux_xxx.h, (there are some include files in directory src/include)" -- echo " if your kernel version is similar to the include files provided, you can use method 2" -- echo "==========================================================================================" -- exit -- fi -+ rm -rf vmlinux.h -+ ln -s linux_5.10.0-106.1.0.55.oe2209.aarch64.h vmlinux.h -+ echo "debug: openEuler 22.09 match vmlinux :" ${MATCH_VMLINUX} - - 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-modify-to-adapt-to-oe2209-x86.patch b/0001-modify-to-adapt-to-oe2209-x86.patch deleted file mode 100644 index edb6e96067aa01f14312d5774797665e9316d134..0000000000000000000000000000000000000000 --- a/0001-modify-to-adapt-to-oe2209-x86.patch +++ /dev/null @@ -1,65 +0,0 @@ -From 82974fc559451d52897053314ffa66e2c9ed7cd6 Mon Sep 17 00:00:00 2001 -From: zhaoyuxing -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 +++---------------- - .../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 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() - MATCH_VMLINUX=linux_${LINUX_VER}.h - - cd ${VMLINUX_DIR} -- if [ -f ${MATCH_VMLINUX} ];then -- rm -f vmlinux.h -- ln -s ${MATCH_VMLINUX} vmlinux.h -- echo "debug: match vmlinux :" ${MATCH_VMLINUX} -- elif [ -f "vmlinux.h" ];then -- echo "debug: vmlinux.h is already here, continue compile." -- else -- echo "======================================ERROR===============================================" -- echo "there no match vmlinux :" ${MATCH_VMLINUX} -- echo "please create vmlinux.h manually." -- echo "methods:" -- echo " 1. generate linux_xxx.h by compile the kernel, refer to gen_vmlinux_h.sh;" -- echo " 2. ln -s vmlinux.h linux_xxx.h, (there are some include files in directory src/include)" -- echo " if your kernel version is similar to the include files provided, you can use method 2" -- echo "==========================================================================================" -- exit -- fi -+ rm -rf vmlinux.h -+ ln -s linux_5.10.0-106.1.0.55.oe2209.x86_64.h vmlinux.h -+ echo "debug: openEuler 22.09 match vmlinux :" ${MATCH_VMLINUX} - - 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/A-Ops-web-node-modules.tar.gz b/A-Ops-web-node-modules.tar.gz deleted file mode 100644 index b8f3fcfca5b7cd1f15d112bc4a7d97d60e8a1d03..0000000000000000000000000000000000000000 Binary files a/A-Ops-web-node-modules.tar.gz and /dev/null differ diff --git a/A-Ops.spec b/A-Ops.spec index 1870bb2f6c3e568b89e2be059a4f8f0cf388caad..9df96584b75c1a91628be65610c3e20cd440364b 100644 --- a/A-Ops.spec +++ b/A-Ops.spec @@ -1,27 +1,11 @@ Name: A-Ops Version: v1.3.0 -Release: 1 +Release: 2 Summary: The intelligent ops toolkit for openEuler License: MulanPSL2 URL: https://gitee.com/openeuler/A-Ops Source0: %{name}-%{version}.tar.gz -Source1: A-Ops-web-node-modules.tar.gz - -%ifarch x86_64 -patch0001: 0001-modify-to-adapt-to-oe2209-x86.patch -%endif -%ifarch aarch64 -patch0001: 0001-modify-to-adapt-to-oe2209-arm.patch -%endif - - -# build for web -BuildRequires: nodejs node-gyp nodejs-yarn - -# build for gopher -BuildRequires: cmake gcc-c++ yum elfutils-devel clang >= 10.0.1 llvm libconfig-devel -BuildRequires: librdkafka-devel libmicrohttpd-devel uthash-devel libbpf libbpf-devel -BuildRequires: log4cplus-devel +%global debug_package %{nil} # build for ragdoll & aops basic module BuildRequires: python3-setuptools python3-connexion python3-werkzeug python3-libyang @@ -30,66 +14,11 @@ BuildRequires: git python3-devel systemd # build for aops basic module BuildRequires: python3-setuptools python3-kafka-python python3-connexion -# build for spider & anteater -BuildRequires: python3-setuptools - %description The intelligent ops toolkit for openEuler -%package -n aops-agent -Summary: agent for A-Ops -Requires: python3-requests python3-flask python3-connexion python3-configparser python3-jsonschema -Requires: python3-flask-testing python3-libconf python3-swagger-ui-bundle -Requires: python3-concurrent-log-handler dmidecode python3-responses - -%description -n aops-agent -agent for A-Ops - - -%package -n aops-utils -Summary: utils for A-Ops -Requires: python3-concurrent-log-handler python3-xmltodict python3-pyyaml python3-marshmallow >= 3.13.0 -Requires: python3-requests python3-xlrd python3-prettytable python3-pygments python3-sqlalchemy -Requires: python3-elasticsearch >= 7 python3-prometheus-api-client python3-urllib3 python3-werkzeug -Requires: python3-flask python3-flask-restful python3-PyMySQL python3-kafka-python - -%description -n aops-utils -utils for A-Ops - - -%package -n aops-manager -Summary: manager of A-ops -Requires: aops-utils = %{version}-%{release} ansible >= 2.9.0 -Requires: python3-pyyaml python3-marshmallow >= 3.13.0 python3-flask python3-flask-restful -Requires: python3-requests sshpass python3-uWSGI python3-sqlalchemy python3-werkzeug python3-PyMySQL - -%description -n aops-manager -manager of A-ops, support software deployment and installation, account management, host management, -host group management, task and template management of ansible. - - -%package -n aops-check -Summary: check module for A-Ops -Requires: aops-utils = %{version}-%{release} -Requires: python3-requests python3-flask python3-flask-restful python3-marshmallow >= 3.13.0 -Requires: python3-numpy python3-pandas python3-prometheus-api-client -Requires: python3-sqlalchemy python3-PyMySQL python3-Flask-APScheduler >= 1.11.0 -Requires: python3-scipy - -%description -n aops-check -check module for A-Ops - - -%package -n gala-gopher -Summary: Intelligent ops toolkit for openEuler -Requires: bash glibc elfutils zlib elfutils-devel - -%description -n gala-gopher -Intelligent ops toolkit for openEuler - - %package -n gala-ragdoll Summary: Configuration traceability Requires: python3-gala-ragdoll = %{version}-%{release} @@ -107,158 +36,18 @@ Requires: python3-werkzeug python3-connexion python3-swagger-ui-bundle python3 pakcage of gala-ragdoll -%package -n gala-spider -Summary: Configuration traceability -Requires: python3-gala-spider = %{version}-%{release} - -%description -n gala-spider -Configuration traceability - - -%package -n python3-gala-spider -Summary: Python3 package of gala-spider -Requires: python3-kafka-python python3-pyyaml python3-pyarango python3-requests - -%description -n python3-gala-spider -Python3 package of gala-spider - - -%package -n gala-inference -Summary: Cause inference module for A-Ops project -Requires: python3-gala-inference = %{version}-%{release} - -%description -n gala-inference -Cause inference module for A-Ops project - - -%package -n python3-gala-inference -Summary: Python3 package of gala-inference -Requires: python3-gala-spider python3-kafka-python python3-pyyaml python3-pyarango -Requires: python3-requests python3-networkx python3-scipy - -%description -n python3-gala-inference -Python3 package of gala-inference - - -%package -n gala-anteater -Summary: abnormal detection -Requires: python3-gala-anteater = %{version}-%{release} - -%description -n gala-anteater -Abnormal detection module for A-Ops project - - -%package -n python3-gala-anteater -Summary: abnormal detection -Requires: python3-APScheduler python3-kafka-python python3-joblib python3-numpy -Requires: python3-pandas python3-requests python3-scikit-learn python3-pytorch - -%description -n python3-gala-anteater -Python3 package of python3-gala-anteater - - -%package -n aops-web -Summary: website for A-Ops -Requires: nginx - -%description -n aops-web -website for A-Ops, deployed by Nginx - -%package -n aops-tools -Summary: aops tools - -%description -n aops-tools -tools for aops, it's about agent deploy - - %prep -%setup -%setup -T -D -a 1 -%patch0001 -p1 -cp -rf A-Ops-web-node-modules/node_modules aops-web/ +%autosetup -n %{name}-%{version} %build -# build for aops-agent -pushd aops-agent -%py3_build -popd - -# build for aops-utils -pushd aops-utils -%py3_build -popd - -#build for aops-manager -pushd aops-manager -%py3_build -popd - -# build for aops-check -pushd aops-check -%py3_build -popd - -#build for gala-gopher -pushd gala-gopher/build -sh build.sh --release -popd - #build for gala-ragdoll pushd gala-ragdoll %py3_build popd -#build for gala-spider -pushd gala-spider -%py3_build -popd - -#build for gala-anteater -pushd gala-anteater -%py3_build -popd - -#build for aops-web -pushd aops-web -yarn build -popd - %install -# install for agent -pushd aops-agent -%py3_install -popd - -# install for utils -pushd aops-utils -%py3_install -popd - -# install for manager -pushd aops-manager -%py3_install -mkdir -p %{buildroot}/%{python3_sitelib}/aops_manager/deploy_manager/ansible_handler -cp -r aops_manager/deploy_manager/ansible_handler/* %{buildroot}/%{python3_sitelib}/aops_manager/deploy_manager/ansible_handler -mkdir -p %{buildroot}/%{python3_sitelib}/aops_manager/deploy_manager/tasks -cp -r aops_manager/deploy_manager/tasks/* %{buildroot}/%{python3_sitelib}/aops_manager/deploy_manager/tasks -popd - -# install for check -pushd aops-check -%py3_install -popd - -#install for gala-gopher -pushd gala-gopher/build -install -d %{buildroot}/opt/gala-gopher -install -d %{buildroot}%{_bindir} -mkdir -p %{buildroot}/usr/lib/systemd/system -install -m 0600 ../service/gala-gopher.service %{buildroot}/usr/lib/systemd/system/gala-gopher.service -sh install.sh %{buildroot}%{_bindir} %{buildroot}/opt/gala-gopher -popd - #install for gala-ragdoll pushd gala-ragdoll %py3_install @@ -271,42 +60,6 @@ mkdir -p %{buildroot}/%{_prefix}/lib/systemd/system install service/gala-ragdoll.service %{buildroot}/%{_prefix}/lib/systemd/system popd -#install for gala-spider -pushd gala-spider -%py3_install -popd - -#install for gala-anteater -pushd gala-anteater -%py3_install -popd - -# install for web -pushd aops-web -mkdir -p %{buildroot}/opt/aops_web -cp -r dist %{buildroot}/opt/aops_web/ -mkdir -p %{buildroot}/%{_sysconfdir}/nginx -cp -r deploy/aops-nginx.conf %{buildroot}/%{_sysconfdir}/nginx/ -mkdir -p %{buildroot}/usr/lib/systemd/system -cp -r deploy/aops-web.service %{buildroot}/usr/lib/systemd/system/ -popd - -# install for aops tools -pushd aops-tools -mkdir -p %{buildroot}/opt/aops/ -cp -r aops_tools %{buildroot}/opt/aops/ -popd - - -%post -n gala-gopher -%systemd_post gala-gopher.service - -%preun -n gala-gopher -%systemd_preun gala-gopher.service - -%postun -n gala-gopher -%systemd_postun_with_restart gala-gopher.service - %pre -n gala-ragdoll if [ -f "%{systemd_dir}/gala-ragdoll.service" ] ; then @@ -322,99 +75,6 @@ fi %postun -n gala-ragdoll %systemd_postun gala-ragdoll.service -%pre -n gala-spider -if [ -f "%{_unitdir}/gala-spider.service" ] ; then - systemctl enable gala-spider.service || : -fi - -%post -n gala-spider -%systemd_post gala-spider.service - -%preun -n gala-spider -%systemd_preun gala-spider.service - -%postun -n gala-spider -%systemd_postun gala-spider.service - - -%pre -n gala-inference -if [ -f "%{_unitdir}/gala-inference.service" ] ; then - systemctl enable gala-inference.service || : -fi - -%post -n gala-inference -%systemd_post gala-inference.service - -%preun -n gala-inference -%systemd_preun gala-inference.service - -%postun -n gala-inference -%systemd_postun gala-inference.service - - -%pre -n gala-anteater -if [ -f "%{_unitdir}/gala-anteater.service" ] ; then - systemctl enable gala-anteater.service || : -fi - -%post -n gala-anteater -%systemd_post gala-anteater.service - -%preun -n gala-anteater -%systemd_preun gala-anteater.service - -%postun -n gala-anteater -%systemd_postun gala-anteater.service - - -%files -n aops-agent -%attr(0644,root,root) %{_sysconfdir}/aops/agent.conf -%attr(0755,root,root) %{_unitdir}/aops-agent.service -%{python3_sitelib}/aops_agent*.egg-info -%{python3_sitelib}/aops_agent/* -%{_bindir}/aops_agent - - -%files -n aops-utils -%doc README.* -%attr(0644,root,root) %{_sysconfdir}/aops/system.ini -%{python3_sitelib}/aops_utils*.egg-info -%{python3_sitelib}/aops_utils/* -%attr(0755,root,root) %{_bindir}/aops-utils - - -%files -n aops-manager -%attr(0644,root,root) %{_sysconfdir}/aops/manager.ini -%attr(0644,root,root) %{_sysconfdir}/aops/default.json -%attr(0755,root,root) %{_bindir}/aops-manager -%attr(0755,root,root) %{_unitdir}/aops-manager.service -%{python3_sitelib}/aops_manager*.egg-info -%{python3_sitelib}/aops_manager/* - - -%files -n aops-check -%attr(0644,root,root) %{_sysconfdir}/aops/check.ini -%attr(0644,root,root) %{_sysconfdir}/aops/check_default.json -%attr(0755,root,root) %{_bindir}/aops-check -%attr(0755,root,root) %{_unitdir}/aops-check.service -%{python3_sitelib}/aops_check*.egg-info -%{python3_sitelib}/aops_check/* - - -%files -n gala-gopher -%defattr(-,root,root) -%dir /opt/gala-gopher -%dir /opt/gala-gopher/extend_probes -%dir /opt/gala-gopher/meta -%dir /opt/gala-gopher/lib -%{_bindir}/* -%config(noreplace) /opt/gala-gopher/gala-gopher.conf -%config(noreplace) /opt/gala-gopher/task_whitelist.conf -/opt/gala-gopher/extend_probes/* -/opt/gala-gopher/meta/* -/opt/gala-gopher/lib/* -%{_unitdir}/gala-gopher.service - %files -n gala-ragdoll %doc gala-ragdoll/doc/* @@ -430,57 +90,10 @@ fi %{python3_sitelib}/ragdoll-*.egg-info -%files -n gala-spider -%doc gala-spider/README.md gala-spider/docs/* -%license gala-spider/LICENSE -%config(noreplace) %{_sysconfdir}/gala-spider/gala-spider.yaml -%config(noreplace) %{_sysconfdir}/gala-spider/topo-relation.yaml -%config(noreplace) %{_sysconfdir}/gala-spider/ext-observe-meta.yaml -%{_bindir}/spider-storage -%{_unitdir}/gala-spider.service - - -%files -n python3-gala-spider -%{python3_sitelib}/spider/* -%{python3_sitelib}/gala_spider-*.egg-info - - -%files -n gala-inference -%doc gala-spider/README.md gala-spider/docs/* -%license LICENSE -%config(noreplace) %{_sysconfdir}/gala-inference/gala-inference.yaml -%config(noreplace) %{_sysconfdir}/gala-inference/ext-observe-meta.yaml -%{_bindir}/gala-inference -%{_unitdir}/gala-inference.service - - -%files -n python3-gala-inference -%{python3_sitelib}/cause_inference/* -%{python3_sitelib}/gala_spider-*.egg-info - - -%files -n gala-anteater -%doc gala-anteater/README.md -%license gala-anteater/LICENSE -%{_bindir}/gala-anteater -%{_unitdir}/gala-anteater.service - - -%files -n python3-gala-anteater -%{python3_sitelib}/anteater/* -%{python3_sitelib}/gala_anteater-*.egg-info - - -%files -n aops-web -%attr(0755, root, root) /opt/aops_web/dist/* -%attr(0755, root, root) %{_sysconfdir}/nginx/aops-nginx.conf -%attr(0755, root, root) %{_unitdir}/aops-web.service - -%files -n aops-tools -%attr(0755, root, root) /opt/aops/aops_tools/* - - %changelog +* 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