diff --git a/snmptraps/alpine/conf/usr/sbin/zabbix_trap_handler.sh b/snmptraps/alpine/conf/usr/sbin/zabbix_trap_handler.sh index 1dcd907c2..15c1aa6fa 100644 --- a/snmptraps/alpine/conf/usr/sbin/zabbix_trap_handler.sh +++ b/snmptraps/alpine/conf/usr/sbin/zabbix_trap_handler.sh @@ -4,7 +4,7 @@ ZABBIX_TRAPS_FILE="/var/lib/zabbix/snmptraps/snmptraps.log" ZBX_SNMP_TRAP_DATE_FORMAT=${ZBX_SNMP_TRAP_DATE_FORMAT:-"+%Y%m%d.%H%M%S"} -ZBX_SNMP_TRAP_FORMAT=${ZBX_SNMP_TRAP_FORMAT:"\n"} +ZBX_SNMP_TRAP_FORMAT=${ZBX_SNMP_TRAP_FORMAT:-" "} date=$(date "$ZBX_SNMP_TRAP_DATE_FORMAT") @@ -40,4 +40,4 @@ done ! [ -z $trap_address ] && sender_addr=$trap_address -echo -e "$date ZBXTRAP $sender_addr$ZBX_SNMP_TRAP_FORMAT$vars" >> $ZABBIX_TRAPS_FILE +echo -e "$date ZBXTRAP $sender_addr$ZBX_SNMP_TRAP_FORMAT$sender$ZBX_SNMP_TRAP_FORMAT$vars" >> $ZABBIX_TRAPS_FILE diff --git a/snmptraps/centos/conf/usr/sbin/zabbix_trap_handler.sh b/snmptraps/centos/conf/usr/sbin/zabbix_trap_handler.sh index 1dcd907c2..96b599409 100644 --- a/snmptraps/centos/conf/usr/sbin/zabbix_trap_handler.sh +++ b/snmptraps/centos/conf/usr/sbin/zabbix_trap_handler.sh @@ -4,7 +4,7 @@ ZABBIX_TRAPS_FILE="/var/lib/zabbix/snmptraps/snmptraps.log" ZBX_SNMP_TRAP_DATE_FORMAT=${ZBX_SNMP_TRAP_DATE_FORMAT:-"+%Y%m%d.%H%M%S"} -ZBX_SNMP_TRAP_FORMAT=${ZBX_SNMP_TRAP_FORMAT:"\n"} +ZBX_SNMP_TRAP_FORMAT=${ZBX_SNMP_TRAP_FORMAT:" "} date=$(date "$ZBX_SNMP_TRAP_DATE_FORMAT") diff --git a/snmptraps/ubuntu/conf/usr/sbin/zabbix_trap_handler.sh b/snmptraps/ubuntu/conf/usr/sbin/zabbix_trap_handler.sh index 1dcd907c2..96b599409 100644 --- a/snmptraps/ubuntu/conf/usr/sbin/zabbix_trap_handler.sh +++ b/snmptraps/ubuntu/conf/usr/sbin/zabbix_trap_handler.sh @@ -4,7 +4,7 @@ ZABBIX_TRAPS_FILE="/var/lib/zabbix/snmptraps/snmptraps.log" ZBX_SNMP_TRAP_DATE_FORMAT=${ZBX_SNMP_TRAP_DATE_FORMAT:-"+%Y%m%d.%H%M%S"} -ZBX_SNMP_TRAP_FORMAT=${ZBX_SNMP_TRAP_FORMAT:"\n"} +ZBX_SNMP_TRAP_FORMAT=${ZBX_SNMP_TRAP_FORMAT:" "} date=$(date "$ZBX_SNMP_TRAP_DATE_FORMAT")