mirror/librenms-librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-10-07 16:52:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into rrd-create-remote

Browse Source
This commit is contained in:
Tony Murray
2016-07-07 21:28:47 -05:00
parent 57650e4ffc 4a3b1a1420
commit a1ab19047e
111 changed files with 50858 additions and 311 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
html/includes/graphs/common.inc.php
View File

@@ -90,6 +90,10 @@ if ($_GET['bg']) {
$rrd_options .= ' -c CANVAS#'.mres($_GET['bg']).' ';
}
if ($_GET['font']) {
$rrd_options .= ' -c FONT#'.mres($_GET['font']).' ';
}
// $rrd_options .= " -c BACK#FFFFFF";
if ($height < '99') {
$rrd_options .= ' --only-graph';

6
html/includes/graphs/generic_data.inc.php
View File

@@ -85,15 +85,17 @@ $rrd_options .= ' VDEF:totin=inoctets,TOTAL';
$rrd_options .= ' VDEF:totout=outoctets,TOTAL';
$rrd_options .= ' VDEF:tot=octets,TOTAL';
$rrd_options .= ' VDEF:95thin=inbits,95,PERCENT';
$rrd_options .= ' VDEF:95thout=outbits,95,PERCENT';
$rrd_options .= ' CDEF:d95thoutn=doutbits,-1,* VDEF:d95thoutn95=d95thoutn,95,PERCENT CDEF:d95thoutn95n=doutbits,doutbits,-,d95thoutn95,-1,*,+ VDEF:d95thout=d95thoutn95n,FIRST';
if ($format == 'octets' || $format == 'bytes') {
$rrd_options .= ' VDEF:95thin=inoctets,95,PERCENT';
$rrd_options .= ' VDEF:95thout=outoctets,95,PERCENT';
$units = 'Bps';
$format = 'octets';
}
else {
$rrd_options .= ' VDEF:95thin=inbits,95,PERCENT';
$rrd_options .= ' VDEF:95thout=outbits,95,PERCENT';
$units = 'bps';
$format = 'bits';
}