Skip to content

feat(grafana): update entrypoint for envsubst and configure Grafana p… #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
BisoLab merged 2 commits into from
May 1, 2026
Merged

feat(grafana): update entrypoint for envsubst and configure Grafana p… #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
70f5d0b
feat(grafana): update entrypoint for envsubst and configure Grafana p…
Abasy714 May 1, 2026
bacb2e2
Merge branch 'main' into monitoring
Abasy714 May 1, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions docker-compose.monitoring.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down Expand Up @@ -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
Expand Down
10 changes: 10 additions & 0 deletions nginx/rythmify-back.duckdns.org.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Loading