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

spread things out

This commit is contained in:
davidnewhall2 2019-11-18 01:19:30 -08:00
parent 47efa49aed
commit ca0a737f15
2 changed files with 24 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
integrations/influxunifi/promunifi/usg.go
View File

@ -117,7 +117,7 @@ func (u *unifiCollector) exportUSG(s *unifi.USG) []*metricExports {
labelWan := append([]string{"all"}, labels...) labelWan := append([]string{"all"}, labels...)
// Gateway System Data. // Gateway System Data.
m := []*metricExports{ return append([]*metricExports{
{u.USG.Uptime, prometheus.GaugeValue, s.Uptime, labels}, {u.USG.Uptime, prometheus.GaugeValue, s.Uptime, labels},
{u.USG.TotalTxBytes, prometheus.CounterValue, s.TxBytes, labels}, {u.USG.TotalTxBytes, prometheus.CounterValue, s.TxBytes, labels},
{u.USG.TotalRxBytes, prometheus.CounterValue, s.RxBytes, labels}, {u.USG.TotalRxBytes, prometheus.CounterValue, s.RxBytes, labels},
@ -153,31 +153,33 @@ func (u *unifiCollector) exportUSG(s *unifi.USG) []*metricExports {
{u.USG.Runtime, prometheus.GaugeValue, s.SpeedtestStatus.Runtime, labels}, {u.USG.Runtime, prometheus.GaugeValue, s.SpeedtestStatus.Runtime, labels},
{u.USG.XputDownload, prometheus.GaugeValue, s.SpeedtestStatus.XputDownload, labels}, {u.USG.XputDownload, prometheus.GaugeValue, s.SpeedtestStatus.XputDownload, labels},
{u.USG.XputUpload, prometheus.GaugeValue, s.SpeedtestStatus.XputUpload, labels}, {u.USG.XputUpload, prometheus.GaugeValue, s.SpeedtestStatus.XputUpload, labels},
} }, u.exportWANPorts(labels, s.Wan1, s.Wan2)...)
}
// WAN Ports' Stats func (u *unifiCollector) exportWANPorts(labels []string, wans ...unifi.Wan) []*metricExports {
for _, wan := range []unifi.Wan{s.Wan1, s.Wan2} { var m []*metricExports
for _, wan := range wans {
if !wan.Up.Val { if !wan.Up.Val {
continue // only record UP interfaces. continue // only record UP interfaces.
} }
labelWan := append([]string{wan.Name}, labels...) l := append([]string{wan.Name}, labels...)
m = append(m, []*metricExports{ m = append(m, []*metricExports{
{u.USG.WanRxPackets, prometheus.CounterValue, wan.RxPackets, labelWan}, {u.USG.WanRxPackets, prometheus.CounterValue, wan.RxPackets, l},
{u.USG.WanRxBytes, prometheus.CounterValue, wan.RxBytes, labelWan}, {u.USG.WanRxBytes, prometheus.CounterValue, wan.RxBytes, l},
{u.USG.WanRxDropped, prometheus.CounterValue, wan.RxDropped, labelWan}, {u.USG.WanRxDropped, prometheus.CounterValue, wan.RxDropped, l},
{u.USG.WanRxErrors, prometheus.CounterValue, wan.RxErrors, labelWan}, {u.USG.WanRxErrors, prometheus.CounterValue, wan.RxErrors, l},
{u.USG.WanTxPackets, prometheus.CounterValue, wan.TxPackets, labelWan}, {u.USG.WanTxPackets, prometheus.CounterValue, wan.TxPackets, l},
{u.USG.WanTxBytes, prometheus.CounterValue, wan.TxBytes, labelWan}, {u.USG.WanTxBytes, prometheus.CounterValue, wan.TxBytes, l},
{u.USG.WanRxBroadcast, prometheus.CounterValue, wan.RxBroadcast, labelWan}, {u.USG.WanRxBroadcast, prometheus.CounterValue, wan.RxBroadcast, l},
{u.USG.WanRxMulticast, prometheus.CounterValue, wan.RxMulticast, labelWan}, {u.USG.WanRxMulticast, prometheus.CounterValue, wan.RxMulticast, l},
{u.USG.WanSpeed, prometheus.CounterValue, wan.Speed, labelWan}, {u.USG.WanSpeed, prometheus.CounterValue, wan.Speed, l},
{u.USG.WanTxBroadcast, prometheus.CounterValue, wan.TxBroadcast, labelWan}, {u.USG.WanTxBroadcast, prometheus.CounterValue, wan.TxBroadcast, l},
{u.USG.WanTxBytesR, prometheus.CounterValue, wan.TxBytesR, labelWan}, {u.USG.WanTxBytesR, prometheus.CounterValue, wan.TxBytesR, l},
{u.USG.WanTxDropped, prometheus.CounterValue, wan.TxDropped, labelWan}, {u.USG.WanTxDropped, prometheus.CounterValue, wan.TxDropped, l},
{u.USG.WanTxErrors, prometheus.CounterValue, wan.TxErrors, labelWan}, {u.USG.WanTxErrors, prometheus.CounterValue, wan.TxErrors, l},
{u.USG.WanTxMulticast, prometheus.CounterValue, wan.TxMulticast, labelWan}, {u.USG.WanTxMulticast, prometheus.CounterValue, wan.TxMulticast, l},
{u.USG.WanBytesR, prometheus.GaugeValue, wan.BytesR, labelWan}, {u.USG.WanBytesR, prometheus.GaugeValue, wan.BytesR, l},
}...) }...)
} }

7
integrations/influxunifi/promunifi/usw.go
View File

@ -143,7 +143,7 @@ func (u *unifiCollector) exportUSW(s *unifi.USW) []*metricExports {
s.Type, s.Version, s.DeviceID, s.IP} s.Type, s.Version, s.DeviceID, s.IP}
// Switch data. // Switch data.
m := []*metricExports{ return append([]*metricExports{
{u.USW.Uptime, prometheus.GaugeValue, s.Uptime, labels}, {u.USW.Uptime, prometheus.GaugeValue, s.Uptime, labels},
{u.USW.Temperature, prometheus.GaugeValue, s.GeneralTemperature, labels}, {u.USW.Temperature, prometheus.GaugeValue, s.GeneralTemperature, labels},
{u.USW.TotalMaxPower, prometheus.GaugeValue, s.TotalMaxPower, labels}, {u.USW.TotalMaxPower, prometheus.GaugeValue, s.TotalMaxPower, labels},
@ -178,10 +178,7 @@ func (u *unifiCollector) exportUSW(s *unifi.USW) []*metricExports {
{u.USW.SwTxMulticast, prometheus.CounterValue, s.Stat.Sw.TxMulticast, labels}, {u.USW.SwTxMulticast, prometheus.CounterValue, s.Stat.Sw.TxMulticast, labels},
{u.USW.SwTxBroadcast, prometheus.CounterValue, s.Stat.Sw.TxBroadcast, labels}, {u.USW.SwTxBroadcast, prometheus.CounterValue, s.Stat.Sw.TxBroadcast, labels},
{u.USW.SwBytes, prometheus.CounterValue, s.Stat.Sw.Bytes, labels}, {u.USW.SwBytes, prometheus.CounterValue, s.Stat.Sw.Bytes, labels},
} }, u.exportPortTable(s.PortTable, labels[:6])...)
// Remove last four labels.
m = append(m, u.exportPortTable(s.PortTable, labels[:6])...)
return m
} }
func (u *unifiCollector) exportPortTable(pt []unifi.Port, labels []string) []*metricExports { func (u *unifiCollector) exportPortTable(pt []unifi.Port, labels []string) []*metricExports {