Skip to content

Commit 04d2d2c

Browse files
authored
Merge branch 'master' into feature/trash-bin
2 parents 7cc9eb2 + b7814bb commit 04d2d2c

File tree

129 files changed

+1441
-540
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

129 files changed

+1441
-540
lines changed

.env-devel

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
# unset $(grep -v '^#' .env | sed -E 's/(.*)=.*/\1/' | xargs)
1111
#
1212

13-
AGENT_LOGLEVEL=WARNING
13+
AGENT_LOGLEVEL=INFO
1414
AGENT_VOLUMES_CLEANUP_S3_ACCESS_KEY=12345678
1515
AGENT_VOLUMES_CLEANUP_S3_BUCKET=simcore-volume-backups
1616
AGENT_VOLUMES_CLEANUP_S3_ENDPOINT=http://172.17.0.1:9001
@@ -19,7 +19,7 @@ AGENT_VOLUMES_CLEANUP_S3_REGION=us-east-1
1919
AGENT_VOLUMES_CLEANUP_S3_SECRET_KEY=12345678
2020

2121
API_SERVER_DEV_FEATURES_ENABLED=0
22-
API_SERVER_LOGLEVEL=WARNING
22+
API_SERVER_LOGLEVEL=INFO
2323
API_SERVER_PROFILING=1
2424
TRAEFIK_API_SERVER_INFLIGHTREQ_AMOUNT=25
2525

@@ -29,7 +29,7 @@ AUTOSCALING_DOCKER_JOIN_DRAINED=True
2929
AUTOSCALING_WAIT_FOR_CLOUD_INIT_BEFORE_WARM_BUFFER_ACTIVATION=False
3030
AUTOSCALING_EC2_ACCESS=null
3131
AUTOSCALING_EC2_INSTANCES=null
32-
AUTOSCALING_LOGLEVEL=WARNING
32+
AUTOSCALING_LOGLEVEL=INFO
3333
AUTOSCALING_NODES_MONITORING=null
3434
AUTOSCALING_POLL_INTERVAL=10
3535
AUTOSCALING_SSM_ACCESS=null
@@ -39,7 +39,7 @@ AWS_S3_CLI_S3=null
3939
CATALOG_BACKGROUND_TASK_REST_TIME=60
4040
CATALOG_DEV_FEATURES_ENABLED=0
4141
CATALOG_HOST=catalog
42-
CATALOG_LOGLEVEL=WARNING
42+
CATALOG_LOGLEVEL=INFO
4343
CATALOG_PORT=8000
4444
CATALOG_PROFILING=1
4545
CATALOG_SERVICES_DEFAULT_RESOURCES='{"CPU": {"limit": 0.1, "reservation": 0.1}, "RAM": {"limit": 2147483648, "reservation": 2147483648}}'
@@ -52,15 +52,15 @@ CLUSTERS_KEEPER_DASK_WORKER_SATURATION=inf
5252
CLUSTERS_KEEPER_EC2_ACCESS=null
5353
CLUSTERS_KEEPER_SSM_ACCESS=null
5454
CLUSTERS_KEEPER_EC2_INSTANCES_PREFIX=""
55-
CLUSTERS_KEEPER_LOGLEVEL=WARNING
55+
CLUSTERS_KEEPER_LOGLEVEL=INFO
5656
CLUSTERS_KEEPER_MAX_MISSED_HEARTBEATS_BEFORE_CLUSTER_TERMINATION=5
5757
CLUSTERS_KEEPER_PRIMARY_EC2_INSTANCES=null
5858
CLUSTERS_KEEPER_TASK_INTERVAL=30
5959
CLUSTERS_KEEPER_WORKERS_EC2_INSTANCES=null
6060

6161
DASK_SCHEDULER_HOST=dask-scheduler
6262
DASK_SCHEDULER_PORT=8786
63-
DASK_SIDECAR_LOGLEVEL=WARNING
63+
DASK_SIDECAR_LOGLEVEL=INFO
6464
DASK_TLS_CA_FILE=/home/scu/.dask/dask-crt.pem
6565
DASK_TLS_CERT=/home/scu/.dask/dask-crt.pem
6666
DASK_TLS_KEY=/home/scu/.dask/dask-key.pem
@@ -91,7 +91,7 @@ DIRECTOR_V2_DYNAMIC_SCHEDULER_CLOSE_SERVICES_VIA_FRONTEND_WHEN_CREDITS_LIMIT_REA
9191
DIRECTOR_V2_DYNAMIC_SIDECAR_SLEEP_AFTER_CONTAINER_REMOVAL=0
9292
DIRECTOR_V2_GENERIC_RESOURCE_PLACEMENT_CONSTRAINTS_SUBSTITUTIONS='{}'
9393
DIRECTOR_V2_HOST=director-v2
94-
DIRECTOR_V2_LOGLEVEL=WARNING
94+
DIRECTOR_V2_LOGLEVEL=INFO
9595
DIRECTOR_V2_NODE_PORTS_STORAGE_AUTH=null
9696
DIRECTOR_V2_PORT=8000
9797
DIRECTOR_V2_PROFILING=1
@@ -115,7 +115,7 @@ FUNCTION_SERVICES_AUTHORS='{"UN": {"name": "Unknown", "email": "[email protected]
115115
# Can use 'docker run -it itisfoundation/invitations:latest simcore-service-invitations generate-dotenv --auto-password'
116116
INVITATIONS_DEFAULT_PRODUCT=osparc
117117
INVITATIONS_HOST=invitations
118-
INVITATIONS_LOGLEVEL=WARNING
118+
INVITATIONS_LOGLEVEL=INFO
119119
INVITATIONS_OSPARC_URL=http://127.0.0.1.nip.io:9081
120120
INVITATIONS_PASSWORD=adminadmin
121121
INVITATIONS_PORT=8000
@@ -124,6 +124,7 @@ INVITATIONS_SWAGGER_API_DOC_ENABLED=1
124124
INVITATIONS_USERNAME=admin
125125

