- Configure Zabbix Agent to log to syslog instead of its own logs.
- Remove old zabbix log-dir and logrotate settings from rootfile, lfs
and install-script.
- Update log.dat to view Zabbix Agent logging from syslog.
Signed-off-by: Robin Roevens <robin.roevens@disroot.org>
-etc/logrotate.d/zabbix_agentd
etc/rc.d/init.d/zabbix_agentd
etc/sudoers.d/zabbix_agentd
etc/sudoers.d/zabbix_agentd_user
var/ipfire/zabbix_agentd/userparameters
var/ipfire/zabbix_agentd/userparameters/userparameter_pakfire.conf
var/ipfire/zabbix_agentd/userparameters/userparameter_ipfire.conf
-#var/log/zabbix
+++ /dev/null
-/var/log/zabbix/zabbix_agentd.log {
- monthly
- rotate 12
- compress
- delaycompress
- missingok
- notifempty
- create 0640 zabbix zabbix
-}
PidFile=/var/run/zabbix/zabbix_agentd.pid
-# Log rotation is managed by logrotate
-LogFile=/var/log/zabbix/zabbix_agentd.log
-LogFileSize=0
+# Logs go to syslog so it can be viewed in WUI logviewer
+LogType=system
# These paths are included in the IPFire backups. Do not put user modules
# or configuration files in other locations if you want them included in the
'ssh' => '(sshd(?:\(.*\))?\[.*\]: )',
'unbound' => '(unbound: \[.*?\])(.*:.*$)',
'urlfilter bl' => '(installpackage\[urlfilter\]: )',
- 'wireless' => '(hostapd:|kernel: ath.*:|kernel: wifi[0-9]:)'
+ 'wireless' => '(hostapd:|kernel: ath.*:|kernel: wifi[0-9]:)',
+ 'zabbix_agentd' => '(zabbix_agentd\[.*?\]: )'
);
# Translations for the %sections array.
'ssh' => 'SSH',
'unbound' => 'DNS: Unbound',
'urlfilter bl' => 'URLFilter Blacklist',
- 'wireless' => 'Wireless'
+ 'wireless' => 'Wireless',
+ 'zabbix_agentd' => 'Zabbix Agent'
);
# Create directory for additional agent modules
-mkdir -pv /usr/lib/zabbix
- # Create directory for logging
- -mkdir -pv /var/log/zabbix
- chown zabbix.zabbix /var/log/zabbix
-
# Create directory for pid.
-mkdir -pv /var/run/zabbix
chown zabbix.zabbix /var/run/zabbix
install -v -m 644 $(DIR_SRC)/config/backup/includes/zabbix_agentd \
/var/ipfire/backup/addons/includes/zabbix_agentd
- # Install include file for Logrotate
- -mkdir -pv /etc/logrotate.d
- install -v -m 644 $(DIR_SRC)/config/zabbix_agentd/logrotate \
- /etc/logrotate.d/zabbix_agentd
-
@rm -rf $(DIR_APP)
@$(POSTBUILD)
ln -sf ../init.d/zabbix_agentd /etc/rc.d/rc6.d/K02zabbix_agentd
# Create additonal directories and set permissions
-[ -d /var/log/zabbix ] || ( mkdir -pv /var/log/zabbix && chown zabbix.zabbix /var/log/zabbix )
[ -d /usr/lib/zabbix ] || ( mkdir -pv /usr/lib/zabbix && chown zabbix.zabbix /usr/lib/zabbix )
restore_backup ${NAME}
if [ $? -eq 1 ]; then
# Remove settings that are now in our own config
sed -i -e "\|^PidFile=.*$|d" /etc/zabbix_agentd/zabbix_agentd.conf
- sed -i -e "\|^LogFile=.*$|d" /etc/zabbix_agentd/zabbix_agentd.conf
- sed -i -e "\|^LogFileSize=.*$|d" /etc/zabbix_agentd/zabbix_agentd.conf
+ sed -i -e "\|^LogType=.*$|d" /etc/zabbix_agentd/zabbix_agentd.conf
sed -i -e "\|^LoadModulePath=.*$|d" /etc/zabbix_agentd/zabbix_agentd.conf
sed -i -e "\|^Include=/etc/zabbix_agentd/zabbix_agentd\.d/\*\.conf$|d" /etc/zabbix_agentd/zabbix_agentd.conf
# Include our own config in main config