Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Treewide: Add snmp monitoring for some switches #760

Merged
merged 24 commits into from
Feb 8, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
99908a0
agym: added monitoring for switch
FFHener Feb 4, 2024
0159b9b
snmp_profiles: add tplink-switches
FFHener Feb 4, 2024
556264f
chris: added monitoring for switch
FFHener Feb 4, 2024
f04759b
dorfplatz: added monitoring for switch
FFHener Feb 4, 2024
738e7f7
dtmb: added monitoring for switch
FFHener Feb 4, 2024
7966256
emma: added monitoring for switch
FFHener Feb 4, 2024
c1c94e2
gruni73: added monitoring for switch
FFHener Feb 4, 2024
edaf464
j41: added monitoring for switch
FFHener Feb 4, 2024
496bfe1
jup: added monitoring for switch
FFHener Feb 4, 2024
748a37e
kiehlufer: added monitoring for switch
FFHener Feb 4, 2024
a4f80a7
kirchhof: remove old ssh-keys
FFHener Feb 4, 2024
60f5caa
kirchhof: added monitoring for switch
FFHener Feb 4, 2024
791641f
l5: added monitoring for switch
FFHener Feb 4, 2024
74a4da6
klunker: added monitoring for switch
FFHener Feb 4, 2024
868f966
snmp_profiles: add edgerouter
FFHener Feb 4, 2024
35dd9e4
ohlauer: add snmp-monitoring
FFHener Feb 4, 2024
83cc165
l105: add snmp-monitoring
FFHener Feb 5, 2024
63ef2f1
snmp_profiles: added comment regarding errors that may appear
FFHener Feb 5, 2024
3a1ad69
saarbruecker: added snmp monitoring
FFHener Feb 5, 2024
92f98b8
strom: add monitoring for switch
FFHener Feb 5, 2024
5e0fd01
segen: add monitoring for switch and segen-saarbr
FFHener Feb 5, 2024
5a74571
sama: monitoring: added switches, removed saarbr monitoring
FFHener Feb 5, 2024
8a414a8
emma: remove monitoring from other locations
FFHener Feb 5, 2024
31d709f
l105: removed tu
FFHener Feb 8, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 56 additions & 0 deletions group_vars/all/snmp_profiles.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
4 changes: 4 additions & 0 deletions locations/agym.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 4 additions & 0 deletions locations/chris.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 4 additions & 0 deletions locations/dorfplatz.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 8 additions & 0 deletions locations/dtmb.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
27 changes: 23 additions & 4 deletions locations/emma.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 4 additions & 0 deletions locations/gruni73.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 4 additions & 0 deletions locations/j41.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
11 changes: 11 additions & 0 deletions locations/jup.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 3 additions & 0 deletions locations/kiehlufer.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
24 changes: 11 additions & 13 deletions locations/kirchhof.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:

Expand Down Expand Up @@ -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
Expand Down
7 changes: 5 additions & 2 deletions locations/klunker.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
---

location: klunker
location_nice: Klunkerkranich
latitude: 52.4819617
Expand All @@ -8,7 +7,6 @@ altitude: 63
community: true

hosts:

- hostname: klunker-core
role: corerouter
model: "avm_fritzbox-4040"
Expand All @@ -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
Expand Down
35 changes: 24 additions & 11 deletions locations/l105.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
---

location: l105
location_nice: Lützowstraße 105
latitude: 52.502040
Expand All @@ -8,14 +7,28 @@ altitude: 62
community: true

hosts:

- hostname: l105-gw
role: gateway
model: "x86-64"
image_search_pattern: "*-ext4-combined.img*"
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
Expand All @@ -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:
Expand All @@ -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
Expand Down
Loading
Loading