From 70f5d0b91e8fa1cdb6be189da060313f15abe080 Mon Sep 17 00:00:00 2001
From: Mohamed jameel alabasy <alabasy@live.com>
Date: Fri, 1 May 2026 18:40:50 +0300
Subject: [PATCH] feat(grafana): update entrypoint for envsubst and configure
 Grafana proxy settings

---
 docker-compose.monitoring.yml        |  8 +++++---
 nginx/rythmify-back.duckdns.org.conf | 10 ++++++++++
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/docker-compose.monitoring.yml b/docker-compose.monitoring.yml
index d7ab0fd..ab5eecd 100644
--- a/docker-compose.monitoring.yml
+++ b/docker-compose.monitoring.yml
@@ -39,9 +39,9 @@ services:
     entrypoint: ["/bin/sh", "-c"]
     command:
       - |
-        wget -q https://github.com/a8m/envsubst/releases/download/v1.2.0/envsubst-Linux-x86_64 -O /usr/local/bin/envsubst &&
-        chmod +x /usr/local/bin/envsubst &&
-        envsubst < /etc/alertmanager/alertmanager.yml.tmpl > /tmp/alertmanager.yml &&
+        wget -q https://github.com/a8m/envsubst/releases/download/v1.2.0/envsubst-Linux-x86_64 -O /tmp/envsubst &&
+        chmod +x /tmp/envsubst &&
+        /tmp/envsubst < /etc/alertmanager/alertmanager.yml.tmpl > /tmp/alertmanager.yml &&
         /bin/alertmanager --config.file=/tmp/alertmanager.yml --storage.path=/alertmanager
     environment:
       ALERTMANAGER_SMTP_PASSWORD: ${ALERTMANAGER_SMTP_PASSWORD}
@@ -70,6 +70,8 @@ services:
       GF_SMTP_FROM_NAME: ${GF_SMTP_FROM_NAME:-Rythmify Monitoring}
       GF_SMTP_STARTTLS_POLICY: MandatoryStartTLS
       ALERT_EMAIL_TO: ${ALERT_EMAIL_TO:-}
+      GF_SERVER_ROOT_URL: https://rythmify-back.duckdns.org/grafana/
+      GF_SERVER_SERVE_FROM_SUB_PATH: "true"
     volumes:
       - grafana_data:/var/lib/grafana
       - ./monitoring/grafana/provisioning:/etc/grafana/provisioning:ro
diff --git a/nginx/rythmify-back.duckdns.org.conf b/nginx/rythmify-back.duckdns.org.conf
index 635fb58..172682b 100644
--- a/nginx/rythmify-back.duckdns.org.conf
+++ b/nginx/rythmify-back.duckdns.org.conf
@@ -41,6 +41,16 @@ server {
         proxy_set_header X-Forwarded-Proto $scheme;
     }
 
+    # ── /grafana/ — Grafana dashboard (proxied from port 3000) ────────────────────
+    location /grafana/ {
+        proxy_pass         http://localhost:3000/;
+        proxy_http_version 1.1;
+        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;
+    }
+
     # ── / — all API and WebSocket traffic ───────────────────────────────────────
     location / {
         proxy_pass         http://localhost:8080;