gandalf/secubox-openwrt
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore(luci-app-secubox-netifyd): Remove unnecessary collector

Browse Source 
Netifyd crée nativement /var/run/netifyd/status.json avec toutes
les stats nécessaires. Le collecteur custom n'est plus nécessaire.

Supprimé:
- /usr/sbin/netifyd-collector
- /etc/cron.d/netifyd-collector
- Installation dans Makefile

Le backend RPC lit maintenant directement le fichier natif de netifyd.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
This commit is contained in:
CyberMind-FR 2026-01-05 18:52:19 +01:00
parent d3e8e51043
commit 7df75ad5d1
3 changed files with 0 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
package/secubox/luci-app-secubox-netifyd/Makefile
View File

@ -20,9 +20,6 @@ define Package/$(PKG_NAME)/install
$(INSTALL_DATA) ./README-FLOW-DATA.md $(1)/usr/share/doc/$(PKG_NAME)/
$(INSTALL_DIR) $(1)/usr/sbin
$(INSTALL_BIN) ./root/usr/sbin/secubox-netifyd-configure $(1)/usr/sbin/
$(INSTALL_BIN) ./root/usr/sbin/netifyd-collector $(1)/usr/sbin/
$(INSTALL_DIR) $(1)/etc/cron.d
$(INSTALL_DATA) ./root/etc/cron.d/netifyd-collector $(1)/etc/cron.d/
endef
include $(TOPDIR)/feeds/luci/luci.mk

2
package/secubox/luci-app-secubox-netifyd/root/etc/cron.d/netifyd-collector
View File

@ -1,2 +0,0 @@
# Netifyd Data Collector - runs every minute
* * * * * root /usr/sbin/netifyd-collector

70
package/secubox/luci-app-secubox-netifyd/root/usr/sbin/netifyd-collector
View File

@ -1,70 +0,0 @@
#!/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"
TMP_FILE="/tmp/netifyd-status.tmp"
FLOW_DUMP="/tmp/netifyd-flow-dump.json"
# 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 flow count from status
FLOW_COUNT=$(echo "$STATUS_OUTPUT" | grep -i "flows:" | head -1 | awk '{print $2}' | tr -d ',' || echo 0)
# Parse detection stats from status output
# Example lines:
# Detection Cache Entries: 156
# Detected Applications: 24
# Detected Protocols: 12
DHC_SIZE=$(echo "$STATUS_OUTPUT" | grep -i "cache entries\|applications" | head -1 | awk '{print $NF}' | tr -d ',' || echo 0)
PROTO_COUNT=$(echo "$STATUS_OUTPUT" | grep -i "protocols:" | awk '{print $NF}' | tr -d ',' || echo 0)
# Try to extract device count from ARP table as fallback
DEVICE_COUNT=$(ip neigh show | grep -c "REACHABLE\|STALE\|DELAY" 2>/dev/null || echo 0)
# Build minimal devices object (MAC -> IP mapping from ARP)
if command -v jq >/dev/null 2>&1; then
DEVICES_OBJ=$(ip neigh show 2>/dev/null | awk '$5 != "" && $1 != "" {print "{\"mac\":\""$5"\",\"ip\":\""$1"\"}"}' | jq -s 'reduce .[] as $item ({}; .[$item.mac] += [$item.ip])' 2>/dev/null || echo '{}')
else
DEVICES_OBJ='{}'
fi
# Estimate total bytes from interface stats
TOTAL_BYTES=0
for iface in br-lan eth0 eth1 wlan0; do
if [ -d "/sys/class/net/$iface" ]; then
RX=$(cat /sys/class/net/$iface/statistics/rx_bytes 2>/dev/null || echo 0)
TX=$(cat /sys/class/net/$iface/statistics/tx_bytes 2>/dev/null || echo 0)
TOTAL_BYTES=$((TOTAL_BYTES + RX + TX))
fi
done
# Create JSON status file
cat > "$TMP_FILE" <<EOF
{
"flow_count": ${FLOW_COUNT:-0},
"devices": ${DEVICES_OBJ},
"dhc_size": ${DHC_SIZE:-0},
"protocol_count": ${PROTO_COUNT:-0},
"total_bytes": ${TOTAL_BYTES:-0},
"device_count": ${DEVICE_COUNT:-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