From e1816224a975eee48c922cc3aef722cb773512f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rodolphe=20Qui=E9deville?= Date: Tue, 17 Aug 2010 16:52:36 +0200 Subject: [PATCH] Minor bugfix --- plugins/other/kvm_net | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/plugins/other/kvm_net b/plugins/other/kvm_net index be926990..81c99073 100755 --- a/plugins/other/kvm_net +++ b/plugins/other/kvm_net @@ -33,12 +33,12 @@ graph_args --base 1024 print base_config for vm in vm_names: print "%s_in.label %s" % (vm, vm) - print "%s_in.type GAUGE" % vm + print "%s_in.type COUNTER" % vm print "%s_in.min 0" % vm print "%s_in.draw LINE2" % vm print "%s_out.negative %s_in" % (vm, vm) print "%s_out.label %s" % (vm, vm) - print "%s_out.type GAUGE" % vm + print "%s_out.type COUNTER" % vm print "%s_out.min 0" % vm print "%s_out.draw LINE2" % vm @@ -64,14 +64,15 @@ def fetch(vms): mac = get_vm_mac(pid) try: tap = "tap%s" % macs[mac] - f = open("/proc/net/dev", "r") - for line in f.readlines(): - if tap in line: - print "%s_in.value %s" % (vms[pid], line.split()[1]) - print "%s_out.value %s" % (vms[pid], line.split()[9]) - break - else: - f.close() + f = open("/proc/net/dev", "r") + for line in f.readlines(): + if tap in line: + line = line.split(':')[1] + print "%s_in.value %s" % (vms[pid], line.split()[0]) + print "%s_out.value %s" % (vms[pid], line.split()[8]) + break + else: + f.close() except: continue @@ -116,7 +117,7 @@ def find_vms_tap(): res = kvm.communicate()[0].split('\n') for line in res: try: - tap = line.split()[0] + tap = str(int(line.split()[0]) - 1) mac = line.split()[1] result[mac] = tap except: