From 0400fd7f4aac8f73a78bd5c9ec41673d420616b8 Mon Sep 17 00:00:00 2001 From: Tony Murray Date: Mon, 23 Sep 2024 06:57:41 -0500 Subject: [PATCH] Add orderBy to ospf module db dumps --- LibreNMS/Modules/Ospf.php | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/LibreNMS/Modules/Ospf.php b/LibreNMS/Modules/Ospf.php index 9446c2b1b38c..ab49ccc7186e 100644 --- a/LibreNMS/Modules/Ospf.php +++ b/LibreNMS/Modules/Ospf.php @@ -277,10 +277,17 @@ public function dump(Device $device, string $type): ?array 'ospf_ports' => $device->ospfPorts() ->leftJoin('ports', 'ospf_ports.port_id', 'ports.port_id') ->select(['ospf_ports.*', 'ifIndex']) + ->orderBy('ospf_port_id')->orderBy('context_name') ->get()->map->makeHidden(['id', 'device_id', 'port_id']), - 'ospf_instances' => $device->ospfInstances->map->makeHidden(['id', 'device_id']), - 'ospf_areas' => $device->ospfAreas->map->makeHidden(['id', 'device_id']), - 'ospf_nbrs' => $device->ospfNbrs->map->makeHidden(['id', 'device_id']), + 'ospf_instances' => $device->ospfInstances() + ->orderBy('ospf_instance_id')->orderBy('context_name') + ->get()->map->makeHidden(['id', 'device_id']), + 'ospf_areas' => $device->ospfAreas() + ->orderBy('ospfAreaId')->orderBy('context_name') + ->get()->map->makeHidden(['id', 'device_id']), + 'ospf_nbrs' => $device->ospfNbrs() + ->orderBy('ospf_nbr_id')->orderBy('context_name') + ->get()->map->makeHidden(['id', 'device_id']), ]; } }