<type>(scope): <description>

[body]

[footer(s)]

infrastructure/grafana/grafana.ini

@@ -48,10 +48,10 @@ domain = localhost
 enforce_domain = false
 
 # The full public facing url
-root_url = %(protocol)s://%(domain)s:%(http_port)s/
+root_url = %(protocol)s://%(domain)s:%(http_port)s/admin/grafana/
 
 # Serve Grafana from subpath specified in `root_url` setting. By default it is set to `false` for compatibility reasons.
-serve_from_sub_path = false
+serve_from_sub_path = true
 
 # Log web requests
 router_logging = false

infrastructure/nginx/nginx.conf

@@ -155,6 +155,16 @@ http {
             client_max_body_size 100M;
         }
 
+        location /admin/grafana/ {
+            rewrite ^/admin/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;
+        }
+
         error_page 404 = @notfound;
         location @notfound {
             return 444;