lots of stuff

playbooks/monitoring/docker-compose.yml.j2

@@ -12,6 +12,14 @@ services:
     volumes:
       - prometheus-data:/prometheus
       - /opt/beeserver/monitoring/prometheus.yml:/etc/prometheus/prometheus.yml
+    command:
+      - --config.file=/etc/prometheus/prometheus.yml
+      - --storage.tsdb.path=/prometheus
+      - --storage.tsdb.retention.time=90d
+      - --web.enable-lifecycle
+{% if prometheus_admin_api | default(false) %}
+      - --web.enable-admin-api
+{% endif %}
     networks:
       - monitoring
 
@@ -23,12 +31,17 @@ services:
       - '127.0.0.1:4000:4000'
     volumes:
       - grafana-storage:/var/lib/grafana
+      - /opt/beeserver/monitoring/grafana/provisioning:/etc/grafana/provisioning:ro
+      - /opt/beeserver/monitoring/grafana/dashboards:/var/lib/grafana/dashboards:ro
+      - /opt/beeserver/monitoring/grafana/dashboards-general:/var/lib/grafana/dashboards-general:ro
     environment:
       - GF_SECURITY_SECRET_KEY={{ grafana_secret }}
       - GF_SERVER_DOMAIN=grafana.secretbee.buzz
       - GF_SERVER_ROOT_URL=https://grafana.secretbee.buzz/
       - GF_SERVER_HTTP_PORT=4000
       - GF_SERVER_PROTOCOL=HTTP
+      - GF_INSTALL_PLUGINS=yesoreyeram-infinity-datasource
+      - GF_UNIFIED_ALERTING_ENABLED=true
     networks:
       - monitoring
 
@@ -37,6 +50,7 @@ services:
     container_name: loki
     ports:
       - '127.0.0.1:3100:3100'
+      - '{{ wireguard_beepi_ip }}:3100:3100'
       - '127.0.0.1:9096:9096'
     volumes:
       - loki-data:/loki
@@ -87,8 +101,42 @@ services:
     networks:
       - monitoring
 
+  blackbox:
+    image: docker.io/prom/blackbox-exporter
+    container_name: blackbox
+    restart: always
+    network_mode: host
+    volumes:
+      - /opt/beeserver/monitoring/blackbox.yml:/etc/blackbox_exporter/config.yml
+    command:
+      - --config.file=/etc/blackbox_exporter/config.yml
+      - --web.listen-address=0.0.0.0:9115
+    extra_hosts:
+{% for service in monitored_services %}
+{% if service.vhost is defined %}
+      - '{{ service.vhost }}:127.0.0.1'
+{% endif %}
+{% endfor %}
+
+  topology:
+    image: docker.io/library/python:3-alpine
+    container_name: topology
+    restart: always
+    ports:
+      - '127.0.0.1:8088:8088'
+    volumes:
+      - /opt/beeserver/monitoring/topology:/app:ro
+    command:
+      - python
+      - /app/topology.py
+    environment:
+      - PROMETHEUS_URL=http://prometheus:9090
+      - LISTEN_PORT=8088
+    networks:
+      - monitoring
+
 volumes:
   prometheus-data:
   grafana-storage:
   loki-data:
-  alloy-data:
+  alloy-data: