From 156a17db3b99d81ad0ad9c70c28820f3928bf09f Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Fri, 27 Aug 2021 01:05:34 +0200 Subject: port new openwrt support to elevate promzone --- inventory/host_vars/ch-router.yml | 2 +- inventory/host_vars/ele-mon.yml | 18 ------------------ inventory/host_vars/ele-router.yml | 5 +++++ inventory/host_vars/ele-tub.yml | 5 +++++ 4 files changed, 11 insertions(+), 19 deletions(-) (limited to 'inventory/host_vars') 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: | -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 -- cgit v1.2.3