rpms
/
zabbix
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Update to 6.0.17.release1

This commit is contained in:
eabdullin 2023-05-22 09:47:57 +03:00
parent 787ef0d2ce
commit 1d41de9cae
5 changed files with 110 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored Normal file
View File

@ -0,0 +1 @@
SOURCES/zabbix-6.0.17.tar.gz

2
.zabbix.metadata
View File

@ -1 +1 @@
7f2bd26f4bd2438fc1cdb5f165764f5409d0963e SOURCES/zabbix-6.0.9.tar.gz
0a1665c7179e889de1a96fdbcd2fcc6134425d15 SOURCES/zabbix-6.0.17.tar.gz

21
SOURCES/agent2.conf.socket.patch Normal file
View File

@ -0,0 +1,21 @@
diff -urN zabbix-6.4.0beta6.orig/src/go/conf/zabbix_agent2.conf zabbix-6.4.0beta6/src/go/conf/zabbix_agent2.conf
--- zabbix-6.4.0beta6.orig/src/go/conf/zabbix_agent2.conf 2023-01-12 18:58:00.992534889 +0200
+++ zabbix-6.4.0beta6/src/go/conf/zabbix_agent2.conf 2023-01-13 09:30:59.464813623 +0200
@@ -309,6 +309,8 @@
# Default:/tmp/agent.plugin.sock
# PluginSocket=
+PluginSocket=/run/zabbix/agent.plugin.sock
+
####### USER-DEFINED MONITORED PARAMETERS #######
### Option: UnsafeUserParameters
@@ -350,7 +352,7 @@
# Default:
# ControlSocket=
-ControlSocket=/tmp/agent.sock
+ControlSocket=/run/zabbix/agent.sock
####### TLS-RELATED PARAMETERS #######

1
SOURCES/zabbix-agent2.service
View File

@ -15,6 +15,7 @@ ExecStop=/bin/kill -SIGTERM $MAINPID
RestartSec=10s
User=zabbix
Group=zabbix
LimitNOFILE=8192
[Install]
WantedBy=multi-user.target

92
SPECS/zabbix.spec
View File

