From 007002ecfe422fc86433cdf0e920a092b610194d Mon Sep 17 00:00:00 2001 From: davidnewhall2 Date: Mon, 15 Jun 2020 05:19:55 -0700 Subject: [PATCH] put append back --- integrations/inputunifi/interface.go | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/integrations/inputunifi/interface.go b/integrations/inputunifi/interface.go index e79fc2ea..dab0185e 100644 --- a/integrations/inputunifi/interface.go +++ b/integrations/inputunifi/interface.go @@ -85,18 +85,27 @@ func (u *InputUnifi) MetricsFrom(filter *poller.Filter) (*poller.Metrics, bool, return nil, false, nil } - // Check if the request is for an existing, configured controller. + metrics := &poller.Metrics{} + + // Check if the request is for an existing, configured controller (or all controllers) for _, c := range u.Controllers { if filter != nil && !strings.EqualFold(c.URL, filter.Path) { continue } m, err := u.collectController(c) + if err != nil { + return metrics, false, err + } - return m, err == nil && m != nil, err + metrics = poller.AppendMetrics(metrics, m) } - if !u.Dynamic || filter == nil { + if filter == nil || len(metrics.Clients) != 0 { + return metrics, true, nil + } + + if !u.Dynamic { return nil, false, errDynamicLookupsDisabled }