From 86f7ad8a0bee0815af8e6de29a0027cffe572a54 Mon Sep 17 00:00:00 2001 From: Miguel David Date: Thu, 17 Aug 2017 11:40:16 +0100 Subject: [PATCH 1/3] Update README Changed the Slack integration part according to their new interface. Fixed a typo. I hope this helps! --- README.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 41293b4..bb836c6 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ Once configurations are done let's start it up. From the /prometheus project dir $ docker-compose up -d -That's it. docker-compose builds the entire Grafa and Prometheus stack automagically. +That's it. docker-compose builds the entire Grafana and Prometheus stack automagically. The Grafana Dashboard is now accessible via: `http://:3000` for example http://192.168.10.1:3000 @@ -41,8 +41,8 @@ Slack configuration - `alertmanager/config.yml` The Slack configuration requires to build a custom integration. * Open your slack team in your browser `https://.slack.com/apps` * Click build in the upper right corner -* Make a Custom integration -* Choose Incoming Web Hooks +* Choose Incoming Web Hooks link under Send Messages +* Click on the "incoming webhook integration" link * Select which channel * Click on Add Incoming WebHooks integration * Copy the Webhook URL into the `alertmanager/config.yml` URL section @@ -56,7 +56,7 @@ A quick test for your alerts is to stop a service. Stop the node_exporter contai High load test alert - `docker run --rm -it busybox sh -c "while true; do :; done"` -Let this run for a few minutes and you will notice the load alert appear. +Let this run for a few minutes and you will notice the load alert appear. Then Ctrl+C to stop this container. ## Install Dashboard I created a Dashboard template which is available on [Grafana Docker Dashboard](https://grafana.net/dashboards/179). Simply download the dashboard and select from the Grafana menu -> Dashboards -> Import @@ -99,4 +99,4 @@ Several projects utilize this Prometheus stack. Here's the list of projects: edit file `docker-compose.yml` change `node.hostname = ` to your swarm node name for both `alertmanager` and `prometheus` ``` docker stack deploy -c docker-compose.yml monitor -``` \ No newline at end of file +``` From 1647b230f08f10a798887b2092747db706ae1445 Mon Sep 17 00:00:00 2001 From: Leo Winter Date: Mon, 28 Aug 2017 01:43:02 +0200 Subject: [PATCH 2/3] Add auto restart --- docker-compose.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index f5f5245..fcf11f8 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -30,6 +30,7 @@ services: - cadvisor networks: - back-tier + restart: always deploy: placement: constraints: @@ -55,6 +56,7 @@ services: - ./alertmanager/:/etc/alertmanager/ networks: - back-tier + restart: always command: - '-config.file=/etc/alertmanager/config.yml' - '-storage.path=/alertmanager' @@ -73,6 +75,7 @@ services: - 8080 networks: - back-tier + restart: always deploy: mode: global @@ -88,4 +91,4 @@ services: - config.monitoring networks: - back-tier - - front-tier \ No newline at end of file + - front-tier From b7036aa48b64373a391d2da512a3189da1e11a4d Mon Sep 17 00:00:00 2001 From: Leo Winter Date: Mon, 28 Aug 2017 01:45:57 +0200 Subject: [PATCH 3/3] Add auto restart to node-expolorer --- docker-compose.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/docker-compose.yml b/docker-compose.yml index fcf11f8..cd5c5d4 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -47,6 +47,7 @@ services: - 9100 networks: - back-tier + restart: always deploy: alertmanager: image: prom/alertmanager