Robot/contrib-munin
2
0
Fork 0
mirror of https://github.com/munin-monitoring/contrib.git synced 2018-11-08 00:59:34 +01:00
Code Issues Releases Wiki Activity

Merge pull request #511 from icyground/master

Browse Source 
Fixing Regexp for kvm plugins to be aware of underscores in vm names
This commit is contained in:
Steve Schnepp 2014-08-07 09:13:23 +02:00
commit d33fcd5598
4 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
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():
@ -99,3 +99,4 @@ if __name__ == "__main__":
fetch(find_vm_names(list_pids()))
else:
fetch(find_vm_names(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):