From 33652acb901b43dde9596473bd2431568e95baea Mon Sep 17 00:00:00 2001 From: Taha Yassine Kraiem Date: Mon, 4 Jul 2022 16:16:54 +0200 Subject: [PATCH 1/7] feat(api): changed EE env handler --- ee/api/env_vars.sh | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/ee/api/env_vars.sh b/ee/api/env_vars.sh index 4375c3d89..bd73e14fa 100755 --- a/ee/api/env_vars.sh +++ b/ee/api/env_vars.sh @@ -7,21 +7,12 @@ else if [ -f "$override" ]; then cp $override .env.override override=.env.override - # to remove endOfLine form sed result - echo "" >> $override - sed 's/=.*//;/^$/d' $override > .replacements # to remove all defined os-env-vars - cat .replacements | while read line + cat $override | while read line do - unset $line + export $line done - rm .replacements - - # to merge predefined .env with the override.env - cp .env .env.d - sort -u -t '=' -k 1,1 $override .env.d > .env - rm .env.d else echo "$override does not exist." fi From 750308c765dcc703aae5ac58adb928ac6b1d1fe5 Mon Sep 17 00:00:00 2001 From: Taha Yassine Kraiem Date: Mon, 4 Jul 2022 16:31:05 +0200 Subject: [PATCH 2/7] feat(api): changed EE env handler --- ee/api/env_vars.sh | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/ee/api/env_vars.sh b/ee/api/env_vars.sh index bd73e14fa..7789501e4 100755 --- a/ee/api/env_vars.sh +++ b/ee/api/env_vars.sh @@ -7,12 +7,7 @@ else if [ -f "$override" ]; then cp $override .env.override override=.env.override - - # to remove all defined os-env-vars - cat $override | while read line - do - export $line - done + source $override else echo "$override does not exist." fi From 336992c91a2e7f0c624ef2419864a3b5f2bd46fe Mon Sep 17 00:00:00 2001 From: Taha Yassine Kraiem Date: Mon, 4 Jul 2022 16:43:13 +0200 Subject: [PATCH 3/7] feat(api): changed EE env handler --- ee/api/entrypoint.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ee/api/entrypoint.sh b/ee/api/entrypoint.sh index d8ca9fa4f..cd09d8fc1 100755 --- a/ee/api/entrypoint.sh +++ b/ee/api/entrypoint.sh @@ -1,5 +1,5 @@ #!/bin/bash -bash env_vars.sh +. env_vars.sh cd sourcemap-reader nohup npm start &> /tmp/sourcemap-reader.log & cd .. From b18945e59b98bb93f3ac687f0909438927c6f78d Mon Sep 17 00:00:00 2001 From: Taha Yassine Kraiem Date: Mon, 4 Jul 2022 16:52:13 +0200 Subject: [PATCH 4/7] feat(api): changed EE env handler --- ee/api/entrypoint.sh | 3 ++- ee/api/env_vars.sh | 3 +-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ee/api/entrypoint.sh b/ee/api/entrypoint.sh index cd09d8fc1..60396491c 100755 --- a/ee/api/entrypoint.sh +++ b/ee/api/entrypoint.sh @@ -1,5 +1,6 @@ #!/bin/bash -. env_vars.sh +bash env_vars.sh +source .env.override cd sourcemap-reader nohup npm start &> /tmp/sourcemap-reader.log & cd .. diff --git a/ee/api/env_vars.sh b/ee/api/env_vars.sh index 7789501e4..5892bd10c 100755 --- a/ee/api/env_vars.sh +++ b/ee/api/env_vars.sh @@ -6,9 +6,8 @@ else override=$ENV_CONFIG_OVERRIDE_PATH if [ -f "$override" ]; then cp $override .env.override - override=.env.override - source $override else + touch .env.override echo "$override does not exist." fi From 9808c4af4ff18b88f2edd2054004920add2ba002 Mon Sep 17 00:00:00 2001 From: Taha Yassine Kraiem Date: Mon, 4 Jul 2022 16:57:44 +0200 Subject: [PATCH 5/7] feat(crons): changed crons --- ee/api/app_crons.py | 37 +++++++++++++------------------------ 1 file changed, 13 insertions(+), 24 deletions(-) diff --git a/ee/api/app_crons.py b/ee/api/app_crons.py index ced170bd1..3dfea4fe4 100644 --- a/ee/api/app_crons.py +++ b/ee/api/app_crons.py @@ -1,30 +1,19 @@ print("============= CRONS =============") +import sys -import logging - -from apscheduler.schedulers.asyncio import AsyncIOScheduler -from decouple import config -from fastapi import FastAPI - -from routers.crons import core_crons, core_dynamic_crons - -app = FastAPI() +from routers.crons import core_dynamic_crons -@app.get("/") -async def root(): - return {"status": "Running"} +def process(action): + { + "TELEMETRY": core_dynamic_crons.telemetry_cron, + "JOB": core_dynamic_crons.run_scheduled_jobs, + "REPORT": core_dynamic_crons.weekly_report2 + }.get(action.upper(), lambda: print(f"{action} not found in crons-definitions"))() -app.schedule = AsyncIOScheduler() -app.schedule.start() - -if not config("LOCAL_CRONS", default=False, cast=bool): - for job in core_crons.cron_jobs + core_dynamic_crons.cron_jobs + core_dynamic_crons.SINGLE_CRONS: - app.schedule.add_job(id=job["func"].__name__, **job) - - logging.basicConfig(level=config("LOGLEVEL", default=logging.INFO)) - logging.getLogger('apscheduler').setLevel(config("LOGLEVEL", default=logging.INFO)) - -else: - print("Nothing to do because LOCAL_CRONS mode is enabled.") +if __name__ == '__main__': + if len(sys.argv) < 2 or len(sys.argv[1]) < 1: + print("please provide actions as argument") + else: + process(sys.argv[1]) From 5c39abac40e374a53c6a6228819dcdda9a327106 Mon Sep 17 00:00:00 2001 From: Taha Yassine Kraiem Date: Mon, 4 Jul 2022 17:09:25 +0200 Subject: [PATCH 6/7] feat(api): accept wrong metric_id --- api/routers/subs/metrics.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/api/routers/subs/metrics.py b/api/routers/subs/metrics.py index c68eec3e9..b8332aa85 100644 --- a/api/routers/subs/metrics.py +++ b/api/routers/subs/metrics.py @@ -142,7 +142,7 @@ def get_custom_metrics(projectId: int, context: schemas.CurrentContext = Depends @app.get('/{projectId}/metrics/{metric_id}', tags=["dashboard"]) @app.get('/{projectId}/custom_metrics/{metric_id}', tags=["customMetrics"]) -def get_custom_metric(projectId: int, metric_id: int, context: schemas.CurrentContext = Depends(OR_context)): +def get_custom_metric(projectId: int, metric_id: str, context: schemas.CurrentContext = Depends(OR_context)): data = custom_metrics.get(project_id=projectId, user_id=context.user_id, metric_id=metric_id) if data is None: return {"errors": ["custom metric not found"]} From de21f5d2493b69dfb4b52871bec5175ece628ff1 Mon Sep 17 00:00:00 2001 From: Taha Yassine Kraiem Date: Mon, 4 Jul 2022 17:10:34 +0200 Subject: [PATCH 7/7] feat(crons): changed env handler feat(api): changed env handler feat(alerts): changed env handler --- ee/api/entrypoint_alerts.sh | 1 + ee/api/entrypoint_crons.sh | 1 + 2 files changed, 2 insertions(+) diff --git a/ee/api/entrypoint_alerts.sh b/ee/api/entrypoint_alerts.sh index 3165a88c7..9d6c95358 100755 --- a/ee/api/entrypoint_alerts.sh +++ b/ee/api/entrypoint_alerts.sh @@ -1,3 +1,4 @@ #!/bin/bash bash env_vars.sh +source .env.override uvicorn app:app --host 0.0.0.0 --reload diff --git a/ee/api/entrypoint_crons.sh b/ee/api/entrypoint_crons.sh index cf2c18394..1817e547e 100755 --- a/ee/api/entrypoint_crons.sh +++ b/ee/api/entrypoint_crons.sh @@ -1,3 +1,4 @@ #!/bin/bash bash env_vars.sh +source .env.override uvicorn app:app --host 0.0.0.0 --reload --proxy-headers