Diferencia deploys por entornos, corrige dev (394425d1) · Commits · REDMIC Project / Metric / Swarmprom CI

.gitlab-ci.yml

+9 −6

Original line number	Diff line number	Diff line
		@@ -18,6 +18,7 @@ deploy-dev:
		stage: deploy
		variables:
		SSH_REMOTE: ${DEV_SSH_REMOTE}
		COMPOSE_FILE: docker-compose.tmpl.yml:docker-compose.dev.yml
		ADMIN_USER: ${DEV_ADMIN_USER}
		ADMIN_PASSWORD: ${DEV_ADMIN_PASSWORD}
		DOCKER_GWBRIDGE_IP: ${DEV_DOCKER_GWBRIDGE_IP}
		@@ -26,8 +27,8 @@ deploy-dev:
		script:
		- create-nets.sh metric-net
		- >
		deploy.sh ADMIN_USER=${ADMIN_USER} ADMIN_PASSWORD=${ADMIN_PASSWORD} DOCKER_GWBRIDGE_IP=${DOCKER_GWBRIDGE_IP}
		UI_AUTH=${UI_AUTH} PUBLIC_HOSTNAME=${PUBLIC_HOSTNAME}
		deploy.sh COMPOSE_FILE=${COMPOSE_FILE} ADMIN_USER=${ADMIN_USER} ADMIN_PASSWORD=${ADMIN_PASSWORD}
		DOCKER_GWBRIDGE_IP=${DOCKER_GWBRIDGE_IP} UI_AUTH=${UI_AUTH} PUBLIC_HOSTNAME=${PUBLIC_HOSTNAME}
		environment:
		name: dev
		only:
		@@ -38,6 +39,7 @@ deploy-supporting-branch:
		stage: deploy
		variables:
		SSH_REMOTE: ${DEV_SSH_REMOTE}
		COMPOSE_FILE: docker-compose.tmpl.yml:docker-compose.dev.yml
		ADMIN_USER: ${DEV_ADMIN_USER}
		ADMIN_PASSWORD: ${DEV_ADMIN_PASSWORD}
		DOCKER_GWBRIDGE_IP: ${DEV_DOCKER_GWBRIDGE_IP}
		@@ -46,8 +48,8 @@ deploy-supporting-branch:
		script:
		- create-nets.sh metric-net
		- >
		deploy.sh ADMIN_USER=${ADMIN_USER} ADMIN_PASSWORD=${ADMIN_PASSWORD} DOCKER_GWBRIDGE_IP=${DOCKER_GWBRIDGE_IP}
		UI_AUTH=${UI_AUTH} PUBLIC_HOSTNAME=${PUBLIC_HOSTNAME}
		deploy.sh COMPOSE_FILE=${COMPOSE_FILE} ADMIN_USER=${ADMIN_USER} ADMIN_PASSWORD=${ADMIN_PASSWORD}
		DOCKER_GWBRIDGE_IP=${DOCKER_GWBRIDGE_IP} UI_AUTH=${UI_AUTH} PUBLIC_HOSTNAME=${PUBLIC_HOSTNAME}
		environment:
		name: dev
		only:
		@@ -61,6 +63,7 @@ deploy-pro:
		stage: deploy
		variables:
		SSH_REMOTE: ${PRO_SSH_REMOTE}
		COMPOSE_FILE: docker-compose.tmpl.yml:docker-compose.prod.yml
		ADMIN_USER: ${PRO_ADMIN_USER}
		ADMIN_PASSWORD: ${PRO_ADMIN_PASSWORD}
		DOCKER_GWBRIDGE_IP: ${PRO_DOCKER_GWBRIDGE_IP}
		@@ -69,8 +72,8 @@ deploy-pro:
		script:
		- create-nets.sh metric-net
		- >
		deploy.sh ADMIN_USER=${ADMIN_USER} ADMIN_PASSWORD=${ADMIN_PASSWORD} DOCKER_GWBRIDGE_IP=${DOCKER_GWBRIDGE_IP}
		UI_AUTH=${UI_AUTH} PUBLIC_HOSTNAME=${PUBLIC_HOSTNAME}
		deploy.sh COMPOSE_FILE=${COMPOSE_FILE} ADMIN_USER=${ADMIN_USER} ADMIN_PASSWORD=${ADMIN_PASSWORD}
		DOCKER_GWBRIDGE_IP=${DOCKER_GWBRIDGE_IP} UI_AUTH=${UI_AUTH} PUBLIC_HOSTNAME=${PUBLIC_HOSTNAME}
		environment:
		name: pro
		only:

