Mirrors/Munin-Contrib
1
0
Fork 0
mirror of https://github.com/munin-monitoring/contrib.git synced 2025-07-21 18:41:03 +00:00
Code Issues Releases Wiki Activity

Update kvm_cpu

Browse source 
in python3 filter returns an object, not an list. I think a list is required here? at least the plugin works as soon as list(...) is added.
need to change from pid to pid.decode, as pid is binary and not a string.
This commit is contained in:
Alois 2021-03-04 11:33:31 +01:00 • committed by Lars Kruse
parent 9ecd634f86
commit acdaeb6d11
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
plugins/libvirt/kvm_cpu
View file

@ -47,7 +47,7 @@ def config(vm_names):
@param vm_names : a list of "cleaned" vms' name @param vm_names : a list of "cleaned" vms' name
''' '''
percent = 100 * len( percent = 100 * len(
filter(lambda x: x[0:3] == 'cpu' and x[3] != ' ', open('/proc/stat', 'r').readlines())) list(filter(lambda x: x[0:3] == 'cpu' and x[3] != ' ', open('/proc/stat', 'r').readlines())))
base_config = """graph_title KVM Virtual Machine CPU usage base_config = """graph_title KVM Virtual Machine CPU usage
graph_vlabel %% graph_vlabel %%
@ -97,7 +97,7 @@ def find_vm_names(pids):
''' '''
result = {} result = {}
for pid in pids: for pid in pids:
cmdline = open("/proc/%s/cmdline" % pid, "r") cmdline = open("/proc/%s/cmdline" % pid.decode(), "r")
result[pid] = clean_vm_name( result[pid] = clean_vm_name(
re.sub(r"^.*guest=([a-zA-Z0-9.-_-]*).*$", r"\1", cmdline.readline())) re.sub(r"^.*guest=([a-zA-Z0-9.-_-]*).*$", r"\1", cmdline.readline()))
return result return result
@ -116,7 +116,7 @@ def fetch(vms):
@param dictionary {kvm_pid: cleaned vm name} @param dictionary {kvm_pid: cleaned vm name}
''' '''
for pid, name in vms.items(): for pid, name in vms.items():
user, system = open("/proc/%s/stat" % pid, 'r').readline().split(' ')[13:15] user, system = open("/proc/%s/stat" % pid.decode(), 'r').readline().split(' ')[13:15]
print('%s_cpu.value %d' % (name, int(user) + int(system))) print('%s_cpu.value %d' % (name, int(user) + int(system)))