2 files changed, 6 insertions, 11 deletions

diff --git a/conf/config.php b/conf/config.php
index da23449..149348a 100644
--- a/conf/config.php
+++ b/conf/config.php
@@ -1,5 +1,8 @@
 <?php
 
+# collectd version
+$CONFIG['version'] = 4;
+
 # collectd's datadir
 $CONFIG['datadir'] = '/var/lib/collectd/rrd';
 
@@ -21,16 +24,6 @@ $CONFIG['detail-heigth'] = 350;
 # disabled: NULL
 $CONFIG['socket'] = NULL;
 
-# group data to show in a graph
-# XXX: these settings have to move to their plugins
-$CONFIG['groupby'] = array(
-        'cpu' => 'type',
-        'irq' => 'type',
-        'memory' => 'type',
-        'processes' => 'type',
-        'swap' => 'type',
-        'sensors' => 'type',
-);
 
 # load local configuration
 if (file_exists(dirname(__FILE__).'/config.local.php'))
diff --git a/inc/collectd.inc.php b/inc/collectd.inc.php
index ab4340f..fde3267 100644
--- a/inc/collectd.inc.php
+++ b/inc/collectd.inc.php
@@ -112,7 +112,9 @@ function graphs_from_plugin($host, $plugin) {
         $ts = collectd_plugindetail($host, $plugin, 't');
         $tis = collectd_plugindetail($host, $plugin, 'ti');
         if (!$pis) $pis = array('NULL');
-        if (!$tis || $CONFIG['groupby'][$plugin] == 'type')
+        if (!$tis) $tis = array('NULL');
+        # backwards compatibility
+        if ($CONFIG['version'] >= 5 || !preg_match('/^(df|interface)$/', $plugin))
                 $tis = array('NULL');
 
         foreach($pis as $pi) {