Merge branch 'staging' into update/Integration-iqair-devices

Updates from airqo staging
airqo-platform · Dec 4, 2024 · cd0063a · cd0063a
2 parents aa2dfeb + 4718807
commit cd0063a
Show file tree

Hide file tree

Showing 11 changed files with 15 additions and 11 deletions.
diff --git a/k8s/auth-service/values-prod.yaml b/k8s/auth-service/values-prod.yaml
@@ -6,7 +6,7 @@ app:
 replicaCount: 3
 image:
   repository: eu.gcr.io/airqo-250220/airqo-auth-api
-  tag: prod-877d4dac-1733224973
+  tag: prod-1ea1da62-1733249735
 nameOverride: ''
 fullnameOverride: ''
 podAnnotations: {}

diff --git a/k8s/auth-service/values-stage.yaml b/k8s/auth-service/values-stage.yaml
@@ -6,7 +6,7 @@ app:
 replicaCount: 2
 image:
   repository: eu.gcr.io/airqo-250220/airqo-stage-auth-api
-  tag: stage-fc6cf1bc-1733223452
+  tag: stage-1838aa7a-1733249623
 nameOverride: ''
 fullnameOverride: ''
 podAnnotations: {}

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-877d4dac-1733224973
+  tag: prod-03a25cf1-1733249950
 nameOverride: ''
 fullnameOverride: ''
 podAnnotations: {}

diff --git a/k8s/device-registry/values-stage.yaml b/k8s/device-registry/values-stage.yaml
@@ -6,7 +6,7 @@ app:
 replicaCount: 2
 image:
   repository: eu.gcr.io/airqo-250220/airqo-stage-device-registry-api
-  tag: stage-fc6cf1bc-1733223452
+  tag: stage-1838aa7a-1733249623
 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-877d4dac-1733224973
+  tag: prod-03a25cf1-1733249950
 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-877d4dac-1733224973
+  tag: prod-03a25cf1-1733249950
 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-877d4dac-1733224973
+  tag: prod-1ea1da62-1733249735
 api:
   name: airqo-prediction-api
   label: prediction-api

diff --git a/k8s/spatial/values-prod.yaml b/k8s/spatial/values-prod.yaml
@@ -6,7 +6,7 @@ app:
 replicaCount: 3
 image:
   repository: eu.gcr.io/airqo-250220/airqo-spatial-api
-  tag: prod-877d4dac-1733224973
+  tag: prod-1ea1da62-1733249735
 nameOverride: ''
 fullnameOverride: ''
 podAnnotations: {}

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-877d4dac-1733224973
+  tag: prod-03a25cf1-1733249950
 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-7f60b036-1733224934
+  tag: stage-e06dd73e-1733249810
 nameOverride: ''
 fullnameOverride: ''
 podAnnotations: {}

diff --git a/src/device-registry/config/global/mappings.js b/src/device-registry/config/global/mappings.js
@@ -37,7 +37,11 @@ const mappings = {
   PREDEFINED_FILTER_VALUES: {
     NETWORKS: ["metone", "usembassy"],
     COMBINATIONS: {
-      NETWORK_PAIRS: [["metone", "usembassy"], ["kcca", "clarity"]],
+      NETWORK_PAIRS: [
+        ["metone", "usembassy", "us_embassy"],
+        ["kcca", "clarity"],
+        ["urbanbetter", "airbeam", "urban_better"],
+      ],
       GROUP_PAIRS: [["metone", "usembassy"], ["kcca", "clarity"]],
       STATUS_PAIRS: [
         ["active", "enabled", "running"],