From 5715bb24087d832466e6c313c6d40787d98bac49 Mon Sep 17 00:00:00 2001 From: Stanislav Kopp Date: Thu, 21 May 2015 15:40:11 +0200 Subject: [PATCH] fixed regex for "vm_name" resolv, so VMs with dash in the name will be displayed correctly --- plugins/virtualization/kvm_cpu | 2 +- plugins/virtualization/kvm_io | 2 +- plugins/virtualization/kvm_mem | 2 +- plugins/virtualization/kvm_net | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/plugins/virtualization/kvm_cpu b/plugins/virtualization/kvm_cpu index eb47ee96..2088b093 100755 --- a/plugins/virtualization/kvm_cpu +++ b/plugins/virtualization/kvm_cpu @@ -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(): diff --git a/plugins/virtualization/kvm_io b/plugins/virtualization/kvm_io index 5019fbdc..8051692f 100755 --- a/plugins/virtualization/kvm_io +++ b/plugins/virtualization/kvm_io @@ -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(): diff --git a/plugins/virtualization/kvm_mem b/plugins/virtualization/kvm_mem index 5038f9b1..2a93aaa6 100755 --- a/plugins/virtualization/kvm_mem +++ b/plugins/virtualization/kvm_mem @@ -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(): diff --git a/plugins/virtualization/kvm_net b/plugins/virtualization/kvm_net index 5754a5ec..ad34e217 100755 --- a/plugins/virtualization/kvm_net +++ b/plugins/virtualization/kvm_net @@ -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):