diff --git a/abra.sh b/abra.sh index 958a882..c70a056 100644 --- a/abra.sh +++ b/abra.sh @@ -1,4 +1,4 @@ -export PROMTAIL_YML_VERSION=v3 +export PROMTAIL_YML_VERSION=v5 export NODE_EXPORTER_ENTRYPOINT_VERSION=v1 export NGINX_CONFIG_VERSION=v11 export HTPASSWD_CONFIG_VERSION=v2 diff --git a/compose.yml b/compose.yml index 661840b..ce30cc5 100644 --- a/compose.yml +++ b/compose.yml @@ -52,7 +52,7 @@ services: entrypoint: ["/bin/sh", "-e", "/entrypoint.sh"] cadvisor: - image: google/cadvisor:latest + image: google/cadvisor:v0.33.0 command: -logtostderr -docker_only volumes: - /var/lib/docker/:/var/lib/docker:ro @@ -66,7 +66,8 @@ services: promtail: image: grafana/promtail:2.0.0 volumes: - - /var/log:/var/log + - /var/log:/var/log:ro + - /var/lib/docker/containers:/var/lib/docker/containers:ro command: -config.file=/etc/promtail/config.yml configs: - source: promtail_yml diff --git a/promtail.yml.tmpl b/promtail.yml.tmpl index a80eba1..56c0f0a 100644 --- a/promtail.yml.tmpl +++ b/promtail.yml.tmpl @@ -22,9 +22,8 @@ scrape_configs: - job_name: containers static_configs: - - targets: + - targets: - localhost labels: job: containers __path__: /var/lib/docker/containers/*/*log -