Skip to content

Commit ec5a651

Browse files
author
ubuntu
committed
filter localhost, docker, kvm, bridge virtual-network
1 parent e9baa04 commit ec5a651

File tree

2 files changed

+14
-12
lines changed

2 files changed

+14
-12
lines changed

clients/client-linux.py

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
#!/usr/bin/env python
2-
# -*- coding: utf-8 -*-
2+
# coding: utf-8
33
# Update by : https://github.com/cppla/ServerStatus
44
# 支持Python版本:2.7 to 3.5
55
# 支持操作系统: Linux, OSX, FreeBSD, OpenBSD and NetBSD, both 32-bit and 64-bit architectures
6-
# 时间: 20180828
6+
# 时间: 20190128
77

88

99
SERVER = "127.0.0.1"
@@ -37,7 +37,7 @@ def get_memory():
3737
for line in open('/proc/meminfo'):
3838
match = re_parser.match(line)
3939
if not match:
40-
continue;
40+
continue
4141
key, value = match.groups(['key', 'value'])
4242
result[key] = int(value)
4343

@@ -90,9 +90,10 @@ def get(self):
9090

9191
for dev in net_dev[2:]:
9292
dev = dev.split(':')
93-
if dev[0].strip() == "lo" or dev[0].find("tun") > -1 \
94-
or dev[0].find("docker") > -1 or dev[0].find("veth") > -1 \
95-
or dev[0].find("br-") > -1:
93+
if "lo" in dev[0] or "tun" in dev[0] \
94+
or "docker" in dev[0] or "veth" in dev[0] \
95+
or "br-" in dev[0] or "vmbr" in dev[0] \
96+
or "vnet" in dev[0]:
9697
continue
9798
dev = dev[1].split()
9899
avgrx += int(dev[0])

clients/client-psutil.py

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
#!/usr/bin/env python
2-
# -*- coding: utf-8 -*-
2+
# coding: utf-8
33
# Update by : https://github.com/cppla/ServerStatus
44
# 依赖于psutil跨平台库:
5-
# 支持Python版本:2.6 to 3.5 (users of Python 2.4 and 2.5 may use 2.1.3 version)
5+
# 支持Python版本:2.7 to 3.5
66
# 支持操作系统: Linux, Windows, OSX, Sun Solaris, FreeBSD, OpenBSD and NetBSD, both 32-bit and 64-bit architectures
7-
# 时间: 20180828
7+
# 时间: 20190128
88

99
SERVER = "127.0.0.1"
1010
PORT = 35601
@@ -62,9 +62,10 @@ def __init__(self):
6262
def get(self):
6363
avgrx = 0; avgtx = 0
6464
for name, stats in psutil.net_io_counters(pernic=True).iteritems():
65-
if name == "lo" or name.find("tun") > -1 \
66-
or name.find("docker") > -1 or name.find("veth") > -1 \
67-
or name.find("br-") > -1:
65+
if "lo" in name or "tun" in name \
66+
or "docker" in name or "veth" in name \
67+
or "br-" in name or "vmbr" in name \
68+
or "vnet" in name:
6869
continue
6970
avgrx += stats.bytes_recv
7071
avgtx += stats.bytes_sent

0 commit comments

Comments
 (0)