ddp/docker-compose
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

put grafana behind traefik, remove grafana/prometheus/cadvisor/node-exporter/alertmanager ports also added critical missing grafana.ini connection so the one in the container dir is actually in the container... *sigh*

Browse Source
This commit is contained in:
Damien De Paoli
2020-07-12 15:18:05 +10:00
parent 128cf3c997
commit 43fa3201f7
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
docker-compose.yml
View File

@@ -19,6 +19,8 @@ services:
- "--providers.file.watch=true" - "--providers.file.watch=true"
- "--entrypoints.web.address=:80" - "--entrypoints.web.address=:80"
- "--entrypoints.secureweb.address=:443" - "--entrypoints.secureweb.address=:443"
- "--metrics"
- "--metrics.prometheus.buckets=0.1,0.3,1.2,5.0"
ports: ports:
- "80:80" - "80:80"
- "443:443" - "443:443"
@@ -317,8 +319,6 @@ services:
- '--web.console.libraries=/usr/share/prometheus/console_libraries' - '--web.console.libraries=/usr/share/prometheus/console_libraries'
- '--web.console.templates=/usr/share/prometheus/consoles' - '--web.console.templates=/usr/share/prometheus/consoles'
- '--web.enable-lifecycle' - '--web.enable-lifecycle'
ports:
- 19090:9090
links: links:
- cadvisor:cadvisor - cadvisor:cadvisor
# - alertmanager:alertmanager # - alertmanager:alertmanager
@@ -334,13 +334,14 @@ services:
- /proc:/host/proc:ro - /proc:/host/proc:ro
- /sys:/host/sys:ro - /sys:/host/sys:ro
- /:/rootfs:ro - /:/rootfs:ro
- /export/docker/container/node-exporter/textfile_collector:/var/lib/node_exporter/textfile_collector
command: command:
- '--path.procfs=/host/proc' - '--path.procfs=/host/proc'
- '--path.sysfs=/host/sys' - '--path.sysfs=/host/sys'
- --collector.filesystem.ignored-mount-points - --collector.filesystem.ignored-mount-points
- "^/(sys|proc|dev|host|etc|rootfs/var/lib/docker/containers|rootfs/var/lib/docker/overlay2|rootfs/run/docker/netns|rootfs/var/lib/docker/aufs)($$|/)" - "^/(sys|proc|dev|host|etc|rootfs/var/lib/docker/containers|rootfs/var/lib/docker/overlay2|rootfs/run/docker/netns|rootfs/var/lib/docker/aufs)($$|/)"
ports: - --collector.textfile.directory
- 19100:9100 - "/var/lib/node_exporter/textfile_collector"
restart: always restart: always
# alertmanager: # alertmanager:
@@ -363,8 +364,6 @@ services:
- /var/run:/var/run:rw - /var/run:/var/run:rw
- /sys:/sys:ro - /sys:/sys:ro
- /var/lib/docker/:/var/lib/docker:ro - /var/lib/docker/:/var/lib/docker:ro
ports:
- 18080:8080
restart: always restart: always
grafana: grafana:
@@ -372,11 +371,14 @@ services:
container_name: grafana container_name: grafana
depends_on: depends_on:
- prometheus - prometheus
ports:
- 13000:3000
volumes: volumes:
- /export/docker/container/grafana/grafana.ini:/etc/grafana/grafana.ini
- /export/docker/container/grafana/data:/var/lib/grafana - /export/docker/container/grafana/data:/var/lib/grafana
- /export/docker/container/grafana/dashboards:/var/lib/grafana/dashboards - /export/docker/container/grafana/dashboards:/var/lib/grafana/dashboards
- /export/docker/container/grafana/grafana/provisioning:/etc/grafana/provisioning - /export/docker/container/grafana/grafana/provisioning:/etc/grafana/provisioning
env_file: env_file:
- /export/docker/container/grafana/config.monitoring - /export/docker/container/grafana/config.monitoring
labels:
- "traefik.enable=true"
- "traefik.http.routers.grafana.rule=PathPrefix(`/grafana/`)"
- "traefik.http.routers.grafana.entrypoints=web"