1 files changed, 15 insertions, 12 deletions
diff --git a/tools/etc/frr/support_bundle_commands.conf b/tools/etc/frr/support_bundle_commands.conf
index 11f88e7101..087c35981d 100644
--- a/tools/etc/frr/support_bundle_commands.conf
+++ b/tools/etc/frr/support_bundle_commands.conf
@@ -8,17 +8,17 @@
 PROC_NAME:bgp
 CMD_LIST_START
 show bgp summary
-show ip bgp
-show ip bgp neighbors
-show ip bgp summary
-show ip bgp statistics
+show bgp ipv4 uni
+show bgp ipv4 neighbors
+show bgp ipv4 summary
+show bgp ipv4 statistics
 
-show ip bgp update-groups advertise-queue
-show ip bgp update-groups advertised-routes
-show ip bgp update-groups packet-queue
-show ip bgp update-groups statistics
-show ip bgp peer-group
-show ip bgp memory
+show bgp ipv4 update-groups advertise-queue
+show bgp ipv4 update-groups advertised-routes
+show bgp ipv4 update-groups packet-queue
+show bgp ipv4 update-groups statistics
+show bgp peer-group
+show bgp memory
 
 show bgp ipv6
 show bgp ipv6 neighbors
@@ -27,8 +27,9 @@ show bgp ipv6 update-groups advertise-queue
 show bgp ipv6 update-groups advertised-routes
 show bgp ipv6 update-groups packet-queue
 show bgp ipv6 update-groups statistics
-show ip bgp statistics
+show bgp ipv6 statistics
 show bgp martian next-hop
+show bgp nexthop
 
 show bgp evpn route
 CMD_LIST_END
@@ -38,13 +39,15 @@ PROC_NAME:zebra
 CMD_LIST_START
 show zebra
 show zebra client summary
+show zebra router table summary
 show ip nht vrf all
+show ipv6 nht vrf all
+show nexthop-group rib
 show route-map
 show memory
 show interface vrf all
 show vrf
 show zebra fpm stats
-show error all
 show work-queues
 show debugging hashtable
 show running-config