Skip to content

Commit 84461fd

Browse files
author
Francisco Augusto
committed
Merge branch 'trk' of https://github.com/melignus/awesome-sysadmin into melignus-trk
2 parents dcedf8f + a3a5fcd commit 84461fd

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

README.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -420,12 +420,16 @@ Comparison of NoSQL servers: http://kkovacs.eu/cassandra-vs-mongodb-vs-couchdb-v
420420
* [TheBugGenie](http://www.thebuggenie.com) - Open source ticket system with extremely complete users rights granularity.
421421

422422
## Troubleshooting
423-
*Troubleshooting Tools.*
423+
*Troubleshooting tools.*
424424

425425
* [mitmproxy](http://mitmproxy.org/) - A Python tool used for intercepting, viewing and modifying network traffic. Invaluable in troubleshooting certain problems.
426426
* [Sysdig](http://www.sysdig.org/) - Capture system state and activity from a running Linux instance, then save, filter and analyze.
427427
* [Wireshark](http://www.wireshark.org/) - The world's foremost network protocol analyzer.
428428

429+
*Troubleshooting distributions.*
430+
431+
* [TRK](http://trinityhome.org) - Linux toolkit as a livecd for general computer troubleshooting. Useful for Win, Linux, and OSX.
432+
429433
## Project Management
430434
*Web-based project management and bug tracking systems.*
431435

0 commit comments

Comments
 (0)