ansible-inventory

@@ -23,8 +23,8 @@ ap-b682 ip=10.85.1.40 location=tent-3          channel_2g=11 channel_5g=64  txpo
 
 [accesspoints:vars]
 ansible_remote_tmp=/tmp
-garet_profile=aruba-ap-105_22.03
-garet_release=9974455
+garet_profile=aruba-ap-105_21.02
+garet_release=845a6ba
 
 [switches]
 sw-access01 ip=10.84.1.11 base_mac=bc:cf:4f:e3:bb:8d
@@ -41,7 +41,7 @@ ffl-ans-gw-core01 ip=10.85.1.1
 
 [gateways:vars]
 ansible_remote_tmp=/tmp
-garet_profile=sophos-sg-125r2_22.03
+garet_profile=sophos-sg-125r2-22.03
 garet_release=89cbd27
 
 [server]

documentation/INCIDENTS.md

@@ -1338,47 +1338,3 @@ Afterwards we disabled the temporary backoffice wifi in tent 1 (`e3d8369`).
 The new ap is connected via a `CAT.7 outdoor 30m` cable and is plugged into `sw-acces01 port 6`.
 
 This closes incident `031`.
-
-
-034 2023.01.08 04:00 - 05:30 | (maintenance) bring accesspoints onto OpenWrt 22.03
-----------------------------------------------------------------------------------
-
-**target version**:
-```
- -----------------------------------------------------
- https://git.sr.ht/~hirnpfirsich/garet
- garet 9974455, aruba-ap-105_22.03
- -----------------------------------------------------
-```
-
-**changelog**:
-* `OpenWrt 22.03.2`
-* support for `lldp` -- needs to be configured
-
-**canary test**:
-* `ap-c5d1` (adp)
-* `ap-b6ee` (ans)
-* down from 04:00 - 04:05
-* `playbook_provision_accesspoints` restarted wifi on `ap-c5d1` 04:21 one more time
-
-**Deutscher Platz**:
-* down from 05:00 - 05:06
-* `playbook_provision_accesspoints` restarted wifi on the following aps again at around 05:10
-	* `ap-8f39`
-	* `ap-c495`
-	* `ap-ac7c`
-	* `ap-0b99`
-
-**Arno-Nitzsche-Str**:
-* down from 05:21 - 05:27
-* `playbook_provision_accesspoints` did not restart the wifi again
-
-**summarized impact**:
-* `Arno-Nitzsche-Str`: wifi down from 05:21 - 05:27
-	* `ap-b6ee` from 04:00 - 04:05
-* `Deutscher Platz`:   wifi down from 05:00 - 05:06
-	* `ap-c5d1` from 04:00 - 04:05
-	* `ap-8f39` additional wifi restart at 05:10
-	* `ap-c495` additional wifi restart at 05:10
-	* `ap-ac7c` additional wifi restart at 05:10
-	* `ap-0b99` additional wifi restart at 05:10

playbook_provision_accesspoints.yml

@@ -12,6 +12,16 @@
       notify:
         - "reload {{ item | basename }}"
 
+    - name: install custom prometheus-node-exporter-lua-wifi
+      copy:
+        src: files/wifi.lua
+        dest: /usr/lib/lua/prometheus-collectors/wifi.lua
+        owner: root
+        group: root
+        mode: 0755
+      notify:
+        - restart prometheus-node-exporter-lua
+
   handlers:
     - name: reload network
       service:
@@ -26,7 +36,7 @@
         name: system
         state: reloaded
 
-    - name: reload lldpd
+    - name: restart prometheus-node-exporter-lua
       service:
-        name: lldpd
-        state: reloaded
+        name: prometheus-node-exporter-lua
+        state: restarted

playbook_provision_gateway.yml

@@ -38,11 +38,6 @@
       notify:
         - restart frr
 
-    - name: install lldpd
-      opkg:
-        name: lldpd
-        update_cache: yes
-
   handlers:
     - name: reload dhcp
       service:
@@ -74,11 +69,6 @@
         name: frr
         state: restarted
 
-    - name: reload lldpd
-      service:
-        name: lldpd
-        state: reloaded
-
 - name: custom changes for ffl-ans-gw-core01 (offloader vm, ...)
   hosts: ffl-ans-gw-core01
   tasks:

playbook_sysupgrade.yml

@@ -16,10 +16,6 @@
       setup:
         filter: ansible_local
 
-    - name: stringify garet_release...
-      set_fact:
-        garet_release: "{{ garet_release | string }}"
-
     - name: handle update
       block:
         - name: upload new firmware

templates/accesspoints/etc/config/lldpd

@@ -1,13 +0,0 @@
-config lldpd config
-	option enable_cdp   0
-	option enable_fdp   0
-	option enable_sonmp 0
-	option enable_edp   0
-
-
-	option lldp_class    4
-	option lldp_mgmt_ip  "{{ ip }}"
-	option lldp_location "{{ location }}"
-
-	list interface "loopback"
-	list interface "eth0"

templates/gateways/ffl-ans-gw-core01/etc/config/lldpd

@@ -1,16 +0,0 @@
-config lldpd config
-	option enable_cdp   0
-	option enable_fdp   0
-	option enable_sonmp 0
-	option enable_edp   0
-
-
-	option lldp_class    4
-	option lldp_mgmt_ip  "{{ ip }}"
-	option lldp_location ""
-
-	list interface "loopback"
-	list interface "eth0"
-	list interface "eth1"
-	list interface "eth2"
-	list interface "eth3"

templates/gateways/gw-core01/etc/config/lldpd

@@ -1,20 +0,0 @@
-config lldpd config
-	option enable_cdp   0
-	option enable_fdp   0
-	option enable_sonmp 0
-	option enable_edp   0
-
-
-	option lldp_class    4
-	option lldp_mgmt_ip  "{{ ip }}"
-	option lldp_location ""
-
-	list interface "loopback"
-	list interface "eth0"
-	list interface "eth1"
-	list interface "eth2"
-	list interface "eth3"
-	list interface "eth4"
-	list interface "eth5"
-	list interface "eth6"
-	list interface "eth7"