From 2f57b91e01087ee0f981a8aaa26ab17513c0453f Mon Sep 17 00:00:00 2001 From: David Newhall II Date: Sun, 14 Mar 2021 17:45:14 -0700 Subject: [PATCH] add uxg and usg temps --- integrations/influxunifi/go.mod | 2 +- integrations/influxunifi/influxdb.go | 2 ++ integrations/influxunifi/report.go | 4 ++-- integrations/influxunifi/usg.go | 1 + 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/integrations/influxunifi/go.mod b/integrations/influxunifi/go.mod index 3cadad42..ac3cf5c3 100644 --- a/integrations/influxunifi/go.mod +++ b/integrations/influxunifi/go.mod @@ -5,7 +5,7 @@ go 1.15 require ( github.com/influxdata/influxdb1-client v0.0.0-20200515024757-02f0bf5dbca3 github.com/unifi-poller/poller v0.0.8 - github.com/unifi-poller/unifi v0.0.7-0.20210315000917-22c6030f9df5 + github.com/unifi-poller/unifi v0.0.7-0.20210315003727-a4802cb45269 github.com/unifi-poller/webserver v0.0.0-20200628212441-340749c94743 golift.io/cnfg v0.0.7 ) diff --git a/integrations/influxunifi/influxdb.go b/integrations/influxunifi/influxdb.go index f0cb7a45..f75af3c0 100644 --- a/integrations/influxunifi/influxdb.go +++ b/integrations/influxunifi/influxdb.go @@ -269,6 +269,8 @@ func (u *InfluxUnifi) switchExport(r report, v interface{}) { //nolint:cyclop u.batchUSW(r, v) case *unifi.USG: u.batchUSG(r, v) + case *unifi.UXG: + u.batchUXG(r, v) case *unifi.UDM: u.batchUDM(r, v) case *unifi.Site: diff --git a/integrations/influxunifi/report.go b/integrations/influxunifi/report.go index e485c769..5d801a48 100644 --- a/integrations/influxunifi/report.go +++ b/integrations/influxunifi/report.go @@ -103,10 +103,10 @@ func (r *Report) String() string { m, c := r.Metrics, r.Counts.Val return fmt.Sprintf("Site: %d, Client: %d, "+ - "%s: %d, %s/%s: %d, %s: %d, %s/%s/%s/%s: %d/%d/%d/%d, "+ + "%s: %d, %s/%s/: %d, %s: %d, %s/%s/%s/%s: %d/%d/%d/%d, "+ "DPI Site/Client: %d/%d, %s: %d, %s: %d, Err: %d, Dur: %v", len(m.Sites), len(m.Clients), - uapT, c[uapT], udmT, usgT, c[udmT]+c[usgT], uswT, c[uswT], + uapT, c[uapT], udmT, usgT, c[udmT]+c[usgT]+c[uxgT], uswT, c[uswT], idsT, eventT, alarmT, anomalyT, c[idsT], c[eventT], c[alarmT], c[anomalyT], len(m.SitesDPI), len(m.ClientsDPI), pointT, c[pointT], fieldT, c[fieldT], len(r.Errors), r.Elapsed.Round(time.Millisecond)) diff --git a/integrations/influxunifi/usg.go b/integrations/influxunifi/usg.go index 5b57e9a7..43d4e06f 100644 --- a/integrations/influxunifi/usg.go +++ b/integrations/influxunifi/usg.go @@ -25,6 +25,7 @@ func (u *InfluxUnifi) batchUSG(r report, s *unifi.USG) { "type": s.Type, } fields := Combine( + u.batchUDMtemps(s.Temperatures), u.batchSysStats(s.SysStats, s.SystemStats), u.batchUSGstats(s.SpeedtestStatus, s.Stat.Gw, s.Uplink), map[string]interface{}{