mirror of
https://github.com/unpoller/unpoller.git
synced 2026-04-05 00:44:06 -04:00
ae1ab40386
Fixes #417 UniFi controllers populate RemoteUserNumActive for VPN connections but leave NumUser at 0 for the VPN subsystem. This caused dashboard queries looking for num_user in the VPN subsystem to always show 0 active users, even when VPN connections were active. Root Cause: For most subsystems (wlan, lan, www), the controller populates NumUser directly. However, for the VPN subsystem, the controller uses the RemoteUserNumActive field instead, leaving NumUser at 0. The Prometheus exporter had special handling for VPN (lines 148-156 in pkg/promunifi/site.go) and exported RemoteUserNumActive, but did not export NumUser. The InfluxDB and Datadog exporters exported all fields for all subsystems without special handling, resulting in num_user always being 0 for VPN. Existing Grafana dashboards query: SELECT "num_user" FROM "subsystems" WHERE subsystem='vpn' This always returned 0 even with active VPN users. Solution: For all three exporters (InfluxDB, Datadog, Prometheus), when the subsystem is 'vpn' and NumUser is 0 but RemoteUserNumActive has a value, populate num_user with RemoteUserNumActive. Changes: - pkg/influxunifi/site.go: Add VPN-specific num_user fallback logic - pkg/datadogunifi/site.go: Add VPN-specific num_user fallback logic - pkg/promunifi/site.go: Add NumUser metric to VPN case with fallback This maintains backward compatibility - existing queries for num_user will now work correctly, and the remote_user_num_active field is still available for those who updated their dashboards. Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
93 lines
3.0 KiB
Go
93 lines
3.0 KiB
Go
package influxunifi
|
|
|
|
import (
|
|
"github.com/unpoller/unifi/v5"
|
|
)
|
|
|
|
// batchSite generates Unifi Sites' datapoints for InfluxDB.
|
|
// These points can be passed directly to influx.
|
|
func (u *InfluxUnifi) batchSite(r report, s *unifi.Site) {
|
|
for _, h := range s.Health {
|
|
tags := map[string]string{
|
|
"name": s.Name,
|
|
"site_name": s.SiteName,
|
|
"source": s.SourceName,
|
|
"desc": s.Desc,
|
|
"status": h.Status,
|
|
"subsystem": h.Subsystem,
|
|
"wan_ip": h.WanIP,
|
|
"gw_name": h.GwName,
|
|
"lan_ip": h.LanIP,
|
|
}
|
|
|
|
// For VPN subsystem, use RemoteUserNumActive for num_user if NumUser is not set
|
|
numUser := h.NumUser.Val
|
|
if h.Subsystem == "vpn" && numUser == 0 && h.RemoteUserNumActive.Val > 0 {
|
|
numUser = h.RemoteUserNumActive.Val
|
|
}
|
|
|
|
fields := map[string]any{
|
|
"num_user": numUser,
|
|
"num_guest": h.NumGuest.Val,
|
|
"num_iot": h.NumIot.Val,
|
|
"tx_bytes-r": h.TxBytesR.Int64(),
|
|
"rx_bytes-r": h.RxBytesR.Int64(),
|
|
"num_ap": h.NumAp.Val,
|
|
"num_adopted": h.NumAdopted.Val,
|
|
"num_disabled": h.NumDisabled.Val,
|
|
"num_disconnected": h.NumDisconnected.Val,
|
|
"num_pending": h.NumPending.Val,
|
|
"num_gw": h.NumGw.Val,
|
|
"wan_ip": h.WanIP,
|
|
"num_sta": h.NumSta.Val,
|
|
"gw_cpu": h.GwSystemStats.CPU.Val,
|
|
"gw_mem": h.GwSystemStats.Mem.Val,
|
|
"gw_uptime": h.GwSystemStats.Uptime.Val,
|
|
"latency": h.Latency.Val,
|
|
"uptime": h.Uptime.Int64(),
|
|
"drops": h.Drops.Val,
|
|
"xput_up": h.XputUp.Val,
|
|
"xput_down": h.XputDown.Val,
|
|
"speedtest_ping": h.SpeedtestPing.Val,
|
|
"speedtest_lastrun": h.SpeedtestLastrun.Val,
|
|
"num_sw": h.NumSw.Val,
|
|
"remote_user_num_active": h.RemoteUserNumActive.Val,
|
|
"remote_user_num_inactive": h.RemoteUserNumInactive.Val,
|
|
"remote_user_rx_bytes": h.RemoteUserRxBytes.Val,
|
|
"remote_user_tx_bytes": h.RemoteUserTxBytes.Val,
|
|
"remote_user_rx_packets": h.RemoteUserRxPackets.Val,
|
|
"remote_user_tx_packets": h.RemoteUserTxPackets.Val,
|
|
"num_new_alarms": s.NumNewAlarms.Val,
|
|
}
|
|
|
|
r.send(&metric{Table: "subsystems", Tags: tags, Fields: fields})
|
|
}
|
|
}
|
|
|
|
func (u *InfluxUnifi) batchSiteDPI(r report, v any) {
|
|
s, ok := v.(*unifi.DPITable)
|
|
if !ok {
|
|
u.LogErrorf("invalid type given to batchSiteDPI: %T", v)
|
|
|
|
return
|
|
}
|
|
|
|
for _, dpi := range s.ByApp {
|
|
r.send(&metric{
|
|
Table: "sitedpi",
|
|
Tags: map[string]string{
|
|
"category": unifi.DPICats.Get(dpi.Cat.Int()),
|
|
"application": unifi.DPIApps.GetApp(dpi.Cat.Int(), dpi.App.Int()),
|
|
"site_name": s.SiteName,
|
|
"source": s.SourceName,
|
|
},
|
|
Fields: map[string]any{
|
|
"tx_packets": dpi.TxPackets.Int64(),
|
|
"rx_packets": dpi.RxPackets.Int64(),
|
|
"tx_bytes": dpi.TxBytes.Int64(),
|
|
"rx_bytes": dpi.RxBytes.Int64(),
|
|
},
|
|
})
|
|
}
|
|
}
|