Merge branch 'master' of github.com:jaxxstorm/awesome-sysadmin

Conflicts:
	README.md
This commit is contained in:
lbriggs 2015-04-12 22:15:32 +01:00
commit c668663474

View File

@ -330,10 +330,12 @@
## Monitoring ## Monitoring
*Monitoring software.* *Monitoring software.*
* [Alerta](https://github.com/guardian/alerta) - Distributed, scaleable and flexible monitoring system.
* [Cacti](http://www.cacti.net) - Web-based network monitoring and graphing tool. * [Cacti](http://www.cacti.net) - Web-based network monitoring and graphing tool.
* [Cabot](http://cabotapp.com/) - Monitoring and alerts, similar to PagerDuty. * [Cabot](http://cabotapp.com/) - Monitoring and alerts, similar to PagerDuty.
* [check_mk](http://mathias-kettner.com/check_mk.html) - Collection of extensions for Nagios. * [check_mk](http://mathias-kettner.com/check_mk.html) - Collection of extensions for Nagios.
* [Dash](https://github.com/afaqurk/linux-dash) - A low-overhead monitoring web dashboard for a GNU/Linux machine. * [Dash](https://github.com/afaqurk/linux-dash) - A low-overhead monitoring web dashboard for a GNU/Linux machine.
* [Flapjack](http://flapjack.io/) - Monitoring notification routing & event processing system.
* [Icinga](https://www.icinga.org/) - Fork of Nagios. * [Icinga](https://www.icinga.org/) - Fork of Nagios.
* [LibreNMS](https://github.com/librenms/librenms/) - fork of Observium. * [LibreNMS](https://github.com/librenms/librenms/) - fork of Observium.
* [Monit](http://mmonit.com/monit/#home) - Small Open Source utility for managing and monitoring Unix systems. * [Monit](http://mmonit.com/monit/#home) - Small Open Source utility for managing and monitoring Unix systems.
@ -420,6 +422,7 @@ Comparison of NoSQL servers: http://kkovacs.eu/cassandra-vs-mongodb-vs-couchdb-v
## Queuing ## Queuing
* [ActiveMQ](https://activemq.apache.org/) - Open source java message broker.
* [BeanstalkD](http://kr.github.io/beanstalkd/) - A simple, fast work queue. * [BeanstalkD](http://kr.github.io/beanstalkd/) - A simple, fast work queue.
* [Gearman](http://gearman.org/) - Fast multi-language queuing/job processing platform. * [Gearman](http://gearman.org/) - Fast multi-language queuing/job processing platform.
* [Kafka](http://kafka.apache.org) - Extremely high performance publish/subscribe message system. * [Kafka](http://kafka.apache.org) - Extremely high performance publish/subscribe message system.
@ -544,8 +547,13 @@ Comparison of NoSQL servers: http://kkovacs.eu/cassandra-vs-mongodb-vs-couchdb-v
* [Ganeti](https://code.google.com/p/ganeti/) - Cluster virtual server management software tool built on top of KVM and Xen. * [Ganeti](https://code.google.com/p/ganeti/) - Cluster virtual server management software tool built on top of KVM and Xen.
* [KVM](http://www.linux-kvm.org) - Linux kernel virtualization infrastructure. * [KVM](http://www.linux-kvm.org) - Linux kernel virtualization infrastructure.
* [oVirt](http://www.ovirt.org/) - Manages virtual machines, storage and virtual networks. * [oVirt](http://www.ovirt.org/) - Manages virtual machines, storage and virtual networks.
* [OpenNebula](http://opennebula.org/) - Flexible enterprise cloud made simple.
* [Packer](http://www.packer.io/) - A tool for creating identical machine images for multiple platforms from a single source configuration. * [Packer](http://www.packer.io/) - A tool for creating identical machine images for multiple platforms from a single source configuration.
<<<<<<< HEAD
* [QEMU](http://www.qemu.org/) - QEMU is a generic and open source machine emulator and virtualizer. * [QEMU](http://www.qemu.org/) - QEMU is a generic and open source machine emulator and virtualizer.
=======
* [Proxmox VE](https://www.proxmox.com/proxmox-ve) - Complete open source virtualization management solution.
>>>>>>> 55b7e6c4e3269a6c8e199d77a41c778696f972b6
* [Vagrant](https://www.vagrantup.com/) - Tool for building complete development environments. * [Vagrant](https://www.vagrantup.com/) - Tool for building complete development environments.
* [VirtualBox](https://www.virtualbox.org/) - Virtualization product from Oracle Corporation. * [VirtualBox](https://www.virtualbox.org/) - Virtualization product from Oracle Corporation.
* [Xen](http://www.xenproject.org/) - Virtual machine monitor for 32/64 bit Intel / AMD (IA 64) and PowerPC 970 architectures. * [Xen](http://www.xenproject.org/) - Virtual machine monitor for 32/64 bit Intel / AMD (IA 64) and PowerPC 970 architectures.