Fix redis exporter environment (#988)

* Fix redis exporter environment

1. Correct REDIS_ADDR configuration (support secure protocol)
2. Add REDIS_USER (for 6.0 version support)

* Fix REDIS_ADDRESS mapping

Co-authored-by: Sylvain <[email protected]>

---------

Co-authored-by: Sylvain <[email protected]>

Author: YuryHrytsuk

services/monitoring/docker-compose.yml.j2

@@ -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

services/monitoring/template.env

@@ -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_ADDRESS=${REDIS_ADDRESS}
 REDIS_PASSWORD=${REDIS_PASSWORD}
 MONITORING_PROMETHEUS_CEPH_TARGETS='${MONITORING_PROMETHEUS_CEPH_TARGETS}'
 MONITORING_PROMETHEUS_PGSQL_GID_MONITORED=${MONITORING_PROMETHEUS_PGSQL_GID_MONITORED}