From f55aaafdd94361e2c44e087650b4966af169de2048260586504cdafd74546dd5 Mon Sep 17 00:00:00 2001 From: Boris Manojlovic Date: Tue, 20 Feb 2024 13:08:15 +0000 Subject: [PATCH 1/4] Accepting request 1147906 from home:dimstar:rpm4.20:z Prepare for RPM 4.20 OBS-URL: https://build.opensuse.org/request/show/1147906 OBS-URL: https://build.opensuse.org/package/show/server:monitoring:zabbix/zabbix?expand=0&rev=51 --- zabbix.changes | 6 ++++++ zabbix.spec | 3 +-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/zabbix.changes b/zabbix.changes index 0c4044c..ad73eca 100644 --- a/zabbix.changes +++ b/zabbix.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Feb 20 12:05:38 UTC 2024 - Dominique Leuenberger + +- Use %autosetup macro. Allows to eliminate the usage of deprecated + %patchN. + ------------------------------------------------------------------- Sun Dec 24 09:21:51 UTC 2023 - Boris Manojlovic diff --git a/zabbix.spec b/zabbix.spec index d90b080..ce78a93 100644 --- a/zabbix.spec +++ b/zabbix.spec @@ -244,8 +244,7 @@ turn uses the JMX management API to query the application of interest remotely. %prep -%setup -q -n zabbix-%{version} -%patch3 +%autosetup -p0 -n zabbix-%{version} cp %{SOURCE6} . # fix source & config files to respect adapted names From e8e04d7f0e8316a65932b61a8ff0a5a4c7416d81b68f3a3ca54bb257e3915445 Mon Sep 17 00:00:00 2001 From: Boris Manojlovic Date: Fri, 22 Mar 2024 07:36:38 +0000 Subject: [PATCH 2/4] Accepting request 1143962 from home:dirkmueller:Factory - add group provides needed by RPM 4.19 + ZBX-22711 Fixed incorrectly displayed simple graphs with non-numeric items in Host graphs page entities; added possibility to update the uuid parameter for the Service API; fixed duplicate UUIDs zabbix-6.0.12-curl-fixes.patch zabbix-6.0.12-netsnmp-fixes.patch zabbix-6.0.12-new-m4-pgsql.patch - add CVE-2022-35230 patch file CVE-2022-35230.patch + ZBX-20680 Fixed reflected XSS issues + ZBX-19457 Fixed failed query when updating application names longer than 255 characters + ZBX-8999 Fixed exporting of images separately from other objects + ZBX-18688 Fixed schema name didnt show when available only postgresql + ZBXNEXT-5903 Added vmware datacenters discovery - New Features and Improvements: + ZBX-17390 Fixed validation of the maximum selected period + ZBXNEXT-3604 Added support of user configurable ciphers for communication between zabbix components + ZBX-16548 Fixed sort order in plain text screen + ZBXNEXT-5422 Quoted numbers are now accepted by jsonpath aggregate functions + ZBX-16424 Fixed unable to create/update web scenario from internet explorer/edge period being overridden by global configuration and jqueryui v1.10.3 -> v1.12.1 thanks to jose deniz for the patch + ZBX-15646 fixed web-server 'Request-URI Too Long' error in trigger description dialog metrics from an external Zabbix instance + ZBX-15456 fixed incorrect style property in Monitoring->Problems; removed unused id from filter form items vfs.dir.size[] and vfs.dir.count[] in item regexp preprocessing, general pcre code improvements + ZBXNEXT-4271 improved escalator performance by using nextcheck index instead of reading whole table remaining when zabbix daemon is terminated during startup - fixed configuration paths OBS-URL: https://build.opensuse.org/request/show/1143962 OBS-URL: https://build.opensuse.org/package/show/server:monitoring:zabbix/zabbix?expand=0&rev=52 --- zabbix.changes | 63 +++++++++++++++++++++++++++----------------------- zabbix.spec | 33 +++++++++++++------------- 2 files changed, 50 insertions(+), 46 deletions(-) diff --git a/zabbix.changes b/zabbix.changes index ad73eca..2da3054 100644 --- a/zabbix.changes +++ b/zabbix.changes @@ -4,6 +4,11 @@ Tue Feb 20 12:05:38 UTC 2024 - Dominique Leuenberger - Use %autosetup macro. Allows to eliminate the usage of deprecated %patchN. +------------------------------------------------------------------- +Sun Feb 4 09:27:45 UTC 2024 - Dirk Müller + +- add group provides needed by RPM 4.19 + ------------------------------------------------------------------- Sun Dec 24 09:21:51 UTC 2023 - Boris Manojlovic @@ -189,7 +194,7 @@ Tue Oct 17 20:03:33 UTC 2023 - Boris Manojlovic + ZBX-22369 Fixed suffix interpretation in threshold values for "Top hosts" widget + ZBX-22825 Fixed Zabbix access to the first page for user with specific page access + ZBX-22867 Fixed import popup showing circle animation even if PHP code failed - + ZBX-22711 Fixed incorrectly displayed simple graphs with non-numeric items in Host graphs page + + ZBX-22711 Fixed incorrectly displayed simple graphs with non-numeric items in Host graphs page ------------------------------------------------------------------- Thu Jul 20 20:54:15 UTC 2023 - Boris Manojlovic @@ -285,7 +290,7 @@ Thu Jul 20 20:54:15 UTC 2023 - Boris Manojlovic + ZBX-22461 Fixed incorrect sortable item positioning in Safari + ZBX-22469 Fixed SLI calculation for services having multiple alarms per second + ZBX-22859 Fixed validation of input parameters in action configuration form - + ------------------------------------------------------------------- Mon May 15 16:46:46 UTC 2023 - Boris Manojlovic @@ -330,7 +335,7 @@ Mon May 15 16:46:46 UTC 2023 - Boris Manojlovic + ZBX-22538 Fixed popup menus disappearing on right-clicking links in them + ZBX-21583 Optimised preprocessing steps and added two graphs and dashboard in the Hadoop by HTTP template + ZBX-19375 Prevented the ability to set a duplicate value for the uuid parameter when updating any of template - entities; added possibility to update the uuid parameter for the Service API; fixed duplicate UUIDs + entities; added possibility to update the uuid parameter for the Service API; fixed duplicate UUIDs in Proxmox VE by HTTP template + ZBX-21603 Optimised preprocessing steps in the Zookeeper by HTTP template + ZBX-21589 Optimised SQL queries and preprocessing steps @@ -485,8 +490,8 @@ Mon May 15 16:46:46 UTC 2023 - Boris Manojlovic Fri Jan 27 21:44:50 UTC 2023 - Boris Manojlovic - mention of patches added required... - zabbix-6.0.12-curl-fixes.patch zabbix-6.0.12-netsnmp-fixes.patch - zabbix-6.0.12-new-m4-pgsql.patch + zabbix-6.0.12-curl-fixes.patch zabbix-6.0.12-netsnmp-fixes.patch + zabbix-6.0.12-new-m4-pgsql.patch ------------------------------------------------------------------- Fri Jan 20 18:42:28 UTC 2023 - Boris Manojlovic @@ -500,7 +505,7 @@ Fri Jan 20 18:42:28 UTC 2023 - Boris Manojlovic ------------------------------------------------------------------- Fri Jul 22 23:14:21 UTC 2022 - Boris Manojlovic -- add CVE-2022-35230 patch file CVE-2022-35230.patch +- add CVE-2022-35230 patch file CVE-2022-35230.patch ------------------------------------------------------------------- Fri Jul 22 22:44:34 UTC 2022 - Boris Manojlovic @@ -522,7 +527,7 @@ Thu Mar 17 09:40:55 UTC 2022 - Boris Manojlovic - updated to latest release 4.0.39 - Bug Fixes + ZBX-19789 Added SourceIP support to ldap simple checks - + ZBX-20680 Fixed reflected XSS issues + + ZBX-20680 Fixed reflected XSS issues ( Reflected XSSes in Zabbix Frontend (CVE-2022-24349, CVE-2022-24917, CVE-2022-24918, CVE-2022-24919) ) fixes for bsc#1196945 bsc#1196946 bsc#1196947 @@ -559,7 +564,7 @@ Sat Jan 22 10:37:11 UTC 2022 - Boris Manojlovic + ZBX-19428 Fixed high CPU usage and preprocessing workers exiting with timeout when starting numerous poller, trapper and discoverer processes + ZBX-19510 Fixed re-reading of old Windows events for various Windows event system synchronization problems - + ZBX-19457 Fixed failed query when updating application names longer than 255 characters + + ZBX-19457 Fixed failed query when updating application names longer than 255 characters ------------------------------------------------------------------- Tue Jan 11 10:35:51 UTC 2022 - Johannes Segitz @@ -605,7 +610,7 @@ Fri Aug 13 19:53:27 UTC 2021 - Boris Manojlovic + ZBX-19300 Updated jquery version + ZBX-19139 Fixed memory errors in cmdline parsing on freebsd + ZBX-19359 Fixed error in logsource function due to empty source - + ZBX-8999 Fixed exporting of images separately from other objects + + ZBX-8999 Fixed exporting of images separately from other objects ------------------------------------------------------------------- Thu Jun 24 09:46:42 UTC 2021 - Ferdinand Thiessen @@ -671,7 +676,7 @@ Wed Apr 14 13:32:26 UTC 2021 - Ferdinand Thiessen + ZBX-18885 Fixed SNMP agent item not accepting values that are bigger than 2KB - Last update (4.0.28) also included a fix for CVE-2021-27927 - + ------------------------------------------------------------------- Thu Mar 4 21:23:58 UTC 2021 - Boris Manojlovic @@ -716,7 +721,7 @@ Thu Mar 4 21:23:58 UTC 2021 - Boris Manojlovic + ZBX-18423 Fixed inconsistent macro expansion with Oracle DB compared with other databases + ZBX-18219 Fixed custom multiplier preprocessing step validation to accept a string with macros + ZBX-18422 Fixed "server is not running" warning message width - + ZBX-18688 Fixed schema name didnt show when available only postgresql + + ZBX-18688 Fixed schema name didnt show when available only postgresql ------------------------------------------------------------------- Fri Jan 15 08:30:14 UTC 2021 - Boris Manojlovic @@ -784,7 +789,7 @@ Thu Jul 30 08:25:38 UTC 2020 - Boris Manojlovic - updated to latest release 4.0.23 - New Features and improvements + ZBXNEXT-6004 Added host info to vmware event message log - + ZBXNEXT-5903 Added vmware datacenters discovery + + ZBXNEXT-5903 Added vmware datacenters discovery - Bug Fixes + ZBX-8081 Fixed 'cmdline' parameter truncation on solaris 11.3 and later + ZBX-18014 Fixed memory leak when action message does not have to be sent @@ -807,7 +812,7 @@ Sat Jul 18 20:46:25 UTC 2020 - Boris Manojlovic - updated to latest release 4.0.22 - Fixes CVE-2020-15803 -- New Features and Improvements: +- New Features and Improvements: + ZBXNEXT-3588 Improved Zabbix server performance when evaluating trigger, discovery, autoregistration and internal actions + ZBXNEXT-5922 Increased max configuration cache size limit to 64GB @@ -860,7 +865,7 @@ Sat Jul 18 20:46:25 UTC 2020 - Boris Manojlovic + ZBX-17012 Fixed url validator to also accept relative urls + ZBX-17507 Fixed oracle query interpreted as a multistatement + ZBX-9387 Fixed incorrect maintenance calculations when dst changed to summer time - + ZBX-17390 Fixed validation of the maximum selected period + + ZBX-17390 Fixed validation of the maximum selected period ------------------------------------------------------------------- Thu Apr 23 12:11:58 UTC 2020 - Boris Manojlovic @@ -869,7 +874,7 @@ Thu Apr 23 12:11:58 UTC 2020 - Boris Manojlovic - replaced URL for source downloads to zabbix CDN network location - New Features and improvements + ZBXNEXT-5649 Added name referencing support ('~' suffix) to jsonpath - + ZBXNEXT-3604 Added support of user configurable ciphers for communication between zabbix components + + ZBXNEXT-3604 Added support of user configurable ciphers for communication between zabbix components - Bug Fixes + ZBX-17173 Improved windows agent build scripts + ZBX-17425 Fixed template.massupdate api macros update @@ -964,7 +969,7 @@ Thu Nov 28 10:27:02 UTC 2019 - Boris Manojlovic + ZBX-10618 Fixed disappearing dependent trigger cells and rows in overview + ZBX-16596 Added handling of bom to detect encoding for vfs.file.contents, vfs.file.regex and vfs.file.regmatch + ZBX-16771 Fixed wrong tab number being remembered when several browser tabs are in use - + ZBX-16548 Fixed sort order in plain text screen + + ZBX-16548 Fixed sort order in plain text screen ------------------------------------------------------------------- Wed Oct 30 08:58:50 UTC 2019 - Boris Manojlovic @@ -973,7 +978,7 @@ Wed Oct 30 08:58:50 UTC 2019 - Boris Manojlovic - New Features and Improvements + ZBXNEXT-5481 Added support of {trigger.id} macro in trigger tags + ZBXNEXT-4746 Added "template server cisco ucs snmpv2" template - + ZBXNEXT-5422 Quoted numbers are now accepted by jsonpath aggregate functions + + ZBXNEXT-5422 Quoted numbers are now accepted by jsonpath aggregate functions - Bug Fixes + ZBX-16605 Fixed accessibility of localstorage identifier if cookies are made unaccessible for client side scripts @@ -1051,7 +1056,7 @@ Thu Aug 29 08:46:12 UTC 2019 - Boris Manojlovic + ZBX-16316 Fixed dashboard widget and slideshow menu popup not updating current refresh rate and fixed a js error in slideshows + ZBX-16346 Fixed compilation for oracle instant client v18.5 and higher - + ZBX-16424 Fixed unable to create/update web scenario from internet explorer/edge + + ZBX-16424 Fixed unable to create/update web scenario from internet explorer/edge ------------------------------------------------------------------- Mon Aug 26 12:02:52 UTC 2019 - Marketa Calabkova @@ -1072,7 +1077,7 @@ Wed Aug 14 08:22:49 UTC 2019 - Boris Manojlovic - New Features and Improvements - ZBXNEXT-4502,ZBXNEXT-5176 Added support of full jsonpath functionality - ZBXNEXT-5205 Blocked zero item history/trends - period being overridden by global configuration + period being overridden by global configuration - Bug Fixes + ZBX-16376 Fixed preprocessing steps having incorrect order and duplicate step numbers @@ -1187,7 +1192,7 @@ Fri May 31 14:01:10 UTC 2019 - Boris Manojlovic - updated to latest release 4.0.8 - New Features and Improvements + ZBX-16069 Upgraded jquery version v1.10.2 -> v3.3.1 - and jqueryui v1.10.3 -> v1.12.1 + and jqueryui v1.10.3 -> v1.12.1 - Bug Fixes + ZBX-16032 Changed application filtering to partial name search + ZBX-15915 Fixed linking error if round() is undefined @@ -1346,7 +1351,7 @@ Wed Apr 24 14:07:54 UTC 2019 - Boris Manojlovic + ZBX-15742 Fixed network discovery is not reacting to the changes in agent configuration if uniqueness criteria is value + ZBX-15634 Fixed database monitor item does not use stored credentials; - thanks to jose deniz for the patch + thanks to jose deniz for the patch ------------------------------------------------------------------- Mon Apr 1 08:45:14 UTC 2019 - Boris Manojlovic @@ -1429,7 +1434,7 @@ Mon Apr 1 08:45:14 UTC 2019 - Boris Manojlovic + ZBX-15539 fixed validation of master item in item update form + ZBX-15532 fixed undefined index error on problems page when trigger expression contains web items + ZBX-15488 fixed permission check for inherited triggers - + ZBX-15646 fixed web-server 'Request-URI Too Long' error in trigger description dialog + + ZBX-15646 fixed web-server 'Request-URI Too Long' error in trigger description dialog ------------------------------------------------------------------- Mon Feb 25 20:07:06 UTC 2019 - Boris Manojlovic @@ -1438,7 +1443,7 @@ Mon Feb 25 20:07:06 UTC 2019 - Boris Manojlovic - New Features and Improvements + ZBXNEXT-5046 added non-destructive resizing and reordering of dashboard widgets + ZBXNEXT-401, ZBXNEXT-4907, ZBXNEXT-4955 added monitoring of internal - metrics from an external Zabbix instance + metrics from an external Zabbix instance - Bug Fixes + ZBXNEXT-4941 changed overflow statements to execute one by one for Oracle for better performance @@ -1465,7 +1470,7 @@ Mon Feb 25 20:07:06 UTC 2019 - Boris Manojlovic reset to "1920" instead of DB default value when updating via edit form + ZBX-15271 added link to documentation in all man pages + ZBX-15422 fixed SQL errors when linked template have item prototype with equal key as host item - + ZBX-15456 fixed incorrect style property in Monitoring->Problems; removed unused id from filter form + + ZBX-15456 fixed incorrect style property in Monitoring->Problems; removed unused id from filter form ------------------------------------------------------------------- Wed Feb 6 10:24:34 UTC 2019 - boris@steki.net @@ -1476,7 +1481,7 @@ Wed Feb 6 10:24:34 UTC 2019 - boris@steki.net + ZBXNEXT-4873 implemented single dot datasets to be drawn as points in line vector graphs + ZBX-14876 added a new optional parameter to - items vfs.dir.size[] and vfs.dir.count[] + items vfs.dir.size[] and vfs.dir.count[] + ZBXNEXT-4792 added column "Latest values" in Monitoring->Problems and Dashboard + ZBX-15202 implemented widget pausing methods in dashboard; made graph widget paused when using selection box or opening a tooltip @@ -1573,7 +1578,7 @@ Wed Feb 6 10:24:34 UTC 2019 - boris@steki.net + ZBX-15200 fixed host, trigger and item count calculation; fixed required performance calculation + ZBX-15158 fixed graph name for cache usage in proxy and server templates + ZBX-15178 fixed wrong behaviour when referencing unexisting capture groups - in item regexp preprocessing, general pcre code improvements + in item regexp preprocessing, general pcre code improvements ------------------------------------------------------------------- Thu Nov 29 08:59:53 UTC 2018 - boris@steki.net @@ -1593,7 +1598,7 @@ Thu Nov 29 08:59:53 UTC 2018 - boris@steki.net + ZBXNEXT-4796 added 'fullscreen' and 'kiosk' URL arguments to allow to set layout mode via link + ZBXNEXT-4782 improve out of memory error message by adding statistics and backtrace; improve something impossible has just happened error message by adding backtrace - + ZBXNEXT-4271 improved escalator performance by using nextcheck index instead of reading whole table + + ZBXNEXT-4271 improved escalator performance by using nextcheck index instead of reading whole table - Bug Fixes + ZBX-15171 fixed crash in ODBC when creating JSON from null db values, fixed memory leak @@ -1680,7 +1685,7 @@ Thu Nov 29 08:59:53 UTC 2018 - boris@steki.net fixed debug element being hidden on widget refresh + ZBX-14806 changed focus style for radio buttons + ZBX-15027 fixed startup failures due to orphaned or zombie processes - remaining when zabbix daemon is terminated during startup + remaining when zabbix daemon is terminated during startup + ZBX-14904 fixed possible PHP errors in "Problem hosts" widget + ZBX-15057 fixed possible crash when syncing host groups + ZBX-14807 fixed selection box for graphs on monitoring screens @@ -1736,7 +1741,7 @@ Tue Oct 16 22:49:22 UTC 2018 - Boris Manojlovic - removed support for jabber protocol as iksemel was removed from openSUSE:Factory -- fixed configuration paths +- fixed configuration paths ------------------------------------------------------------------- Mon Oct 2 12:36:00 UTC 2018 - pieter@hollants.com diff --git a/zabbix.spec b/zabbix.spec index ce78a93..87425bb 100644 --- a/zabbix.spec +++ b/zabbix.spec @@ -1,7 +1,7 @@ # # spec file for package zabbix # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -28,7 +28,7 @@ Release: 0 Summary: Distributed monitoring system License: GPL-2.0-or-later Group: System/Monitoring -URL: http://www.zabbix.com +URL: https://www.zabbix.com Source0: https://cdn.zabbix.com/zabbix/sources/stable/6.0/zabbix-%{version}.tar.gz Source1: rn6.0.0.html Source2: zabbix-tmpfiles.conf @@ -60,9 +60,6 @@ BuildRequires: logrotate BuildRequires: net-snmp-devel BuildRequires: openldap2-devel BuildRequires: pkgconfig -%if 0%{?suse_version} >= 1600 || 0%{?sle_version} > 150100 -BuildRequires: postgresql-server-devel -%endif BuildRequires: systemd-rpm-macros BuildRequires: unixODBC-devel BuildRequires: update-alternatives @@ -77,6 +74,9 @@ BuildRequires: pkgconfig(openssl) BuildRequires: pkgconfig(sqlite3) BuildRequires: pkgconfig(zlib) %{?systemd_requires} +%if 0%{?suse_version} >= 1600 || 0%{?sle_version} > 150100 +BuildRequires: postgresql-server-devel +%endif %description Zabbix is a distributed monitoring system. @@ -103,6 +103,7 @@ Requires: logrotate Requires(pre): %fillup_prereq Requires(pre): shadow Conflicts: zabbix-agent +Provides: group(zabbix) %description agent The Zabbix agent monitors local resources and relays information to the server. @@ -117,6 +118,7 @@ Requires: zabbix_server_binary = %{version}-%{release} Requires(pre): %fillup_prereq Requires(pre): shadow Conflicts: zabbix-server +Provides: group(zabbix) %description server The Zabbix server component. @@ -131,6 +133,7 @@ Requires: zabbix_proxy_binary = %{version}-%{release} Requires(pre): %fillup_prereq Requires(pre): shadow Conflicts: zabbix-proxy +Provides: group(zabbix) %description proxy The Zabbix proxy component. @@ -165,7 +168,7 @@ Group: System/Monitoring Requires: %{name}-server = %{version}-%{release} Requires: mariadb Requires(post): update-alternatives -Requires(postun):update-alternatives +Requires(postun): update-alternatives Conflicts: zabbix-server-mysql Provides: %{name} = %{version}-%{release} Provides: zabbix_server_binary = %{version}-%{release} @@ -179,7 +182,7 @@ Group: System/Monitoring Requires: %{name}-server = %{version}-%{release} Requires: postgresql Requires(post): update-alternatives -Requires(postun):update-alternatives +Requires(postun): update-alternatives Conflicts: zabbix-server-postgresql Provides: %{name} = %{version}-%{release} Provides: zabbix_server_binary = %{version}-%{release} @@ -193,7 +196,7 @@ Group: System/Monitoring Requires: %{name}-proxy = %{version}-%{release} Requires: mariadb Requires(post): update-alternatives -Requires(postun):update-alternatives +Requires(postun): update-alternatives Conflicts: zabbix-proxy-mysql Provides: %{name} = %{version}-%{release} Provides: zabbix_proxy_binary = %{version}-%{release} @@ -207,7 +210,7 @@ Group: System/Monitoring Requires: %{name}-proxy = %{version}-%{release} Requires: postgresql Requires(post): update-alternatives -Requires(postun):update-alternatives +Requires(postun): update-alternatives Conflicts: zabbix-proxy-postgresql Provides: %{name} = %{version}-%{release} Provides: zabbix_proxy_binary = %{version}-%{release} @@ -220,7 +223,7 @@ Summary: Zabbix proxy with SQLite support Group: System/Monitoring Requires: %{name}-proxy = %{version}-%{release} Requires(post): update-alternatives -Requires(postun):update-alternatives +Requires(postun): update-alternatives Conflicts: zabbix-proxy-sqlite Provides: %{name} = %{version}-%{release} Provides: zabbix_proxy_binary = %{version}-%{release} @@ -301,20 +304,20 @@ ZABBIX_BASIC_CONFIG="--enable-proxy --enable-server --enable-agent --sysconfdir # configure MySQL repo (here) autoreconf -fvi %configure $ZABBIX_BASIC_CONFIG --with-mysql --without-postgresql --without-sqlite3 -make %{?_smp_mflags} +%make_build # configure PostgreSQL repo cd ../zabbix-%{version}-postgresql autoreconf -fvi %configure $ZABBIX_BASIC_CONFIG --with-postgresql --without-mysql --without-sqlite3 -make %{?_smp_mflags} +%make_build cd - # configure SQLite repo cd ../zabbix-%{version}-sqlite autoreconf -fvi %configure $ZABBIX_BASIC_CONFIG --disable-server --enable-proxy --with-sqlite3 --without-postgresql --without-mysql -make %{?_smp_mflags} +%make_build cd - %install @@ -425,28 +428,24 @@ cp %{SOURCE15} . %{_bindir}/getent group %{server_group} >/dev/null || %{_sbindir}/groupadd -r %{server_group} %{_bindir}/getent passwd %{server_user} >/dev/null || %{_sbindir}/useradd -r -d %{_localstatedir}/lib/%{server_user} -s /bin/false -c "Zabbix Server Daemon" -g %{server_group} %{server_user} %service_add_pre zabbix_server.service -exit 0 %pre proxy # Proxy daemon %{_bindir}/getent group %{server_group} >/dev/null || %{_sbindir}/groupadd -r %{server_group} %{_bindir}/getent passwd %{server_user} >/dev/null || %{_sbindir}/useradd -r -d %{_localstatedir}/lib/%{server_user} -s /bin/false -c "Zabbix Proxy Daemon" -g %{server_group} %{server_user} %service_add_pre zabbix_proxy.service -exit 0 %pre agent # Agent daemon %{_bindir}/getent group %{agent_group} >/dev/null || %{_sbindir}/groupadd -r %{agent_group} %{_bindir}/getent passwd %{agent_user} >/dev/null || %{_sbindir}/useradd -r -d %{_localstatedir}/lib/%{agent_user} -s /bin/false -c "Zabbix Agent Daemon" -g %{agent_group} %{agent_user} %service_add_pre zabbix_agentd.service -exit 0 %pre java-gateway # Java daemon %{_bindir}/getent group %{server_group} >/dev/null || %{_sbindir}/groupadd -r %{server_group} %{_bindir}/getent passwd %{server_user} >/dev/null || %{_sbindir}/useradd -r -d %{_localstatedir}/lib/%{server_user} -s /bin/false -c "Zabbix Java Daemon" -g %{server_group} %{server_user} %service_add_pre zabbix-java-gateway.service -exit 0 %post server %service_add_post zabbix_server.service From 551a7ff4c7decf060bab5ec59eb13a71ca053824d4b566ad7eff131823bf981c Mon Sep 17 00:00:00 2001 From: Boris Manojlovic Date: Fri, 22 Mar 2024 14:36:50 +0000 Subject: [PATCH 3/4] Accepting request 1160699 from home:bmanojlovic:branches:server:monitoring:zabbix - update to latest release 6.0.27 - replaced zabbix-agentd.firewall zabbix-java-gateway.firewall zabbix-proxy.firewall zabbix-server.firewall with firewalld xml definitions zabbix-agentd.xml zabbix-java-gateway.xml zabbix-proxy.xml zabbix-server.xml - New Features and Improvements + ZBXNEXT-8983 Updated max supported MariaDB version to 11.2 + ZBXNEXT-8984 Updated max supported MySQL version to 8.3 + ZBXNEXT-8762 Added YugabyteDB by HTTP and YugabyteDB Cluster by HTTP templates + ZBXNEXT-8891 Updated max supported MySQL version to 8.2 + ZBXNEXT-8524 Added support for HTTP proxy in GCP templates + ZBXNEXT-8759 Added dashboards in Azure templates + ZBXNEXT-8580 Added new discovery rules, refactored discovery rules to dependent items and made few minor changes in MSSQL by ODBC template + ZBXNEXT-8730 Added Azure Cost Management by HTTP template -Bug Fixes + ZBX-23124 Fixed items with disabled history being sometimes stuck in non-supported state + ZBX-23586 Fixed filter evaluation type of organizations discovery in Cisco Meraki dashboard by HTTP template + ZBX-23766 Updated Zabbix agent 2 Ceph plugin readme setup instructions + ZBX-24094 Fixed network interfaces LLD filtering macro in Linux by Prom template + ZBX-23202 Fixed unused tag value being saved in tag filter + ZBX-22555 Updated regexp to case insensitive in Nginx templates + ZBX-23973 Fixed trends being retrieved from database for new items and for items with infrequent update interval + ZBX-22745 Removed incorrect description of network interfaces administrative status filter macro in SNMP templates + ZBX-24015 Improved zabbix[queue] internal item not to block history syncers and pollers + ZBX-23509 Fixed JSONPath of Keyspace discovery master item in Redis by Zabbix agent 2 template + ZBX-24059 Fixed libmodbus unnecessary linking into all binaries + ZBX-24055 Added missing API port macros in URL of script items in HPE Synergy by HTTP and HPE Primera by HTTP templates + ZBX-20525 Fixed vfs.dir.size performance issues when walking through directory that has a lot of subdirs/files + ZBX-23773 Improved trigger functionality for Acronis Cyber Protect Cloud MSP by HTTP template + ZBX-23979 Improved trend recalculation performance by performing trend updates in own transaction + ZBX-23688 Improved new item value retrieval performance by adding such items to value cache after configuration sync + ZBX-22130 Changed JSONPath expression evaluator to treat null values as empty variants + ZBX-23986 Added a license to the Go module + ZBX-23587 Fixed widget input field selecting when clicking on label + ZBX-23640 Fixed preload hints opening + ZBX-22433 Fixed web scenario and web scenario step configuration field trimming and field sorting + ZBX-23684 Fixed transactions query file for PostgreSQL by Zabbix agent template + ZBX-22371 Fixed process tags option not adding tags for service events + ZBX-17208 Fixed invalid command-line flag handling in Zabbix agent 2 + ZBX-23937 Fixed JavaScript for AWS EC2 instances discovery + ZBX-22715 Fixed map shape dimension changes on resizing in scaled browser mode + ZBX-23722 Added garbage collection after executing JavaScript code + ZBX-23740 Fixed netsnmp persistent state disabling without affecting its configuration + ZBX-23257 Fixed log items not using MaxLinesPerSecond setting correctly for Zabbix agent 2 + ZBX-23890 Removed non-existing headers from compiler checks: mtent.h and knlist.h + ZBX-23912 Removed Jira with CustomFields media type in data.tmpl + ZBX-23761 Fixed JavaScript in Jira media type + ZBX-22558 Fixed trigger expression for retrieval of stub page in Nginx templates + ZBX-23691 Fixed LLD filters evaluation type for devices discovery in Cisco SD-WAN by HTTP template + ZBX-23540 Added error checks for RegisterMetrics calls + ZBX-23605 Removed getting location buckets in AWS by HTTP template added discovery filters for request metrics in AWS S3 bucket by HTTP template + ZBX-23466 Fixed data aggregation errors in Graphs and Top hosts widgets with Elasticsearch backend + ZBX-23835 Updated Meraki templates + ZBX-23723 Fixed proxy params in JavaScript AWS templates + ZBX-23733 Fixed error when downloading graph as .png image if item name contains multibyte characters + ZBX-22983 Fixed ellipsed dropdown options in items mass update in preprocessing + ZBX-23715 Fixed persistent directory path not following symlinks upon creation + ZBX-23825 Fixed query_fields values for Acronis and Nomand templates + ZBX-22055 Fixed map image of map widget not being updated when pressing Apply button + ZBX-23629 Fixed interface icon cursor to pointer + ZBX-22536 Fixed TimescaleDB compression detection for history.clear API method and proper error appearance in frontend + ZBX-23145 Disabled deprecated automatic reconnection in MySQL + ZBX-22933 Improved vfs.file.regmatch and vfs.file.regexp items to use buffered file read + ZBX-23439 Fixed sorting of numeric items with/without aggregation enabled in Top hosts widget + ZBX-21973 Changed deprecated X-Frame option allow-from to Content-Security-Policy frame-ancestors + ZBX-23633 Fixed service alarms to be recovered with problem time in case of negative problem duration + ZBX-23738 Fixed Zabbix backend sources for libxml2 2.12.0 version changes + ZBX-23746 Fixed creation of tickets during escalation for Zammad media type + ZBX-23561 Fixed spacing between filter and results table + ZBX-18873 Fixed disabled chevrons color in problem view + ZBX-23636 Fixed some fields in Administration section not being trimmed on form submit - Use %autosetup macro. Allows to eliminate the usage of deprecated %patchN. - add group provides needed by RPM 4.19 OBS-URL: https://build.opensuse.org/request/show/1160699 OBS-URL: https://build.opensuse.org/package/show/server:monitoring:zabbix/zabbix?expand=0&rev=53 --- system-user-zabbix.conf | 7 +++ zabbix-6.0.25.tar.gz | 3 -- zabbix-6.0.27.tar.gz | 3 ++ zabbix-agentd.firewall | 17 ------ zabbix-agentd.xml | 6 +++ zabbix-java-gateway.firewall | 17 ------ zabbix-java-gateway.xml | 6 +++ zabbix-proxy.firewall | 17 ------ zabbix-proxy.xml | 6 +++ zabbix-server.firewall | 17 ------ zabbix-server.xml | 6 +++ zabbix.changes | 76 ++++++++++++++++++++++++++ zabbix.spec | 102 ++++++++++++++++++++++------------- 13 files changed, 174 insertions(+), 109 deletions(-) create mode 100644 system-user-zabbix.conf delete mode 100644 zabbix-6.0.25.tar.gz create mode 100644 zabbix-6.0.27.tar.gz delete mode 100644 zabbix-agentd.firewall create mode 100644 zabbix-agentd.xml delete mode 100644 zabbix-java-gateway.firewall create mode 100644 zabbix-java-gateway.xml delete mode 100644 zabbix-proxy.firewall create mode 100644 zabbix-proxy.xml delete mode 100644 zabbix-server.firewall create mode 100644 zabbix-server.xml diff --git a/system-user-zabbix.conf b/system-user-zabbix.conf new file mode 100644 index 0000000..f882a47 --- /dev/null +++ b/system-user-zabbix.conf @@ -0,0 +1,7 @@ +#Type Name ID GECOS Home directory Shell +g zabbix - "Zabbix agent" +g zabbixs - "Zabbix server" +u zabbix - "Zabbix agent" /var/lib/zabbix - +u zabbixs - "Zabbix agent" /var/lib/zabbixs - +m zabbix zabbix +m zabbixs zabbixs diff --git a/zabbix-6.0.25.tar.gz b/zabbix-6.0.25.tar.gz deleted file mode 100644 index baf4250..0000000 --- a/zabbix-6.0.25.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7b321c523790fed3127da6a4ab9477e4f75d08aa9ee081348b961d999c5843a0 -size 44109483 diff --git a/zabbix-6.0.27.tar.gz b/zabbix-6.0.27.tar.gz new file mode 100644 index 0000000..930b8b7 --- /dev/null +++ b/zabbix-6.0.27.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9593a32a1a6783dfcf7522835b09f93f6ef4bc554f517f140c4ac6f00e43d57c +size 44522147 diff --git a/zabbix-agentd.firewall b/zabbix-agentd.firewall deleted file mode 100644 index 3264b01..0000000 --- a/zabbix-agentd.firewall +++ /dev/null @@ -1,17 +0,0 @@ -## Name: zabbix-agentd -## Description: Opens ports for zabbix-agentd - -# space separated list of allowed TCP ports -TCP="10050" - -# space separated list of allowed UDP ports -UDP="" - -# space separated list of allowed RPC services -RPC="" - -# space separated list of allowed IP protocols -IP="" - -# space separated list of allowed UDP broadcast ports -BROADCAST="" diff --git a/zabbix-agentd.xml b/zabbix-agentd.xml new file mode 100644 index 0000000..e28cb84 --- /dev/null +++ b/zabbix-agentd.xml @@ -0,0 +1,6 @@ + + + Zabbix Agent + Enables Zabbix Agent for monitoring data collection and sending to a Zabbix server. + + diff --git a/zabbix-java-gateway.firewall b/zabbix-java-gateway.firewall deleted file mode 100644 index 02742ba..0000000 --- a/zabbix-java-gateway.firewall +++ /dev/null @@ -1,17 +0,0 @@ -## Name: zabbix-java-gateway -## Description: Opens ports for zabbix-java-gateway - -# space separated list of allowed TCP ports -TCP="10052" - -# space separated list of allowed UDP ports -UDP="" - -# space separated list of allowed RPC services -RPC="" - -# space separated list of allowed IP protocols -IP="" - -# space separated list of allowed UDP broadcast ports -BROADCAST="" diff --git a/zabbix-java-gateway.xml b/zabbix-java-gateway.xml new file mode 100644 index 0000000..db0c150 --- /dev/null +++ b/zabbix-java-gateway.xml @@ -0,0 +1,6 @@ + + + Zabbix Java Gateway + Enables Zabbix Java Gateway for JMX monitoring and data collection from Java applications. + + diff --git a/zabbix-proxy.firewall b/zabbix-proxy.firewall deleted file mode 100644 index b442d6b..0000000 --- a/zabbix-proxy.firewall +++ /dev/null @@ -1,17 +0,0 @@ -## Name: zabbix-proxy -## Description: Opens ports for zabbix-proxy - -# space separated list of allowed TCP ports -TCP="10051" - -# space separated list of allowed UDP ports -UDP="" - -# space separated list of allowed RPC services -RPC="" - -# space separated list of allowed IP protocols -IP="" - -# space separated list of allowed UDP broadcast ports -BROADCAST="" diff --git a/zabbix-proxy.xml b/zabbix-proxy.xml new file mode 100644 index 0000000..0c95661 --- /dev/null +++ b/zabbix-proxy.xml @@ -0,0 +1,6 @@ + + + Zabbix Proxy + Enables Zabbix Proxy for data collection from monitored devices and sending to Zabbix server. + + diff --git a/zabbix-server.firewall b/zabbix-server.firewall deleted file mode 100644 index 7c53a99..0000000 --- a/zabbix-server.firewall +++ /dev/null @@ -1,17 +0,0 @@ -## Name: zabbix-server -## Description: Opens ports for zabbix-server - -# space separated list of allowed TCP ports -TCP="10051" - -# space separated list of allowed UDP ports -UDP="" - -# space separated list of allowed RPC services -RPC="" - -# space separated list of allowed IP protocols -IP="" - -# space separated list of allowed UDP broadcast ports -BROADCAST="" diff --git a/zabbix-server.xml b/zabbix-server.xml new file mode 100644 index 0000000..afe5088 --- /dev/null +++ b/zabbix-server.xml @@ -0,0 +1,6 @@ + + + Zabbix Server + Enables Zabbix Server for processing monitoring data, sending notifications, and visualization. + + diff --git a/zabbix.changes b/zabbix.changes index 2da3054..400fce8 100644 --- a/zabbix.changes +++ b/zabbix.changes @@ -1,3 +1,79 @@ +------------------------------------------------------------------- +Fri Mar 22 07:49:43 UTC 2024 - Boris Manojlovic + +- update to latest release 6.0.27 +- replaced zabbix-agentd.firewall zabbix-java-gateway.firewall zabbix-proxy.firewall zabbix-server.firewall + with firewalld xml definitions zabbix-agentd.xml zabbix-java-gateway.xml zabbix-proxy.xml zabbix-server.xml +- New Features and Improvements + + ZBXNEXT-8983 Updated max supported MariaDB version to 11.2 + + ZBXNEXT-8984 Updated max supported MySQL version to 8.3 + + ZBXNEXT-8762 Added YugabyteDB by HTTP and YugabyteDB Cluster by HTTP templates + + ZBXNEXT-8891 Updated max supported MySQL version to 8.2 + + ZBXNEXT-8524 Added support for HTTP proxy in GCP templates + + ZBXNEXT-8759 Added dashboards in Azure templates + + ZBXNEXT-8580 Added new discovery rules, refactored discovery rules to dependent items + and made few minor changes in MSSQL by ODBC template + + ZBXNEXT-8730 Added Azure Cost Management by HTTP template + + -Bug Fixes + + ZBX-23124 Fixed items with disabled history being sometimes stuck in non-supported state + + ZBX-23586 Fixed filter evaluation type of organizations discovery in Cisco Meraki dashboard by HTTP template + + ZBX-23766 Updated Zabbix agent 2 Ceph plugin readme setup instructions + + ZBX-24094 Fixed network interfaces LLD filtering macro in Linux by Prom template + + ZBX-23202 Fixed unused tag value being saved in tag filter + + ZBX-22555 Updated regexp to case insensitive in Nginx templates + + ZBX-23973 Fixed trends being retrieved from database for new items and for items with infrequent update interval + + ZBX-22745 Removed incorrect description of network interfaces administrative status filter macro in SNMP templates + + ZBX-24015 Improved zabbix[queue] internal item not to block history syncers and pollers + + ZBX-23509 Fixed JSONPath of Keyspace discovery master item in Redis by Zabbix agent 2 template + + ZBX-24059 Fixed libmodbus unnecessary linking into all binaries + + ZBX-24055 Added missing API port macros in URL of script items in HPE Synergy by HTTP and HPE Primera by HTTP templates + + ZBX-20525 Fixed vfs.dir.size performance issues when walking through directory that has a lot of subdirs/files + + ZBX-23773 Improved trigger functionality for Acronis Cyber Protect Cloud MSP by HTTP template + + ZBX-23979 Improved trend recalculation performance by performing trend updates in own transaction + + ZBX-23688 Improved new item value retrieval performance by adding such items to value cache after configuration sync + + ZBX-22130 Changed JSONPath expression evaluator to treat null values as empty variants + + ZBX-23986 Added a license to the Go module + + ZBX-23587 Fixed widget input field selecting when clicking on label + + ZBX-23640 Fixed preload hints opening + + ZBX-22433 Fixed web scenario and web scenario step configuration field trimming and field sorting + + ZBX-23684 Fixed transactions query file for PostgreSQL by Zabbix agent template + + ZBX-22371 Fixed process tags option not adding tags for service events + + ZBX-17208 Fixed invalid command-line flag handling in Zabbix agent 2 + + ZBX-23937 Fixed JavaScript for AWS EC2 instances discovery + + ZBX-22715 Fixed map shape dimension changes on resizing in scaled browser mode + + ZBX-23722 Added garbage collection after executing JavaScript code + + ZBX-23740 Fixed netsnmp persistent state disabling without affecting its configuration + + ZBX-23257 Fixed log items not using MaxLinesPerSecond setting correctly for Zabbix agent 2 + + ZBX-23890 Removed non-existing headers from compiler checks: mtent.h and knlist.h + + ZBX-23912 Removed Jira with CustomFields media type in data.tmpl + + ZBX-23761 Fixed JavaScript in Jira media type + + ZBX-22558 Fixed trigger expression for retrieval of stub page in Nginx templates + + ZBX-23691 Fixed LLD filters evaluation type for devices discovery in Cisco SD-WAN by HTTP template + + ZBX-23540 Added error checks for RegisterMetrics calls + + ZBX-23605 Removed getting location buckets in AWS by HTTP template + added discovery filters for request metrics in AWS S3 bucket by HTTP template + + ZBX-23466 Fixed data aggregation errors in Graphs and Top hosts widgets with Elasticsearch backend + + ZBX-23835 Updated Meraki templates + + ZBX-23723 Fixed proxy params in JavaScript AWS templates + + ZBX-23733 Fixed error when downloading graph as .png image if item name contains multibyte characters + + ZBX-22983 Fixed ellipsed dropdown options in items mass update in preprocessing + + ZBX-23715 Fixed persistent directory path not following symlinks upon creation + + ZBX-23825 Fixed query_fields values for Acronis and Nomand templates + + ZBX-22055 Fixed map image of map widget not being updated when pressing Apply button + + ZBX-23629 Fixed interface icon cursor to pointer + + ZBX-22536 Fixed TimescaleDB compression detection for history.clear API method and proper error appearance in frontend + + ZBX-23145 Disabled deprecated automatic reconnection in MySQL + + ZBX-22933 Improved vfs.file.regmatch and vfs.file.regexp items to use buffered file read + + ZBX-23439 Fixed sorting of numeric items with/without aggregation enabled in Top hosts widget + + ZBX-21973 Changed deprecated X-Frame option allow-from to Content-Security-Policy frame-ancestors + + ZBX-23633 Fixed service alarms to be recovered with problem time in case of negative problem duration + + ZBX-23738 Fixed Zabbix backend sources for libxml2 2.12.0 version changes + + ZBX-23746 Fixed creation of tickets during escalation for Zammad media type + + ZBX-23561 Fixed spacing between filter and results table + + ZBX-18873 Fixed disabled chevrons color in problem view + + ZBX-23636 Fixed some fields in Administration section not being trimmed on form submit + ------------------------------------------------------------------- Tue Feb 20 12:05:38 UTC 2024 - Dominique Leuenberger diff --git a/zabbix.spec b/zabbix.spec index 87425bb..11042f5 100644 --- a/zabbix.spec +++ b/zabbix.spec @@ -18,12 +18,11 @@ %define server_user zabbixs %define server_group zabbixs -# keep zabbix user for backwards compatibility of agent %define agent_user zabbix %define agent_group zabbix -%define SUSEfirewall_services_dir %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services + Name: zabbix -Version: 6.0.25 +Version: 6.0.27 Release: 0 Summary: Distributed monitoring system License: GPL-2.0-or-later @@ -36,15 +35,16 @@ Source3: zabbix-java-gateway.sh Source4: zabbix-logrotate.in Source5: apache2-zabbix.conf Source6: README.SUSE -Source7: zabbix-server.firewall -Source8: zabbix-agentd.firewall -Source9: zabbix-proxy.firewall -Source10: zabbix-java-gateway.firewall +Source7: zabbix-server.xml +Source8: zabbix-agentd.xml +Source9: zabbix-proxy.xml +Source10: zabbix-java-gateway.xml Source11: zabbix-proxy.service Source12: zabbix-agentd.service Source13: zabbix-server.service Source14: zabbix-java-gateway.service Source15: README-SSL.SUSE +Source16: system-user-zabbix.conf # PATCH-FIX-OPENSUSE zabbix-6.0.12-netsnmp-fixes.patch fix for removed md5 auth protocol Patch3: zabbix-6.0.12-netsnmp-fixes.patch BuildRequires: apache-rpm-macros @@ -52,6 +52,7 @@ BuildRequires: apache2-devel BuildRequires: autoconf BuildRequires: automake BuildRequires: fdupes +BuildRequires: firewall-macros BuildRequires: gcc BuildRequires: java-devel >= 1.6 BuildRequires: libmysqlclient-devel @@ -61,6 +62,7 @@ BuildRequires: net-snmp-devel BuildRequires: openldap2-devel BuildRequires: pkgconfig BuildRequires: systemd-rpm-macros +BuildRequires: sysuser-tools BuildRequires: unixODBC-devel BuildRequires: update-alternatives BuildRequires: pkgconfig(OpenIPMI) @@ -73,6 +75,8 @@ BuildRequires: pkgconfig(libxml-2.0) BuildRequires: pkgconfig(openssl) BuildRequires: pkgconfig(sqlite3) BuildRequires: pkgconfig(zlib) +%sysusers_requires + %{?systemd_requires} %if 0%{?suse_version} >= 1600 || 0%{?sle_version} > 150100 BuildRequires: postgresql-server-devel @@ -102,8 +106,10 @@ Group: System/Monitoring Requires: logrotate Requires(pre): %fillup_prereq Requires(pre): shadow +Requires: update-alternatives +Requires: group(%{agent_group}) +Requires: user(%{agent_user}) Conflicts: zabbix-agent -Provides: group(zabbix) %description agent The Zabbix agent monitors local resources and relays information to the server. @@ -117,8 +123,9 @@ Requires: update-alternatives Requires: zabbix_server_binary = %{version}-%{release} Requires(pre): %fillup_prereq Requires(pre): shadow +Requires: group(%{server_group}) +Requires: user(%{server_user}) Conflicts: zabbix-server -Provides: group(zabbix) %description server The Zabbix server component. @@ -132,8 +139,9 @@ Requires: update-alternatives Requires: zabbix_proxy_binary = %{version}-%{release} Requires(pre): %fillup_prereq Requires(pre): shadow +Requires: group(%{server_group}) +Requires: user(%{server_user}) Conflicts: zabbix-proxy -Provides: group(zabbix) %description proxy The Zabbix proxy component. @@ -155,7 +163,9 @@ Requires: php8-xmlwriter Suggests: php8-mysqli Suggests: php8-pgsql Conflicts: zabbix-phpfrontend +Provides: zabbix-phpfrontend Obsoletes: zabbix-phpfrontend < 6.0.0 +BuildArch: noarch %description ui The Zabbix PHP frontend allows access via standard web browsers. @@ -238,6 +248,9 @@ Requires: jre Requires(pre): shadow Conflicts: zabbix-java-gateway Provides: %{name} = %{version}-%{release} +Requires: group(%{server_group}) +Requires: user(%{server_user}) +BuildArch: noarch %description java-gateway JMX monitoring can be used to monitor JMX counters of a Java @@ -246,6 +259,19 @@ host, the Zabbix server queries the Zabbix Java gateway, which in turn uses the JMX management API to query the application of interest remotely. +%package -n system-user-zabbix +Summary: Users and groups +Group: System +Requires(pre): pwdutils +Provides: group(%{agent_group}) +Provides: group(%{server_group}) +Provides: user(%{agent_user}) +Provides: user(%{server_user})%define server_user zabbixs +BuildArch: noarch + +%description -n system-user-zabbix +Zabbix users and groups required by zabbix packages + %prep %autosetup -p0 -n zabbix-%{version} @@ -297,6 +323,7 @@ cp -r zabbix-%{version} zabbix-%{version}-sqlite cd - %build +%sysusers_generate_pre %{SOURCE1} zabbix system-user-zabbix.conf ZABBIX_BASIC_CONFIG="--enable-proxy --enable-server --enable-agent --sysconfdir=%{_sysconfdir}/zabbix \ --with-openipmi --enable-java --enable-ipv6 --with-ssh2 --with-ldap --with-unixodbc \ --with-libcurl --with-net-snmp --with-libxml2 --with-openssl --with-libpcre --with-libevent" @@ -321,6 +348,7 @@ autoreconf -fvi cd - %install +install -D -m 0644 %{SOURCE1} %{buildroot}%{_sysusersdir}/system-user-zabbix.conf # install the binaries %make_install -C ../zabbix-%{version}-sqlite @@ -368,14 +396,11 @@ sed -e 's|COMPONENT|proxy|g; s|USER|zabbixs|g' %{SOURCE4} > \ %fdupes %{buildroot} -# install firewall description files for SLE 12 / Leap 42 -%if 0%{?suse_version} < 1500 -install -Dm 0644 %{SOURCE7} %{buildroot}%{SUSEfirewall_services_dir}/zabbix_server -install -Dm 0644 %{SOURCE8} %{buildroot}%{SUSEfirewall_services_dir}/zabbix_agentd -install -Dm 0644 %{SOURCE9} %{buildroot}%{SUSEfirewall_services_dir}/zabbix_proxy -install -Dm 0644 %{SOURCE10} %{buildroot}%{SUSEfirewall_services_dir}/zabbix-java-gateway -%endif - +# install firewalld service files +install -Dm 0644 %{SOURCE7} %{buildroot}%{_prefix}/lib/firewalld/services/zabbix-server.xml +install -Dm 0644 %{SOURCE8} %{buildroot}%{_prefix}/lib/firewalld/services/zabbix-agentd.xml +install -Dm 0644 %{SOURCE9} %{buildroot}%{_prefix}/lib/firewalld/services/zabbix-proxy.xml +install -Dm 0644 %{SOURCE10} %{buildroot}%{_prefix}/lib/firewalld/services/zabbix-java-gateway.xml # install systemd unit files install -Dm 0644 %{SOURCE11} %{buildroot}%{_unitdir}/zabbix_proxy.service install -Dm 0644 %{SOURCE12} %{buildroot}%{_unitdir}/zabbix_agentd.service @@ -425,43 +450,41 @@ cp %{SOURCE15} . %pre server # Server daemon -%{_bindir}/getent group %{server_group} >/dev/null || %{_sbindir}/groupadd -r %{server_group} -%{_bindir}/getent passwd %{server_user} >/dev/null || %{_sbindir}/useradd -r -d %{_localstatedir}/lib/%{server_user} -s /bin/false -c "Zabbix Server Daemon" -g %{server_group} %{server_user} %service_add_pre zabbix_server.service %pre proxy # Proxy daemon -%{_bindir}/getent group %{server_group} >/dev/null || %{_sbindir}/groupadd -r %{server_group} -%{_bindir}/getent passwd %{server_user} >/dev/null || %{_sbindir}/useradd -r -d %{_localstatedir}/lib/%{server_user} -s /bin/false -c "Zabbix Proxy Daemon" -g %{server_group} %{server_user} %service_add_pre zabbix_proxy.service %pre agent # Agent daemon -%{_bindir}/getent group %{agent_group} >/dev/null || %{_sbindir}/groupadd -r %{agent_group} -%{_bindir}/getent passwd %{agent_user} >/dev/null || %{_sbindir}/useradd -r -d %{_localstatedir}/lib/%{agent_user} -s /bin/false -c "Zabbix Agent Daemon" -g %{agent_group} %{agent_user} %service_add_pre zabbix_agentd.service %pre java-gateway # Java daemon -%{_bindir}/getent group %{server_group} >/dev/null || %{_sbindir}/groupadd -r %{server_group} -%{_bindir}/getent passwd %{server_user} >/dev/null || %{_sbindir}/useradd -r -d %{_localstatedir}/lib/%{server_user} -s /bin/false -c "Zabbix Java Daemon" -g %{server_group} %{server_user} %service_add_pre zabbix-java-gateway.service +%pre -n system-user-zabbix -f zabbix.pre + %post server +%firewalld_reload %service_add_post zabbix_server.service %tmpfiles_create %{_tmpfilesdir}/zabbix_server.conf echo "Please read %{_docdir}/%{name}-server/README-SSL.SUSE to set up SSL on Zabbix server." %post proxy +%firewalld_reload %service_add_post zabbix_proxy.service %tmpfiles_create %{_tmpfilesdir}/zabbix_proxy.conf echo "Please read %{_docdir}/%{name}-proxy/README-SSL.SUSE to set up SSL on Zabbix proxy." %post java-gateway +%firewalld_reload %service_add_post zabbix-java-gateway.service %tmpfiles_create %{_tmpfilesdir}/zabbix-java-gateway.conf %post agent +%firewalld_reload %service_add_post zabbix_agentd.service %tmpfiles_create %{_tmpfilesdir}/zabbix_agentd.conf echo "Please read %{_docdir}/%{name}-agent/README-SSL.SUSE to set up SSL on Zabbix agent." @@ -532,9 +555,9 @@ fi %files server %doc AUTHORS ChangeLog database/mysql database/oracle database/postgresql database/sqlite3 rn6.0.0.html README-SSL.SUSE -%if 0%{?suse_version} < 1500 -%config %{SUSEfirewall_services_dir}/zabbix_server -%endif +%config %{_prefix}/lib/firewalld/services/zabbix-server.xml +%dir %{_prefix}/lib/firewalld +%dir %{_prefix}/lib/firewalld/services %dir %{_sysconfdir}/zabbix %config(noreplace) %attr(0640, root, %{server_group}) %{_sysconfdir}/zabbix/zabbix_server.conf %{_bindir}/zabbix_get @@ -556,9 +579,9 @@ fi %files proxy %doc README-SSL.SUSE -%if 0%{?suse_version} < 1500 -%config %{SUSEfirewall_services_dir}/zabbix_proxy -%endif +%config %{_prefix}/lib/firewalld/services/zabbix-proxy.xml +%dir %{_prefix}/lib/firewalld +%dir %{_prefix}/lib/firewalld/services %{_sbindir}/zabbix_proxy %{_sbindir}/zabbix-proxy %{_sbindir}/rczabbix_proxy @@ -576,9 +599,9 @@ fi %files agent %doc README-SSL.SUSE -%if 0%{?suse_version} < 1500 -%config %{SUSEfirewall_services_dir}/zabbix_agentd -%endif +%config %{_prefix}/lib/firewalld/services/zabbix-agentd.xml +%dir %{_prefix}/lib/firewalld +%dir %{_prefix}/lib/firewalld/services %dir %{_sysconfdir}/zabbix %config(noreplace) %attr(0640, root, %{agent_group}) %{_sysconfdir}/zabbix/zabbix_agent*.conf %{_sbindir}/rczabbix_agentd @@ -627,9 +650,9 @@ fi %ghost %{_sysconfdir}/alternatives/zabbix_proxy %files java-gateway -%if 0%{?suse_version} < 1500 -%config %{SUSEfirewall_services_dir}/zabbix-java-gateway -%endif +%config %{_prefix}/lib/firewalld/services/zabbix-java-gateway.xml +%dir %{_prefix}/lib/firewalld +%dir %{_prefix}/lib/firewalld/services %dir %{_sysconfdir}/zabbix %config(noreplace) %attr(0640, root, %{server_group}) %{_sysconfdir}/zabbix/zabbix-java-gateway.conf %config(noreplace) %attr(0640, root, %{server_group}) %{_sysconfdir}/zabbix/zabbix-java-gateway-log.xml @@ -646,4 +669,7 @@ fi %{_unitdir}/zabbix-java-gateway.service %{_tmpfilesdir}/zabbix-java-gateway.conf +%files -n system-user-zabbix +%{_sysusersdir}/system-user-zabbix.conf + %changelog From a095fddab7c680d1e9a6c829cc6462e52ef07fda8f4ae8e45cec7219c790f355 Mon Sep 17 00:00:00 2001 From: Boris Manojlovic Date: Fri, 22 Mar 2024 16:26:04 +0000 Subject: [PATCH 4/4] Accepting request 1160720 from home:bmanojlovic:branches:server:monitoring:zabbix - remove all firewalld definitions as they are part of firewald package already OBS-URL: https://build.opensuse.org/request/show/1160720 OBS-URL: https://build.opensuse.org/package/show/server:monitoring:zabbix/zabbix?expand=0&rev=54 --- zabbix-agentd.xml | 6 ------ zabbix-java-gateway.xml | 6 ------ zabbix-proxy.xml | 6 ------ zabbix-server.xml | 6 ------ zabbix.changes | 5 +++++ zabbix.spec | 21 --------------------- 6 files changed, 5 insertions(+), 45 deletions(-) delete mode 100644 zabbix-agentd.xml delete mode 100644 zabbix-java-gateway.xml delete mode 100644 zabbix-proxy.xml delete mode 100644 zabbix-server.xml diff --git a/zabbix-agentd.xml b/zabbix-agentd.xml deleted file mode 100644 index e28cb84..0000000 --- a/zabbix-agentd.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - Zabbix Agent - Enables Zabbix Agent for monitoring data collection and sending to a Zabbix server. - - diff --git a/zabbix-java-gateway.xml b/zabbix-java-gateway.xml deleted file mode 100644 index db0c150..0000000 --- a/zabbix-java-gateway.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - Zabbix Java Gateway - Enables Zabbix Java Gateway for JMX monitoring and data collection from Java applications. - - diff --git a/zabbix-proxy.xml b/zabbix-proxy.xml deleted file mode 100644 index 0c95661..0000000 --- a/zabbix-proxy.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - Zabbix Proxy - Enables Zabbix Proxy for data collection from monitored devices and sending to Zabbix server. - - diff --git a/zabbix-server.xml b/zabbix-server.xml deleted file mode 100644 index afe5088..0000000 --- a/zabbix-server.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - Zabbix Server - Enables Zabbix Server for processing monitoring data, sending notifications, and visualization. - - diff --git a/zabbix.changes b/zabbix.changes index 400fce8..9841773 100644 --- a/zabbix.changes +++ b/zabbix.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Mar 22 16:11:33 UTC 2024 - Boris Manojlovic + +- remove all firewalld definitions as they are part of firewald package already + ------------------------------------------------------------------- Fri Mar 22 07:49:43 UTC 2024 - Boris Manojlovic diff --git a/zabbix.spec b/zabbix.spec index 11042f5..5341e8d 100644 --- a/zabbix.spec +++ b/zabbix.spec @@ -35,10 +35,6 @@ Source3: zabbix-java-gateway.sh Source4: zabbix-logrotate.in Source5: apache2-zabbix.conf Source6: README.SUSE -Source7: zabbix-server.xml -Source8: zabbix-agentd.xml -Source9: zabbix-proxy.xml -Source10: zabbix-java-gateway.xml Source11: zabbix-proxy.service Source12: zabbix-agentd.service Source13: zabbix-server.service @@ -396,11 +392,6 @@ sed -e 's|COMPONENT|proxy|g; s|USER|zabbixs|g' %{SOURCE4} > \ %fdupes %{buildroot} -# install firewalld service files -install -Dm 0644 %{SOURCE7} %{buildroot}%{_prefix}/lib/firewalld/services/zabbix-server.xml -install -Dm 0644 %{SOURCE8} %{buildroot}%{_prefix}/lib/firewalld/services/zabbix-agentd.xml -install -Dm 0644 %{SOURCE9} %{buildroot}%{_prefix}/lib/firewalld/services/zabbix-proxy.xml -install -Dm 0644 %{SOURCE10} %{buildroot}%{_prefix}/lib/firewalld/services/zabbix-java-gateway.xml # install systemd unit files install -Dm 0644 %{SOURCE11} %{buildroot}%{_unitdir}/zabbix_proxy.service install -Dm 0644 %{SOURCE12} %{buildroot}%{_unitdir}/zabbix_agentd.service @@ -555,9 +546,6 @@ fi %files server %doc AUTHORS ChangeLog database/mysql database/oracle database/postgresql database/sqlite3 rn6.0.0.html README-SSL.SUSE -%config %{_prefix}/lib/firewalld/services/zabbix-server.xml -%dir %{_prefix}/lib/firewalld -%dir %{_prefix}/lib/firewalld/services %dir %{_sysconfdir}/zabbix %config(noreplace) %attr(0640, root, %{server_group}) %{_sysconfdir}/zabbix/zabbix_server.conf %{_bindir}/zabbix_get @@ -579,9 +567,6 @@ fi %files proxy %doc README-SSL.SUSE -%config %{_prefix}/lib/firewalld/services/zabbix-proxy.xml -%dir %{_prefix}/lib/firewalld -%dir %{_prefix}/lib/firewalld/services %{_sbindir}/zabbix_proxy %{_sbindir}/zabbix-proxy %{_sbindir}/rczabbix_proxy @@ -599,9 +584,6 @@ fi %files agent %doc README-SSL.SUSE -%config %{_prefix}/lib/firewalld/services/zabbix-agentd.xml -%dir %{_prefix}/lib/firewalld -%dir %{_prefix}/lib/firewalld/services %dir %{_sysconfdir}/zabbix %config(noreplace) %attr(0640, root, %{agent_group}) %{_sysconfdir}/zabbix/zabbix_agent*.conf %{_sbindir}/rczabbix_agentd @@ -650,9 +632,6 @@ fi %ghost %{_sysconfdir}/alternatives/zabbix_proxy %files java-gateway -%config %{_prefix}/lib/firewalld/services/zabbix-java-gateway.xml -%dir %{_prefix}/lib/firewalld -%dir %{_prefix}/lib/firewalld/services %dir %{_sysconfdir}/zabbix %config(noreplace) %attr(0640, root, %{server_group}) %{_sysconfdir}/zabbix/zabbix-java-gateway.conf %config(noreplace) %attr(0640, root, %{server_group}) %{_sysconfdir}/zabbix/zabbix-java-gateway-log.xml