From 7e35c87dabf21bb92898ee280d5b05ded54a267b Mon Sep 17 00:00:00 2001 From: davidnewhall2 Date: Mon, 18 Nov 2019 02:41:20 -0800 Subject: [PATCH] move tx/rx labels around --- promunifi/clients.go | 36 ++++++++++++++++++------------------ promunifi/collector.go | 6 +++--- promunifi/site.go | 4 ++-- promunifi/uap.go | 2 +- promunifi/usg.go | 42 +++++++++++++++++++++--------------------- promunifi/usw.go | 30 +++++++++++++++--------------- 6 files changed, 60 insertions(+), 60 deletions(-) diff --git a/promunifi/clients.go b/promunifi/clients.go index 4743118a..e3c973b1 100644 --- a/promunifi/clients.go +++ b/promunifi/clients.go @@ -55,30 +55,30 @@ func descClient(ns string) *client { Noise: prometheus.NewDesc(ns+"noise", "Client AP Noise", labels, nil), RoamCount: prometheus.NewDesc(ns+"roam_total", "Client Roam Counter", labels, nil), RSSI: prometheus.NewDesc(ns+"rssi", "Client RSSI", labels, nil), - RxBytes: prometheus.NewDesc(ns+"rx_bytes_total", "Client Receive Bytes", labels, nil), - RxBytesR: prometheus.NewDesc(ns+"rx_bytes_rate", "Client Receive Data Rate", labels, nil), - RxPackets: prometheus.NewDesc(ns+"rx_packets_total", "Client Receive Packets", labels, nil), - RxRate: prometheus.NewDesc(ns+"rx_rate", "Client Receive Rate", labels, nil), + RxBytes: prometheus.NewDesc(ns+"bytes_rx_total", "Client Receive Bytes", labels, nil), + RxBytesR: prometheus.NewDesc(ns+"bytes_rx_rate", "Client Receive Data Rate", labels, nil), + RxPackets: prometheus.NewDesc(ns+"packets_rx_total", "Client Receive Packets", labels, nil), + RxRate: prometheus.NewDesc(ns+"rate", "Client Receive Rate", labels, nil), Signal: prometheus.NewDesc(ns+"signal", "Client Signal Strength", labels, nil), - TxBytes: prometheus.NewDesc(ns+"tx_bytes_total", "Client Transmit Bytes", labels, nil), - TxBytesR: prometheus.NewDesc(ns+"tx_bytes_rate", "Client Transmit Data Rate", labels, nil), - TxPackets: prometheus.NewDesc(ns+"tx_packets_total", "Client Transmit Packets", labels, nil), + TxBytes: prometheus.NewDesc(ns+"bytes_tx_total", "Client Transmit Bytes", labels, nil), + TxBytesR: prometheus.NewDesc(ns+"bytes_tx_rate", "Client Transmit Data Rate", labels, nil), + TxPackets: prometheus.NewDesc(ns+"packets_tx_total", "Client Transmit Packets", labels, nil), TxPower: prometheus.NewDesc(ns+"tx_power", "Client Transmit Power", labels, nil), TxRate: prometheus.NewDesc(ns+"tx_rate", "Client Transmit Rate", labels, nil), Uptime: prometheus.NewDesc(ns+"uptime", "Client Uptime", labels, nil), - WifiTxAttempts: prometheus.NewDesc(ns+"wifi_tx_attempts_total", "Client Wifi Transmit Attempts", labels, nil), - WiredRxBytes: prometheus.NewDesc(ns+"wired_rx_bytes_total", "Client Wired Receive Bytes", labels, nil), - WiredRxBytesR: prometheus.NewDesc(ns+"wired_rx_bytes_rate", "Client Wired Receive Data Rate", labels, nil), - WiredRxPackets: prometheus.NewDesc(ns+"wired_rx_packets_total", "Client Wired Receive Packets", labels, nil), - WiredTxBytes: prometheus.NewDesc(ns+"wired_tx_bytes_total", "Client Wired Transmit Bytes", labels, nil), - WiredTxBytesR: prometheus.NewDesc(ns+"wired_tx_bytes_rate", "Client Wired Data Rate", labels, nil), - WiredTxPackets: prometheus.NewDesc(ns+"wired_tx_packets_total", "Client Wired Transmit Packets", labels, nil), + WifiTxAttempts: prometheus.NewDesc(ns+"wifi_attempts_tx_total", "Client Wifi Transmit Attempts", labels, nil), + WiredRxBytes: prometheus.NewDesc(ns+"wired_bytes_rx_total", "Client Wired Receive Bytes", labels, nil), + WiredRxBytesR: prometheus.NewDesc(ns+"wired_bytes_rx_rate", "Client Wired Receive Data Rate", labels, nil), + WiredRxPackets: prometheus.NewDesc(ns+"wired_packets_rx_total", "Client Wired Receive Packets", labels, nil), + WiredTxBytes: prometheus.NewDesc(ns+"wired_bytes_tx_total", "Client Wired Transmit Bytes", labels, nil), + WiredTxBytesR: prometheus.NewDesc(ns+"wired_bytes_tx_rate", "Client Wired Data Rate", labels, nil), + WiredTxPackets: prometheus.NewDesc(ns+"wired_packets_tx_total", "Client Wired Transmit Packets", labels, nil), DpiStatsApp: prometheus.NewDesc(ns+"dpi_stats_app", "Client DPI Stats App", labels, nil), DpiStatsCat: prometheus.NewDesc(ns+"dpi_stats_cat", "Client DPI Stats Cat", labels, nil), - DpiStatsRxBytes: prometheus.NewDesc(ns+"dpi_stats_rx_bytes_total", "Client DPI Stats Receive Bytes", labels, nil), - DpiStatsRxPackets: prometheus.NewDesc(ns+"dpi_stats_rx_packets_total", "Client DPI Stats Receive Packets", labels, nil), - DpiStatsTxBytes: prometheus.NewDesc(ns+"dpi_stats_tx_bytes_total", "Client DPI Stats Transmit Bytes", labels, nil), - DpiStatsTxPackets: prometheus.NewDesc(ns+"dpi_stats_tx_packets_total", "Client DPI Stats Transmit Packets", labels, nil), + DpiStatsRxBytes: prometheus.NewDesc(ns+"dpi_stats_bytes_rx_total", "Client DPI Stats Receive Bytes", labels, nil), + DpiStatsRxPackets: prometheus.NewDesc(ns+"dpi_stats_packets_rx_total", "Client DPI Stats Receive Packets", labels, nil), + DpiStatsTxBytes: prometheus.NewDesc(ns+"dpi_stats_bytes_tx_total", "Client DPI Stats Transmit Bytes", labels, nil), + DpiStatsTxPackets: prometheus.NewDesc(ns+"dpi_stats_packets_tx_total", "Client DPI Stats Transmit Packets", labels, nil), } } diff --git a/promunifi/collector.go b/promunifi/collector.go index d431b1e9..400841c1 100644 --- a/promunifi/collector.go +++ b/promunifi/collector.go @@ -17,13 +17,13 @@ type UnifiCollectorCnfg struct { Namespace string // If true, any error encountered during collection is reported as an // invalid metric (see NewInvalidMetric). Otherwise, errors are ignored - // and the collected metrics will be incomplete. (Possibly, no metrics - // will be collected at all.) + // and the collected metrics will be incomplete. Possibly, no metrics + // will be collected at all. ReportErrors bool // This function is passed to the Collect() method. The Collect method runs This // function to retreive the latest UniFi CollectFn func() (*metrics.Metrics, error) - // provide a logger function if you want to run a routine *after* prometheus checks in. + // Provide a logger function if you want to run a routine *after* prometheus checks in. LoggingFn func(*Report) } diff --git a/promunifi/site.go b/promunifi/site.go index 88741016..5e8d0eaf 100644 --- a/promunifi/site.go +++ b/promunifi/site.go @@ -43,8 +43,8 @@ func descSite(ns string) *site { NumUser: prometheus.NewDesc(ns+"user_total", "Number of Users", labels, nil), NumGuest: prometheus.NewDesc(ns+"guest_total", "Number of Guests", labels, nil), NumIot: prometheus.NewDesc(ns+"iot_total", "Number of IoT Devices", labels, nil), - TxBytesR: prometheus.NewDesc(ns+"tx_bytes_rate", "Bytes Transmit Rate", labels, nil), - RxBytesR: prometheus.NewDesc(ns+"rx_bytes_rate", "Bytes Receive Rate", labels, nil), + TxBytesR: prometheus.NewDesc(ns+"bytes_tx_rate", "Bytes Transmit Rate", labels, nil), + RxBytesR: prometheus.NewDesc(ns+"bytes_rx_rate", "Bytes Receive Rate", labels, nil), NumAp: prometheus.NewDesc(ns+"ap_total", "Access Point Count", labels, nil), NumAdopted: prometheus.NewDesc(ns+"adopted_total", "Adoption Count", labels, nil), NumDisabled: prometheus.NewDesc(ns+"disabled_total", "Disabled Count", labels, nil), diff --git a/promunifi/uap.go b/promunifi/uap.go index 676434d0..9d42e095 100644 --- a/promunifi/uap.go +++ b/promunifi/uap.go @@ -98,7 +98,7 @@ func descUAP(ns string) *uap { MemTotal: prometheus.NewDesc(ns+"memory_installed", "System Installed Memory", labels, nil), MemBuffer: prometheus.NewDesc(ns+"memory_buffer", "System Memory Buffer", labels, nil), CPU: prometheus.NewDesc(ns+"cpu_utilization", "System CPU % Utilized", labels, nil), - Mem: prometheus.NewDesc(ns+"memory", "System Memory % Utilized", labels, nil), + Mem: prometheus.NewDesc(ns+"memory_utilization", "System Memory % Utilized", labels, nil), } } diff --git a/promunifi/usg.go b/promunifi/usg.go index f641672a..0bf68be8 100644 --- a/promunifi/usg.go +++ b/promunifi/usg.go @@ -64,8 +64,8 @@ func descUSG(ns string) *usg { return &usg{ Uptime: prometheus.NewDesc(ns+"uptime", "Uptime", labels, nil), - TotalTxBytes: prometheus.NewDesc(ns+"tx_bytes_total", "Total Transmitted Bytes", labels, nil), - TotalRxBytes: prometheus.NewDesc(ns+"rx_bytes_total", "Total Received Bytes", labels, nil), + TotalTxBytes: prometheus.NewDesc(ns+"bytes_tx_total", "Total Transmitted Bytes", labels, nil), + TotalRxBytes: prometheus.NewDesc(ns+"bytes_rx_total", "Total Received Bytes", labels, nil), TotalBytes: prometheus.NewDesc(ns+"bytes_total", "Total Bytes Transfered", labels, nil), NumSta: prometheus.NewDesc(ns+"stations_total", "Number of Stations", labels, nil), UserNumSta: prometheus.NewDesc(ns+"stations_user_total", "Number of User Stations", labels, nil), @@ -81,27 +81,27 @@ func descUSG(ns string) *usg { MemBuffer: prometheus.NewDesc(ns+"memory_buffer", "System Memory Buffer", labels, nil), CPU: prometheus.NewDesc(ns+"cpu_utilization", "System CPU % Utilized", labels, nil), Mem: prometheus.NewDesc(ns+"memory_utilization", "System Memory % Utilized", labels, nil), // this may not be %. - WanRxPackets: prometheus.NewDesc(ns+"wan_rx_packets_total", "WAN Receive Packets Total", labelWan, nil), - WanRxBytes: prometheus.NewDesc(ns+"wan_rx_bytes_total", "WAN Receive Bytes Total", labelWan, nil), - WanRxDropped: prometheus.NewDesc(ns+"wan_rx_dropped_total", "WAN Receive Dropped Total", labelWan, nil), - WanRxErrors: prometheus.NewDesc(ns+"wan_rx_errors_total", "WAN Receive Errors Total", labelWan, nil), - WanTxPackets: prometheus.NewDesc(ns+"wan_tx_packets_total", "WAN Transmit Packets Total", labelWan, nil), - WanTxBytes: prometheus.NewDesc(ns+"wan_tx_bytes_total", "WAN Transmit Bytes Total", labelWan, nil), - WanRxBroadcast: prometheus.NewDesc(ns+"wan_rx_broadcast_total", "WAN Receive Broadcast Total", labelWan, nil), - WanRxBytesR: prometheus.NewDesc(ns+"wan_rx_bytes_rate", "WAN Receive Bytes Rate", labelWan, nil), - WanRxMulticast: prometheus.NewDesc(ns+"wan_rx_multicast_total", "WAN Receive Multicast Total", labelWan, nil), + WanRxPackets: prometheus.NewDesc(ns+"wan_packets_rx_total", "WAN Receive Packets Total", labelWan, nil), + WanRxBytes: prometheus.NewDesc(ns+"wan_bytes_rx_total", "WAN Receive Bytes Total", labelWan, nil), + WanRxDropped: prometheus.NewDesc(ns+"wan_dropped_rx_total", "WAN Receive Dropped Total", labelWan, nil), + WanRxErrors: prometheus.NewDesc(ns+"wan_errors_rx_total", "WAN Receive Errors Total", labelWan, nil), + WanTxPackets: prometheus.NewDesc(ns+"wan_packets_tx_total", "WAN Transmit Packets Total", labelWan, nil), + WanTxBytes: prometheus.NewDesc(ns+"wan_bytes_tx_total", "WAN Transmit Bytes Total", labelWan, nil), + WanRxBroadcast: prometheus.NewDesc(ns+"wan_broadcast_rx_total", "WAN Receive Broadcast Total", labelWan, nil), + WanRxBytesR: prometheus.NewDesc(ns+"wan_bytes_rx_rate", "WAN Receive Bytes Rate", labelWan, nil), + WanRxMulticast: prometheus.NewDesc(ns+"wan_ulticast_rx_total", "WAN Receive Multicast Total", labelWan, nil), WanSpeed: prometheus.NewDesc(ns+"wan_speed", "WAN Speed", labelWan, nil), - WanTxBroadcast: prometheus.NewDesc(ns+"wan_tx_broadcast_total", "WAN Transmit Broadcast Total", labelWan, nil), - WanTxBytesR: prometheus.NewDesc(ns+"wan_tx_bytes_rate", "WAN Transmit Bytes Rate", labelWan, nil), - WanTxDropped: prometheus.NewDesc(ns+"wan_tx_dropped_total", "WAN Transmit Dropped Total", labelWan, nil), - WanTxErrors: prometheus.NewDesc(ns+"wan_tx_errors_total", "WAN Transmit Errors Total", labelWan, nil), - WanTxMulticast: prometheus.NewDesc(ns+"wan_tx_multicast_total", "WAN Transmit Multicast Total", labelWan, nil), + WanTxBroadcast: prometheus.NewDesc(ns+"wan_broadcast_tx_total", "WAN Transmit Broadcast Total", labelWan, nil), + WanTxBytesR: prometheus.NewDesc(ns+"wan_bytes_tx_rate", "WAN Transmit Bytes Rate", labelWan, nil), + WanTxDropped: prometheus.NewDesc(ns+"wan_dropped_tx_total", "WAN Transmit Dropped Total", labelWan, nil), + WanTxErrors: prometheus.NewDesc(ns+"wan_errors_tx_total", "WAN Transmit Errors Total", labelWan, nil), + WanTxMulticast: prometheus.NewDesc(ns+"wan_multicast_tx_total", "WAN Transmit Multicast Total", labelWan, nil), WanBytesR: prometheus.NewDesc(ns+"wan_bytes_rate", "WAN Transfer Rate", labelWan, nil), - LanRxPackets: prometheus.NewDesc(ns+"lan_rx_packets_total", "LAN Receive Packets Total", labels, nil), - LanRxBytes: prometheus.NewDesc(ns+"lan_rx_bytes_total", "LAN Receive Bytes Total", labels, nil), - LanRxDropped: prometheus.NewDesc(ns+"lan_rx_dropped_total", "LAN Receive Dropped Total", labels, nil), - LanTxPackets: prometheus.NewDesc(ns+"lan_tx_packets_total", "LAN Transmit Packets Total", labels, nil), - LanTxBytes: prometheus.NewDesc(ns+"lan_tx_bytes_total", "LAN Transmit Bytes Total", labels, nil), + LanRxPackets: prometheus.NewDesc(ns+"lan_packets_rx_total", "LAN Receive Packets Total", labels, nil), + LanRxBytes: prometheus.NewDesc(ns+"lan_bytes_rx_total", "LAN Receive Bytes Total", labels, nil), + LanRxDropped: prometheus.NewDesc(ns+"lan_dropped_rx_total", "LAN Receive Dropped Total", labels, nil), + LanTxPackets: prometheus.NewDesc(ns+"lan_packets_tx_total", "LAN Transmit Packets Total", labels, nil), + LanTxBytes: prometheus.NewDesc(ns+"lan_bytes_tx_total", "LAN Transmit Bytes Total", labels, nil), Latency: prometheus.NewDesc(ns+"speedtest_latency", "Speedtest Latency", labels, nil), Runtime: prometheus.NewDesc(ns+"speedtest_runtime", "Speedtest Run Time", labels, nil), XputDownload: prometheus.NewDesc(ns+"speedtest_download_rate", "Speedtest Download Rate", labels, nil), diff --git a/promunifi/usw.go b/promunifi/usw.go index 866590d9..ac2ab5ac 100644 --- a/promunifi/usw.go +++ b/promunifi/usw.go @@ -94,7 +94,7 @@ func descUSW(ns string) *usw { MemTotal: prometheus.NewDesc(ns+"memory_installed", "System Installed Memory", labels, nil), MemBuffer: prometheus.NewDesc(ns+"memory_buffer", "System Memory Buffer", labels, nil), CPU: prometheus.NewDesc(ns+"cpu_utilization", "System CPU % Utilized", labels, nil), - Mem: prometheus.NewDesc(ns+"memory", "System Memory % Utilized", labels, nil), // this may not be %. + Mem: prometheus.NewDesc(ns+"memory_utilization", "System Memory % Utilized", labels, nil), // this may not be %. SwRxPackets: prometheus.NewDesc(ns+"switch_packets_rx_total", "Switch Packets Received Total", labels, nil), SwRxBytes: prometheus.NewDesc(ns+"switch_bytes_rx_total", "Switch Bytes Received Total", labels, nil), @@ -117,22 +117,22 @@ func descUSW(ns string) *usw { PoeCurrent: prometheus.NewDesc(pns+"poe_current", "POE Current", labelP, nil), PoePower: prometheus.NewDesc(pns+"poe_power", "POE Power", labelP, nil), PoeVoltage: prometheus.NewDesc(pns+"poe_voltage", "POE Voltage", labelP, nil), - RxBroadcast: prometheus.NewDesc(pns+"rx_broadcast_total", "Receive Broadcast", labelP, nil), - RxBytes: prometheus.NewDesc(pns+"rx_bytes_total", "Total Receive Bytes", labelP, nil), - RxBytesR: prometheus.NewDesc(pns+"rx_bytes_rate", "Receive Bytes Rate", labelP, nil), - RxDropped: prometheus.NewDesc(pns+"rx_dropped_total", "Total Receive Dropped", labelP, nil), - RxErrors: prometheus.NewDesc(pns+"rx_errors_total", "Total Receive Errors", labelP, nil), - RxMulticast: prometheus.NewDesc(pns+"rx_multicast_total", "Total Receive Multicast", labelP, nil), - RxPackets: prometheus.NewDesc(pns+"rx_packets_total", "Total Receive Packets", labelP, nil), + RxBroadcast: prometheus.NewDesc(pns+"broadcast_rx_total", "Receive Broadcast", labelP, nil), + RxBytes: prometheus.NewDesc(pns+"bytes_rx_total", "Total Receive Bytes", labelP, nil), + RxBytesR: prometheus.NewDesc(pns+"bytes_rx_rate", "Receive Bytes Rate", labelP, nil), + RxDropped: prometheus.NewDesc(pns+"dropped_rx_total", "Total Receive Dropped", labelP, nil), + RxErrors: prometheus.NewDesc(pns+"errors_rx_total", "Total Receive Errors", labelP, nil), + RxMulticast: prometheus.NewDesc(pns+"multicast_rx_total", "Total Receive Multicast", labelP, nil), + RxPackets: prometheus.NewDesc(pns+"packets_rx_total", "Total Receive Packets", labelP, nil), Satisfaction: prometheus.NewDesc(pns+"satisfaction", "Satisfaction", labelP, nil), Speed: prometheus.NewDesc(pns+"speed", "Speed", labelP, nil), - TxBroadcast: prometheus.NewDesc(pns+"tx_broadcast_total", "Total Transmit Broadcast", labelP, nil), - TxBytes: prometheus.NewDesc(pns+"tx_bytes_total", "Total Transmit Bytes", labelP, nil), - TxBytesR: prometheus.NewDesc(pns+"tx_bytes_rate", "Transmit Bytes Rate", labelP, nil), - TxDropped: prometheus.NewDesc(pns+"tx_dropped_total", "Total Transmit Dropped", labelP, nil), - TxErrors: prometheus.NewDesc(pns+"tx_errors_total", "Total Transmit Errors", labelP, nil), - TxMulticast: prometheus.NewDesc(pns+"tx_multicast_total", "Total Tranmist Multicast", labelP, nil), - TxPackets: prometheus.NewDesc(pns+"tx_packets_total", "Total Transmit Packets", labelP, nil), + TxBroadcast: prometheus.NewDesc(pns+"broadcast_tx_total", "Total Transmit Broadcast", labelP, nil), + TxBytes: prometheus.NewDesc(pns+"bytes_tx_total", "Total Transmit Bytes", labelP, nil), + TxBytesR: prometheus.NewDesc(pns+"bytes_tx_rate", "Transmit Bytes Rate", labelP, nil), + TxDropped: prometheus.NewDesc(pns+"dropped_tx_total", "Total Transmit Dropped", labelP, nil), + TxErrors: prometheus.NewDesc(pns+"errors_tx_total", "Total Transmit Errors", labelP, nil), + TxMulticast: prometheus.NewDesc(pns+"multicast_tx_total", "Total Tranmist Multicast", labelP, nil), + TxPackets: prometheus.NewDesc(pns+"packets_tx_total", "Total Transmit Packets", labelP, nil), } }