Port parsing better asymmetric speed handling

Add support to generic_data graph (port_bits)
share with custom map code

Author: murrant

app/Http/Controllers/Maps/CustomMapDataController.php

@@ -79,36 +79,11 @@ public function get(Request $request, CustomMap $map): JsonResponse
                 $edges[$edgeid]['port_name'] = $edge->port->device->displayName() . ' - ' . $edge->port->getLabel();
                 $edges[$edgeid]['port_info'] = Blade::render('<x-port-link-map :port="$port" />', ['port' => $edge->port]);
 
-                // Work out speed to and from
-                $speedto = 0;
-                $speedfrom = 0;
-                $rateto = 0;
-                $ratefrom = 0;
-
-                // Try to interpret the SNMP speeds
-                if ($edge->port->port_descr_speed) {
-                    $speed_parts = explode('/', (string) $edge->port->port_descr_speed, 2);
-
-                    if (count($speed_parts) == 1) {
-                        $speedto = $this->snmpSpeed($speed_parts[0]);
-                        $speedfrom = $speedto;
-                    } elseif ($edge->reverse) {
-                        $speedto = $this->snmpSpeed($speed_parts[1]);
-                        $speedfrom = $this->snmpSpeed($speed_parts[0]);
-                    } else {
-                        $speedto = $this->snmpSpeed($speed_parts[0]);
-                        $speedfrom = $this->snmpSpeed($speed_parts[1]);
-                    }
-                    if ($speedto == 0 || $speedfrom == 0) {
-                        $speedto = 0;
-                        $speedfrom = 0;
-                    }
-                }
-
-                // If we did not get a speed from the snmp desc, use the deteced speed
-                if ($speedto == 0 && $edge->port->ifSpeed) {
-                    $speedto = $edge->port->ifSpeed;
-                    $speedfrom = $edge->port->ifSpeed;
+                // Get speed to and from
+                if ($edge->reverse) {
+                    [$speedto, $speedfrom] = $edge->port->getSpeeds();
+                } else {
+                    [$speedfrom, $speedto] = $edge->port->getSpeeds();
                 }
 
                 // Get the to/from rates
@@ -339,12 +314,6 @@ private function rateString(int $rate): string
         return Number::formatSi($rate, 2, 3, 'bps');
     }
 
-    private function snmpSpeed(string $speeds): int
-    {
-        // Only succeed if the string starts with a number optionally followed by a unit, return 0 for non-parsable
-        return (int) Number::toBytes($speeds);
-    }
-
     private function fixedColour(array $colours, float $pct): string
     {
         $last_colour = 'black';

app/Models/Port.php

@@ -12,6 +12,7 @@
 use Illuminate\Database\Eloquent\Relations\MorphMany;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Str;
+use LibreNMS\Util\Number;
 use LibreNMS\Util\Rewrite;
 use Permissions;
 
@@ -130,6 +131,28 @@ public function getDescription(): string
         return (string) $this->ifAlias;
     }
 
+    /**
+     * Get port speeds, respecting parsed interface circuit speeds as bps
+     * @return array{int, int} [egress bps, ingress bps]
+     */
+    public function getSpeeds(): array
+    {
+        $egress = $ingress = (int) $this->ifSpeed;
+
+        if (! empty($this->port_descr_speed)) {
+            $speed_parts = explode('/', $this->port_descr_speed, 2);
+            $parsed_egress = Number::toBytes($speed_parts[0]);
+            $parsed_ingress = isset($speed_parts[1]) ? Number::toBytes($speed_parts[1]) : $parsed_egress;
+
+            if ($parsed_egress > 0 && $parsed_ingress > 0) {
+                $egress = $parsed_egress;
+                $ingress = $parsed_ingress;
+            }
+        }
+
+        return [$egress, $ingress];
+    }
+
     /**
      * Check if user can access this port.
      *

includes/html/graphs/generic_data.inc.php

@@ -19,7 +19,6 @@
 
 require 'includes/html/graphs/common.inc.php';
 
-$stacked = generate_stacked_graphs(! empty($port['ifSpeed']) && ($vars['port_speed_zoom'] ?? LibrenmsConfig::get('graphs.port_speed_zoom')));
 $inverse ??= false;
 $multiplier ??= false;
 $format ??= '';
@@ -31,10 +30,13 @@
 if ($inverse) {
     $in = 'out';
     $out = 'in';
+    [$ingress_speed, $egress_speed] = PortCache::get($port['port_id'])->getSpeeds();
 } else {
     $in = 'in';
     $out = 'out';
+    [$egress_speed, $ingress_speed] = PortCache::get($port['port_id'])->getSpeeds();
 }
+$stacked = generate_stacked_graphs(($egress_speed || $ingress_speed) && ($vars['port_speed_zoom'] ?? LibrenmsConfig::get('graphs.port_speed_zoom')));
 
 if ($multiplier) {
     $rrd_options .= ' DEF:p' . $out . 'octets=' . $rrd_filename_out . ':' . $ds_out . ':AVERAGE';
@@ -167,9 +169,13 @@
 $rrd_options .= ' LINE1:percentile_in#aa0000';
 $rrd_options .= ' LINE1:dpercentile_out#aa0000';
 
-if (! empty($port['ifSpeed'])) {
-    $speed_line_type = ($vars['port_speed_zoom'] ?? LibrenmsConfig::get('graphs.port_speed_zoom')) ? 'LINE2' : 'HRULE';
-    $rrd_options .= " $speed_line_type:{$port['ifSpeed']}#000000:'Port Speed " . Number::formatSi($port['ifSpeed'], 2, 0, 'bps') . "\\n'";
+
+$speed_line_type = ($vars['port_speed_zoom'] ?? LibrenmsConfig::get('graphs.port_speed_zoom')) ? 'LINE2' : 'HRULE';
+if ($egress_speed && $ingress_speed && $ingress_speed != $egress_speed) {
+    $rrd_options .= " $speed_line_type:$ingress_speed#000000:'In Port Speed " . Number::formatSi($ingress_speed, 2, 0, 'bps') . "\\n'";
+    $rrd_options .= " $speed_line_type:-$egress_speed#000000:'Out Port Speed " . Number::formatSi($egress_speed, 2, 0, 'bps') . "\\n'";
+} elseif ($egress_speed) {
+    $rrd_options .= " $speed_line_type:$egress_speed#000000:'Port Speed " . Number::formatSi($egress_speed, 2, 0, 'bps') . "\\n'";
 }
 
 // Linear prediction of trend