@ -1,5 +1,5 @@
Name: zabbix
Version: 6.0.9
Version: 6.0.17
Release: %{?alphatag:%{?alphatag}.}release1%{?dist}
Summary: The Enterprise-class open source monitoring solution
Group: Applications/Internet
@ -35,21 +35,22 @@ Patch4: agent2.conf.patch
Patch5: rhel6-go11.6.patch
Patch6: conf.var.run.patch
Patch7: agent2.conf.var.run.patch
Patch8: agent2.conf.socket.patch
BuildRequires: gcc
Buildrequires: golang
BuildRequires: selinux-policy-devel
Buildroot: %{_tmppath}/zabbix-%{version}-%{release}-root-%(%{__id_u} -n)
%{!?build_agent: %global build_agent 1}
%ifarch x86_64
%if 0%{?rhel} >= 6
%{!?build_agent2: %global build_agent2 1}
%endif
%if 0%{?rhel} >= 8
%{!?build_web_service: %global build_web_service 1}
%endif
%endif
%if 0%{?rhel} >= 7
%{!?build_proxy: %global build_proxy 1}
@ -169,6 +170,8 @@ Requires(preun): /sbin/chkconfig
Requires(preun): /sbin/service
Requires(postun): /sbin/service
%endif
Requires: zabbix-agent2-plugin-mongodb
Requires: zabbix-agent2-plugin-postgresql
%description agent2
New implementation of zabbix agent.
@ -483,6 +486,10 @@ mv database/sqlite3/schema.sql database/sqlite3/proxy.sql
%endif
%endif
%if 0%{?build_agent2}
%patch8 -p1
%endif
%build
# Build consists of 1-3 configure/make passes, one for each database.
# pass 1: is sqlite proxy, may be omitted.
@ -894,7 +901,6 @@ fi
%config(noreplace) %{_sysconfdir}/zabbix/zabbix_agent2.d/plugins.d/memcached.conf
%config(noreplace) %{_sysconfdir}/zabbix/zabbix_agent2.d/plugins.d/mysql.conf
%config(noreplace) %{_sysconfdir}/zabbix/zabbix_agent2.d/plugins.d/oracle.conf
%config(noreplace) %{_sysconfdir}/zabbix/zabbix_agent2.d/plugins.d/postgres.conf
%config(noreplace) %{_sysconfdir}/zabbix/zabbix_agent2.d/plugins.d/redis.conf
%config(noreplace) %{_sysconfdir}/zabbix/zabbix_agent2.d/plugins.d/smart.conf
%config(noreplace) %{_sysconfdir}/zabbix/zabbix_agent2.d/plugins.d/modbus.conf
@ -1378,6 +1384,80 @@ if [ $1 = 0 ] && semodule -l | grep -q zabbix_policy; then semodule -r zabbix_po
%changelog
* Mon Apr 24 2023 Zabbix Packager <info@zabbix.com> - 6.0.17-release1
- update to 6.0.17
* Wed Apr 19 2023 Zabbix Packager <info@zabbix.com> - 6.0.17-rc2.release1
- update to 6.0.17rc2
* Mon Apr 17 2023 Zabbix Packager <info@zabbix.com> - 6.0.17-rc1.release1
- update to 6.0.17rc1
* Tue Apr 11 2023 Zabbix Packager <info@zabbix.com> - 6.0.16-release1
- update to 6.0.16
* Wed Apr 05 2023 Zabbix Packager <info@zabbix.com> - 6.0.16-rc1.release1
- update to 6.0.16rc1
* Fri Mar 31 2023 Zabbix Packager <info@zabbix.com> - 6.0.15-release1
- update to 6.0.15
* Wed Mar 29 2023 Zabbix Packager <info@zabbix.com> - 6.0.15-rc2.release1
- update to 6.0.15rc2
* Wed Mar 22 2023 Zabbix Packager <info@zabbix.com> - 6.0.15-rc1.release1
- update to 6.0.15rc1
* Wed Mar 08 2023 Zabbix Packager <info@zabbix.com> - 6.0.14-release1
- update to 6.0.14
* Mon Feb 27 2023 Zabbix Packager <info@zabbix.com> - 6.0.14-rc2.release1
- update to 6.0.14rc2
* Mon Feb 20 2023 Zabbix Packager <info@zabbix.com> - 6.0.14-rc1.release1
- update to 6.0.14rc1
- removed c99-1.patch; use -std=gnu99 compiler flag instead
* Wed Feb 01 2023 Zabbix Packager <info@zabbix.com> - 6.0.13-release1
- update to 6.0.13
* Fri Jan 27 2023 Zabbix Packager <info@zabbix.com> - 6.0.13-rc1.release1
- update to 6.0.13rc1
- added LimitNOFILE=8192 to agent2 systemd service file (ZBX-22061)
- added agent2.conf.socket.patch (ZBX-22061)
- added c99-1.patch
* Mon Dec 05 2022 Zabbix Packager <info@zabbix.com> - 6.0.12-release1
- update to 6.0.12
* Fri Dec 02 2022 Zabbix Packager <info@zabbix.com> - 6.0.12-rc2.release1
- update to 6.0.12rc2
* Thu Dec 01 2022 Zabbix Packager <info@zabbix.com> - 6.0.12-rc1.release1
- update to 6.0.12rc1
* Mon Nov 28 2022 Zabbix Packager <info@zabbix.com> - 6.0.11-release1
- update to 6.0.11
* Fri Nov 25 2022 Zabbix Packager <info@zabbix.com> - 6.0.11-rc2.release1
- update to 6.0.11rc2
* Mon Nov 21 2022 Zabbix Packager <info@zabbix.com> - 6.0.11-rc1.release1
- update to 6.0.11rc1
* Wed Nov 16 2022 Zabbix Packager <info@zabbix.com> - 6.0.10-release2
- added explicit dependencies on mongodb and postgresql plugins to agent2; to ease upgrade
* Wed Nov 02 2022 Zabbix Packager <info@zabbix.com> - 6.0.10-release1
- update to 6.0.10
* Thu Oct 27 2022 Zabbix Packager <info@zabbix.com> - 6.0.10-rc2.release1
- update to 6.0.10rc2
* Tue Oct 25 2022 Zabbix Packager <info@zabbix.com> - 6.0.10-rc1.release1
- update to 6.0.10rc1
- removed agent2 builtin postgres.conf file; to be replaced with a plugin
* Wed Sep 21 2022 Zabbix Packager <info@zabbix.com> - 6.0.9-release1
- update to 6.0.9