diff --git a/docker-compose.yml b/docker-compose.yml --- a/docker-compose.yml +++ b/docker-compose.yml @@ -43,6 +43,15 @@ - "./prometheus-statsd-mapping.yml:/etc/prometheus/statsd-mapping.yml:ro" restart: unless-stopped + cadvisor: + image: google/cadvisor:latest + container_name: cadvisor + volumes: + - /:/rootfs:ro + - /var/run:/var/run:rw + - /sys:/sys:ro + - /var/lib/docker/:/var/lib/docker:ro + nginx: image: nginx volumes: diff --git a/nginx.conf b/nginx.conf --- a/nginx.conf +++ b/nginx.conf @@ -92,6 +92,16 @@ set $upstream "http://prometheus:9090"; proxy_pass $upstream; } + location /cadvisor { + set $upstream "http://cadvisor:8080"; + + rewrite ^/cadvisor/(.*)$ /$1 break; + + proxy_pass $upstream; + proxy_redirect ~^/containers/ /cadvisor/containers/; + proxy_redirect ~^/docker/ /cadvisor/docker/; + proxy_redirect ~^/metrics/ /cadvisor/metrics/; + } location / { set $upstream "http://swh-web:5004"; proxy_pass $upstream; diff --git a/prometheus.yml b/prometheus.yml --- a/prometheus.yml +++ b/prometheus.yml @@ -15,3 +15,8 @@ static_configs: - targets: - prometheus-statsd-exporter:9102 + + - job_name: cadvisor + static_configs: + - targets: + - cadvisor:8080