Merge pull request #4834 from srimohans/support_bundle

tools: Modifications to copy support bundle files
This commit is contained in:
Donald Sharp 2019-09-14 07:47:26 -04:00 committed by GitHub
commit 8e0bab8a1e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 16 additions and 3 deletions

View File

@ -1 +1,2 @@
usr/lib/frr/frr-reload.py usr/lib/frr/frr-reload.py
usr/lib/frr/generate_support_bundle.py

1
debian/rules vendored
View File

@ -71,6 +71,7 @@ override_dh_auto_install:
dh_auto_install dh_auto_install
sed -e '1c #!/usr/bin/python3' -i debian/tmp/usr/lib/frr/frr-reload.py sed -e '1c #!/usr/bin/python3' -i debian/tmp/usr/lib/frr/frr-reload.py
sed -e '1c #!/usr/bin/python3' -i debian/tmp/usr/lib/frr/generate_support_bundle.py
# let dh_systemd_* and dh_installinit do their thing automatically # let dh_systemd_* and dh_installinit do their thing automatically
ifeq ($(filter pkg.frr.nosystemd,$(DEB_BUILD_PROFILES)),) ifeq ($(filter pkg.frr.nosystemd,$(DEB_BUILD_PROFILES)),)

View File

@ -656,6 +656,9 @@ fi
%files pythontools %files pythontools
%{_sbindir}/generate_support_bundle.py
%{_sbindir}/generate_support_bundle.pyc
%{_sbindir}/generate_support_bundle.pyo
%{_sbindir}/frr-reload.py %{_sbindir}/frr-reload.py
%{_sbindir}/frr-reload.pyc %{_sbindir}/frr-reload.pyc
%{_sbindir}/frr-reload.pyo %{_sbindir}/frr-reload.pyo

View File

@ -28,6 +28,7 @@ show bgp ipv6 update-groups advertised-routes
show bgp ipv6 update-groups packet-queue show bgp ipv6 update-groups packet-queue
show bgp ipv6 update-groups statistics show bgp ipv6 update-groups statistics
show ip bgp statistics show ip bgp statistics
show bgp martian next-hop
show bgp evpn route show bgp evpn route
CMD_LIST_END CMD_LIST_END
@ -37,14 +38,17 @@ PROC_NAME:zebra
CMD_LIST_START CMD_LIST_START
show zebra show zebra
show zebra client summary show zebra client summary
show ip route show ip zebra route dump json
show ipv6 zebra route dump json
show ip nht vrf all
show route-map show route-map
show memory show memory
show interface show interface vrf all
show vrf show vrf
show zebra fpm stats
show error all show error all
show work-queues show work-queues
show debugging hashtable
show running-config show running-config
show thread cpu show thread cpu
show thread poll show thread poll

2
tools/generate_support_bundle.py Normal file → Executable file
View File

@ -1,3 +1,5 @@
#!/usr/bin/python
######################################################## ########################################################
### Python Script to generate the FRR support bundle ### ### Python Script to generate the FRR support bundle ###
######################################################## ########################################################

View File

@ -16,6 +16,7 @@ sbin_SCRIPTS += \
\ \
tools/frrcommon.sh \ tools/frrcommon.sh \
tools/frrinit.sh \ tools/frrinit.sh \
tools/generate_support_bundle.py \
tools/watchfrr.sh \ tools/watchfrr.sh \
# end # end
@ -35,6 +36,7 @@ EXTRA_DIST += \
tools/frr-reload \ tools/frr-reload \
tools/frr-reload.py \ tools/frr-reload.py \
tools/frr.service \ tools/frr.service \
tools/generate_support_bundle.py \
tools/multiple-bgpd.sh \ tools/multiple-bgpd.sh \
tools/rrcheck.pl \ tools/rrcheck.pl \
tools/rrlookup.pl \ tools/rrlookup.pl \