plugin/libvirt: collectd 5 compatibility

2 files changed, 19 insertions, 8 deletions

diff --git a/inc/collectd.inc.php b/inc/collectd.inc.php
index 51aedba..11dc91f 100644
--- a/inc/collectd.inc.php
+++ b/inc/collectd.inc.php
@@ -107,8 +107,9 @@ function group_plugindata($plugindata) {
         # type instances should be grouped in 1 graph
         foreach ($plugindata as $item) {
                 # backwards compatibility
-                if ($CONFIG['version'] >= 5 || !preg_match('/^(df|interface|libvirt)$/', $item['p']))
-                        unset($item['ti']);
+                if ($CONFIG['version'] >= 5 || !preg_match('/^(df|interface)$/', $item['p']))
+                        if($item['p'] != 'libvirt')
+                                unset($item['ti']);
                 $data[] = $item;
         }
 
diff --git a/plugin/libvirt.php b/plugin/libvirt.php
index 0d5071a..829c592 100644
--- a/plugin/libvirt.php
+++ b/plugin/libvirt.php
@@ -103,12 +103,12 @@ switch($obj->args['type']) {
                 require_once 'type/Default.class.php';
                 $obj = new Type_Default($CONFIG);
 
-                $obj->data_sources = array('ns');
+                $obj->data_sources = array('value');
                 $obj->ds_names = array(
-                        'ns' => 'CPU time',
+                        'value' => 'CPU time',
                 );
                 $obj->colors = array(
-                        'ns' => '0000ff',
+                        'value' => '0000ff',
                 );
                 $obj->rrd_title = 'CPU usage';
                 $obj->rrd_vertical = 'CPU time';
@@ -117,12 +117,12 @@ switch($obj->args['type']) {
                 require_once 'type/Default.class.php';
                 $obj = new Type_Default($CONFIG);
 
-                $obj->data_sources = array('ns');
+                $obj->data_sources = array('value');
                 $obj->ds_names = array(
-                        'ns' => 'VCPU time',
+                        'value' => 'VCPU time',
                 );
                 $obj->colors = array(
-                        'ns' => '0000ff',
+                        'value' => '0000ff',
                 );
                 $obj->rrd_title = 'VCPU usage';
                 $obj->rrd_vertical = 'VCPU time';
@@ -133,5 +133,15 @@ $obj->width = $width;
 $obj->heigth = $heigth;
 $obj->rrd_format = '%5.1lf%s';
 
+if ($CONFIG['version'] < 5 && count($obj->data_sources) == 1) {
+        $obj->data_sources = array('ns');
+
+        $obj->ds_names['ns'] = $obj->ds_names['value'];
+        unset($obj->ds_names['value']);
+
+        $obj->colors['ns'] = $obj->colors['value'];
+        unset($obj->colors['value']);
+}
+
 collectd_flush($obj->identifiers);
 $obj->rrd_graph();