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.

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

♻️ Clean up simcore webserver environment ⚠️ DEVOPS #4491

Merged
merged 32 commits into from
Jul 31, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
e005101
Clean up simcore webserver environment
YuryHrytsuk Jul 12, 2023
1643fbe
Add WEBSERVER_ACTIVITY
YuryHrytsuk Jul 14, 2023
4ce375b
Fix project variables
YuryHrytsuk Jul 14, 2023
b9aa157
Merge branch 'master' into clean-up-webserver-env
YuryHrytsuk Jul 14, 2023
b436532
Fixing tests
YuryHrytsuk Jul 14, 2023
0e6e483
Merge branch 'master' into clean-up-webserver-env
YuryHrytsuk Jul 14, 2023
81e1f70
Stop using json env variables
YuryHrytsuk Jul 17, 2023
a25e602
Fix mock environment
YuryHrytsuk Jul 17, 2023
463e946
Fix login setup
YuryHrytsuk Jul 18, 2023
1693065
Fix garbage collector unit tests
YuryHrytsuk Jul 18, 2023
0ffb179
Propagate new env names
YuryHrytsuk Jul 18, 2023
fe63d28
Fix garbage collector tests
YuryHrytsuk Jul 18, 2023
162b44a
Fix exporter variable
YuryHrytsuk Jul 18, 2023
26f4f40
Add missing WEBSERVER_LOGLEVEL
YuryHrytsuk Jul 18, 2023
215b682
Fix variable `STUDIES_ACCESS_ANONYMOUS_ALLOWED`
YuryHrytsuk Jul 18, 2023
bce288f
Return to one-liner volumes
YuryHrytsuk Jul 19, 2023
51387c2
Remove `dask-scheduler` env validation
YuryHrytsuk Jul 19, 2023
c1fcd84
Add LOGIN_2FA_CODE_EXPIRATION_SEC env
YuryHrytsuk Jul 19, 2023
38b881c
Update webserver related services env
YuryHrytsuk Jul 20, 2023
88af0b1
Merge branch 'master' into clean-up-webserver-env
YuryHrytsuk Jul 20, 2023
840ab12
Merge branch 'master' into clean-up-webserver-env
YuryHrytsuk Jul 20, 2023
25e3491
Update webserver garbage collector and event db listener env
YuryHrytsuk Jul 21, 2023
338f109
Merge branch 'master' into clean-up-webserver-env
YuryHrytsuk Jul 24, 2023
332c5b3
Merge branch 'master' into clean-up-webserver-env
YuryHrytsuk Jul 26, 2023
817bff8
Add missing envs
YuryHrytsuk Jul 28, 2023
ccebdc1
Update .env-devel
YuryHrytsuk Jul 28, 2023
8aaada7
Add missing envs to .env-devel
YuryHrytsuk Jul 28, 2023
d6600c3
Merge branch 'master' into clean-up-webserver-env
YuryHrytsuk Jul 28, 2023
c5367d4
Add missing env
YuryHrytsuk Jul 28, 2023
8c6bace
Merge branch 'master' into clean-up-webserver-env
YuryHrytsuk Jul 28, 2023
7fca09b
Merge branch 'master' into clean-up-webserver-env
YuryHrytsuk Jul 31, 2023
d89e2b3
Merge branch 'master' into clean-up-webserver-env
YuryHrytsuk Jul 31, 2023
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
143 changes: 136 additions & 7 deletions .env-devel
Original file line number Diff line number Diff line change
Expand Up @@ -81,8 +81,6 @@ S3_ENDPOINT=172.17.0.1:9001
S3_SECRET_KEY=12345678
S3_SECURE=0



SCICRUNCH_API_BASE_URL=https://scicrunch.org/api/1
SCICRUNCH_API_KEY=REPLACE_ME_with_valid_api_key

Expand All @@ -105,19 +103,83 @@ TRACING_THRIFT_COMPACT_ENDPOINT=http://jaeger:5775
TRAEFIK_SIMCORE_ZONE=internal_simcore_stack

# NOTE: WEBSERVER_SESSION_SECRET_KEY = $(python3 -c "from cryptography.fernet import Fernet; print(Fernet.generate_key())")

WEBSERVER_LOGLEVEL=INFO

WEBSERVER_PROJECTS={}
PROJECTS_MAX_COPY_SIZE_BYTES=30Gib
PROJECTS_MAX_NUM_RUNNING_DYNAMIC_NODES=5

WEBSERVER_ANNOUNCEMENTS=1

WEBSERVER_DEV_FEATURES_ENABLED=0

WEBSERVER_HOST=webserver
WEBSERVER_LOGIN_REGISTRATION_CONFIRMATION_REQUIRED=0
WEBSERVER_LOGIN_REGISTRATION_INVITATION_REQUIRED=0

WEBSERVER_CATALOG={}
CATALOG_HOST=catalog
CATALOG_PORT=8000

WEBSERVER_SCICRUNCH={}

WEBSERVER_SESSION_SECRET_KEY='REPLACE_ME_with_result__Fernet_generate_key='

WEBSERVER_STATICWEB={}

WEBSERVER_STUDIES_DISPATCHER={}
STUDIES_ACCESS_ANONYMOUS_ALLOWED=0
STUDIES_DEFAULT_SERVICE_THUMBNAIL=https://via.placeholder.com/170x120.png

WEBSERVER_TRACING={}

WEBSERVER_GUNICORN_CMD_ARGS=--timeout=180

WEBSERVER_EXPORTER={}

WEBSERVER_EMAIL={}

DIRECTOR_HOST=director
DIRECTOR_PORT=8080

DIRECTOR_V2_HOST=director-v2
DIRECTOR_V2_PORT=8000

