1 files changed, 10 insertions, 4 deletions

diff --git a/plugin/interface.php b/plugin/interface.php
index 6beee00..f200813 100644
--- a/plugin/interface.php
+++ b/plugin/interface.php
@@ -6,12 +6,17 @@ require_once 'conf/common.inc.php';
 require_once 'type/GenericIO.class.php';
 require_once 'inc/collectd.inc.php';
 
-# LAYOUT
+# LAYOUT - Collectd 4
 # interface/
 # interface/if_errors-XXXX.rrd
 # interface/if_octets-XXXX.rrd
 # interface/if_packets-XXXX.rrd
 
+# LAYOUT - Collectd 5
+# interface-XXXX/if_errors.rrd
+# interface-XXXX/if_octets.rrd
+# interface-XXXX/if_packets.rrd
+
 $obj = new Type_GenericIO($CONFIG);
 $obj->data_sources = array('rx', 'tx');
 $obj->ds_names = array(
@@ -26,17 +31,18 @@ $obj->width = $width;
 $obj->heigth = $heigth;
 $obj->rrd_format = '%5.1lf%s';
 
+$instance = $CONFIG['version'] < 5 ? 'tinstance' : 'pinstance';
 switch($obj->args['type']) {
         case 'if_errors':
-                $obj->rrd_title = sprintf('Interface Errors (%s)', $obj->args['tinstance']);
+                $obj->rrd_title = sprintf('Interface Errors (%s)', $obj->args[$instance]);
                 $obj->rrd_vertical = 'Errors per second';
         break;
         case 'if_octets':
-                $obj->rrd_title = sprintf('Interface Traffic (%s)', $obj->args['tinstance']);
+                $obj->rrd_title = sprintf('Interface Traffic (%s)', $obj->args[$instance]);
                 $obj->rrd_vertical = 'Bytes per second';
         break;
         case 'if_packets':
-                $obj->rrd_title = sprintf('Interface Packets (%s)', $obj->args['tinstance']);
+                $obj->rrd_title = sprintf('Interface Packets (%s)', $obj->args[$instance]);
                 $obj->rrd_vertical = 'Packets per second';
         break;
 }