From a29438a07e9af6ccdcadd465492e527f6ba4a8ab Mon Sep 17 00:00:00 2001 From: mh Date: Sat, 15 Sep 2012 16:18:54 +0200 Subject: cleanup plugins --- files/plugins/kvm_io | 3 +-- files/plugins/kvm_mem | 3 +-- files/plugins/kvm_net | 7 +++---- 3 files changed, 5 insertions(+), 8 deletions(-) (limited to 'files/plugins') diff --git a/files/plugins/kvm_io b/files/plugins/kvm_io index 602b2ca..43941f5 100644 --- a/files/plugins/kvm_io +++ b/files/plugins/kvm_io @@ -25,8 +25,7 @@ def config(vm_names): graph_vlabel Bytes read(-)/written(+) per second graph_category KVM graph_info This graph shows the block device I/O used of virtual machines -graph_args --base 1024 - """ +graph_args --base 1024""" print base_config for vm in vm_names: diff --git a/files/plugins/kvm_mem b/files/plugins/kvm_mem index c64d8ce..14fb793 100644 --- a/files/plugins/kvm_mem +++ b/files/plugins/kvm_mem @@ -25,8 +25,7 @@ def config(vm_names): graph_vlabel Bytes graph_category KVM graph_info This graph shows the current amount of memory used by virtual machines -graph_args --base 1024 - """ +graph_args --base 1024""" print base_config draw = "AREA" for vm in vm_names: diff --git a/files/plugins/kvm_net b/files/plugins/kvm_net index bcad719..c7b5aca 100644 --- a/files/plugins/kvm_net +++ b/files/plugins/kvm_net @@ -28,19 +28,18 @@ def config(vms): graph_vlabel Bytes rx(-)/tx(+) per second graph_category KVM graph_info This graph shows the network I/O of the virtual machines -graph_args --base 1024 - """ +graph_args --base 1024""" print base_config for pid in vms: macs = get_vm_macs(pid) i = 0 for mac in macs: - print "%s_eth%s_in.label %s" % (vms[pid],i, vms[pid]) + print "%s_eth%s_in.label %s_eth%s" % (vms[pid],i, vms[pid], i) print "%s_eth%s_in.type COUNTER" % (vms[pid], i) print "%s_eth%s_in.min 0" % (vms[pid],i) print "%s_eth%s_in.draw LINE2" % (vms[pid],i) print "%s_eth%s_out.negative %s_eth%s_in" % (vms[pid], i, vms[pid], i) - print "%s_eth%s_out.label %s" % (vms[pid], i, vms[pid]) + print "%s_eth%s_out.label %s_eth%s" % (vms[pid], i, vms[pid], i) print "%s_eth%s_out.type COUNTER" % (vms[pid], i) print "%s_eth%s_out.min 0" % (vms[pid], i) print "%s_eth%s_out.draw LINE2" % (vms[pid], i) -- cgit v1.2.3