mirror of
https://github.com/unpoller/unpoller.git
synced 2026-09-30 03:21:28 +02:00
Merge pull request #915 from unpoller/issue-910
Allow PoE-providing ports to be scraped even when disabled
This commit is contained in:
@@ -79,8 +79,8 @@ func (u *DatadogUnifi) batchUSWstat(sw *unifi.Sw) map[string]float64 {
|
||||
//nolint:funlen
|
||||
func (u *DatadogUnifi) batchPortTable(r report, t map[string]string, pt []unifi.Port) {
|
||||
for _, p := range pt {
|
||||
if !u.DeadPorts && (!p.Up.Val || !p.Enable.Val) {
|
||||
continue // only record UP ports.
|
||||
if !u.DeadPorts && (!p.Up.Val || !p.Enable.Val) && p.PoePower.Val == 0 {
|
||||
continue // only record UP ports, or ports providing PoE power.
|
||||
}
|
||||
|
||||
tags := cleanTags(map[string]string{
|
||||
|
||||
@@ -75,8 +75,8 @@ func (u *InfluxUnifi) batchUSWstat(sw *unifi.Sw) map[string]any {
|
||||
//nolint:funlen
|
||||
func (u *InfluxUnifi) batchPortTable(r report, t map[string]string, pt []unifi.Port) {
|
||||
for _, p := range pt {
|
||||
if !u.DeadPorts && (!p.Up.Val || !p.Enable.Val) {
|
||||
continue // only record UP ports.
|
||||
if !u.DeadPorts && (!p.Up.Val || !p.Enable.Val) && p.PoePower.Val == 0 {
|
||||
continue // only record UP ports, or ports providing PoE power.
|
||||
}
|
||||
|
||||
tags := map[string]string{
|
||||
|
||||
@@ -197,8 +197,8 @@ func (u *promUnifi) exportPDUstats(r report, labels []string, sw *unifi.Sw) {
|
||||
func (u *promUnifi) exportPDUPrtTable(r report, labels []string, pt []unifi.Port) {
|
||||
// Per-port data on a switch
|
||||
for _, p := range pt {
|
||||
if !u.DeadPorts && (!p.Up.Val || !p.Enable.Val) {
|
||||
continue
|
||||
if !u.DeadPorts && (!p.Up.Val || !p.Enable.Val) && p.PoePower.Val == 0 {
|
||||
continue // skip dead ports unless they're providing PoE power
|
||||
}
|
||||
|
||||
// Copy labels, and add four new ones.
|
||||
|
||||
@@ -176,8 +176,8 @@ func (u *promUnifi) exportUSWstats(r report, labels []string, sw *unifi.Sw) {
|
||||
func (u *promUnifi) exportPRTtable(r report, labels []string, pt []unifi.Port) {
|
||||
// Per-port data on a switch
|
||||
for _, p := range pt {
|
||||
if !u.DeadPorts && (!p.Up.Val || !p.Enable.Val) {
|
||||
continue
|
||||
if !u.DeadPorts && (!p.Up.Val || !p.Enable.Val) && p.PoePower.Val == 0 {
|
||||
continue // skip dead ports unless they're providing PoE power
|
||||
}
|
||||
|
||||
// Copy labels, and add four new ones.
|
||||
|
||||
Reference in New Issue
Block a user