Fix analytics REDIS params, default to REDIS URL

Author: maor-rozenfeld

README.md

@@ -154,7 +154,7 @@ postgres:
 openopsEnv:
   OPS_PUBLIC_URL: "https://us-east.openops.example.com"
   OPS_POSTGRES_HOST: "rds-us-east-1.example.com"
-  OPS_REDIS_HOST: "elasticache-us-east-1.example.com"
+  OPS_REDIS_URL: "redis://elasticache-us-east-1.example.com:6379/0"
 
 nginx:
   service:

chart/templates/_helpers.tpl

@@ -92,6 +92,40 @@ Redis connection parameters
 {{- printf "redis://%s:%s/0" (include "openops.redisHost" .) (include "openops.redisPort" .) -}}
 {{- end }}
 
+{{- define "openops.resolvedRedisUrl" -}}
+{{- tpl .Values.openopsEnv.OPS_REDIS_URL . -}}
+{{- end }}
+
+{{- define "openops.redisUrlExtractHost" -}}
+{{- $url := urlParse (include "openops.resolvedRedisUrl" .) -}}
+{{- $host := $url.host -}}
+{{- if contains ":" $host -}}
+{{- first (splitList ":" $host) -}}
+{{- else -}}
+{{- $host -}}
+{{- end -}}
+{{- end }}
+
+{{- define "openops.redisUrlExtractPort" -}}
+{{- $url := urlParse (include "openops.resolvedRedisUrl" .) -}}
+{{- $host := $url.host -}}
+{{- if contains ":" $host -}}
+{{- last (splitList ":" $host) -}}
+{{- else -}}
+6379
+{{- end -}}
+{{- end }}
+
+{{- define "openops.redisUrlExtractDb" -}}
+{{- $url := urlParse (include "openops.resolvedRedisUrl" .) -}}
+{{- $path := trimPrefix "/" $url.path -}}
+{{- if $path -}}
+{{- $path -}}
+{{- else -}}
+0
+{{- end -}}
+{{- end }}
+
 {{/*
 PostgreSQL connection parameters
 */}}

chart/values.production.yaml

@@ -37,8 +37,7 @@ openopsEnv:
 
   # Queue - externalized to managed Redis (e.g., AWS ElastiCache, GCP Memorystore, Azure Cache)
   OPS_QUEUE_MODE: REDIS
-  OPS_REDIS_HOST: "your-redis-cluster.cache.amazonaws.com"
-  OPS_REDIS_PORT: "6379"
+  OPS_REDIS_URL: "redis://your-redis-cluster.cache.amazonaws.com:6379/0"
 
   # AWS-specific settings for EKS deployments
   OPS_AWS_ENABLE_IMPLICIT_ROLE: "true"

chart/values.yaml

@@ -112,8 +112,7 @@ openopsEnv:
 
   # Queue
   OPS_QUEUE_MODE: REDIS
-  OPS_REDIS_HOST: '{{ include "openops.redisHost" . }}'
-  OPS_REDIS_PORT: '{{ include "openops.redisPort" . }}'
+  OPS_REDIS_URL: '{{ include "openops.redisUrl" . }}'
 
   # Database
   OPS_DB_TYPE: POSTGRES
@@ -366,8 +365,10 @@ analytics:
     DATABASE_HOST_ALT: "{{ .Values.openopsEnv.OPS_OPENOPS_TABLES_DB_HOST }}"
     SUPERSET_SECRET_KEY: "{{ .Values.openopsEnvSecrets.SUPERSET_SECRET_KEY }}"
     SUPERSET_FEATURE_ALLOW_ADHOC_SUBQUERY: '"{{ .Values.openopsEnv.ANALYTICS_ALLOW_ADHOC_SUBQUERY }}"'
-    REDIS_HOST: "{{ .Values.openopsEnv.OPS_REDIS_HOST }}"
-    REDIS_PORT: "{{ .Values.openopsEnv.OPS_REDIS_PORT }}"
+    REDIS_HOST: '{{ include "openops.redisUrlExtractHost" . }}'
+    REDIS_PORT: '{{ include "openops.redisUrlExtractPort" . }}'
+    REDIS_CELERY_DB: '{{ include "openops.redisUrlExtractDb" . }}'
+    REDIS_RESULTS_DB: '{{ include "openops.redisUrlExtractDb" . }}'
 
 postgres:
   name: postgres

docs/DEPLOY_TO_AWS_EKS.md

@@ -638,8 +638,7 @@ openopsEnv:
 
   # Queue - AWS ElastiCache Redis
   OPS_QUEUE_MODE: REDIS
-  OPS_REDIS_HOST: "openops-production-redis.xxxxx.cache.amazonaws.com"
-  OPS_REDIS_PORT: "6379"
+  OPS_REDIS_URL: "redis://openops-production-redis.xxxxx.cache.amazonaws.com:6379/0"
   # If using auth token:
   # OPS_REDIS_PASSWORD: set via secretEnv
 

docs/DEPLOY_TO_AWS_EKS_FARGATE.md

@@ -699,8 +699,7 @@ openopsEnv:
 
   # External ElastiCache Redis
   OPS_QUEUE_MODE: REDIS
-  OPS_REDIS_HOST: "REPLACE_WITH_REDIS_ENDPOINT"  # Replace with actual Redis endpoint
-  OPS_REDIS_PORT: "6379"
+  OPS_REDIS_URL: "redis://REPLACE_WITH_REDIS_ENDPOINT:6379/0"  # Replace with actual Redis endpoint
 
   # AWS-specific settings
   OPS_AWS_ENABLE_IMPLICIT_ROLE: "true"