matthew/sonic-buildimage
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Disable snmpd module disk_hw, so no syslog messages about unavailable disks (#977)

Browse Source 
* Revert "snmpd ignores unavailable disks (#607)"

This reverts commit d70e973496.

* Disable snmpd module disk_hw, so no syslog messages about unavailable disks

Signed-off-by: Qi Luo <qiluo-msft@users.noreply.github.com>

* Strip white spaces

Signed-off-by: Qi Luo <qiluo-msft@users.noreply.github.com>
This commit is contained in:
Qi Luo 2017-09-21 17:31:39 -07:00 committed by GitHub
parent 0f6c8c14e8
commit bec99f257a
2 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
dockers/docker-snmp-sv2/snmpd.conf.j2
View File

@ -28,7 +28,7 @@ agentAddress udp:{{ prefix | ip }}:161
{% endif %} {% endif %}
{% endfor %} {% endfor %}
{% else %} {% else %}
# Listen on all addresses as mgmt ip not specified # Listen on all addresses as mgmt ip not specified
agentAddress udp:161 agentAddress udp:161
{% endif %} {% endif %}
@ -61,7 +61,7 @@ sysServices 72
# #
# Process Monitoring # Process Monitoring
# #
# TODO: should we enable snmp based monitoring of sswsyncd and other processes? # todo: should we enable snmp based monitoring of sswsyncd and other processes?
# At least one 'sendmail' process, but no more than 10 # At least one 'sendmail' process, but no more than 10
#proc sendmail 10 1 #proc sendmail 10 1
@ -76,12 +76,7 @@ sysServices 72
# 10MBs required on root disk, 5% free on /var, 10% free on all other disks # 10MBs required on root disk, 5% free on /var, 10% free on all other disks
disk / 10000 disk / 10000
disk /var 5% disk /var 5%
includeAllDisks 10%
# Note: includeAllDisks will conflict with ignoredisk
# TODO: /root/* are introduced by aufs union mount, happening in initramfs stage. Clean them in the mount list.
ignoredisk /root/host
ignoredisk /root/dev
ignoredisk /root/dev/pts
# Walk the UCD-SNMP-MIB::dskTable to see the resulting output # 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 # Note that this table will be empty if there are no "disk" entries in the snmpd.conf file

2
dockers/docker-snmp-sv2/supervisord.conf
View File

@ -20,7 +20,7 @@ stdout_logfile=syslog
stderr_logfile=syslog stderr_logfile=syslog
[program:snmpd] [program:snmpd]
command=/usr/sbin/snmpd -f -LS4d -u Debian-snmp -g Debian-snmp -I -smux,mteTrigger,mteTriggerConf,ifTable,ifXTable,inetCidrRouteTable,ipCidrRouteTable,ip -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=3 priority=3
autostart=false autostart=false
autorestart=false autorestart=false