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

Merge pull request #618 from xtavras/kvm_fix

Browse source 
fixed kvm_* plugins
This commit is contained in:
Stig Sandbeck Mathisen 2015-05-23 21:11:32 +02:00
commit 403bba18fa
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 = {} result = {}
for pid in pids: for pid in pids:
cmdline = open("/proc/%s/cmdline" % pid, "r") 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 return result
def list_pids(): def list_pids():

2
plugins/virtualization/kvm_io
View file

@ -85,7 +85,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, "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 return result
def list_pids(): def list_pids():

2
plugins/virtualization/kvm_mem
View file

@ -82,7 +82,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, "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 return result
def list_pids(): def list_pids():

2
plugins/virtualization/kvm_net
View file

@ -84,7 +84,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, "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 return result
def get_vm_mac(pid): def get_vm_mac(pid):