WEBSERVER_DIAGNOSTICS={}
DIAGNOSTICS_MAX_AVG_LATENCY=10
DIAGNOSTICS_MAX_TASK_DELAY=30
DIAGNOSTICS_SLOW_DURATION_SECS=1

WEBSERVER_GARBAGE_COLLECTOR=null

WEBSERVER_DB_LISTENER=0

WEBSERVER_LOGIN={}
LOGIN_REGISTRATION_CONFIRMATION_REQUIRED=0
LOGIN_REGISTRATION_INVITATION_REQUIRED=0
LOGIN_2FA_REQUIRED=0
LOGIN_2FA_CODE_EXPIRATION_SEC=60

WEBSERVER_FRONTEND={}

WEBSERVER_ACTIVITY=null
WEBSERVER_PROMETHEUS_API_VERSION=v1
WEBSERVER_PROMETHEUS_URL=http://prometheus:9090
WEBSERVER_RESOURCES_DELETION_TIMEOUT_SECONDS=900
WEBSERVER_SESSION_SECRET_KEY='REPLACE_ME_with_result__Fernet_generate_key='
WEBSERVER_STUDIES_ACCESS_ENABLED=0

RESOURCE_MANAGER_RESOURCE_TTL_S=900

RESOURCE_USAGE_TRACKER_HOST=resource-usage-tracker

WEBSERVER_NOTIFICATIONS=1

WEBSERVER_CLUSTERS=0
WEBSERVER_GROUPS=1
WEBSERVER_META_MODELING=1
WEBSERVER_PRODUCTS=1
WEBSERVER_PUBLICATIONS=1
WEBSERVER_SOCKETIO=1
WEBSERVER_TAGS=1
WEBSERVER_USERS=1
WEBSERVER_VERSION_CONTROL=1

# For development ONLY ---------------
#
Expand All @@ -128,3 +190,70 @@ WEBSERVER_STUDIES_ACCESS_ENABLED=0
# PYTHONTRACEMALLOC=1
#
# ------------------------------------

AIODEBUG_SLOW_DURATION_SECS=0

# Webserver Garbage Collector

# the same in all deployments
WB_GC_LOGLEVEL=DEBUG

WB_GC_GARBAGE_COLLECTOR='{"GARBAGE_COLLECTOR_INTERVAL_S": 30}'
WB_GC_RESOURCE_MANAGER_RESOURCE_TTL_S=60

WB_GC_ANNOUNCEMENTS=0
WB_GC_ACTIVITY=null
WB_GC_CATALOG=null
WB_GC_NOTIFICATIONS=0
WB_GC_DB_LISTENER=0
WB_GC_DIAGNOSTICS=null
WB_GC_EMAIL=null
WB_GC_EXPORTER=null
WB_GC_FRONTEND=null
WB_GC_LOGIN=null
WB_GC_PROJECTS=null
WB_GC_SCICRUNCH=null
WB_GC_STATICWEB=null

WB_GC_TRACING=null
WB_GC_CLUSTERS=0
WB_GC_GROUPS=0
WB_GC_META_MODELING=0
WB_GC_PRODUCTS=0
WB_GC_PUBLICATIONS=0
WB_GC_SOCKETIO=1
WB_GC_STUDIES_DISPATCHER=null
WB_GC_TAGS=0
WB_GC_USERS=0
WB_GC_VERSION_CONTROL=0

# WebServer DB Event Listener

WB_DB_EL_LOGLEVEL=DEBUG
WB_DB_EL_DB_LISTENER=1
WB_DB_EL_SOCKETIO=1

WB_DB_EL_ANNOUNCEMENTS=0
WB_DB_EL_ACTIVITY=null
WB_DB_EL_CATALOG=null
WB_DB_EL_NOTIFICATIONS=0
WB_DB_EL_DIAGNOSTICS=null
WB_DB_EL_EMAIL=null
WB_DB_EL_EXPORTER=null
WB_DB_EL_FRONTEND=null
WB_DB_EL_GARBAGE_COLLECTOR=null
WB_DB_EL_LOGIN=null
WB_DB_EL_PROJECTS=null
WB_DB_EL_SCICRUNCH=null
WB_DB_EL_STATICWEB=null
WB_DB_EL_STORAGE=null
WB_DB_EL_STUDIES_DISPATCHER=null
WB_DB_EL_TRACING=null
WB_DB_EL_CLUSTERS=0
WB_DB_EL_GROUPS=0
WB_DB_EL_META_MODELING=0
WB_DB_EL_PRODUCTS=0
WB_DB_EL_PUBLICATIONS=0
WB_DB_EL_TAGS=0
WB_DB_EL_USERS=0
WB_DB_EL_VERSION_CONTROL=0
38 changes: 0 additions & 38 deletions .env-wb-db-event-listener

This file was deleted.

38 changes: 0 additions & 38 deletions .env-wb-garbage-collector

This file was deleted.

3 changes: 2 additions & 1 deletion services/docker-compose.devel.yml
Original file line number Diff line number Diff line change
Expand Up @@ -95,14 +95,15 @@ services:
volumes: *webserver-volumes-dev
environment:
<<: *webserver-environment-dev
WEBSERVER_RESOURCES_DELETION_TIMEOUT_SECONDS: 15
RESOURCE_MANAGER_RESOURCE_TTL_S: 15

dask-sidecar:
volumes:
&dev-dask-sidecar-volumes
- ./dask-sidecar:/devel/services/dask-sidecar
- ../packages:/devel/packages
- ${ETC_HOSTNAME:-/etc/hostname}:/home/scu/hostname:ro

environment:
SC_BOOT_MODE: debug-ptvsd
SIDECAR_LOGLEVEL: DEBUG
Expand Down
Loading