From 00f8fce4f8c9478d0ed7517992287a48fcfff593 Mon Sep 17 00:00:00 2001
From: Bianco Veigel <devel@zivillian.de>
Date: Mon, 20 Jul 2020 19:29:33 +0200
Subject: [PATCH] prevent duplicate graphs and unify line style

---
 plugins/libvirt/kvm_io  | 5 +----
 plugins/libvirt/kvm_net | 5 +----
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/plugins/libvirt/kvm_io b/plugins/libvirt/kvm_io
index 329db9ada..72288694d 100755
--- a/plugins/libvirt/kvm_io
+++ b/plugins/libvirt/kvm_io
@@ -33,12 +33,11 @@ graph_args --base 1024
         print "%s_read.label %s" % (vm, vm)
         print "%s_read.type COUNTER" % vm
         print "%s_read.min 0" % vm
-        print "%s_read.draw LINE1" % vm
         print "%s_read.info I/O used by virtual machine %s" % (vm, vm)
+        print "%s_read.graph no" % vm
         print "%s_write.label %s" % (vm, vm)
         print "%s_write.type COUNTER" % vm
         print "%s_write.min 0" % vm
-        print "%s_write.draw LINE1" % vm
         print "%s_write.negative %s_read" % (vm, vm)
         print "%s_write.info I/O used by virtual machine %s" % (vm, vm)
 
@@ -51,14 +50,12 @@ def clean_vm_name(vm_name):
     suffix = os.getenv('vmsuffix')
     if suffix:
         vm_name = re.sub(suffix,'',vm_name)
-
     parts = vm_name.split('\x00')
     if (parts[0].endswith('kvm')):
         try:
             return parts[parts.index('-name')+1]
         except ValueError:
             pass
-
     return re.sub(r"[^a-zA-Z0-9_]", "_", vm_name)
 
 def fetch(vms):
diff --git a/plugins/libvirt/kvm_net b/plugins/libvirt/kvm_net
index e7b1b8db4..71e6cd592 100755
--- a/plugins/libvirt/kvm_net
+++ b/plugins/libvirt/kvm_net
@@ -82,12 +82,11 @@ def config(vm_names):
         print("%s_in.label %s" % (vm, vm))
         print("%s_in.type COUNTER" % vm)
         print("%s_in.min 0" % vm)
-        print("%s_in.draw LINE2" % vm)
+        print("%s_in.graph no" % vm)
         print("%s_out.negative %s_in" % (vm, vm))
         print("%s_out.label %s" % (vm, vm))
         print("%s_out.type COUNTER" % vm)
         print("%s_out.min 0" % vm)
-        print("%s_out.draw LINE2" % vm)
 
 
 def clean_vm_name(vm_name):
@@ -100,14 +99,12 @@ def clean_vm_name(vm_name):
     suffix = os.getenv("vmsuffix")
     if suffix:
         vm_name = re.sub(suffix, "", vm_name)
-
     parts = vm_name.split('\x00')
     if (parts[0].endswith('kvm')):
         try:
             return parts[parts.index('-name')+1]
         except ValueError:
             pass
-
     return re.sub(r"[^a-zA-Z0-9_]", "_", vm_name)