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

Merge pull request #478 from unpoller/upgrade-metrics 

"Upgradeable" metrics addition
This commit is contained in:
Cody Lee 2022-12-21 20:44:05 -06:00 committed by GitHub
parent 052de6a38c 0329066fe5
commit 62f92cb068
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
12 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkg/datadogunifi/points.go
View File

@ -47,3 +47,10 @@ func cleanTags(tags map[string]string) map[string]string {
return tags
}
func boolToFloat64(v bool) float64 {
if v {
return 1.0
}
return 0.0
}

1
pkg/datadogunifi/uap.go
View File

@ -70,6 +70,7 @@ func (u *DatadogUnifi) batchUAP(r report, s *unifi.UAP) {
data["user_num_sta"] = s.UserNumSta.Val
data["guest_num_sta"] = s.GuestNumSta.Val
data["num_sta"] = s.NumSta.Val
data["upgradeable"] = boolToFloat64(s.Upgradable.Val)
r.addCount(uapT)

2
pkg/datadogunifi/udm.go
View File

@ -125,6 +125,7 @@ func (u *DatadogUnifi) batchUDM(r report, s *unifi.UDM) { // nolint: funlen
"num_desktop": s.NumDesktop.Val,
"num_handheld": s.NumHandheld.Val,
"num_mobile": s.NumMobile.Val,
"upgradeable": boolToFloat64(s.Upgradeable.Val),
},
)
@ -155,6 +156,7 @@ func (u *DatadogUnifi) batchUDM(r report, s *unifi.UDM) { // nolint: funlen
"rx_bytes": s.RxBytes.Val,
"tx_bytes": s.TxBytes.Val,
"uptime": s.Uptime.Val,
"upgradeable": boolToFloat64(s.Upgradeable.Val),
})
metricName = metricNamespace("usw")

1
pkg/datadogunifi/usg.go
View File

@ -42,6 +42,7 @@ func (u *DatadogUnifi) batchUSG(r report, s *unifi.USG) {
"num_desktop": s.NumDesktop.Val,
"num_handheld": s.NumHandheld.Val,
"num_mobile": s.NumMobile.Val,
"upgradeable": boolToFloat64(s.Upgradable.Val),
},
)

1
pkg/datadogunifi/usw.go
View File

@ -39,6 +39,7 @@ func (u *DatadogUnifi) batchUSW(r report, s *unifi.USW) {
"uptime": s.Uptime.Val,
"state": s.State.Val,
"user_num_sta": s.UserNumSta.Val,
"upgradeable": boolToFloat64(s.Upgradeable.Val),
})
r.addCount(uswT)

1
pkg/influxunifi/uap.go
View File

@ -68,6 +68,7 @@ func (u *InfluxUnifi) batchUAP(r report, s *unifi.UAP) {
fields["user-num_sta"] = int(s.UserNumSta.Val)
fields["guest-num_sta"] = int(s.GuestNumSta.Val)
fields["num_sta"] = s.NumSta.Val
fields["upgradeable"] = s.Upgradable.Val
r.addCount(uapT)
r.send(&metric{Table: "uap", Tags: tags, Fields: fields})

2
pkg/influxunifi/udm.go
View File

@ -114,6 +114,7 @@ func (u *InfluxUnifi) batchUDM(r report, s *unifi.UDM) { // nolint: funlen
"num_desktop": s.NumDesktop.Val,
"num_handheld": s.NumHandheld.Val,
"num_mobile": s.NumMobile.Val,
"upgradeable": s.Upgradeable.Val,
},
)
@ -142,6 +143,7 @@ func (u *InfluxUnifi) batchUDM(r report, s *unifi.UDM) { // nolint: funlen
"rx_bytes": s.RxBytes.Val,
"tx_bytes": s.TxBytes.Val,
"uptime": s.Uptime.Val,
"upgradeable": s.Upgradeable.Val,
})
r.send(&metric{Table: "usw", Tags: tags, Fields: fields})

