CL-Softwares
/
telegraf
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(inputs.bond): Reset slave stats for each interface (#12462)

This commit is contained in:
felixhuettner 2023-02-16 10:49:56 +01:00 committed by GitHub
parent c37b5871ac
commit 5ac9494172
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 72 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
plugins/inputs/bond/bond.go
View File

@ -245,6 +245,9 @@ func (bond *Bond) gatherSlavePart(bondName string, rawFile string, acc telegraf.
fields["failures"] = count fields["failures"] = count
if !scanPast { if !scanPast {
acc.AddFields("bond_slave", fields, tags) acc.AddFields("bond_slave", fields, tags)
fields = map[string]interface{}{
"status": 0,
}
} }
} }
if strings.Contains(name, "Actor Churned Count") { if strings.Contains(name, "Actor Churned Count") {
@ -262,6 +265,9 @@ func (bond *Bond) gatherSlavePart(bondName string, rawFile string, acc telegraf.
fields["partner_churned"] = count fields["partner_churned"] = count
fields["total_churned"] = fields["actor_churned"].(int) + fields["partner_churned"].(int) fields["total_churned"] = fields["actor_churned"].(int) + fields["partner_churned"].(int)
acc.AddFields("bond_slave", fields, tags) acc.AddFields("bond_slave", fields, tags)
fields = map[string]interface{}{
"status": 0,
}
} }
} }
tags = map[string]string{ tags = map[string]string{

66
plugins/inputs/bond/bond_test.go
View File

@ -77,6 +77,48 @@ Actor Churned Count: 0
Partner Churned Count: 0 Partner Churned Count: 0
` `
const sampleTestLACPFirstUpSecondDown = `
Ethernet Channel Bonding Driver: v3.7.1 (April 27, 2011)
Bonding Mode: IEEE 802.3ad Dynamic link aggregation
Transmit Hash Policy: layer2 (0)
MII Status: up
MII Polling Interval (ms): 100
Up Delay (ms): 0
Down Delay (ms): 0
802.3ad info
LACP rate: fast
Min links: 0
Aggregator selection policy (ad_select): stable
Slave Interface: eth0
MII Status: up
Speed: 10000 Mbps
Duplex: full
Link Failure Count: 2
Permanent HW addr: 3c:ec:ef:5e:71:58
Slave queue ID: 0
Aggregator ID: 2
Actor Churn State: none
Partner Churn State: none
Actor Churned Count: 2
Partner Churned Count: 0
Slave Interface: eth1
MII Status: down
Speed: Unknown
Duplex: Unkown
Link Failure Count: 1
Permanent HW addr: 3c:ec:ef:5e:71:59
Slave queue ID: 0
Aggregator ID: 2
Actor Churn State: none
Partner Churn State: none
Actor Churned Count: 0
Partner Churned Count: 0
`
const sampleSysMode = "802.3ad 5" const sampleSysMode = "802.3ad 5"
const sampleSysSlaves = "eth0 eth1 " const sampleSysSlaves = "eth0 eth1 "
const sampleSysAdPorts = " 2 " const sampleSysAdPorts = " 2 "
@ -124,4 +166,28 @@ func TestGatherBondInterface(t *testing.T) {
map[string]interface{}{"slave_count": 2, "ad_port_count": 2}, map[string]interface{}{"slave_count": 2, "ad_port_count": 2},
map[string]string{"bond": "bondLACP", "mode": "802.3ad"}, map[string]string{"bond": "bondLACP", "mode": "802.3ad"},
) )
acc = testutil.Accumulator{}
require.NoError(t, bond.gatherBondInterface("bondLACPUpDown", sampleTestLACPFirstUpSecondDown, &acc))
bond.gatherSysDetails("bondLACPUpDown", sysFiles{ModeFile: sampleSysMode, SlaveFile: sampleSysSlaves, ADPortsFile: sampleSysAdPorts}, &acc)
acc.AssertContainsTaggedFields(t, "bond", map[string]interface{}{"status": 1}, map[string]string{"bond": "bondLACPUpDown"})
acc.AssertContainsTaggedFields(
t,
"bond_slave",
map[string]interface{}{"failures": 2, "status": 1, "actor_churned": 2, "partner_churned": 0, "total_churned": 2},
map[string]string{"bond": "bondLACPUpDown", "interface": "eth0"},
)
acc.AssertContainsTaggedFields(
t,
"bond_slave",
map[string]interface{}{"failures": 1, "status": 0, "actor_churned": 0, "partner_churned": 0, "total_churned": 0},
map[string]string{"bond": "bondLACPUpDown", "interface": "eth1"},
)
acc.AssertContainsTaggedFields(t, "bond_slave", map[string]interface{}{"count": 2}, map[string]string{"bond": "bondLACPUpDown"})
acc.AssertContainsTaggedFields(
t,
"bond_sys",
map[string]interface{}{"slave_count": 2, "ad_port_count": 2},
map[string]string{"bond": "bondLACPUpDown", "mode": "802.3ad"},
)
} }