From 3f03e7abbfe15cc01f9b96750e5d532dc2202c02 Mon Sep 17 00:00:00 2001 From: root Date: Thu, 18 Apr 2019 23:53:46 +0300 Subject: [PATCH] Fixed duplicated SNMP traps --- .../conf/etc/supervisor/conf.d/supervisord_snmptraps.conf | 2 +- .../conf/etc/supervisor/conf.d/supervisord_snmptraps.conf | 2 +- snmptraps/ubuntu/Dockerfile | 3 --- .../conf/etc/supervisor/conf.d/supervisord_snmptraps.conf | 2 +- 4 files changed, 3 insertions(+), 6 deletions(-) diff --git a/snmptraps/alpine/conf/etc/supervisor/conf.d/supervisord_snmptraps.conf b/snmptraps/alpine/conf/etc/supervisor/conf.d/supervisord_snmptraps.conf index 6a4c9a4af4..89b330246f 100644 --- a/snmptraps/alpine/conf/etc/supervisor/conf.d/supervisord_snmptraps.conf +++ b/snmptraps/alpine/conf/etc/supervisor/conf.d/supervisord_snmptraps.conf @@ -17,7 +17,7 @@ stdout_logfile = /dev/stdout stdout_logfile_maxbytes = 0 [program:snmptrapd] -command = /usr/sbin/%(program_name)s -f -n -Lo -p /var/run/snmptrapd.pid -c /etc/snmp/%(program_name)s.conf +command = /usr/sbin/%(program_name)s -m '+ALL' -M /usr/share/snmp/mibs/:/var/lib/zabbix/mibs -f -n -Lo -p /var/run/snmptrapd.pid -C -c /etc/snmp/%(program_name)s.conf auto_start = true autorestart = true priority = 100 diff --git a/snmptraps/centos/conf/etc/supervisor/conf.d/supervisord_snmptraps.conf b/snmptraps/centos/conf/etc/supervisor/conf.d/supervisord_snmptraps.conf index 6a4c9a4af4..89b330246f 100644 --- a/snmptraps/centos/conf/etc/supervisor/conf.d/supervisord_snmptraps.conf +++ b/snmptraps/centos/conf/etc/supervisor/conf.d/supervisord_snmptraps.conf @@ -17,7 +17,7 @@ stdout_logfile = /dev/stdout stdout_logfile_maxbytes = 0 [program:snmptrapd] -command = /usr/sbin/%(program_name)s -f -n -Lo -p /var/run/snmptrapd.pid -c /etc/snmp/%(program_name)s.conf +command = /usr/sbin/%(program_name)s -m '+ALL' -M /usr/share/snmp/mibs/:/var/lib/zabbix/mibs -f -n -Lo -p /var/run/snmptrapd.pid -C -c /etc/snmp/%(program_name)s.conf auto_start = true autorestart = true priority = 100 diff --git a/snmptraps/ubuntu/Dockerfile b/snmptraps/ubuntu/Dockerfile index c93d07a1b8..78852e86e0 100644 --- a/snmptraps/ubuntu/Dockerfile +++ b/snmptraps/ubuntu/Dockerfile @@ -62,9 +62,6 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \ -e "/^LOGFILE=/s/=.*/=\"\/var\/lib\/zabbix\/snmptraps\/snmptraps.log\"/" \ "/etc/snmp/snmptrapfmt.conf" && \ rm -rf /tmp/snmptrapfmt_1.14+nmu1ubuntu2_amd64.deb && \ - apt-get ${APT_FLAGS_COMMON} purge \ - snmp-mibs-downloader \ - wget && \ apt-get ${APT_FLAGS_COMMON} autoremove 1>/dev/null && \ rm -rf /var/lib/apt/lists/* diff --git a/snmptraps/ubuntu/conf/etc/supervisor/conf.d/supervisord_snmptraps.conf b/snmptraps/ubuntu/conf/etc/supervisor/conf.d/supervisord_snmptraps.conf index 6a4c9a4af4..86b471372a 100644 --- a/snmptraps/ubuntu/conf/etc/supervisor/conf.d/supervisord_snmptraps.conf +++ b/snmptraps/ubuntu/conf/etc/supervisor/conf.d/supervisord_snmptraps.conf @@ -17,7 +17,7 @@ stdout_logfile = /dev/stdout stdout_logfile_maxbytes = 0 [program:snmptrapd] -command = /usr/sbin/%(program_name)s -f -n -Lo -p /var/run/snmptrapd.pid -c /etc/snmp/%(program_name)s.conf +command = /usr/sbin/%(program_name)s -m '+ALL' -M /usr/share/snmp/mibs:/var/lib/snmp/mibs/iana:/var/lib/snmp/mibs/ietf:/var/lib/zabbix/mibs -f -n -Lo -p /var/run/snmptrapd.pid -C -c /etc/snmp/%(program_name)s.conf auto_start = true autorestart = true priority = 100