1
0
Fork 0
mirror of https://github.com/munin-monitoring/contrib.git synced 2025-07-21 18:41:03 +00:00

Merge pull request #1331 from Baroti/kvm_improve_fieldname_proxmox_centos

kvm_*: improve field names for Proxmox, Centos
This commit is contained in:
Kenyon Ralph 2024-11-19 23:16:01 -08:00 committed by GitHub
commit 8fa02efe0a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 4 additions and 4 deletions

View file

@ -80,7 +80,7 @@ def clean_vm_name(vm_name):
parts = vm_name.split('\x00') parts = vm_name.split('\x00')
if parts[0].endswith('kvm'): if parts[0].endswith('kvm'):
try: try:
return parts[parts.index('-name') + 1] return re.sub(r"(^[^A-Za-z_]|[^A-Za-z0-9_])", "_", parts[parts.index('-name') + 1])
except ValueError: except ValueError:
pass pass
return re.sub(r"(^[^A-Za-z_]|[^A-Za-z0-9_])", "_", vm_name) return re.sub(r"(^[^A-Za-z_]|[^A-Za-z0-9_])", "_", vm_name)

View file

@ -79,7 +79,7 @@ def clean_vm_name(vm_name):
parts = vm_name.split('\x00') parts = vm_name.split('\x00')
if (parts[0].endswith('kvm')): if (parts[0].endswith('kvm')):
try: try:
vm_name = parts[parts.index('-name') + 1] vm_name = re.sub(r"(^[^A-Za-z_]|[^A-Za-z0-9_])", "_", parts[parts.index('-name') + 1])
except ValueError: except ValueError:
pass pass
return re.sub(r"(^[^A-Za-z_]|[^A-Za-z0-9_])", "_", vm_name) return re.sub(r"(^[^A-Za-z_]|[^A-Za-z0-9_])", "_", vm_name)

View file

@ -48,7 +48,7 @@ def clean_vm_name(vm_name):
parts = vm_name.split('\x00') parts = vm_name.split('\x00')
if (parts[0].endswith('kvm')): if (parts[0].endswith('kvm')):
try: try:
return parts[parts.index('-name')+1] return re.sub(r"(^[^A-Za-z_]|[^A-Za-z0-9_])", "_", parts[parts.index('-name')+1])
except ValueError: except ValueError:
pass pass
return re.sub(r"(^[^A-Za-z_]|[^A-Za-z0-9_])", "_", vm_name) return re.sub(r"(^[^A-Za-z_]|[^A-Za-z0-9_])", "_", vm_name)

View file

@ -103,7 +103,7 @@ def clean_vm_name(vm_name):
parts = vm_name.split('\x00') parts = vm_name.split('\x00')
if (parts[0].endswith('kvm')): if (parts[0].endswith('kvm')):
try: try:
return parts[parts.index('-name')+1] return re.sub(r"(^[^A-Za-z_]|[^A-Za-z0-9_])", "_", parts[parts.index('-name')+1])
except ValueError: except ValueError:
pass pass
return re.sub(r"(^[^A-Za-z_]|[^A-Za-z0-9_])", "_", vm_name) return re.sub(r"(^[^A-Za-z_]|[^A-Za-z0-9_])", "_", vm_name)