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

fixed regex for "vm_name" resolv, so VMs with dash in the name will be

Browse source 
displayed correctly
This commit is contained in:
Stanislav Kopp 2015-05-21 15:40:11 +02:00
parent 8537e6fd02
commit 5715bb2408
4 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
plugins/virtualization/kvm_cpu
View file

@ -68,7 +68,7 @@ def find_vm_names(pids):
result = {}
for pid in pids:
cmdline = open("/proc/%s/cmdline" % pid, "r")
result[pid] = clean_vm_name(re.sub(r"^.*-name\x00([a-zA-Z0-9.-_]*)\x00\-.*$",r"\1", cmdline.readline()))
result[pid] = clean_vm_name(re.sub(r"^.*-name\x00([a-zA-Z0-9.-_-]*)\x00\-.*$",r"\1", cmdline.readline()))
return result
def list_pids():

2
plugins/virtualization/kvm_io
View file

@ -85,7 +85,7 @@ def find_vm_names(pids):
result = {}
for pid in pids:
cmdline = open("/proc/%s/cmdline" % pid, "r")
result[pid] = clean_vm_name(re.sub(r"^.*-name\x00([a-zA-Z0-9.-_]*)\x00\-.*$",r"\1", cmdline.readline()))
result[pid] = clean_vm_name(re.sub(r"^.*-name\x00([a-zA-Z0-9.-_-]*)\x00\-.*$",r"\1", cmdline.readline()))
return result
def list_pids():

2
plugins/virtualization/kvm_mem
View file

@ -82,7 +82,7 @@ def find_vm_names(pids):
result = {}
for pid in pids:
cmdline = open("/proc/%s/cmdline" % pid, "r")
result[pid] = clean_vm_name(re.sub(r"^.*-name\x00([a-zA-Z0-9.-_]*)\x00\-.*$",r"\1", cmdline.readline()))
result[pid] = clean_vm_name(re.sub(r"^.*-name\x00([a-zA-Z0-9.-_-]*)\x00\-.*$",r"\1", cmdline.readline()))
return result
def list_pids():

2
plugins/virtualization/kvm_net
View file

@ -84,7 +84,7 @@ def find_vm_names(pids):
result = {}
for pid in pids:
cmdline = open("/proc/%s/cmdline" % pid, "r")
result[pid] = clean_vm_name(re.sub(r"^.*-name\x00([a-zA-Z0-9.-_]*)\x00\-.*$",r"\1", cmdline.readline()))
result[pid] = clean_vm_name(re.sub(r"^.*-name\x00([a-zA-Z0-9.-_-]*)\x00\-.*$",r"\1", cmdline.readline()))
return result
def get_vm_mac(pid):