12 files changed, 47 insertions, 192 deletions

diff --git a/plugin/cpu.php b/plugin/cpu.php
index 4cc74f6..d4097b0 100644
--- a/plugin/cpu.php
+++ b/plugin/cpu.php
@@ -4,6 +4,7 @@
 
 require_once 'conf/common.inc.php';
 require_once 'type/GenericStacked.class.php';
+require_once 'inc/collectd.inc.php';
 
 ## LAYOUT
 # cpu-X/
@@ -16,19 +17,7 @@ require_once 'type/GenericStacked.class.php';
 # cpu-X/cpu-user.rrd
 # cpu-X/cpu-wait.rrd
 
-# grouped
-require_once 'inc/collectd.inc.php';
-$tinstance = collectd_plugindetail($host, $plugin, 'ti');
-
-$obj = new Type_GenericStacked;
-$obj->datadir = $CONFIG['datadir'];
-$obj->args = array(
-        'host' => $host,
-        'plugin' => $plugin,
-        'pinstance' => $pinstance,
-        'type' => $type,
-        'tinstance' => $tinstance,
-);
+$obj = new Type_GenericStacked($CONFIG['datadir']);
 $obj->data_sources = array('value');
 $obj->order = array('idle', 'nice', 'user', 'wait', 'system', 'softirq', 'interrupt', 'steal');
 $obj->ds_names = array(
@@ -53,14 +42,12 @@ $obj->colors = array(
 );
 $obj->width = $width;
 $obj->heigth = $heigth;
-$obj->seconds = $seconds;
 
-$obj->rrd_title = sprintf('CPU-%s usage', $pinstance);
+$obj->rrd_title = sprintf('CPU-%s usage', $obj->args['pinstance']);
 $obj->rrd_vertical = 'Jiffies';
 $obj->rrd_format = '%5.2lf';
 
-collectd_flush(ident_from_args($obj->args));
-
+collectd_flush($obj->identifiers);
 $obj->rrd_graph();
 
 ?>
diff --git a/plugin/df.php b/plugin/df.php
index bf9b850..79c5cb5 100644
--- a/plugin/df.php
+++ b/plugin/df.php
@@ -11,15 +11,7 @@ require_once 'inc/collectd.inc.php';
 # df/
 # df/df-XXXX.rrd
 
-$obj = new Type_GenericStacked;
-$obj->datadir = $CONFIG['datadir'];
-$obj->args = array(
-        'host' => $host,
-        'plugin' => $plugin,
-        'pinstance' => $pinstance,
-        'type' => $type,
-        'tinstance' => $tinstance,
-);
+$obj = new Type_GenericStacked($CONFIG['datadir']);
 $obj->data_sources = array('free', 'used');
 $obj->ds_names = array(
         'free' => 'Free',
@@ -31,14 +23,12 @@ $obj->colors = array(
 );
 $obj->width = $width;
 $obj->heigth = $heigth;
-$obj->seconds = $seconds;
 
-$obj->rrd_title = sprintf('Free space (%s)', $tinstance);
+$obj->rrd_title = sprintf('Free space (%s)', $obj->args['tinstance']);
 $obj->rrd_vertical = 'Bytes';
 $obj->rrd_format = '%5.1lf%sB';
 
-collectd_flush(ident_from_args($obj->args));
-
+collectd_flush($obj->identifiers);
 $obj->rrd_graph();
 
 ?>
diff --git a/plugin/disk.php b/plugin/disk.php
index 620b188..f1100d6 100644
--- a/plugin/disk.php
+++ b/plugin/disk.php
@@ -13,15 +13,7 @@ require_once 'inc/collectd.inc.php';
 # disk-XXXX/disk_ops.rrd
 # disk-XXXX/disk_time.rrd
 
-$obj = new Type_GenericIO;
-$obj->datadir = $CONFIG['datadir'];
-$obj->args = array(
-        'host' => $host,
-        'plugin' => $plugin,
-        'pinstance' => $pinstance,
-        'type' => $type,
-        'tinstance' => $tinstance,
-);
+$obj = new Type_GenericIO($CONFIG['datadir']);
 $obj->data_sources = array('read', 'write');
 $obj->ds_names = array(
         'read' => 'Read   ',
@@ -33,33 +25,31 @@ $obj->colors = array(
 );
 $obj->width = $width;
 $obj->heigth = $heigth;
-$obj->seconds = $seconds;
-switch($type) {
+switch($obj->args['type']) {
         case 'disk_merged':
-                $obj->rrd_title = sprintf('Disk Merged Operations (%s)', $pinstance);
+                $obj->rrd_title = sprintf('Disk Merged Operations (%s)', $obj->args['pinstance']);
                 $obj->rrd_vertical = 'Merged operations/s';
                 $obj->rrd_format = '%5.1lf';
         break;
         case 'disk_octets':
-                $obj->rrd_title = sprintf('Disk Traffic (%s)', $pinstance);
+                $obj->rrd_title = sprintf('Disk Traffic (%s)', $obj->args['pinstance']);
                 $obj->rrd_vertical = 'Bytes per second';
                 $obj->rrd_format = '%5.1lf%s';
         break;
         case 'disk_ops':
-                $obj->rrd_title = sprintf('Disk Operations (%s)', $pinstance);
+                $obj->rrd_title = sprintf('Disk Operations (%s)', $obj->args['pinstance']);
                 $obj->rrd_vertical = 'Ops per second';
                 $obj->rrd_format = '%5.1lf';
         break;
         case 'disk_time':
-                $obj->rrd_title = sprintf('Disk time per operation (%s)', $pinstance);
+                $obj->rrd_title = sprintf('Disk time per operation (%s)', $obj->args['pinstance']);
                 $obj->rrd_vertical = 'Avg. Time/Op';
                 $obj->rrd_format = '%5.1lf%ss';
                 $obj->scale = '0.001';
         break;
 }
 
-collectd_flush(ident_from_args($obj->args));
-
+collectd_flush($obj->identifiers);
 $obj->rrd_graph();
 
 ?>
diff --git a/plugin/entropy.php b/plugin/entropy.php
index 6ee96aa..8705894 100644
--- a/plugin/entropy.php
+++ b/plugin/entropy.php
@@ -9,15 +9,7 @@ require_once 'inc/collectd.inc.php';
 ## LAYOUT
 # entropy/entropy.rrd
 
-$obj = new Type_Default;
-$obj->datadir = $CONFIG['datadir'];
-$obj->args = array(
-        'host' => $host,
-        'plugin' => $plugin,
-        'pinstance' => $pinstance,
-        'type' => $type,
-        'tinstance' => $tinstance,
-);
+$obj = new Type_Default($CONFIG['datadir']);
 $obj->data_sources = array('entropy');
 $obj->ds_names = array(
         'entropy' => 'Entropy bits',
@@ -27,13 +19,11 @@ $obj->colors = array(
 );
 $obj->width = $width;
 $obj->heigth = $heigth;
-$obj->seconds = $seconds;
 $obj->rrd_title = 'Available entropy';
 $obj->rrd_vertical = 'Bits';
 $obj->rrd_format = '%4.0lf';
 
-collectd_flush(ident_from_args($obj->args));
-
+collectd_flush($obj->identifiers);
 $obj->rrd_graph();
 
 ?>
diff --git a/plugin/interface.php b/plugin/interface.php
index 7d8d929..89e4280 100644
--- a/plugin/interface.php
+++ b/plugin/interface.php
@@ -12,15 +12,7 @@ require_once 'inc/collectd.inc.php';
 # interface/if_octets-XXXX.rrd
 # interface/if_packets-XXXX.rrd
 
-$obj = new Type_GenericIO;
-$obj->datadir = $CONFIG['datadir'];
-$obj->args = array(
-        'host' => $host,
-        'plugin' => $plugin,
-        'pinstance' => $pinstance,
-        'type' => $type,
-        'tinstance' => $tinstance,
-);
+$obj = new Type_GenericIO($CONFIG['datadir']);
 $obj->data_sources = array('rx', 'tx');
 $obj->ds_names = array(
         'rx' => 'Receive ',
@@ -32,25 +24,24 @@ $obj->colors = array(
 );
 $obj->width = $width;
 $obj->heigth = $heigth;
-$obj->seconds = $seconds;
 $obj->rrd_format = '%5.1lf%s';
-switch($type) {
+
+switch($obj->args['type']) {
         case 'if_errors':
-                $obj->rrd_title = sprintf('Interface Errors (%s)', $tinstance);
+                $obj->rrd_title = sprintf('Interface Errors (%s)', $obj->args['tinstance']);
                 $obj->rrd_vertical = 'Errors per second';
         break;
         case 'if_octets':
-                $obj->rrd_title = sprintf('Interface Traffic (%s)', $tinstance);
+                $obj->rrd_title = sprintf('Interface Traffic (%s)', $obj->args['tinstance']);
                 $obj->rrd_vertical = 'Bits per second';
         break;
         case 'if_packets':
-                $obj->rrd_title = sprintf('Interface Packets (%s)', $tinstance);
+                $obj->rrd_title = sprintf('Interface Packets (%s)', $obj->args['tinstance']);
                 $obj->rrd_vertical = 'Packets per second';
         break;
 }
 
-collectd_flush(ident_from_args($obj->args));
-
+collectd_flush($obj->identifiers);
 $obj->rrd_graph();
 
 ?>
diff --git a/plugin/irq.php b/plugin/irq.php
index d6b1e72..ba0e7cb 100644
--- a/plugin/irq.php
+++ b/plugin/irq.php
@@ -4,38 +4,21 @@
 
 require_once 'conf/common.inc.php';
 require_once 'type/GenericStacked.class.php';
+require_once 'inc/collectd.inc.php';
 
 ## LAYOUT
 # irq/
 # irq/irq-XX.rrd
 
-# grouped
-require_once 'inc/collectd.inc.php';
-$tinstance = collectd_plugindetail($host, $plugin, 'ti');
-sort($tinstance);
-
-$obj = new Type_GenericStacked;
-$obj->datadir = $CONFIG['datadir'];
-$obj->args = array(
-        'host' => $host,
-        'plugin' => $plugin,
-        'pinstance' => $pinstance,
-        'type' => $type,
-        'tinstance' => $tinstance,
-);
-$obj->data_sources = array('value');
-$obj->ds_names = NULL;
-$obj->colors = NULL;
+$obj = new Type_GenericStacked($CONFIG['datadir']);
 $obj->width = $width;
 $obj->heigth = $heigth;
-$obj->seconds = $seconds;
 
 $obj->rrd_title = 'Interrupts';
 $obj->rrd_vertical = 'IRQs/s';
 $obj->rrd_format = '%6.1lf';
 
-collectd_flush(ident_from_args($obj->args));
-
+collectd_flush($obj->identifiers);
 $obj->rrd_graph();
 
 ?>
diff --git a/plugin/load.php b/plugin/load.php
index 523f14c..44baf45 100644
--- a/plugin/load.php
+++ b/plugin/load.php
@@ -9,15 +9,7 @@ require_once 'inc/collectd.inc.php';
 ## LAYOUT
 # load/load.rrd
 
-$obj = new Type_Default;
-$obj->datadir = $CONFIG['datadir'];
-$obj->args = array(
-        'host' => $host,
-        'plugin' => $plugin,
-        'pinstance' => $pinstance,
-        'type' => $type,
-        'tinstance' => $tinstance,
-);
+$obj = new Type_Default($CONFIG['datadir']);
 $obj->data_sources = array('shortterm', 'midterm', 'longterm');
 $obj->ds_names = array(
         'shortterm' => ' 1 min',
@@ -31,13 +23,11 @@ $obj->colors = array(
 );
 $obj->width = $width;
 $obj->heigth = $heigth;
-$obj->seconds = $seconds;
 $obj->rrd_title = 'System load';
 $obj->rrd_vertical = 'System load';
 $obj->rrd_format = '%.2lf';
 
-collectd_flush(ident_from_args($obj->args));
-
+collectd_flush($obj->identifiers);
 $obj->rrd_graph();
 
 ?>
diff --git a/plugin/memory.php b/plugin/memory.php
index b0f6b73..ade242c 100644
--- a/plugin/memory.php
+++ b/plugin/memory.php
@@ -4,6 +4,7 @@
 
 require_once 'conf/common.inc.php';
 require_once 'type/GenericStacked.class.php';
+require_once 'inc/collectd.inc.php';
 
 ## LAYOUT
 # memory/
@@ -12,20 +13,7 @@ require_once 'type/GenericStacked.class.php';
 # memory/memory-free.rrd
 # memory/memory-used.rrd
 
-# grouped
-require_once 'inc/collectd.inc.php';
-$tinstance = collectd_plugindetail($host, $plugin, 'ti');
-
-$obj = new Type_GenericStacked;
-$obj->datadir = $CONFIG['datadir'];
-$obj->args = array(
-        'host' => $host,
-        'plugin' => $plugin,
-        'pinstance' => $pinstance,
-        'type' => $type,
-        'tinstance' => $tinstance,
-);
-$obj->data_sources = array('value');
+$obj = new Type_GenericStacked($CONFIG['datadir']);
 $obj->order = array('free', 'buffered', 'cached', 'used');
 $obj->ds_names = array(
         'free' => 'Free    ',
@@ -41,14 +29,12 @@ $obj->colors = array(
 );
 $obj->width = $width;
 $obj->heigth = $heigth;
-$obj->seconds = $seconds;
 
 $obj->rrd_title = 'Physical memory utilization';
 $obj->rrd_vertical = 'Bytes';
 $obj->rrd_format = '%5.1lf%s';
 
-collectd_flush(ident_from_args($obj->args));
-
+collectd_flush($obj->identifiers);
 $obj->rrd_graph();
 
 ?>
diff --git a/plugin/processes.php b/plugin/processes.php
index 65e1ddd..1487568 100644
--- a/plugin/processes.php
+++ b/plugin/processes.php
@@ -4,6 +4,7 @@
 
 require_once 'conf/common.inc.php';
 require_once 'type/GenericStacked.class.php';
+require_once 'inc/collectd.inc.php';
 
 ## LAYOUT
 # processes/
@@ -14,20 +15,7 @@ require_once 'type/GenericStacked.class.php';
 # processes/ps_state-running.rrd
 # processes/ps_state-sleeping.rrd
 
-# grouped
-require_once 'inc/collectd.inc.php';
-$tinstance = collectd_plugindetail($host, $plugin, 'ti');
-
-$obj = new Type_GenericStacked;
-$obj->datadir = $CONFIG['datadir'];
-$obj->args = array(
-        'host' => $host,
-        'plugin' => $plugin,
-        'pinstance' => $pinstance,
-        'type' => $type,
-        'tinstance' => $tinstance,
-);
-$obj->data_sources = array('value');
+$obj = new Type_GenericStacked($CONFIG['datadir']);
 $obj->ds_names = array(
         'paging' => 'Paging  ',
         'blocked' => 'Blocked ',
@@ -46,14 +34,12 @@ $obj->colors = array(
 );
 $obj->width = $width;
 $obj->heigth = $heigth;
-$obj->seconds = $seconds;
 
 $obj->rrd_title = 'Processes';
 $obj->rrd_vertical = 'Processes';
 $obj->rrd_format = '%5.1lf%s';
 
-collectd_flush(ident_from_args($obj->args));
-
+collectd_flush($obj->identifiers);
 $obj->rrd_graph();
 
 ?>
diff --git a/plugin/sensors.php b/plugin/sensors.php
index 048f9f1..fda5432 100644
--- a/plugin/sensors.php
+++ b/plugin/sensors.php
@@ -4,6 +4,7 @@
 
 require_once 'conf/common.inc.php';
 require_once 'type/Default.class.php';
+require_once 'inc/collectd.inc.php';
 
 ## LAYOUT
 # disk-XXXX/
@@ -11,49 +12,34 @@ require_once 'type/Default.class.php';
 # disk-XXXX/temerature-XXXX.rrd
 # disk-XXXX/voltage-XXXX.rrd
 
-# grouped
-require_once 'inc/collectd.inc.php';
-$tinstance = collectd_plugindetail($host, $plugin, 'ti', array('t' => $type));
-
-$obj = new Type_Default;
-$obj->datadir = $CONFIG['datadir'];
-$obj->args = array(
-        'host' => $host,
-        'plugin' => $plugin,
-        'pinstance' => $pinstance,
-        'type' => $type,
-        'tinstance' => $tinstance,
-);
-$obj->data_sources = array('value');
+$obj = new Type_Default($CONFIG['datadir']);
 $obj->ds_names = array(
         'value' => 'Value  ',
 );
 $obj->width = $width;
 $obj->heigth = $heigth;
-$obj->seconds = $seconds;
-switch($type) {
+switch($obj->args['type']) {
         case 'fanspeed':
                 $obj->colors = '00ff00';
-                $obj->rrd_title = sprintf('Fanspeed (%s)', $pinstance);
+                $obj->rrd_title = sprintf('Fanspeed (%s)', $obj->args['pinstance']);
                 $obj->rrd_vertical = 'RPM';
                 $obj->rrd_format = '%5.1lf';
         break;
         case 'temperature':
                 $obj->colors = '0000ff';
-                $obj->rrd_title = sprintf('Temperature (%s)', $pinstance);
+                $obj->rrd_title = sprintf('Temperature (%s)', $obj->args['pinstance']);
                 $obj->rrd_vertical = 'Celius';
                 $obj->rrd_format = '%5.1lf%s';
         break;
         case 'voltage':
                 $obj->colors = 'ff0000';
-                $obj->rrd_title = sprintf('Voltage (%s)', $pinstance);
+                $obj->rrd_title = sprintf('Voltage (%s)', $obj->args['pinstance']);
                 $obj->rrd_vertical = 'Volt';
                 $obj->rrd_format = '%5.1lf';
         break;
 }
 
-collectd_flush(ident_from_args($obj->args));
-
+collectd_flush($obj->identifiers);
 $obj->rrd_graph();
 
 ?>
diff --git a/plugin/swap.php b/plugin/swap.php
index 638ddc3..e1527cc 100644
--- a/plugin/swap.php
+++ b/plugin/swap.php
@@ -4,6 +4,7 @@
 
 require_once 'conf/common.inc.php';
 require_once 'type/GenericStacked.class.php';
+require_once 'inc/collectd.inc.php';
 
 ## LAYOUT
 # swap/
@@ -11,25 +12,12 @@ require_once 'type/GenericStacked.class.php';
 # swap/swap-free.rrd
 # swap/swap-used.rrd
 
-if ($type == 'swap_io') {
+if ($_GET['t'] == 'swap_io') {
         die_img('Error: swap_io not supported yet');
         exit;
 }
 
-# grouped
-require_once 'inc/collectd.inc.php';
-$tinstance = collectd_plugindetail($host, $plugin, 'ti', array('t' => $type));
-
-$obj = new Type_GenericStacked;
-$obj->datadir = $CONFIG['datadir'];
-$obj->args = array(
-        'host' => $host,
-        'plugin' => $plugin,
-        'pinstance' => $pinstance,
-        'type' => $type,
-        'tinstance' => $tinstance,
-);
-$obj->data_sources = array('value');
+$obj = new Type_GenericStacked($CONFIG['datadir']);
 $obj->order = array('free', 'cached', 'used');
 $obj->ds_names = array(
         'free' => 'Free    ',
@@ -43,14 +31,12 @@ $obj->colors = array(
 );
 $obj->width = $width;
 $obj->heigth = $heigth;
-$obj->seconds = $seconds;
 
 $obj->rrd_title = 'Swap utilization';
 $obj->rrd_vertical = 'Bytes';
 $obj->rrd_format = '%5.1lf%s';
 
-collectd_flush(ident_from_args($obj->args));
-
+collectd_flush($obj->identifiers);
 $obj->rrd_graph();
 
 ?>
diff --git a/plugin/users.php b/plugin/users.php
index 5ebee43..d94a8c1 100644
--- a/plugin/users.php
+++ b/plugin/users.php
@@ -9,15 +9,7 @@ require_once 'inc/collectd.inc.php';
 ## LAYOUT
 # users/users.rrd
 
-$obj = new Type_Default;
-$obj->datadir = $CONFIG['datadir'];
-$obj->args = array(
-        'host' => $host,
-        'plugin' => $plugin,
-        'pinstance' => $pinstance,
-        'type' => $type,
-        'tinstance' => $tinstance,
-);
+$obj = new Type_Default($CONFIG['datadir']);
 $obj->data_sources = array('users');
 $obj->ds_names = array(
         'users' => 'Users',
@@ -27,13 +19,11 @@ $obj->colors = array(
 );
 $obj->width = $width;
 $obj->heigth = $heigth;
-$obj->seconds = $seconds;
 $obj->rrd_title = 'Users';
 $obj->rrd_vertical = 'Users';
 $obj->rrd_format = '%.1lf';
 
-collectd_flush(ident_from_args($obj->args));
-
+collectd_flush($obj->identifiers);
 $obj->rrd_graph();
 
 ?>