docker-compose.dev.yml

0 → 100644

+160 −0

Original line number	Diff line number	Diff line
		version: '3.5'

		services:
		dockerd-exporter:
		deploy:
		mode: global
		restart_policy:
		condition: on-failure
		delay: 1m
		window: 3m
		resources:
		limits:
		cpus: '0.5'
		memory: 128M
		reservations:
		memory: 64M

		cadvisor:
		deploy:
		mode: global
		restart_policy:
		condition: on-failure
		delay: 1m
		window: 3m
		resources:
		limits:
		cpus: '0.5'
		memory: 128M
		reservations:
		memory: 64M

		grafana:
		ports:
		- target: 3000
		published: 18004
		mode: host
		deploy:
		mode: replicated
		replicas: 1
		labels:
		traefik.port: "3000"
		traefik.docker.network: traefik-net
		traefik.frontend.rule: Host:grafana.${PUBLIC_HOSTNAME}
		traefik.backend: grafana
		placement:
		constraints:
		- node.role == manager
		restart_policy:
		condition: on-failure
		delay: 1m
		window: 3m
		resources:
		limits:
		cpus: '0.5'
		memory: 128M
		reservations:
		memory: 64M

		alertmanager:
		ports:
		- target: 9093
		published: 9093
		mode: host
		deploy:
		mode: replicated
		replicas: 1
		labels:
		traefik.port: "9093"
		traefik.docker.network: traefik-net
		traefik.frontend.auth.basic: ${UI_AUTH}
		traefik.frontend.rule: Host:alertmanager.${PUBLIC_HOSTNAME}
		traefik.backend: alertmanager
		placement:
		constraints:
		- node.role == manager
		restart_policy:
		condition: on-failure
		delay: 1m
		window: 3m
		resources:
		limits:
		cpus: '0.5'
		memory: 128M
		reservations:
		memory: 64M

		unsee:
		ports:
		- target: 9094
		published: 9094
		mode: host
		deploy:
		mode: replicated
		replicas: 1
		labels:
		traefik.port: "9094"
		traefik.docker.network: traefik-net
		traefik.frontend.auth.basic: ${UI_AUTH}
		traefik.frontend.rule: Host:unsee.${PUBLIC_HOSTNAME}
		traefik.backend: unsee
		restart_policy:
		condition: on-failure
		delay: 1m
		window: 3m
		resources:
		limits:
		cpus: '0.5'
		memory: 128M
		reservations:
		memory: 64M

		node-exporter:
		deploy:
		mode: global
		restart_policy:
		condition: on-failure
		delay: 1m
		window: 3m
		resources:
		limits:
		cpus: '0.5'
		memory: 128M
		reservations:
		memory: 64M

		prometheus:
		ports:
		- target: 9090
		published: 9090
		mode: host
		deploy:
		mode: replicated
		replicas: 1
		labels:
		traefik.port: "9090"
		traefik.docker.network: traefik-net
		traefik.frontend.auth.basic: ${UI_AUTH}
		traefik.frontend.rule: Host:prometheus.${PUBLIC_HOSTNAME}
		traefik.backend: prometheus
		placement:
		constraints:
		- node.role == manager
		restart_policy:
		condition: on-failure
		delay: 1m
		window: 3m
		resources:
		limits:
		cpus: '0.5'
		memory: 512M
		reservations:
		memory: 128M

		volumes:
		prometheus:
		name: prometheus-vol
		grafana:
		name: grafana-vol
		alertmanager:
		name: alertmanager-vol

