feat(luci-app-secubox-netifyd): Add data collector for metrics v1.0.2
Added netifyd-collector daemon to aggregate real-time statistics from netifyd and populate the dashboard with actual data. New Features: - Added /usr/sbin/netifyd-collector script - Queries netifyd socket for flow data - Aggregates devices, applications, protocols - Writes /var/run/netifyd/status.json - Runs every minute via cron - Added /etc/cron.d/netifyd-collector cron job - Added socat dependency for socket communication Changes: - Bumped version to 1.0.2 - Updated Makefile to install collector and cron job - Fixed dashboard empty metrics issue: * Unique Devices will now show count * Applications will now show count * Total Traffic will now show bytes This fixes the "0" values issue in dashboard Network Statistics. Dashboard will now show real metrics after 1 minute of netifyd running. 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
This commit is contained in:
parent
e70f18bdf9
commit
82d2e8575d
@ -1,14 +1,14 @@
|
|||||||
include $(TOPDIR)/rules.mk
|
include $(TOPDIR)/rules.mk
|
||||||
|
|
||||||
PKG_NAME:=luci-app-secubox-netifyd
|
PKG_NAME:=luci-app-secubox-netifyd
|
||||||
PKG_VERSION:=1.0.1
|
PKG_VERSION:=1.0.2
|
||||||
PKG_RELEASE:=1
|
PKG_RELEASE:=1
|
||||||
PKG_LICENSE:=MIT
|
PKG_LICENSE:=MIT
|
||||||
PKG_MAINTAINER:=CyberMind <contact@cybermind.fr>
|
PKG_MAINTAINER:=CyberMind <contact@cybermind.fr>
|
||||||
PKG_ARCH:=all
|
PKG_ARCH:=all
|
||||||
|
|
||||||
LUCI_TITLE:=SecuBox Netifyd Deep Packet Inspection Interface
|
LUCI_TITLE:=SecuBox Netifyd Deep Packet Inspection Interface
|
||||||
LUCI_DEPENDS:=+luci-base +rpcd +netifyd +jq +secubox-core
|
LUCI_DEPENDS:=+luci-base +rpcd +netifyd +jq +socat +secubox-core
|
||||||
LUCI_DESCRIPTION:=Complete LuCI interface for netifyd DPI engine with real-time flow monitoring, application detection, and network analytics
|
LUCI_DESCRIPTION:=Complete LuCI interface for netifyd DPI engine with real-time flow monitoring, application detection, and network analytics
|
||||||
LUCI_PKGARCH:=all
|
LUCI_PKGARCH:=all
|
||||||
|
|
||||||
@ -20,8 +20,9 @@ define Package/$(PKG_NAME)/install
|
|||||||
$(INSTALL_DATA) ./README-FLOW-DATA.md $(1)/usr/share/doc/$(PKG_NAME)/
|
$(INSTALL_DATA) ./README-FLOW-DATA.md $(1)/usr/share/doc/$(PKG_NAME)/
|
||||||
$(INSTALL_DIR) $(1)/usr/sbin
|
$(INSTALL_DIR) $(1)/usr/sbin
|
||||||
$(INSTALL_BIN) ./root/usr/sbin/secubox-netifyd-configure $(1)/usr/sbin/
|
$(INSTALL_BIN) ./root/usr/sbin/secubox-netifyd-configure $(1)/usr/sbin/
|
||||||
$(INSTALL_DIR) $(1)/usr/bin
|
$(INSTALL_BIN) ./root/usr/sbin/netifyd-collector $(1)/usr/sbin/
|
||||||
$(INSTALL_BIN) ./root/usr/bin/netifyd-collector $(1)/usr/bin/
|
$(INSTALL_DIR) $(1)/etc/cron.d
|
||||||
|
$(INSTALL_DATA) ./root/etc/cron.d/netifyd-collector $(1)/etc/cron.d/
|
||||||
endef
|
endef
|
||||||
|
|
||||||
include $(TOPDIR)/feeds/luci/luci.mk
|
include $(TOPDIR)/feeds/luci/luci.mk
|
||||||
|
|||||||
@ -0,0 +1,2 @@
|
|||||||
|
# Netifyd Data Collector - runs every minute
|
||||||
|
* * * * * root /usr/sbin/netifyd-collector
|
||||||
@ -0,0 +1,79 @@
|
|||||||
|
#!/bin/sh
|
||||||
|
# Netifyd Data Collector
|
||||||
|
# Collects statistics from netifyd and creates status.json
|
||||||
|
# Copyright (C) 2025 CyberMind.fr
|
||||||
|
|
||||||
|
NETIFYD_STATUS="/var/run/netifyd/status.json"
|
||||||
|
NETIFYD_SOCKET="/var/run/netifyd/netifyd.sock"
|
||||||
|
TMP_FILE="/tmp/netifyd-status.tmp"
|
||||||
|
|
||||||
|
# Create run directory if needed
|
||||||
|
mkdir -p /var/run/netifyd
|
||||||
|
|
||||||
|
# Check if netifyd is running
|
||||||
|
if ! pidof netifyd >/dev/null 2>&1; then
|
||||||
|
echo '{"error":"netifyd not running","flow_count":0,"devices":{},"dhc_size":0}' > "$NETIFYD_STATUS"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Get status from netifyd CLI
|
||||||
|
STATUS_OUTPUT=$(netifyd -s 2>/dev/null)
|
||||||
|
|
||||||
|
# Parse active flows count
|
||||||
|
FLOW_COUNT=$(echo "$STATUS_OUTPUT" | grep -i "active flows" | awk '{print $NF}' | tr -d ',' || echo 0)
|
||||||
|
|
||||||
|
# Try to get data from socket if available
|
||||||
|
if [ -S "$NETIFYD_SOCKET" ] && command -v socat >/dev/null 2>&1; then
|
||||||
|
# Request flow dump from socket (with 2 second timeout)
|
||||||
|
SOCKET_DATA=$(timeout 2 socat - UNIX-CONNECT:"$NETIFYD_SOCKET" <<EOF 2>/dev/null
|
||||||
|
{"type":"request","request":"flow_dump"}
|
||||||
|
EOF
|
||||||
|
)
|
||||||
|
|
||||||
|
# Parse socket data if available
|
||||||
|
if [ -n "$SOCKET_DATA" ] && command -v jq >/dev/null 2>&1; then
|
||||||
|
# Extract devices (unique IPs/MACs)
|
||||||
|
DEVICES=$(echo "$SOCKET_DATA" | jq -c '[.flows[]? | {ip: (.local_ip // "unknown"), mac: (.local_mac // "unknown")}] | unique' 2>/dev/null || echo '[]')
|
||||||
|
|
||||||
|
# Count unique applications
|
||||||
|
APP_COUNT=$(echo "$SOCKET_DATA" | jq '[.flows[]?.detected_application // "Unknown"] | unique | length' 2>/dev/null || echo 0)
|
||||||
|
|
||||||
|
# Count unique protocols
|
||||||
|
PROTO_COUNT=$(echo "$SOCKET_DATA" | jq '[.flows[]?.detected_protocol // "Unknown"] | unique | length' 2>/dev/null || echo 0)
|
||||||
|
|
||||||
|
# Calculate total bytes
|
||||||
|
TOTAL_BYTES=$(echo "$SOCKET_DATA" | jq '[.flows[]? | (.bytes_orig // 0) + (.bytes_resp // 0)] | add' 2>/dev/null || echo 0)
|
||||||
|
|
||||||
|
# Build devices object from array
|
||||||
|
DEVICES_OBJ=$(echo "$DEVICES" | jq -c 'reduce .[] as $item ({}; .[$item.mac] += [$item.ip])' 2>/dev/null || echo '{}')
|
||||||
|
else
|
||||||
|
DEVICES_OBJ='{}'
|
||||||
|
APP_COUNT=0
|
||||||
|
PROTO_COUNT=0
|
||||||
|
TOTAL_BYTES=0
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
# Fallback: estimate from netifyd -s output
|
||||||
|
DEVICES_OBJ='{}'
|
||||||
|
APP_COUNT=0
|
||||||
|
PROTO_COUNT=0
|
||||||
|
TOTAL_BYTES=0
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Create JSON status file
|
||||||
|
cat > "$TMP_FILE" <<EOF
|
||||||
|
{
|
||||||
|
"flow_count": ${FLOW_COUNT:-0},
|
||||||
|
"devices": ${DEVICES_OBJ},
|
||||||
|
"dhc_size": ${APP_COUNT:-0},
|
||||||
|
"protocol_count": ${PROTO_COUNT:-0},
|
||||||
|
"total_bytes": ${TOTAL_BYTES:-0},
|
||||||
|
"timestamp": $(date +%s),
|
||||||
|
"uptime": $(awk '{print int($1)}' /proc/uptime 2>/dev/null || echo 0)
|
||||||
|
}
|
||||||
|
EOF
|
||||||
|
|
||||||
|
# Atomic move to prevent partial reads
|
||||||
|
mv "$TMP_FILE" "$NETIFYD_STATUS"
|
||||||
|
|
||||||
|
exit 0
|
||||||
Loading…
Reference in New Issue
Block a user