Merge remote-tracking branch 'kickball/pr/45' into next

pull/43/merge
nodiscc 10 years ago
commit 9e598c1b89

@ -252,6 +252,7 @@ See also [Static Site Generators](#static-site-generators)
* [adminer](http://www.adminer.org/) - Database management in a single PHP file ([Source code](https://github.com/vrana/adminer)) * [adminer](http://www.adminer.org/) - Database management in a single PHP file ([Source code](https://github.com/vrana/adminer))
* [Icinga / Icinga 2](https://www.icinga.org/) - Nagios fork that has since lapped nagios several times. Comes with the possibility of clustered monitoring - ([SourceCode](https://github.com/Icinga)) - `GPLv2` * [Icinga / Icinga 2](https://www.icinga.org/) - Nagios fork that has since lapped nagios several times. Comes with the possibility of clustered monitoring - ([SourceCode](https://github.com/Icinga)) - `GPLv2`
* [linux-dash](https://github.com/afaqurk/linux-dash) - A drop-in, low-overhead monitoring web dashboard for a linux machine ([Demo](http://afaq.dreamhosters.com/linux-dash/)) * [linux-dash](https://github.com/afaqurk/linux-dash) - A drop-in, low-overhead monitoring web dashboard for a linux machine ([Demo](http://afaq.dreamhosters.com/linux-dash/))
* [LibreNMS](http://www.librenms.org/) - Community-based GPL-licensed network monitoring system - `GPL-v3.0`
* [Nagios](https://www.nagios.org/) - Industry standard monitoring software, which has a lot of plugins and customisation posibilities. - `GPL` * [Nagios](https://www.nagios.org/) - Industry standard monitoring software, which has a lot of plugins and customisation posibilities. - `GPL`
* [phpSysInfo](https://phpsysinfo.github.io/phpsysinfo/) - a customizable PHP script that displays information about your system nicely ([Demo](http://phpsysinfo.sourceforge.net/phpsysinfo/index.php?disp=bootstrap)) * [phpSysInfo](https://phpsysinfo.github.io/phpsysinfo/) - a customizable PHP script that displays information about your system nicely ([Demo](http://phpsysinfo.sourceforge.net/phpsysinfo/index.php?disp=bootstrap))
* [psdash](https://github.com/Jahaja/psdash) - A linux system information web dashboard using psutils and flask * [psdash](https://github.com/Jahaja/psdash) - A linux system information web dashboard using psutils and flask

Loading…
Cancel
Save