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 #4070

Merged
merged 13 commits into from
Dec 13, 2024
Merged

move to production #4070

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
ea2c422
Update website production image tag to prod-7c9244bc-1734092169
github-actions[bot] Dec 13, 2024
fcfda1d
Update workflows prod image tag to prod-7c9244bc-1734092169
github-actions[bot] Dec 13, 2024
e257100
Update analytics production image tag to prod-7c9244bc-1734092169
github-actions[bot] Dec 13, 2024
c3a2e46
Update predict production image tag to prod-7c9244bc-1734092169
github-actions[bot] Dec 13, 2024
1ad845b
Update workflows staging image tag to stage-78c653a5-1734092306
github-actions[bot] Dec 13, 2024
4b7f426
Update auth service production image tag to prod-a00e783d-1734092401
github-actions[bot] Dec 13, 2024
7028c34
Update device registry production image tag to prod-a00e783d-1734092401
github-actions[bot] Dec 13, 2024
ffdbe1b
Update KCCA exceedance production image tag to prod-a00e783d-1734092401
github-actions[bot] Dec 13, 2024
23fe718
Update workflows prod image tag to prod-a00e783d-1734092401
github-actions[bot] Dec 13, 2024
d8cdae1
Update spatial production image tag to prod-7c9244bc-1734092169
github-actions[bot] Dec 13, 2024
5a2ac8d
Just some cleanup
NicholasTurner23 Dec 13, 2024
44abcbc
Merge branch 'staging' into update-fix/Clean_up
NicholasTurner23 Dec 13, 2024
549b847
Merge pull request #4068 from NicholasTurner23/update-fix/Clean_up
Baalmart Dec 13, 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-875fce3e-1734088534
tag: prod-7c9244bc-1734092169
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-7c9244bc-1734092169
tag: prod-a00e783d-1734092401
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-7c9244bc-1734092169
tag: prod-a00e783d-1734092401
nameOverride: ''
fullnameOverride: ''
podAnnotations: {}
Expand Down
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-7c9244bc-1734092169
tag: prod-a00e783d-1734092401
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-875fce3e-1734088534
tag: prod-7c9244bc-1734092169
api:
name: airqo-prediction-api
label: prediction-api
Expand Down
2 changes: 1 addition & 1 deletion k8s/spatial/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-spatial-api
tag: prod-875fce3e-1734088534
tag: prod-7c9244bc-1734092169
nameOverride: ''
fullnameOverride: ''
podAnnotations: {}
Expand Down
2 changes: 1 addition & 1 deletion k8s/website/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-website-api
tag: prod-875fce3e-1734088534
tag: prod-7c9244bc-1734092169
nameOverride: ''
fullnameOverride: ''
podAnnotations: {}
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-875fce3e-1734088534
tag: prod-a00e783d-1734092401
nameOverride: ''
fullnameOverride: ''
podAnnotations: {}
Expand Down
2 changes: 1 addition & 1 deletion k8s/workflows/values-stage.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-stage-workflows-xcom
redisContainer: eu.gcr.io/airqo-250220/airqo-stage-redis
containers: eu.gcr.io/airqo-250220/airqo-stage-workflows
tag: stage-40bbbd59-1734088481
tag: stage-78c653a5-1734092306
nameOverride: ''
fullnameOverride: ''
podAnnotations: {}
Expand Down
11 changes: 7 additions & 4 deletions src/analytics/api/views/data.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,11 +163,14 @@ def post(self):
)
if minimum_output:
# Drop unnecessary columns
columns_to_drop = ["site_id"]
columns_to_drop.append("timestamp") if frequency in [
"hourly",
"daily",
] else columns_to_drop
print(data_frame.columns.to_list())
data_frame.drop(
columns=[
"site_id",
"timestamp",
],
columns=columns_to_drop,
inplace=True,
)

Expand Down
Loading