diff --git a/monitoring/docker-compose.cluster.yml b/monitoring/docker-compose.cluster.yml index 87eb7d62..bbbb1996 100644 --- a/monitoring/docker-compose.cluster.yml +++ b/monitoring/docker-compose.cluster.yml @@ -18,7 +18,7 @@ services: replicas: 1 volumes: - prometheus_data_backup:/prometheus - - /var/run/docker.sock:/var/run/docker.sock:ro + - ${DOCKER_SOCK_FOLDER}:/var/run/docker.sock:ro configs: - target: /etc/prometheus/prometheus.yml source: prometheus.yml diff --git a/monitoring/docker-compose.yml b/monitoring/docker-compose.yml index 0683cc74..2d4de27b 100644 --- a/monitoring/docker-compose.yml +++ b/monitoring/docker-compose.yml @@ -77,7 +77,7 @@ services: user: root volumes: - prometheus-data:/prometheus - - /var/run/docker.sock:/var/run/docker.sock:ro + - ${DOCKER_SOCK_FOLDER}:/var/run/docker.sock:ro configs: - target: /etc/prometheus/prometheus.yml source: prometheus.yml @@ -99,7 +99,7 @@ services: - /:/rootfs:ro - /var/run:/var/run - /sys:/sys:ro - - /var/lib/docker/:/var/lib/docker + - ${DOCKER_LIB_FOLDER}:/var/lib/docker - /dev/disk/:/dev/disk:ro deploy: mode: global @@ -133,7 +133,7 @@ services: promtail: image: ${PROMTAIL_IMAGE} volumes: - - /var/lib/docker/containers:/host/containers + - ${DOCKER_LIB_FOLDER}/containers:/host/containers - /var/log:/var/log:ro configs: - target: /etc/promtail/promtail-config.yml diff --git a/monitoring/package-metadata.json b/monitoring/package-metadata.json index b1d7b9b3..82dc6b54 100644 --- a/monitoring/package-metadata.json +++ b/monitoring/package-metadata.json @@ -34,6 +34,8 @@ "MO_SECURITY_ADMIN_PASSWORD": "dev_password_only", "MO_RETENTION_TIME": "15d", "GF_SERVER_SERVE_FROM_SUB_PATH": "false", - "MINIO_BROWSER_REDIRECT_URL": "" + "MINIO_BROWSER_REDIRECT_URL": "", + "DOCKER_SOCK_FOLDER": "/var/run/docker.sock", + "DOCKER_LIB_FOLDER": "/var/lib/docker/" } }