diff --git a/go.mod b/go.mod index e65147e2..57df995e 100644 --- a/go.mod +++ b/go.mod @@ -13,14 +13,18 @@ require ( github.com/prometheus/common v0.61.0 github.com/spf13/pflag v1.0.6-0.20201009195203-85dd5c8bc61c github.com/stretchr/testify v1.10.0 + github.com/unpoller/unifi/v5 v5.0.3 golang.org/x/crypto v0.31.0 golang.org/x/net v0.33.0 golang.org/x/term v0.27.0 golift.io/cnfg v0.2.3 golift.io/cnfgfile v0.0.0-20240713024420-a5436d84eb48 golift.io/version v0.0.2 + gopkg.in/yaml.v3 v3.0.1 ) +require github.com/unpoller/unifi v0.4.3 // indirect + require ( github.com/BurntSushi/toml v1.4.0 // indirect github.com/Microsoft/go-winio v0.6.0 // indirect @@ -39,12 +43,10 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/prometheus/client_model v0.6.1 // indirect github.com/prometheus/procfs v0.15.1 // indirect - github.com/unpoller/unifi v0.4.3 golang.org/x/mod v0.7.0 // indirect golang.org/x/sys v0.28.0 // indirect golang.org/x/tools v0.3.0 // indirect google.golang.org/protobuf v1.35.2 // indirect - gopkg.in/yaml.v3 v3.0.1 ) // for local iterative development only diff --git a/go.sum b/go.sum index 021fa8ce..d4d09328 100644 --- a/go.sum +++ b/go.sum @@ -1,9 +1,5 @@ -github.com/BurntSushi/toml v1.3.2 h1:o7IhLm0Msx3BaB+n3Ag7L8EVlByGnpq14C4YWiu/gL8= -github.com/BurntSushi/toml v1.3.2/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= github.com/BurntSushi/toml v1.4.0 h1:kuoIxZQy2WRRk1pttg9asf+WVv6tWQuBNVmK8+nqPr0= github.com/BurntSushi/toml v1.4.0/go.mod h1:ukJfTF/6rtPPRCnwkur4qwRxa8vTRFBF0uk2lLoLwho= -github.com/DataDog/datadog-go v4.8.3+incompatible h1:fNGaYSuObuQb5nzeTQqowRAd9bpDIRRV4/gUtIBjh8Q= -github.com/DataDog/datadog-go v4.8.3+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ= github.com/DataDog/datadog-go/v5 v5.6.0 h1:2oCLxjF/4htd55piM75baflj/KoE6VYS7alEUqFvRDw= github.com/DataDog/datadog-go/v5 v5.6.0/go.mod h1:K9kcYBlxkcPP8tvvjZZKs/m1edNAUFzBbdpTUKfCsuw= github.com/Microsoft/go-winio v0.5.0/go.mod h1:JPGBdM1cNvN/6ISo+n8V5iA4v8pBzdOpzfwIujj1a84= @@ -26,20 +22,14 @@ github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs github.com/golang/mock v1.6.0/go.mod h1:p6yTPP+5HYm5mzsMV8JkE6ZKdX+/wYM6Hr+LicevLPs= github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= -github.com/google/uuid v1.3.1 h1:KjJaJ9iWZ3jOFZIf1Lqf4laDRCasjl0BCmnEGxkdLb4= -github.com/google/uuid v1.3.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/gorilla/mux v1.8.1 h1:TuBL49tXwgrFYWhqrNgrUNEY92u81SPhu7sTdzQEiWY= github.com/gorilla/mux v1.8.1/go.mod h1:AKf9I4AEqPTmMytcMc0KkNouC66V3BtZ4qD5fmWSiMQ= github.com/influxdata/influxdb-client-go/v2 v2.14.0 h1:AjbBfJuq+QoaXNcrova8smSjwJdUHnwvfjMF71M1iI4= github.com/influxdata/influxdb-client-go/v2 v2.14.0/go.mod h1:Ahpm3QXKMJslpXl3IftVLVezreAUtBOTZssDrjZEFHI= -github.com/influxdata/influxdb1-client v0.0.0-20200827194710-b269163b24ab h1:HqW4xhhynfjrtEiiSGcQUd6vrK23iMam1FO8rI7mwig= -github.com/influxdata/influxdb1-client v0.0.0-20200827194710-b269163b24ab/go.mod h1:qj24IKcXYK6Iy9ceXlo3Tc+vtHo9lIhSX5JddghvEPo= github.com/influxdata/influxdb1-client v0.0.0-20220302092344-a9ab5670611c h1:qSHzRbhzK8RdXOsAdfDgO49TtqC1oZ+acxPrkfTxcCs= github.com/influxdata/influxdb1-client v0.0.0-20220302092344-a9ab5670611c/go.mod h1:qj24IKcXYK6Iy9ceXlo3Tc+vtHo9lIhSX5JddghvEPo= -github.com/influxdata/line-protocol v0.0.0-20200327222509-2487e7298839 h1:W9WBk7wlPfJLvMCdtV4zPulc4uCPrlywQOmbFOhgQNU= -github.com/influxdata/line-protocol v0.0.0-20200327222509-2487e7298839/go.mod h1:xaLFMmpvUxqXtVkUJfg9QmT88cDaCJ3ZKgdZ78oO8Qo= github.com/influxdata/line-protocol v0.0.0-20210922203350-b1ad95c89adf h1:7JTmneyiNEwVBOHSjoMxiWAqB992atOeepeFYegn5RU= github.com/influxdata/line-protocol v0.0.0-20210922203350-b1ad95c89adf/go.mod h1:xaLFMmpvUxqXtVkUJfg9QmT88cDaCJ3ZKgdZ78oO8Qo= github.com/juju/gnuflag v0.0.0-20171113085948-2ce1bb71843d/go.mod h1:2PavIy+JPciBPrBUjwbNvtwB6RQlve+hkpll6QSNmOE= @@ -53,8 +43,6 @@ github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0 github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw= github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA= github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= -github.com/oapi-codegen/runtime v1.0.0 h1:P4rqFX5fMFWqRzY9M/3YF9+aPSPPB06IzP2P7oOxrWo= -github.com/oapi-codegen/runtime v1.0.0/go.mod h1:LmCUMQuPB4M/nLXilQXhHw+BLZdDb18B34OO356yJ/A= github.com/oapi-codegen/runtime v1.1.1 h1:EXLHh0DXIJnWhdRPN2w4MXAzFyE4CskzhNLUmtpMYro= github.com/oapi-codegen/runtime v1.1.1/go.mod h1:SK9X900oXmPWilYR5/WKPzt3Kqxn/uS/+lbpREv+eCg= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= @@ -89,6 +77,8 @@ github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOf github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/unpoller/unifi v0.4.3 h1:MyX27nf/Nq9a+p/o5qIjNJDJSS+jvxGC7BbxDk09BRg= github.com/unpoller/unifi v0.4.3/go.mod h1:TWzPB/1SVbvoweS3RcknQj3Ds+MclHzGGE2weqI+vO0= +github.com/unpoller/unifi/v5 v5.0.3 h1:LMm62uZZFbtgV+n06Wlchxsjmp+5TTdGmhZzu+7UZZQ= +github.com/unpoller/unifi/v5 v5.0.3/go.mod h1:G45KRuSH9PFrIUFmDTzWEEM/E/e7GuyXp36AVOfhm7I= github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= @@ -130,8 +120,6 @@ golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golift.io/cnfg v0.2.3 h1:cQsC4JS20njJyu5drtGefNmgN7M4HrLaRDNBPLit3pQ= golift.io/cnfg v0.2.3/go.mod h1:T4t8MFa8aZilCdIk1qQrN4mOGaFVPZ/qHQBBMbCIZJ0= -golift.io/cnfgfile v0.0.0-20230531075023-f880041cc0a0 h1:u14MTHfTGx7kLX2b3wFbaESrIm3YqL//HM92XA6wzH4= -golift.io/cnfgfile v0.0.0-20230531075023-f880041cc0a0/go.mod h1:dVC3N+72/nHNlBv3cwXb4FQTxMAor+JlNClAldwACkY= golift.io/cnfgfile v0.0.0-20240713024420-a5436d84eb48 h1:c7cJWRr0cUnFHKtq072esKzhQHKlFA5YRY/hPzQrdko= golift.io/cnfgfile v0.0.0-20240713024420-a5436d84eb48/go.mod h1:zHm9o8SkZ6Mm5DfGahsrEJPsogyR0qItP59s5lJ98/I= golift.io/version v0.0.2 h1:i0gXRuSDHKs4O0sVDUg4+vNIuOxYoXhaxspftu2FRTE= diff --git a/pkg/datadogunifi/alarms.go b/pkg/datadogunifi/alarms.go index 90c5dfe1..82020324 100644 --- a/pkg/datadogunifi/alarms.go +++ b/pkg/datadogunifi/alarms.go @@ -5,7 +5,7 @@ import ( "strconv" "time" - "github.com/unpoller/unifi" + "github.com/unpoller/unifi/v5" ) const ( diff --git a/pkg/datadogunifi/clients.go b/pkg/datadogunifi/clients.go index e0941511..e20725f9 100644 --- a/pkg/datadogunifi/clients.go +++ b/pkg/datadogunifi/clients.go @@ -1,7 +1,7 @@ package datadogunifi import ( - "github.com/unpoller/unifi" + "github.com/unpoller/unifi/v5" ) // batchClient generates Unifi Client datapoints for Datadog. @@ -37,12 +37,12 @@ func (u *DatadogUnifi) batchClient(r report, s *unifi.Client) { // nolint: funle "bssid": s.Bssid, "ip": s.IP, } - + powerSaveEnabled := 0.0 if s.PowersaveEnabled.Val { powerSaveEnabled = 1.0 } - + data := map[string]float64{ "anomalies": s.Anomalies.Val, "channel": s.Channel.Val, diff --git a/pkg/datadogunifi/datadog.go b/pkg/datadogunifi/datadog.go index 92b7e44d..c88fb58a 100644 --- a/pkg/datadogunifi/datadog.go +++ b/pkg/datadogunifi/datadog.go @@ -8,7 +8,7 @@ import ( "time" "github.com/DataDog/datadog-go/v5/statsd" - "github.com/unpoller/unifi" + "github.com/unpoller/unifi/v5" "github.com/unpoller/unpoller/pkg/poller" "golift.io/cnfg" ) diff --git a/pkg/datadogunifi/events.go b/pkg/datadogunifi/events.go index 81c52ff3..c1fa086c 100644 --- a/pkg/datadogunifi/events.go +++ b/pkg/datadogunifi/events.go @@ -5,7 +5,7 @@ import ( "strconv" "time" - "github.com/unpoller/unifi" + "github.com/unpoller/unifi/v5" ) // These constants are used as names for printed/logged counters. diff --git a/pkg/datadogunifi/pdu.go b/pkg/datadogunifi/pdu.go index 1a61c61e..c04fb30d 100644 --- a/pkg/datadogunifi/pdu.go +++ b/pkg/datadogunifi/pdu.go @@ -1,7 +1,7 @@ package datadogunifi import ( - "github.com/unpoller/unifi" + "github.com/unpoller/unifi/v5" ) // pduT is used as a name for printed/logged counters. @@ -45,9 +45,9 @@ func (u *DatadogUnifi) batchPDU(r report, s *unifi.PDU) { "user_num_sta": s.UserNumSta.Val, "upgradeable": boolToFloat64(s.Upgradeable.Val), }) - + r.addCount(pduT) - + metricName := metricNamespace("pdu") reportGaugeForFloat64Map(r, metricName, data, tags) diff --git a/pkg/datadogunifi/site.go b/pkg/datadogunifi/site.go index ab3b70aa..2a9f9c32 100644 --- a/pkg/datadogunifi/site.go +++ b/pkg/datadogunifi/site.go @@ -1,7 +1,7 @@ package datadogunifi import ( - "github.com/unpoller/unifi" + "github.com/unpoller/unifi/v5" ) // reportSite generates Unifi Sites' datapoints for Datadog. diff --git a/pkg/datadogunifi/uap.go b/pkg/datadogunifi/uap.go index 160e68a4..ed5ba1ac 100644 --- a/pkg/datadogunifi/uap.go +++ b/pkg/datadogunifi/uap.go @@ -3,7 +3,7 @@ package datadogunifi import ( "strings" - "github.com/unpoller/unifi" + "github.com/unpoller/unifi/v5" ) // uapT is used as a name for printed/logged counters. diff --git a/pkg/datadogunifi/udm.go b/pkg/datadogunifi/udm.go index e7a5d7f9..8249ed69 100644 --- a/pkg/datadogunifi/udm.go +++ b/pkg/datadogunifi/udm.go @@ -4,7 +4,7 @@ import ( "regexp" "strings" - "github.com/unpoller/unifi" + "github.com/unpoller/unifi/v5" ) // udmT is used as a name for printed/logged counters. diff --git a/pkg/datadogunifi/usg.go b/pkg/datadogunifi/usg.go index 33c232f8..1bdb8ca3 100644 --- a/pkg/datadogunifi/usg.go +++ b/pkg/datadogunifi/usg.go @@ -1,7 +1,7 @@ package datadogunifi import ( - "github.com/unpoller/unifi" + "github.com/unpoller/unifi/v5" ) // usgT is used as a name for printed/logged counters. diff --git a/pkg/datadogunifi/usw.go b/pkg/datadogunifi/usw.go index 81908068..72ebb9b1 100644 --- a/pkg/datadogunifi/usw.go +++ b/pkg/datadogunifi/usw.go @@ -1,7 +1,7 @@ package datadogunifi import ( - "github.com/unpoller/unifi" + "github.com/unpoller/unifi/v5" ) // uswT is used as a name for printed/logged counters. @@ -43,9 +43,9 @@ func (u *DatadogUnifi) batchUSW(r report, s *unifi.USW) { }) r.addCount(uswT) - + metricName := metricNamespace("usw") - + reportGaugeForFloat64Map(r, metricName, data, tags) u.batchPortTable(r, tags, s.PortTable) diff --git a/pkg/datadogunifi/uxg.go b/pkg/datadogunifi/uxg.go index 063e29a6..4178bac3 100644 --- a/pkg/datadogunifi/uxg.go +++ b/pkg/datadogunifi/uxg.go @@ -1,7 +1,7 @@ package datadogunifi import ( - "github.com/unpoller/unifi" + "github.com/unpoller/unifi/v5" ) // uxgT is used as a name for printed/logged counters. @@ -26,17 +26,17 @@ func (u *DatadogUnifi) batchUXG(r report, s *unifi.UXG) { // nolint: funlen "ip": s.IP, "license_state": s.LicenseState, }) - + var gw *unifi.Gw if s.Stat != nil { gw = s.Stat.Gw } - + var sw *unifi.Sw if s.Stat != nil { sw = s.Stat.Sw } - + data := CombineFloat64( u.batchUDMstorage(s.Storage), u.batchUDMtemps(s.Temperatures), diff --git a/pkg/influxunifi/alarms.go b/pkg/influxunifi/alarms.go index 072a9ff8..db071f36 100644 --- a/pkg/influxunifi/alarms.go +++ b/pkg/influxunifi/alarms.go @@ -3,7 +3,7 @@ package influxunifi import ( "time" - "github.com/unpoller/unifi" + "github.com/unpoller/unifi/v5" ) const ( diff --git a/pkg/influxunifi/clients.go b/pkg/influxunifi/clients.go index 35c228e5..821ee041 100644 --- a/pkg/influxunifi/clients.go +++ b/pkg/influxunifi/clients.go @@ -1,7 +1,7 @@ package influxunifi import ( - "github.com/unpoller/unifi" + "github.com/unpoller/unifi/v5" ) // batchClient generates Unifi Client datapoints for InfluxDB. @@ -33,7 +33,7 @@ func (u *InfluxUnifi) batchClient(r report, s *unifi.Client) { // nolint: funlen "channel": s.Channel.Txt, "vlan": s.Vlan.Txt, } - + fields := map[string]any{ "anomalies": s.Anomalies.Int64(), "ip": s.IP, @@ -81,7 +81,7 @@ func (u *InfluxUnifi) batchClientDPI(r report, v any, appTotal, catTotal totalsD s, ok := v.(*unifi.DPITable) if !ok { u.LogErrorf("invalid type given to batchClientDPI: %T", v) - + return } diff --git a/pkg/influxunifi/events.go b/pkg/influxunifi/events.go index ecbeb333..2c685a16 100644 --- a/pkg/influxunifi/events.go +++ b/pkg/influxunifi/events.go @@ -3,7 +3,7 @@ package influxunifi import ( "time" - "github.com/unpoller/unifi" + "github.com/unpoller/unifi/v5" ) // These constants are used as names for printed/logged counters. diff --git a/pkg/influxunifi/influxdb.go b/pkg/influxunifi/influxdb.go index 6cf2dd39..9017b90e 100644 --- a/pkg/influxunifi/influxdb.go +++ b/pkg/influxunifi/influxdb.go @@ -13,7 +13,7 @@ import ( influx "github.com/influxdata/influxdb-client-go/v2" influxV1 "github.com/influxdata/influxdb1-client/v2" - "github.com/unpoller/unifi" + "github.com/unpoller/unifi/v5" "github.com/unpoller/unpoller/pkg/poller" "github.com/unpoller/unpoller/pkg/webserver" "golang.org/x/net/context" diff --git a/pkg/influxunifi/pdu.go b/pkg/influxunifi/pdu.go index ee57d59a..1b61ee1f 100644 --- a/pkg/influxunifi/pdu.go +++ b/pkg/influxunifi/pdu.go @@ -1,7 +1,7 @@ package influxunifi import ( - "github.com/unpoller/unifi" + "github.com/unpoller/unifi/v5" ) // pduT is used as a name for printed/logged counters. diff --git a/pkg/influxunifi/site.go b/pkg/influxunifi/site.go index 823b7945..5d102bec 100644 --- a/pkg/influxunifi/site.go +++ b/pkg/influxunifi/site.go @@ -1,7 +1,7 @@ package influxunifi import ( - "github.com/unpoller/unifi" + "github.com/unpoller/unifi/v5" ) // batchSite generates Unifi Sites' datapoints for InfluxDB. @@ -61,7 +61,7 @@ func (u *InfluxUnifi) batchSiteDPI(r report, v any) { s, ok := v.(*unifi.DPITable) if !ok { u.LogErrorf("invalid type given to batchSiteDPI: %T", v) - + return } diff --git a/pkg/influxunifi/uap.go b/pkg/influxunifi/uap.go index 21eeff2b..a9b1e22e 100644 --- a/pkg/influxunifi/uap.go +++ b/pkg/influxunifi/uap.go @@ -3,7 +3,7 @@ package influxunifi import ( "strings" - "github.com/unpoller/unifi" + "github.com/unpoller/unifi/v5" ) // uapT is used as a name for printed/logged counters. diff --git a/pkg/influxunifi/udm.go b/pkg/influxunifi/udm.go index c958f2ef..c8d7da7d 100644 --- a/pkg/influxunifi/udm.go +++ b/pkg/influxunifi/udm.go @@ -3,7 +3,7 @@ package influxunifi import ( "strings" - "github.com/unpoller/unifi" + "github.com/unpoller/unifi/v5" ) // udmT is used as a name for printed/logged counters. diff --git a/pkg/influxunifi/usg.go b/pkg/influxunifi/usg.go index 1611b457..ca5ad1e6 100644 --- a/pkg/influxunifi/usg.go +++ b/pkg/influxunifi/usg.go @@ -1,7 +1,7 @@ package influxunifi import ( - "github.com/unpoller/unifi" + "github.com/unpoller/unifi/v5" ) // usgT is used as a name for printed/logged counters. diff --git a/pkg/influxunifi/usw.go b/pkg/influxunifi/usw.go index d7d91eef..fd92db27 100644 --- a/pkg/influxunifi/usw.go +++ b/pkg/influxunifi/usw.go @@ -1,7 +1,7 @@ package influxunifi import ( - "github.com/unpoller/unifi" + "github.com/unpoller/unifi/v5" ) // uswT is used as a name for printed/logged counters. diff --git a/pkg/influxunifi/uxg.go b/pkg/influxunifi/uxg.go index 971bf98e..f64b2cf2 100644 --- a/pkg/influxunifi/uxg.go +++ b/pkg/influxunifi/uxg.go @@ -1,7 +1,7 @@ package influxunifi import ( - "github.com/unpoller/unifi" + "github.com/unpoller/unifi/v5" ) // uxgT is used as a name for printed/logged counters. @@ -24,7 +24,7 @@ func (u *InfluxUnifi) batchUXG(r report, s *unifi.UXG) { // nolint: funlen "serial": s.Serial, "type": s.Type, } - + var gw *unifi.Gw if s.Stat != nil { gw = s.Stat.Gw @@ -34,7 +34,7 @@ func (u *InfluxUnifi) batchUXG(r report, s *unifi.UXG) { // nolint: funlen if s.Stat != nil { sw = s.Stat.Sw } - + fields := Combine( u.batchUDMstorage(s.Storage), u.batchUDMtemps(s.Temperatures), diff --git a/pkg/inputunifi/collectevents.go b/pkg/inputunifi/collectevents.go index 58ab74dd..05c0f1cd 100644 --- a/pkg/inputunifi/collectevents.go +++ b/pkg/inputunifi/collectevents.go @@ -4,7 +4,7 @@ import ( "fmt" "time" - "github.com/unpoller/unifi" + "github.com/unpoller/unifi/v5" "github.com/unpoller/unpoller/pkg/webserver" ) diff --git a/pkg/inputunifi/collector.go b/pkg/inputunifi/collector.go index af85c126..14fde812 100644 --- a/pkg/inputunifi/collector.go +++ b/pkg/inputunifi/collector.go @@ -7,7 +7,7 @@ import ( "strings" "time" - "github.com/unpoller/unifi" + "github.com/unpoller/unifi/v5" "github.com/unpoller/unpoller/pkg/poller" ) diff --git a/pkg/inputunifi/input.go b/pkg/inputunifi/input.go index 7a650c42..b9a29aa3 100644 --- a/pkg/inputunifi/input.go +++ b/pkg/inputunifi/input.go @@ -9,7 +9,7 @@ import ( "sync" "time" - "github.com/unpoller/unifi" + "github.com/unpoller/unifi/v5" "github.com/unpoller/unpoller/pkg/poller" ) diff --git a/pkg/inputunifi/interface.go b/pkg/inputunifi/interface.go index 67f8b984..4ffa0420 100644 --- a/pkg/inputunifi/interface.go +++ b/pkg/inputunifi/interface.go @@ -6,7 +6,7 @@ import ( "fmt" "strings" - "github.com/unpoller/unifi" + "github.com/unpoller/unifi/v5" "github.com/unpoller/unpoller/pkg/poller" "github.com/unpoller/unpoller/pkg/webserver" ) diff --git a/pkg/inputunifi/updateweb.go b/pkg/inputunifi/updateweb.go index 5ac9f450..e9afe7b2 100644 --- a/pkg/inputunifi/updateweb.go +++ b/pkg/inputunifi/updateweb.go @@ -5,7 +5,7 @@ import ( "strconv" "time" - "github.com/unpoller/unifi" + "github.com/unpoller/unifi/v5" "github.com/unpoller/unpoller/pkg/webserver" ) diff --git a/pkg/lokiunifi/report.go b/pkg/lokiunifi/report.go index 0b1f5c42..636f61ca 100644 --- a/pkg/lokiunifi/report.go +++ b/pkg/lokiunifi/report.go @@ -5,7 +5,7 @@ import ( "strings" "time" - "github.com/unpoller/unifi" + "github.com/unpoller/unifi/v5" "github.com/unpoller/unpoller/pkg/poller" ) diff --git a/pkg/lokiunifi/report_alarm.go b/pkg/lokiunifi/report_alarm.go index a9006c0e..338506ce 100644 --- a/pkg/lokiunifi/report_alarm.go +++ b/pkg/lokiunifi/report_alarm.go @@ -3,7 +3,7 @@ package lokiunifi import ( "strconv" - "github.com/unpoller/unifi" + "github.com/unpoller/unifi/v5" ) const typeAlarm = "Alarm" diff --git a/pkg/lokiunifi/report_anomaly.go b/pkg/lokiunifi/report_anomaly.go index bce0fc4a..22e622d0 100644 --- a/pkg/lokiunifi/report_anomaly.go +++ b/pkg/lokiunifi/report_anomaly.go @@ -3,7 +3,7 @@ package lokiunifi import ( "strconv" - "github.com/unpoller/unifi" + "github.com/unpoller/unifi/v5" ) const typeAnomaly = "Anomaly" diff --git a/pkg/lokiunifi/report_event.go b/pkg/lokiunifi/report_event.go index 8ec3e47c..61b24b0e 100644 --- a/pkg/lokiunifi/report_event.go +++ b/pkg/lokiunifi/report_event.go @@ -3,7 +3,7 @@ package lokiunifi import ( "strconv" - "github.com/unpoller/unifi" + "github.com/unpoller/unifi/v5" ) const typeEvent = "Event" diff --git a/pkg/lokiunifi/report_ids.go b/pkg/lokiunifi/report_ids.go index b6a1ef9c..16141672 100644 --- a/pkg/lokiunifi/report_ids.go +++ b/pkg/lokiunifi/report_ids.go @@ -3,7 +3,7 @@ package lokiunifi import ( "strconv" - "github.com/unpoller/unifi" + "github.com/unpoller/unifi/v5" ) const typeIDs = "IDs" diff --git a/pkg/promunifi/clients.go b/pkg/promunifi/clients.go index ff3dec63..577df04d 100644 --- a/pkg/promunifi/clients.go +++ b/pkg/promunifi/clients.go @@ -2,7 +2,7 @@ package promunifi import ( "github.com/prometheus/client_golang/prometheus" - "github.com/unpoller/unifi" + "github.com/unpoller/unifi/v5" ) type uclient struct { diff --git a/pkg/promunifi/collector.go b/pkg/promunifi/collector.go index 36fb1972..62ce3a56 100644 --- a/pkg/promunifi/collector.go +++ b/pkg/promunifi/collector.go @@ -14,7 +14,7 @@ import ( "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promhttp" promver "github.com/prometheus/common/version" - "github.com/unpoller/unifi" + "github.com/unpoller/unifi/v5" "github.com/unpoller/unpoller/pkg/poller" "github.com/unpoller/unpoller/pkg/webserver" "golift.io/version" diff --git a/pkg/promunifi/pdu.go b/pkg/promunifi/pdu.go index 085bc0c4..882a786b 100644 --- a/pkg/promunifi/pdu.go +++ b/pkg/promunifi/pdu.go @@ -2,7 +2,7 @@ package promunifi import ( "github.com/prometheus/client_golang/prometheus" - "github.com/unpoller/unifi" + "github.com/unpoller/unifi/v5" ) type pdu struct { diff --git a/pkg/promunifi/site.go b/pkg/promunifi/site.go index 7b9dcc5a..11e4f6c9 100644 --- a/pkg/promunifi/site.go +++ b/pkg/promunifi/site.go @@ -2,7 +2,7 @@ package promunifi import ( "github.com/prometheus/client_golang/prometheus" - "github.com/unpoller/unifi" + "github.com/unpoller/unifi/v5" ) type site struct { @@ -79,7 +79,7 @@ func (u *promUnifi) exportSiteDPI(r report, v any) { s, ok := v.(*unifi.DPITable) if !ok { u.LogErrorf("invalid type given to SiteDPI: %T", v) - + return } diff --git a/pkg/promunifi/uap.go b/pkg/promunifi/uap.go index d7bbedf4..aca4c515 100644 --- a/pkg/promunifi/uap.go +++ b/pkg/promunifi/uap.go @@ -2,7 +2,7 @@ package promunifi import ( "github.com/prometheus/client_golang/prometheus" - "github.com/unpoller/unifi" + "github.com/unpoller/unifi/v5" ) type uap struct { diff --git a/pkg/promunifi/udm.go b/pkg/promunifi/udm.go index 07ef34aa..c72cdc40 100644 --- a/pkg/promunifi/udm.go +++ b/pkg/promunifi/udm.go @@ -2,7 +2,7 @@ package promunifi import ( "github.com/prometheus/client_golang/prometheus" - "github.com/unpoller/unifi" + "github.com/unpoller/unifi/v5" ) // These are shared by all four device types: UDM, UAP, USG, USW. diff --git a/pkg/promunifi/usg.go b/pkg/promunifi/usg.go index a60f0915..2dfc11a2 100644 --- a/pkg/promunifi/usg.go +++ b/pkg/promunifi/usg.go @@ -4,7 +4,7 @@ import ( "strings" "github.com/prometheus/client_golang/prometheus" - "github.com/unpoller/unifi" + "github.com/unpoller/unifi/v5" ) type usg struct { diff --git a/pkg/promunifi/usw.go b/pkg/promunifi/usw.go index 02672c3a..221840fa 100644 --- a/pkg/promunifi/usw.go +++ b/pkg/promunifi/usw.go @@ -2,7 +2,7 @@ package promunifi import ( "github.com/prometheus/client_golang/prometheus" - "github.com/unpoller/unifi" + "github.com/unpoller/unifi/v5" ) type usw struct { diff --git a/pkg/promunifi/uxg.go b/pkg/promunifi/uxg.go index e2607825..1ae0da94 100644 --- a/pkg/promunifi/uxg.go +++ b/pkg/promunifi/uxg.go @@ -1,7 +1,7 @@ package promunifi import ( - "github.com/unpoller/unifi" + "github.com/unpoller/unifi/v5" ) // exportUXG is a collection of stats from USG and USW. It has no unique stats. diff --git a/pkg/unittest/dep.go b/pkg/unittest/dep.go index 725c7e65..86b4c5f6 100644 --- a/pkg/unittest/dep.go +++ b/pkg/unittest/dep.go @@ -3,7 +3,7 @@ package unittest import ( "testing" - "github.com/unpoller/unifi/mocks" + "github.com/unpoller/unifi/v5/mocks" "github.com/unpoller/unpoller/pkg/inputunifi" "github.com/unpoller/unpoller/pkg/poller" )