From c847a5a8ccd34b5bf0beddc5c7b953a799e90aca Mon Sep 17 00:00:00 2001 From: David Newhall II Date: Sun, 14 Jul 2019 02:38:16 -0700 Subject: [PATCH] Allign all points. --- integrations/inputunifi/unifipoller/config.go | 1 + integrations/inputunifi/unifipoller/unifi.go | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/integrations/inputunifi/unifipoller/config.go b/integrations/inputunifi/unifipoller/config.go index eedc5d6a..f2e817bc 100644 --- a/integrations/inputunifi/unifipoller/config.go +++ b/integrations/inputunifi/unifipoller/config.go @@ -42,6 +42,7 @@ type UnifiPoller struct { // Metrics contains all the data from the controller and an influx endpoint to send it to. type Metrics struct { + TS time.Time unifi.Sites unifi.IDSList unifi.Clients diff --git a/integrations/inputunifi/unifipoller/unifi.go b/integrations/inputunifi/unifipoller/unifi.go index b1026a8c..9123738e 100644 --- a/integrations/inputunifi/unifipoller/unifi.go +++ b/integrations/inputunifi/unifipoller/unifi.go @@ -78,7 +78,7 @@ func (u *UnifiPoller) CollectAndReport() error { // CollectMetrics grabs all the measurements from a UniFi controller and returns them. // This also creates an InfluxDB writer, and returns an error if that fails. func (u *UnifiPoller) CollectMetrics() (*Metrics, error) { - m := &Metrics{} + m := &Metrics{TS: time.Now()} var err error // Get the sites we care about. m.Sites, err = u.GetFilteredSites() @@ -188,7 +188,7 @@ func (m *Metrics) processPoints(asset Asset) error { if asset == nil { return nil } - points, err := asset.Points() + points, err := asset.PointsAt(m.TS) if err != nil || points == nil { return err }