9 files changed, 27 insertions, 20 deletions
diff --git a/inventory/group_vars/chaos-at-home-ap/vars.yml b/inventory/group_vars/chaos-at-home-ap/vars.yml
index 640de99f..d5dd6b98 100644
--- a/inventory/group_vars/chaos-at-home-ap/vars.yml
+++ b/inventory/group_vars/chaos-at-home-ap/vars.yml
@@ -47,6 +47,6 @@ accesspoint_wireless_ifaces_yaml: |
   {% endfor %}
 
 
-prometheus_scrape_endpoint:  "{{ network_mgmt_zone.prefix | ipaddr(network_mgmt_zone.offsets[inventory_hostname]) | ipaddr('address') }}:9100"
+prometheus_scrape_endpoint: "{{ network_mgmt_zone.prefix | ipaddr(network_mgmt_zone.offsets[inventory_hostname]) | ipaddr('address') }}:9100"
 prometheus_exporters_default:
   - openwrt
diff --git a/inventory/group_vars/ele-ap/vars.yml b/inventory/group_vars/ele-ap/vars.yml
index 8a8cf199..f6c7ca85 100644
--- a/inventory/group_vars/ele-ap/vars.yml
+++ b/inventory/group_vars/ele-ap/vars.yml
@@ -74,3 +74,8 @@ accesspoint_wireless_ifaces_yaml: |
       key: '{{ accesspoint_zones[zone].key }}'
   {%   endfor %}
   {% endfor %}
+
+
+prometheus_scrape_endpoint: "{{ network_mgmt_zone.prefix | ipaddr(network_mgmt_zone.offsets[inventory_hostname]) | ipaddr('address') }}:9100"
+prometheus_exporters_default:
+  - openwrt
diff --git a/inventory/group_vars/ele-ups/vars.yml b/inventory/group_vars/ele-ups/vars.yml
index 182e7363..8b420c61 100644
--- a/inventory/group_vars/ele-ups/vars.yml
+++ b/inventory/group_vars/ele-ups/vars.yml
@@ -158,3 +158,8 @@ openwrt_uci:
         password: secret
         instcmd:
           - ALL
+
+
+prometheus_scrape_endpoint: "{{ network_mgmt_zone.prefix | ipaddr(network_mgmt_zone.offsets[inventory_hostname]) | ipaddr('address') }}:9100"
+prometheus_exporters_default:
+  - openwrt
diff --git a/inventory/group_vars/promzone-elevate-festival/vars.yml b/inventory/group_vars/promzone-elevate-festival/vars.yml
index 85ade2dc..154c4b4a 100644
--- a/inventory/group_vars/promzone-elevate-festival/vars.yml
+++ b/inventory/group_vars/promzone-elevate-festival/vars.yml
@@ -8,6 +8,7 @@ prometheus_exporters_default:
 prometheus_server: ele-mon
 prometheus_server_jobs:
   - node
+  - openwrt
 
 prometheus_zone_name: Elevate Festival
 prometheus_zone_targets: "{{ groups['promzone-elevate-festival'] }}"
diff --git a/inventory/host_vars/ch-router.yml b/inventory/host_vars/ch-router.yml
index 85d065d4..db9c4525 100644
--- a/inventory/host_vars/ch-router.yml
+++ b/inventory/host_vars/ch-router.yml
@@ -373,6 +373,6 @@ virsh_domxml: |
   </domain>
 
 
-prometheus_scrape_endpoint:  "{{ network_zones.mgmt.prefix | ipaddr(network_zones.mgmt.offsets[inventory_hostname]) | ipaddr('address') }}:9100"
+prometheus_scrape_endpoint: "{{ network_zones.mgmt.prefix | ipaddr(network_zones.mgmt.offsets[inventory_hostname]) | ipaddr('address') }}:9100"
 prometheus_exporters_default:
   - openwrt
diff --git a/inventory/host_vars/ele-mon.yml b/inventory/host_vars/ele-mon.yml
index 54d02218..8d683174 100644
--- a/inventory/host_vars/ele-mon.yml
+++ b/inventory/host_vars/ele-mon.yml
@@ -128,24 +128,6 @@ grafana_secret_key: "{{ vault_grafana_secret_key }}"
 
 
 prometheus_server_jobs_extra: |
-  - job_name: 'node-openwrt'
-    scheme: http
-    static_configs:
-    - targets:
-      - 192.168.42.170:9100   ## ele-ap-nextlib0
-      - 192.168.42.171:9100   ## ele-ap-nextlib1
-      - 192.168.42.172:9100   ## ele-ap-nextlib2
-      #- 192.168.42.173:9100   ## ele-ap-nextlib3
-      #- 192.168.42.174:9100   ## ele-ap-nextlib4
-      - 192.168.42.175:9100   ## ele-ap-nextlib5
-      - 192.168.42.176:9100   ## ele-ap-nextlib6
-      - 192.168.42.210:9100   ## ele-ups-nextlib0
-      - 192.168.42.211:9100   ## ele-ups-nextlib1
-      - 192.168.42.212:9100   ## ele-ups-nextlib2
-      - 192.168.42.213:9100   ## ele-ups-nextlib3
-      - 192.168.42.240:9100   ## ele-tub
-      - 192.168.42.254:9100   ## ele-router
-
   - job_name: 'nut'
     metrics_path: /proxy
     params:
diff --git a/inventory/host_vars/ele-router.yml b/inventory/host_vars/ele-router.yml
index aebc6e8b..3a50d302 100644
--- a/inventory/host_vars/ele-router.yml
+++ b/inventory/host_vars/ele-router.yml
@@ -402,3 +402,8 @@ openwrt_uci:
 
   dhcp: "{{ openwrt_dhcp_base + openwrt_dhcp_internal + openwrt_dhcp_external }}"
   network: "{{ openwrt_network_base + openwrt_network_internal + openwrt_network_external }}"
+
+
+prometheus_scrape_endpoint: "{{ network_mgmt_zone.prefix | ipaddr(network_mgmt_zone.offsets[inventory_hostname]) | ipaddr('address') }}:9100"
+prometheus_exporters_default:
+  - openwrt
diff --git a/inventory/host_vars/ele-tub.yml b/inventory/host_vars/ele-tub.yml
index 24d35b2d..ee2bed4d 100644
--- a/inventory/host_vars/ele-tub.yml
+++ b/inventory/host_vars/ele-tub.yml
@@ -185,3 +185,8 @@ openwrt_uci:
         listen_interface: 'mgmt'
         listen_ipv6: '0'
         listen_port: '9100'
+
+
+prometheus_scrape_endpoint: "{{ network_zones.mgmt.prefix | ipaddr(network_zones.mgmt.offsets[inventory_hostname]) | ipaddr('address') }}:9100"
+prometheus_exporters_default:
+  - openwrt
diff --git a/inventory/hosts.ini b/inventory/hosts.ini
index e38cc1a8..1abf21a0 100644
--- a/inventory/hosts.ini
+++ b/inventory/hosts.ini
@@ -415,7 +415,11 @@ ele-mon
 ele-telesto
 ele-dione
 ele-helene
+ele-router
+ele-tub
 [promzone-elevate-festival:children]
+ele-ap
+ele-ups
 promzone-elevate-festival-server
 emc