Merge remote-tracking branch 'origin/dev' into dev

docker/docker-compose.staging.template.yaml

@@ -109,6 +109,32 @@ services:
     networks:
       - baron_net
 
+  promtail:
+    image: grafana/promtail:2.9.0
+    container_name: baron_promtail
+    restart: unless-stopped
+    volumes:
+      - /var/run/docker.sock:/var/run/docker.sock:ro
+      - /var/lib/docker/containers:/var/lib/docker/containers:ro
+      - ./docker/promtail-config.template.yaml:/etc/promtail/promtail-config.yaml:ro
+    command: -config.file=/etc/promtail/promtail-config.yaml -config.expand-env=true
+    environment:
+      - LOKI_URL=${LOKI_URL:-http://loki:3100/loki/api/v1/push}
+    networks:
+      - baron_net
+
+  blackbox-exporter:
+    image: prom/blackbox-exporter:v0.25.0
+    container_name: baron_blackbox_exporter
+    restart: unless-stopped
+    ports:
+      - "9115:9115"
+    volumes:
+      - ./docker/monitor/blackbox.yml:/etc/blackbox_exporter/config.yml:ro
+    networks:
+      - baron_net
+      - ory-net
+
 networks:
   baron_net:
     external: true