mirror of
https://github.com/librenms/librenms.git
synced 2024-10-07 16:52:45 +00:00
FIX 95th percent lines in negative range
This commit is contained in:
committed by
Richard Kojedzinszky
parent
8196b19096
commit
ca595e1e9d
@@ -87,7 +87,7 @@ $rrd_options .= ' VDEF:tot=octets,TOTAL';
|
|||||||
|
|
||||||
$rrd_options .= ' VDEF:95thin=inbits,95,PERCENT';
|
$rrd_options .= ' VDEF:95thin=inbits,95,PERCENT';
|
||||||
$rrd_options .= ' VDEF:95thout=outbits,95,PERCENT';
|
$rrd_options .= ' VDEF:95thout=outbits,95,PERCENT';
|
||||||
$rrd_options .= ' VDEF:d95thout=doutbits,5,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') {
|
if ($format == 'octets' || $format == 'bytes') {
|
||||||
$units = 'Bps';
|
$units = 'Bps';
|
||||||
|
@@ -57,7 +57,7 @@ if ($i) {
|
|||||||
$rrd_options .= ' CDEF:doutbits=doutoctets,8,*';
|
$rrd_options .= ' CDEF:doutbits=doutoctets,8,*';
|
||||||
$rrd_options .= ' VDEF:95thin=inbits,95,PERCENT';
|
$rrd_options .= ' VDEF:95thin=inbits,95,PERCENT';
|
||||||
$rrd_options .= ' VDEF:95thout=outbits,95,PERCENT';
|
$rrd_options .= ' VDEF:95thout=outbits,95,PERCENT';
|
||||||
$rrd_options .= ' VDEF:d95thout=doutbits,5,PERCENT';
|
$rrd_options .= ' CDEF:d95thoutn=doutbits,-1,* VDEF:d95thoutn95=d95thoutn,95,PERCENT CDEF:d95thoutn95n=doutbits,doutbits,-,d95thoutn95,-1,*,+ VDEF:d95thout=d95thoutn95n,FIRST';
|
||||||
|
|
||||||
if ($_GET['previous'] == 'yes') {
|
if ($_GET['previous'] == 'yes') {
|
||||||
$rrd_options .= ' CDEF:'.$in.'octetsX='.$in_thingX.$pluses;
|
$rrd_options .= ' CDEF:'.$in.'octetsX='.$in_thingX.$pluses;
|
||||||
@@ -68,7 +68,7 @@ if ($i) {
|
|||||||
$rrd_options .= ' CDEF:doutbitsX=doutoctetsX,8,*';
|
$rrd_options .= ' CDEF:doutbitsX=doutoctetsX,8,*';
|
||||||
$rrd_options .= ' VDEF:95thinX=inbitsX,95,PERCENT';
|
$rrd_options .= ' VDEF:95thinX=inbitsX,95,PERCENT';
|
||||||
$rrd_options .= ' VDEF:95thoutX=outbitsX,95,PERCENT';
|
$rrd_options .= ' VDEF:95thoutX=outbitsX,95,PERCENT';
|
||||||
$rrd_options .= ' VDEF:d95thoutX=doutbitsX,5,PERCENT';
|
$rrd_options .= ' CDEF:d95thoutXn=doutbitsX,-1,* VDEF:d95thoutXn95=d95thoutXn,95,PERCENT CDEF:d95thoutXn95n=doutbitsX,doutbitsX,-,d95thoutXn95,-1,*,+ VDEF:d95thoutX=d95thoutXn95n,FIRST';
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($legend == 'no' || $legend == '1') {
|
if ($legend == 'no' || $legend == '1') {
|
||||||
|
@@ -66,7 +66,7 @@ if ($i) {
|
|||||||
$rrd_options .= ' CDEF:doutbits=doutoctets,8,*';
|
$rrd_options .= ' CDEF:doutbits=doutoctets,8,*';
|
||||||
$rrd_options .= ' VDEF:95thin=inbits,95,PERCENT';
|
$rrd_options .= ' VDEF:95thin=inbits,95,PERCENT';
|
||||||
$rrd_options .= ' VDEF:95thout=outbits,95,PERCENT';
|
$rrd_options .= ' VDEF:95thout=outbits,95,PERCENT';
|
||||||
$rrd_options .= ' VDEF:d95thout=doutbits,5,PERCENT';
|
$rrd_options .= ' CDEF:d95thoutn=doutbits,-1,* VDEF:d95thoutn95=d95thoutn,95,PERCENT CDEF:d95thoutn95n=doutbits,doutbits,-,d95thoutn95,-1,*,+ VDEF:d95thout=d95thoutn95n,FIRST';
|
||||||
|
|
||||||
if ($_GET['previous'] == 'yes') {
|
if ($_GET['previous'] == 'yes') {
|
||||||
$rrd_options .= ' CDEF:'.$in.'octetsX='.$in_thingX.$pluses;
|
$rrd_options .= ' CDEF:'.$in.'octetsX='.$in_thingX.$pluses;
|
||||||
@@ -77,7 +77,7 @@ if ($i) {
|
|||||||
$rrd_options .= ' CDEF:doutbitsX=doutoctetsX,8,*';
|
$rrd_options .= ' CDEF:doutbitsX=doutoctetsX,8,*';
|
||||||
$rrd_options .= ' VDEF:95thinX=inbitsX,95,PERCENT';
|
$rrd_options .= ' VDEF:95thinX=inbitsX,95,PERCENT';
|
||||||
$rrd_options .= ' VDEF:95thoutX=outbitsX,95,PERCENT';
|
$rrd_options .= ' VDEF:95thoutX=outbitsX,95,PERCENT';
|
||||||
$rrd_options .= ' VDEF:d95thoutX=doutbitsX,5,PERCENT';
|
$rrd_options .= ' CDEF:d95thoutXn=doutbitsX,-1,* VDEF:d95thoutXn95=d95thoutXn,95,PERCENT CDEF:d95thoutXn95n=doutbitsX,doutbitsX,-,d95thoutXn95,-1,*,+ VDEF:d95thoutX=d95thoutXn95n,FIRST';
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($legend == 'no' || $legend == '1') {
|
if ($legend == 'no' || $legend == '1') {
|
||||||
|
@@ -111,7 +111,7 @@ if (!$nototal) {
|
|||||||
|
|
||||||
$rrd_options .= ' VDEF:95thin=inbits,95,PERCENT';
|
$rrd_options .= ' VDEF:95thin=inbits,95,PERCENT';
|
||||||
$rrd_options .= ' VDEF:95thout=outbits,95,PERCENT';
|
$rrd_options .= ' VDEF:95thout=outbits,95,PERCENT';
|
||||||
$rrd_options .= ' VDEF:d95thout=doutbits,5,PERCENT';
|
$rrd_options .= ' CDEF:d95thoutn=doutbits,-1,* VDEF:d95thoutn95=d95thoutn,95,PERCENT CDEF:d95thoutn95n=doutbits,doutbits,-,d95thoutn95,-1,*,+ VDEF:d95thout=d95thoutn95n,FIRST';
|
||||||
|
|
||||||
$rrd_options .= ' VDEF:totin=inoctets,TOTAL';
|
$rrd_options .= ' VDEF:totin=inoctets,TOTAL';
|
||||||
$rrd_options .= ' VDEF:totout=outoctets,TOTAL';
|
$rrd_options .= ' VDEF:totout=outoctets,TOTAL';
|
||||||
|
@@ -111,7 +111,7 @@ if ($_GET['previous'] == 'yes') {
|
|||||||
$rrd_options .= ' CDEF:doutbitsX=doutBX,8,*';
|
$rrd_options .= ' CDEF:doutbitsX=doutBX,8,*';
|
||||||
$rrd_options .= ' VDEF:95thinX=inbitsX,95,PERCENT';
|
$rrd_options .= ' VDEF:95thinX=inbitsX,95,PERCENT';
|
||||||
$rrd_options .= ' VDEF:95thoutX=outbitsX,95,PERCENT';
|
$rrd_options .= ' VDEF:95thoutX=outbitsX,95,PERCENT';
|
||||||
$rrd_options .= ' VDEF:d95thoutX=doutbitsX,5,PERCENT';
|
$rrd_options .= ' CDEF:d95thoutXn=doutbitsX,-1,* VDEF:d95thoutXn95=d95thoutXn,95,PERCENT CDEF:d95thoutXn95n=doutbitsX,doutbitsX,-,d95thoutXn95,-1,*,+ VDEF:d95thoutX=d95thoutXn95n,FIRST';
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($_GET['previous'] == 'yes') {
|
if ($_GET['previous'] == 'yes') {
|
||||||
@@ -132,7 +132,7 @@ if (!$args['nototal']) {
|
|||||||
$rrd_options .= ' CDEF:doutbits=doutB,8,*';
|
$rrd_options .= ' CDEF:doutbits=doutB,8,*';
|
||||||
$rrd_options .= ' VDEF:95thin=inbits,95,PERCENT';
|
$rrd_options .= ' VDEF:95thin=inbits,95,PERCENT';
|
||||||
$rrd_options .= ' VDEF:95thout=outbits,95,PERCENT';
|
$rrd_options .= ' VDEF:95thout=outbits,95,PERCENT';
|
||||||
$rrd_options .= ' VDEF:d95thout=doutbits,5,PERCENT';
|
$rrd_options .= ' CDEF:d95thoutn=doutbits,-1,* VDEF:d95thoutn95=d95thoutn,95,PERCENT CDEF:d95thoutn95n=doutbits,doutbits,-,d95thoutn95,-1,*,+ VDEF:d95thout=d95thoutn95n,FIRST';
|
||||||
$rrd_options .= ' VDEF:totin=inB,TOTAL';
|
$rrd_options .= ' VDEF:totin=inB,TOTAL';
|
||||||
$rrd_options .= ' VDEF:avein=inbits,AVERAGE';
|
$rrd_options .= ' VDEF:avein=inbits,AVERAGE';
|
||||||
$rrd_options .= ' VDEF:totout=outB,TOTAL';
|
$rrd_options .= ' VDEF:totout=outB,TOTAL';
|
||||||
|
Reference in New Issue
Block a user