Update nginx config to route grafana

assets/nginx.conf

@@ -2,26 +2,32 @@ server {
   listen 5005;
 
 
-  location /collect {
-    proxy_pass_request_headers on;
-    proxy_pass_request_body on;
-    proxy_pass http://alloy:8027/collect;
-    proxy_set_header Host $host;
+  location /grafana {
+    rewrite ^/grafana(.*)$ $1 break;
+    proxy_pass http://grafana:3000;
+    proxy_set_header Host $http_host;
     proxy_set_header X-Real-IP $remote_addr;
     proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
     proxy_set_header X-Forwarded-Proto $scheme;
+
+    # Required for Grafana Live WebSocket connections
+    proxy_http_version 1.1;
+    proxy_set_header Upgrade $http_upgrade;
+    proxy_set_header Connection "upgrade";
   }
-
 
-  location /grafana {
+
+  location /collect {
     proxy_pass_request_headers on;
     proxy_pass_request_body on;
-    proxy_pass http://grafana:3000;
+    proxy_pass http://alloy:8027/collect;
     proxy_set_header Host $host;
     proxy_set_header X-Real-IP $remote_addr;
     proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
     proxy_set_header X-Forwarded-Proto $scheme;
   }
+
+
 
   location / {
     root /usr/share/nginx/html/;

docker-compose-deploy.yaml

@@ -43,6 +43,12 @@ services:
     environment:
       GF_SECURITY_ADMIN_PASSWORD: "${GF_SECURITY_ADMIN_PASSWORD}"
       GF_SECURITY_ADMIN_USER: "${GF_SECURITY_ADMIN_USER}"
+      GF_SERVER_ROOT_URL: "http://${DOMAIN}/grafana/"
+      GF_SERVER_SERVE_FROM_SUB_PATH: "true"
+      # GF_SERVER_DOMAIN: ${DOMAIN}
+      # GF_SERVER_ENFORCE_DOMAIN: "false"
+      # GF_SERVER_HTTP_PORT: "3000"
+      # GF_SERVER_HTTP_ADDR: "0.0.0.0"
 
   loki:
     build: