public_git
/
unpoller_unpoller
mirror of https://github.com/unpoller/unpoller.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

add uxg and usg temps

This commit is contained in:
David Newhall II 2021-03-14 17:45:14 -07:00
parent bd10066545
commit 2f57b91e01
4 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
integrations/influxunifi/go.mod
View File

@ -5,7 +5,7 @@ go 1.15
require ( require (
github.com/influxdata/influxdb1-client v0.0.0-20200515024757-02f0bf5dbca3 github.com/influxdata/influxdb1-client v0.0.0-20200515024757-02f0bf5dbca3
github.com/unifi-poller/poller v0.0.8 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 github.com/unifi-poller/webserver v0.0.0-20200628212441-340749c94743
golift.io/cnfg v0.0.7 golift.io/cnfg v0.0.7
) )

2
integrations/influxunifi/influxdb.go
View File

@ -269,6 +269,8 @@ func (u *InfluxUnifi) switchExport(r report, v interface{}) { //nolint:cyclop
u.batchUSW(r, v) u.batchUSW(r, v)
case *unifi.USG: case *unifi.USG:
u.batchUSG(r, v) u.batchUSG(r, v)
case *unifi.UXG:
u.batchUXG(r, v)
case *unifi.UDM: case *unifi.UDM:
u.batchUDM(r, v) u.batchUDM(r, v)
case *unifi.Site: case *unifi.Site:

4
integrations/influxunifi/report.go
View File

@ -103,10 +103,10 @@ func (r *Report) String() string {
m, c := r.Metrics, r.Counts.Val m, c := r.Metrics, r.Counts.Val
return fmt.Sprintf("Site: %d, Client: %d, "+ 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", "DPI Site/Client: %d/%d, %s: %d, %s: %d, Err: %d, Dur: %v",
len(m.Sites), len(m.Clients), 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], 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(m.SitesDPI), len(m.ClientsDPI), pointT, c[pointT], fieldT, c[fieldT],
len(r.Errors), r.Elapsed.Round(time.Millisecond)) len(r.Errors), r.Elapsed.Round(time.Millisecond))

1
integrations/influxunifi/usg.go
View File

@ -25,6 +25,7 @@ func (u *InfluxUnifi) batchUSG(r report, s *unifi.USG) {
"type": s.Type, "type": s.Type,
} }
fields := Combine( fields := Combine(
u.batchUDMtemps(s.Temperatures),
u.batchSysStats(s.SysStats, s.SystemStats), u.batchSysStats(s.SysStats, s.SystemStats),
u.batchUSGstats(s.SpeedtestStatus, s.Stat.Gw, s.Uplink), u.batchUSGstats(s.SpeedtestStatus, s.Stat.Gw, s.Uplink),
map[string]interface{}{ map[string]interface{}{