From da7f1292838f087e2179705f2778f78ddd85cba8 Mon Sep 17 00:00:00 2001
From: "Daniel F. Dickinson" <dfdpublic@wildtechgarden.ca>
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. Modified 2025-12-25. Modified 2026-01-21.

1. Use syslog not a file for logging
2. Place PidFile under /var/run/zabbix
3. Only start passive agent by default
4. Do not do active checks by default
5. Use the system hostname as hostname (except on zabbix server)
6. Include configurations under /etc/zabbix_agentd.conf.d/
7. Drop privileges to the zabbix-agent user (instead of zabbix)

Signed-off-by: Daniel F. Dickinson <dfdpublic@wildtechgarden.ca>
---
 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 @@
 
 ############ GENERAL PARAMETERS #################
 
-### Option: PidFile
-#	Name of PID file.
-#
-# Mandatory: no
-# Default:
-# PidFile=/tmp/zabbix_agentd.pid
+# Zabbix always creates a PidFile. Make sure it is where we want it.
+PidFile=/var/run/zabbix-agent/zabbix_agentd.pid
+
+# use syslog
+LogType=system
 
 ### Option: LogType
 #	Specifies where log messages are written to:
@@ -27,8 +26,6 @@
 # Default:
 # LogFile=
 
-LogFile=/tmp/zabbix_agentd.log
-
 ### Option: LogFileSize
 #	Maximum size of log file in MB.
 #	0 - disable automatic log rotation.
@@ -136,6 +133,7 @@ Server=127.0.0.1
 # Range: 0-100
 # Default:
 # StartAgents=10
+StartAgents=1
 
 ##### Active checks related
 
@@ -166,8 +164,6 @@ Server=127.0.0.1
 # Default:
 # ServerActive=
 
-ServerActive=127.0.0.1
-
 ### Option: Hostname
 #	List of comma delimited unique, case sensitive hostnames.
 #	Required for active checks and must match hostnames as configured on the server.
@@ -177,8 +173,6 @@ ServerActive=127.0.0.1
 # Default:
 # Hostname=
 
-Hostname=Zabbix server
-
 ### Option: HostnameItem
 #	Item used for generating Hostname if it is undefined. Ignored if Hostname is defined.
 #	Does not support UserParameters or aliases.
@@ -317,7 +311,7 @@ Hostname=Zabbix server
 #
 # Mandatory: no
 # Default:
-# User=zabbix
+User=zabbix-agent
 
 ####### USER-DEFINED MONITORED PARAMETERS #######
 
@@ -547,5 +541,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/
