Skip to content
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

bsd: Pass '-W' to netstat for full interface names on FreeBSD #1141

Closed
wants to merge 1 commit into from
Closed

bsd: Pass '-W' to netstat for full interface names on FreeBSD #1141

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
14 changes: 11 additions & 3 deletions checks.d/network.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,9 +240,17 @@ def _check_linux(self, instance):
self.log.debug("Unable to read /proc/net/snmp.")

def _check_bsd(self, instance):
netstat = subprocess.Popen(["netstat", "-i", "-b"],
stdout=subprocess.PIPE,
close_fds=True).communicate()[0]
platf = sys.platform

# FreeBSD's netstat truncates device names unless you pass '-W'
if Platform.is_freebsd(platf):
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You can use directly Platform.is_freebsd() 😉

netstat = subprocess.Popen(["netstat", "-i", "-b", "-W"],
stdout=subprocess.PIPE,
close_fds=True).communicate()[0]
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just to make the code more readable, we could modify a netstat_flags in the if block and only call once subprocess after that. What do you think?

else:
netstat = subprocess.Popen(["netstat", "-i", "-b"],
stdout=subprocess.PIPE,
close_fds=True).communicate()[0]
# Name Mtu Network Address Ipkts Ierrs Ibytes Opkts Oerrs Obytes Coll
# lo0 16384 <Link#1> 318258 0 428252203 318258 0 428252203 0
# lo0 16384 localhost fe80:1::1 318258 - 428252203 318258 - 428252203 -
Expand Down