Add compose monitoring profile

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
+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,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

@@ -569,6 +569,7 @@ services:
       # start_interval: 5s
       start_period: 1m
       retries: 10
+
     profiles:
       - connectiontest
 
@@ -752,6 +753,10 @@ services:
       internal:
         ipv4_address: $IPV4_IP_GRAFANA_INTERNAL
 
+    profiles:
+      - alertmanager
+      - monitoring
+
   prometheus:
     image: ${DOCKER_IMAGE_PROMETHEUS}
 
@@ -782,6 +787,10 @@ services:
     volumes:
       - prometheus-data:/prometheus
 
+    profiles:
+      - alertmanager
+      - monitoring
+
   alertmanager:
     image: ${DOCKER_IMAGE_PROMETHEUS_ALERTMANAGER}
 
@@ -824,6 +833,10 @@ services:
     networks:
       - internal
 
+    profiles:
+      - alertmanager
+      - monitoring
+
   redis-exporter:
     image: ${DOCKER_IMAGE_REDIS_EXPORTER}
 
@@ -841,6 +854,10 @@ services:
     networks:
       - internal
 
+    profiles:
+      - alertmanager
+      - monitoring
+
   statsd-exporter:
     image: ${DOCKER_IMAGE_STATSD_EXPORTER}
 
@@ -862,6 +879,10 @@ services:
         aliases:
           - statsd
 
+    profiles:
+      - alertmanager
+      - monitoring
+
   celery-exporter:
     image: ${DOCKER_IMAGE_CELERY_EXPORTER}
     command:
@@ -883,6 +904,10 @@ services:
       rabbitmq:
         condition: service_healthy
 
+    profiles:
+      - alertmanager
+      - monitoring
+
   # https://github.com/prometheus/node_exporter#docker
   node-exporter:
     image: ${DOCKER_IMAGE_NODE_EXPORTER}
@@ -913,6 +938,10 @@ services:
       - /var/run/dbus/system_bus_socket:/var/run/dbus/system_bus_socket
       - prometheus-textfile-directory:/prometheus-textfile-directory
 
+    profiles:
+      - alertmanager
+      - monitoring
+
   docker_stats_exporter:
     # https://github.com/jan4843/docker_stats_exporter
     image: ${DOCKER_IMAGE_DOCKER_STATSD_EXPORTER}
@@ -932,6 +961,10 @@ services:
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
 
+    profiles:
+      - alertmanager
+      - monitoring
+
   nginx_logs_exporter:
     image: ${DOCKER_IMAGE_NGINX_LOGS_EXPORTER}
     command:
@@ -953,6 +986,10 @@ services:
     volumes:
       - nginx-logs-exporter:/var/log/nginx/prometheus-nginxlog-exporter/
 
+    profiles:
+      - alertmanager
+      - monitoring
+
 volumes:
   postgres: {}
   postgres-backups: {}

docker/defaults.env

@@ -146,7 +146,7 @@ COMPOSE_PROJECT_NAME=internetnl
 COMPOSE_FILE=docker/compose.yaml
 
 # enable all services and crons
-COMPOSE_PROFILES=connectiontest,cron,routinator
+COMPOSE_PROFILES=connectiontest,cron,monitoring,routinator
 
 # interval for batch processing
 BATCH_SCHEDULER_INTERVAL=1

docker/develop.env

@@ -70,4 +70,4 @@ INTERNETNL_BRANDING=False
 NGINX_PROXY_CACHE=off
 
 # only enable application services
-COMPOSE_PROFILES=connectiontest
+COMPOSE_PROFILES=connectiontest,monitoring

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 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).
 
@@ -26,4 +26,4 @@ The Grafana service is used because Prometheus does not include curl. The URL's
 
 **notice**: Please note that Grafana (and the rest of the monitoring containers) are not connected to the public interface and don't have internet access. So adding Dashboards via "Import via grafana.com" does not work. Dashboard from grafana.com can be imported using the JSON model.
 
-Dashboard can be manually created through the Grafana web interface and can be saved there. Existing Dashboard cannot be modified this way as they are provisioned from the Docker image. Either duplicate the Dashboard with your own modifications or export the Dashboard JSON Model and update the files at: https://github.com/internetstandards/Internet.nl/tree/docker/docker/monitoring/grafana/dashboards
+Dashboard can be manually created through the Grafana web interface and can be saved there. Existing Dashboard cannot be modified this way as they are provisioned from the Docker image. Either duplicate the Dashboard with your own modifications or export the Dashboard JSON Model and update the files at: https://github.com/internetstandards/Internet.nl/tree/main/docker/monitoring/grafana/dashboards