mirror of
https://github.com/munin-monitoring/contrib.git
synced 2018-11-08 00:59:34 +01:00
Merge pull request #83 from iborodikhin/master
New plugin for KVM network stats.
This commit is contained in:
commit
3535ad102c
@ -4,12 +4,10 @@
|
|||||||
#
|
#
|
||||||
# Munin plugin to show the network I/O per vm
|
# Munin plugin to show the network I/O per vm
|
||||||
#
|
#
|
||||||
# Copyright Maxence Dunnewind, Rodolphe Quiédeville
|
# Copyright Igor Borodikhin
|
||||||
#
|
#
|
||||||
# License : GPLv3
|
# License : GPLv3
|
||||||
#
|
#
|
||||||
# need to be run with root privilege to execute brctl
|
|
||||||
#
|
|
||||||
#
|
#
|
||||||
# parsed environment variables:
|
# parsed environment variables:
|
||||||
# vmsuffix: part of vm name to be removed
|
# vmsuffix: part of vm name to be removed
|
||||||
@ -58,22 +56,18 @@ def fetch(vms):
|
|||||||
''' Fetch values for a list of pids
|
''' Fetch values for a list of pids
|
||||||
@param dictionnary {kvm_pid: cleaned vm name}
|
@param dictionnary {kvm_pid: cleaned vm name}
|
||||||
'''
|
'''
|
||||||
macs = find_vms_tap()
|
|
||||||
res = {}
|
res = {}
|
||||||
for pid in vms:
|
for pid in vms:
|
||||||
mac = get_vm_mac(pid)
|
tap = get_vm_mac(pid)
|
||||||
try:
|
try:
|
||||||
tap = "tap%s" % macs[mac]
|
|
||||||
f = open("/proc/net/dev", "r")
|
f = open("/proc/net/dev", "r")
|
||||||
for line in f.readlines():
|
for line in f.readlines():
|
||||||
if tap in line:
|
if tap in line:
|
||||||
line = line.split(':')[1]
|
print "%s_in.value %s" % (vms[pid], re.sub(r"%s:"%tap, "", line.split()[0]))
|
||||||
print "%s_in.value %s" % (vms[pid], line.split()[0])
|
|
||||||
print "%s_out.value %s" % (vms[pid], line.split()[8])
|
print "%s_out.value %s" % (vms[pid], line.split()[8])
|
||||||
break
|
break
|
||||||
else:
|
except Exception as inst:
|
||||||
f.close()
|
print inst
|
||||||
except:
|
|
||||||
continue
|
continue
|
||||||
|
|
||||||
def detect_kvm():
|
def detect_kvm():
|
||||||
@ -98,7 +92,8 @@ def get_vm_mac(pid):
|
|||||||
@return the mac address for a specified pid
|
@return the mac address for a specified pid
|
||||||
'''
|
'''
|
||||||
cmdline = open("/proc/%s/cmdline" % pid, "r")
|
cmdline = open("/proc/%s/cmdline" % pid, "r")
|
||||||
mac = re.sub(r"^.*macaddr=(..:..:..:..:..:..).*$",r"\1", cmdline.readline())
|
line = cmdline.readline()
|
||||||
|
mac = re.sub(r"^.*ifname=(tap[^,]+),.*$",r"\1", line)
|
||||||
return mac
|
return mac
|
||||||
|
|
||||||
def list_pids():
|
def list_pids():
|
||||||
@ -112,16 +107,21 @@ def find_vms_tap():
|
|||||||
''' Check if kvm is installed
|
''' Check if kvm is installed
|
||||||
@return a list of pids from running kvm
|
@return a list of pids from running kvm
|
||||||
'''
|
'''
|
||||||
result = {}
|
result = []
|
||||||
kvm = Popen("brctl showmacs br0 | grep no", shell=True, stdout=PIPE)
|
tap = ""
|
||||||
|
mac = ""
|
||||||
|
kvm = Popen("ip a | grep -A 1 tap | awk '{print $2}' | grep -v '^$'", shell=True, stdout=PIPE)
|
||||||
res = kvm.communicate()[0].split('\n')
|
res = kvm.communicate()[0].split('\n')
|
||||||
for line in res:
|
for line in res:
|
||||||
try:
|
try:
|
||||||
tap = str(int(line.split()[0]) - 1)
|
if len(line) > 0:
|
||||||
mac = line.split()[1]
|
if re.match(r"^tap.*", line):
|
||||||
result[mac] = tap
|
tap = re.sub(r"(tap[^:]+):", r"\1", line)
|
||||||
except:
|
else:
|
||||||
|
result.append(tap)
|
||||||
|
except Exception as inst:
|
||||||
continue
|
continue
|
||||||
|
|
||||||
return result
|
return result
|
||||||
|
|
||||||
if __name__ == "__main__":
|
if __name__ == "__main__":
|
||||||
|
Loading…
Reference in New Issue
Block a user