docker-compose.prod.yml

0 → 100644

+144 −0

Original line number	Diff line number	Diff line
		version: '3.5'

		services:
		dockerd-exporter:
		deploy:
		mode: global
		restart_policy:
		condition: on-failure
		delay: 1m
		window: 3m
		resources:
		limits:
		cpus: '0.5'
		memory: 128M
		reservations:
		memory: 64M

		cadvisor:
		deploy:
		mode: global
		restart_policy:
		condition: on-failure
		delay: 1m
		window: 3m
		resources:
		limits:
		cpus: '0.5'
		memory: 128M
		reservations:
		memory: 64M

		grafana:
		deploy:
		mode: replicated
		replicas: 1
		labels:
		traefik.port: "3000"
		traefik.docker.network: traefik-net
		traefik.frontend.rule: Host:grafana.${PUBLIC_HOSTNAME}
		traefik.backend: grafana
		placement:
		constraints:
		- node.role == manager
		restart_policy:
		condition: on-failure
		delay: 1m
		window: 3m
		resources:
		limits:
		cpus: '0.5'
		memory: 128M
		reservations:
		memory: 64M

		alertmanager:
		deploy:
		mode: replicated
		replicas: 1
		labels:
		traefik.port: "9093"
		traefik.docker.network: traefik-net
		traefik.frontend.auth.basic: ${UI_AUTH}
		traefik.frontend.rule: Host:alertmanager.${PUBLIC_HOSTNAME}
		traefik.backend: alertmanager
		placement:
		constraints:
		- node.role == manager
		restart_policy:
		condition: on-failure
		delay: 1m
		window: 3m
		resources:
		limits:
		cpus: '0.5'
		memory: 128M
		reservations:
		memory: 64M

		unsee:
		deploy:
		mode: replicated
		replicas: 1
		labels:
		traefik.port: "9094"
		traefik.docker.network: traefik-net
		traefik.frontend.auth.basic: ${UI_AUTH}
		traefik.frontend.rule: Host:unsee.${PUBLIC_HOSTNAME}
		traefik.backend: unsee
		restart_policy:
		condition: on-failure
		delay: 1m
		window: 3m
		resources:
		limits:
		cpus: '0.5'
		memory: 128M
		reservations:
		memory: 64M

		node-exporter:
		deploy:
		mode: global
		restart_policy:
		condition: on-failure
		delay: 1m
		window: 3m
		resources:
		limits:
		cpus: '0.5'
		memory: 128M
		reservations:
		memory: 64M

		prometheus:
		deploy:
		mode: replicated
		replicas: 1
		labels:
		traefik.port: "9090"
		traefik.docker.network: traefik-net
		traefik.frontend.auth.basic: ${UI_AUTH}
		traefik.frontend.rule: Host:prometheus.${PUBLIC_HOSTNAME}
		traefik.backend: prometheus
		placement:
		constraints:
		- node.role == worker
		restart_policy:
		condition: on-failure
		delay: 1m
		window: 3m
		resources:
		limits:
		cpus: '0.5'
		memory: 512M
		reservations:
		memory: 128M

		volumes:
		prometheus:
		name: prometheus-vol
		grafana:
		name: grafana-vol
		alertmanager:
		name: alertmanager-vol

docker-compose.yml→docker-compose.tmpl.yml

+0 −128

