more fixes!
This commit is contained in:
davidnewhall2
parent
8d2244b02f
commit
204a93fab1
|
|
@ -50,27 +50,27 @@ func descSite(ns string) *site {
|
|||
labels := []string{"subsystem", "status", "name", "desc", "site_name"}
|
||||
|
||||
return &site{
|
||||
NumUser: prometheus.NewDesc(ns+"num_user", "Number of Users", labels, nil),
|
||||
NumGuest: prometheus.NewDesc(ns+"num_guest", "Number of Guests", labels, nil),
|
||||
NumIot: prometheus.NewDesc(ns+"num_iot", "Number of IoT Devices", labels, nil),
|
||||
NumUser: prometheus.NewDesc(ns+"users", "Number of Users", labels, nil),
|
||||
NumGuest: prometheus.NewDesc(ns+"guests", "Number of Guests", labels, nil),
|
||||
NumIot: prometheus.NewDesc(ns+"iots", "Number of IoT Devices", labels, nil),
|
||||
TxBytesR: prometheus.NewDesc(ns+"transmit_rate_bytes", "Bytes Transmit Rate", labels, nil),
|
||||
RxBytesR: prometheus.NewDesc(ns+"receive_rate_bytes", "Bytes Receive Rate", labels, nil),
|
||||
NumAp: prometheus.NewDesc(ns+"num_ap", "Access Point Count", labels, nil),
|
||||
NumAdopted: prometheus.NewDesc(ns+"num_adopted", "Adoption Count", labels, nil),
|
||||
NumDisabled: prometheus.NewDesc(ns+"num_disabled", "Disabled Count", labels, nil),
|
||||
NumDisconnected: prometheus.NewDesc(ns+"num_disconnected", "Disconnected Count", labels, nil),
|
||||
NumPending: prometheus.NewDesc(ns+"num_pending", "Pending Count", labels, nil),
|
||||
NumGw: prometheus.NewDesc(ns+"num_gateways", "Gateway Count", labels, nil),
|
||||
NumSw: prometheus.NewDesc(ns+"num_switches", "Switch Count", labels, nil),
|
||||
NumSta: prometheus.NewDesc(ns+"num_stations", "Station Count", labels, nil),
|
||||
NumAp: prometheus.NewDesc(ns+"aps", "Access Point Count", labels, nil),
|
||||
NumAdopted: prometheus.NewDesc(ns+"adopted", "Adoption Count", labels, nil),
|
||||
NumDisabled: prometheus.NewDesc(ns+"disabled", "Disabled Count", labels, nil),
|
||||
NumDisconnected: prometheus.NewDesc(ns+"disconnected", "Disconnected Count", labels, nil),
|
||||
NumPending: prometheus.NewDesc(ns+"pending", "Pending Count", labels, nil),
|
||||
NumGw: prometheus.NewDesc(ns+"gateways", "Gateway Count", labels, nil),
|
||||
NumSw: prometheus.NewDesc(ns+"switches", "Switch Count", labels, nil),
|
||||
NumSta: prometheus.NewDesc(ns+"stations", "Station Count", labels, nil),
|
||||
Latency: prometheus.NewDesc(ns+"latency_seconds", "Latency", labels, nil),
|
||||
Uptime: prometheus.NewDesc(ns+"uptime_seconds", "Uptime", labels, nil),
|
||||
Drops: prometheus.NewDesc(ns+"intenet_drops_total", "Internet (WAN) Disconnections", labels, nil),
|
||||
XputUp: prometheus.NewDesc(ns+"xput_up_rate", "Speedtest Upload", labels, nil),
|
||||
XputDown: prometheus.NewDesc(ns+"xput_down_rate", "Speedtest Download", labels, nil),
|
||||
SpeedtestPing: prometheus.NewDesc(ns+"speedtest_ping", "Speedtest Ping", labels, nil),
|
||||
RemoteUserNumActive: prometheus.NewDesc(ns+"num_remote_user_active", "Remote Users Active", labels, nil),
|
||||
RemoteUserNumInactive: prometheus.NewDesc(ns+"num_remote_user_inactive", "Remote Users Inactive", labels, nil),
|
||||
RemoteUserNumActive: prometheus.NewDesc(ns+"remote_user_active", "Remote Users Active", labels, nil),
|
||||
RemoteUserNumInactive: prometheus.NewDesc(ns+"remote_user_inactive", "Remote Users Inactive", labels, nil),
|
||||
RemoteUserRxBytes: prometheus.NewDesc(ns+"remote_user_receive_bytes_total", "Remote Users Receive Bytes", labels, nil),
|
||||
RemoteUserTxBytes: prometheus.NewDesc(ns+"remote_user_transmit_bytes_total", "Remote Users Transmit Bytes", labels, nil),
|
||||
RemoteUserRxPackets: prometheus.NewDesc(ns+"remote_user_receive_packets_total", "Remote Users Receive Packets", labels, nil),
|
||||
|
|
|
|||
|
|
@ -121,9 +121,9 @@ func descUAP(ns string) *uap {
|
|||
TxBytesD: prometheus.NewDesc(ns+"d_tranmsit_bytes", "Transmit Bytes D???", labels, nil),
|
||||
RxBytesD: prometheus.NewDesc(ns+"d_receive_bytes", "Receive Bytes D???", labels, nil),
|
||||
BytesR: prometheus.NewDesc(ns+"rate_bytes", "Transfer Rate", labels, nil),
|
||||
NumSta: prometheus.NewDesc(ns+"num_stations", "Number of Stations", labels, nil),
|
||||
UserNumSta: prometheus.NewDesc(ns+"num_stations_user", "Number of User Stations", labels, nil),
|
||||
GuestNumSta: prometheus.NewDesc(ns+"num_stations_guest", "Number of Guest Stations", labels, nil),
|
||||
NumSta: prometheus.NewDesc(ns+"stations", "Number of Stations", labels, nil),
|
||||
UserNumSta: prometheus.NewDesc(ns+"stations_user", "Number of User Stations", labels, nil),
|
||||
GuestNumSta: prometheus.NewDesc(ns+"stations_guest", "Number of Guest Stations", labels, nil),
|
||||
Loadavg1: prometheus.NewDesc(ns+"load_average_1", "System Load Average 1 Minute", labels, nil),
|
||||
Loadavg5: prometheus.NewDesc(ns+"load_average_5", "System Load Average 5 Minutes", labels, nil),
|
||||
Loadavg15: prometheus.NewDesc(ns+"load_average_15", "System Load Average 15 Minutes", labels, nil),
|
||||
|
|
@ -153,7 +153,7 @@ func descUAP(ns string) *uap {
|
|||
// N each - 1 per Virtual AP (VAP)
|
||||
VAPCcq: prometheus.NewDesc(ns+"vap_ccq", "VAP Client Connection Quality", labelV, nil),
|
||||
VAPMacFilterRejections: prometheus.NewDesc(ns+"vap_mac_filter_rejects_total", "VAP MAC Filter Rejections", labelV, nil),
|
||||
VAPNumSatisfactionSta: prometheus.NewDesc(ns+"vap_num_satisfaction_stations", "VAP Number Satisifaction Stations", labelV, nil),
|
||||
VAPNumSatisfactionSta: prometheus.NewDesc(ns+"vap_satisfaction_stations", "VAP Number Satisifaction Stations", labelV, nil),
|
||||
VAPAvgClientSignal: prometheus.NewDesc(ns+"vap_average_client_signal", "VAP Average Client Signal", labelV, nil),
|
||||
VAPSatisfaction: prometheus.NewDesc(ns+"vap_satisfaction_percent", "VAP Satisfaction", labelV, nil),
|
||||
VAPSatisfactionNow: prometheus.NewDesc(ns+"vap_satisfaction_now_percent", "VAP Satisfaction Now", labelV, nil),
|
||||
|
|
@ -205,9 +205,9 @@ func descUAP(ns string) *uap {
|
|||
RadioCuTotal: prometheus.NewDesc(ns+"radio_channel_utilization_total", "Radio Channel Utilization", labelR, nil),
|
||||
RadioExtchannel: prometheus.NewDesc(ns+"radio_ext_channel", "Radio Ext Channel", labelR, nil),
|
||||
RadioGain: prometheus.NewDesc(ns+"radio_gain", "Radio Gain", labelR, nil),
|
||||
RadioGuestNumSta: prometheus.NewDesc(ns+"radio_num_guest_stations", "Radio Guest Station Count", labelR, nil),
|
||||
RadioNumSta: prometheus.NewDesc(ns+"radio_num_stations", "Radio Total Station Count", labelR, nil),
|
||||
RadioUserNumSta: prometheus.NewDesc(ns+"radio_num_user_stations", "Radio User Station Count", labelR, nil),
|
||||
RadioGuestNumSta: prometheus.NewDesc(ns+"radio_guest_stations", "Radio Guest Station Count", labelR, nil),
|
||||
RadioNumSta: prometheus.NewDesc(ns+"radio_stations", "Radio Total Station Count", labelR, nil),
|
||||
RadioUserNumSta: prometheus.NewDesc(ns+"radio_user_stations", "Radio User Station Count", labelR, nil),
|
||||
RadioTxPackets: prometheus.NewDesc(ns+"radio_transmit_packets_total", "Radio Transmitted Packets", labelR, nil),
|
||||
RadioTxRetries: prometheus.NewDesc(ns+"radio_transmit_retries_total", "Radio Transmit Retries", labelR, nil),
|
||||
}
|
||||
|
|
|
|||
|
|
@ -7,7 +7,6 @@ import (
|
|||
|
||||
type usg struct {
|
||||
Uptime *prometheus.Desc
|
||||
Temperature *prometheus.Desc
|
||||
TotalMaxPower *prometheus.Desc
|
||||
FanLevel *prometheus.Desc
|
||||
TotalTxBytes *prometheus.Desc
|
||||
|
|
@ -66,12 +65,12 @@ func descUSG(ns string) *usg {
|
|||
TotalTxBytes: prometheus.NewDesc(ns+"transmit_bytes_total", "Total Transmitted Bytes", labels, nil),
|
||||
TotalRxBytes: prometheus.NewDesc(ns+"receive_bytes_total", "Total Received Bytes", labels, nil),
|
||||
TotalBytes: prometheus.NewDesc(ns+"transferred_bytes_total", "Total Bytes Transferred", labels, nil),
|
||||
NumSta: prometheus.NewDesc(ns+"num_stations", "Number of Stations", labels, nil),
|
||||
UserNumSta: prometheus.NewDesc(ns+"num_stations_user", "Number of User Stations", labels, nil),
|
||||
GuestNumSta: prometheus.NewDesc(ns+"num_stations_guest", "Number of Guest Stations", labels, nil),
|
||||
NumDesktop: prometheus.NewDesc(ns+"num_desktops", "Number of Desktops", labels, nil),
|
||||
NumMobile: prometheus.NewDesc(ns+"num_mobile", "Number of Mobiles", labels, nil),
|
||||
NumHandheld: prometheus.NewDesc(ns+"num_handheld", "Number of Handhelds", labels, nil),
|
||||
NumSta: prometheus.NewDesc(ns+"stations", "Number of Stations", labels, nil),
|
||||
UserNumSta: prometheus.NewDesc(ns+"stations_user", "Number of User Stations", labels, nil),
|
||||
GuestNumSta: prometheus.NewDesc(ns+"stations_guest", "Number of Guest Stations", labels, nil),
|
||||
NumDesktop: prometheus.NewDesc(ns+"desktops", "Number of Desktops", labels, nil),
|
||||
NumMobile: prometheus.NewDesc(ns+"mobile", "Number of Mobiles", labels, nil),
|
||||
NumHandheld: prometheus.NewDesc(ns+"handheld", "Number of Handhelds", labels, nil),
|
||||
Loadavg1: prometheus.NewDesc(ns+"load_average_1", "System Load Average 1 Minute", labels, nil),
|
||||
Loadavg5: prometheus.NewDesc(ns+"load_average_5", "System Load Average 5 Minutes", labels, nil),
|
||||
Loadavg15: prometheus.NewDesc(ns+"load_average_15", "System Load Average 15 Minutes", labels, nil),
|
||||
|
|
@ -124,7 +123,6 @@ func (u *unifiCollector) exportUSGs(r *Report) {
|
|||
func (u *unifiCollector) exportUSG(r *Report, s *unifi.USG) {
|
||||
labels := []string{s.SiteName, s.Mac, s.Model, s.Name, s.Serial, s.Type, s.Version, s.IP}
|
||||
labelWan := append([]string{"all"}, labels...)
|
||||
|
||||
// Gateway System Data.
|
||||
r.send([]*metricExports{
|
||||
{u.USG.Uptime, prometheus.GaugeValue, s.Uptime, labels},
|
||||
|
|
|
|||
|
|
@ -83,9 +83,9 @@ func descUSW(ns string) *usw {
|
|||
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 Transferred", labels, nil),
|
||||
NumSta: prometheus.NewDesc(ns+"num_stations", "Number of Stations", labels, nil),
|
||||
UserNumSta: prometheus.NewDesc(ns+"num_stations_user", "Number of User Stations", labels, nil),
|
||||
GuestNumSta: prometheus.NewDesc(ns+"num_stations_guest", "Number of Guest Stations", labels, nil),
|
||||
NumSta: prometheus.NewDesc(ns+"stations", "Number of Stations", labels, nil),
|
||||
UserNumSta: prometheus.NewDesc(ns+"stations_user", "Number of User Stations", labels, nil),
|
||||
GuestNumSta: prometheus.NewDesc(ns+"stations_guest", "Number of Guest Stations", labels, nil),
|
||||
Loadavg1: prometheus.NewDesc(ns+"load_average_1", "System Load Average 1 Minute", labels, nil),
|
||||
Loadavg5: prometheus.NewDesc(ns+"load_average_5", "System Load Average 5 Minutes", labels, nil),
|
||||
Loadavg15: prometheus.NewDesc(ns+"load_average_15", "System Load Average 15 Minutes", labels, nil),
|
||||
|
|
|
|||
Loading…
Reference in New Issue