prometheus-node-exporter: fix ubus stations
Not every radio has also ubus support. Only query radios with ubus
functions.
Signed-off-by: Nick Hainke <vincent@systemli.org>
[fixup, call ubus.connect() once per scrape]
Signed-off-by: Etienne Champetier <champetier.etienne@gmail.com>
(cherry picked from commit 0a07237514
)
This commit is contained in:
parent
a9accc565d
commit
942a091633
2 changed files with 11 additions and 10 deletions
|
@ -4,7 +4,7 @@
|
|||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=prometheus-node-exporter-lua
|
||||
PKG_VERSION:=2022.04.23
|
||||
PKG_VERSION:=2022.04.30
|
||||
PKG_RELEASE:=1
|
||||
|
||||
PKG_MAINTAINER:=Etienne CHAMPETIER <champetier.etienne@gmail.com>
|
||||
|
|
|
@ -1,14 +1,13 @@
|
|||
local ubus = require "ubus"
|
||||
local bit = require "bit"
|
||||
|
||||
local function get_wifi_interfaces() -- based on hostapd_stations.lua
|
||||
local u = ubus.connect()
|
||||
local status = u:call("network.wireless", "status", {})
|
||||
local function get_wifi_hostapd_interfaces(u)
|
||||
local ubuslist = u:objects()
|
||||
local interfaces = {}
|
||||
|
||||
for _, dev_table in pairs(status) do
|
||||
for _, intf in ipairs(dev_table['interfaces']) do
|
||||
table.insert(interfaces, intf['ifname'])
|
||||
for _,net in ipairs(ubuslist) do
|
||||
if net.find(net,"hostapd.") then
|
||||
table.insert(interfaces, net)
|
||||
end
|
||||
end
|
||||
|
||||
|
@ -16,6 +15,7 @@ local function get_wifi_interfaces() -- based on hostapd_stations.lua
|
|||
end
|
||||
|
||||
local function scrape()
|
||||
local u = ubus.connect()
|
||||
local metric_hostapd_ubus_station_rrm_caps_link_measurement =
|
||||
metric("hostapd_ubus_station_rrm_caps_link_measurement", "gauge")
|
||||
local metric_hostapd_ubus_station_rrm_caps_neighbor_report =
|
||||
|
@ -55,14 +55,15 @@ local function scrape()
|
|||
metric_hostapd_ubus_station_rrm_caps_ftm_range_report(label_station, rrm_caps_ftm_range_report)
|
||||
end
|
||||
|
||||
for _, ifname in ipairs(get_wifi_interfaces()) do
|
||||
local u = ubus.connect()
|
||||
local clients_call = u:call("hostapd." .. ifname, "get_clients", {})
|
||||
for _, hostapd_int in ipairs(get_wifi_hostapd_interfaces(u)) do
|
||||
local clients_call = u:call(hostapd_int, "get_clients", {})
|
||||
local ifname = hostapd_int:gsub("hostapd.", "")
|
||||
|
||||
for client, client_table in pairs(clients_call['clients']) do
|
||||
evaluate_metrics(ifname, clients_call['freq'], client, client_table)
|
||||
end
|
||||
end
|
||||
u:close()
|
||||
end
|
||||
|
||||
return { scrape = scrape }
|
||||
|
|
Loading…
Reference in a new issue