From f38451f6c0e9819096eb4e5193fda855d8472efc Mon Sep 17 00:00:00 2001 From: Ffhener Date: Thu, 24 Oct 2024 01:31:34 +0200 Subject: [PATCH 1/9] model: add flag for os Set all to openwrt for now. This can be used in the future for proprietary devices --- group_vars/model_avm_fritzbox_4040.yml | 1 + group_vars/model_avm_fritzbox_7530.yml | 1 + group_vars/model_avm_fritzrepeater_3000.yml | 1 + group_vars/model_bananapi_bpi_r2.yml | 1 + group_vars/model_bananapi_bpi_r64.yml | 1 + group_vars/model_cudy_ap3000outdoor_v1.yml | 1 + group_vars/model_cudy_x6_v1.yml | 1 + group_vars/model_dlink_covr_x1860_a1.yml | 1 + group_vars/model_dlink_dap_x1860_a1.yml | 1 + group_vars/model_glinet_gl_b1300.yml | 1 + group_vars/model_glinet_gl_mt1300.yml | 1 + group_vars/model_glinet_gl_mt3000.yml | 1 + group_vars/model_glinet_gl_mt6000.yml | 1 + group_vars/model_linksys_e8450_ubi.yml | 1 + group_vars/model_mikrotik_routerboard_750gr3.yml | 1 + group_vars/model_mikrotik_routerboard_760igs.yml | 1 + group_vars/model_mikrotik_routerboard_wap_g_5hact2hnd.yml | 1 + group_vars/model_mikrotik_sxtsq_2_lite.yml | 1 + group_vars/model_mikrotik_sxtsq_5_ac.yml | 1 + group_vars/model_mikrotik_wap_ac.yml | 1 + group_vars/model_netgear_wax202.yml | 1 + group_vars/model_netgear_wax220.yml | 1 + group_vars/model_siemens_ws_ap3610.yml | 1 + group_vars/model_totolink_a7000r.yml | 1 + group_vars/model_tplink_archer_a7_v5.yml | 1 + group_vars/model_tplink_archer_c50_v3.yml | 1 + group_vars/model_tplink_archer_c5_v1.yml | 1 + group_vars/model_tplink_archer_c6_v2.yml | 1 + group_vars/model_tplink_archer_c7_v2.yml | 1 + group_vars/model_tplink_archer_c7_v4.yml | 1 + group_vars/model_tplink_archer_c7_v5.yml | 1 + group_vars/model_tplink_cpe210_v1.yml | 1 + group_vars/model_tplink_cpe510_v1.yml | 1 + group_vars/model_tplink_eap225_outdoor_v1.yml | 1 + group_vars/model_tplink_tl_wdr3500_v1.yml | 1 + group_vars/model_tplink_tl_wdr3600_v1.yml | 1 + group_vars/model_tplink_tl_wdr4300_v1.yml | 1 + group_vars/model_tplink_tl_wdr4900_v1.yml | 1 + group_vars/model_tplink_tl_wr842n_v3.yml | 1 + group_vars/model_ubnt_bullet_m2_ar7241.yml | 1 + group_vars/model_ubnt_bullet_m5_ar7241.yml | 1 + group_vars/model_ubnt_edgerouter_4.yml | 1 + group_vars/model_ubnt_edgerouter_x.yml | 1 + group_vars/model_ubnt_edgerouter_x_sfp.yml | 1 + group_vars/model_ubnt_nanobeam_ac_xc.yml | 1 + group_vars/model_ubnt_nanostation_ac_loco.yml | 1 + group_vars/model_ubnt_nanostation_loco_m2_xm.yml | 1 + group_vars/model_ubnt_nanostation_loco_m5_xm.yml | 1 + group_vars/model_ubnt_nanostation_loco_m5_xw.yml | 1 + group_vars/model_ubnt_nanostation_m2_xm.yml | 1 + group_vars/model_ubnt_nanostation_m5_xm.yml | 1 + group_vars/model_ubnt_nanostation_m5_xw.yml | 1 + group_vars/model_ubnt_powerbeam_m5_xw.yml | 1 + group_vars/model_ubnt_rocket_5ac_lite.yml | 1 + group_vars/model_ubnt_uk_ultra.yml | 1 + group_vars/model_ubnt_unifi_6_lite.yml | 1 + group_vars/model_ubnt_unifiac_lite.yml | 1 + group_vars/model_ubnt_unifiac_mesh.yml | 1 + group_vars/model_ubnt_unifiac_pro.yml | 1 + group_vars/model_ubnt_usw_flex.yml | 1 + group_vars/model_x86_64.yml | 1 + group_vars/model_xiaomi_mi_router_3g_v2.yml | 1 + group_vars/model_zyxel_nbg6617.yml | 1 + group_vars/model_zyxel_nwa50ax.yml | 1 + group_vars/model_zyxel_nwa55axe.yml | 1 + 65 files changed, 65 insertions(+) diff --git a/group_vars/model_avm_fritzbox_4040.yml b/group_vars/model_avm_fritzbox_4040.yml index 53d8df8f2..6ae62c95c 100644 --- a/group_vars/model_avm_fritzbox_4040.yml +++ b/group_vars/model_avm_fritzbox_4040.yml @@ -1,5 +1,6 @@ --- target: ipq40xx/generic +os: openwrt brand_nice: AVM model_nice: FRITZ!Box 4040 diff --git a/group_vars/model_avm_fritzbox_7530.yml b/group_vars/model_avm_fritzbox_7530.yml index f26f8719d..bcd94bbb9 100644 --- a/group_vars/model_avm_fritzbox_7530.yml +++ b/group_vars/model_avm_fritzbox_7530.yml @@ -1,5 +1,6 @@ --- target: ipq40xx/generic +os: openwrt brand_nice: AVM model_nice: FRITZ!Box 7530 diff --git a/group_vars/model_avm_fritzrepeater_3000.yml b/group_vars/model_avm_fritzrepeater_3000.yml index 036ffbe73..7f2ef01ec 100644 --- a/group_vars/model_avm_fritzrepeater_3000.yml +++ b/group_vars/model_avm_fritzrepeater_3000.yml @@ -1,5 +1,6 @@ --- target: ipq40xx/generic +os: openwrt brand_nice: AVM model_nice: FRITZ!Repeater 3000 diff --git a/group_vars/model_bananapi_bpi_r2.yml b/group_vars/model_bananapi_bpi_r2.yml index 59fa50aab..765b39aea 100644 --- a/group_vars/model_bananapi_bpi_r2.yml +++ b/group_vars/model_bananapi_bpi_r2.yml @@ -1,5 +1,6 @@ --- target: mediatek/mt7623 +os: openwrt brand_nice: Sinovoip model_nice: Banana Pi R2 version_nice: 1.2 diff --git a/group_vars/model_bananapi_bpi_r64.yml b/group_vars/model_bananapi_bpi_r64.yml index 6381cd8df..817bec564 100644 --- a/group_vars/model_bananapi_bpi_r64.yml +++ b/group_vars/model_bananapi_bpi_r64.yml @@ -1,5 +1,6 @@ --- target: mediatek/mt7622 +os: openwrt brand_nice: Sinovoip model_nice: Banana Pi R64 diff --git a/group_vars/model_cudy_ap3000outdoor_v1.yml b/group_vars/model_cudy_ap3000outdoor_v1.yml index 4da838786..e6ce3ba57 100644 --- a/group_vars/model_cudy_ap3000outdoor_v1.yml +++ b/group_vars/model_cudy_ap3000outdoor_v1.yml @@ -1,5 +1,6 @@ --- target: mediatek/filogic +os: openwrt openwrt_version: snapshot brand_nice: Cudy model_nice: AP3000 Outdoor v1 diff --git a/group_vars/model_cudy_x6_v1.yml b/group_vars/model_cudy_x6_v1.yml index cfd476b30..1229bd6f3 100644 --- a/group_vars/model_cudy_x6_v1.yml +++ b/group_vars/model_cudy_x6_v1.yml @@ -1,5 +1,6 @@ --- target: ramips/mt7621 +os: openwrt brand_nice: Cudy model_nice: X6 version_nice: v1 diff --git a/group_vars/model_dlink_covr_x1860_a1.yml b/group_vars/model_dlink_covr_x1860_a1.yml index 44b9bd2ea..2c6391570 100644 --- a/group_vars/model_dlink_covr_x1860_a1.yml +++ b/group_vars/model_dlink_covr_x1860_a1.yml @@ -1,5 +1,6 @@ --- target: ramips/mt7621 +os: openwrt brand_nice: D-Link model_nice: COVR-X1860 version_nice: A1 diff --git a/group_vars/model_dlink_dap_x1860_a1.yml b/group_vars/model_dlink_dap_x1860_a1.yml index 90e9f756f..40685c0a6 100644 --- a/group_vars/model_dlink_dap_x1860_a1.yml +++ b/group_vars/model_dlink_dap_x1860_a1.yml @@ -1,5 +1,6 @@ --- target: ramips/mt7621 +os: openwrt brand_nice: D-Link model_nice: DAP-X1860 version_nice: A1 diff --git a/group_vars/model_glinet_gl_b1300.yml b/group_vars/model_glinet_gl_b1300.yml index 1c0386431..79e889815 100644 --- a/group_vars/model_glinet_gl_b1300.yml +++ b/group_vars/model_glinet_gl_b1300.yml @@ -1,5 +1,6 @@ --- target: ipq40xx/generic +os: openwrt brand_nice: GL.iNet model_nice: GL-B1300 diff --git a/group_vars/model_glinet_gl_mt1300.yml b/group_vars/model_glinet_gl_mt1300.yml index a4836817a..ebcb5b92b 100644 --- a/group_vars/model_glinet_gl_mt1300.yml +++ b/group_vars/model_glinet_gl_mt1300.yml @@ -1,5 +1,6 @@ --- target: ramips/mt7621 +os: openwrt brand_nice: GL.iNet model_nice: GL-MT1300 (Beryl) version_nice: v1 diff --git a/group_vars/model_glinet_gl_mt3000.yml b/group_vars/model_glinet_gl_mt3000.yml index c4cb4cde8..db7e3e6a4 100644 --- a/group_vars/model_glinet_gl_mt3000.yml +++ b/group_vars/model_glinet_gl_mt3000.yml @@ -1,5 +1,6 @@ --- target: "mediatek/filogic" +os: openwrt brand_nice: GL.iNet model_nice: GL-MT3000 (Beryl AX) diff --git a/group_vars/model_glinet_gl_mt6000.yml b/group_vars/model_glinet_gl_mt6000.yml index e080c4cfe..a8b95c44a 100644 --- a/group_vars/model_glinet_gl_mt6000.yml +++ b/group_vars/model_glinet_gl_mt6000.yml @@ -1,5 +1,6 @@ --- target: "mediatek/filogic" +os: openwrt brand_nice: GL.iNet model_nice: GL-MT6000 (Flint 2) diff --git a/group_vars/model_linksys_e8450_ubi.yml b/group_vars/model_linksys_e8450_ubi.yml index 029d2f6a4..6c1cc1d97 100644 --- a/group_vars/model_linksys_e8450_ubi.yml +++ b/group_vars/model_linksys_e8450_ubi.yml @@ -1,5 +1,6 @@ --- target: mediatek/mt7622 +os: openwrt brand_nice: Belkin model_nice: RT3200 diff --git a/group_vars/model_mikrotik_routerboard_750gr3.yml b/group_vars/model_mikrotik_routerboard_750gr3.yml index b7f6769cd..395effb30 100644 --- a/group_vars/model_mikrotik_routerboard_750gr3.yml +++ b/group_vars/model_mikrotik_routerboard_750gr3.yml @@ -1,5 +1,6 @@ --- target: ramips/mt7621 +os: openwrt brand_nice: MikroTik model_nice: hEX diff --git a/group_vars/model_mikrotik_routerboard_760igs.yml b/group_vars/model_mikrotik_routerboard_760igs.yml index 734e21fb1..a680cd3e6 100644 --- a/group_vars/model_mikrotik_routerboard_760igs.yml +++ b/group_vars/model_mikrotik_routerboard_760igs.yml @@ -1,5 +1,6 @@ --- target: ramips/mt7621 +os: openwrt brand_nice: MikroTik model_nice: hEX S diff --git a/group_vars/model_mikrotik_routerboard_wap_g_5hact2hnd.yml b/group_vars/model_mikrotik_routerboard_wap_g_5hact2hnd.yml index bd4042aa8..1a322a6e3 100644 --- a/group_vars/model_mikrotik_routerboard_wap_g_5hact2hnd.yml +++ b/group_vars/model_mikrotik_routerboard_wap_g_5hact2hnd.yml @@ -1,6 +1,7 @@ --- override_target: "mikrotik_routerboard-wap-g-5hact2hnd" target: ath79/mikrotik +os: openwrt brand_nice: MikroTik model_nice: wAP AC diff --git a/group_vars/model_mikrotik_sxtsq_2_lite.yml b/group_vars/model_mikrotik_sxtsq_2_lite.yml index ffb45531c..0701bf792 100644 --- a/group_vars/model_mikrotik_sxtsq_2_lite.yml +++ b/group_vars/model_mikrotik_sxtsq_2_lite.yml @@ -1,6 +1,7 @@ --- override_target: "mikrotik_routerboard-lhg-2nd" target: ath79/mikrotik +os: openwrt brand_nice: MikroTik model_nice: SXTsq Lite2 diff --git a/group_vars/model_mikrotik_sxtsq_5_ac.yml b/group_vars/model_mikrotik_sxtsq_5_ac.yml index a7469b77b..cfc8597a5 100644 --- a/group_vars/model_mikrotik_sxtsq_5_ac.yml +++ b/group_vars/model_mikrotik_sxtsq_5_ac.yml @@ -1,5 +1,6 @@ --- target: ipq40xx/mikrotik +os: openwrt brand_nice: MikroTik model_nice: SXTsq 5 ac diff --git a/group_vars/model_mikrotik_wap_ac.yml b/group_vars/model_mikrotik_wap_ac.yml index 0b8f36683..b20391f46 100644 --- a/group_vars/model_mikrotik_wap_ac.yml +++ b/group_vars/model_mikrotik_wap_ac.yml @@ -1,5 +1,6 @@ --- target: ipq40xx/mikrotik +os: openwrt brand_nice: MikroTik model_nice: wAP AC version_nice: Rev 2 (2022-) diff --git a/group_vars/model_netgear_wax202.yml b/group_vars/model_netgear_wax202.yml index c3b488883..5393965c9 100644 --- a/group_vars/model_netgear_wax202.yml +++ b/group_vars/model_netgear_wax202.yml @@ -1,5 +1,6 @@ --- target: ramips/mt7621 +os: openwrt brand_nice: NETGEAR model_nice: WAX202 diff --git a/group_vars/model_netgear_wax220.yml b/group_vars/model_netgear_wax220.yml index 02640c5cc..9ec169fd0 100644 --- a/group_vars/model_netgear_wax220.yml +++ b/group_vars/model_netgear_wax220.yml @@ -1,5 +1,6 @@ --- target: mediatek/filogic +os: openwrt brand_nice: NETGEAR model_nice: WAX220 int_port: eth0 diff --git a/group_vars/model_siemens_ws_ap3610.yml b/group_vars/model_siemens_ws_ap3610.yml index 5b248d0f3..98a87278b 100644 --- a/group_vars/model_siemens_ws_ap3610.yml +++ b/group_vars/model_siemens_ws_ap3610.yml @@ -1,5 +1,6 @@ --- target: ath79/generic +os: openwrt brand_nice: Siemens model_nice: WS-AP3610 diff --git a/group_vars/model_totolink_a7000r.yml b/group_vars/model_totolink_a7000r.yml index 4b37e624d..7a8aba429 100644 --- a/group_vars/model_totolink_a7000r.yml +++ b/group_vars/model_totolink_a7000r.yml @@ -1,5 +1,6 @@ --- target: ramips/mt7621 +os: openwrt brand_nice: TOTOLINK model_nice: A7000R diff --git a/group_vars/model_tplink_archer_a7_v5.yml b/group_vars/model_tplink_archer_a7_v5.yml index 1e2f7a937..893b5c92c 100644 --- a/group_vars/model_tplink_archer_a7_v5.yml +++ b/group_vars/model_tplink_archer_a7_v5.yml @@ -1,5 +1,6 @@ --- target: ath79/generic +os: openwrt brand_nice: TP-Link model_nice: Archer C7 version_nice: v5 diff --git a/group_vars/model_tplink_archer_c50_v3.yml b/group_vars/model_tplink_archer_c50_v3.yml index 0f89ea174..817a7a072 100644 --- a/group_vars/model_tplink_archer_c50_v3.yml +++ b/group_vars/model_tplink_archer_c50_v3.yml @@ -1,5 +1,6 @@ --- target: ramips/mt76x8 +os: openwrt brand_nice: TP-Link model_nice: Archer C50 version_nice: v3 diff --git a/group_vars/model_tplink_archer_c5_v1.yml b/group_vars/model_tplink_archer_c5_v1.yml index f819fdfd9..c1a89e579 100644 --- a/group_vars/model_tplink_archer_c5_v1.yml +++ b/group_vars/model_tplink_archer_c5_v1.yml @@ -1,5 +1,6 @@ --- target: ath79/generic +os: openwrt brand_nice: TP-Link model_nice: Archer C5 version_nice: v1 diff --git a/group_vars/model_tplink_archer_c6_v2.yml b/group_vars/model_tplink_archer_c6_v2.yml index 9bb842170..6d3e6b79d 100644 --- a/group_vars/model_tplink_archer_c6_v2.yml +++ b/group_vars/model_tplink_archer_c6_v2.yml @@ -1,5 +1,6 @@ --- target: ath79/generic +os: openwrt brand_nice: TP-Link model_nice: Archer C6 version_nice: v2 diff --git a/group_vars/model_tplink_archer_c7_v2.yml b/group_vars/model_tplink_archer_c7_v2.yml index 8ab948edb..cf414dc30 100644 --- a/group_vars/model_tplink_archer_c7_v2.yml +++ b/group_vars/model_tplink_archer_c7_v2.yml @@ -1,5 +1,6 @@ --- target: ath79/generic +os: openwrt brand_nice: TP-Link model_nice: Archer C7 version_nice: v2, v2.1 diff --git a/group_vars/model_tplink_archer_c7_v4.yml b/group_vars/model_tplink_archer_c7_v4.yml index a119a7abc..f2338d302 100644 --- a/group_vars/model_tplink_archer_c7_v4.yml +++ b/group_vars/model_tplink_archer_c7_v4.yml @@ -1,5 +1,6 @@ --- target: ath79/generic +os: openwrt model__packages__to_merge: - "-kmod-ath10k-ct -ath10k-firmware-qca988x-ct" diff --git a/group_vars/model_tplink_archer_c7_v5.yml b/group_vars/model_tplink_archer_c7_v5.yml index 4bb730f8a..f77a79aab 100644 --- a/group_vars/model_tplink_archer_c7_v5.yml +++ b/group_vars/model_tplink_archer_c7_v5.yml @@ -1,5 +1,6 @@ --- target: ath79/generic +os: openwrt brand_nice: TP-Link model_nice: Archer C7 version_nice: v5 diff --git a/group_vars/model_tplink_cpe210_v1.yml b/group_vars/model_tplink_cpe210_v1.yml index de356fa60..f4a339b76 100644 --- a/group_vars/model_tplink_cpe210_v1.yml +++ b/group_vars/model_tplink_cpe210_v1.yml @@ -1,5 +1,6 @@ --- target: ath79/generic +os: openwrt brand_nice: TP-Link model_nice: CPE210 version_nice: v1 diff --git a/group_vars/model_tplink_cpe510_v1.yml b/group_vars/model_tplink_cpe510_v1.yml index 4690af738..9cca8c36c 100644 --- a/group_vars/model_tplink_cpe510_v1.yml +++ b/group_vars/model_tplink_cpe510_v1.yml @@ -1,5 +1,6 @@ --- target: ath79/generic +os: openwrt brand_nice: TP-Link model_nice: CPE510 version_nice: v1 diff --git a/group_vars/model_tplink_eap225_outdoor_v1.yml b/group_vars/model_tplink_eap225_outdoor_v1.yml index 33744b569..f2c3c0566 100644 --- a/group_vars/model_tplink_eap225_outdoor_v1.yml +++ b/group_vars/model_tplink_eap225_outdoor_v1.yml @@ -1,5 +1,6 @@ --- target: ath79/generic +os: openwrt brand_nice: TP-Link model_nice: EAP225 version_nice: v1 diff --git a/group_vars/model_tplink_tl_wdr3500_v1.yml b/group_vars/model_tplink_tl_wdr3500_v1.yml index 4c65d94f0..a805b8507 100644 --- a/group_vars/model_tplink_tl_wdr3500_v1.yml +++ b/group_vars/model_tplink_tl_wdr3500_v1.yml @@ -1,5 +1,6 @@ --- target: ath79/generic +os: openwrt brand_nice: TP-Link model_nice: WDR3500 version_nice: v1 diff --git a/group_vars/model_tplink_tl_wdr3600_v1.yml b/group_vars/model_tplink_tl_wdr3600_v1.yml index c96bbd61c..212af4619 100644 --- a/group_vars/model_tplink_tl_wdr3600_v1.yml +++ b/group_vars/model_tplink_tl_wdr3600_v1.yml @@ -1,5 +1,6 @@ --- target: ath79/generic +os: openwrt brand_nice: TP-Link model_nice: WDR3600 version_nice: v1 diff --git a/group_vars/model_tplink_tl_wdr4300_v1.yml b/group_vars/model_tplink_tl_wdr4300_v1.yml index 772d317de..8f0da1f4e 100644 --- a/group_vars/model_tplink_tl_wdr4300_v1.yml +++ b/group_vars/model_tplink_tl_wdr4300_v1.yml @@ -1,5 +1,6 @@ --- target: ath79/generic +os: openwrt brand_nice: TP-Link model_nice: WDR4300 version_nice: v1 diff --git a/group_vars/model_tplink_tl_wdr4900_v1.yml b/group_vars/model_tplink_tl_wdr4900_v1.yml index 3c8c487d1..edad4e72f 100644 --- a/group_vars/model_tplink_tl_wdr4900_v1.yml +++ b/group_vars/model_tplink_tl_wdr4900_v1.yml @@ -1,5 +1,6 @@ --- target: mpc85xx/p1010 +os: openwrt brand_nice: TP-Link model_nice: WDR4900 version_nice: v1 diff --git a/group_vars/model_tplink_tl_wr842n_v3.yml b/group_vars/model_tplink_tl_wr842n_v3.yml index 9938f7575..6315a37aa 100644 --- a/group_vars/model_tplink_tl_wr842n_v3.yml +++ b/group_vars/model_tplink_tl_wr842n_v3.yml @@ -1,5 +1,6 @@ --- target: ath79/generic +os: openwrt brand_nice: TP-Link model_nice: TL-WR842N version_nice: v3 diff --git a/group_vars/model_ubnt_bullet_m2_ar7241.yml b/group_vars/model_ubnt_bullet_m2_ar7241.yml index 0aa7f7112..d1da79db1 100644 --- a/group_vars/model_ubnt_bullet_m2_ar7241.yml +++ b/group_vars/model_ubnt_bullet_m2_ar7241.yml @@ -1,6 +1,7 @@ --- override_target: "ubnt_bullet-m-ar7241" target: ath79/tiny +os: openwrt brand_nice: Ubiquiti model_nice: Bullet M2 version_nice: XM diff --git a/group_vars/model_ubnt_bullet_m5_ar7241.yml b/group_vars/model_ubnt_bullet_m5_ar7241.yml index 915cc841a..2be6803df 100644 --- a/group_vars/model_ubnt_bullet_m5_ar7241.yml +++ b/group_vars/model_ubnt_bullet_m5_ar7241.yml @@ -1,6 +1,7 @@ --- override_target: "ubnt_bullet-m-ar7241" target: ath79/tiny +os: openwrt brand_nice: Ubiquiti model_nice: Bullet M5 version_nice: XM diff --git a/group_vars/model_ubnt_edgerouter_4.yml b/group_vars/model_ubnt_edgerouter_4.yml index 0a56114ec..5b67cc532 100644 --- a/group_vars/model_ubnt_edgerouter_4.yml +++ b/group_vars/model_ubnt_edgerouter_4.yml @@ -1,5 +1,6 @@ --- target: octeon/generic +os: openwrt brand_nice: Ubiquiti model_nice: EdgeRouter 4 diff --git a/group_vars/model_ubnt_edgerouter_x.yml b/group_vars/model_ubnt_edgerouter_x.yml index d0b7f2c57..c454d62c9 100644 --- a/group_vars/model_ubnt_edgerouter_x.yml +++ b/group_vars/model_ubnt_edgerouter_x.yml @@ -1,5 +1,6 @@ --- target: ramips/mt7621 +os: openwrt brand_nice: Ubiquiti model_nice: EdgeRouter X diff --git a/group_vars/model_ubnt_edgerouter_x_sfp.yml b/group_vars/model_ubnt_edgerouter_x_sfp.yml index fa4d77b50..8c694ccbd 100644 --- a/group_vars/model_ubnt_edgerouter_x_sfp.yml +++ b/group_vars/model_ubnt_edgerouter_x_sfp.yml @@ -1,5 +1,6 @@ --- target: ramips/mt7621 +os: openwrt brand_nice: Ubiquiti model_nice: EdgeRouter X SFP diff --git a/group_vars/model_ubnt_nanobeam_ac_xc.yml b/group_vars/model_ubnt_nanobeam_ac_xc.yml index b0616bc7e..2b8a3bf6b 100644 --- a/group_vars/model_ubnt_nanobeam_ac_xc.yml +++ b/group_vars/model_ubnt_nanobeam_ac_xc.yml @@ -1,5 +1,6 @@ --- target: ath79/generic +os: openwrt brand_nice: Ubiquiti model_nice: Nanobeam 5AC version_nice: XC diff --git a/group_vars/model_ubnt_nanostation_ac_loco.yml b/group_vars/model_ubnt_nanostation_ac_loco.yml index 807ec5e55..f861eeffb 100644 --- a/group_vars/model_ubnt_nanostation_ac_loco.yml +++ b/group_vars/model_ubnt_nanostation_ac_loco.yml @@ -1,5 +1,6 @@ --- target: ath79/generic +os: openwrt brand_nice: Ubiquiti model_nice: Nanostation AC Loco diff --git a/group_vars/model_ubnt_nanostation_loco_m2_xm.yml b/group_vars/model_ubnt_nanostation_loco_m2_xm.yml index 7c3bf46c4..519d2b2a1 100644 --- a/group_vars/model_ubnt_nanostation_loco_m2_xm.yml +++ b/group_vars/model_ubnt_nanostation_loco_m2_xm.yml @@ -1,6 +1,7 @@ --- override_target: "ubnt_nanostation-loco-m" target: ath79/tiny +os: openwrt brand_nice: Ubiquiti model_nice: Nanostation Loco M2 version_nice: XM diff --git a/group_vars/model_ubnt_nanostation_loco_m5_xm.yml b/group_vars/model_ubnt_nanostation_loco_m5_xm.yml index 3d8d17ae8..d6bce73c7 100644 --- a/group_vars/model_ubnt_nanostation_loco_m5_xm.yml +++ b/group_vars/model_ubnt_nanostation_loco_m5_xm.yml @@ -1,6 +1,7 @@ --- override_target: "ubnt_nanostation-loco-m" target: ath79/tiny +os: openwrt brand_nice: Ubiquiti model_nice: Nanostation Loco M5 version_nice: XM diff --git a/group_vars/model_ubnt_nanostation_loco_m5_xw.yml b/group_vars/model_ubnt_nanostation_loco_m5_xw.yml index 86effa4eb..b238bc3a7 100644 --- a/group_vars/model_ubnt_nanostation_loco_m5_xw.yml +++ b/group_vars/model_ubnt_nanostation_loco_m5_xw.yml @@ -1,6 +1,7 @@ --- override_target: "ubnt_nanostation-loco-m-xw" target: ath79/tiny +os: openwrt brand_nice: Ubiquiti model_nice: Nanostation Loco M5 version_nice: XW diff --git a/group_vars/model_ubnt_nanostation_m2_xm.yml b/group_vars/model_ubnt_nanostation_m2_xm.yml index a5fd07a32..f56330b47 100644 --- a/group_vars/model_ubnt_nanostation_m2_xm.yml +++ b/group_vars/model_ubnt_nanostation_m2_xm.yml @@ -1,6 +1,7 @@ --- override_target: "ubnt_nanostation-m" target: ath79/tiny +os: openwrt brand_nice: Ubiquiti model_nice: Nanostation M2 version_nice: XM diff --git a/group_vars/model_ubnt_nanostation_m5_xm.yml b/group_vars/model_ubnt_nanostation_m5_xm.yml index 8efb1766c..a798a1713 100644 --- a/group_vars/model_ubnt_nanostation_m5_xm.yml +++ b/group_vars/model_ubnt_nanostation_m5_xm.yml @@ -1,6 +1,7 @@ --- override_target: "ubnt_nanostation-m" target: ath79/tiny +os: openwrt brand_nice: Ubiquiti model_nice: Nanostation M5 version_nice: XM diff --git a/group_vars/model_ubnt_nanostation_m5_xw.yml b/group_vars/model_ubnt_nanostation_m5_xw.yml index 42131576a..6c9c62cb2 100644 --- a/group_vars/model_ubnt_nanostation_m5_xw.yml +++ b/group_vars/model_ubnt_nanostation_m5_xw.yml @@ -1,6 +1,7 @@ --- override_target: "ubnt_nanostation-m-xw" target: ath79/generic +os: openwrt brand_nice: Ubiquiti model_nice: Nanostation M5 version_nice: XW diff --git a/group_vars/model_ubnt_powerbeam_m5_xw.yml b/group_vars/model_ubnt_powerbeam_m5_xw.yml index ce26ab9cb..f62530b23 100644 --- a/group_vars/model_ubnt_powerbeam_m5_xw.yml +++ b/group_vars/model_ubnt_powerbeam_m5_xw.yml @@ -1,5 +1,6 @@ --- target: ath79/generic +os: openwrt brand_nice: Ubiquiti model_nice: Powerbeam M5 version_nice: XW diff --git a/group_vars/model_ubnt_rocket_5ac_lite.yml b/group_vars/model_ubnt_rocket_5ac_lite.yml index 2d17ff83b..ee109f264 100644 --- a/group_vars/model_ubnt_rocket_5ac_lite.yml +++ b/group_vars/model_ubnt_rocket_5ac_lite.yml @@ -1,5 +1,6 @@ --- target: ath79/generic +os: openwrt brand_nice: Ubiquiti model_nice: Rocket 5AC Lite diff --git a/group_vars/model_ubnt_uk_ultra.yml b/group_vars/model_ubnt_uk_ultra.yml index 7dd50f6b4..533b0fc8e 100644 --- a/group_vars/model_ubnt_uk_ultra.yml +++ b/group_vars/model_ubnt_uk_ultra.yml @@ -1,5 +1,6 @@ --- target: "ath79/generic" +os: openwrt brand_nice: Ubiquiti model_nice: Swiss Army Knife Ultra diff --git a/group_vars/model_ubnt_unifi_6_lite.yml b/group_vars/model_ubnt_unifi_6_lite.yml index 962313c88..6e61f21de 100644 --- a/group_vars/model_ubnt_unifi_6_lite.yml +++ b/group_vars/model_ubnt_unifi_6_lite.yml @@ -1,5 +1,6 @@ --- target: ramips/mt7621 +os: openwrt brand_nice: Ubiquiti model_nice: UniFi 6 Lite diff --git a/group_vars/model_ubnt_unifiac_lite.yml b/group_vars/model_ubnt_unifiac_lite.yml index f06e2f0ec..db10deb0f 100644 --- a/group_vars/model_ubnt_unifiac_lite.yml +++ b/group_vars/model_ubnt_unifiac_lite.yml @@ -1,5 +1,6 @@ --- target: ath79/generic +os: openwrt brand_nice: Ubiquiti model_nice: UniFi AC Lite diff --git a/group_vars/model_ubnt_unifiac_mesh.yml b/group_vars/model_ubnt_unifiac_mesh.yml index 1825b6a2f..5b5241e01 100644 --- a/group_vars/model_ubnt_unifiac_mesh.yml +++ b/group_vars/model_ubnt_unifiac_mesh.yml @@ -1,5 +1,6 @@ --- target: ath79/generic +os: openwrt brand_nice: Ubiquiti model_nice: UniFi AC Mesh diff --git a/group_vars/model_ubnt_unifiac_pro.yml b/group_vars/model_ubnt_unifiac_pro.yml index 97f7ab8c6..753d71f3f 100644 --- a/group_vars/model_ubnt_unifiac_pro.yml +++ b/group_vars/model_ubnt_unifiac_pro.yml @@ -1,5 +1,6 @@ --- target: ath79/generic +os: openwrt brand_nice: Ubiquiti model_nice: UniFi AC Mesh Pro diff --git a/group_vars/model_ubnt_usw_flex.yml b/group_vars/model_ubnt_usw_flex.yml index 87e96ec58..f6a585c3d 100644 --- a/group_vars/model_ubnt_usw_flex.yml +++ b/group_vars/model_ubnt_usw_flex.yml @@ -8,6 +8,7 @@ # - one 14720k partition, vendor two 7360k partitions target: ramips/mt7621 +os: openwrt brand_nice: Ubiquiti model_nice: USW-Flex diff --git a/group_vars/model_x86_64.yml b/group_vars/model_x86_64.yml index b0e959bc4..0a88a7527 100644 --- a/group_vars/model_x86_64.yml +++ b/group_vars/model_x86_64.yml @@ -1,5 +1,6 @@ --- target: x86/64 +os: openwrt override_target: generic image_search_pattern: "*-ext4-combined.img*" model_nice: 32-/64-bit Computer diff --git a/group_vars/model_xiaomi_mi_router_3g_v2.yml b/group_vars/model_xiaomi_mi_router_3g_v2.yml index a998e526c..592f244af 100644 --- a/group_vars/model_xiaomi_mi_router_3g_v2.yml +++ b/group_vars/model_xiaomi_mi_router_3g_v2.yml @@ -1,5 +1,6 @@ --- target: ramips/mt7621 +os: openwrt brand_nice: Xiaomi model_nice: MiWiFi 3G version_nice: v2 diff --git a/group_vars/model_zyxel_nbg6617.yml b/group_vars/model_zyxel_nbg6617.yml index ce2defc4a..3c40b98c4 100644 --- a/group_vars/model_zyxel_nbg6617.yml +++ b/group_vars/model_zyxel_nbg6617.yml @@ -1,5 +1,6 @@ --- target: ipq40xx/generic +os: openwrt brand_nice: ZyXEL model_nice: NBG6617 diff --git a/group_vars/model_zyxel_nwa50ax.yml b/group_vars/model_zyxel_nwa50ax.yml index 05147e5c2..8d3a7043b 100644 --- a/group_vars/model_zyxel_nwa50ax.yml +++ b/group_vars/model_zyxel_nwa50ax.yml @@ -1,5 +1,6 @@ --- target: ramips/mt7621 +os: openwrt brand_nice: ZyXEL model_nice: NWA50AX diff --git a/group_vars/model_zyxel_nwa55axe.yml b/group_vars/model_zyxel_nwa55axe.yml index 5577fe436..ab8884b3e 100644 --- a/group_vars/model_zyxel_nwa55axe.yml +++ b/group_vars/model_zyxel_nwa55axe.yml @@ -1,5 +1,6 @@ --- target: ramips/mt7621 +os: openwrt brand_nice: ZyXEL model_nice: NWA55AXE int_port: lan From c112a7825ab19fa9523dffdc1c2a3dea7543c95a Mon Sep 17 00:00:00 2001 From: Ffhener Date: Thu, 24 Oct 2024 01:36:08 +0200 Subject: [PATCH 2/9] ansible: run certain tasks only for openwrt-devices --- roles/cfg_openwrt/tasks/main.yml | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/roles/cfg_openwrt/tasks/main.yml b/roles/cfg_openwrt/tasks/main.yml index b7b47a20a..196e5d803 100644 --- a/roles/cfg_openwrt/tasks/main.yml +++ b/roles/cfg_openwrt/tasks/main.yml @@ -12,6 +12,7 @@ apply: tags: always tags: always + when: os == "openwrt" - name: Prepare some variables (1) set_fact: @@ -40,6 +41,7 @@ apply: tags: always tags: always + when: os == "openwrt" - name: Include add_symlinks.yml include_tasks: @@ -47,6 +49,8 @@ apply: tags: always tags: always + when: os == "openwrt" + - name: Add poemgr config if poemgr target template: @@ -55,6 +59,7 @@ mode: "644" when: - poemgr_ports is defined + - os == "openwrt" tags: always - name: "Make sure /lib/firmware is present" @@ -62,7 +67,9 @@ dest: "{{ configs_dir }}/lib/firmware/ath10k" state: directory recurse: true - when: ath10k_ct_fwcfg is defined + when: + - ath10k_ct_fwcfg is defined + - os == "openwrt" tags: always - name: "Configure ath10k-ct driver" @@ -71,6 +78,7 @@ content: "{{ item.config }}" mode: "644" loop: "{{ ath10k_ct_fwcfg | default([]) }}" + when: os == "openwrt" tags: always - name: Include fix_permissions.yml @@ -78,13 +86,20 @@ file: fix_permissions.yml apply: tags: always + when: os == "openwrt" tags: always +- name: Display all variables/facts known for a host + debug: + var: hostvars[inventory_hostname] + tags: debug_info + - name: Include image generation include_tasks: file: imagebuilder.yml apply: tags: always + when: os == "openwrt" tags: - never - image From 1df08ff5dca8c01ee9872fef8f93b0cb4c4f08e6 Mon Sep 17 00:00:00 2001 From: Ffhener Date: Fri, 25 Oct 2024 22:25:25 +0200 Subject: [PATCH 3/9] f --- roles/cfg_openwrt/tasks/main.yml | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/roles/cfg_openwrt/tasks/main.yml b/roles/cfg_openwrt/tasks/main.yml index 196e5d803..179989d7c 100644 --- a/roles/cfg_openwrt/tasks/main.yml +++ b/roles/cfg_openwrt/tasks/main.yml @@ -12,7 +12,7 @@ apply: tags: always tags: always - when: os == "openwrt" + when: os == "openwrt" | default ("openwrt") - name: Prepare some variables (1) set_fact: @@ -41,7 +41,7 @@ apply: tags: always tags: always - when: os == "openwrt" + when: os == "openwrt" | default ("openwrt") - name: Include add_symlinks.yml include_tasks: @@ -49,7 +49,7 @@ apply: tags: always tags: always - when: os == "openwrt" + when: os == "openwrt" | default ("openwrt") - name: Add poemgr config if poemgr target @@ -59,7 +59,7 @@ mode: "644" when: - poemgr_ports is defined - - os == "openwrt" + - os == "openwrt" | default ("openwrt") tags: always - name: "Make sure /lib/firmware is present" @@ -69,7 +69,7 @@ recurse: true when: - ath10k_ct_fwcfg is defined - - os == "openwrt" + - os == "openwrt" | default ("openwrt") tags: always - name: "Configure ath10k-ct driver" @@ -78,7 +78,7 @@ content: "{{ item.config }}" mode: "644" loop: "{{ ath10k_ct_fwcfg | default([]) }}" - when: os == "openwrt" + when: os == "openwrt" | default ("openwrt") tags: always - name: Include fix_permissions.yml @@ -86,20 +86,15 @@ file: fix_permissions.yml apply: tags: always - when: os == "openwrt" + when: os == "openwrt" | default ("openwrt") tags: always -- name: Display all variables/facts known for a host - debug: - var: hostvars[inventory_hostname] - tags: debug_info - - name: Include image generation include_tasks: file: imagebuilder.yml apply: tags: always - when: os == "openwrt" + when: os == "openwrt" | default ("openwrt") tags: - never - image From 0fb36acb88d9b6e33634010fde90603017147e20 Mon Sep 17 00:00:00 2001 From: Ffhener Date: Thu, 24 Oct 2024 19:54:07 +0200 Subject: [PATCH 4/9] collectd: prepare template for new way of writing hosts --- .../common/collectd/conf.d/bbb-snmp.conf.j2 | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/roles/cfg_openwrt/templates/common/collectd/conf.d/bbb-snmp.conf.j2 b/roles/cfg_openwrt/templates/common/collectd/conf.d/bbb-snmp.conf.j2 index 5afee2504..b0a053397 100644 --- a/roles/cfg_openwrt/templates/common/collectd/conf.d/bbb-snmp.conf.j2 +++ b/roles/cfg_openwrt/templates/common/collectd/conf.d/bbb-snmp.conf.j2 @@ -1,6 +1,12 @@ #jinja2: trim_blocks: "true", lstrip_blocks: "true" {% set profiles = snmp_devices | default([]) | map(attribute='snmp_profile') | list | unique %} +{# collect profiles from new way of writing hosts as well and append them #} +{% for host in groups[group_names[0]]%} + {% if hostvars[host]["snmp_profile"] is defined %} + {% do profiles.append(hostvars[host]["snmp_profile"]) %} + {% endif %} +{% endfor %} {% if profiles | length > 0 %} LoadPlugin snmp @@ -30,6 +36,23 @@ LoadPlugin snmp {% endfor %} {% endfor %} +{# Add non-openwrt hosts that are defined as hosts as well #} +{# Only works if mgmt-IPs are defined in the standard way #} +{% for host in groups[group_names[0]]%} + {% if hostvars[host]["snmp_profile"] is defined %} + {# Calculate the IP for this host based on the mgmt assignment #} + {% set mgmt_network = networks | selectattr('role', 'equalto', 'mgmt') | first %} + + Address "{{ mgmt_network['prefix'] | ansible.utils.ipaddr(mgmt_network['assignments'][host])| ansible.utils.ipaddr('address') }}" + Version 1 + Interval 30 + Community '{{ host['community'] | default('public') }}' + {% for metric_name in collectd_snmp_profiles[hostvars[host]["snmp_profile"]] %} + Collect "{{ hostvars[host]["snmp_profile"] }}_{{ metric_name }}" + {% endfor %} + + {% endif %} +{% endfor %} {% if profiles | length > 0 %} {% endif %} From 717bb5878f160bbc83f1f8977a07eaaf2f652a75 Mon Sep 17 00:00:00 2001 From: Ffhener Date: Thu, 24 Oct 2024 19:55:10 +0200 Subject: [PATCH 5/9] model: add mikrotik css610_8p_2s_in This is a first example of adding ono-openwrt hosts --- group_vars/model_mikrotik_css610_8p_2s_in.yml | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 group_vars/model_mikrotik_css610_8p_2s_in.yml diff --git a/group_vars/model_mikrotik_css610_8p_2s_in.yml b/group_vars/model_mikrotik_css610_8p_2s_in.yml new file mode 100644 index 000000000..ab639fbb1 --- /dev/null +++ b/group_vars/model_mikrotik_css610_8p_2s_in.yml @@ -0,0 +1,7 @@ +--- +os: swos_lite +brand_nice: MikroTik +model_nice: Cloud Smart Switch +version_nice: 610-8P-2S+IN + +snmp_profile: swos_lite From 269dee4abe8a0d3da5cd03b7e8f283bf915f57d8 Mon Sep 17 00:00:00 2001 From: Ffhener Date: Thu, 24 Oct 2024 19:57:06 +0200 Subject: [PATCH 6/9] q216: move switch to hosts --- locations/q216.yml | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/locations/q216.yml b/locations/q216.yml index 06ffa1744..b04ba6352 100644 --- a/locations/q216.yml +++ b/locations/q216.yml @@ -22,10 +22,14 @@ hosts: wireless_profile: freifunk_default mac_override: {eth0: dc:2c:6e:91:08:1b} -snmp_devices: - hostname: q216-switch - address: 10.31.201.242 - snmp_profile: swos_lite + role: switch + model: "mikrotik_css610_8p_2s_in" + +snmp_devices: +# - hostname: q216-switch +# address: 10.31.201.242 +# snmp_profile: swos_lite - hostname: q216-tierpark address: 10.31.201.243 From e0d869874534726ba198a455e1bde5963e677e35 Mon Sep 17 00:00:00 2001 From: Ffhener Date: Fri, 25 Oct 2024 22:36:31 +0200 Subject: [PATCH 7/9] all: rename snmp_profile to os --- DEVELOPER.md | 4 +-- group_vars/model_mikrotik_css610_8p_2s_in.yml | 2 +- locations/agym.yml | 6 ++-- locations/ak36.yml | 12 ++++---- locations/bht.yml | 20 ++++++------- locations/c-base.yml | 4 +-- locations/chris.yml | 14 +++++----- locations/dorfplatz.yml | 6 ++-- locations/dragonkiez-adlerhalle.yml | 2 +- locations/dragonkiez-buero.yml | 2 +- locations/dragonkiez-dorfplatz.yml | 2 +- locations/dragonkiez-kiezraum.yml | 2 +- locations/dragonkiez-rathausblock-miami.yml | 2 +- locations/dtmb.yml | 20 ++++++------- locations/e16outdoor.yml | 2 +- locations/eberswalder7.yml | 2 +- locations/ekke.yml | 2 +- locations/emma.yml | 28 +++++++++---------- locations/fanninger47.yml | 4 +-- locations/fardf.yml | 16 +++++------ locations/fesev.yml | 4 +-- locations/flughafen.yml | 10 +++---- locations/funkigel.yml | 2 +- locations/glanz15.yml | 2 +- locations/gruni73.yml | 6 ++-- locations/gub37.yml | 6 ++-- locations/halle.yml | 2 +- locations/hds.yml | 4 +-- locations/humpty.yml | 4 +-- locations/hway.yml | 2 +- locations/ilr.yml | 4 +-- locations/j41.yml | 6 ++-- locations/jup.yml | 6 ++-- locations/k12-h2.yml | 2 +- locations/k9.yml | 4 +-- locations/kiehlufer.yml | 8 +++--- locations/kiezladen154.yml | 2 +- locations/kirchhof.yml | 2 +- locations/klunker.yml | 6 ++-- locations/knallt-m42.yml | 2 +- locations/kotti.yml | 2 +- locations/kub.yml | 2 +- locations/l105.yml | 6 ++-- locations/l5.yml | 2 +- locations/liese-21.yml | 4 +-- locations/magda.yml | 4 +-- locations/manstein10.yml | 2 +- locations/mela.yml | 10 +++---- locations/mgh.yml | 2 +- locations/mlk-nk.yml | 4 +-- locations/newyorck.yml | 6 ++-- locations/ohlauer.yml | 4 +-- locations/perle.yml | 2 +- locations/perleberger36.yml | 14 +++++----- locations/philmel.yml | 16 +++++------ locations/potse.yml | 2 +- locations/q216.yml | 6 ++-- locations/radbahn.yml | 2 +- locations/rauchhaus.yml | 6 ++-- locations/rev99.yml | 2 +- locations/rhnk.yml | 20 ++++++------- locations/rhxb.yml | 28 +++++++++---------- locations/rigaer78.yml | 4 +-- locations/rigaer83.yml | 2 +- locations/rio.yml | 4 +-- locations/rixbox.yml | 2 +- locations/saarbruecker.yml | 8 +++--- locations/sama.yml | 16 +++++------ locations/sama27.yml | 2 +- locations/sav.yml | 2 +- locations/scharni.yml | 4 +-- locations/schreiner.yml | 8 +++--- locations/segen.yml | 26 ++++++++--------- locations/simeon.yml | 8 +++--- locations/ska95.yml | 2 +- locations/spitta13.yml | 8 +++--- locations/stadalbert.yml | 4 +-- locations/strom.yml | 8 +++--- locations/t1.yml | 6 ++-- locations/teufelsberg.yml | 12 ++++---- locations/vaterhaus.yml | 14 +++++----- locations/w38b.yml | 4 +-- locations/walde.yml | 2 +- locations/weidenbaum.yml | 2 +- locations/wilgu10.yml | 4 +-- locations/xdorf.yml | 6 ++-- locations/zwingli.yml | 18 ++++++------ .../common/collectd/conf.d/bbb-snmp.conf.j2 | 16 +++++------ 88 files changed, 287 insertions(+), 287 deletions(-) diff --git a/DEVELOPER.md b/DEVELOPER.md index 2cff3c18d..0887a8c70 100644 --- a/DEVELOPER.md +++ b/DEVELOPER.md @@ -79,13 +79,13 @@ Without the `mac_override` these devices will still function, but generate a new ### monitoring -All OpenWrt-devices have monitoring enabled. To activate monitoring for other devices we use SNMP. The core router will collect and report statistics for the devices. Make sure SNMP is activated on the proprietary device with the community set to public. You can find an overview with all available profiles at `group_vars/all/snmp_profiles.yml` +All OpenWrt-devices have monitoring enabled. To activate monitoring for other devices we use SNMP. The core router will collect and report statistics for the devices. Make sure SNMP is activated on the proprietary device with the community set to public. You can find an overview with all available profiles at `group_vars/all/oss.yml` ```yml snmp_devices: - hostname: segen-f2a # hostname address: 10.31.6.11 # static ip of the device - snmp_profile: airos_8 # SNMP profile + os: airos_8 # SNMP profile ``` ### airos dfs reset diff --git a/group_vars/model_mikrotik_css610_8p_2s_in.yml b/group_vars/model_mikrotik_css610_8p_2s_in.yml index ab639fbb1..470535ed2 100644 --- a/group_vars/model_mikrotik_css610_8p_2s_in.yml +++ b/group_vars/model_mikrotik_css610_8p_2s_in.yml @@ -4,4 +4,4 @@ brand_nice: MikroTik model_nice: Cloud Smart Switch version_nice: 610-8P-2S+IN -snmp_profile: swos_lite +os: swos_lite diff --git a/locations/agym.yml b/locations/agym.yml index f90d5ac1d..536c6b777 100644 --- a/locations/agym.yml +++ b/locations/agym.yml @@ -17,15 +17,15 @@ hosts: snmp_devices: - hostname: agym-switch-roof address: 10.230.89.2 - snmp_profile: edgeswitch + os: edgeswitch - hostname: agym-zwingli address: 10.230.89.4 - snmp_profile: af60 + os: af60 - hostname: agym-simeon address: 10.230.89.5 - snmp_profile: airos_8 + os: airos_8 ipv6_prefix: "2001:bf7:830:1f00::/56" diff --git a/locations/ak36.yml b/locations/ak36.yml index 9b4d36879..cc80e936a 100644 --- a/locations/ak36.yml +++ b/locations/ak36.yml @@ -20,27 +20,27 @@ hosts: snmp_devices: - hostname: ak36-poe-roof address: 10.31.130.131 - snmp_profile: swos + os: swos - hostname: ak36-philmel address: 10.31.130.132 - snmp_profile: airos_8 + os: airos_8 - hostname: ak36-flughafen address: 10.31.130.133 - snmp_profile: af60 + os: af60 - hostname: ak36-dtmb address: 10.31.130.134 - snmp_profile: airos_6 + os: airos_6 - hostname: ak36-rhnk address: 10.31.130.136 - snmp_profile: af60 + os: af60 - hostname: ak36-teufelsberg address: 10.31.130.139 - snmp_profile: af60 + os: af60 # AK36 got following prefixes: diff --git a/locations/bht.yml b/locations/bht.yml index e535ee908..411b9d7f5 100644 --- a/locations/bht.yml +++ b/locations/bht.yml @@ -20,43 +20,43 @@ snmp_devices: - hostname: bht-segen address: 10.31.166.5 - snmp_profile: airos_8 + os: airos_8 - hostname: bht-perleberger36 address: 10.31.166.6 - snmp_profile: airos_8 + os: airos_8 - hostname: bht-scherer8 address: 10.31.166.7 - snmp_profile: airos_8 + os: airos_8 - hostname: bht-nord address: 10.31.166.8 - snmp_profile: airos_6 + os: airos_6 - hostname: bht-chris address: 10.31.166.9 - snmp_profile: airos_6 + os: airos_6 - hostname: bht-jup address: 10.31.166.10 - snmp_profile: airos_6 + os: airos_6 - hostname: bht-ost address: 10.31.166.11 - snmp_profile: airos_6 + os: airos_6 - hostname: bht-sued address: 10.31.166.12 - snmp_profile: airos_6 + os: airos_6 - hostname: bht-fardf address: 10.31.166.13 - snmp_profile: airos_8 + os: airos_8 - hostname: bht-west address: 10.31.166.14 - snmp_profile: airos_8 + os: airos_8 airos_dfs_reset: - name: "bht-segen" diff --git a/locations/c-base.yml b/locations/c-base.yml index 7be7ddc30..389cffb43 100644 --- a/locations/c-base.yml +++ b/locations/c-base.yml @@ -28,11 +28,11 @@ hosts: snmp_devices: - hostname: c-base-switch address: 10.31.134.98 - snmp_profile: edgeswitch + os: edgeswitch - hostname: c-base-mesh-ssw address: 10.31.134.101 - snmp_profile: airos_8 + os: airos_8 airos_dfs_reset: - name: "c-base-mesh-ssw" diff --git a/locations/chris.yml b/locations/chris.yml index 5df4302ad..57068d8ad 100644 --- a/locations/chris.yml +++ b/locations/chris.yml @@ -33,31 +33,31 @@ hosts: snmp_devices: - hostname: chris-switch address: 10.230.18.2 - snmp_profile: tplink + os: tplink - hostname: chris-bht address: 10.230.18.3 - snmp_profile: airos_6 + os: airos_6 - hostname: chris-teufelsberg address: 10.230.18.4 - snmp_profile: airos_8 + os: airos_8 - hostname: chris-n-5ghz address: 10.230.18.5 - snmp_profile: airos_6 + os: airos_6 - hostname: chris-o-5ghz address: 10.230.18.6 - snmp_profile: airos_6 + os: airos_6 - hostname: chris-s-5ghz address: 10.230.18.7 - snmp_profile: airos_6 + os: airos_6 - hostname: chris-w-5ghz address: 10.230.18.8 - snmp_profile: airos_6 + os: airos_6 ipv6_prefix: "2001:bf7:790::/56" diff --git a/locations/dorfplatz.yml b/locations/dorfplatz.yml index fa0179597..16c907dda 100644 --- a/locations/dorfplatz.yml +++ b/locations/dorfplatz.yml @@ -39,15 +39,15 @@ hosts: snmp_devices: - hostname: dorfplatz-poe-switch address: 10.31.75.34 - snmp_profile: edgeswitch + os: edgeswitch - hostname: dorfplatz-sama address: 10.31.75.35 - snmp_profile: airos_8 + os: airos_8 - hostname: dorfplatz-zwingli address: 10.31.75.36 - snmp_profile: airos_8 + os: airos_8 ipv6_prefix: "2001:bf7:830:8200::/56" diff --git a/locations/dragonkiez-adlerhalle.yml b/locations/dragonkiez-adlerhalle.yml index a49dd9a9e..2a59d2907 100644 --- a/locations/dragonkiez-adlerhalle.yml +++ b/locations/dragonkiez-adlerhalle.yml @@ -16,7 +16,7 @@ hosts: snmp_devices: - hostname: dragonkiez-adlerhalle-rhxb address: 10.31.34.46 - snmp_profile: airos_8 + os: airos_8 ipv6_prefix: "2001:bf7:830:b3c0::/58" diff --git a/locations/dragonkiez-buero.yml b/locations/dragonkiez-buero.yml index 9ba3723b0..54d9f9777 100644 --- a/locations/dragonkiez-buero.yml +++ b/locations/dragonkiez-buero.yml @@ -16,7 +16,7 @@ hosts: snmp_devices: - hostname: dragonkiez-buero-rhxb address: 10.31.23.114 - snmp_profile: airos_8 + os: airos_8 ipv6_prefix: "2001:bf7:830:b300::/58" diff --git a/locations/dragonkiez-dorfplatz.yml b/locations/dragonkiez-dorfplatz.yml index 3ddc8a652..df8e3b7d4 100644 --- a/locations/dragonkiez-dorfplatz.yml +++ b/locations/dragonkiez-dorfplatz.yml @@ -19,7 +19,7 @@ hosts: snmp_devices: - hostname: dragonkiez-dorfplatz-rhxb address: 10.31.28.250 - snmp_profile: airos_8 + os: airos_8 ipv6_prefix: "2001:bf7:830:b340::/58" diff --git a/locations/dragonkiez-kiezraum.yml b/locations/dragonkiez-kiezraum.yml index da4358fbc..d20d4473d 100644 --- a/locations/dragonkiez-kiezraum.yml +++ b/locations/dragonkiez-kiezraum.yml @@ -16,7 +16,7 @@ hosts: snmp_devices: - hostname: dragonkiez-kiezraum-rhxb address: 10.31.92.226 - snmp_profile: airos_6 + os: airos_6 ipv6_prefix: "2001:bf7:830:ad00::/56" diff --git a/locations/dragonkiez-rathausblock-miami.yml b/locations/dragonkiez-rathausblock-miami.yml index 228a046ce..2827b2598 100644 --- a/locations/dragonkiez-rathausblock-miami.yml +++ b/locations/dragonkiez-rathausblock-miami.yml @@ -24,7 +24,7 @@ hosts: snmp_devices: - hostname: dragonkiez-rathausblock-miami-rhxb address: 10.31.30.34 - snmp_profile: airos_8 + os: airos_8 ipv6_prefix: "2001:bf7:830:b380::/58" diff --git a/locations/dtmb.yml b/locations/dtmb.yml index 1b8f39566..d7215696f 100644 --- a/locations/dtmb.yml +++ b/locations/dtmb.yml @@ -16,43 +16,43 @@ hosts: snmp_devices: - hostname: dtmb-sw1 address: 10.31.131.2 - snmp_profile: edgeswitch + os: edgeswitch - hostname: dtmb-sw2 address: 10.31.131.3 - snmp_profile: edgeswitch + os: edgeswitch - hostname: dtmb-ak36 address: 10.31.131.10 - snmp_profile: airos_6 + os: airos_6 - hostname: dtmb-rhxb address: 10.31.131.11 - snmp_profile: airos_6 + os: airos_6 - hostname: dtmb-cbase address: 10.31.131.12 - snmp_profile: airos_6 + os: airos_6 - hostname: dtmb-laden address: 10.31.131.13 - snmp_profile: airos_6 + os: airos_6 - hostname: dtmb-x address: 10.31.131.14 - snmp_profile: airos_6 + os: airos_6 - hostname: dtmb-m2-1 address: 10.31.131.20 - snmp_profile: airos_6 + os: airos_6 - hostname: dtmb-m2-2 address: 10.31.131.21 - snmp_profile: airos_6 + os: airos_6 - hostname: dtmb-m2-3 address: 10.31.131.22 - snmp_profile: airos_6 + os: airos_6 ipv6_prefix: "2001:bf7:750:3400::/56" diff --git a/locations/e16outdoor.yml b/locations/e16outdoor.yml index 7dbf12184..4688266b5 100644 --- a/locations/e16outdoor.yml +++ b/locations/e16outdoor.yml @@ -29,7 +29,7 @@ hosts: snmp_devices: - hostname: e16outdoor-segen address: 10.31.142.50 - snmp_profile: airos_8 + os: airos_8 ipv6_prefix: '2001:bf7:760:2700::/56' diff --git a/locations/eberswalder7.yml b/locations/eberswalder7.yml index 43719ddb2..6785b908f 100644 --- a/locations/eberswalder7.yml +++ b/locations/eberswalder7.yml @@ -16,7 +16,7 @@ hosts: snmp_devices: - hostname: eberswalder7-segen address: 10.31.238.194 - snmp_profile: airos_6 + os: airos_6 # IPs ipv6_prefix: '2001:bf7:760:1600::/56' diff --git a/locations/ekke.yml b/locations/ekke.yml index 2c48ca81b..6cb2d6ef3 100644 --- a/locations/ekke.yml +++ b/locations/ekke.yml @@ -24,7 +24,7 @@ hosts: snmp_devices: - hostname: ekke-switch address: 10.31.226.2 - snmp_profile: routeros + os: routeros # ROUTER: 10.31.226.0/26 # --MGMT: 10.31.226.0/29 diff --git a/locations/emma.yml b/locations/emma.yml index 143d2d476..2c25b1144 100644 --- a/locations/emma.yml +++ b/locations/emma.yml @@ -14,59 +14,59 @@ hosts: snmp_devices: - hostname: emma-switch-no address: 10.31.11.2 - snmp_profile: edgeswitch + os: edgeswitch - hostname: emma-switch-so address: 10.31.11.3 - snmp_profile: edgeswitch + os: edgeswitch - hostname: emma-switch-sw address: 10.31.11.4 - snmp_profile: edgeswitch + os: edgeswitch - hostname: emma-switch-nw address: 10.31.11.5 - snmp_profile: edgeswitch + os: edgeswitch - hostname: emma-no-60ghz address: 10.31.11.10 - snmp_profile: af60 + os: af60 - hostname: emma-wsw-60ghz address: 10.31.11.17 - snmp_profile: mikrotik_60g + os: mikrotik_60g - hostname: emma-ssw-uplink address: 10.31.11.18 - snmp_profile: mikrotik_60g + os: mikrotik_60g - hostname: emma-oso-5ghz address: 10.31.11.19 - snmp_profile: airos_8 + os: airos_8 - hostname: emma-nno-5ghz address: 10.31.11.20 - snmp_profile: airos_8 + os: airos_8 - hostname: emma-wsw-5ghz address: 10.31.11.22 - snmp_profile: airos_8 + os: airos_8 - hostname: emma-wnw-5ghz address: 10.31.11.23 - snmp_profile: airos_8 + os: airos_8 - hostname: emma-nnw-5ghz address: 10.31.11.24 - snmp_profile: airos_8 + os: airos_8 - hostname: emma-sso-5ghz address: 10.31.11.25 - snmp_profile: airos_8 + os: airos_8 - hostname: emma-nnw-60ghz address: 10.31.11.29 - snmp_profile: mikrotik_60g + os: mikrotik_60g airos_dfs_reset: - name: "emma-oso-5ghz" diff --git a/locations/fanninger47.yml b/locations/fanninger47.yml index 0773318ed..268a0c9e8 100644 --- a/locations/fanninger47.yml +++ b/locations/fanninger47.yml @@ -32,11 +32,11 @@ hosts: snmp_devices: - hostname: fanninger47-switch address: 10.31.233.2 - snmp_profile: routeros + os: routeros - hostname: fanninger47-liese21 address: 10.31.233.4 - snmp_profile: airos_8 + os: airos_8 ipv6_prefix: "2001:bf7:860:1100::/56" # ALL: 10.31.233.0/26 diff --git a/locations/fardf.yml b/locations/fardf.yml index 85a95980d..dd677cf67 100644 --- a/locations/fardf.yml +++ b/locations/fardf.yml @@ -15,35 +15,35 @@ hosts: snmp_devices: - hostname: fardf-switch address: 10.248.11.130 - snmp_profile: edgeswitch + os: edgeswitch - hostname: fardf-bht address: 10.248.11.131 - snmp_profile: airos_8 + os: airos_8 - hostname: fardf-maerkisches address: 10.248.11.132 - snmp_profile: airos_8 + os: airos_8 - hostname: fardf-sange address: 10.248.11.133 - snmp_profile: airos_8 + os: airos_8 - hostname: fardf-nord address: 10.248.11.134 - snmp_profile: airos_8 + os: airos_8 - hostname: fardf-ost address: 10.248.11.135 - snmp_profile: airos_8 + os: airos_8 - hostname: fardf-sued address: 10.248.11.136 - snmp_profile: airos_8 + os: airos_8 - hostname: fardf-west address: 10.248.11.137 - snmp_profile: airos_8 + os: airos_8 airos_dfs_reset: - name: "fardf-maerkisches" diff --git a/locations/fesev.yml b/locations/fesev.yml index cfb1a6d56..05a5b7c95 100644 --- a/locations/fesev.yml +++ b/locations/fesev.yml @@ -54,11 +54,11 @@ hosts: snmp_devices: - hostname: fesev-sama address: 10.31.96.243 - snmp_profile: airos_8 + os: airos_8 - hostname: fesev-switch address: 10.31.96.242 - snmp_profile: edgeswitch + os: edgeswitch # mesh: 10.31.96.216/30 # dhcp: 10.31.97.128/25 diff --git a/locations/flughafen.yml b/locations/flughafen.yml index 11ac8ce3f..b7ef678cb 100644 --- a/locations/flughafen.yml +++ b/locations/flughafen.yml @@ -18,23 +18,23 @@ snmp_devices: - hostname: flughafen-ak36 address: 10.31.131.131 - snmp_profile: af60 + os: af60 - hostname: flughafen-rhxb address: 10.31.131.132 - snmp_profile: af60 + os: af60 - hostname: flughafen-zoll address: 10.31.131.138 - snmp_profile: airos_8 + os: airos_8 - hostname: flughafen-feld address: 10.31.131.139 - snmp_profile: airos_8 + os: airos_8 - hostname: flughafen-garten address: 10.31.131.140 - snmp_profile: airos_6 + os: airos_6 airos_dfs_reset: diff --git a/locations/funkigel.yml b/locations/funkigel.yml index 17ce9a0c0..dc537a7f5 100644 --- a/locations/funkigel.yml +++ b/locations/funkigel.yml @@ -20,7 +20,7 @@ snmp_devices: - hostname: funkigel-frischauf address: 10.248.9.194 - snmp_profile: airos_8 + os: airos_8 airos_dfs_reset: - name: "funkigel-frischauf" diff --git a/locations/glanz15.yml b/locations/glanz15.yml index 4d4179768..c44e841d3 100644 --- a/locations/glanz15.yml +++ b/locations/glanz15.yml @@ -21,7 +21,7 @@ hosts: snmp_devices: - hostname: glanz15-vaterhaus address: 10.31.191.170 - snmp_profile: airos_8 + os: airos_8 # mgmt: 10.31.191.168/29 diff --git a/locations/gruni73.yml b/locations/gruni73.yml index 194f64b87..649afc7f6 100644 --- a/locations/gruni73.yml +++ b/locations/gruni73.yml @@ -29,15 +29,15 @@ hosts: snmp_devices: - hostname: gruni73-switch address: 10.31.156.2 - snmp_profile: edgeswitch + os: edgeswitch - hostname: gruni73-sama address: 10.31.156.5 - snmp_profile: airos_8 + os: airos_8 - hostname: gruni73-zwingli address: 10.31.156.6 - snmp_profile: airos_8 + os: airos_8 # IPv4 10.31.156.0/24 diff --git a/locations/gub37.yml b/locations/gub37.yml index 2947c44c9..6d7873be3 100644 --- a/locations/gub37.yml +++ b/locations/gub37.yml @@ -28,15 +28,15 @@ hosts: snmp_devices: - hostname: gub37-zwingli address: 10.31.157.10 - snmp_profile: airos_8 + os: airos_8 - hostname: gub37-emma address: 10.31.157.11 - snmp_profile: af60 + os: af60 - hostname: gub37-sama address: 10.31.157.12 - snmp_profile: airos_8 + os: airos_8 # IPs # IPv4 10.31.157.0/25 diff --git a/locations/halle.yml b/locations/halle.yml index fe5a58439..a3cda4e15 100644 --- a/locations/halle.yml +++ b/locations/halle.yml @@ -16,7 +16,7 @@ hosts: snmp_devices: - hostname: halle-rhxb address: 10.31.184.66 - snmp_profile: airos_8 + os: airos_8 ipv6_prefix: "2001:bf7:750:5600::/56" diff --git a/locations/hds.yml b/locations/hds.yml index b6f95ed25..f238539cf 100644 --- a/locations/hds.yml +++ b/locations/hds.yml @@ -28,11 +28,11 @@ hosts: snmp_devices: - hostname: hdm-hds address: 10.36.166.150 - snmp_profile: airos_8 + os: airos_8 - hostname: hdm-p3 address: 10.36.166.146 - snmp_profile: airos_8 + os: airos_8 networks: - vid: 10 diff --git a/locations/humpty.yml b/locations/humpty.yml index d38655e95..efde99765 100644 --- a/locations/humpty.yml +++ b/locations/humpty.yml @@ -19,11 +19,11 @@ hosts: snmp_devices: - hostname: humpty-rhxb address: 10.31.205.162 - snmp_profile: airos_8 + os: airos_8 - hostname: humpty-dtmb address: 10.31.205.163 - snmp_profile: airos_8 + os: airos_8 ipv6_prefix: "2001:bf7:830:c300::/56" diff --git a/locations/hway.yml b/locations/hway.yml index 035829c44..835ec668f 100644 --- a/locations/hway.yml +++ b/locations/hway.yml @@ -47,7 +47,7 @@ snmp_devices: - hostname: hway-kiehlufer address: 10.31.255.252 - snmp_profile: mikrotik_60g + os: mikrotik_60g networks: diff --git a/locations/ilr.yml b/locations/ilr.yml index a70f9dfd3..370c3e372 100644 --- a/locations/ilr.yml +++ b/locations/ilr.yml @@ -72,11 +72,11 @@ hosts: snmp_devices: - hostname: ilr-teufb address: 10.31.214.26 - snmp_profile: af60 + os: af60 - hostname: ilr-perleb address: 10.31.214.27 - snmp_profile: airos_8 + os: airos_8 # ROUTER: 10.31.214.0/27 # --DHCP: 10.31.214.0/28 diff --git a/locations/j41.yml b/locations/j41.yml index bbf21d587..a02653ca9 100644 --- a/locations/j41.yml +++ b/locations/j41.yml @@ -15,15 +15,15 @@ hosts: snmp_devices: - hostname: j41-switch address: 10.31.41.2 - snmp_profile: edgeswitch + os: edgeswitch - hostname: j41-f2a address: 10.31.41.3 - snmp_profile: airos_6 + os: airos_6 - hostname: j41-zwingli address: 10.31.41.4 - snmp_profile: airos_6 + os: airos_6 ipv6_prefix: "2001:bf7:830:bd00::/56" diff --git a/locations/jup.yml b/locations/jup.yml index b1f99351c..0ac530658 100644 --- a/locations/jup.yml +++ b/locations/jup.yml @@ -41,15 +41,15 @@ hosts: snmp_devices: - hostname: jup-poe address: 10.31.147.130 - snmp_profile: edgeswitch + os: edgeswitch - hostname: jup-bht address: 10.31.147.131 - snmp_profile: airos_6 + os: airos_6 - hostname: jup-segen address: 10.31.147.132 - snmp_profile: airos_6 + os: airos_6 ipv6_prefix: "2001:bf7:760:2600::/56" diff --git a/locations/k12-h2.yml b/locations/k12-h2.yml index 2f6dbdec3..fa1c7eb32 100644 --- a/locations/k12-h2.yml +++ b/locations/k12-h2.yml @@ -36,7 +36,7 @@ hosts: snmp_devices: - hostname: k12-h2-segen address: 10.31.158.195 - snmp_profile: airos_8 + os: airos_8 ipv6_prefix: '2001:bf7:760:2a00::/56' diff --git a/locations/k9.yml b/locations/k9.yml index d12d3a2cd..474531170 100644 --- a/locations/k9.yml +++ b/locations/k9.yml @@ -17,11 +17,11 @@ hosts: snmp_devices: - hostname: k9-sama address: 10.31.9.211 - snmp_profile: airos_8 + os: airos_8 - hostname: k9-zwingli address: 10.31.9.212 - snmp_profile: airos_6 + os: airos_6 ipv6_prefix: '2001:bf7:830:8d00::/56' diff --git a/locations/kiehlufer.yml b/locations/kiehlufer.yml index 4950e1003..e0d1a50a7 100644 --- a/locations/kiehlufer.yml +++ b/locations/kiehlufer.yml @@ -73,19 +73,19 @@ hosts: snmp_devices: - hostname: kiehlufer-switch address: 10.31.82.210 - snmp_profile: swos_lite + os: swos_lite - hostname: kiehlufer-rhnk address: 10.31.82.211 - snmp_profile: af60 + os: af60 - hostname: kiehlufer-hway address: 10.31.82.212 - snmp_profile: mikrotik_60g + os: mikrotik_60g - hostname: kiehlufer-emma address: 10.31.82.213 - snmp_profile: airos_8 + os: airos_8 ipv6_prefix: '2001:bf7:830:8c00::/56' diff --git a/locations/kiezladen154.yml b/locations/kiezladen154.yml index b6ba5d07e..2532a6ec3 100644 --- a/locations/kiezladen154.yml +++ b/locations/kiezladen154.yml @@ -19,7 +19,7 @@ hosts: snmp_devices: - hostname: kiezladen154-rhnk address: 10.248.3.162 - snmp_profile: airos_8 + os: airos_8 # mgmt: 10.248.3.160/28 diff --git a/locations/kirchhof.yml b/locations/kirchhof.yml index 0d5dbf2aa..8107c79fe 100644 --- a/locations/kirchhof.yml +++ b/locations/kirchhof.yml @@ -40,7 +40,7 @@ hosts: snmp_devices: - hostname: kirchhof-switch address: 10.31.183.130 - snmp_profile: edgeswitch + os: edgeswitch # 10.31.183.128/28 - mgmt - vlan 42 # 10.31.183.144/28 - mesh - vlan 20, 50 diff --git a/locations/klunker.yml b/locations/klunker.yml index b936a2b82..efc23a3bf 100644 --- a/locations/klunker.yml +++ b/locations/klunker.yml @@ -33,15 +33,15 @@ hosts: snmp_devices: - hostname: klunker-switch address: 10.31.191.178 - snmp_profile: edgeswitch + os: edgeswitch - hostname: klunker-rhnk address: 10.31.191.179 - snmp_profile: mikrotik_60g + os: mikrotik_60g - hostname: klunker-philmel address: 10.31.191.180 - snmp_profile: af60 + os: af60 ipv6_prefix: "2001:bf7:820:e00::/56" diff --git a/locations/knallt-m42.yml b/locations/knallt-m42.yml index 70f214058..0b03c3f52 100644 --- a/locations/knallt-m42.yml +++ b/locations/knallt-m42.yml @@ -16,7 +16,7 @@ hosts: snmp_devices: - hostname: knallt-m42-lb address: 10.248.0.114 - snmp_profile: airos_8 + os: airos_8 ipv6_prefix: '2001:bf7:760:1700::/56' diff --git a/locations/kotti.yml b/locations/kotti.yml index 445f3082c..ca672a7c1 100644 --- a/locations/kotti.yml +++ b/locations/kotti.yml @@ -18,7 +18,7 @@ hosts: snmp_devices: - hostname: kotti-simeon address: 10.31.167.210 - snmp_profile: airos_8 + os: airos_8 ipv6_prefix: 2001:bf7:830:6600::/56 diff --git a/locations/kub.yml b/locations/kub.yml index e91539e05..19eb8951c 100644 --- a/locations/kub.yml +++ b/locations/kub.yml @@ -74,7 +74,7 @@ hosts: snmp_devices: - hostname: kub-simeon address: 10.31.139.2 - snmp_profile: airos_8 + os: airos_8 ipv6_prefix: "2001:bf7:830:8800::/56" diff --git a/locations/l105.yml b/locations/l105.yml index d4e36a8dd..9ab572b1f 100644 --- a/locations/l105.yml +++ b/locations/l105.yml @@ -17,16 +17,16 @@ hosts: snmp_devices: - hostname: l105-poe address: 10.31.127.130 - snmp_profile: edgeswitch + os: edgeswitch - hostname: l105-rhxb address: 10.31.127.131 - snmp_profile: af60 + os: af60 # tub is not existent as of 02/24 # - hostname: l105-tu # adress: 10.31.127.132 - # snmp_profile: af60 + # os: af60 # L105 got following prefixes: diff --git a/locations/l5.yml b/locations/l5.yml index c38d514af..6c496626c 100644 --- a/locations/l5.yml +++ b/locations/l5.yml @@ -29,7 +29,7 @@ hosts: snmp_devices: - hostname: l5-switch address: 10.31.161.162 - snmp_profile: edgeswitch + os: edgeswitch # 10.31.161.160/29 - mgmt # 10.31.191.160/29 - mesh diff --git a/locations/liese-21.yml b/locations/liese-21.yml index 53f6de5ed..ed5a05b39 100644 --- a/locations/liese-21.yml +++ b/locations/liese-21.yml @@ -29,11 +29,11 @@ hosts: snmp_devices: - hostname: liese-21-magda address: 10.31.137.50 - snmp_profile: airos_8 + os: airos_8 - hostname: liese-21-n-5ghz address: 10.31.137.51 - snmp_profile: airos_8 + os: airos_8 airos_dfs_reset: diff --git a/locations/magda.yml b/locations/magda.yml index fc7ba0ada..f612ff411 100644 --- a/locations/magda.yml +++ b/locations/magda.yml @@ -42,11 +42,11 @@ hosts: snmp_devices: - hostname: magda-sama address: 10.31.83.115 - snmp_profile: airos_8 + os: airos_8 - hostname: magda-ost-5ghz address: 10.31.83.116 - snmp_profile: airos_8 + os: airos_8 airos_dfs_reset: - name: "magda-ost-5ghz" diff --git a/locations/manstein10.yml b/locations/manstein10.yml index 6b7c155e1..a5b53dc7c 100644 --- a/locations/manstein10.yml +++ b/locations/manstein10.yml @@ -29,7 +29,7 @@ hosts: snmp_devices: - hostname: manstein10-rhxb address: 10.36.208.4 - snmp_profile: airos_6 + os: airos_6 # Overall we allocated: 10.31.125.0/24 diff --git a/locations/mela.yml b/locations/mela.yml index 0b02a4a30..b31dbcae1 100644 --- a/locations/mela.yml +++ b/locations/mela.yml @@ -40,19 +40,19 @@ hosts: snmp_devices: - hostname: mela-switch-hinten address: 10.36.70.2 - snmp_profile: edgeswitch + os: edgeswitch - hostname: mela-switch-vorne address: 10.36.70.3 - snmp_profile: edgeswitch + os: edgeswitch - hostname: mela-nw-5ghz address: 10.36.70.4 - snmp_profile: airos_6 + os: airos_6 - hostname: mela-ono-5ghz address: 10.36.70.5 - snmp_profile: airos_6 + os: airos_6 - hostname: mela-teufelsberg address: 10.36.70.6 - snmp_profile: airos_8 + os: airos_8 ipv6_prefix: "2001:bf7:790:f00::/56" diff --git a/locations/mgh.yml b/locations/mgh.yml index cffaa2d73..5c7ba3430 100644 --- a/locations/mgh.yml +++ b/locations/mgh.yml @@ -17,7 +17,7 @@ hosts: snmp_devices: - hostname: mgh-simeon address: 10.31.106.66 - snmp_profile: airos_8 + os: airos_8 ipv6_prefix: "2001:bf7:830:9500::/56" diff --git a/locations/mlk-nk.yml b/locations/mlk-nk.yml index 75cc7bc3b..c83861b8a 100644 --- a/locations/mlk-nk.yml +++ b/locations/mlk-nk.yml @@ -31,11 +31,11 @@ snmp_devices: - hostname: mlk-nk-nno-5ghz address: 10.31.69.4 - snmp_profile: airos_8 + os: airos_8 - hostname: mlk-nk-so-5ghz address: 10.31.69.5 - snmp_profile: airos_6 + os: airos_6 ipv6_prefix: '2001:bf7:820:2500::/56' diff --git a/locations/newyorck.yml b/locations/newyorck.yml index c0a8d2aea..59942ffc7 100644 --- a/locations/newyorck.yml +++ b/locations/newyorck.yml @@ -39,17 +39,17 @@ snmp_devices: # TL-SG2424 - hostname: newyorck-switch1 address: 10.31.155.226 - snmp_profile: tplink + os: tplink # TL-SG2424 - hostname: newyorck-switch2 address: 10.31.155.227 - snmp_profile: tplink + os: tplink # TL-SG3424P - hostname: newyorck-switch3 address: 10.31.155.228 - snmp_profile: tplink + os: tplink # PRDHCP: 10.31.247.0/25 # --DHCP: 10.31.160.0/25 diff --git a/locations/ohlauer.yml b/locations/ohlauer.yml index b0e688be4..8ab957a29 100644 --- a/locations/ohlauer.yml +++ b/locations/ohlauer.yml @@ -16,11 +16,11 @@ hosts: snmp_devices: - hostname: ohlauer-switch address: 10.31.166.250 - snmp_profile: edgerouter + os: edgerouter - hostname: ohlauer-emma address: 10.31.166.251 - snmp_profile: mikrotik_60g + os: mikrotik_60g ipv6_prefix: 2001:bf7:830:8300::/56 diff --git a/locations/perle.yml b/locations/perle.yml index c04daa9ab..e80372a79 100644 --- a/locations/perle.yml +++ b/locations/perle.yml @@ -22,7 +22,7 @@ snmp_devices: - hostname: perle-m5 address: 10.31.205.130 - snmp_profile: airos_6 + os: airos_6 ipv6_prefix: "2001:bf7:750:6800::/56" diff --git a/locations/perleberger36.yml b/locations/perleberger36.yml index 016bbd14d..e1a50af71 100644 --- a/locations/perleberger36.yml +++ b/locations/perleberger36.yml @@ -17,25 +17,25 @@ hosts: snmp_devices: - hostname: perleberger36-strom2a address: 10.36.243.162 - snmp_profile: airos_8 + os: airos_8 - hostname: perleberger36-tu address: 10.36.243.166 - snmp_profile: airos_8 + os: airos_8 - hostname: perleberger36-bht address: 10.36.243.170 - snmp_profile: airos_8 + os: airos_8 - hostname: perleberger36-scherer8 address: 10.36.243.174 - snmp_profile: airos_8 + os: airos_8 - hostname: perleberger36-turm-5ghz-nw address: 10.36.243.178 - snmp_profile: airos_8 + os: airos_8 - hostname: perleberger36-turm-5ghz-o address: 10.36.243.182 - snmp_profile: airos_8 + os: airos_8 - hostname: perleberger36-turm-5ghz-sw address: 10.36.243.186 - snmp_profile: airos_8 + os: airos_8 airos_dfs_reset: - name: "perleberger36-tu" diff --git a/locations/philmel.yml b/locations/philmel.yml index d1c8b7831..491de2f12 100644 --- a/locations/philmel.yml +++ b/locations/philmel.yml @@ -19,28 +19,28 @@ hosts: snmp_devices: - hostname: philmel-rhnk address: 10.230.2.4 - snmp_profile: af60 + os: af60 - hostname: philmel-nord-5ghz address: 10.230.2.6 - snmp_profile: airos_8 + os: airos_8 - hostname: philmel-ost address: 10.230.2.7 - snmp_profile: airos_6 + os: airos_6 - hostname: philmel-vaterhaus address: 10.230.2.8 - snmp_profile: airos_8 + os: airos_8 - hostname: philmel-sued address: 10.230.2.9 - snmp_profile: airos_6 + os: airos_6 - hostname: philmel-sued-5ac address: 10.230.2.10 - snmp_profile: airos_8 + os: airos_8 - hostname: philmel-west address: 10.230.2.11 - snmp_profile: airos_6 + os: airos_6 - hostname: philmel-ak36 address: 10.230.2.12 - snmp_profile: airos_8 + os: airos_8 airos_dfs_reset: - name: "philmel-ak36" diff --git a/locations/potse.yml b/locations/potse.yml index f124b9c5a..0914d09ec 100644 --- a/locations/potse.yml +++ b/locations/potse.yml @@ -17,7 +17,7 @@ hosts: snmp_devices: - hostname: potse-flughafen address: 10.31.130.194 - snmp_profile: airos_8 + os: airos_8 ipv6_prefix: "2001:bf7:750:4100::/56" diff --git a/locations/q216.yml b/locations/q216.yml index b04ba6352..027608f84 100644 --- a/locations/q216.yml +++ b/locations/q216.yml @@ -29,15 +29,15 @@ hosts: snmp_devices: # - hostname: q216-switch # address: 10.31.201.242 -# snmp_profile: swos_lite +# os: swos_lite - hostname: q216-tierpark address: 10.31.201.243 - snmp_profile: airos_8 + os: airos_8 - hostname: q216-spitta address: 10.31.201.245 - snmp_profile: airos_8 + os: airos_8 ssh_keys: # to stop merging other ssh-keys - comment: Hener diff --git a/locations/radbahn.yml b/locations/radbahn.yml index d31a5138c..44d0ee6ef 100644 --- a/locations/radbahn.yml +++ b/locations/radbahn.yml @@ -44,7 +44,7 @@ snmp_devices: - hostname: radbahn-emma address: 10.31.251.2 - snmp_profile: mikrotik_60g + os: mikrotik_60g # 10.31.248.240/28 # 10.31.248.240/29 - mgmt diff --git a/locations/rauchhaus.yml b/locations/rauchhaus.yml index 1054d3da3..c76d64157 100644 --- a/locations/rauchhaus.yml +++ b/locations/rauchhaus.yml @@ -47,15 +47,15 @@ hosts: snmp_devices: - hostname: rauchhaus-switch address: 10.31.98.226 - snmp_profile: routeros + os: routeros - hostname: rauchhaus-emma address: 10.31.98.227 - snmp_profile: airos_8 + os: airos_8 - hostname: rauchhaus-xdorf address: 10.31.98.228 - snmp_profile: airos_6 + os: airos_6 # 10.31.98.188/32 - mesh-emma # 10.31.36.104/32 - mesh-xdorf diff --git a/locations/rev99.yml b/locations/rev99.yml index ae02ce6ca..4d3a3a498 100644 --- a/locations/rev99.yml +++ b/locations/rev99.yml @@ -14,7 +14,7 @@ hosts: snmp_devices: - hostname: rev99-zwingli address: 10.31.214.130 - snmp_profile: airos_8 + os: airos_8 ipv6_prefix: '2001:bf7:830:be00::/56' diff --git a/locations/rhnk.yml b/locations/rhnk.yml index da5895720..2f122415b 100644 --- a/locations/rhnk.yml +++ b/locations/rhnk.yml @@ -32,43 +32,43 @@ hosts: snmp_devices: - hostname: rhnk-switch address: 10.31.153.2 - snmp_profile: swos + os: swos - hostname: rhnk-rhxb address: 10.31.153.11 - snmp_profile: af60 + os: af60 - hostname: rhnk-emma address: 10.31.153.15 - snmp_profile: airos_8 + os: airos_8 - hostname: rhnk-no-5ghz address: 10.31.153.20 - snmp_profile: airos_8 + os: airos_8 - hostname: rhnk-wsw-5ghz address: 10.31.153.21 - snmp_profile: airos_8 + os: airos_8 - hostname: rhnk-wsw-60ghz address: 10.31.153.22 - snmp_profile: af60 + os: af60 - hostname: rhnk-ssw-5ghz address: 10.31.153.23 - snmp_profile: airos_8 + os: airos_8 - hostname: rhnk-oso-60ghz address: 10.31.153.24 - snmp_profile: af60 + os: af60 - hostname: rhnk-nno-5ghz address: 10.31.153.25 - snmp_profile: airos_8 + os: airos_8 - hostname: rhnk-nno-60ghz address: 10.31.153.26 - snmp_profile: af60 + os: af60 airos_dfs_reset: - name: "rhnk-no-5ghz" diff --git a/locations/rhxb.yml b/locations/rhxb.yml index a2ca33fb8..01c18b8ea 100644 --- a/locations/rhxb.yml +++ b/locations/rhxb.yml @@ -17,59 +17,59 @@ hosts: snmp_devices: - hostname: rhxb-switch-roof address: 10.31.126.2 - snmp_profile: "edgeswitch" + os: "edgeswitch" - hostname: rhxb-l105 address: 10.31.126.4 - snmp_profile: "af60" + os: "af60" - hostname: rhxb-flughafen address: 10.31.126.5 - snmp_profile: "af60" + os: "af60" - hostname: rhxb-manstein address: 10.31.126.6 - snmp_profile: "airos_6" + os: "airos_6" - hostname: rhxb-emmaus address: 10.31.126.7 - snmp_profile: "airos_6" + os: "airos_6" - hostname: rhxb-rhnk address: 10.31.126.8 - snmp_profile: "af60" + os: "af60" - hostname: rhxb-technikmuseum address: 10.31.126.9 - snmp_profile: "airos_6" + os: "airos_6" - hostname: rhxb-no-5ghz address: 10.31.126.10 - snmp_profile: "airos_6" + os: "airos_6" - hostname: rhxb-nw-5ghz address: 10.31.126.11 - snmp_profile: "airos_6" + os: "airos_6" - hostname: rhxb-sw-5ghz address: 10.31.126.12 - snmp_profile: "airos_6" + os: "airos_6" - hostname: rhxb-5-so address: 10.31.126.13 - snmp_profile: "airos_6" + os: "airos_6" - hostname: rhxb-simeon address: 10.31.126.14 - snmp_profile: "airos_8" + os: "airos_8" - hostname: rhxb-nw-ac address: 10.31.126.15 - snmp_profile: "airos_8" + os: "airos_8" - hostname: rhxb-dragon address: 10.31.126.17 - snmp_profile: "airos_8" + os: "airos_8" airos_dfs_reset: diff --git a/locations/rigaer78.yml b/locations/rigaer78.yml index 03cfe816a..0fec7f02f 100644 --- a/locations/rigaer78.yml +++ b/locations/rigaer78.yml @@ -9,11 +9,11 @@ community: true snmp_devices: - hostname: rigaer78-sama address: 10.31.119.131 - snmp_profile: airos_8 + os: airos_8 - hostname: rigaer78-zwingli address: 10.31.119.132 - snmp_profile: airos_8 + os: airos_8 hosts: - hostname: rigaer78-core diff --git a/locations/rigaer83.yml b/locations/rigaer83.yml index b93daf281..adf4f421a 100644 --- a/locations/rigaer83.yml +++ b/locations/rigaer83.yml @@ -28,7 +28,7 @@ hosts: snmp_devices: - hostname: rigaer83-sama address: 10.31.81.83 - snmp_profile: airos_8 + os: airos_8 ipv6_prefix: "2001:bf7:830:8e00::/56" diff --git a/locations/rio.yml b/locations/rio.yml index c1a77658d..4374a274d 100644 --- a/locations/rio.yml +++ b/locations/rio.yml @@ -27,11 +27,11 @@ hosts: snmp_devices: - hostname: rio-emma address: 10.31.134.3 - snmp_profile: airos_6 + os: airos_6 - hostname: rio-simeon address: 10.31.134.4 - snmp_profile: airos_6 + os: airos_6 ipv6_prefix: "2001:bf7:830:6700::/56" diff --git a/locations/rixbox.yml b/locations/rixbox.yml index 2a42c99a3..6e0210f56 100644 --- a/locations/rixbox.yml +++ b/locations/rixbox.yml @@ -46,7 +46,7 @@ hosts: snmp_devices: - hostname: rixbox-rhnk address: 10.31.154.117 - snmp_profile: airos_8 + os: airos_8 # TODO: delete these old addresses: # - mesh: 10.230.3.164/... diff --git a/locations/saarbruecker.yml b/locations/saarbruecker.yml index 59d2e5ceb..4accbbc81 100644 --- a/locations/saarbruecker.yml +++ b/locations/saarbruecker.yml @@ -13,20 +13,20 @@ hosts: snmp_devices: - hostname: saarbruecker-sw address: 10.31.83.50 - snmp_profile: edgerouter + os: edgerouter - hostname: saarbruecker-hds address: 10.31.83.51 - snmp_profile: mikrotik_60g + os: mikrotik_60g - hostname: saarbruecker-sama address: 10.31.83.52 - snmp_profile: af60 + os: 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 + os: airos_8 ipv6_prefix: 2001:bf7:760:2201::/56 diff --git a/locations/sama.yml b/locations/sama.yml index c61fee1dd..ada7d34c8 100644 --- a/locations/sama.yml +++ b/locations/sama.yml @@ -40,35 +40,35 @@ hosts: snmp_devices: - hostname: sama-poe-1 address: 10.31.81.2 - snmp_profile: edgeswitch + os: edgeswitch - hostname: sama-poe-2 address: 10.31.81.3 - snmp_profile: edgeswitch + os: edgeswitch - hostname: sama-nord-5ghz address: 10.31.81.20 - snmp_profile: airos_8 + os: airos_8 - hostname: sama-ost-5ghz address: 10.31.81.21 - snmp_profile: airos_8 + os: airos_8 - hostname: sama-sued-5ghz address: 10.31.81.22 - snmp_profile: airos_8 + os: airos_8 - hostname: sama-west-5ghz address: 10.31.81.23 - snmp_profile: airos_8 + os: airos_8 - hostname: sama-sued-60ghz address: 10.31.81.26 - snmp_profile: af60 + os: af60 - hostname: sama-saarbruecker address: 10.31.81.30 - snmp_profile: af60 + os: af60 airos_dfs_reset: - name: "sama-nord-5ghz" diff --git a/locations/sama27.yml b/locations/sama27.yml index a252c3389..7044b1c28 100644 --- a/locations/sama27.yml +++ b/locations/sama27.yml @@ -17,7 +17,7 @@ hosts: snmp_devices: - hostname: sama27-sama address: 10.31.161.2 - snmp_profile: airos_8 + os: airos_8 # IPv4 10.31.161.0/27 diff --git a/locations/sav.yml b/locations/sav.yml index 0efdc5b2b..71adb499f 100644 --- a/locations/sav.yml +++ b/locations/sav.yml @@ -76,7 +76,7 @@ hosts: snmp_devices: - hostname: sav-emma address: 10.31.174.242 - snmp_profile: af60 + os: af60 networks: - vid: 10 diff --git a/locations/scharni.yml b/locations/scharni.yml index 5744e5bda..541246f06 100644 --- a/locations/scharni.yml +++ b/locations/scharni.yml @@ -42,11 +42,11 @@ hosts: snmp_devices: - hostname: scharni-sama address: 10.31.52.163 - snmp_profile: airos_8 + os: airos_8 - hostname: scharni-zwingli address: 10.31.52.164 - snmp_profile: airos_8 + os: airos_8 ipv6_prefix: '2001:bf7:830:8400::/56' diff --git a/locations/schreiner.yml b/locations/schreiner.yml index 596346fff..f46e23d73 100644 --- a/locations/schreiner.yml +++ b/locations/schreiner.yml @@ -17,19 +17,19 @@ snmp_devices: - hostname: schreiner-f2a address: 10.31.97.98 - snmp_profile: airos_6 + os: airos_6 - hostname: schreiner-sama address: 10.31.97.99 - snmp_profile: airos_6 + os: airos_6 - hostname: schreiner-ap-5ghz address: 10.31.97.101 - snmp_profile: airos_6 + os: airos_6 - hostname: schreiner-ap-2ghz address: 10.31.97.102 - snmp_profile: airos_6 + os: airos_6 ipv6_prefix: "2001:bf7:830:9100::/56" diff --git a/locations/segen.yml b/locations/segen.yml index bf952119c..3cf27d9ca 100644 --- a/locations/segen.yml +++ b/locations/segen.yml @@ -34,56 +34,56 @@ hosts: snmp_devices: - hostname: segen-switch address: 10.31.6.2 - snmp_profile: edgeswitch + os: 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 + os: airos_8 - hostname: segen-f2a address: 10.31.6.11 - snmp_profile: airos_8 + os: airos_8 - hostname: segen-stadalbert address: 10.31.6.12 - snmp_profile: airos_8 + os: airos_8 - hostname: segen-sw address: 10.31.6.13 - snmp_profile: airos_6 + os: airos_6 - hostname: segen-bht address: 10.31.6.14 - snmp_profile: airos_8 + os: airos_8 - hostname: segen-k12 address: 10.31.6.15 - snmp_profile: airos_8 + os: airos_8 - hostname: segen-no address: 10.31.6.16 - snmp_profile: airos_6 + os: airos_6 - hostname: segen-wsee address: 10.31.6.17 - snmp_profile: airos_6 + os: airos_6 - hostname: segen-n-5ghz address: 10.31.6.20 - snmp_profile: airos_6 + os: airos_6 - hostname: segen-o-5ghz address: 10.31.6.21 - snmp_profile: airos_6 + os: airos_6 - hostname: segen-s-5ghz address: 10.31.6.22 - snmp_profile: airos_6 + os: airos_6 - hostname: segen-w-5ghz address: 10.31.6.23 - snmp_profile: airos_6 + os: airos_6 airos_dfs_reset: - name: "segen-f2a" diff --git a/locations/simeon.yml b/locations/simeon.yml index 8ba9c427e..e8c62c40f 100644 --- a/locations/simeon.yml +++ b/locations/simeon.yml @@ -18,19 +18,19 @@ snmp_devices: - hostname: simeon-mgh address: 10.31.104.131 - snmp_profile: airos_8 + os: airos_8 - hostname: simeon-nord address: 10.31.104.132 - snmp_profile: airos_8 + os: airos_8 - hostname: simeon-emma address: 10.31.104.133 - snmp_profile: airos_6 + os: airos_6 - hostname: simeon-rhxb address: 10.31.104.134 - snmp_profile: airos_8 + os: airos_8 airos_dfs_reset: diff --git a/locations/ska95.yml b/locations/ska95.yml index 9edb16d81..3a8e3423b 100644 --- a/locations/ska95.yml +++ b/locations/ska95.yml @@ -43,7 +43,7 @@ hosts: snmp_devices: - hostname: ska95-emma address: 10.31.8.2 - snmp_profile: airos_6 + os: airos_6 networks: - vid: 10 diff --git a/locations/spitta13.yml b/locations/spitta13.yml index 98fc4fb26..be1e1a244 100644 --- a/locations/spitta13.yml +++ b/locations/spitta13.yml @@ -32,19 +32,19 @@ hosts: snmp_devices: - hostname: spitta13-switch address: 10.31.232.194 - snmp_profile: swos + os: swos - hostname: spitta13-zwingli address: 10.31.232.195 - snmp_profile: airos_8 + os: airos_8 - hostname: spitta13-ost address: 10.31.232.196 - snmp_profile: airos_8 + os: airos_8 - hostname: spitta13-j41 address: 10.31.232.199 - snmp_profile: airos_6 + os: airos_6 airos_dfs_reset: - name: "spitta-ost" diff --git a/locations/stadalbert.yml b/locations/stadalbert.yml index 623e283af..9d7f34789 100644 --- a/locations/stadalbert.yml +++ b/locations/stadalbert.yml @@ -46,11 +46,11 @@ hosts: snmp_devices: - hostname: stadalbert-segen address: 10.31.160.212 - snmp_profile: airos_8 + os: airos_8 - hostname: stadalbert-linie address: 10.31.160.213 - snmp_profile: mikrotik_60g + os: mikrotik_60g location__ssh_keys__to_merge: - comment: mcky diff --git a/locations/strom.yml b/locations/strom.yml index 05207f993..ae68add1d 100644 --- a/locations/strom.yml +++ b/locations/strom.yml @@ -27,19 +27,19 @@ hosts: snmp_devices: - hostname: strom-poe address: 10.31.130.66 - snmp_profile: tplink + os: tplink - hostname: strom-perleberger address: 10.31.130.67 - snmp_profile: airos_8 + os: airos_8 - hostname: strom-tub address: 10.31.130.68 - snmp_profile: airos_6 + os: airos_6 - hostname: strom-no-5ghz address: 10.31.130.69 - snmp_profile: airos_6 + os: airos_6 # Router: 10.31.130.64/26 2001:bf7:750:2a00::/56 diff --git a/locations/t1.yml b/locations/t1.yml index bf83a03c2..4418d507d 100644 --- a/locations/t1.yml +++ b/locations/t1.yml @@ -31,15 +31,15 @@ hosts: snmp_devices: - hostname: t1-switch address: 10.248.1.2 - snmp_profile: edgeswitch + os: edgeswitch - hostname: t1-zwingli address: 10.248.1.3 - snmp_profile: airos_8 + os: airos_8 - hostname: t1-ap-no address: 10.248.1.4 - snmp_profile: airos_8 + os: airos_8 # ROUTER: 10.248.1.0/25 # --MGMT: 10.248.1.0/28 diff --git a/locations/teufelsberg.yml b/locations/teufelsberg.yml index 6edee45d7..9b19a165a 100644 --- a/locations/teufelsberg.yml +++ b/locations/teufelsberg.yml @@ -51,27 +51,27 @@ snmp_devices: - hostname: teufelsberg-switch address: 10.31.213.2 - snmp_profile: swos + os: swos - hostname: teufelsberg-ak36 address: 10.31.213.7 - snmp_profile: af60 + os: af60 - hostname: teufelsberg-ilr address: 10.31.213.8 - snmp_profile: af60 + os: af60 - hostname: teufelsberg-nw address: 10.31.213.10 - snmp_profile: airos_8 + os: airos_8 - hostname: teufelsberg-nord address: 10.31.213.11 - snmp_profile: airos_8 + os: airos_8 - hostname: teufelsberg-ono address: 10.31.213.12 - snmp_profile: airos_8 + os: airos_8 airos_dfs_reset: diff --git a/locations/vaterhaus.yml b/locations/vaterhaus.yml index 57850ccaf..b5c33c885 100644 --- a/locations/vaterhaus.yml +++ b/locations/vaterhaus.yml @@ -26,31 +26,31 @@ hosts: snmp_devices: - hostname: vaterhaus-zwingli address: 10.230.192.202 - snmp_profile: af60 + os: af60 - hostname: vaterhaus-w address: 10.230.192.203 - snmp_profile: airos_8 + os: airos_8 # - hostname: vaterhaus-no # address: 10.230.192.204 - # snmp_profile: mikrotik + # os: mikrotik - hostname: vaterhaus-o address: 10.230.192.205 - snmp_profile: airos_8 + os: airos_8 - hostname: vaterhaus-adlershof address: 10.230.192.206 - snmp_profile: airos_8 + os: airos_8 - hostname: vaterhaus-cg47 address: 10.230.192.207 - snmp_profile: airos_8 + os: airos_8 # - hostname: vaterhaus-m2no # address: 10.230.192.208 - # snmp_profile: airos_6 + # os: airos_6 ipv6_prefix: "2001:bf7:830:a500::/56" diff --git a/locations/w38b.yml b/locations/w38b.yml index fa1923f31..140cba889 100644 --- a/locations/w38b.yml +++ b/locations/w38b.yml @@ -21,10 +21,10 @@ hosts: snmp_devices: - hostname: w38b-sama address: 10.31.212.3 - snmp_profile: af60 + os: af60 - hostname: w38b-rhnk address: 10.31.212.4 - snmp_profile: af60 + os: af60 # IPs ipv6_prefix: '2001:bf7:830:bc00::/56' diff --git a/locations/walde.yml b/locations/walde.yml index 098577237..411b5ffd5 100644 --- a/locations/walde.yml +++ b/locations/walde.yml @@ -17,7 +17,7 @@ hosts: snmp_devices: - hostname: walde-emma address: 10.31.92.2 - snmp_profile: airos_8 + os: airos_8 ipv6_prefix: "2001:bf7:830:b00::/56" diff --git a/locations/weidenbaum.yml b/locations/weidenbaum.yml index e7a9df17f..e0ef1ca7a 100644 --- a/locations/weidenbaum.yml +++ b/locations/weidenbaum.yml @@ -18,7 +18,7 @@ snmp_devices: - hostname: weidenbaum-bht address: 10.31.204.130 - snmp_profile: airos_8 + os: airos_8 ipv6_prefix: "2001:bf7:780:a00::/56" diff --git a/locations/wilgu10.yml b/locations/wilgu10.yml index d3f9643fd..ff43c395d 100644 --- a/locations/wilgu10.yml +++ b/locations/wilgu10.yml @@ -36,11 +36,11 @@ hosts: snmp_devices: - hostname: wilgu10-zwingli address: 10.36.190.181 - snmp_profile: airos_8 + os: airos_8 - hostname: wilgu10-sama address: 10.36.190.182 - snmp_profile: af60 + os: af60 ipv6_prefix: "2001:bf7:860:900::/56" diff --git a/locations/xdorf.yml b/locations/xdorf.yml index d3e20643b..a2bbf45ad 100644 --- a/locations/xdorf.yml +++ b/locations/xdorf.yml @@ -18,15 +18,15 @@ snmp_devices: - hostname: xdorf-rauchhaus address: 10.31.54.162 - snmp_profile: airos_6 + os: airos_6 - hostname: xdorf-ap1 address: 10.31.54.163 - snmp_profile: airos_6 + os: airos_6 - hostname: xdorf-ap2 address: 10.31.54.164 - snmp_profile: airos_6 + os: airos_6 ipv6_prefix: "2001:bf7:830:9000::/56" diff --git a/locations/zwingli.yml b/locations/zwingli.yml index 2f398b85a..49610f38c 100644 --- a/locations/zwingli.yml +++ b/locations/zwingli.yml @@ -87,39 +87,39 @@ airos_dfs_reset: snmp_devices: - hostname: zwingli-switch address: 10.31.115.2 - snmp_profile: swos + os: swos - hostname: zwingli-nord-5ghz address: 10.31.115.20 - snmp_profile: airos_8 + os: airos_8 - hostname: zwingli-ost-5ghz address: 10.31.115.21 - snmp_profile: airos_8 + os: airos_8 - hostname: zwingli-sued-5ghz address: 10.31.115.22 - snmp_profile: airos_8 + os: airos_8 - hostname: zwingli-west-5ghz address: 10.31.115.23 - snmp_profile: airos_8 + os: airos_8 - hostname: zwingli-sama address: 10.31.115.3 - snmp_profile: af60 + os: af60 - hostname: zwingli-agym address: 10.31.115.5 - snmp_profile: af60 + os: af60 - hostname: zwingli-vaterhaus address: 10.31.115.6 - snmp_profile: af60 + os: af60 - hostname: zwingli-emma address: 10.31.115.7 - snmp_profile: af60 + os: af60 ipv6_prefix: "2001:bf7:830:9800::/56" # ipv4-prefix: 10.31.115.0/24 diff --git a/roles/cfg_openwrt/templates/common/collectd/conf.d/bbb-snmp.conf.j2 b/roles/cfg_openwrt/templates/common/collectd/conf.d/bbb-snmp.conf.j2 index b0a053397..d9f2d0581 100644 --- a/roles/cfg_openwrt/templates/common/collectd/conf.d/bbb-snmp.conf.j2 +++ b/roles/cfg_openwrt/templates/common/collectd/conf.d/bbb-snmp.conf.j2 @@ -1,10 +1,10 @@ #jinja2: trim_blocks: "true", lstrip_blocks: "true" -{% set profiles = snmp_devices | default([]) | map(attribute='snmp_profile') | list | unique %} +{% set profiles = snmp_devices | default([]) | map(attribute='os') | list | unique %} {# collect profiles from new way of writing hosts as well and append them #} {% for host in groups[group_names[0]]%} - {% if hostvars[host]["snmp_profile"] is defined %} - {% do profiles.append(hostvars[host]["snmp_profile"]) %} + {% if hostvars[host]["os"] is defined %} + {% do profiles.append(hostvars[host]["os"]) %} {% endif %} {% endfor %} @@ -31,15 +31,15 @@ LoadPlugin snmp Version 1 Interval 30 Community '{{ device['community'] | default('public') }}' - {% for metric_name in collectd_snmp_profiles[device['snmp_profile']] %} - Collect "{{ device['snmp_profile'] }}_{{ metric_name }}" + {% for metric_name in collectd_snmp_profiles[device['os']] %} + Collect "{{ device['os'] }}_{{ metric_name }}" {% endfor %} {% endfor %} {# Add non-openwrt hosts that are defined as hosts as well #} {# Only works if mgmt-IPs are defined in the standard way #} {% for host in groups[group_names[0]]%} - {% if hostvars[host]["snmp_profile"] is defined %} + {% if hostvars[host]["os"] is defined %} {# Calculate the IP for this host based on the mgmt assignment #} {% set mgmt_network = networks | selectattr('role', 'equalto', 'mgmt') | first %} @@ -47,8 +47,8 @@ LoadPlugin snmp Version 1 Interval 30 Community '{{ host['community'] | default('public') }}' - {% for metric_name in collectd_snmp_profiles[hostvars[host]["snmp_profile"]] %} - Collect "{{ hostvars[host]["snmp_profile"] }}_{{ metric_name }}" + {% for metric_name in collectd_snmp_profiles[hostvars[host]["os"]] %} + Collect "{{ hostvars[host]["os"] }}_{{ metric_name }}" {% endfor %} {% endif %} From 0b1e244e8804890ec642114db01ecd63d8932baf Mon Sep 17 00:00:00 2001 From: Ffhener Date: Fri, 25 Oct 2024 23:17:50 +0200 Subject: [PATCH 8/9] fix model css610: duplicate os definition --- group_vars/model_mikrotik_css610_8p_2s_in.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/group_vars/model_mikrotik_css610_8p_2s_in.yml b/group_vars/model_mikrotik_css610_8p_2s_in.yml index 470535ed2..1f7cfa5cc 100644 --- a/group_vars/model_mikrotik_css610_8p_2s_in.yml +++ b/group_vars/model_mikrotik_css610_8p_2s_in.yml @@ -3,5 +3,3 @@ os: swos_lite brand_nice: MikroTik model_nice: Cloud Smart Switch version_nice: 610-8P-2S+IN - -os: swos_lite From ba885ce098766ff1ea8dc1c4c0624c5121685897 Mon Sep 17 00:00:00 2001 From: Ffhener Date: Fri, 25 Oct 2024 23:18:18 +0200 Subject: [PATCH 9/9] fix collectd --- .../templates/common/collectd/conf.d/bbb-snmp.conf.j2 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/roles/cfg_openwrt/templates/common/collectd/conf.d/bbb-snmp.conf.j2 b/roles/cfg_openwrt/templates/common/collectd/conf.d/bbb-snmp.conf.j2 index d9f2d0581..cf5d48db8 100644 --- a/roles/cfg_openwrt/templates/common/collectd/conf.d/bbb-snmp.conf.j2 +++ b/roles/cfg_openwrt/templates/common/collectd/conf.d/bbb-snmp.conf.j2 @@ -1,9 +1,9 @@ #jinja2: trim_blocks: "true", lstrip_blocks: "true" -{% set profiles = snmp_devices | default([]) | map(attribute='os') | list | unique %} +{% set profiles = snmp_devices | default([]) | map(attribute='os') | reject('search', 'openwrt') | list | unique %} {# collect profiles from new way of writing hosts as well and append them #} {% for host in groups[group_names[0]]%} - {% if hostvars[host]["os"] is defined %} + {% if hostvars[host]["os"] != "openwrt" %} {% do profiles.append(hostvars[host]["os"]) %} {% endif %} {% endfor %} @@ -39,7 +39,7 @@ LoadPlugin snmp {# Add non-openwrt hosts that are defined as hosts as well #} {# Only works if mgmt-IPs are defined in the standard way #} {% for host in groups[group_names[0]]%} - {% if hostvars[host]["os"] is defined %} + {% if hostvars[host]["os"] != "openwrt" %} {# Calculate the IP for this host based on the mgmt assignment #} {% set mgmt_network = networks | selectattr('role', 'equalto', 'mgmt') | first %}