diff --git a/group_vars/all/snmp_profiles.yml b/group_vars/all/snmp_profiles.yml index 83b0595b8..5e8aa0701 100644 --- a/group_vars/all/snmp_profiles.yml +++ b/group_vars/all/snmp_profiles.yml @@ -92,6 +92,8 @@ collectd_snmp_profiles: TypeInstanceOID: .1.3.6.1.4.1.41112.1.4.7.1.2.1 Values: .1.3.6.1.4.1.41112.1.4.7.1.20.1 + # Collectd will throw a noSuchName error every Interval for every Value + # when no Station is connected to a AP airos_6: sys_uptime: Type: uptime @@ -274,3 +276,57 @@ collectd_snmp_profiles: TypeInstanceOID: .1.3.6.1.2.1.2.2.1.2 Table: true Values: .1.3.6.1.2.1.2.2.1.14 + + edgerouter: + sys_uptime: + Type: uptime + TypeInstance: days + Table: false + Scale: 1.15740740741e-07 # TODO: Check scale + Values: 1.3.6.1.2.1.25.1.1.0 + + if_oper_status: + Type: gauge + TypeInstanceOID: 1.3.6.1.2.1.2.2.1.2 + Table: true + Values: .1.3.6.1.2.1.2.2.1.8 + + if_speed: + Type: gauge + TypeInstanceOID: .1.3.6.1.2.1.2.2.1.2 + Table: true + Scale: 1000000 + Values: 1.3.6.1.2.1.2.2.1.5 + + if_in_errors: + Type: gauge + TypeInstanceOID: .1.3.6.1.2.1.2.2.1.2 + Table: true + Values: .1.3.6.1.2.1.2.2.1.14 + + tplink: + sys_uptime: + Type: uptime + TypeInstance: days + Table: false + Scale: 1.15740740741e-07 # TODO: check if scale if right. Unit is 1/100th of a second + Values: .1.3.6.1.2.1.1.3 + + if_oper_status: + Type: gauge + TypeInstanceOID: .1.3.6.1.2.1.2.2.1.2 + Table: true + Values: 1.3.6.1.2.1.2.2.1.8 + + if_speed: + Type: gauge + TypeInstanceOID: .1.3.6.1.2.1.2.2.1.2 + Table: true + Scale: 1000000 + Values: 1.3.6.1.2.1.2.2.1.5 + + if_in_errors: + Type: gauge + TypeInstanceOID: .1.3.6.1.2.1.2.2.1.2 + Table: true + Values: .1.3.6.1.2.1.2.2.1.14 diff --git a/locations/agym.yml b/locations/agym.yml index 7a446bbc7..f90d5ac1d 100644 --- a/locations/agym.yml +++ b/locations/agym.yml @@ -15,6 +15,10 @@ hosts: wireless_profile: freifunk_default snmp_devices: + - hostname: agym-switch-roof + address: 10.230.89.2 + snmp_profile: edgeswitch + - hostname: agym-zwingli address: 10.230.89.4 snmp_profile: af60 diff --git a/locations/chris.yml b/locations/chris.yml index 11b052c5e..df27018f0 100644 --- a/locations/chris.yml +++ b/locations/chris.yml @@ -31,6 +31,10 @@ hosts: model: "ubnt_nanostation-m2_xm" snmp_devices: + - hostname: chris-switch + address: 10.230.18.2 + snmp_profile: tplink + - hostname: chris-bht address: 10.230.18.3 snmp_profile: airos_6 diff --git a/locations/dorfplatz.yml b/locations/dorfplatz.yml index 134704608..fa0179597 100644 --- a/locations/dorfplatz.yml +++ b/locations/dorfplatz.yml @@ -37,6 +37,10 @@ hosts: model: "avm_fritzbox-4040" snmp_devices: + - hostname: dorfplatz-poe-switch + address: 10.31.75.34 + snmp_profile: edgeswitch + - hostname: dorfplatz-sama address: 10.31.75.35 snmp_profile: airos_8 diff --git a/locations/dtmb.yml b/locations/dtmb.yml index 20db2feb2..6199d1ed5 100644 --- a/locations/dtmb.yml +++ b/locations/dtmb.yml @@ -14,6 +14,14 @@ hosts: wireless_profile: freifunk_default snmp_devices: + - hostname: dtmb-sw1 + address: 10.31.131.2 + snmp_profile: edgeswitch + + - hostname: dtmb-sw2 + address: 10.31.131.3 + snmp_profile: edgeswitch + - hostname: dtmb-ak36 address: 10.31.131.10 snmp_profile: airos_6 diff --git a/locations/emma.yml b/locations/emma.yml index 717f55036..1c4dd1b0e 100644 --- a/locations/emma.yml +++ b/locations/emma.yml @@ -13,34 +13,53 @@ hosts: wireless_profile: freifunk_default snmp_devices: + - hostname: emma-switch-no + address: 10.31.11.2 + snmp_profile: edgeswitch + + - hostname: emma-switch-so + address: 10.31.11.3 + snmp_profile: edgeswitch + + - hostname: emma-switch-sw + address: 10.31.11.4 + snmp_profile: edgeswitch + + - hostname: emma-switch-nw + address: 10.31.11.5 + snmp_profile: edgeswitch + - hostname: emma-ssw-uplink address: 10.31.11.18 snmp_profile: mikrotik_60g + - hostname: emma-oso-5ghz address: 10.31.11.19 snmp_profile: airos_8 + - hostname: emma-nno-5ghz address: 10.31.11.20 snmp_profile: airos_8 + - hostname: emma-ono-5ghz address: 10.31.11.21 snmp_profile: airos_8 + - hostname: emma-wsw-5ghz address: 10.31.11.22 snmp_profile: airos_8 + - hostname: emma-wnw-5ghz address: 10.31.11.23 snmp_profile: airos_8 + - hostname: emma-nnw-5ghz address: 10.31.11.24 snmp_profile: airos_8 + - hostname: emma-sso-5ghz address: 10.31.11.25 snmp_profile: airos_8 - # Monitor ohlauer device from emma - - hostname: ohlauer-emma - address: 10.31.166.251 - snmp_profile: mikrotik_60g airos_dfs_reset: - name: "emma-oso-5ghz" diff --git a/locations/gruni73.yml b/locations/gruni73.yml index eefe668de..149e9b5c9 100644 --- a/locations/gruni73.yml +++ b/locations/gruni73.yml @@ -27,6 +27,10 @@ hosts: model: "ubnt_rocket-5ac-lite" snmp_devices: + - hostname: gruni73-switch + address: 10.31.156.2 + snmp_profile: edgeswitch + - hostname: gruni73-sama address: 10.31.156.5 snmp_profile: airos_8 diff --git a/locations/j41.yml b/locations/j41.yml index 71c70cd3c..bbf21d587 100644 --- a/locations/j41.yml +++ b/locations/j41.yml @@ -13,6 +13,10 @@ hosts: wireless_profile: freifunk_default snmp_devices: + - hostname: j41-switch + address: 10.31.41.2 + snmp_profile: edgeswitch + - hostname: j41-f2a address: 10.31.41.3 snmp_profile: airos_6 diff --git a/locations/jup.yml b/locations/jup.yml index 706b33278..39a2cf258 100644 --- a/locations/jup.yml +++ b/locations/jup.yml @@ -13,29 +13,40 @@ hosts: role: corerouter model: "tplink_tl-wdr4900-v1" wireless_profile: freifunk_default + - hostname: jup-m5-ap1 role: ap model: "ubnt_nanostation-m5_xm" + - hostname: jup-m5-ap2 role: ap model: "ubnt_nanostation-m5_xm" + - hostname: jup-m2-ap3 role: ap model: "ubnt_nanostation-m2_xm" + - hostname: jup-bullet-ap4 role: ap model: "ubnt_bullet-m-ar7241" + - hostname: jup-m5-ap5 role: ap model: "ubnt_nanostation-m5_xm" + - hostname: jup-bar role: ap model: "avm_fritzbox-7530" snmp_devices: + - hostname: jup-poe + address: 10.31.147.130 + snmp_profile: edgeswitch + - hostname: jup-bht address: 10.31.147.131 snmp_profile: airos_6 + - hostname: jup-segen address: 10.31.147.132 snmp_profile: airos_6 diff --git a/locations/kiehlufer.yml b/locations/kiehlufer.yml index edfb80593..7f335f59a 100644 --- a/locations/kiehlufer.yml +++ b/locations/kiehlufer.yml @@ -61,6 +61,9 @@ hosts: eth0: 08:55:31:b1:3c:01 snmp_devices: + - hostname: kiehlufer-switch + address: 10.31.82.210 + snmp_profile: swos_lite - hostname: kiehlufer-rhnk address: 10.31.82.211 diff --git a/locations/kirchhof.yml b/locations/kirchhof.yml index 860ac8669..00863d6bc 100644 --- a/locations/kirchhof.yml +++ b/locations/kirchhof.yml @@ -7,19 +7,6 @@ longitude: 13.44337 contact_nickname: Stadtfunk gGmbH contacts: - noc@stadtfunk.net -location__ssh_keys__to_merge: - - comment: pktpls@systemli.org - key: ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINVY2XHiLDXbj7TGWtUpKEb8+qKw/DrkiVbLiyvyRaCi - - comment: Hener - key: ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEST9QsXtphN7BYb5p9FhxZTxvoWkICfRWC54SN/QHII - - comment: Lino - key: ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOaljQHr4Nj6veeDi51BZjy/a3WXP - -# 10.31.183.128/28 - mgmt - vlan 42 -# 10.31.183.144/28 - mesh - vlan 20, 50 -# 10.31.183.160/27 - privdhcp - vlan 41 untagged -# 10.31.183.192/26 - dhcp - vlan 40 -ipv6_prefix: 2001:bf7:820:2300::/56 hosts: @@ -50,6 +37,17 @@ hosts: mac_override: {eth0: 2c:c8:1b:8a:96:28} wireless_profile: freifunk_default +snmp_devices: + - hostname: kirchhof-switch + address: 10.31.147.130 + snmp_profile: edgeswitch + +# 10.31.183.128/28 - mgmt - vlan 42 +# 10.31.183.144/28 - mesh - vlan 20, 50 +# 10.31.183.160/27 - privdhcp - vlan 41 untagged +# 10.31.183.192/26 - dhcp - vlan 40 +ipv6_prefix: 2001:bf7:820:2300::/56 + networks: - vid: 20 diff --git a/locations/klunker.yml b/locations/klunker.yml index b785673af..e4d2cf91e 100644 --- a/locations/klunker.yml +++ b/locations/klunker.yml @@ -1,5 +1,4 @@ --- - location: klunker location_nice: Klunkerkranich latitude: 52.4819617 @@ -8,7 +7,6 @@ altitude: 63 community: true hosts: - - hostname: klunker-core role: corerouter model: "avm_fritzbox-4040" @@ -33,9 +31,14 @@ hosts: eth0: cc:2d:e0:9c:4f:00 snmp_devices: + - hostname: klunker-switch + address: 10.31.191.178 + snmp_profile: edgeswitch + - hostname: klunker-rhnk address: 10.31.191.179 snmp_profile: mikrotik_60g + - hostname: klunker-philmel address: 10.31.191.180 snmp_profile: af60 diff --git a/locations/l105.yml b/locations/l105.yml index 3650a3475..0e366d1ae 100644 --- a/locations/l105.yml +++ b/locations/l105.yml @@ -1,5 +1,4 @@ --- - location: l105 location_nice: Lützowstraße 105 latitude: 52.502040 @@ -8,7 +7,6 @@ altitude: 62 community: true hosts: - - hostname: l105-gw role: gateway model: "x86-64" @@ -16,6 +14,21 @@ hosts: l105__disabled_services__to_merge: - "bird" +snmp_devices: + - hostname: l105-poe + address: 10.31.127.130 + snmp_profile: edgeswitch + + - hostname: l105-rhxb + address: 10.31.127.131 + snmp_profile: af60 + + # tub is not existent as of 02/24 + # - hostname: l105-tu + # adress: 10.31.127.132 + # snmp_profile: af60 + + # L105 got following prefixes: # Router: 10.31.127.128/25 2001:bf7:750:3f00::/56 # --MGMT: 10.31.127.128/27 @@ -38,9 +51,9 @@ mgmt: ipv6: 2001:bf7:750:3f00::/64 assignments: l105-gw: 1 # .129 - l105-poe: 2 # .130 poe - l105-rhxb: 3 # .131 mesh_rhxb - l105-tu: 4 # .132 mesh_tu + l105-poe: 2 # .130 + l105-rhxb: 3 # .131 + # l105-tu: 4 # .132 # Mesh Network: 10.31.127.160/27 mesh_links: @@ -51,12 +64,12 @@ mesh_links: metric: 128 ptp: true - - name: mesh_tu - ifname: eth1.11 - ipv4: 10.31.127.161/32 - ipv6: 2001:bf7:750:3f01::2/128 - metric: 128 - ptp: true + # - name: mesh_tu + # ifname: eth1.11 + # ipv4: 10.31.127.161/32 + # ipv6: 2001:bf7:750:3f01::2/128 + # metric: 128 + # ptp: true - name: mesh_bbbvpn ifname: eth1.32 diff --git a/locations/l5.yml b/locations/l5.yml index cab6d298d..c38d514af 100644 --- a/locations/l5.yml +++ b/locations/l5.yml @@ -9,7 +9,6 @@ contacts: - noc@stadtfunk.net hosts: - - hostname: l5-core role: corerouter model: "avm_fritzbox-4040" @@ -27,6 +26,11 @@ hosts: mac_override: eth0: dc:2c:6e:c4:35:e9 +snmp_devices: + - hostname: l5-switch + address: 10.31.161.162 + snmp_profile: edgeswitch + # 10.31.161.160/29 - mgmt # 10.31.191.160/29 - mesh # 10.31.194.0/25 - dhcp @@ -34,7 +38,6 @@ hosts: ipv6_prefix: "2001:bf7:830:b600::/56" networks: - - vid: 40 role: dhcp name: dhcp diff --git a/locations/ohlauer.yml b/locations/ohlauer.yml index 2b26abc76..81796cf16 100644 --- a/locations/ohlauer.yml +++ b/locations/ohlauer.yml @@ -13,6 +13,15 @@ hosts: role: gateway model: "ubnt_edgerouter-4" +snmp_devices: + - hostname: ohlauer-switch + address: 10.31.166.250 + snmp_profile: edgerouter + + - hostname: ohlauer-emma + address: 10.31.166.251 + snmp_profile: mikrotik_60g + ipv6_prefix: 2001:bf7:830:8300::/56 # mgmt: 10.31.166.248/29 diff --git a/locations/saarbruecker.yml b/locations/saarbruecker.yml index a7f1f04bc..2af8ea4f9 100644 --- a/locations/saarbruecker.yml +++ b/locations/saarbruecker.yml @@ -1,5 +1,4 @@ --- - location: saarbruecker location_nice: Saarbrücker latitude: 52.5283930134242 @@ -7,11 +6,28 @@ longitude: 13.41561550087894 community: true hosts: - - hostname: saarbruecker-gw role: gateway model: "ubnt_edgerouter-4" +snmp_devices: + - hostname: saarbruecker-sw + address: 10.31.83.50 + snmp_profile: edgerouter + + - hostname: saarbruecker-hds + address: 10.31.83.51 + snmp_profile: mikrotik_60g + + - hostname: saarbruecker-sama + address: 10.31.83.52 + snmp_profile: af60 + + # Despite being a 60GHz devices the SNMP-data that is reported is in the same format as the airmax devices + - hostname: saarbruecker-segen + address: 10.31.83.53 + snmp_profile: airos_8 + ipv6_prefix: 2001:bf7:760:2201::/56 uplink: diff --git a/locations/sama.yml b/locations/sama.yml index ca1c4986d..fa816e339 100644 --- a/locations/sama.yml +++ b/locations/sama.yml @@ -38,6 +38,14 @@ hosts: eth0: 08:55:31:54:63:06 snmp_devices: + - hostname: sama-poe-1 + address: 10.31.81.2 + snmp_profile: edgeswitch + + - hostname: sama-poe-2 + address: 10.31.81.3 + snmp_profile: edgeswitch + - hostname: sama-nord-5ghz address: 10.31.81.20 snmp_profile: airos_8 @@ -58,10 +66,6 @@ snmp_devices: address: 10.31.81.26 snmp_profile: af60 - - hostname: saarbruecker-sama - address: 10.31.83.52 - snmp_profile: af60 - - hostname: sama-saarbruecker address: 10.31.81.30 snmp_profile: af60 diff --git a/locations/segen.yml b/locations/segen.yml index cda4623cb..449e3ed08 100644 --- a/locations/segen.yml +++ b/locations/segen.yml @@ -32,10 +32,14 @@ hosts: model: ubnt_nanostation-m2_xm snmp_devices: - # TODO: Create a Gigabeam LR SNMP profile and use it for segen-saarbr - # - hostname: segen-saarbr - # address: 10.31.6.10 - # snmp_profile: airos_8 + - hostname: segen-switch + address: 10.31.6.2 + snmp_profile: edgeswitch + + # Despite being a 60GHz devices the SNMP-data that is reported is in the same format as the airmax devices + - hostname: segen-saarbr + address: 10.31.6.10 + snmp_profile: airos_8 - hostname: segen-f2a address: 10.31.6.11 diff --git a/locations/strom.yml b/locations/strom.yml index 8948940fa..a10fca8aa 100644 --- a/locations/strom.yml +++ b/locations/strom.yml @@ -25,6 +25,9 @@ hosts: - ethtool -K eth0 tx off rx off snmp_devices: + - hostname: strom-poe + address: 10.31.130.66 + snmp_profile: tplink - hostname: strom-perleberger address: 10.31.130.67