Merge pull request #3785 from airqo-platform/staging

move to production
airqo-platform · Oct 28, 2024 · 3e61538 · 3e61538
2 parents cf1605b + 0957541
commit 3e61538
Show file tree

Hide file tree

Showing 9 changed files with 11 additions and 9 deletions.
diff --git a/k8s/analytics/values-prod.yaml b/k8s/analytics/values-prod.yaml
@@ -8,7 +8,7 @@ images:
     celeryWorker: eu.gcr.io/airqo-250220/airqo-analytics-celery-worker
     reportJob: eu.gcr.io/airqo-250220/airqo-analytics-report-job
     devicesSummaryJob: eu.gcr.io/airqo-250220/airqo-analytics-devices-summary-job
-  tag: prod-bbf47c3d-1729854005
+  tag: prod-cf1605be-1730099912
 api:
   name: airqo-analytics-api
   label: analytics-api

diff --git a/k8s/device-registry/values-prod.yaml b/k8s/device-registry/values-prod.yaml
@@ -6,7 +6,7 @@ app:
 replicaCount: 3
 image:
   repository: eu.gcr.io/airqo-250220/airqo-device-registry-api
-  tag: prod-bbf47c3d-1729854005
+  tag: prod-cf1605be-1730099912
 nameOverride: ''
 fullnameOverride: ''
 podAnnotations: {}

diff --git a/k8s/exceedance/values-prod-airqo.yaml b/k8s/exceedance/values-prod-airqo.yaml
@@ -4,6 +4,6 @@ app:
   configmap: env-exceedance-production
 image:
   repository: eu.gcr.io/airqo-250220/airqo-exceedance-job
-  tag: prod-bbf47c3d-1729854005
+  tag: prod-cf1605be-1730099912
 nameOverride: ''
 fullnameOverride: ''
diff --git a/k8s/exceedance/values-prod-kcca.yaml b/k8s/exceedance/values-prod-kcca.yaml
@@ -4,6 +4,6 @@ app:
   configmap: env-exceedance-production
 image:
   repository: eu.gcr.io/airqo-250220/kcca-exceedance-job
-  tag: prod-bbf47c3d-1729854005
+  tag: prod-cf1605be-1730099912
 nameOverride: ''
 fullnameOverride: ''
diff --git a/k8s/predict/values-prod.yaml b/k8s/predict/values-prod.yaml
@@ -7,7 +7,7 @@ images:
     predictJob: eu.gcr.io/airqo-250220/airqo-predict-job
     trainJob: eu.gcr.io/airqo-250220/airqo-train-job
     predictPlaces: eu.gcr.io/airqo-250220/airqo-predict-places-air-quality
-  tag: prod-bbf47c3d-1729854005
+  tag: prod-cf1605be-1730099912
 api:
   name: airqo-prediction-api
   label: prediction-api

diff --git a/k8s/workflows/values-prod.yaml b/k8s/workflows/values-prod.yaml
@@ -10,7 +10,7 @@ images:
     initContainer: eu.gcr.io/airqo-250220/airqo-workflows-xcom
     redisContainer: eu.gcr.io/airqo-250220/airqo-redis
     containers: eu.gcr.io/airqo-250220/airqo-workflows
-  tag: prod-bbf47c3d-1729854005
+  tag: prod-cf1605be-1730099912
 nameOverride: ''
 fullnameOverride: ''
 podAnnotations: {}

diff --git a/k8s/workflows/values-stage.yaml b/k8s/workflows/values-stage.yaml
@@ -10,7 +10,7 @@ images:
     initContainer: eu.gcr.io/airqo-250220/airqo-stage-workflows-xcom
     redisContainer: eu.gcr.io/airqo-250220/airqo-stage-redis
     containers: eu.gcr.io/airqo-250220/airqo-stage-workflows
-  tag: stage-b3d5eb96-1729853938
+  tag: stage-f4c5a75e-1730099832
 nameOverride: ''
 fullnameOverride: ''
 podAnnotations: {}

diff --git a/src/workflows/airqo_etl_utils/airqo_utils.py b/src/workflows/airqo_etl_utils/airqo_utils.py
@@ -1058,8 +1058,8 @@ def get_devices(group_id: str) -> pd.DataFrame:
                 except json.JSONDecodeError as e:
                     logger.exception(f"Error decoding JSON: {e}")
                     continue
-                if not key or not value.get("device_id"):
-                    logger.info(
+                if not key or not value.get("_id"):
+                    logger.warning(
                         f"Skipping message with key: {key}, missing 'device_id'."
                     )
                     continue

diff --git a/src/workflows/airqo_etl_utils/message_broker_utils.py b/src/workflows/airqo_etl_utils/message_broker_utils.py
@@ -232,6 +232,8 @@ def consume_from_topic(
                 "auto.offset.reset": auto_offset_reset,
                 "enable.auto.commit": "true" if auto_commit else "false",
                 "fetch.message.max.bytes": 2 * 1024 * 1024,
+                "api.version.request.timeout.ms": 15000,
+                "socket.timeout.ms": 30000,
             }
         )
         consumer = Consumer(consumer_config)