diff --git a/admin/zabbix/Makefile b/admin/zabbix/Makefile index 99ded40d5e..1a89460b53 100644 --- a/admin/zabbix/Makefile +++ b/admin/zabbix/Makefile @@ -8,13 +8,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=zabbix -PKG_VERSION:=7.0.12 +PKG_VERSION:=7.0.21 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://cdn.zabbix.com/zabbix/sources/stable/$(basename $(PKG_VERSION))/ \ https://cdn.zabbix.com/zabbix/sources/oldstable/$(basename $(PKG_VERSION))/ -PKG_HASH:=6069ed604aa5e33fe631ccc68b782654a697071952a1cf365151655a0a122b05 +PKG_HASH:=a7f82c1610bc02e4ac42f5257c0265f92e32b51fb5e04b4ad29f72e97189d3ef PKG_MAINTAINER:=Etienne CHAMPETIER PKG_LICENSE:=AGPL-3.0-only diff --git a/admin/zabbix/patches/010-change-agentd-config.patch b/admin/zabbix/patches/010-change-agentd-config.patch index 7329113577..2dbae8baa5 100644 --- a/admin/zabbix/patches/010-change-agentd-config.patch +++ b/admin/zabbix/patches/010-change-agentd-config.patch @@ -1,3 +1,23 @@ +From da7f1292838f087e2179705f2778f78ddd85cba8 Mon Sep 17 00:00:00 2001 +From: "Daniel F. Dickinson" +Date: Wed, 17 Dec 2025 18:28:37 -0500 +Subject: [PATCH] zabbix_agentd: Tweak config file for OpenWrt + +Note: original patch had no header, header added 2025-12-16, while +bumping package version. + +1. Use syslog not a file for logging +2. Do not use PidFile +3. Only start in passive agent by default +4. Do not do active checks by default +5. Use the system hostname as hostname. +6. Include configurations under /etc/zabbix_agentd.conf.d/ + +Signed-off-by: Daniel F. Dickinson +--- + conf/zabbix_agentd.conf | 19 +++++++------------ + 1 file changed, 7 insertions(+), 12 deletions(-) + --- a/conf/zabbix_agentd.conf +++ b/conf/zabbix_agentd.conf @@ -3,12 +3,11 @@ @@ -53,13 +73,10 @@ ### Option: HostnameItem # Item used for generating Hostname if it is undefined. Ignored if Hostname is defined. # Does not support UserParameters or aliases. -@@ -326,8 +320,8 @@ Hostname=Zabbix server +@@ -545,5 +539,5 @@ Hostname=Zabbix server # Include= # Include=/usr/local/etc/zabbix_agentd.userparams.conf -# Include=/usr/local/etc/zabbix_agentd.conf.d/ # Include=/usr/local/etc/zabbix_agentd.conf.d/*.conf +Include=/etc/zabbix_agentd.conf.d/ - - ####### USER-DEFINED MONITORED PARAMETERS ####### -