cleanup: swarm mode & single host use same docker-compose.yml

This commit is contained in:
llitfkitfk 2017-08-16 16:31:12 +08:00
parent c5efc5517c
commit 886a882a25

View File

@ -1,14 +1,8 @@
version: '3' version: '3'
volumes: volumes:
prometheus-config: prometheus_data: {}
external: grafana_data: {}
name: prometheus-config
prometheus-data:
grafana-data:
alertmanager-config:
external:
name: alertmanager-config
networks: networks:
front-tier: front-tier:
@ -19,14 +13,19 @@ services:
image: prom/prometheus image: prom/prometheus
container_name: prometheus container_name: prometheus
volumes: volumes:
- prometheus-config:/etc/prometheus/ - ./prometheus/:/etc/prometheus/
- prometheus-data:/prometheus - prometheus_data:/prometheus
command: command:
- '-config.file=/etc/prometheus/prometheus.yml' - '-config.file=/etc/prometheus/prometheus.yml'
- '-storage.local.path=/prometheus' - '-storage.local.path=/prometheus'
- '-alertmanager.url=http://alertmanager:9093' - '-alertmanager.url=http://alertmanager:9093'
expose:
- 9090
ports: ports:
- 9090:9090 - 9090:9090
links:
- cadvisor:cadvisor
- alertmanager:alertmanager
depends_on: depends_on:
- cadvisor - cadvisor
networks: networks:
@ -34,29 +33,35 @@ services:
deploy: deploy:
placement: placement:
constraints: constraints:
- node.role == manager - node.hostname == <hostname where the prometheus config file in>
- node.hostname == node1
node-exporter: node-exporter:
container_name: node-exporter
image: prom/node-exporter image: prom/node-exporter
volumes: volumes:
- /proc:/host/proc:ro - /proc:/host/proc:ro
- /sys:/host/sys:ro - /sys:/host/sys:ro
- /:/rootfs:ro - /:/rootfs:ro
command: '-collector.procfs=/host/proc -collector.sysfs=/host/sys -collector.filesystem.ignored-mount-points="^(/rootfs|/host|)/(sys|proc|dev|host|etc)($$|/)" collector.filesystem.ignored-fs-types="^(sys|proc|auto|cgroup|devpts|ns|au|fuse\.lxc|mqueue)(fs|)$$"' command: '-collector.procfs=/host/proc -collector.sysfs=/host/sys -collector.filesystem.ignored-mount-points="^(/rootfs|/host|)/(sys|proc|dev|host|etc)($$|/)" collector.filesystem.ignored-fs-types="^(sys|proc|auto|cgroup|devpts|ns|au|fuse\.lxc|mqueue)(fs|)$$"'
expose:
- 9100
networks: networks:
- back-tier - back-tier
deploy: deploy:
# alertmanager: alertmanager:
# image: prom/alertmanager image: prom/alertmanager
# ports: ports:
# - 9093:9093 - 9093:9093
# volumes: volumes:
# - alertmanager-config:/etc/alertmanager/ - ./alertmanager/:/etc/alertmanager/
# networks: networks:
# - back-tier - back-tier
# command: command:
# - '-config.file=/etc/alertmanager/config.yml' - '-config.file=/etc/alertmanager/config.yml'
# - '-storage.path=/alertmanager' - '-storage.path=/alertmanager'
deploy:
placement:
constraints:
- node.hostname == <hostname where alertmanager config file in>
cadvisor: cadvisor:
image: google/cadvisor image: google/cadvisor
volumes: volumes:
@ -64,10 +69,13 @@ 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
expose:
- 8080
networks: networks:
- back-tier - back-tier
deploy: deploy:
mode: global mode: global
grafana: grafana:
image: grafana/grafana image: grafana/grafana
depends_on: depends_on:
@ -75,7 +83,7 @@ services:
ports: ports:
- 3000:3000 - 3000:3000
volumes: volumes:
- grafana-data:/var/lib/grafana - grafana_data:/var/lib/grafana
env_file: env_file:
- config.monitoring - config.monitoring
networks: networks: