From 800cc7d99d0a086e43f7b31b8a7c022a0d349abb Mon Sep 17 00:00:00 2001 From: vincue Date: Thu, 23 Dec 2021 14:24:30 +0530 Subject: [PATCH 1/2] Lambda config for anomaly detection --- .env | 4 ++++ .env.dev | 4 ++++ docker-compose-dev.yml | 3 +++ docker-compose.yml | 4 +++- ui/package.json | 2 +- 5 files changed, 15 insertions(+), 2 deletions(-) diff --git a/.env b/.env index cb3dd4d..7b1f084 100644 --- a/.env +++ b/.env @@ -27,3 +27,7 @@ IS_AUTHENTICATION_REQUIRED=False EMAIL_HOST="" ### ex smtp.gmail.com EMAIL_HOST_USER="" EMAIL_HOST_PASSWORD="" + +## LAMBDA +DETECTION_SERVICE_PLATFORM="" +AWS_LAMBDA_URL="" diff --git a/.env.dev b/.env.dev index 683fd1b..7d5d974 100644 --- a/.env.dev +++ b/.env.dev @@ -26,3 +26,7 @@ IS_AUTHENTICATION_REQUIRED=False EMAIL_HOST="" ### ex smtp.gmail.com EMAIL_HOST_USER="" EMAIL_HOST_PASSWORD="" + +## LAMBDA +DETECTION_SERVICE_PLATFORM="" +AWS_LAMBDA_URL="" diff --git a/docker-compose-dev.yml b/docker-compose-dev.yml index a2204d7..0d7ccee 100644 --- a/docker-compose-dev.yml +++ b/docker-compose-dev.yml @@ -36,6 +36,9 @@ services: DJANGO_SUPERUSER_PASSWORD: ${DJANGO_SUPERUSER_PASSWORD} DJANGO_SUPERUSER_EMAIL: ${DJANGO_SUPERUSER_EMAIL} IS_AUTHENTICATION_REQUIRED: ${IS_AUTHENTICATION_REQUIRED} + CELERY_RESULT_BACKEND: ${CELERY_RESULT_BACKEND} + DETECTION_SERVICE_PLATFORM: + AWS_LAMBDA_URL: network_mode: "host" cueo-alerts: diff --git a/docker-compose.yml b/docker-compose.yml index 6c74989..0dcc605 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -17,11 +17,13 @@ services: DJANGO_SUPERUSER_PASSWORD: ${DJANGO_SUPERUSER_PASSWORD} DJANGO_SUPERUSER_EMAIL: ${DJANGO_SUPERUSER_EMAIL} IS_AUTHENTICATION_REQUIRED: ${IS_AUTHENTICATION_REQUIRED} + CELERY_RESULT_BACKEND: ${CELERY_RESULT_BACKEND} REDIS_BROKER_URL: + DETECTION_SERVICE_PLATFORM: + AWS_LAMBDA_URL: volumes: - sqliteDB:/code/db:rw - djangoStaticFiles:/home/staticfiles:rw - cueo-alerts: build: context: alerts-api diff --git a/ui/package.json b/ui/package.json index 01ed1d7..366fd4c 100644 --- a/ui/package.json +++ b/ui/package.json @@ -27,7 +27,7 @@ "tailwindcss": "^2.2.16" }, "scripts": { - "start": "PORT=3030 react-scripts --max_old_space_size=4096 --optimize_for_size start", + "start": "PORT=3030 react-scripts --optimize_for_size start", "build": "react-scripts --max_old_space_size=4096 --optimize_for_size build && gulp licenses", "test": "react-scripts test", "eject": "react-scripts eject", From ed01928957d1b3f2970842179e2945a358af17ab Mon Sep 17 00:00:00 2001 From: vincue Date: Mon, 27 Dec 2021 13:31:26 +0530 Subject: [PATCH 2/2] Added Lambda config variables --- .env | 1 + .env.dev | 1 + aws_lambda_setup.sh | 0 docker-compose-prod.yml | 4 +++- docker-compose.yml | 6 +++--- 5 files changed, 8 insertions(+), 4 deletions(-) mode change 100644 => 100755 aws_lambda_setup.sh diff --git a/.env b/.env index 7b1f084..8ff9c47 100644 --- a/.env +++ b/.env @@ -31,3 +31,4 @@ EMAIL_HOST_PASSWORD="" ## LAMBDA DETECTION_SERVICE_PLATFORM="" AWS_LAMBDA_URL="" +## AWS_LAMBDA_URL=https://asdf3adf9.execute-api..amazonaws.com/default/testCueobserveAnomalyDetection diff --git a/.env.dev b/.env.dev index 7d5d974..ceee939 100644 --- a/.env.dev +++ b/.env.dev @@ -30,3 +30,4 @@ EMAIL_HOST_PASSWORD="" ## LAMBDA DETECTION_SERVICE_PLATFORM="" AWS_LAMBDA_URL="" +## AWS_LAMBDA_URL=https://asdf3adf9.execute-api..amazonaws.com/default/testCueobserveAnomalyDetection diff --git a/aws_lambda_setup.sh b/aws_lambda_setup.sh old mode 100644 new mode 100755 diff --git a/docker-compose-prod.yml b/docker-compose-prod.yml index 33d011d..0f775bf 100644 --- a/docker-compose-prod.yml +++ b/docker-compose-prod.yml @@ -17,6 +17,8 @@ services: IS_AUTHENTICATION_REQUIRED: ${IS_AUTHENTICATION_REQUIRED} REDIS_BROKER_URL: ${REDIS_BROKER_URL} CELERY_RESULT_BACKEND: ${CELERY_RESULT_BACKEND} + DETECTION_SERVICE_PLATFORM: + AWS_LAMBDA_URL: volumes: - sqliteDB:/code/db:rw - djangoStaticFiles:/home/staticfiles:rw @@ -41,7 +43,7 @@ services: - "cueo-backend" - "cueo-redis" volumes: - - djangoStaticFiles:/home/staticfiles:rw + - djangoStaticFiles:/home/staticfiles:ro cueo-redis: image: redis diff --git a/docker-compose.yml b/docker-compose.yml index 0dcc605..e5228e1 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -18,9 +18,9 @@ services: DJANGO_SUPERUSER_EMAIL: ${DJANGO_SUPERUSER_EMAIL} IS_AUTHENTICATION_REQUIRED: ${IS_AUTHENTICATION_REQUIRED} CELERY_RESULT_BACKEND: ${CELERY_RESULT_BACKEND} - REDIS_BROKER_URL: - DETECTION_SERVICE_PLATFORM: - AWS_LAMBDA_URL: + REDIS_BROKER_URL: ${REDIS_BROKER_URL} + DETECTION_SERVICE_PLATFORM: ${DETECTION_SERVICE_PLATFORM} + AWS_LAMBDA_URL: ${AWS_LAMBDA_URL} volumes: - sqliteDB:/code/db:rw - djangoStaticFiles:/home/staticfiles:rw