From 0fb187b8dc9f0f9d10db67f33edb4ac30c832de9 Mon Sep 17 00:00:00 2001 From: Andreas Gebhardt Date: Fri, 15 Jun 2018 19:37:44 +0200 Subject: [PATCH 1/2] =?UTF-8?q?=C2=BBAzure=20Container=20Service=C2=AB=20(?= =?UTF-8?q?ACS)=20is=20now=20=C2=BBAzure=20Kubernetes=20Service=C2=AB=20(A?= =?UTF-8?q?KS)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Travis CI build #1609 [1] failed: > Issues :-( > Links > 2. [L567] 301 https://azure.microsoft.com/en-us/services/container-service/ → https://azure.microsoft.com/en-us/services/kubernetes-service/ [1] https://travis-ci.org/veggiemonk/awesome-docker/builds/392703890 --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 10aedcd..de158ed 100644 --- a/README.md +++ b/README.md @@ -564,7 +564,7 @@ Services to securely store your Docker images. - [Amazon ECS](https://aws.amazon.com/ecs/) - A management service on EC2 that supports Docker containers. - [Arukas](https://arukas.io/) - Heroku-inspired CaaS -- [Azure ACS](https://azure.microsoft.com/en-us/services/container-service/) - A management service on Azure Virtual Machines that supports Docker containers. +- [Azure AKS](https://azure.microsoft.com/en-us/services/kubernetes-service/) - Simplify Kubernetes management, deployment, and operations. Use a fully managed Kubernetes container orchestration service. - [Cloud 66](https://www.cloud66.com) - Full-stack hosted container management as a service - [Codenvy](https://codenvy.com) - One-click Docker environments and cloud workspace for development teams - [ContainerShip Cloud][containership] - Multi-Cloud Container Hosting Automation Platform. From 4c9a52214269bff6bda27781c71886bf52015ae8 Mon Sep 17 00:00:00 2001 From: Andreas Gebhardt Date: Fri, 15 Jun 2018 19:46:57 +0200 Subject: [PATCH 2/2] =?UTF-8?q?fix=20link=20=C2=BBAxibase=20Collector?= =?UTF-8?q?=C2=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Travis CI build #1609 [1] failed: > Issues :-( > Links > 1. [L179] 404 https://github.com/axibase/atsd-use-cases/tree/master/how-to/docker [1] https://travis-ci.org/veggiemonk/awesome-docker/builds/392703890 --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index de158ed..664d240 100644 --- a/README.md +++ b/README.md @@ -176,7 +176,7 @@ _Source:_ [What is Docker](https://www.docker.com/what-docker) ### Monitoring -- [Axibase Collector](https://github.com/axibase/atsd-use-cases/tree/master/how-to/docker) - Axibase Collector streams performance counters, configuration changes and lifecycle events from the Docker engine(s) into Axibase Time Series Database for roll-up dashboards and integration with upstream monitoring systems. +- [Axibase Collector](https://github.com/axibase/atsd-use-cases/tree/master/integrations/docker) - Axibase Collector streams performance counters, configuration changes and lifecycle events from the Docker engine(s) into Axibase Time Series Database for roll-up dashboards and integration with upstream monitoring systems. - [cAdvisor](https://github.com/google/cadvisor) - Analyzes resource usage and performance characteristics of running containers. Created by [@Google][google] - [Docker-Alertd](https://github.com/deltaskelta/docker-alertd) - Monitor and send alerts based on docker container resource usage/statistics - [Docker-Flow-Monitor](https://github.com/docker-flow/docker-flow-monitor) - Reconfigures Prometheus when a new service is updated or deployed automatically by [@vfarcic][vfarcic]