1
pkg/influxunifi/usg.go
View File

@ -43,6 +43,7 @@ func (u *InfluxUnifi) batchUSG(r report, s *unifi.USG) {
"num_desktop": s.NumDesktop.Val,
"num_handheld": s.NumHandheld.Val,
"num_mobile": s.NumMobile.Val,
"upgradeable": s.Upgradable.Val,
// "speedtest_rundate": time.Unix(int64(s.SpeedtestStatus.Rundate.Val), 0).String(),
},
)

1
pkg/influxunifi/usw.go
View File

@ -39,6 +39,7 @@ func (u *InfluxUnifi) batchUSW(r report, s *unifi.USW) {
"uptime": s.Uptime.Val,
"state": s.State.Val,
"user-num_sta": s.UserNumSta.Val,
"upgradeable": s.Upgradable.Val,
})
r.addCount(uswT)

3
pkg/promunifi/udm.go
View File

@ -29,6 +29,7 @@ type unifiDevice struct {
MemUsed *prometheus.Desc
CPU *prometheus.Desc
Mem *prometheus.Desc
Upgradeable *prometheus.Desc
}
func descDevice(ns string) *unifiDevice {
@ -60,6 +61,7 @@ func descDevice(ns string) *unifiDevice {
MemBuffer: prometheus.NewDesc(ns+"memory_buffer_bytes", "System Memory Buffer", labels, nil),
CPU: prometheus.NewDesc(ns+"cpu_utilization_ratio", "System CPU % Utilized", labels, nil),
Mem: prometheus.NewDesc(ns+"memory_utilization_ratio", "System Memory % Utilized", labels, nil),
Upgradeable: prometheus.NewDesc(ns+"upgradable", "Upgrade-able", labels, nil),
}
}
@ -85,6 +87,7 @@ func (u *promUnifi) exportUDM(r report, d *unifi.UDM) {
r.send([]*metric{
{u.Device.Info, gauge, 1.0, append(labels, infoLabels...)},
{u.Device.Uptime, gauge, d.Uptime, labels},
{u.Device.Upgradeable, gauge, d.Upgradeable.Val, labels},
})
// UDM pro has special temp sensors. UDM non-pro may not have temp; not sure.

1
pkg/promunifi/usg.go
View File

@ -104,6 +104,7 @@ func (u *promUnifi) exportUSG(r report, d *unifi.USG) {
r.send([]*metric{
{u.Device.Info, gauge, 1.0, append(labels, infoLabels...)},
{u.Device.Uptime, gauge, d.Uptime, labels},
{u.Device.Upgradeable, gauge, d.Upgradable.Val, labels},
})
}

5
pkg/promunifi/usw.go
View File

@ -48,6 +48,8 @@ type usw struct {
SFPTemperature *prometheus.Desc
SFPTxPower *prometheus.Desc
SFPVoltage *prometheus.Desc
// other
Upgradeable *prometheus.Desc
}
func descUSW(ns string) *usw {
@ -104,6 +106,8 @@ func descUSW(ns string) *usw {
SFPTemperature: nd(sfp+"temperature", "SFP Temperature", labelF, nil),
SFPTxPower: nd(sfp+"tx_power", "SFP Transmit Power", labelF, nil),
SFPVoltage: nd(sfp+"voltage", "SFP Voltage", labelF, nil),
// other data
Upgradeable: nd(ns+"upgradeable", "Upgrade-able", labelS, nil),
}
}
@ -123,6 +127,7 @@ func (u *promUnifi) exportUSW(r report, d *unifi.USW) {
r.send([]*metric{
{u.Device.Info, gauge, 1.0, append(labels, infoLabels...)},
{u.Device.Uptime, gauge, d.Uptime, labels},
{u.Device.Upgradeable, gauge, d.Upgradable.Val, labels},
})
// Switch System Data.