Skip to content

Commit

Permalink
Revert "Revert "Remove snmpd hw_fsys module, remove disk monitoring w…
Browse files Browse the repository at this point in the history
…hich is not in use" (#1665)"

This reverts commit 5817e99.
  • Loading branch information
jleveque authored May 2, 2018
1 parent ebd6044 commit d79ad4d
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 9 deletions.
8 changes: 0 additions & 8 deletions dockers/docker-snmp-sv2/snmpd.conf.j2
Original file line number Diff line number Diff line change
Expand Up @@ -60,14 +60,6 @@ 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

Expand Down
2 changes: 1 addition & 1 deletion dockers/docker-snmp-sv2/supervisord.conf
Original file line number Diff line number Diff line change
Expand Up @@ -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 -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,hw_fsys -p /run/snmpd.pid
priority=4
autostart=false
autorestart=false
Expand Down

0 comments on commit d79ad4d

Please sign in to comment.