From a04b9f6935c1bf8f5c745a7dbe4eb0b371a9817c Mon Sep 17 00:00:00 2001 From: Marcin Krol Date: Thu, 20 Jul 2023 13:42:51 +0200 Subject: [PATCH] - build and package Zabbix Agent 2 --- zabbix.spec | 48 +++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 47 insertions(+), 1 deletion(-) diff --git a/zabbix.spec b/zabbix.spec index 3c31511..fcbbe4c 100644 --- a/zabbix.spec +++ b/zabbix.spec @@ -26,6 +26,7 @@ Source1: %{name}-apache.conf Source2: %{name}_agentd.init Source3: %{name}_server.init Source4: %{name}_proxy.init +Source5: %{name}_agent2.init Patch0: tld.patch Patch1: sqlite3_dbname.patch Patch2: always_compile_ipc.patch @@ -34,7 +35,7 @@ BuildRequires: OpenIPMI-devel BuildRequires: autoconf BuildRequires: automake >= 1:1.15 BuildRequires: curl-devel -#BuildRequires: iksemel-devel +BuildRequires: golang %{?with_java:BuildRequires: jdk} BuildRequires: libevent-devel BuildRequires: libssh2-devel @@ -103,6 +104,20 @@ Zabbix agent collects data from the local system for a Zabbix server. %description agentd -l pl.UTF-8 Agent zbiera dane z lokalnej maszyny dla serwera Zabbix. +%package agent2 +Summary: Zabbix Agent 2 +Summary(pl.UTF-8): Agent 2 Zabbixa +Group: Networking/Utilities +Requires: %{name} = %{version}-%{release} +Requires(post,preun): /sbin/chkconfig +Requires: rc-scripts + +%description agent2 +Zabbix agent collects data from the local system for a Zabbix server. + +%description agent2 -l pl.UTF-8 +Agent zbiera dane z lokalnej maszyny dla serwera Zabbix. + %package web Summary: Web frontend for Zabbix Summary(pl.UTF-8): Interfejs Web dla Zabbixa @@ -263,6 +278,7 @@ This package provides the Zabbix Java Gateway. configure() { %configure \ --enable-agent \ + --enable-agent2 \ --enable-ipv6 \ %{__enable_disable java} \ --with-jabber \ @@ -314,6 +330,7 @@ install -d $RPM_BUILD_ROOT{%{_sysconfdir},/etc/rc.d/init.d,/etc/webapps/%{_webap %{__make} install \ DESTDIR=$RPM_BUILD_ROOT \ + GOBIN=$RPM_BUILD_ROOT%{_sbindir} \ ZJG_DEST=$RPM_BUILD_ROOT%{_datadir}/zabbix_java for database in %{databases} ; do @@ -338,6 +355,7 @@ cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_webapps}/%{_webapp}/httpd.conf install %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/zabbix_agentd install %{SOURCE3} $RPM_BUILD_ROOT/etc/rc.d/init.d/zabbix_server install %{SOURCE4} $RPM_BUILD_ROOT/etc/rc.d/init.d/zabbix_proxy +install %{SOURCE5} $RPM_BUILD_ROOT/etc/rc.d/init.d/zabbix_agent2 mv $RPM_BUILD_ROOT%{_appdir}/ui/conf $RPM_BUILD_ROOT%{_sysconfdir}/web ln -s %{_sysconfdir}/web $RPM_BUILD_ROOT%{_appdir}/ui/conf @@ -440,6 +458,16 @@ if [ "$1" = "0" ]; then /sbin/chkconfig --del zabbix_agentd fi +%post agent2 +/sbin/chkconfig --add zabbix_agent2 +%service zabbix_agent2 restart + +%preun agent2 +if [ "$1" = "0" ]; then + %service -q zabbix_agent2 stop + /sbin/chkconfig --del zabbix_agent2 +fi + %post proxy-mysql ln -sf %{_sbindir}/zabbix_proxy-mysql %{_sbindir}/zabbix_proxy || : @@ -487,6 +515,24 @@ fi %attr(755,root,root) %{_sbindir}/zabbix_agentd %{_mandir}/man8/zabbix_agentd* +%files agent2 +%defattr(644,root,root,755) +%attr(640,root,zabbix) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/zabbix_agent2.conf +%dir %attr(751,root,zabbix) %{_sysconfdir}/zabbix_agent2.d +%dir %attr(751,root,zabbix) %{_sysconfdir}/zabbix_agent2.d/plugins.d +%attr(640,root,zabbix) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/zabbix_agent2.d/plugins.d/ceph.conf +%attr(640,root,zabbix) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/zabbix_agent2.d/plugins.d/docker.conf +%attr(640,root,zabbix) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/zabbix_agent2.d/plugins.d/memcached.conf +%attr(640,root,zabbix) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/zabbix_agent2.d/plugins.d/modbus.conf +%attr(640,root,zabbix) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/zabbix_agent2.d/plugins.d/mqtt.conf +%attr(640,root,zabbix) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/zabbix_agent2.d/plugins.d/mysql.conf +%attr(640,root,zabbix) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/zabbix_agent2.d/plugins.d/oracle.conf +%attr(640,root,zabbix) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/zabbix_agent2.d/plugins.d/redis.conf +%attr(640,root,zabbix) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/zabbix_agent2.d/plugins.d/smart.conf +%attr(754,root,root) /etc/rc.d/init.d/zabbix_agent2 +%attr(755,root,root) %{_sbindir}/zabbix_agent2 +%{_mandir}/man8/zabbix_agent2* + %files web %defattr(644,root,root,755) %attr(750,root,http) %dir %{_webapps}/%{_webapp} -- 2.46.0