From 3a099e7b9b144718d6137dc7a091f6c258bd6ba0 Mon Sep 17 00:00:00 2001 From: Alexey Pustovalov Date: Mon, 8 Feb 2021 20:11:50 -0500 Subject: [PATCH 1/3] Zabbix Appliance has been decommissioned --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index f5454ca6f..063712bb0 100644 --- a/README.md +++ b/README.md @@ -27,6 +27,7 @@ This repository contains **Dockerfile** of [Zabbix](https://zabbix.com/) for [Do Please follow usage instructions of each Zabbix component image: * [zabbix-appliance](https://hub.docker.com/r/zabbix/zabbix-appliance/) - Zabbix appliance with built-in MySQL server, Zabbix server, Zabbix Java Gateway and Zabbix frontend based on Nginx web-server + > **Important information: Zabbix Docker Appliance has been decommissioned (except Red Hat edition) and will not be available for 3.0.31, 4.0.19, 4.4.7, 5.0.0 and newer releases. Please use a separate Docker images for each component instead of the all-in-one solution.** * [zabbix-agent](https://hub.docker.com/r/zabbix/zabbix-agent/) - Zabbix agent * [zabbix-server-mysql](https://hub.docker.com/r/zabbix/zabbix-server-mysql/) - Zabbix server with MySQL database support From 528876cc8cb43094e96259f7d942f99868089502 Mon Sep 17 00:00:00 2001 From: Alexey Pustovalov Date: Fri, 12 Feb 2021 08:14:16 -0500 Subject: [PATCH 2/3] Updated snmptraps image. Fixed source IP handling and trap format --- snmptraps/alpine/conf/usr/sbin/zabbix_trap_handler.sh | 4 ++-- snmptraps/centos/conf/usr/sbin/zabbix_trap_handler.sh | 2 +- snmptraps/ubuntu/conf/usr/sbin/zabbix_trap_handler.sh | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) 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") From c1a435b6c7b165e2b9601dce7ff699b85e34aa8f Mon Sep 17 00:00:00 2001 From: Alexey Pustovalov Date: Fri, 12 Feb 2021 08:24:37 -0500 Subject: [PATCH 3/3] Updated snmptraps image. Fixed source IP handling and trap format --- snmptraps/centos/conf/usr/sbin/zabbix_trap_handler.sh | 2 +- snmptraps/ubuntu/conf/usr/sbin/zabbix_trap_handler.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/snmptraps/centos/conf/usr/sbin/zabbix_trap_handler.sh b/snmptraps/centos/conf/usr/sbin/zabbix_trap_handler.sh index 96b599409..051c6f02d 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:-" "} 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 96b599409..051c6f02d 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:-" "} date=$(date "$ZBX_SNMP_TRAP_DATE_FORMAT")