Merge pull request #42 from cu-devclub/dev

Config grafana reverse proxy
cu-devclub · Mar 30, 2024 · 7de4f0b · 7de4f0b
2 parents 0f2afc0 + 67f797e
commit 7de4f0b
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 0 deletions.
diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
@@ -229,6 +229,7 @@ services:
       - ./monitoring/grafana/datasources.yaml:/etc/grafana/provisioning/datasources/datasources.yaml
       - ./monitoring/grafana/main-dashboard.json:/var/lib/grafana/dashboards/dashboard.json
       - ./monitoring/grafana/dashboard.yml:/etc/grafana/provisioning/dashboards/main.yml
+      - ./monitoring/grafana/grafana.ini:/etc/grafana/grafana.ini
     environment:
       - GF_AUTH_ANONYMOUS_ENABLED=true
       - GF_AUTH_ANONYMOUS_ORG_ROLE=Admin

diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml
@@ -232,6 +232,7 @@ services:
       - ./monitoring/grafana/datasources.yaml:/etc/grafana/provisioning/datasources/datasources.yaml
       - ./monitoring/grafana/main-dashboard.json:/var/lib/grafana/dashboards/dashboard.json
       - ./monitoring/grafana/dashboard.yml:/etc/grafana/provisioning/dashboards/main.yml
+      - ./monitoring/grafana/grafana.ini.prod:/etc/grafana/grafana.ini
     environment:
       - GF_AUTH_ANONYMOUS_ENABLED=true
       - GF_AUTH_ANONYMOUS_ORG_ROLE=Admin

diff --git a/monitoring/grafana/grafana.ini b/monitoring/grafana/grafana.ini
@@ -0,0 +1,3 @@
+[server]
+root_url = http://localhost/grafana
+serve_from_sub_path = true
diff --git a/monitoring/grafana/grafana.ini.prod b/monitoring/grafana/grafana.ini.prod
@@ -0,0 +1,3 @@
+[server]
+root_url = https://search.dhammanava.net/grafana
+serve_from_sub_path = true
diff --git a/nginx/nginx.dev.conf b/nginx/nginx.dev.conf
@@ -44,5 +44,13 @@ http {
             proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
             proxy_set_header X-Forwarded-Proto $scheme;
         }
+
+        location /grafana/ {
+            proxy_set_header Host $host;
+            proxy_pass http://grafana:3000;
+            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;
+        }
     }
 }
diff --git a/nginx/nginx.prod.conf b/nginx/nginx.prod.conf
@@ -65,6 +65,14 @@ http {
             proxy_set_header X-Forwarded-Proto $scheme;
         }
 
+        location /grafana/ {
+            proxy_set_header Host $host;
+            proxy_pass http://grafana:3000;
+            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 ~ /.well-known/acme-challenge/ {
             root /var/www/certbot;
         }