Projet

Général

Profil

Révision e1816224

IDe1816224a975eee48c922cc3aef722cb773512f7
Parent e09d89cd
Enfant e78a1590

Ajouté par Rodolphe Qui?deville il y a presque 14 ans

Minor bugfix

Voir les différences:

plugins/other/kvm_net
33 33
    print base_config
34 34
    for vm in vm_names:
35 35
        print "%s_in.label %s" % (vm, vm)
36
        print "%s_in.type GAUGE" % vm
36
        print "%s_in.type COUNTER" % vm
37 37
        print "%s_in.min 0" % vm
38 38
        print "%s_in.draw LINE2" % vm
39 39
        print "%s_out.negative %s_in" % (vm, vm)
40 40
        print "%s_out.label %s" % (vm, vm)
41
        print "%s_out.type GAUGE" % vm
41
        print "%s_out.type COUNTER" % vm
42 42
        print "%s_out.min 0" % vm
43 43
        print "%s_out.draw LINE2" % vm
44 44

  
......
64 64
        mac = get_vm_mac(pid)
65 65
        try:
66 66
            tap = "tap%s" % macs[mac]
67
            f = open("/proc/net/dev", "r")
68
            for line in f.readlines():
69
                if tap in line:
70
                    print "%s_in.value %s" % (vms[pid], line.split()[1]) 
71
                    print "%s_out.value %s" % (vms[pid], line.split()[9]) 
72
                    break
73
                else:
74
                    f.close()
67
    	    f = open("/proc/net/dev", "r")
68
    	    for line in f.readlines():
69
    	        if tap in line:
70
                    line = line.split(':')[1]
71
	    	    print "%s_in.value %s" % (vms[pid], line.split()[0]) 
72
	    	    print "%s_out.value %s" % (vms[pid], line.split()[8]) 
73
	    	    break
74
	        else:
75
	    	    f.close()
75 76
        except:
76 77
            continue
77 78

  
......
116 117
    res = kvm.communicate()[0].split('\n')
117 118
    for line in res:
118 119
        try:
119
            tap = line.split()[0]
120
            tap = str(int(line.split()[0]) - 1)
120 121
            mac = line.split()[1]
121 122
            result[mac] = tap
122 123
        except:

Formats disponibles : Unified diff