From 0f915e88c9054890e9e22d3389febcd980e707c8 Mon Sep 17 00:00:00 2001 From: Cody Lee Date: Tue, 18 Jul 2023 10:57:23 -0500 Subject: [PATCH] bump unifi version and fix data types https://github.com/unpoller/unpoller/issues/575 --- go.mod | 2 +- go.sum | 4 ++-- pkg/datadogunifi/clients.go | 28 ++++++++++++++-------------- pkg/inputunifi/updateweb.go | 4 ++-- pkg/promunifi/clients.go | 2 +- 5 files changed, 20 insertions(+), 20 deletions(-) diff --git a/go.mod b/go.mod index f0eb144a..6f10945e 100644 --- a/go.mod +++ b/go.mod @@ -35,7 +35,7 @@ require ( github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect github.com/prometheus/client_model v0.4.0 // indirect github.com/prometheus/procfs v0.10.1 // indirect - github.com/unpoller/unifi v0.3.3 + github.com/unpoller/unifi v0.3.4 golang.org/x/sys v0.10.0 // indirect google.golang.org/protobuf v1.30.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect diff --git a/go.sum b/go.sum index 356f3139..cc751a19 100644 --- a/go.sum +++ b/go.sum @@ -75,8 +75,8 @@ github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UV github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= -github.com/unpoller/unifi v0.3.3 h1:bnysdsk1qsKK1ZrQuHTwJvfxWhY/8p0rnonGkJ6UNjM= -github.com/unpoller/unifi v0.3.3/go.mod h1:DvHu7qM7idlZeORTh7dyQqxtWsuCMrZb1mtYUchJl7s= +github.com/unpoller/unifi v0.3.4 h1:xFagB13HNFnvA3vdDwTg3mubq0LPl+0/qqMnKAki6QA= +github.com/unpoller/unifi v0.3.4/go.mod h1:Vea8cfAjs6vR8UbZm1AtiRk6AKxp01SxGdbdBTGkM1Y= github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc= github.com/valyala/fasttemplate v1.0.1/go.mod h1:UQGH1tvbgY+Nz5t2n7tXsz52dQxojPUpymEIMZ47gx8= github.com/valyala/fasttemplate v1.2.1/go.mod h1:KHLXt3tVN2HBp8eijSv/kGJopbvo7S+qRAEEKiv+SiQ= diff --git a/pkg/datadogunifi/clients.go b/pkg/datadogunifi/clients.go index 32345b00..5262886e 100644 --- a/pkg/datadogunifi/clients.go +++ b/pkg/datadogunifi/clients.go @@ -51,25 +51,25 @@ func (u *DatadogUnifi) batchClient(r report, s *unifi.Client) { // nolint: funle "powersave_enabled": powerSaveEnabled, "roam_count": float64(s.RoamCount), "rssi": float64(s.Rssi), - "rx_bytes": float64(s.RxBytes), - "rx_bytes_r": float64(s.RxBytesR), - "rx_packets": float64(s.RxPackets), + "rx_bytes": s.RxBytes.Val, + "rx_bytes_r": s.RxBytesR.Val, + "rx_packets": s.RxPackets.Val, "rx_rate": float64(s.RxRate), "signal": float64(s.Signal), - "tx_bytes": float64(s.TxBytes), - "tx_bytes_r": float64(s.TxBytesR), - "tx_packets": float64(s.TxPackets), + "tx_bytes": s.TxBytes.Val, + "tx_bytes_r": s.TxBytesR.Val, + "tx_packets": s.TxPackets.Val, "tx_retries": float64(s.TxRetries), - "tx_power": float64(s.TxPower), - "tx_rate": float64(s.TxRate), + "tx_power": s.TxPower.Val, + "tx_rate": s.TxRate.Val, "uptime": float64(s.Uptime), "wifi_tx_attempts": float64(s.WifiTxAttempts), - "wired_rx_bytes": float64(s.WiredRxBytes), - "wired_rx_bytes-r": float64(s.WiredRxBytesR), - "wired_rx_packets": float64(s.WiredRxPackets), - "wired_tx_bytes": float64(s.WiredTxBytes), - "wired_tx_bytes-r": float64(s.WiredTxBytesR), - "wired_tx_packets": float64(s.WiredTxPackets), + "wired_rx_bytes": s.WiredRxBytes.Val, + "wired_rx_bytes-r": s.WiredRxBytesR.Val, + "wired_rx_packets": s.WiredRxPackets.Val, + "wired_tx_bytes": s.WiredTxBytes.Val, + "wired_tx_bytes-r": s.WiredTxBytesR.Val, + "wired_tx_packets": s.WiredTxPackets.Val, } metricName := metricNamespace("clients") diff --git a/pkg/inputunifi/updateweb.go b/pkg/inputunifi/updateweb.go index c660690f..40b9872e 100644 --- a/pkg/inputunifi/updateweb.go +++ b/pkg/inputunifi/updateweb.go @@ -98,8 +98,8 @@ func formatClients(c *Controller, clients []*unifi.Client) (d webserver.Clients) IP: client.IP, Type: clientType, DeviceMAC: deviceMAC, - Rx: client.RxBytes, - Tx: client.TxBytes, + Rx: client.RxBytes.Int64(), + Tx: client.TxBytes.Int64(), Since: time.Unix(client.FirstSeen, 0), Last: time.Unix(client.LastSeen, 0), }) diff --git a/pkg/promunifi/clients.go b/pkg/promunifi/clients.go index 98b2b98f..9ca0d5a6 100644 --- a/pkg/promunifi/clients.go +++ b/pkg/promunifi/clients.go @@ -133,7 +133,7 @@ func (u *promUnifi) exportClient(r report, c *unifi.Client) { {u.Client.RSSI, gauge, c.Rssi, labelW}, {u.Client.Signal, gauge, c.Signal, labelW}, {u.Client.TxPower, gauge, c.TxPower, labelW}, - {u.Client.TxRate, gauge, c.TxRate * 1000, labelW}, + {u.Client.TxRate, gauge, c.TxRate.Val * 1000, labelW}, {u.Client.WifiTxAttempts, counter, c.WifiTxAttempts, labelW}, {u.Client.RxRate, gauge, c.RxRate * 1000, labelW}, {u.Client.TxRetries, counter, c.TxRetries, labels},