diff --git a/A-Ops-v1.0.1.tar.gz b/A-Ops-v1.0.2.tar.gz similarity index 75% rename from A-Ops-v1.0.1.tar.gz rename to A-Ops-v1.0.2.tar.gz index cc5eb1898880ce156ceecbe7bbf53d25650ffd9e..a1f18301f97062f4952c83009dd48574d8c4b91a 100644 Binary files a/A-Ops-v1.0.1.tar.gz and b/A-Ops-v1.0.2.tar.gz differ diff --git a/A-Ops.spec b/A-Ops.spec index 4d6cc395c46c6d9b0d7632e02a8d051174c51c6d..f899675961a030e7fb5a1d6ad48d70b7c5408a78 100644 --- a/A-Ops.spec +++ b/A-Ops.spec @@ -1,7 +1,7 @@ #needsrootforbuild Name: A-Ops -Version: v1.0.1 -Release: 2 +Version: v1.0.2 +Release: 1 Summary: The intelligent ops toolkit for openEuler License: MulanPSL2 URL: https://gitee.com/openeuler/A-Ops @@ -16,6 +16,9 @@ BuildRequires: librdkafka-devel libmicrohttpd-devel BuildRequires: python3-setuptools python3-connexion python3-werkzeug python3-libyang BuildRequires: git python3-devel systemd +# build for spider & aops basic module +BuildRequires: python3-setuptools python3-kafka-python python3-connexion + # build for web BuildRequires: nodejs node-gyp npm @@ -135,6 +138,20 @@ Requires: python3-werkzeug python3-connexion python3-swagger-ui-bundle %description -n python3-gala-ragdoll python3 pakcage of gala-ragdoll +%package -n gala-spider +Summary: Configuration traceability + +%description -n gala-spider +Configuration traceability + + +%package -n python3-gala-spider +Summary: python3 pakcage of gala-spider +Requires: gala-spider = %{version}-%{release} python3-kafka-python python3-connexion + +%description -n python3-gala-spider +python3 pakcage of gala-spider + %package -n aops-web Summary: website for A-Ops @@ -209,7 +226,7 @@ popd #build for gala-gopher pushd gala-gopher -sh build.sh package +sh build.sh build popd #build for gala-ragdoll @@ -217,6 +234,11 @@ pushd gala-ragdoll %py3_build popd +#build for gala-spider +pushd gala-spider +%py3_build +popd + #build for aops-web pushd aops-web yarn build @@ -305,6 +327,17 @@ 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 +mkdir -p %{buildroot}/%{_sysconfdir}/spider +install config/*.conf %{buildroot}/%{_sysconfdir}/spider/ +mkdir %{buildroot}/%{python3_sitelib}/spider/config +install config/*.conf %{buildroot}/%{python3_sitelib}/spider/config +mkdir -p %{buildroot}/%{_prefix}/lib/systemd/system +install service/gala-spider.service %{buildroot}/%{_prefix}/lib/systemd/system +popd + %post -n gala-gopher %systemd_post gala-gopher.service @@ -330,7 +363,19 @@ fi %postun -n python3-gala-ragdoll %systemd_postun gala-ragdoll.service +%pre -n python3-gala-spider +if [ -f "%{systemd_dir}/gala-spider.service" ] ; then + systemctl enable gala-spider.service || : +fi + +%post -n python3-gala-spider +%systemd_post gala-spider.service + +%preun -n python3-gala-spider +%systemd_preun gala-spider.service +%postun -n python3-gala-spider +%systemd_postun gala-spider.service %files -n aops-utils %doc README.* @@ -429,6 +474,19 @@ fi %{python3_sitelib}/ragdoll-*.egg-info +%files -n gala-spider +%doc gala-spider/doc/* +%license gala-spider/LICENSE +/%{_sysconfdir}/spider/gala-spider.conf +%{_bindir}/spider +%{_prefix}/lib/systemd/system/gala-spider.service + + +%files -n python3-gala-spider +%{python3_sitelib}/spider/* +%{python3_sitelib}/spider-*.egg-info + + %files -n aops-web %attr(0755, root, root) /opt/aops_web/dist/* %attr(0755, root, root) %{_sysconfdir}/nginx/aops-nginx.conf @@ -436,6 +494,9 @@ fi %changelog +* 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