From 79182e5503bb220ba524bced841079a7f49e3ab5 Mon Sep 17 00:00:00 2001
From: Christian Pointner <equinox@spreadspace.org>
Date: Sun, 1 Aug 2021 22:16:30 +0200
Subject: fix config for ele-tub

---
 inventory/group_vars/elevate-festival/vars.yml |  1 +
 inventory/host_vars/ele-tub.yml                | 20 ++++++++++++++++----
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/inventory/group_vars/elevate-festival/vars.yml b/inventory/group_vars/elevate-festival/vars.yml
index 9344c7a6..683d357d 100644
--- a/inventory/group_vars/elevate-festival/vars.yml
+++ b/inventory/group_vars/elevate-festival/vars.yml
@@ -242,6 +242,7 @@ network_zones:
     - 10.12.0.10
     offsets:
       ele-tub: 14
+      ele-br-tub1: 13
 
   murat_transfer:
     description: "transfer network for upstream via mur.at"
diff --git a/inventory/host_vars/ele-tub.yml b/inventory/host_vars/ele-tub.yml
index 47c06223..a89261ae 100644
--- a/inventory/host_vars/ele-tub.yml
+++ b/inventory/host_vars/ele-tub.yml
@@ -37,6 +37,11 @@ openwrt_packages_add:
   - iperf
   - iperf3
   - mtr
+  - iptraf-ng
+  - prometheus-node-exporter-lua
+  - prometheus-node-exporter-lua-nat_traffic
+  - prometheus-node-exporter-lua-netstat
+  - prometheus-node-exporter-lua-openwrt
 
 
 openwrt_mixin:
@@ -66,8 +71,8 @@ openwrt_mixin:
         FFSUBNET_IPADDR=$(uci get network.ffsubnet.ipaddr)
         FFSUBNET_NETMASK=$(uci get network.ffsubnet.netmask)
 
-        iptables -A FORWARD -i "$FFSUBNET_IF" -o "$FF_IF" -s "$FFSUBNET_IPADDR/$FFSUBNET_IPADDR" -j ACCEPT
-        iptables -A FORWARD -i "$FF_IF" -o "$FFSUBNET_IF" -d "$FFSUBNET_IPADDR/$FFSUBNET_IPADDR" -j ACCEPT
+        iptables -A FORWARD -i "$FFSUBNET_IF" -o "$FF_IF" -s "$FFSUBNET_IPADDR/$FFSUBNET_NETMASK" -j ACCEPT
+        iptables -A FORWARD -i "$FF_IF" -o "$FFSUBNET_IF" -d "$FFSUBNET_IPADDR/$FFSUBNET_NETMASK" -j ACCEPT
         iptables -P FORWARD DROP
       }
 
@@ -118,7 +123,7 @@ openwrt_uci:
 
     - name: interface 'mgmt'
       options:
-        ifname: eth0
+        ifname: eth2
         proto: static
         ipaddr: "{{ network_zones.mgmt.prefix | ipaddr(network_zones.mgmt.offsets[inventory_hostname]) | ipaddr('address') }}"
         netmask: "{{ network_zones.mgmt.prefix | ipaddr('netmask') }}"
@@ -132,7 +137,7 @@ openwrt_uci:
 
     - name: interface 'ff'
       options:
-        ifname: eth2
+        ifname: eth0
         proto: static
         ipaddr: 10.12.91.28
         netmask: 255.255.0.0
@@ -170,3 +175,10 @@ openwrt_uci:
       options:
         netaddr: "{{ network_zones.funkfeuer.prefix | ipaddr('network') }}"
         netmask: "{{ network_zones.funkfeuer.prefix | ipaddr('netmask') }}"
+
+  prometheus-node-exporter-lua:
+    - name: prometheus-node-exporter-lua 'main'
+      options:
+        listen_interface: 'mgmt'
+        listen_ipv6: '0'
+        listen_port: '9100'
-- 
cgit v1.2.3