a few more fixes
This commit is contained in:
parent
381a31a5b2
commit
1840503f34
|
|
@ -57,12 +57,12 @@ func descClient(ns string) *client {
|
||||||
RSSI: prometheus.NewDesc(ns+"rssi", "Client RSSI", labels, nil),
|
RSSI: prometheus.NewDesc(ns+"rssi", "Client RSSI", labels, nil),
|
||||||
RxBytes: prometheus.NewDesc(ns+"rx_bytes_total", "Client Receive Bytes", 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),
|
RxBytesR: prometheus.NewDesc(ns+"rx_bytes_rate", "Client Receive Data Rate", labels, nil),
|
||||||
RxPackets: prometheus.NewDesc(ns+"rx_packets", "Client Receive Packets", 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),
|
RxRate: prometheus.NewDesc(ns+"rx_rate", "Client Receive Rate", labels, nil),
|
||||||
Signal: prometheus.NewDesc(ns+"signal", "Client Signal Strength", labels, nil),
|
Signal: prometheus.NewDesc(ns+"signal", "Client Signal Strength", labels, nil),
|
||||||
TxBytes: prometheus.NewDesc(ns+"tx_bytes_total", "Client Transmit Bytes", 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),
|
TxBytesR: prometheus.NewDesc(ns+"tx_bytes_rate", "Client Transmit Data Rate", labels, nil),
|
||||||
TxPackets: prometheus.NewDesc(ns+"tx_packets", "Client Transmit Packets", labels, nil),
|
TxPackets: prometheus.NewDesc(ns+"tx_packets_total", "Client Transmit Packets", labels, nil),
|
||||||
TxPower: prometheus.NewDesc(ns+"tx_power", "Client Transmit Power", labels, nil),
|
TxPower: prometheus.NewDesc(ns+"tx_power", "Client Transmit Power", labels, nil),
|
||||||
TxRate: prometheus.NewDesc(ns+"tx_rate", "Client Transmit Rate", labels, nil),
|
TxRate: prometheus.NewDesc(ns+"tx_rate", "Client Transmit Rate", labels, nil),
|
||||||
Uptime: prometheus.NewDesc(ns+"uptime", "Client Uptime", labels, nil),
|
Uptime: prometheus.NewDesc(ns+"uptime", "Client Uptime", labels, nil),
|
||||||
|
|
|
||||||
|
|
@ -41,30 +41,30 @@ func descSite(ns string) *site {
|
||||||
labels := []string{"name", "desc", "site_name", "subsystem", "status", "gwversion"}
|
labels := []string{"name", "desc", "site_name", "subsystem", "status", "gwversion"}
|
||||||
|
|
||||||
return &site{
|
return &site{
|
||||||
NumUser: prometheus.NewDesc(ns+"user_total", "NumUser", labels, nil),
|
NumUser: prometheus.NewDesc(ns+"user_total", "Number of Users", labels, nil),
|
||||||
NumGuest: prometheus.NewDesc(ns+"guest_total", "NumGuest", labels, nil),
|
NumGuest: prometheus.NewDesc(ns+"guest_total", "Number of Guests", labels, nil),
|
||||||
NumIot: prometheus.NewDesc(ns+"iot_total", "NumIot", labels, nil),
|
NumIot: prometheus.NewDesc(ns+"iot_total", "Number of IoT Devices", labels, nil),
|
||||||
TxBytesR: prometheus.NewDesc(ns+"tx_bytes_rate", "TxBytesR", labels, nil),
|
TxBytesR: prometheus.NewDesc(ns+"tx_bytes_rate", "Bytes Transmit Rate", labels, nil),
|
||||||
RxBytesR: prometheus.NewDesc(ns+"rx_bytes_rate", "RxBytesR", labels, nil),
|
RxBytesR: prometheus.NewDesc(ns+"rx_bytes_rate", "Bytes Receive Rate", labels, nil),
|
||||||
NumAp: prometheus.NewDesc(ns+"ap_total", "NumAp", labels, nil),
|
NumAp: prometheus.NewDesc(ns+"ap_total", "Access Point Count", labels, nil),
|
||||||
NumAdopted: prometheus.NewDesc(ns+"adopted_total", "NumAdopted", labels, nil),
|
NumAdopted: prometheus.NewDesc(ns+"adopted_total", "Adoption Count", labels, nil),
|
||||||
NumDisabled: prometheus.NewDesc(ns+"disabled_total", "NumDisabled", labels, nil),
|
NumDisabled: prometheus.NewDesc(ns+"disabled_total", "Disabled Count", labels, nil),
|
||||||
NumDisconnected: prometheus.NewDesc(ns+"disconnected_total", "NumDisconnected", labels, nil),
|
NumDisconnected: prometheus.NewDesc(ns+"disconnected_total", "Disconnected Count", labels, nil),
|
||||||
NumPending: prometheus.NewDesc(ns+"pending_total", "NumPending", labels, nil),
|
NumPending: prometheus.NewDesc(ns+"pending_total", "Pending Count", labels, nil),
|
||||||
NumGw: prometheus.NewDesc(ns+"gw_total", "NumGw", labels, nil),
|
NumGw: prometheus.NewDesc(ns+"gateways_total", "Gateway Count", labels, nil),
|
||||||
NumSw: prometheus.NewDesc(ns+"sw_total", "NumSw", labels, nil),
|
NumSw: prometheus.NewDesc(ns+"switches_total", "Switch Count", labels, nil),
|
||||||
NumSta: prometheus.NewDesc(ns+"stations_total", "NumSta", labels, nil),
|
NumSta: prometheus.NewDesc(ns+"stations_total", "Station Count", labels, nil),
|
||||||
Latency: prometheus.NewDesc(ns+"latency", "Latency", labels, nil),
|
Latency: prometheus.NewDesc(ns+"latency", "Latency", labels, nil),
|
||||||
Drops: prometheus.NewDesc(ns+"drops_total", "Drops", labels, nil),
|
Drops: prometheus.NewDesc(ns+"drops_total", "Drops", labels, nil),
|
||||||
XputUp: prometheus.NewDesc(ns+"xput_up", "XputUp", labels, nil),
|
XputUp: prometheus.NewDesc(ns+"xput_up_rate", "Speedtest Upload", labels, nil),
|
||||||
XputDown: prometheus.NewDesc(ns+"xput_down", "XputDown", labels, nil),
|
XputDown: prometheus.NewDesc(ns+"xput_down_rate", "Speedtest Download", labels, nil),
|
||||||
SpeedtestPing: prometheus.NewDesc(ns+"speedtest_ping", "SpeedtestPing", labels, nil),
|
SpeedtestPing: prometheus.NewDesc(ns+"speedtest_ping", "Speedtest Ping", labels, nil),
|
||||||
RemoteUserNumActive: prometheus.NewDesc(ns+"remote_user_active_total", "RemoteUserNumActive", labels, nil),
|
RemoteUserNumActive: prometheus.NewDesc(ns+"remote_user_active_total", "Remote Users Active", labels, nil),
|
||||||
RemoteUserNumInactive: prometheus.NewDesc(ns+"remote_user_inactive_total", "RemoteUserNumInactive", labels, nil),
|
RemoteUserNumInactive: prometheus.NewDesc(ns+"remote_user_inactive_total", "Remote Users Inactive", labels, nil),
|
||||||
RemoteUserRxBytes: prometheus.NewDesc(ns+"remote_user_rx_bytes_total", "RemoteUserRxBytes", labels, nil),
|
RemoteUserRxBytes: prometheus.NewDesc(ns+"remote_user_rx_bytes_total", "Remote Users Receive Bytes", labels, nil),
|
||||||
RemoteUserTxBytes: prometheus.NewDesc(ns+"remote_user_tx_bytes_total", "RemoteUserTxBytes", labels, nil),
|
RemoteUserTxBytes: prometheus.NewDesc(ns+"remote_user_tx_bytes_total", "Remote Users Transmit Bytes", labels, nil),
|
||||||
RemoteUserRxPackets: prometheus.NewDesc(ns+"remote_user_rx_packets_total", "RemoteUserRxPackets", labels, nil),
|
RemoteUserRxPackets: prometheus.NewDesc(ns+"remote_user_rx_packets_total", "Remote Users Receive Packets", labels, nil),
|
||||||
RemoteUserTxPackets: prometheus.NewDesc(ns+"remote_user_tx_packets_total", "RemoteUserTxPackets", labels, nil),
|
RemoteUserTxPackets: prometheus.NewDesc(ns+"remote_user_tx_packets_total", "Remote Users Transmit Packets", labels, nil),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue