mirror of
https://github.com/zabbix/zabbix-docker.git
synced 2025-01-25 23:09:10 +01:00
Updated snmptraps image. Fixed source IP handling and trap format
This commit is contained in:
parent
3a099e7b9b
commit
528876cc8c
@ -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_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")
|
date=$(date "$ZBX_SNMP_TRAP_DATE_FORMAT")
|
||||||
|
|
||||||
@ -40,4 +40,4 @@ done
|
|||||||
|
|
||||||
! [ -z $trap_address ] && sender_addr=$trap_address
|
! [ -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
|
||||||
|
@ -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_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")
|
date=$(date "$ZBX_SNMP_TRAP_DATE_FORMAT")
|
||||||
|
|
||||||
|
@ -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_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")
|
date=$(date "$ZBX_SNMP_TRAP_DATE_FORMAT")
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user