Changing Redis Instance Used by Airflow

charts/README.md

@@ -192,10 +192,10 @@ airflow:
     enabled: false
   externalRedis:
     ## Azure Redis Cache host
-    host: $(az keyvault secret show --id https://${ENV_VAULT}.vault.azure.net/secrets/base-name-sr --query value -otsv)-cache.redis.cache.windows.net
+    host: $(az keyvault secret show --id https://${ENV_VAULT}.vault.azure.net/secrets/base-name-sr --query value -otsv)-queue.redis.cache.windows.net
     port: 6380
     passwordSecret: "redis"
-    passwordSecretKey: "redis-password"
+    passwordSecretKey: "redis-queue-password"
     databaseNumber: 1  #<-- Adding redis database number according to the Redis config map https://community.opengroup.org/osdu/platform/deployment-and-operations/infra-azure-provisioning/-/blob/master/charts/osdu-common/templates/redis-map.yaml#L7
 
 

charts/airflow/helm-config-dp.yaml

@@ -131,10 +131,10 @@ airflow:
   redis:
     enabled: false
   externalRedis:
-    host: #{base-name-dp}#-cache.redis.cache.windows.net    #<-- Azure Redis Cache host
+    host: #{base-name-dp}#-queue.redis.cache.windows.net    #<-- Azure Redis Cache host
     port: 6380
     passwordSecret: "redis"
-    passwordSecretKey: "redis-password"
+    passwordSecretKey: "redis-queue-password"
     databaseNumber: 1  #<-- Adding redis database number according to the Redis config map https://community.opengroup.org/osdu/platform/deployment-and-operations/infra-azure-provisioning/-/blob/master/charts/osdu-common/templates/redis-map.yaml#L7
 
   ###################################

charts/airflow/helm-config.yaml

@@ -114,10 +114,10 @@ airflow:
   redis:
     enabled: false
   externalRedis:
-    host: #{base-name-sr}#-cache.redis.cache.windows.net    #<-- Azure Redis Cache host
+    host: #{base-name-sr}#-queue.redis.cache.windows.net    #<-- Azure Redis Cache host
     port: 6380
     passwordSecret: "redis"
-    passwordSecretKey: "redis-password"
+    passwordSecretKey: "redis-queue-password"
     databaseNumber: 1  #<-- Adding redis database number according to the Redis config map https://community.opengroup.org/osdu/platform/deployment-and-operations/infra-azure-provisioning/-/blob/master/charts/osdu-common/templates/redis-map.yaml#L7
 
   ###################################

charts/airflow/templates/kv-secrets.yaml

@@ -39,8 +39,8 @@ spec:
   - secretName: redis
     type: Opaque
     data:
-    - objectName: "redis-password"
-      key: redis-password
+    - objectName: "redis-queue-password"
+      key: redis-queue-password
   - secretName: dp-logging
     type: Opaque
     data:
@@ -80,7 +80,7 @@ spec:
           objectName: postgres-password
           objectType: secret
         - |
-          objectName: redis-password
+          objectName: redis-queue-password
           objectType: secret
         - |
           objectName: log-workspace-id

charts/osdu-common/templates/kv-secrets.yaml

@@ -101,8 +101,8 @@ spec:
   - secretName: redis
     type: Opaque
     data:
-    - objectName: "redis-password"
-      key: redis-password
+    - objectName: "redis-queue-password"
+      key: redis-queue-password
   parameters:
     usePodIdentity: "true"
     useVMManagedIdentity: "false"
@@ -189,5 +189,5 @@ spec:
           objectName: postgres-password
           objectType: secret
         - |
-          objectName: redis-password
+          objectName: redis-queue-password
           objectType: secret

infra/templates/osdu-r3-mvp/service_resources/diagnostics.tf

@@ -244,4 +244,20 @@ resource "azurerm_monitor_diagnostic_setting" "redis_diagnostics" {
   }
 }
 
+resource "azurerm_monitor_diagnostic_setting" "redis_queue_diagnostics" {
+  name                       = "redis_queue_diagnostics"
+  target_resource_id         = module.redis_queue.id
+  log_analytics_workspace_id = data.terraform_remote_state.central_resources.outputs.log_analytics_id
+
+
+  metric {
+    category = "AllMetrics"
+
+    retention_policy {
+      days    = var.log_retention_days
+      enabled = local.retention_policy
+    }
+  }
+}
+