Cleanup compose profiles

Removing the unused batch profile from env.
Adding the alertmanager profile to all monitoring services.

docker/batch-test.env

@@ -8,7 +8,7 @@ INTERNETNL_DOMAINNAME=internet.test
 # use unique name to not conflict with integration tests
 COMPOSE_PROJECT_NAME=internetnl-batch-test
 
-COMPOSE_PROFILES=batch,cron,monitoring
+COMPOSE_PROFILES=cron,monitoring
 
 ENABLE_BATCH=True
 

docker/build.env

@@ -2,7 +2,7 @@
 
 # include all compose files
 COMPOSE_FILE=docker/compose.yaml:docker/compose.build.yaml:docker/compose.development.yaml:docker/compose.integration-tests.yaml:docker/compose.test.yaml:docker/compose.tools.yaml:docker/compose.test-runner-develop.yaml:docker/compose.integration-tests.yaml
-COMPOSE_PROFILES=connectiontest,cron,monitoring,routinator,batch,build
+COMPOSE_PROFILES=connectiontest,cron,monitoring,routinator,build
 
 # don't expose HTTP(S) and DNS ports to the outside, this also causes issues due to being privileged ports
 WEBSERVER_PORT=80

docker/compose.yaml

@@ -754,6 +754,7 @@ services:
         ipv4_address: $IPV4_IP_GRAFANA_INTERNAL
 
     profiles:
+      - alertmanager
       - monitoring
 
   prometheus:
@@ -787,6 +788,7 @@ services:
       - prometheus-data:/prometheus
 
     profiles:
+      - alertmanager
       - monitoring
 
   alertmanager:
@@ -832,6 +834,7 @@ services:
       - internal
 
     profiles:
+      - alertmanager
       - monitoring
 
   redis-exporter:
@@ -852,6 +855,7 @@ services:
       - internal
 
     profiles:
+      - alertmanager
       - monitoring
 
   statsd-exporter:
@@ -876,6 +880,7 @@ services:
           - statsd
 
     profiles:
+      - alertmanager
       - monitoring
 
   celery-exporter:
@@ -900,6 +905,7 @@ services:
         condition: service_healthy
 
     profiles:
+      - alertmanager
       - monitoring
 
   # https://github.com/prometheus/node_exporter#docker
@@ -933,6 +939,7 @@ services:
       - prometheus-textfile-directory:/prometheus-textfile-directory
 
     profiles:
+      - alertmanager
       - monitoring
 
   docker_stats_exporter:
@@ -955,6 +962,7 @@ services:
       - /var/run/docker.sock:/var/run/docker.sock
 
     profiles:
+      - alertmanager
       - monitoring
 
   nginx_logs_exporter:
@@ -979,6 +987,7 @@ services:
       - nginx-logs-exporter:/var/log/nginx/prometheus-nginxlog-exporter/
 
     profiles:
+      - alertmanager
       - monitoring
 
 volumes:

documentation/Docker-metrics.md

@@ -1,6 +1,6 @@
 # Metrics
 
-The Docker deployment includes a metrics collection system which is available on production as well as development/test environments. It consists of a Prometheus metrics server which scrapes metrics from various exporters. Grafana is provided as frontend to visualise metrics and create graphs/dashboards. The various exporters, Prometheus and Grafana containers can be disabled by not loading the `monitoring` profile, by overriding the default profiles with e.g. `COMPOSE_PROFILES=batch,cron` in `local.env`.
+The Docker deployment includes a metrics collection system which is available on production as well as development/test environments. It consists of a Prometheus metrics server which scrapes metrics from various exporters. Grafana is provided as frontend to visualise metrics and create graphs/dashboards. The various exporters, Prometheus and Grafana containers can be disabled by not loading the `monitoring` profile, by overriding the default profiles with e.g. `COMPOSE_PROFILES=cron` in `local.env`.
 
 To view metrics and graphs visit the `/grafana/` endpoint. Eg: `http://localhost:8080/grafana/` for development and `https://example.com/grafana/` for production. For development the user/password is set to `test/test`, for production users can be configured using the `MONITORING_AUTH_RAW` variable in `docker/local.env` (see `docker/defaults.env` for information).