public_git
/
unpoller_unpoller
mirror of https://github.com/unpoller/unpoller.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Temp fix for test cases and warning from Dockerfile

This commit is contained in:
aharper343 2025-12-23 16:10:22 -05:00
parent 0b9d3de5cc
commit 22dfc25801
4 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfile
View File

@ -1,4 +1,4 @@
FROM busybox:latest as builder
FROM busybox:latest AS builder
# we have to do this hop because distroless is bare without common shell commands
RUN mkdir -p /etc/unpoller

6
pkg/inputunifi/collector.go
View File

@ -123,7 +123,7 @@ func (u *InputUnifi) pollController(c *Controller) (*poller.Metrics, error) {
if m.CountryTraffic, err = c.Unifi.GetCountryTraffic(sites, &tp); err != nil {
return nil, fmt.Errorf("unifi.GetCountryTraffic(%s): %w", c.URL, err)
}
u.Logf("Found %d CountryTraffic entries", len(m.CountryTraffic))
u.LogDebugf("Found %d CountryTraffic entries", len(m.CountryTraffic))
}
if c.SaveTraffic != nil && *c.SaveTraffic && c.SaveDPI != nil && *c.SaveDPI {
@ -131,10 +131,10 @@ func (u *InputUnifi) pollController(c *Controller) (*poller.Metrics, error) {
if err != nil {
return nil, fmt.Errorf("unifi.GetClientTraffic(%s): %w", c.URL, err)
}
u.Logf("Found %d ClientUsageByApp entries", len(clientUsageByApp))
u.LogDebugf("Found %d ClientUsageByApp entries", len(clientUsageByApp))
b4 := len(m.ClientsDPI)
u.convertToClientDPI(clientUsageByApp, m)
u.Logf("Added %d ClientDPI entries for a total of %d", len(m.ClientsDPI)-b4, len(m.ClientsDPI))
u.LogDebugf("Added %d ClientDPI entries for a total of %d", len(m.ClientsDPI)-b4, len(m.ClientsDPI))
}
// Get all the points.

4
pkg/inputunifi/input.go
View File

@ -277,6 +277,10 @@ func (u *InputUnifi) setDefaults(c *Controller) { //nolint:cyclop
c.SaveAnomal = &f
}
if c.SaveTraffic == nil {
c.SaveTraffic = &f
}
if c.URL == "" {
c.URL = defaultURL
}

18
pkg/unittest/dep.go
View File

@ -20,15 +20,17 @@ func NewTestSetup(t *testing.T) *TestRig {
testCollector := poller.NewTestCollector(t)
enabled := true
disabled := false
controller := inputunifi.Controller{
SaveAnomal: &enabled,
SaveAlarms: &enabled,
SaveEvents: &enabled,
SaveIDs: &enabled,
SaveDPI: &enabled,
SaveRogue: &enabled,
SaveSites: &enabled,
URL: srv.Server.URL,
SaveAnomal: &enabled,
SaveAlarms: &enabled,
SaveEvents: &enabled,
SaveIDs: &enabled,
SaveDPI: &enabled,
SaveRogue: &enabled,
SaveSites: &enabled,
SaveTraffic: &disabled,
URL: srv.Server.URL,
}
in := &inputunifi.InputUnifi{
Logger: testCollector.Logger,