git-svn-id: http://www.observium.org/svn/observer/trunk@368 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Adam Amstrong
2009-03-24 11:16:50 +00:00
parent ff959e2b32
commit 0a2d624578
2 changed files with 5 additions and 8 deletions
+3 -3
View File
@@ -7,9 +7,9 @@ $config['db_pass'] = "password";
$config['db_name'] = "observer"; $config['db_name'] = "observer";
### Installation Location ### Installation Location
$config['install_dir'] = "/opt/observer/"; $config['install_dir'] = "/opt/observer";
$config['html_dir'] = $config['install_dir'] . "html"; $config['html_dir'] = $config['install_dir'] . "/html";
$config['rrd_dir'] = $config['install_dir'] . "rrd"; $config['rrd_dir'] = $config['install_dir'] . "/rrd";
### Default community ### Default community
$config['community'] = "observer"; $config['community'] = "observer";
+2 -5
View File
@@ -36,13 +36,10 @@ while ($interface = mysql_fetch_array($interface_query)) {
if(!$ifDescr) { $ifDescr = $ifName; } if(!$ifDescr) { $ifDescr = $ifName; }
$older_rrdfile = "rrd/" . $device['hostname'] . "." . $interface['ifIndex'] . ".rrd";
$rrdfile = $host_rrd . "/" . $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)) { if(!is_file($rrdfile)) {
$woo = `rrdtool create $rrdfile \ $woo = shell_exec($config['rrdtool'] . " create $rrdfile \
DS:INOCTETS:COUNTER:600:0:12500000000 \ DS:INOCTETS:COUNTER:600:0:12500000000 \
DS:OUTOCTETS:COUNTER:600:0:12500000000 \ DS:OUTOCTETS:COUNTER:600:0:12500000000 \
DS:INERRORS: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:1:600 \
RRA:MAX:0.5:6:700 \ RRA:MAX:0.5:6:700 \
RRA:MAX:0.5:24:775 \ RRA:MAX:0.5:24:775 \
RRA:MAX:0.5:288:797`; RRA:MAX:0.5:288:797");
} }