Skip to content

Fix redis exporter environment #988

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
merged 3 commits into from
Mar 14, 2025
Merged

Fix redis exporter environment #988

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a67431c
Fix redis exporter environment
YuryHrytsuk Mar 13, 2025
d43ab91
Merge remote-tracking branch 'upstream/main' into fix-redis-exporter-…
YuryHrytsuk Mar 13, 2025
aa924fc
Fix REDIS_ADDRESS mapping
YuryHrytsuk Mar 13, 2025
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
7 changes: 5 additions & 2 deletions services/monitoring/docker-compose.yml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -377,9 +377,12 @@ services:
networks:
- monitored
environment:
REDIS_ADDR: redis://{{REDIS_HOST}}:{{REDIS_PORT}}
REDIS_EXPORTER_CHECK_KEYS: db0=user_id*client_session_id*alive,db0=user_id*client_session_id*resources,db1=project_lock*,db3=*
REDIS_ADDR: ${REDIS_ADDRESS}
{%- if REDIS_USER %}
REDIS_USER: ${REDIS_USER}
{%- endif %}
REDIS_PASSWORD: ${REDIS_PASSWORD}
REDIS_EXPORTER_CHECK_KEYS: db0=user_id*client_session_id*alive,db0=user_id*client_session_id*resources,db1=project_lock*,db3=*
deploy:
labels:
- prometheus-job=redis-exporter
Expand Down
4 changes: 2 additions & 2 deletions services/monitoring/template.env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ POSTGRES_PORT=${POSTGRES_PORT}
POSTGRES_HOST=${POSTGRES_HOST}
POSTGRES_ENDPOINT=${POSTGRES_ENDPOINT}
PREFIX_STACK_NAME=${PREFIX_STACK_NAME}
REDIS_PORT=${REDIS_PORT}
REDIS_HOST=${REDIS_HOST}
REDIS_USER=${REDIS_USER}
REDIS_ADDR=${REDIS_ADDRESS}
REDIS_PASSWORD=${REDIS_PASSWORD}
MONITORING_PROMETHEUS_CEPH_TARGETS='${MONITORING_PROMETHEUS_CEPH_TARGETS}'
MONITORING_PROMETHEUS_PGSQL_GID_MONITORED=${MONITORING_PROMETHEUS_PGSQL_GID_MONITORED}
Expand Down
Loading