Skip to content

Commit 88ea8aa

Browse files
committed
Fix deploy_ops CD failure - monitoring - 2nd attempt
1 parent 189c41a commit 88ea8aa

File tree

4 files changed

+33
-5
lines changed

4 files changed

+33
-5
lines changed

services/monitoring/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,4 @@ docker-compose.aws.yml
22
docker-compose.dalco.yml
33
docker-compose.public.yml
44
docker-compose.master.yml
5+
docker-compose.local.yml

services/monitoring/Makefile

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,10 @@ docker-compose.master.yml: docker-compose.master.yml.j2 config.prometheus.ceph.s
8383
# generating $@
8484
@$(call jinja,$<,.env,$@)
8585

86+
docker-compose.local.yml: docker-compose.local.yml.j2 config.prometheus.ceph.simcore $(COMMON_COMPOSE_DEPENDENCIES)
87+
# generating $@
88+
@$(call jinja,$<,.env,$@)
89+
8690
#
8791
# temp compose targets
8892
#
@@ -101,8 +105,8 @@ ${TEMP_COMPOSE}-aws: docker-compose.yml docker-compose.aws.yml $(TEMP_COMPOSE_C
101105
${TEMP_COMPOSE}-master: docker-compose.yml docker-compose.master.yml $(TEMP_COMPOSE_COMMON_DEPENDENCIES)
102106
@${REPO_BASE_DIR}/scripts/docker-stack-config.bash -e .env $< docker-compose.master.yml > $@
103107

104-
${TEMP_COMPOSE}-local: docker-compose.yml docker-compose.master.yml $(TEMP_COMPOSE_COMMON_DEPENDENCIES)
105-
@${REPO_BASE_DIR}/scripts/docker-stack-config.bash -e .env $< > $@
108+
${TEMP_COMPOSE}-local: docker-compose.yml docker-compose.local.yml $(TEMP_COMPOSE_COMMON_DEPENDENCIES)
109+
@${REPO_BASE_DIR}/scripts/docker-stack-config.bash -e .env $< docker-compose.local.yml > $@
106110

107111
#
108112
# artifacts targets
Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
version: '3.7'
2+
services:
3+
grafana:
4+
deploy:
5+
placement:
6+
constraints: []
7+
prometheuscatchall:
8+
deploy:
9+
placement:
10+
constraints: []
11+
prometheusfederation:
12+
deploy:
13+
placement:
14+
constraints: []
15+
redis-exporter:
16+
deploy:
17+
placement:
18+
constraints: []
19+
postgres-exporter:
20+
deploy:
21+
placement:
22+
constraints: []
23+
configs:
24+
prometheus_config:
25+
name: ${STACK_NAME}_prometheus_config_{{ "./prometheus/prometheus.yml" | sha256file | substring(0,10) }}
26+
file: ./prometheus/prometheus.yml

services/monitoring/docker-compose.yml.j2

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -408,9 +408,6 @@ configs:
408408
prometheus_config_federation:
409409
name: ${STACK_NAME}_prometheus_config_federation_{{ "./prometheus/prometheus-federation.yml" | sha256file | substring(0,10) }}
410410
file: ./prometheus/prometheus-federation.yml
411-
prometheus_config:
412-
name: ${STACK_NAME}_prometheus_config_{{ "./prometheus/prometheus.yml" | sha256file | substring(0,10) }}
413-
file: ./prometheus/prometheus.yml
414411
prometheus_rules:
415412
name: ${STACK_NAME}_prometheus_rules_{{ "./prometheus/prometheus.rules.yml" | sha256file | substring(0,10) }}
416413
file: ./prometheus/prometheus.rules.yml

0 commit comments

Comments
 (0)