[packages PATCH 06/12] prometheus-node-exporter-lua: use the new ubus dsl metrics
Andre Heider
a.heider at gmail.com
Tue Dec 15 04:35:25 EST 2020
This is significantly faster.
Signed-off-by: Andre Heider <a.heider at gmail.com>
---
.../lib/lua/prometheus-collectors/ltq-dsl.lua | 108 ++++++++----------
1 file changed, 47 insertions(+), 61 deletions(-)
diff --git a/utils/prometheus-node-exporter-lua/files/usr/lib/lua/prometheus-collectors/ltq-dsl.lua b/utils/prometheus-node-exporter-lua/files/usr/lib/lua/prometheus-collectors/ltq-dsl.lua
index a59c1507e..0a33fa4fd 100644
--- a/utils/prometheus-node-exporter-lua/files/usr/lib/lua/prometheus-collectors/ltq-dsl.lua
+++ b/utils/prometheus-node-exporter-lua/files/usr/lib/lua/prometheus-collectors/ltq-dsl.lua
@@ -1,14 +1,6 @@
-local function scrape()
- local fd = io.popen("/etc/init.d/dsl_control lucistat")
- local dsl_func = loadstring(fd:read("*a"))
- fd:close()
-
- if not dsl_func then
- return
- end
-
- local dsl_stat = dsl_func()
+local ubus = require "ubus"
+local function scrape()
local dsl_line_attenuation = metric("dsl_line_attenuation_db", "gauge")
local dsl_signal_attenuation = metric("dsl_signal_attenuation_db", "gauge")
local dsl_snr = metric("dsl_signal_to_noise_margin_db", "gauge")
@@ -19,82 +11,76 @@ local function scrape()
local dsl_error_seconds_total = metric("dsl_error_seconds_total", "counter")
local dsl_errors_total = metric("dsl_errors_total", "counter")
+ local u = ubus.connect()
+ local m = u:call("dsl", "metrics", {})
+
-- dsl hardware/firmware information
metric("dsl_info", "gauge", {
- atuc_vendor_id = dsl_stat.atuc_vendor_id,
- atuc_system_vendor_id = dsl_stat.atuc_system_vendor_id,
- chipset = dsl_stat.chipset,
- firmware_version = dsl_stat.firmware_version,
- api_version = dsl_stat.api_version,
+ atuc_vendor = m.atu_c.vendor,
+ atuc_system_vendor = m.atu_c.system_vendor,
+ chipset = m.chipset,
+ firmware_version = m.firmware_version,
+ api_version = m.api_version,
}, 1)
-- dsl line settings information
metric("dsl_line_info", "gauge", {
- xtse1 = dsl_stat.xtse1,
- xtse2 = dsl_stat.xtse2,
- xtse3 = dsl_stat.xtse3,
- xtse4 = dsl_stat.xtse4,
- xtse5 = dsl_stat.xtse5,
- xtse6 = dsl_stat.xtse6,
- xtse7 = dsl_stat.xtse7,
- xtse8 = dsl_stat.xtse8,
- annex = dsl_stat.annex_s,
- mode = dsl_stat.line_mode_s,
- profile = dsl_stat.profile_s,
+ annex = m.annex,
+ mode = m.mode,
+ profile = m.profile,
}, 1)
- -- dsl up is 1 if the line is up and running
local dsl_up
- if dsl_stat.line_state == "UP" then
+ if m.up then
dsl_up = 1
else
dsl_up = 0
end
metric("dsl_up", "gauge", {
- detail = dsl_stat.line_state_detail,
+ detail = m.state,
}, dsl_up)
-- dsl line status data
- metric("dsl_uptime_seconds", "gauge", {}, dsl_stat.line_uptime)
+ metric("dsl_uptime_seconds", "gauge", {}, m.uptime)
-- dsl db measurements
- dsl_line_attenuation({direction="down"}, dsl_stat.line_attenuation_down)
- dsl_line_attenuation({direction="up"}, dsl_stat.line_attenuation_up)
- dsl_signal_attenuation({direction="down"}, dsl_stat.signal_attenuation_down)
- dsl_signal_attenuation({direction="up"}, dsl_stat.signal_attenuation_up)
- dsl_snr({direction="down"}, dsl_stat.noise_margin_down)
- dsl_snr({direction="up"}, dsl_stat.noise_margin_up)
- dsl_aggregated_transmit_power({direction="down"}, dsl_stat.actatp_down)
- dsl_aggregated_transmit_power({direction="up"}, dsl_stat.actatp_up)
+ dsl_line_attenuation({direction="down"}, m.downstream.latn)
+ dsl_line_attenuation({direction="up"}, m.upstream.latn)
+ dsl_signal_attenuation({direction="down"}, m.downstream.satn)
+ dsl_signal_attenuation({direction="up"}, m.upstream.satn)
+ dsl_snr({direction="down"}, m.downstream.snr)
+ dsl_snr({direction="up"}, m.upstream.snr)
+ dsl_aggregated_transmit_power({direction="down"}, m.downstream.actatp)
+ dsl_aggregated_transmit_power({direction="up"}, m.upstream.actatp)
-- dsl performance data
- if dsl_stat.latency_down ~= nil then
- dsl_latency({direction="down"}, dsl_stat.latency_down / 1000000)
- dsl_latency({direction="up"}, dsl_stat.latency_up / 1000000)
+ if m.downstream.interleave_delay ~= nil then
+ dsl_latency({direction="down"}, m.downstream.interleave_delay / 1000000)
+ dsl_latency({direction="up"}, m.upstream.interleave_delay / 1000000)
end
- dsl_datarate({direction="down"}, dsl_stat.data_rate_down)
- dsl_datarate({direction="up"}, dsl_stat.data_rate_up)
- dsl_max_datarate({direction="down"}, dsl_stat.max_data_rate_down)
- dsl_max_datarate({direction="up"}, dsl_stat.max_data_rate_up)
+ dsl_datarate({direction="down"}, m.downstream.data_rate)
+ dsl_datarate({direction="up"}, m.upstream.data_rate)
+ dsl_max_datarate({direction="down"}, m.downstream.attndr)
+ dsl_max_datarate({direction="up"}, m.upstream.attndr)
-- dsl errors
- dsl_error_seconds_total({err="forward error correction",loc="near"}, dsl_stat.errors_fecs_near)
- dsl_error_seconds_total({err="forward error correction",loc="far"}, dsl_stat.errors_fecs_far)
- dsl_error_seconds_total({err="errored",loc="near"}, dsl_stat.errors_es_near)
- dsl_error_seconds_total({err="errored",loc="far"}, dsl_stat.errors_es_near)
- dsl_error_seconds_total({err="severely errored",loc="near"}, dsl_stat.errors_ses_near)
- dsl_error_seconds_total({err="severely errored",loc="near"}, dsl_stat.errors_ses_near)
- dsl_error_seconds_total({err="loss of signal",loc="near"}, dsl_stat.errors_loss_near)
- dsl_error_seconds_total({err="loss of signal",loc="far"}, dsl_stat.errors_loss_far)
- dsl_error_seconds_total({err="unavailable",loc="near"}, dsl_stat.errors_uas_near)
- dsl_error_seconds_total({err="unavailable",loc="far"}, dsl_stat.errors_uas_far)
- dsl_errors_total({err="header error code error",loc="near"}, dsl_stat.errors_hec_near)
- dsl_errors_total({err="header error code error",loc="far"}, dsl_stat.errors_hec_far)
- dsl_errors_total({err="non pre-emptive crc error",loc="near"}, dsl_stat.errors_crc_p_near)
- dsl_errors_total({err="non pre-emptive crc error",loc="far"}, dsl_stat.errors_crc_p_far)
- dsl_errors_total({err="pre-emptive crc error",loc="near"}, dsl_stat.errors_crcp_p_near)
- dsl_errors_total({err="pre-emptive crc error",loc="far"}, dsl_stat.errors_crcp_p_far)
+ dsl_error_seconds_total({err="forward error correction", loc="near"}, m.errors.near.fecs)
+ dsl_error_seconds_total({err="forward error correction", loc="far"}, m.errors.far.fecs)
+ dsl_error_seconds_total({err="errored", loc="near"}, m.errors.near.es)
+ dsl_error_seconds_total({err="errored", loc="far"}, m.errors.far.es)
+ dsl_error_seconds_total({err="severely errored", loc="near"}, m.errors.near.ses)
+ dsl_error_seconds_total({err="severely errored", loc="far"}, m.errors.far.ses)
+ dsl_error_seconds_total({err="loss of signal", loc="near"}, m.errors.near.loss)
+ dsl_error_seconds_total({err="loss of signal", loc="far"}, m.errors.far.loss)
+ dsl_error_seconds_total({err="unavailable", loc="near"}, m.errors.near.uas)
+ dsl_error_seconds_total({err="unavailable", loc="far"}, m.errors.far.uas)
+ dsl_errors_total({err="header error code error", loc="near"}, m.errors.near.hec)
+ dsl_errors_total({err="header error code error", loc="far"}, m.errors.far.hec)
+ dsl_errors_total({err="non pre-emptive crc error", loc="near"}, m.errors.near.crc_p)
+ dsl_errors_total({err="non pre-emptive crc error", loc="far"}, m.errors.far.crc_p)
+ dsl_errors_total({err="pre-emptive crc error", loc="near"}, m.errors.near.crcp_p)
+ dsl_errors_total({err="pre-emptive crc error", loc="far"}, m.errors.far.crcp_p)
end
return { scrape = scrape }
--
2.29.2
More information about the openwrt-devel
mailing list