From 8956b3893bbf68267478b11f9feae160b8407edd Mon Sep 17 00:00:00 2001 From: Olivier Mehani Date: Mon, 22 Jul 2024 11:51:27 +0200 Subject: [PATCH 1/2] freebox: add extinfo to users graph (connected devices, and port redirection) Signed-off-by: Olivier Mehani --- plugins/router/freebox | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/plugins/router/freebox b/plugins/router/freebox index e02512005..db12f3916 100755 --- a/plugins/router/freebox +++ b/plugins/router/freebox @@ -231,9 +231,12 @@ get_data() { SWITCH_DOWN=$(get_line_column "Switch" "NF-3" <<< "${INFO}") SWITCH_UP=$(get_line_column "Switch" "NF-1" <<< "${INFO}") - DHCP_CLIENTS=$(sed -nE '/Attributions dhcp/,/Redirections de ports/{s/^\s*([0-9A-F:]{17}).*$/\1/p}' <<< "${INFO}" | wc -l) - REDIRECT_TCP=$(sed -nE '/Redirections de ports/,/Interfaces réseau/{s/^\s*(TCP).*$/\1/p}' <<< "${INFO}" | wc -l) - REDIRECT_UDP=$(sed -nE '/Redirections de ports/,/Interfaces réseau/{s/^\s*(UDP).*$/\1/p}' <<< "${INFO}" | wc -l) + DHCP_CLIENTS_LIST=$(sed -nE '/Attributions dhcp/,/Redirections de ports/{s/^\s*([0-9A-F:]{17})\s*([0-9a-z\.:]+).*$/\2 (\1);/p}' <<< "${INFO}" | sort -n) + DHCP_CLIENTS=$(wc -l <<< "${DHCP_CLIENTS_LIST}") + REDIRECT_TCP_LIST=$(sed -nE '/Redirections de ports/,/Interfaces réseau/{s/^\s*TCP\s+(\w+)\s+([0-9a-z\.:]+)\s+(\w+).*$/\1->\2:\3;/p}' <<< "${INFO}" | sort -n) + REDIRECT_TCP=$(wc -l <<< "${REDIRECT_TCP_LIST}") + REDIRECT_UDP_LIST=$(sed -nE '/Redirections de ports/,/Interfaces réseau/{s/^\s*UDP\s+(\w+)\s+([0-9a-z\.:]+)\s+(\w+).*$/\1->\2:\3;/p}' <<< "${INFO}" | sort -n) + REDIRECT_UDP=$(wc -l <<< "${REDIRECT_UDP_LIST}") if [ -z "${UPTIME_DAYS:-}" ]; then UPTIME_DAYS=0 @@ -448,8 +451,11 @@ graph_data() { ;; .users) echo "dhcp.value ${DHCP_CLIENTS:-U}" + echo "dhcp.extinfo $(echo ${DHCP_CLIENTS_LIST:-U})" echo "redirect_tcp.value ${REDIRECT_TCP:-U}" + echo "redirect_tcp.extinfo $(echo ${REDIRECT_TCP_LIST:-U})" echo "redirect_udp.value ${REDIRECT_UDP:-U}" + echo "redirect_udp.extinfo $(echo ${REDIRECT_UDP_LIST:-U})" ;; *) echo "main_wan.value ${WAN_UP:-U}" From b625ce4cafc15bf8ea1071cf0d5714d47560f2fa Mon Sep 17 00:00:00 2001 From: Olivier Mehani Date: Wed, 5 Mar 2025 13:44:17 +1100 Subject: [PATCH 2/2] plugins/router/freebox: default extinfo to empty string --- plugins/router/freebox | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/plugins/router/freebox b/plugins/router/freebox index db12f3916..f2cf227af 100755 --- a/plugins/router/freebox +++ b/plugins/router/freebox @@ -451,11 +451,11 @@ graph_data() { ;; .users) echo "dhcp.value ${DHCP_CLIENTS:-U}" - echo "dhcp.extinfo $(echo ${DHCP_CLIENTS_LIST:-U})" - echo "redirect_tcp.value ${REDIRECT_TCP:-U}" - echo "redirect_tcp.extinfo $(echo ${REDIRECT_TCP_LIST:-U})" - echo "redirect_udp.value ${REDIRECT_UDP:-U}" - echo "redirect_udp.extinfo $(echo ${REDIRECT_UDP_LIST:-U})" + echo "dhcp.extinfo $(echo ${DHCP_CLIENTS_LIST:-})" + echo "redirect_tcp.value ${REDIRECT_TCP:-}" + echo "redirect_tcp.extinfo $(echo ${REDIRECT_TCP_LIST:-})" + echo "redirect_udp.value ${REDIRECT_UDP:-}" + echo "redirect_udp.extinfo $(echo ${REDIRECT_UDP_LIST:-})" ;; *) echo "main_wan.value ${WAN_UP:-U}"