- Updated local proxy config to correctly proxy grafana

- Add netpol for loki and backend
raft-tech · Sep 23, 2024 · 5e43a1f · 5e43a1f
1 parent 9e00a31
commit 5e43a1f
Show file tree

Hide file tree

Showing 4 changed files with 1,992 additions and 20 deletions.
diff --git a/scripts/deploy-backend.sh b/scripts/deploy-backend.sh
@@ -113,10 +113,13 @@ update_plg_networking() {
   # Prometheus needs to scrape metrics from the backend
   cf add-network-policy prometheus "$CGAPPNAME_BACKEND" --protocol tcp --port 8080
 
-  # Backend needs to talk to grafana if the frontend is going to proxy for us
+  # Promtial needs to send logs to Loki
+  cf add-network-policy "$CGAPPNAME_BACKEND" loki --protocol tcp --port 8080
+
+  # Backend needs to talk to Grafana if the frontend is going to proxy for us
   cf add-network-policy "$CGAPPNAME_BACKEND" grafana --protocol tcp --port 8080
 
-  # Frontend might proxy grafana
+  # Frontend might proxy Grafana
   cf add-network-policy "$CGAPPNAME_FRONTEND" grafana --protocol tcp --port 8080
   cf add-network-policy grafana "$CGAPPNAME_FRONTEND" --protocol tcp --port 80
 }

diff --git a/tdrs-backend/docker-compose.yml b/tdrs-backend/docker-compose.yml
@@ -81,7 +81,7 @@ services:
       - ./plg/grafana/datasources.local.yml:/usr/share/grafana/conf/provisioning/datasources/datasources.yml
       - ./plg/grafana/providers.local.yml:/usr/share/grafana/conf/provisioning/dashboards/providers.yml
       - ./plg/grafana/dashboards:/var/lib/grafana/dashboards
-      - ./plg/grafana/custom.ini:/usr/share/grafana/conf/custom.ini
+      - ./plg/grafana/custom.local.ini:/usr/share/grafana/conf/custom.ini
       - grafana_data:/var/lib/grafana
     command: --config /usr/share/grafana/conf/custom.ini