Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Support systemd-style "predictable network interface names" #312

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

Merged
merged 1 commit into from
Jul 6, 2016
Merged

Support systemd-style "predictable network interface names" #312

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
21 changes: 19 additions & 2 deletions collectors/0/ifstat.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,25 @@ def main():
f_netdev.seek(0)
ts = int(time.time())
for line in f_netdev:
m = re.match("\s+(eth?\d+|em\d+_\d+/\d+|em\d+_\d+|em\d+|"
"p\d+p\d+_\d+/\d+|p\d+p\d+_\d+|p\d+p\d+):(.*)", line)
m = re.match(r'''
\s+
(
eth?\d+ |
em\d+_\d+/\d+ | em\d+_\d+ | em\d+ |
p\d+p\d+_\d+/\d+ | p\d+p\d+_\d+ | p\d+p\d+ |
(?: # Start of 'predictable network interface names'
(?:en|sl|wl|ww)
(?:
b\d+ | # BCMA bus
c[0-9a-f]+ | # CCW bus group
o\d+(?:d\d+)? | # On-board device
s\d+(?:f\d+)?(?:d\d+)? | # Hotplug slots
x[0-9a-f]+ | # Raw MAC address
p\d+s\d+(?:f\d+)?(?:d\d+)? | # PCI geographic loc
p\d+s\d+(?:f\d+)?(?:u\d+)*(?:c\d+)?(?:i\d+)? # USB
)
)
):(.*)''', line, re.VERBOSE)
if not m:
continue
intf = m.group(1)
Expand Down