Merge branch 'master' of github.com:funkypenguin/geek-cookbook

manuscript/ha-docker-swarm/shared-storage-ceph.md

@@ -91,7 +91,7 @@ docker run -d --net=host \
 -v /etc/ceph:/etc/ceph \
 -v /var/lib/ceph/:/var/lib/ceph/ \
 -v /dev/:/dev/ \
--e OSD_FORCE_ZAP=1
+-e OSD_FORCE_ZAP=1 \
 -e OSD_DEVICE=/dev/vdd \
 -e OSD_TYPE=disk \
 --name="ceph-osd" \

manuscript/ha-docker-swarm/traefik.md

@@ -13,7 +13,7 @@ To deal with these gaps, we need a front-end load-balancer, and in this design,
 
 ## Ingredients
 
-1. [Docker swarm cluster](/ha-docker-swarm/design/) with [persistent shared storage](/ha-docker-swarm/shared-storage-ceph.md)
+1. [Docker swarm cluster](/ha-docker-swarm/design/) with [persistent shared storage](/ha-docker-swarm/shared-storage-ceph)
 
 ## Preparation
 

manuscript/recipes/swarmprom.md

@@ -160,7 +160,7 @@ Create a docker swarm config file in docker-compose syntax (v3), based on the or
                 memory: 64M
 
         grafana:
-          image: stefanprodan/swarmprom-grafana:5.0.1
+          image: stefanprodan/swarmprom-grafana:5.3.4
           networks:
             - internal
           env_file: /var/data/config/swarmprom/grafana.env
@@ -289,7 +289,7 @@ Create a docker swarm config file in docker-compose syntax (v3), based on the or
 
 
         node-exporter:
-          image: stefanprodan/swarmprom-node-exporter:v0.15.2
+          image: stefanprodan/swarmprom-node-exporter:v0.16.0
           networks:
             - internal
           environment:
@@ -317,7 +317,7 @@ Create a docker swarm config file in docker-compose syntax (v3), based on the or
                 memory: 64M
 
         prometheus:
-          image: stefanprodan/swarmprom-prometheus:v2.2.0-rc.0
+          image: stefanprodan/swarmprom-prometheus:v2.5.0
           networks:
             - internal
           command: