From ffbdbdbfd5693ed9dfc0b4534eb77189a2ad8587 Mon Sep 17 00:00:00 2001 From: davidnewhall2 Date: Sun, 14 Jun 2020 01:26:29 -0700 Subject: [PATCH] put all port data in one place --- integrations/influxunifi/uap.go | 2 +- integrations/influxunifi/udm.go | 2 +- integrations/influxunifi/usw.go | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/integrations/influxunifi/uap.go b/integrations/influxunifi/uap.go index 3eca0296..638f36e5 100644 --- a/integrations/influxunifi/uap.go +++ b/integrations/influxunifi/uap.go @@ -35,7 +35,7 @@ func (u *InfluxUnifi) batchUAP(r report, s *unifi.UAP) { r.send(&metric{Table: "uap", Tags: tags, Fields: fields}) u.processRadTable(r, tags, s.RadioTable, s.RadioTableStats) u.processVAPTable(r, tags, s.VapTable) - u.batchPortTable(r, tags, "uap", s.PortTable) + u.batchPortTable(r, tags, s.PortTable) } func (u *InfluxUnifi) processUAPstats(ap *unifi.Ap) map[string]interface{} { diff --git a/integrations/influxunifi/udm.go b/integrations/influxunifi/udm.go index ddfd4aa5..6847e23b 100644 --- a/integrations/influxunifi/udm.go +++ b/integrations/influxunifi/udm.go @@ -109,7 +109,7 @@ func (u *InfluxUnifi) batchUDM(r report, s *unifi.UDM) { // nolint: funlen }) r.send(&metric{Table: "usw", Tags: tags, Fields: fields}) - u.batchPortTable(r, tags, "usw", s.PortTable) // udm has a usw in it. + u.batchPortTable(r, tags, s.PortTable) // udm has a usw in it. if s.Stat.Ap == nil { return // we're done now. the following code process UDM (non-pro) UAP data. diff --git a/integrations/influxunifi/usw.go b/integrations/influxunifi/usw.go index af7e98e6..1b08f0c1 100644 --- a/integrations/influxunifi/usw.go +++ b/integrations/influxunifi/usw.go @@ -39,7 +39,7 @@ func (u *InfluxUnifi) batchUSW(r report, s *unifi.USW) { }) r.send(&metric{Table: "usw", Tags: tags, Fields: fields}) - u.batchPortTable(r, tags, "usw", s.PortTable) + u.batchPortTable(r, tags, s.PortTable) } func (u *InfluxUnifi) batchUSWstat(sw *unifi.Sw) map[string]interface{} { @@ -63,7 +63,7 @@ func (u *InfluxUnifi) batchUSWstat(sw *unifi.Sw) map[string]interface{} { } } -func (u *InfluxUnifi) batchPortTable(r report, t map[string]string, dev string, pt []unifi.Port) { +func (u *InfluxUnifi) batchPortTable(r report, t map[string]string, pt []unifi.Port) { for _, p := range pt { if !p.Up.Val || !p.Enable.Val { continue // only record UP ports. @@ -109,6 +109,6 @@ func (u *InfluxUnifi) batchPortTable(r report, t map[string]string, dev string, fields["poe_voltage"] = p.PoeVoltage.Val } - r.send(&metric{Table: dev + "_ports", Tags: tags, Fields: fields}) + r.send(&metric{Table: "usw_ports", Tags: tags, Fields: fields}) } }