clean up base infra

infra/base/monitoring.yaml

@@ -5,10 +5,10 @@
 networks:
   frontend:
     external: true
-    name: frontend
+    name: apa-frontend
   backend:
     external: true
-    name: backend
+    name: apa-backend
 
 volumes:
   prometheus_data:
@@ -17,9 +17,9 @@ volumes:
 
 services:
   # Metrics Collection
-  prometheus:
+  apa-prometheus:
     image: prom/prometheus:v2.48.1
-    container_name: prometheus
+    container_name: apa-prometheus
     restart: unless-stopped
     networks:
       - backend
@@ -44,9 +44,9 @@ services:
       - "traefik.http.services.prometheus.loadbalancer.server.port=9090"
 
   # Visualization & Dashboards
-  grafana:
+  apa-grafana:
     image: grafana/grafana:10.2.3
-    container_name: grafana
+    container_name: apa-grafana
     restart: unless-stopped
     networks:
       - backend
@@ -65,9 +65,9 @@ services:
       GF_AUTH_GENERIC_OAUTH_CLIENT_ID: ${GRAFANA_OAUTH_CLIENT_ID}
       GF_AUTH_GENERIC_OAUTH_CLIENT_SECRET: ${GRAFANA_OAUTH_CLIENT_SECRET}
       GF_AUTH_GENERIC_OAUTH_SCOPES: openid profile email groups
-      GF_AUTH_GENERIC_OAUTH_AUTH_URL: https://authentik.${DOMAIN}/application/o/authorize/
-      GF_AUTH_GENERIC_OAUTH_TOKEN_URL: https://authentik.${DOMAIN}/application/o/token/
-      GF_AUTH_GENERIC_OAUTH_API_URL: https://authentik.${DOMAIN}/application/o/userinfo/
+      GF_AUTH_GENERIC_OAUTH_AUTH_URL: https://auth.${DOMAIN}/application/o/authorize/
+      GF_AUTH_GENERIC_OAUTH_TOKEN_URL: https://auth.${DOMAIN}/application/o/token/
+      GF_AUTH_GENERIC_OAUTH_API_URL: https://auth.${DOMAIN}/application/o/userinfo/
       GF_AUTH_GENERIC_OAUTH_AUTO_LOGIN: false
       GF_AUTH_GENERIC_OAUTH_ALLOW_SIGN_UP: true
       GF_AUTH_GENERIC_OAUTH_ROLE_ATTRIBUTE_PATH: role
@@ -89,9 +89,9 @@ services:
       - "traefik.http.services.grafana.loadbalancer.server.port=3000"
 
   # Log Aggregation
-  loki:
+  apa-loki:
     image: grafana/loki:2.9.4
-    container_name: loki
+    container_name: apa-loki
     restart: unless-stopped
     networks:
       - backend
@@ -110,9 +110,9 @@ services:
       - "traefik.http.services.loki.loadbalancer.server.port=3100"
 
   # Log Shipper (for Docker containers)
-  promtail:
+  apa-promtail:
     image: grafana/promtail:2.9.4
-    container_name: promtail
+    container_name: apa-promtail
     restart: unless-stopped
     networks:
       - backend
@@ -122,5 +122,4 @@ services:
       - ./loki/promtail-config.yml:/etc/promtail/config.yml:ro
     command: -config.file=/etc/promtail/config.yml
     depends_on:
-      - loki
-
+      - apa-loki