Skip to content

[FEATURE] Add Miimon linux bonding metrics #3326

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

[FEATURE] Add Miimon linux bonding metrics #3326

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f346179
Add Miimon metrics
JustHumanz May 5, 2025
ea687a3
add miimon in sys.ttar
JustHumanz May 5, 2025
7df3a8b
refactor `readBondingStats`
JustHumanz May 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 35 additions & 8 deletions collector/bonding_linux.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,20 @@ import (
"log/slog"
"os"
"path/filepath"
"strconv"
"strings"

"github.com/prometheus/client_golang/prometheus"
)

type bondingCollector struct {
slaves, active typedDesc
logger *slog.Logger
slaves, active, miimon typedDesc
logger *slog.Logger
}

type bondingStats struct {
name string
slaves, active, miimon int
}

func init() {
Expand All @@ -50,6 +56,11 @@ func NewBondingCollector(logger *slog.Logger) (Collector, error) {
"Number of active slaves per bonding interface.",
[]string{"master"}, nil,
), prometheus.GaugeValue},
miimon: typedDesc{prometheus.NewDesc(
prometheus.BuildFQName(namespace, "bonding", "miimon"),
"MII link monitoring frequency in milliseconds.",
[]string{"master"}, nil,
), prometheus.GaugeValue},
logger: logger,
}, nil
}
Expand All @@ -65,15 +76,16 @@ func (c *bondingCollector) Update(ch chan<- prometheus.Metric) error {
}
return err
}
for master, status := range bondingStats {
ch <- c.slaves.mustNewConstMetric(float64(status[0]), master)
ch <- c.active.mustNewConstMetric(float64(status[1]), master)
for _, bond := range bondingStats {
ch <- c.slaves.mustNewConstMetric(float64(bond.slaves), bond.name)
ch <- c.active.mustNewConstMetric(float64(bond.active), bond.name)
ch <- c.miimon.mustNewConstMetric(float64(bond.miimon), bond.name)
}
return nil
}

func readBondingStats(root string) (status map[string][2]int, err error) {
status = map[string][2]int{}
func readBondingStats(root string) (status []bondingStats, err error) {
status = []bondingStats{}
masters, err := os.ReadFile(filepath.Join(root, "bonding_masters"))
if err != nil {
return nil, err
Expand All @@ -98,7 +110,22 @@ func readBondingStats(root string) (status map[string][2]int, err error) {
sstat[1]++
}
}
status[master] = sstat

miimon, err := os.ReadFile(filepath.Join(root, master, "bonding", "miimon"))
if err != nil {
return nil, err
}
intMiimon, err := strconv.Atoi(strings.TrimSpace(string(miimon)))
if err != nil {
return nil, err
}

status = append(status, bondingStats{
name: master,
slaves: sstat[0],
active: sstat[1],
miimon: intMiimon,
})
}
return status, err
}
10 changes: 5 additions & 5 deletions collector/bonding_linux_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,15 +25,15 @@ func TestBonding(t *testing.T) {
if err != nil {
t.Fatal(err)
}
if bondingStats["bond0"][0] != 0 || bondingStats["bond0"][1] != 0 {
if bondingStats[0].name != "bond0" || bondingStats[0].slaves != 0 || bondingStats[0].active != 0 || bondingStats[0].miimon != 100 {
t.Fatal("bond0 in unexpected state")
}

if bondingStats["int"][0] != 2 || bondingStats["int"][1] != 1 {
t.Fatal("int in unexpected state")
if bondingStats[1].name != "dmz" || bondingStats[1].slaves != 2 || bondingStats[1].active != 2 || bondingStats[1].miimon != 0 {
t.Fatal("dmz in unexpected state")
}

if bondingStats["dmz"][0] != 2 || bondingStats["dmz"][1] != 2 {
t.Fatal("dmz in unexpected state")
if bondingStats[2].name != "int" || bondingStats[2].slaves != 2 || bondingStats[2].active != 1 || bondingStats[2].miimon != 200 {
t.Fatal("int in unexpected state")
}
}
15 changes: 15 additions & 0 deletions collector/fixtures/sys.ttar
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1711,6 +1711,11 @@ Path: sys/class/net/bond0/bonding/slaves
Lines: 0
Mode: 644
# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Path: sys/class/net/bond0/bonding/miimon
Lines: 1
100
Mode: 644
# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Path: sys/class/net/bond0/broadcast
Lines: 1
ff:ff:ff:ff:ff:ff
Expand Down Expand Up @@ -1853,6 +1858,11 @@ Lines: 1
eth0 eth4
Mode: 644
# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Path: sys/class/net/dmz/bonding/miimon
Lines: 1
0
Mode: 644
# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Path: sys/class/net/dmz/broadcast
Lines: 1
ff:ff:ff:ff:ff:ff
Expand Down Expand Up @@ -2025,6 +2035,11 @@ Lines: 1
eth5 eth1
Mode: 644
# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Path: sys/class/net/int/bonding/miimon
Lines: 1
200
Mode: 644
# ttar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Path: sys/class/net/int/broadcast
Lines: 1
ff:ff:ff:ff:ff:ff
Expand Down