diff --git a/Dockerfile b/Dockerfile index d1bc9e4b..ad2ed5aa 100644 --- a/Dockerfile +++ b/Dockerfile @@ -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 diff --git a/pkg/inputunifi/collector.go b/pkg/inputunifi/collector.go index 2a1f568f..6f6ec043 100644 --- a/pkg/inputunifi/collector.go +++ b/pkg/inputunifi/collector.go @@ -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. diff --git a/pkg/inputunifi/input.go b/pkg/inputunifi/input.go index 79bc10c4..078c2216 100644 --- a/pkg/inputunifi/input.go +++ b/pkg/inputunifi/input.go @@ -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 } diff --git a/pkg/unittest/dep.go b/pkg/unittest/dep.go index 86b4c5f6..b96f6888 100644 --- a/pkg/unittest/dep.go +++ b/pkg/unittest/dep.go @@ -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,