From 9d5c28525a2f602b2dc0a78dca0a5c1ebc08f792 Mon Sep 17 00:00:00 2001
From: Alexey Pustovalov <alexey.pustovalov@zabbix.com>
Date: Mon, 15 Feb 2021 04:51:35 -0500
Subject: [PATCH] Updated snmptraps image. Fixed source IP handling and trap
 format

---
 snmptraps/alpine/conf/usr/sbin/zabbix_trap_handler.sh | 2 +-
 snmptraps/centos/conf/usr/sbin/zabbix_trap_handler.sh | 2 +-
 snmptraps/ubuntu/conf/usr/sbin/zabbix_trap_handler.sh | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/snmptraps/alpine/conf/usr/sbin/zabbix_trap_handler.sh b/snmptraps/alpine/conf/usr/sbin/zabbix_trap_handler.sh
index 15c1aa6fa..ac8140c08 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:-" "}
+ZBX_SNMP_TRAP_FORMAT=${ZBX_SNMP_TRAP_FORMAT:-"\n"}
 
 date=$(date "$ZBX_SNMP_TRAP_DATE_FORMAT")
 
diff --git a/snmptraps/centos/conf/usr/sbin/zabbix_trap_handler.sh b/snmptraps/centos/conf/usr/sbin/zabbix_trap_handler.sh
index 051c6f02d..aea0a853b 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:-" "}
+ZBX_SNMP_TRAP_FORMAT=${ZBX_SNMP_TRAP_FORMAT:-"\n"}
 
 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 051c6f02d..aea0a853b 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:-" "}
+ZBX_SNMP_TRAP_FORMAT=${ZBX_SNMP_TRAP_FORMAT:-"\n"}
 
 date=$(date "$ZBX_SNMP_TRAP_DATE_FORMAT")