From 688ea4518d748191ba882ef78a05ed63fd1fa14a Mon Sep 17 00:00:00 2001 From: Richard Kojedzinszky Date: Tue, 27 Oct 2015 10:26:38 +0100 Subject: [PATCH 1/2] I agree to the conditions of the Contributor Agreement contained in doc/General/Contributing.md --- AUTHORS.md | 1 + 1 file changed, 1 insertion(+) diff --git a/AUTHORS.md b/AUTHORS.md index f2d4c7d426..66d7a7ea98 100644 --- a/AUTHORS.md +++ b/AUTHORS.md @@ -64,5 +64,6 @@ Contributors to LibreNMS: - Donovan Bridoux (PandaWawawa) - Sebastian Neuner (9er) - Robert Zollner (Lupul) +- Richard Kojedzinszky (rkojedzinszky) [1]: http://observium.org/ "Observium web site" From 4fe6aeddcf1286ef05b06c008fa1e551e8ab1953 Mon Sep 17 00:00:00 2001 From: Richard Kojedzinszky Date: Tue, 27 Oct 2015 10:33:22 +0100 Subject: [PATCH 2/2] Using PERCENTNAN instead of PERCENT for 95th percentile line This modifies the existing lines in positive range a bit, but also enables drawing lines in the negative range when data is missing there. --- html/includes/graphs/generic_data.inc.php | 8 ++++---- html/includes/graphs/generic_multi_bits.inc.php | 12 ++++++------ html/includes/graphs/generic_multi_data.inc.php | 12 ++++++------ .../graphs/generic_multi_data_separated.inc.php | 6 +++--- html/includes/graphs/generic_multi_seperated.inc.php | 12 ++++++------ 5 files changed, 25 insertions(+), 25 deletions(-) diff --git a/html/includes/graphs/generic_data.inc.php b/html/includes/graphs/generic_data.inc.php index e13fce80c4..dbd79a1df3 100644 --- a/html/includes/graphs/generic_data.inc.php +++ b/html/includes/graphs/generic_data.inc.php @@ -78,16 +78,16 @@ $rrd_options .= ' CDEF:inbits_max=inoctets_max,8,*'; if ($config['rrdgraph_real_95th']) { $rrd_options .= ' CDEF:highbits=inoctets,outoctets,MAX,8,*'; - $rrd_options .= ' VDEF:95thhigh=highbits,95,PERCENT'; + $rrd_options .= ' VDEF:95thhigh=highbits,95,PERCENTNAN'; } $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 .= ' VDEF:d95thout=doutbits,5,PERCENT'; +$rrd_options .= ' VDEF:95thin=inbits,95,PERCENTNAN'; +$rrd_options .= ' VDEF:95thout=outbits,95,PERCENTNAN'; +$rrd_options .= ' VDEF:d95thout=doutbits,5,PERCENTNAN'; if ($format == 'octets' || $format == 'bytes') { $units = 'Bps'; diff --git a/html/includes/graphs/generic_multi_bits.inc.php b/html/includes/graphs/generic_multi_bits.inc.php index caa765e4dc..4775178b28 100644 --- a/html/includes/graphs/generic_multi_bits.inc.php +++ b/html/includes/graphs/generic_multi_bits.inc.php @@ -55,9 +55,9 @@ if ($i) { $rrd_options .= ' CDEF:inbits=inoctets,8,*'; $rrd_options .= ' CDEF:outbits=outoctets,8,*'; $rrd_options .= ' CDEF:doutbits=doutoctets,8,*'; - $rrd_options .= ' VDEF:95thin=inbits,95,PERCENT'; - $rrd_options .= ' VDEF:95thout=outbits,95,PERCENT'; - $rrd_options .= ' VDEF:d95thout=doutbits,5,PERCENT'; + $rrd_options .= ' VDEF:95thin=inbits,95,PERCENTNAN'; + $rrd_options .= ' VDEF:95thout=outbits,95,PERCENTNAN'; + $rrd_options .= ' VDEF:d95thout=doutbits,5,PERCENTNAN'; if ($_GET['previous'] == 'yes') { $rrd_options .= ' CDEF:'.$in.'octetsX='.$in_thingX.$pluses; @@ -66,9 +66,9 @@ if ($i) { $rrd_options .= ' CDEF:inbitsX=inoctetsX,8,*'; $rrd_options .= ' CDEF:outbitsX=outoctetsX,8,*'; $rrd_options .= ' CDEF:doutbitsX=doutoctetsX,8,*'; - $rrd_options .= ' VDEF:95thinX=inbitsX,95,PERCENT'; - $rrd_options .= ' VDEF:95thoutX=outbitsX,95,PERCENT'; - $rrd_options .= ' VDEF:d95thoutX=doutbitsX,5,PERCENT'; + $rrd_options .= ' VDEF:95thinX=inbitsX,95,PERCENTNAN'; + $rrd_options .= ' VDEF:95thoutX=outbitsX,95,PERCENTNAN'; + $rrd_options .= ' VDEF:d95thoutX=doutbitsX,5,PERCENTNAN'; } if ($legend == 'no' || $legend == '1') { diff --git a/html/includes/graphs/generic_multi_data.inc.php b/html/includes/graphs/generic_multi_data.inc.php index 90f5c908e0..1557eae3c5 100644 --- a/html/includes/graphs/generic_multi_data.inc.php +++ b/html/includes/graphs/generic_multi_data.inc.php @@ -64,9 +64,9 @@ if ($i) { $rrd_options .= ' CDEF:inbits=inoctets,8,*'; $rrd_options .= ' CDEF:outbits=outoctets,8,*'; $rrd_options .= ' CDEF:doutbits=doutoctets,8,*'; - $rrd_options .= ' VDEF:95thin=inbits,95,PERCENT'; - $rrd_options .= ' VDEF:95thout=outbits,95,PERCENT'; - $rrd_options .= ' VDEF:d95thout=doutbits,5,PERCENT'; + $rrd_options .= ' VDEF:95thin=inbits,95,PERCENTNAN'; + $rrd_options .= ' VDEF:95thout=outbits,95,PERCENTNAN'; + $rrd_options .= ' VDEF:d95thout=doutbits,5,PERCENTNAN'; if ($_GET['previous'] == 'yes') { $rrd_options .= ' CDEF:'.$in.'octetsX='.$in_thingX.$pluses; @@ -75,9 +75,9 @@ if ($i) { $rrd_options .= ' CDEF:inbitsX=inoctetsX,8,*'; $rrd_options .= ' CDEF:outbitsX=outoctetsX,8,*'; $rrd_options .= ' CDEF:doutbitsX=doutoctetsX,8,*'; - $rrd_options .= ' VDEF:95thinX=inbitsX,95,PERCENT'; - $rrd_options .= ' VDEF:95thoutX=outbitsX,95,PERCENT'; - $rrd_options .= ' VDEF:d95thoutX=doutbitsX,5,PERCENT'; + $rrd_options .= ' VDEF:95thinX=inbitsX,95,PERCENTNAN'; + $rrd_options .= ' VDEF:95thoutX=outbitsX,95,PERCENTNAN'; + $rrd_options .= ' VDEF:d95thoutX=doutbitsX,5,PERCENTNAN'; } if ($legend == 'no' || $legend == '1') { diff --git a/html/includes/graphs/generic_multi_data_separated.inc.php b/html/includes/graphs/generic_multi_data_separated.inc.php index 7865d03de5..9d28ba3c7e 100644 --- a/html/includes/graphs/generic_multi_data_separated.inc.php +++ b/html/includes/graphs/generic_multi_data_separated.inc.php @@ -109,9 +109,9 @@ if (!$nototal) { $rrd_options .= ' CDEF:outbits=outoctets,8,*'; $rrd_options .= ' CDEF:doutbits=doutoctets,8,*'; - $rrd_options .= ' VDEF:95thin=inbits,95,PERCENT'; - $rrd_options .= ' VDEF:95thout=outbits,95,PERCENT'; - $rrd_options .= ' VDEF:d95thout=doutbits,5,PERCENT'; + $rrd_options .= ' VDEF:95thin=inbits,95,PERCENTNAN'; + $rrd_options .= ' VDEF:95thout=outbits,95,PERCENTNAN'; + $rrd_options .= ' VDEF:d95thout=doutbits,5,PERCENTNAN'; $rrd_options .= ' VDEF:totin=inoctets,TOTAL'; $rrd_options .= ' VDEF:totout=outoctets,TOTAL'; diff --git a/html/includes/graphs/generic_multi_seperated.inc.php b/html/includes/graphs/generic_multi_seperated.inc.php index 9b37f37515..11b722b22e 100644 --- a/html/includes/graphs/generic_multi_seperated.inc.php +++ b/html/includes/graphs/generic_multi_seperated.inc.php @@ -109,9 +109,9 @@ if ($_GET['previous'] == 'yes') { $rrd_options .= ' CDEF:outbitsX=outBX,8,*'; $rrd_options .= ' CDEF:bitsX=inbitsX,outbitsX,+'; $rrd_options .= ' CDEF:doutbitsX=doutBX,8,*'; - $rrd_options .= ' VDEF:95thinX=inbitsX,95,PERCENT'; - $rrd_options .= ' VDEF:95thoutX=outbitsX,95,PERCENT'; - $rrd_options .= ' VDEF:d95thoutX=doutbitsX,5,PERCENT'; + $rrd_options .= ' VDEF:95thinX=inbitsX,95,PERCENTNAN'; + $rrd_options .= ' VDEF:95thoutX=outbitsX,95,PERCENTNAN'; + $rrd_options .= ' VDEF:d95thoutX=doutbitsX,5,PERCENTNAN'; } if ($_GET['previous'] == 'yes') { @@ -130,9 +130,9 @@ if (!$args['nototal']) { $rrd_options .= ' CDEF:outbits=outB,8,*'; $rrd_options .= ' CDEF:bits=inbits,outbits,+'; $rrd_options .= ' CDEF:doutbits=doutB,8,*'; - $rrd_options .= ' VDEF:95thin=inbits,95,PERCENT'; - $rrd_options .= ' VDEF:95thout=outbits,95,PERCENT'; - $rrd_options .= ' VDEF:d95thout=doutbits,5,PERCENT'; + $rrd_options .= ' VDEF:95thin=inbits,95,PERCENTNAN'; + $rrd_options .= ' VDEF:95thout=outbits,95,PERCENTNAN'; + $rrd_options .= ' VDEF:d95thout=doutbits,5,PERCENTNAN'; $rrd_options .= ' VDEF:totin=inB,TOTAL'; $rrd_options .= ' VDEF:avein=inbits,AVERAGE'; $rrd_options .= ' VDEF:totout=outB,TOTAL';