From a2142d5cb207348348ddac3c949e3e62941d6eac Mon Sep 17 00:00:00 2001 From: "Cupid@zul" Date: Thu, 23 Sep 2021 13:43:23 +0100 Subject: [PATCH] Fix graphs showing bps instead of pps (#13266) * fix issue #13119 try to detect if total_units exists (variable comes from errors.inc.php and nupkts.inc.php ) as 'pps' and define graph units as such. * standardize units_descr for both ucastpackets and errors --- includes/html/graphs/generic_multi_seperated.inc.php | 6 +++++- includes/html/graphs/port/nupkts.inc.php | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/includes/html/graphs/generic_multi_seperated.inc.php b/includes/html/graphs/generic_multi_seperated.inc.php index 3d12033ac5..bbb9a36e68 100644 --- a/includes/html/graphs/generic_multi_seperated.inc.php +++ b/includes/html/graphs/generic_multi_seperated.inc.php @@ -37,7 +37,11 @@ if ($format == 'octets' || $format == 'bytes') { $units = 'Bps'; $format = 'bits'; } else { - $units = 'bps'; + if (isset($total_units) && $total_units == 'pps') { + $units = 'pps'; + } else { + $units = 'bps'; + } $format = 'bits'; } diff --git a/includes/html/graphs/port/nupkts.inc.php b/includes/html/graphs/port/nupkts.inc.php index 2c9e1cad78..ee03d78c75 100644 --- a/includes/html/graphs/port/nupkts.inc.php +++ b/includes/html/graphs/port/nupkts.inc.php @@ -19,7 +19,7 @@ $rrd_list[4]['colour_area_in'] = 'FACF5A'; $rrd_list[4]['colour_area_out'] = 'FF5959'; $units = ''; -$units_descr = 'Packets'; +$units_descr = 'Packets/sec'; $total_units = 'pps'; $colours_in = 'purples'; $multiplier = '1';