From 924495bb2d732548083de9e54bf93eebe7f0d910 Mon Sep 17 00:00:00 2001
From: Pim van den Berg
Date: Tue, 12 Jan 2010 19:58:47 +0100
Subject: make rrdtool executable configurable

---
 plugin/cpu.php       | 2 +-
 plugin/df.php        | 2 +-
 plugin/disk.php      | 2 +-
 plugin/entropy.php   | 2 +-
 plugin/interface.php | 2 +-
 plugin/irq.php       | 2 +-
 plugin/load.php      | 2 +-
 plugin/memory.php    | 2 +-
 plugin/processes.php | 2 +-
 plugin/sensors.php   | 2 +-
 plugin/swap.php      | 4 ++--
 plugin/users.php     | 2 +-
 12 files changed, 13 insertions(+), 13 deletions(-)

(limited to 'plugin')

diff --git a/plugin/cpu.php b/plugin/cpu.php
index d4097b0..081427f 100644
--- a/plugin/cpu.php
+++ b/plugin/cpu.php
@@ -17,7 +17,7 @@ require_once 'inc/collectd.inc.php';
 # cpu-X/cpu-user.rrd
 # cpu-X/cpu-wait.rrd
 
-$obj = new Type_GenericStacked($CONFIG['datadir']);
+$obj = new Type_GenericStacked($CONFIG);
 $obj->data_sources = array('value');
 $obj->order = array('idle', 'nice', 'user', 'wait', 'system', 'softirq', 'interrupt', 'steal');
 $obj->ds_names = array(
diff --git a/plugin/df.php b/plugin/df.php
index 79c5cb5..b3bba84 100644
--- a/plugin/df.php
+++ b/plugin/df.php
@@ -11,7 +11,7 @@ require_once 'inc/collectd.inc.php';
 # df/
 # df/df-XXXX.rrd
 
-$obj = new Type_GenericStacked($CONFIG['datadir']);
+$obj = new Type_GenericStacked($CONFIG);
 $obj->data_sources = array('free', 'used');
 $obj->ds_names = array(
 	'free' => 'Free',
diff --git a/plugin/disk.php b/plugin/disk.php
index f1100d6..0f7a11a 100644
--- a/plugin/disk.php
+++ b/plugin/disk.php
@@ -13,7 +13,7 @@ require_once 'inc/collectd.inc.php';
 # disk-XXXX/disk_ops.rrd
 # disk-XXXX/disk_time.rrd
 
-$obj = new Type_GenericIO($CONFIG['datadir']);
+$obj = new Type_GenericIO($CONFIG);
 $obj->data_sources = array('read', 'write');
 $obj->ds_names = array(
 	'read' => 'Read   ',
diff --git a/plugin/entropy.php b/plugin/entropy.php
index 8705894..3583550 100644
--- a/plugin/entropy.php
+++ b/plugin/entropy.php
@@ -9,7 +9,7 @@ require_once 'inc/collectd.inc.php';
 ## LAYOUT
 # entropy/entropy.rrd
 
-$obj = new Type_Default($CONFIG['datadir']);
+$obj = new Type_Default($CONFIG);
 $obj->data_sources = array('entropy');
 $obj->ds_names = array(
 	'entropy' => 'Entropy bits',
diff --git a/plugin/interface.php b/plugin/interface.php
index 89e4280..833de38 100644
--- a/plugin/interface.php
+++ b/plugin/interface.php
@@ -12,7 +12,7 @@ require_once 'inc/collectd.inc.php';
 # interface/if_octets-XXXX.rrd
 # interface/if_packets-XXXX.rrd
 
-$obj = new Type_GenericIO($CONFIG['datadir']);
+$obj = new Type_GenericIO($CONFIG);
 $obj->data_sources = array('rx', 'tx');
 $obj->ds_names = array(
 	'rx' => 'Receive ',
diff --git a/plugin/irq.php b/plugin/irq.php
index ba0e7cb..10c6393 100644
--- a/plugin/irq.php
+++ b/plugin/irq.php
@@ -10,7 +10,7 @@ require_once 'inc/collectd.inc.php';
 # irq/
 # irq/irq-XX.rrd
 
-$obj = new Type_GenericStacked($CONFIG['datadir']);
+$obj = new Type_GenericStacked($CONFIG);
 $obj->width = $width;
 $obj->heigth = $heigth;
 
diff --git a/plugin/load.php b/plugin/load.php
index 44baf45..b33739e 100644
--- a/plugin/load.php
+++ b/plugin/load.php
@@ -9,7 +9,7 @@ require_once 'inc/collectd.inc.php';
 ## LAYOUT
 # load/load.rrd
 
-$obj = new Type_Default($CONFIG['datadir']);
+$obj = new Type_Default($CONFIG);
 $obj->data_sources = array('shortterm', 'midterm', 'longterm');
 $obj->ds_names = array(
 	'shortterm' => ' 1 min',
diff --git a/plugin/memory.php b/plugin/memory.php
index ade242c..48a3048 100644
--- a/plugin/memory.php
+++ b/plugin/memory.php
@@ -13,7 +13,7 @@ require_once 'inc/collectd.inc.php';
 # memory/memory-free.rrd
 # memory/memory-used.rrd
 
-$obj = new Type_GenericStacked($CONFIG['datadir']);
+$obj = new Type_GenericStacked($CONFIG);
 $obj->order = array('free', 'buffered', 'cached', 'used');
 $obj->ds_names = array(
 	'free' => 'Free    ',
diff --git a/plugin/processes.php b/plugin/processes.php
index 1487568..a560b13 100644
--- a/plugin/processes.php
+++ b/plugin/processes.php
@@ -15,7 +15,7 @@ require_once 'inc/collectd.inc.php';
 # processes/ps_state-running.rrd
 # processes/ps_state-sleeping.rrd
 
-$obj = new Type_GenericStacked($CONFIG['datadir']);
+$obj = new Type_GenericStacked($CONFIG);
 $obj->ds_names = array(
 	'paging' => 'Paging  ',
 	'blocked' => 'Blocked ',
diff --git a/plugin/sensors.php b/plugin/sensors.php
index fda5432..29110f1 100644
--- a/plugin/sensors.php
+++ b/plugin/sensors.php
@@ -12,7 +12,7 @@ require_once 'inc/collectd.inc.php';
 # disk-XXXX/temerature-XXXX.rrd
 # disk-XXXX/voltage-XXXX.rrd
 
-$obj = new Type_Default($CONFIG['datadir']);
+$obj = new Type_Default($CONFIG);
 $obj->ds_names = array(
 	'value' => 'Value  ',
 );
diff --git a/plugin/swap.php b/plugin/swap.php
index 27bf7f9..e1fa3f6 100644
--- a/plugin/swap.php
+++ b/plugin/swap.php
@@ -14,7 +14,7 @@ require_once 'inc/collectd.inc.php';
 switch($_GET['t']) {
 	case 'swap':
 		require_once 'type/GenericStacked.class.php';
-		$obj = new Type_GenericStacked($CONFIG['datadir']);
+		$obj = new Type_GenericStacked($CONFIG);
 		$obj->order = array('free', 'cached', 'used');
 		$obj->ds_names = array(
 			'free' => 'Free	',
@@ -31,7 +31,7 @@ switch($_GET['t']) {
 	break;
 	case 'swap_io':
 		require_once 'type/GenericIO.class.php';
-		$obj = new Type_GenericIO($CONFIG['datadir']);
+		$obj = new Type_GenericIO($CONFIG);
 		$obj->order = array('out', 'in');
 		$obj->ds_names = array(
 			'out' => 'Out',
diff --git a/plugin/users.php b/plugin/users.php
index d94a8c1..5df16bc 100644
--- a/plugin/users.php
+++ b/plugin/users.php
@@ -9,7 +9,7 @@ require_once 'inc/collectd.inc.php';
 ## LAYOUT
 # users/users.rrd
 
-$obj = new Type_Default($CONFIG['datadir']);
+$obj = new Type_Default($CONFIG);
 $obj->data_sources = array('users');
 $obj->ds_names = array(
 	'users' => 'Users',
-- 
cgit v1.1