fix nginx

git-svn-id: http://www.observium.org/svn/observer/trunk@2665 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Adam Amstrong 2011-10-07 19:09:35 +00:00
parent 2297709c72
commit b28ae324e0
2 changed files with 33 additions and 32 deletions

View File

@ -16,7 +16,7 @@ $rrd_options .= ' DEF:d='.$rrd_filename.':Waiting:AVERAGE ';
$rrd_options .= ' COMMENT:"Connections Current Average Maximum\n" ';
$rrd_options .= "LINE1:a#22FF22:Active\ \ ";
$rrd_options .= " LINE1:a#22FF22:'Active '";
$rrd_options .= ' GPRINT:a:LAST:"%6.2lf %s" ';
$rrd_options .= ' GPRINT:a:AVERAGE:"%6.2lf %s" ';
$rrd_options .= ' GPRINT:a:MAX:"%6.2lf %s\n" ';

View File

@ -2,22 +2,23 @@
include("includes/graphs/common.inc.php");
$nginx_rrd = $config['rrd_dir'] . "/" . $device['hostname'] . "/app-nginx-".$app['app_id'].".rrd";
$rrd_filename = $config['rrd_dir'] . "/" . $device['hostname'] . "/app-nginx-".$app['app_id'].".rrd";
if (is_file($nginx_rrd))
if (is_file($rrd_filename))
{
$rrd_filename = $nginx_rrd;
}
$rrd_options .= ' -b 1000 ';
$rrd_options .= ' -l 0 ';
$rrd_options .= ' DEF:a='.$rrd_filename.':Requests:AVERAGE ';
$rrd_options .= " -b 1000 ";
$rrd_options .= " -l 0 ";
$rrd_options .= " DEF:a=".$rrd_filename.":Requests:AVERAGE";
$rrd_options .= 'COMMENT:"Requests Current Average Maximum\n" ';
$rrd_options .= " COMMENT:'Requests Current Average Maximum\\n'";
$rrd_options .= " LINE2:a#22FF22:'Requests '";
$rrd_options .= 'GPRINT:a:LAST:"%6.2lf %s" ';
$rrd_options .= 'GPRINT:a:AVERAGE:"%6.2lf %s" ';
$rrd_options .= 'GPRINT:a:MAX:"%6.2lf %s\n" ';
$rrd_options .= " GPRINT:a:LAST:'%6.2lf %s'";
$rrd_options .= " GPRINT:a:AVERAGE:'%6.2lf %s'";
$rrd_options .= " GPRINT:a:MAX:'%6.2lf %s\\n'";
} else {
$error_msg = "Missing RRD";
}
?>