mirrors/bird_exporter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix collecting for bfd sessions stucked in Init state (#86)

Browse Source
This commit is contained in:
Vladimir Shipilov 2023-05-09 15:32:05 +03:00 committed by GitHub
parent 446837936c
commit ca13cd9b96
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
parser/bfd.go
View File

@ -14,7 +14,7 @@ var (
) )
func init() { func init() {
bfdSessionRegex = regexp.MustCompile(`^([^\s]+)\s+([^\s]+)\s+(Up|Down)\s+(\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}|[^\s]+)\s+([0-9\.]+)\s+([0-9\.]+)$`) bfdSessionRegex = regexp.MustCompile(`^([^\s]+)\s+([^\s]+)\s+(Up|Down|Init)\s+(\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}|[^\s]+)\s+([0-9\.]+)\s+([0-9\.]+)$`)
} }
type bfdContext struct { type bfdContext struct {

16
parser/bfd_test.go
View File

@ -17,11 +17,12 @@ func TestParseBFDSessions(t *testing.T) {
bfd1: bfd1:
IP address Interface State Since Interval Timeout IP address Interface State Since Interval Timeout
192.168.64.9 enp0s2 Up 2022-01-27 09:00:00 0.100 1.000 192.168.64.9 enp0s2 Up 2022-01-27 09:00:00 0.100 1.000
192.168.64.10 enp0s2 Down 2022-01-27 08:00:00 0.300 0.000` 192.168.64.10 enp0s2 Down 2022-01-27 08:00:00 0.300 0.000
192.168.64.12 enp0s2 Init 2022-01-27 08:00:00 0.300 5.000`
s := ParseBFDSessions("bfd1", []byte(data)) s := ParseBFDSessions("bfd1", []byte(data))
assert.Equal(t, 2, len(s), "session count") assert.Equal(t, 3, len(s), "session count")
s1 := protocol.BFDSession{ s1 := protocol.BFDSession{
ProtocolName: "bfd1", ProtocolName: "bfd1",
@ -41,5 +42,14 @@ IP address Interface State Since Interval Timeout
Interval: 0.3, Interval: 0.3,
Timeout: 0, Timeout: 0,
} }
assert.Equal(t, []*protocol.BFDSession{&s1, &s2}, s, "sessions") s3 := protocol.BFDSession{
ProtocolName: "bfd1",
IP: "192.168.64.12",
Interface: "enp0s2",
Up: false,
Since: 7200,
Interval: 0.3,
Timeout: 5,
}
assert.Equal(t, []*protocol.BFDSession{&s1, &s2, &s3}, s, "sessions")
} }