Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

move to production #3759

Merged
merged 10 commits into from
Oct 25, 2024
Merged

move to production #3759

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
1663a35
Update device registry staging image tag to stage-792d9b38-1729807076
github-actions[bot] Oct 24, 2024
2b9a335
Update AirQo exceedance production image tag to prod-3b544791-1729807166
github-actions[bot] Oct 24, 2024
783e5ce
Update KCCA exceedance production image tag to prod-3b544791-1729807166
github-actions[bot] Oct 24, 2024
e8a4c60
Update device registry production image tag to prod-3b544791-1729807166
github-actions[bot] Oct 24, 2024
9213bc2
Update workflows prod image tag to prod-3b544791-1729807166
github-actions[bot] Oct 24, 2024
4682f22
Update auth service production image tag to prod-3b544791-1729807166
github-actions[bot] Oct 24, 2024
a3f3036
Update analytics production image tag to prod-3b544791-1729807166
github-actions[bot] Oct 24, 2024
8322d12
Update predict production image tag to prod-3b544791-1729807166
github-actions[bot] Oct 24, 2024
b27533d
Cleanup/Sanitize
NicholasTurner23 Oct 25, 2024
5034b8b
Merge pull request #3758 from NicholasTurner23/update/Kafka-implement…
Baalmart Oct 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion k8s/analytics/values-prod.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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-5e76c979-1729804905
tag: prod-3b544791-1729807166
api:
name: airqo-analytics-api
label: analytics-api
Expand Down
2 changes: 1 addition & 1 deletion k8s/auth-service/values-prod.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ app:
replicaCount: 3
image:
repository: eu.gcr.io/airqo-250220/airqo-auth-api
tag: prod-5e76c979-1729804905
tag: prod-3b544791-1729807166
nameOverride: ''
fullnameOverride: ''
podAnnotations: {}
Expand Down
2 changes: 1 addition & 1 deletion k8s/device-registry/values-prod.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ app:
replicaCount: 3
image:
repository: eu.gcr.io/airqo-250220/airqo-device-registry-api
tag: prod-5e76c979-1729804905
tag: prod-3b544791-1729807166
nameOverride: ''
fullnameOverride: ''
podAnnotations: {}
Expand Down
2 changes: 1 addition & 1 deletion k8s/device-registry/values-stage.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ app:
replicaCount: 2
image:
repository: eu.gcr.io/airqo-250220/airqo-stage-device-registry-api
tag: stage-4f8b662e-1729719666
tag: stage-792d9b38-1729807076
nameOverride: ''
fullnameOverride: ''
podAnnotations: {}
Expand Down
2 changes: 1 addition & 1 deletion k8s/exceedance/values-prod-airqo.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@ app:
configmap: env-exceedance-production
image:
repository: eu.gcr.io/airqo-250220/airqo-exceedance-job
tag: prod-5e76c979-1729804905
tag: prod-3b544791-1729807166
nameOverride: ''
fullnameOverride: ''
2 changes: 1 addition & 1 deletion k8s/exceedance/values-prod-kcca.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@ app:
configmap: env-exceedance-production
image:
repository: eu.gcr.io/airqo-250220/kcca-exceedance-job
tag: prod-5e76c979-1729804905
tag: prod-3b544791-1729807166
nameOverride: ''
fullnameOverride: ''
2 changes: 1 addition & 1 deletion k8s/predict/values-prod.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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-5e76c979-1729804905
tag: prod-3b544791-1729807166
api:
name: airqo-prediction-api
label: prediction-api
Expand Down
2 changes: 1 addition & 1 deletion k8s/workflows/values-prod.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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-5e76c979-1729804905
tag: prod-3b544791-1729807166
nameOverride: ''
fullnameOverride: ''
podAnnotations: {}
Expand Down
3 changes: 0 additions & 3 deletions src/workflows/airqo_etl_utils/data_validator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -290,9 +290,6 @@ def transform_devices(devices: List[Dict[str, Any]], task_instance) -> pd.DataFr
pd.DataFrame: Transformed DataFrame if the devices data has changed since
the last execution; otherwise, an empty DataFrame.
"""
from .airqo_utils import (
AirQoDataUtils,
)
import hashlib

devices.rename(
Expand Down
6 changes: 4 additions & 2 deletions src/workflows/dags/airqo_kafka_workflows.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,16 @@ def airqo_devices_data():

@task()
def extract_devices(**kwargs) -> pd.DataFrame:
return AirQoApi.get_devices()
airqo_api = AirQoApi()
return airqo_api.get_devices()

@task()
def send_device_data_to_broker(devices: pd.DataFrame, **kwargs) -> None:
from airqo_etl_utils.message_broker_utils import MessageBrokerUtils
from airqo_etl_utils.data_validator import DataValidationUtils

devices = DataValidationUtils.transform_devices(
data_validation = DataValidationUtils()
devices = data_validation.transform_devices(
devices=devices, taskinstance=kwargs["ti"]
)
if not devices.empty:
Expand Down
Loading