|
|
@@ -5,8 +5,6 @@
|
|
|
{%- set nms_list = salt['pillar.get'] ('globals:snmp:nms_list', []) %}
|
|
|
{%- set sites_config = salt['pillar.get'] ('sites', {}) %}
|
|
|
{%- set ifaces = salt['ffho_net.get_interface_config'] (node_config, sites_config) %}
|
|
|
-
|
|
|
-
|
|
|
#
|
|
|
# /etc/snmp/snmpd.conf (Salt managed)
|
|
|
#
|
|
|
@@ -43,14 +41,17 @@ rocommunity {{ ro_community }} {{ entry }}
|
|
|
# an ideal value for everyone.
|
|
|
{%- for iface in ifaces|sort %}
|
|
|
{%- set config = ifaces.get (iface) %}
|
|
|
- {%- if 'vlan-raw-device' in config or "batman" in config or "bridge" in config or config.get ('link-type', '') == 'veth' %}
|
|
|
-interface {{ iface }} 6 100000000
|
|
|
+ {%- if 'vlan-raw-device' in config %}
|
|
|
+interface {{ iface }} 6 1000000000 # 1 Gb/s
|
|
|
+ {%- endif %}
|
|
|
+ {%- if "batman" in config or "bridge" in config %}
|
|
|
+interface {{ iface }} 6 500000000 # 500 Mb/s
|
|
|
{%- endif %}
|
|
|
{%- endfor %}
|
|
|
|
|
|
{%- if "fastd" in node_config.get ('roles') %}
|
|
|
{%- for site in node_config.get ('sites') %}
|
|
|
-interface {{ site }}_intergw 6 100000000
|
|
|
+interface {{ site }}_intergw 6 500000000 # 500 Mb/s
|
|
|
{%- endfor %}
|
|
|
{%- endif %}
|
|
|
|
|
|
@@ -67,42 +68,5 @@ interface {{ site }}_intergw 6 100000000
|
|
|
{%- if loop.first %}
|
|
|
# OpenVPN interfaces
|
|
|
{%- endif %}
|
|
|
-interface {{ interface }} 6 100000000
|
|
|
+interface {{ interface }} 6 100000000 # 100 Mb/s
|
|
|
{%- endfor %}
|
|
|
-
|
|
|
-
|
|
|
-#
|
|
|
-# 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
|
|
|
-
|
|
|
-
|
|
|
-#
|
|
|
-# System Load
|
|
|
-#
|
|
|
- # Unacceptable 1-, 5-, and 15-minute load averages
|
|
|
-load 12 10 5
|
|
|
-
|
|
|
-# Walk the UCD-SNMP-MIB::laTable to see the resulting output
|
|
|
-# Note that this table *will* be populated, even without a "load" entry in the snmpd.conf file
|
|
|
-
|
|
|
-
|
|
|
-#
|
|
|
-# Event MIB - automatically generate alerts
|
|
|
-#
|
|
|
- # Remember to activate the 'createUser' lines above
|
|
|
-iquerySecName internalUser
|
|
|
-rouser internalUser
|
|
|
- # generate traps on UCD error conditions
|
|
|
-defaultMonitors no
|
|
|
- # generate traps on linkUp/Down
|
|
|
-linkUpDownNotifications no
|
|
|
-
|
|
|
-
|
|
|
-master agentx
|
Philipp Fromme