126126
LOG_FORMAT_LOCAL_DEV_ENABLED=1
127+
LOG_FILTER_MAPPING='{}'
127128

128129
PAYMENTS_ACCESS_TOKEN_EXPIRE_MINUTES=30
129130
PAYMENTS_ACCESS_TOKEN_SECRET_KEY=2c0411810565e063309be1457009fb39ce023946f6a354e6935107b57676
@@ -138,7 +139,7 @@ PAYMENTS_FAKE_COMPLETION=0
138139
PAYMENTS_GATEWAY_API_SECRET=adminadmin
139140
PAYMENTS_GATEWAY_URL=http://127.0.0.1:32769
140141
PAYMENTS_HOST=payments
141-
PAYMENTS_LOGLEVEL=WARNING
142+
PAYMENTS_LOGLEVEL=INFO
142143
PAYMENTS_PASSWORD=adminadmin
143144
PAYMENTS_PORT=8000
144145
PAYMENTS_STRIPE_API_SECRET='REPLACE_ME_with_api_secret'
@@ -179,7 +180,7 @@ RESOURCE_MANAGER_RESOURCE_TTL_S=900
179180
RESOURCE_USAGE_TRACKER_HOST=resource-usage-tracker
180181
RESOURCE_USAGE_TRACKER_PORT=8000
181182
RESOURCE_USAGE_TRACKER_EXTERNAL_PORT=8000
182-
RESOURCE_USAGE_TRACKER_LOGLEVEL=WARNING
183+
RESOURCE_USAGE_TRACKER_LOGLEVEL=INFO
183184
RESOURCE_USAGE_TRACKER_MISSED_HEARTBEAT_CHECK_ENABLED=1
184185
RESOURCE_USAGE_TRACKER_MISSED_HEARTBEAT_COUNTER_FAIL=6
185186
RESOURCE_USAGE_TRACKER_MISSED_HEARTBEAT_INTERVAL_SEC=300
@@ -214,7 +215,7 @@ BF_API_KEY=none
214215
BF_API_SECRET=none
215216
STORAGE_ENDPOINT=storage:8080
216217
STORAGE_HOST=storage
217-
STORAGE_LOGLEVEL=WARNING
218+
STORAGE_LOGLEVEL=INFO
218219
STORAGE_PORT=8080
219220
STORAGE_PROFILING=1
220221
# STORAGE ----
@@ -245,7 +246,7 @@ WB_GC_GARBAGE_COLLECTOR='{"GARBAGE_COLLECTOR_INTERVAL_S": 30}'
245246
WB_GC_GROUPS=0
246247
WB_GC_INVITATIONS=null
247248
WB_GC_LOGIN=null
248-
WB_GC_LOGLEVEL=WARNING
249+
WB_GC_LOGLEVEL=INFO
249250
WB_GC_META_MODELING=0
250251
WB_GC_NOTIFICATIONS=0
251252
WB_GC_PAYMENTS=null
@@ -278,7 +279,7 @@ WB_DB_EL_GARBAGE_COLLECTOR=null
278279
WB_DB_EL_GROUPS=0
279280
WB_DB_EL_INVITATIONS=null
280281
WB_DB_EL_LOGIN=null
281-
WB_DB_EL_LOGLEVEL=WARNING
282+
WB_DB_EL_LOGLEVEL=INFO
282283
WB_DB_EL_META_MODELING=0
283284
WB_DB_EL_NOTIFICATIONS=0
284285
WB_DB_EL_PAYMENTS=null
@@ -348,7 +349,7 @@ WEBSERVER_GROUPS=1
348349
WEBSERVER_GUNICORN_CMD_ARGS=--timeout=180
349350
WEBSERVER_HOST=webserver
350351
WEBSERVER_LOGIN={}
351-
WEBSERVER_LOGLEVEL=WARNING
352+
WEBSERVER_LOGLEVEL=INFO
352353
WEBSERVER_META_MODELING=1
353354
WEBSERVER_NOTIFICATIONS=1
354355
WEBSERVER_PAYMENTS={}

0 commit comments

Comments
 (0)