Monitoring: rolling config update

Make sure monitoring stack is automatically deployed on config content
changes

Related Issue(s):
* #984

Author: YuryHrytsuk

services/monitoring/Makefile

@@ -84,7 +84,15 @@ ${TEMP_COMPOSE}-master: docker-compose.yml docker-compose.master.yml config.moni
 ${TEMP_COMPOSE}-local: docker-compose.yml docker-compose.letsencrypt.dns.yml config.monitoring .env pgsql_query_exporter_config.yaml smokeping_prober_config.yaml tempo_config.yaml
 	@${REPO_BASE_DIR}/scripts/docker-stack-config.bash -e .env $< docker-compose.letsencrypt.dns.yml > $@
 
-docker-compose.yml: docker-compose.yml.j2 .env .venv pgsql_query_exporter_config.yaml
+docker-compose.yml: docker-compose.yml.j2 .env .venv pgsql_query_exporter_config.yaml \
+					./alertmanager/config.yml \
+					./tempo_config.yaml \
+					./node-exporter/docker-entrypoint.sh \
+					./prometheus/prometheus.yml \
+					./prometheus/prometheus-federation.yml \
+					./prometheus/prometheus.rules.yml \
+					./pgsql_query_exporter_config.yaml \
+					./smokeping_prober_config.yaml
 	$(call jinja,$<,.env,$@)
 
 .PHONY: grafana-import

services/monitoring/docker-compose.yml.j2

@@ -1,36 +1,5 @@
 version: "3.7"
 
-volumes:
-  prometheus_data: {}
-  grafana_data: {}
-  alertmanager_data: {}
-  prometheus_data_federation: {}
-
-networks:
-  monitored:
-    name: ${MONITORED_NETWORK}
-    external: true
-  public:
-    external: true
-    name: ${PUBLIC_NETWORK}
-
-configs:
-  alertmanager_config:
-    file: ./alertmanager/config.yml
-  tempo_config:
-    file: ./tempo_config.yaml
-  node_exporter_entrypoint:
-    file: ./node-exporter/docker-entrypoint.sh
-  prometheus_config:
-    file: ./prometheus/prometheus.yml
-  prometheus_config_federation:
-    file: ./prometheus/prometheus-federation.yml
-  prometheus_rules:
-    file: ./prometheus/prometheus.rules.yml
-  pgsql_query_exporter_config:
-    file: ./pgsql_query_exporter_config.yaml
-  smokeping_prober_config:
-    file: ./smokeping_prober_config.yaml
 services:
   cadvisor-exporter:
     image: gcr.io/cadvisor/cadvisor:v0.49.1
@@ -424,3 +393,43 @@ services:
         limits:
           memory: 2000M
           cpus: "2.0"
+
+configs:
+  alertmanager_config:
+    name: ${STACK_NAME}_alertmanager_config_{{ "./alertmanager/config.yml" | sha256file | substring(0,10) }}
+    file: ./alertmanager/config.yml
+  tempo_config:
+    name: ${STACK_NAME}_tempo_config_{{ "./tempo_config.yaml" | sha256file | substring(0,10) }}
+    file: ./tempo_config.yaml
+  node_exporter_entrypoint:
+    name: ${STACK_NAME}_node_exporter_entrypoint_{{ "./node-exporter/docker-entrypoint.sh" | sha256file | substring(0,10) }}
+    file: ./node-exporter/docker-entrypoint.sh
+  prometheus_config:
+    name: ${STACK_NAME}_prometheus_config_{{ "./prometheus/prometheus.yml" | sha256file | substring(0,10) }}
+    file: ./prometheus/prometheus.yml
+  prometheus_config_federation:
+    name: ${STACK_NAME}_prometheus_config_federation_{{ "./prometheus/prometheus-federation.yml" | sha256file | substring(0,10) }}
+    file: ./prometheus/prometheus-federation.yml
+  prometheus_rules:
+    name: ${STACK_NAME}_prometheus_rules_{{ "./prometheus/prometheus.rules.yml" | sha256file | substring(0,10) }}
+    file: ./prometheus/prometheus.rules.yml
+  pgsql_query_exporter_config:
+    name: ${STACK_NAME}_pgsql_query_exporter_config_{{ "./pgsql_query_exporter_config.yaml" | sha256file | substring(0,10) }}
+    file: ./pgsql_query_exporter_config.yaml
+  smokeping_prober_config:
+    name: ${STACK_NAME}_smokeping_prober_config_{{ "./smokeping_prober_config.yaml" | sha256file | substring(0,10) }}
+    file: ./smokeping_prober_config.yaml
+
+volumes:
+  prometheus_data: {}
+  grafana_data: {}
+  alertmanager_data: {}
+  prometheus_data_federation: {}
+
+networks:
+  monitored:
+    name: ${MONITORED_NETWORK}
+    external: true
+  public:
+    external: true
+    name: ${PUBLIC_NETWORK}

services/monitoring/template.env

@@ -1,3 +1,4 @@
+STACK_NAME=${STACK_NAME}
 MONITORING_DOMAIN=${MONITORING_DOMAIN}
 MONITORING_PROMETHEUS_RETENTION=${MONITORING_PROMETHEUS_RETENTION}
 MONITORING_PROMETHEUS_FEDERATION_RETENTION=${MONITORING_PROMETHEUS_FEDERATION_RETENTION}