diff --git a/.env.example b/.env.example index 9149d49..f29aa87 100644 --- a/.env.example +++ b/.env.example @@ -41,6 +41,7 @@ VITE_OIDC_SCOPE=openid profile email VITE_OIDC_REDIRECT_URI=https://manage.example.com/oidc/callback VITE_OIDC_POST_LOGOUT_REDIRECT_URI=https://manage.example.com/ VITE_DEV_API_PROXY_TARGET=http://backend:8000 +VITE_GRAFANA_URL=https://grafana.example.com # SMTP SMTP_HOST=smtp.example.com diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml index 29190a0..7e89916 100644 --- a/docker-compose.dev.yml +++ b/docker-compose.dev.yml @@ -16,7 +16,7 @@ services: SSH_KNOWN_HOSTS_PATH: /app/backend/.cache/known_hosts PROMETHEUS_FILE_SD_DIR: /app/backend/.cache/prometheus-file-sd ALERTMANAGER_URL: ${ALERTMANAGER_URL:-http://alertmanager:9093} - GRAFANA_URL: ${GRAFANA_URL:-http://grafana:3000} + ALERTMANAGER_WEBHOOK_URL: ${ALERTMANAGER_WEBHOOK_URL:-} ports: - "8000:8000" volumes: @@ -37,6 +37,7 @@ services: VITE_API_URL: "/api" VITE_OIDC_ENABLED: "false" VITE_DEV_API_PROXY_TARGET: "http://backend:8000" + VITE_GRAFANA_URL: "http://localhost:3000" ports: - "5173:5173" volumes: diff --git a/docker-compose.yml b/docker-compose.yml index 72e2ee5..f7726aa 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -27,7 +27,7 @@ services: SSH_KNOWN_HOSTS_PATH: /app/backend/.cache/known_hosts PROMETHEUS_FILE_SD_DIR: ${PROMETHEUS_FILE_SD_DIR:-/app/backend/.cache/prometheus-file-sd} ALERTMANAGER_URL: ${ALERTMANAGER_URL:-http://alertmanager:9093} - GRAFANA_URL: ${GRAFANA_URL:-http://grafana:3000} + ALERTMANAGER_WEBHOOK_URL: ${ALERTMANAGER_WEBHOOK_URL:-} volumes: - ${BACKEND_CACHE_DIR:-./backend-cache}:/app/backend/.cache restart: unless-stopped @@ -69,6 +69,7 @@ services: VITE_OIDC_REDIRECT_URI: ${VITE_OIDC_REDIRECT_URI:?set VITE_OIDC_REDIRECT_URI} VITE_OIDC_POST_LOGOUT_REDIRECT_URI: ${VITE_OIDC_POST_LOGOUT_REDIRECT_URI:?set VITE_OIDC_POST_LOGOUT_REDIRECT_URI} VITE_DEV_API_PROXY_TARGET: ${VITE_DEV_API_PROXY_TARGET:-http://backend:8000} + VITE_GRAFANA_URL: ${VITE_GRAFANA_URL:-https://grafana.example.com} VITE_APP_VERSION: ${APP_VERSION:-0.1.0} VITE_APP_BUILD_INFO: ${APP_BUILD_INFO:-dev} depends_on: diff --git a/frontend/Dockerfile b/frontend/Dockerfile index 9e3172e..da40f75 100644 --- a/frontend/Dockerfile +++ b/frontend/Dockerfile @@ -15,6 +15,7 @@ ARG VITE_OIDC_SCOPE=openid profile email ARG VITE_OIDC_REDIRECT_URI= ARG VITE_OIDC_POST_LOGOUT_REDIRECT_URI= ARG VITE_DEV_API_PROXY_TARGET=http://backend:8000 +ARG VITE_GRAFANA_URL=https://grafana.example.com ARG VITE_APP_VERSION=0.1.0 ARG VITE_APP_BUILD_INFO=dev @@ -26,6 +27,7 @@ ENV VITE_API_URL=${VITE_API_URL} \ VITE_OIDC_REDIRECT_URI=${VITE_OIDC_REDIRECT_URI} \ VITE_OIDC_POST_LOGOUT_REDIRECT_URI=${VITE_OIDC_POST_LOGOUT_REDIRECT_URI} \ VITE_DEV_API_PROXY_TARGET=${VITE_DEV_API_PROXY_TARGET} \ + VITE_GRAFANA_URL=${VITE_GRAFANA_URL} \ VITE_APP_VERSION=${VITE_APP_VERSION} \ VITE_APP_BUILD_INFO=${VITE_APP_BUILD_INFO} @@ -50,6 +52,7 @@ COPY frontend/ ./ ENV VITE_API_URL=/api \ VITE_OIDC_ENABLED=false \ VITE_DEV_API_PROXY_TARGET=http://backend:8000 \ + VITE_GRAFANA_URL=http://localhost:3000 \ VITE_APP_VERSION=0.1.0 \ VITE_APP_BUILD_INFO=dev