public_git
/
unpoller_unpoller
mirror of https://github.com/unpoller/unpoller.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge master

This commit is contained in:
David Newhall II 2019-04-17 02:13:05 -07:00
parent ac156bcd12 4190ade5c8
commit 4ca883723d
2 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
core/unifi/uap_influx.go
View File

@ -218,44 +218,44 @@ func (u UAP) Points() ([]*influx.Point, error) {
fields["radio"] = s.Radio fields["radio"] = s.Radio
fields["state"] = s.State fields["state"] = s.State
fields["radio_tx_packets"] = s.TxPackets fields["radio_tx_packets"] = s.TxPackets
fields["radio_tx_power"] = s.TxPower fields["radio_tx_power"] = s.TxPower.Val
fields["radio_tx_retries"] = s.TxRetries fields["radio_tx_retries"] = s.TxRetries
fields["user-num_sta"] = s.UserNumSta fields["user-num_sta"] = s.UserNumSta
continue break
} }
} }
for _, s := range u.VapTable { for _, s := range u.VapTable {
if p.Name == s.RadioName { if p.Name == s.RadioName {
tags["ap_mac"] = s.ApMac tags["ap_mac"] = s.ApMac
tags["bssid"] = s.Bssid tags["bssid"] = s.Bssid
tags["vap_id"] = s.ID
tags["vap_name"] = s.Name
tags["wlanconf_id"] = s.WlanconfID
fields["ccq"] = s.Ccq fields["ccq"] = s.Ccq
fields["essid"] = s.Essid fields["essid"] = s.Essid
fields["extchannel"] = s.Extchannel fields["extchannel"] = s.Extchannel
tags["vap_id"] = s.ID
fields["is_guest"] = s.IsGuest fields["is_guest"] = s.IsGuest
fields["is_wep"] = s.IsWep fields["is_wep"] = s.IsWep
fields["mac_filter_rejections"] = s.MacFilterRejections fields["mac_filter_rejections"] = s.MacFilterRejections
fields["map_id"] = s.MapID fields["map_id"] = s.MapID
tags["vap_name"] = s.Name fields["vap_rx_bytes"] = s.RxBytes
fields["rx_bytes"] = s.RxBytes fields["vap_rx_crypts"] = s.RxCrypts
fields["rx_crypts"] = s.RxCrypts fields["vap_rx_dropped"] = s.RxDropped
fields["rx_dropped"] = s.RxDropped fields["vap_rx_errors"] = s.RxErrors
fields["rx_errors"] = s.RxErrors fields["vap_rx_frags"] = s.RxFrags
fields["rx_frags"] = s.RxFrags fields["vap_rx_nwids"] = s.RxNwids
fields["rx_nwids"] = s.RxNwids fields["vap_rx_packets"] = s.RxPackets
fields["rx_packets"] = s.RxPackets fields["vap_tx_bytes"] = s.TxBytes
fields["tx_bytes"] = s.TxBytes fields["vap_tx_dropped"] = s.TxDropped
fields["tx_dropped"] = s.TxDropped fields["vap_tx_errors"] = s.TxErrors
fields["tx_errors"] = s.TxErrors fields["vap_tx_latency_avg"] = s.TxLatencyAvg
fields["tx_latency_avg"] = s.TxLatencyAvg fields["vap_tx_latency_max"] = s.TxLatencyMax
fields["tx_latency_max"] = s.TxLatencyMax fields["vap_tx_latency_min"] = s.TxLatencyMin
fields["tx_latency_min"] = s.TxLatencyMin fields["vap_tx_packets"] = s.TxPackets
fields["tx_packets"] = s.TxPackets fields["vap_tx_power"] = s.TxPower.Val
fields["tx_power"] = s.TxPower fields["vap_tx_retries"] = s.TxRetries
fields["tx_retries"] = s.TxRetries
fields["usage"] = s.Usage fields["usage"] = s.Usage
tags["wlanconf_id"] = s.WlanconfID break
continue
} }
} }
pt, err := influx.NewPoint("uap_radios", tags, fields, time.Now()) pt, err := influx.NewPoint("uap_radios", tags, fields, time.Now())

4
core/unifi/uap_type.go
View File

@ -152,7 +152,7 @@ type UAP struct {
Radio string `json:"radio"` Radio string `json:"radio"`
State string `json:"state"` State string `json:"state"`
TxPackets float64 `json:"tx_packets"` TxPackets float64 `json:"tx_packets"`
TxPower float64 `json:"tx_power"` TxPower FlexInt `json:"tx_power"`
TxRetries float64 `json:"tx_retries"` TxRetries float64 `json:"tx_retries"`
UserNumSta float64 `json:"user-num_sta"` UserNumSta float64 `json:"user-num_sta"`
} `json:"radio_table_stats"` } `json:"radio_table_stats"`
@ -341,7 +341,7 @@ type UAP struct {
TxLatencyMax float64 `json:"tx_latency_max"` TxLatencyMax float64 `json:"tx_latency_max"`
TxLatencyMin float64 `json:"tx_latency_min"` TxLatencyMin float64 `json:"tx_latency_min"`
TxPackets float64 `json:"tx_packets"` TxPackets float64 `json:"tx_packets"`
TxPower int `json:"tx_power"` TxPower FlexInt `json:"tx_power"`
TxRetries int `json:"tx_retries"` TxRetries int `json:"tx_retries"`
Up bool `json:"up"` Up bool `json:"up"`
Usage string `json:"usage"` Usage string `json:"usage"`