From 0a2d6245783ffca0ad19fc58f849608091a9d5d7 Mon Sep 17 00:00:00 2001 From: Adam Amstrong Date: Tue, 24 Mar 2009 11:16:50 +0000 Subject: [PATCH] updates git-svn-id: http://www.observium.org/svn/observer/trunk@368 61d68cd4-352d-0410-923a-c4978735b2b8 --- config.php.default | 6 +++--- includes/polling/interfaces.inc.php | 7 ++----- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/config.php.default b/config.php.default index 258109044..fdc5b1ce9 100755 --- a/config.php.default +++ b/config.php.default @@ -7,9 +7,9 @@ $config['db_pass'] = "password"; $config['db_name'] = "observer"; ### Installation Location -$config['install_dir'] = "/opt/observer/"; -$config['html_dir'] = $config['install_dir'] . "html"; -$config['rrd_dir'] = $config['install_dir'] . "rrd"; +$config['install_dir'] = "/opt/observer"; +$config['html_dir'] = $config['install_dir'] . "/html"; +$config['rrd_dir'] = $config['install_dir'] . "/rrd"; ### Default community $config['community'] = "observer"; diff --git a/includes/polling/interfaces.inc.php b/includes/polling/interfaces.inc.php index b03210aef..7f3088f4b 100644 --- a/includes/polling/interfaces.inc.php +++ b/includes/polling/interfaces.inc.php @@ -36,13 +36,10 @@ while ($interface = mysql_fetch_array($interface_query)) { if(!$ifDescr) { $ifDescr = $ifName; } - $older_rrdfile = "rrd/" . $device['hostname'] . "." . $interface['ifIndex'] . ".rrd"; $rrdfile = $host_rrd . "/" . $interface['ifIndex'] . ".rrd"; - if(is_file($older_rrdfile) && !is_file($rrdfile)) { rename($older_rrdfile, $rrdfile); echo("Moving $older_rrdfile to $rrdfile"); } - if(!is_file($rrdfile)) { - $woo = `rrdtool create $rrdfile \ + $woo = shell_exec($config['rrdtool'] . " create $rrdfile \ DS:INOCTETS:COUNTER:600:0:12500000000 \ DS:OUTOCTETS:COUNTER:600:0:12500000000 \ DS:INERRORS:COUNTER:600:0:12500000000 \ @@ -58,7 +55,7 @@ while ($interface = mysql_fetch_array($interface_query)) { RRA:MAX:0.5:1:600 \ RRA:MAX:0.5:6:700 \ RRA:MAX:0.5:24:775 \ - RRA:MAX:0.5:288:797`; + RRA:MAX:0.5:288:797"); }