From 590dd5a05a5c563c981a1aa308f84c07af389834 Mon Sep 17 00:00:00 2001 From: Marcio Castilho Date: Mon, 8 Feb 2016 20:24:59 -0500 Subject: [PATCH 1/2] Adding Meros.io --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 0117c68..5370d10 100644 --- a/README.md +++ b/README.md @@ -456,6 +456,7 @@ desktop! * [Docker-mon](https://github.com/icecrime/docker-mon) (Console-based Docker monitoring) by [@icecrime](https://github.com/icecrime) * [Glances] (http://nicolargo.github.io/glances/) (A cross-platform curses-based system monitoring tool written in Python) by [@nicolargo](https://github.com/nicolargo) * [InfluxDB, cAdvisor, Grafana](https://github.com/vegasbrianc/docker-monitoring) (InfluxDB Time series DB in combination with Grafana and cAdvisor) by [@vegasbrianc](https://github.com/vegasbrianc) +* [Meros](http://meros.io) Analyzes containers resources, captures logs, remote web SSH terminal and powerful DevOps alerts. * [New Relic](http://newrelic.com/docker) New Relics Docker Monitoring tool * [Prometheus](http://prometheus.io/) (Open-source service monitoring system and time series database) * [Ruxit](https://ruxit.com/docker-monitoring/#docker_understand-performance) Monitor containerized applications without installing agents or modifiying your Run commands From 9771d45485f28c6b7a58bbeedf80f0360105e5e0 Mon Sep 17 00:00:00 2001 From: Marcio Castilho Date: Mon, 8 Feb 2016 20:45:37 -0500 Subject: [PATCH 2/2] Fixing url with SSL --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 5370d10..6909228 100644 --- a/README.md +++ b/README.md @@ -456,7 +456,7 @@ desktop! * [Docker-mon](https://github.com/icecrime/docker-mon) (Console-based Docker monitoring) by [@icecrime](https://github.com/icecrime) * [Glances] (http://nicolargo.github.io/glances/) (A cross-platform curses-based system monitoring tool written in Python) by [@nicolargo](https://github.com/nicolargo) * [InfluxDB, cAdvisor, Grafana](https://github.com/vegasbrianc/docker-monitoring) (InfluxDB Time series DB in combination with Grafana and cAdvisor) by [@vegasbrianc](https://github.com/vegasbrianc) -* [Meros](http://meros.io) Analyzes containers resources, captures logs, remote web SSH terminal and powerful DevOps alerts. +* [Meros](https://meros.io) Analyzes containers resources, captures logs, remote web SSH terminal and powerful DevOps alerts. * [New Relic](http://newrelic.com/docker) New Relics Docker Monitoring tool * [Prometheus](http://prometheus.io/) (Open-source service monitoring system and time series database) * [Ruxit](https://ruxit.com/docker-monitoring/#docker_understand-performance) Monitor containerized applications without installing agents or modifiying your Run commands