Fix bill graph 95th percentile calculation under ONLY_FULL_GROUP_BY (librenms#20102)

Author: Gez7

LibreNMS/Billing.php

@@ -132,26 +132,26 @@ public static function getLastMeasurement($bill_id): array
 
     private static function get95thagg($bill_id, $datefrom, $dateto): float
     {
-        $sum_data = dbFetchRows('SELECT (SUM(delta) / SUM(period) * 8) as rate, FROM_UNIXTIME(FLOOR(UNIX_TIMESTAMP(`timestamp`) / 300) * 300) AS bucket_start,   DATE_ADD(FROM_UNIXTIME(FLOOR(UNIX_TIMESTAMP(`timestamp`) / 300) * 300), INTERVAL 5 MINUTE) AS bucket_end,SUM(delta) as delta_sum FROM bill_data WHERE bill_id = ? AND timestamp > ? AND timestamp <= ? GROUP BY bill_id, bucket_start ORDER BY rate ASC', [$bill_id, $datefrom, $dateto]);
-        $measurement_95th = (round(count($sum_data) / 100 * 95) - 2);
+        $sum_data = dbFetchRows('SELECT (SUM(delta) / SUM(period) * 8) as rate, FROM_UNIXTIME(FLOOR(UNIX_TIMESTAMP(`timestamp`) / 300) * 300) AS bucket_start FROM bill_data WHERE bill_id = ? AND timestamp > ? AND timestamp <= ? GROUP BY bill_id, bucket_start ORDER BY rate ASC', [$bill_id, $datefrom, $dateto]);
+        $measurement_95th = max(0, (int) round(count($sum_data) / 100 * 95) - 2);
 
-        return round($sum_data[$measurement_95th]['rate'], 2);
+        return round($sum_data[$measurement_95th]['rate'] ?? 0, 2);
     }
 
     private static function get95thIn($bill_id, $datefrom, $dateto): float
     {
-        $sum_data = dbFetchRows('SELECT (SUM(in_delta) / SUM(period) * 8) as rate, FROM_UNIXTIME(FLOOR(UNIX_TIMESTAMP(`timestamp`) / 300) * 300) AS bucket_start,   DATE_ADD(FROM_UNIXTIME(FLOOR(UNIX_TIMESTAMP(`timestamp`) / 300) * 300), INTERVAL 5 MINUTE) AS bucket_end,SUM(in_delta) as delta_sum FROM bill_data WHERE bill_id = ? AND timestamp > ? AND timestamp <= ? GROUP BY bill_id, bucket_start ORDER BY rate ASC', [$bill_id, $datefrom, $dateto]);
-        $measurement_95th = (round(count($sum_data) / 100 * 95) - 2);
+        $sum_data = dbFetchRows('SELECT (SUM(in_delta) / SUM(period) * 8) as rate, FROM_UNIXTIME(FLOOR(UNIX_TIMESTAMP(`timestamp`) / 300) * 300) AS bucket_start FROM bill_data WHERE bill_id = ? AND timestamp > ? AND timestamp <= ? GROUP BY bill_id, bucket_start ORDER BY rate ASC', [$bill_id, $datefrom, $dateto]);
+        $measurement_95th = max(0, (int) round(count($sum_data) / 100 * 95) - 2);
 
-        return round($sum_data[$measurement_95th]['rate'], 2);
+        return round($sum_data[$measurement_95th]['rate'] ?? 0, 2);
     }
 
     private static function get95thout($bill_id, $datefrom, $dateto): float
     {
-        $sum_data = dbFetchRows('SELECT (SUM(out_delta) / SUM(period) * 8) as rate, FROM_UNIXTIME(FLOOR(UNIX_TIMESTAMP(`timestamp`) / 300) * 300) AS bucket_start,   DATE_ADD(FROM_UNIXTIME(FLOOR(UNIX_TIMESTAMP(`timestamp`) / 300) * 300), INTERVAL 5 MINUTE) AS bucket_end,SUM(out_delta) as delta_sum FROM bill_data WHERE bill_id = ? AND timestamp > ? AND timestamp <= ? GROUP BY bill_id, bucket_start ORDER BY rate ASC', [$bill_id, $datefrom, $dateto]);
-        $measurement_95th = (round(count($sum_data) / 100 * 95) - 2);
+        $sum_data = dbFetchRows('SELECT (SUM(out_delta) / SUM(period) * 8) as rate, FROM_UNIXTIME(FLOOR(UNIX_TIMESTAMP(`timestamp`) / 300) * 300) AS bucket_start FROM bill_data WHERE bill_id = ? AND timestamp > ? AND timestamp <= ? GROUP BY bill_id, bucket_start ORDER BY rate ASC', [$bill_id, $datefrom, $dateto]);
+        $measurement_95th = max(0, (int) round(count($sum_data) / 100 * 95) - 2);
 
-        return round($sum_data[$measurement_95th]['rate'], 2);
+        return round($sum_data[$measurement_95th]['rate'] ?? 0, 2);
     }
 
     public static function getRates($bill_id, $datefrom, $dateto, $dir_95th): array