From 166f452b592cb35b16c40c94579902b45323a827 Mon Sep 17 00:00:00 2001
From: Pierre Zemb <pierre.zemb.isen@gmail.com>
Date: Wed, 12 Aug 2015 21:35:29 +0200
Subject: [PATCH] Add Kubernetes, cadvisor and Bosun

---
 README.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index cd233c48..c9145c99 100644
--- a/README.md
+++ b/README.md
@@ -375,10 +375,12 @@ Some [Groupware](#groupware) solutions also feature file sharing synchronization
 
 
 ## Monitoring and Administration
-
   * [Adagios](http://adagios.org/) - Web based Nagios interface for configuration, as well as monitoring (as a replacement to the standard interface), and a REST interface ([Demo](http://demo.adagios.org/), [SourceCode](https://github.com/opinkerfi/adagios), [Documentation](https://github.com/opinkerfi/adagios/wiki)) - `GPLv3` `Python`
   * [adminer](http://www.adminer.org/) -  Database management in a single PHP file ([Source code](https://github.com/vrana/adminer))
+  * [Bosun](http://bosun.org/) - Monitoring and alerting system by Stack Exchange ([SourceCode](https://github.com/bosun-monitor/bosun), [Documentation](http://bosun.org/quickstart.html)) `MIT` `Go`
+  * [cadvisor](https://github.com/google/cadvisor) - Analyzes resource usage and performance characteristics of running containers ([SourceCode](https://github.com/google/cadvisor)) `Apache` `Go`
   * [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`
+  * [Kubernetes](http://kubernetes.io/) - Orchestration system for Docker containers - ([SourceCode](https://github.com/kubernetes/kubernetes), [Documentation](http://kubernetes.io/v1.0/)) `Apache` `Go`
   * [LibreNMS](http://www.librenms.org/) - Community-based GPL-licensed network monitoring system - `GPLv3`
   * [linux-dash](https://github.com/afaqurk/linux-dash) - A drop-in, low-overhead monitoring web dashboard for a linux machine ([Demo](http://linuxdash.afaqtariq.com/#/system-status))
   * [Nagios](https://www.nagios.org/) - Industry standard monitoring software, which has a lot of plugins and customisation posibilities. - `GPL`