Original line number	Diff line number	Diff line
		@@ -10,18 +10,6 @@ services:
		configs:
		- source: dockerd_config
		target: /etc/caddy/Caddyfile
		deploy:
		mode: global
		restart_policy:
		condition: on-failure
		delay: 1m
		window: 3m
		resources:
		limits:
		cpus: '0.5'
		memory: 128M
		reservations:
		memory: 64M

		cadvisor:
		image: google/cadvisor
		@@ -34,18 +22,6 @@ services:
		- /var/run:/var/run
		- /sys:/sys:ro
		- /var/lib/docker/:/var/lib/docker:ro
		deploy:
		mode: global
		restart_policy:
		condition: on-failure
		delay: 1m
		window: 3m
		resources:
		limits:
		cpus: '0.5'
		memory: 128M
		reservations:
		memory: 64M

		grafana:
		image: stefanprodan/swarmprom-grafana:5.0.1
		@@ -65,27 +41,6 @@ services:
		- traefik-net
		volumes:
		- grafana:/var/lib/grafana
		deploy:
		mode: replicated
		replicas: 1
		labels:
		traefik.port: "3000"
		traefik.docker.network: traefik-net
		traefik.frontend.rule: Host:grafana.${PUBLIC_HOSTNAME}
		traefik.backend: grafana
		placement:
		constraints:
		- node.role == manager
		restart_policy:
		condition: on-failure
		delay: 1m
		window: 3m
		resources:
		limits:
		cpus: '0.5'
		memory: 128M
		reservations:
		memory: 64M

		alertmanager:
		image: stefanprodan/swarmprom-alertmanager:v0.14.0
		@@ -101,28 +56,6 @@ services:
		- traefik-net
		volumes:
		- alertmanager:/alertmanager
		deploy:
		mode: replicated
		replicas: 1
		labels:
		traefik.port: "9093"
		traefik.docker.network: traefik-net
		traefik.frontend.auth.basic: ${UI_AUTH}
		traefik.frontend.rule: Host:alertmanager.${PUBLIC_HOSTNAME}
		traefik.backend: alertmanager
		placement:
		constraints:
		- node.role == manager
		restart_policy:
		condition: on-failure
		delay: 1m
		window: 3m
		resources:
		limits:
		cpus: '0.5'
		memory: 128M
		reservations:
		memory: 64M

		unsee:
		image: cloudflare/unsee:v0.8.0
		@@ -131,25 +64,6 @@ services:
		- traefik-net
		environment:
		- "ALERTMANAGER_URIS=default:http://alertmanager:9093"
		deploy:
		mode: replicated
		replicas: 1
		labels:
		traefik.port: "8080"
		traefik.docker.network: traefik-net
		traefik.frontend.auth.basic: ${UI_AUTH}
		traefik.frontend.rule: Host:unsee.${PUBLIC_HOSTNAME}
		traefik.backend: unsee
		restart_policy:
		condition: on-failure
		delay: 1m
		window: 3m
		resources:
		limits:
		cpus: '0.5'
		memory: 128M
		reservations:
		memory: 64M

		node-exporter:
		image: stefanprodan/swarmprom-node-exporter:v0.15.2
		@@ -171,18 +85,6 @@ services:
		- /sys:/host/sys:ro
		- /:/rootfs:ro
		- /etc/hostname:/etc/nodename
		deploy:
		mode: global
		restart_policy:
		condition: on-failure
		delay: 1m
		window: 3m
		resources:
		limits:
		cpus: '0.5'
		memory: 128M
		reservations:
		memory: 64M

		prometheus:
		image: stefanprodan/swarmprom-prometheus:v2.2.0-rc.0
		@@ -202,28 +104,6 @@ services:
		target: /etc/prometheus/swarm_node.rules.yml
		- source: task_rules
		target: /etc/prometheus/swarm_task.rules.yml
		deploy:
		mode: replicated
		replicas: 1
		labels:
		traefik.port: "9090"
		traefik.docker.network: traefik-net
		traefik.frontend.auth.basic: ${UI_AUTH}
		traefik.frontend.rule: Host:prometheus.${PUBLIC_HOSTNAME}
		traefik.backend: prometheus
		placement:
		constraints:
		- node.role == worker
		restart_policy:
		condition: on-failure
		delay: 1m
		window: 3m
		resources:
		limits:
		cpus: '0.5'
		memory: 512M
		reservations:
		memory: 128M

		networks:
		metric-net:
		@@ -231,14 +111,6 @@ networks:
		traefik-net:
		external: true

		volumes:
		prometheus:
		name: prometheus-vol
		grafana:
		name: grafana-vol
		alertmanager:
		name: alertmanager-vol

		configs:
		dockerd_config:
		file: ./swarmprom/dockerd-exporter/Caddyfile