diff --git a/integrations/inputunifi/Gopkg.lock b/integrations/inputunifi/Gopkg.lock index 1e6fc19c..6d3ecf14 100644 --- a/integrations/inputunifi/Gopkg.lock +++ b/integrations/inputunifi/Gopkg.lock @@ -30,12 +30,12 @@ version = "v1.0.3" [[projects]] - digest = "1:8fc9ea4363eb86ad54e55ca6d0b430c69565cce7b4d4b7a3db1fca99c945e903" + digest = "1:8a7dc583b5300f5d3f2602769b11127193330f74bb0a31e135d7354a1f96374a" name = "golift.io/unifi" packages = ["."] pruneopts = "UT" - revision = "9135d5efa7b36f372b26ed11e0061b18bbe2ad12" - version = "v4.0.1" + revision = "65d8c5a10faeb8180053a760d20800baf515f01a" + version = "v4.0.2" [[projects]] digest = "1:4d2e5a73dc1500038e504a8d78b986630e3626dc027bc030ba5c75da257cdb96" diff --git a/integrations/inputunifi/unifipoller/unifi.go b/integrations/inputunifi/unifipoller/unifi.go index 2ba78b35..6e2da433 100644 --- a/integrations/inputunifi/unifipoller/unifi.go +++ b/integrations/inputunifi/unifipoller/unifi.go @@ -125,6 +125,9 @@ func (u *UnifiPoller) AugmentMetrics(metrics *Metrics) error { for _, r := range metrics.USWs { devices[r.Mac] = r.Name } + for _, r := range metrics.UDMs { + devices[r.Mac] = r.Name + } // These come blank, so set them here. for i, c := range metrics.Clients { metrics.Clients[i].SwName = devices[c.SwMac] @@ -158,7 +161,7 @@ func (u *UnifiPoller) ReportMetrics(metrics *Metrics) error { u.Logf("UniFi Measurements Recorded. Sites: %d, Clients: %d, "+ "Wireless APs: %d, Gateways: %d, Switches: %d, %sPoints: %d, Fields: %d", len(metrics.Sites), len(metrics.Clients), len(metrics.UAPs), - len(metrics.USGs), len(metrics.USWs), idsMsg, points, fields) + len(metrics.UDMs)+len(metrics.USGs), len(metrics.USWs), idsMsg, points, fields) return nil } @@ -196,18 +199,22 @@ func (m *Metrics) ProcessPoints() []error { if m.Devices == nil { return errs } - for _, asset := range m.UAPs { + for _, asset := range m.Devices.UAPs { pts, err := UAPPoints(asset, m.TS) errs = append(errs, processPoints(m, pts, err)) } - for _, asset := range m.USGs { + for _, asset := range m.Devices.USGs { pts, err := USGPoints(asset, m.TS) errs = append(errs, processPoints(m, pts, err)) } - for _, asset := range m.USWs { + for _, asset := range m.Devices.USWs { pts, err := USWPoints(asset, m.TS) errs = append(errs, processPoints(m, pts, err)) } + for _, asset := range m.Devices.UDMs { + pts, err := UDMPoints(asset, m.TS) + errs = append(errs, processPoints(m, pts, err)) + } return errs }