From 8321891a180afcee8bd6822d54012e65f6e69848 Mon Sep 17 00:00:00 2001 From: Qi Luo Date: Tue, 1 May 2018 16:41:27 -0700 Subject: [PATCH] Revert "Remove snmpd hw_fsys module, remove disk monitoring which are not in use (#1663)" This reverts commit 3d61df9d757e33524a26349865f21c8b0df5b10f. --- dockers/docker-snmp-sv2/snmpd.conf.j2 | 8 ++++++++ dockers/docker-snmp-sv2/supervisord.conf | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/dockers/docker-snmp-sv2/snmpd.conf.j2 b/dockers/docker-snmp-sv2/snmpd.conf.j2 index 62188892fa68..6353246acb08 100644 --- a/dockers/docker-snmp-sv2/snmpd.conf.j2 +++ b/dockers/docker-snmp-sv2/snmpd.conf.j2 @@ -60,6 +60,14 @@ sysServices 72 # Note that this table will be empty if there are no "proc" entries in the snmpd.conf file +# +# Disk Monitoring +# + # 10MBs required on root disk, 5% free on /var, 10% free on all other disks +disk / 10000 +disk /var 5% +includeAllDisks 10% + # Walk the UCD-SNMP-MIB::dskTable to see the resulting output # Note that this table will be empty if there are no "disk" entries in the snmpd.conf file diff --git a/dockers/docker-snmp-sv2/supervisord.conf b/dockers/docker-snmp-sv2/supervisord.conf index d07f584a6933..b3db3be95a2f 100644 --- a/dockers/docker-snmp-sv2/supervisord.conf +++ b/dockers/docker-snmp-sv2/supervisord.conf @@ -29,7 +29,7 @@ stdout_logfile=syslog stderr_logfile=syslog [program:snmpd] -command=/usr/sbin/snmpd -f -LS4d -u Debian-snmp -g Debian-snmp -I -smux,mteTrigger,mteTriggerConf,ifTable,ifXTable,inetCidrRouteTable,ipCidrRouteTable,ip,disk_hw,hw_fsys -p /run/snmpd.pid +command=/usr/sbin/snmpd -f -LS4d -u Debian-snmp -g Debian-snmp -I -smux,mteTrigger,mteTriggerConf,ifTable,ifXTable,inetCidrRouteTable,ipCidrRouteTable,ip,disk_hw -p /run/snmpd.pid priority=4 autostart=false autorestart=false