Skip to content

Commit a502a5f

Browse files
author
Andrei Neagu
committed
Merge remote-tracking branch 'upstream/master' into pr-osparc-dynamic-scheduler-monitoring-dashboard-mount-point
2 parents 4c7ce84 + bf06671 commit a502a5f

File tree

235 files changed

+4883
-3858
lines changed

Some content is hidden

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

235 files changed

+4883
-3858
lines changed

.codecov.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ component_management:
2222
statuses:
2323
- type: project
2424
target: auto
25+
threshold: 1%
2526
branches:
2627
- "!master"
2728
individual_components:

.env-devel

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@ AGENT_VOLUMES_CLEANUP_S3_ENDPOINT=http://172.17.0.1:9001
1717
AGENT_VOLUMES_CLEANUP_S3_PROVIDER=MINIO
1818
AGENT_VOLUMES_CLEANUP_S3_REGION=us-east-1
1919
AGENT_VOLUMES_CLEANUP_S3_SECRET_KEY=12345678
20-
AGENT_TRACING={}
20+
AGENT_TRACING=null
2121

2222
API_SERVER_DEV_FEATURES_ENABLED=0
2323
API_SERVER_LOGLEVEL=INFO
2424
API_SERVER_PROFILING=1
25-
API_SERVER_TRACING={}
25+
API_SERVER_TRACING=null
2626
TRAEFIK_API_SERVER_INFLIGHTREQ_AMOUNT=25
2727

2828
AUTOSCALING_DASK=null
@@ -35,7 +35,7 @@ AUTOSCALING_LOGLEVEL=INFO
3535
AUTOSCALING_NODES_MONITORING=null
3636
AUTOSCALING_POLL_INTERVAL="00:00:10"
3737
AUTOSCALING_SSM_ACCESS=null
38-
AUTOSCALING_TRACING={}
38+
AUTOSCALING_TRACING=null
3939

4040
AWS_S3_CLI_S3=null
4141

@@ -47,7 +47,7 @@ CATALOG_PORT=8000
4747
CATALOG_PROFILING=1
4848
CATALOG_SERVICES_DEFAULT_RESOURCES='{"CPU": {"limit": 0.1, "reservation": 0.1}, "RAM": {"limit": 2147483648, "reservation": 2147483648}}'
4949
CATALOG_SERVICES_DEFAULT_SPECIFICATIONS='{}'
50-
CATALOG_TRACING={}
50+
CATALOG_TRACING=null
5151

5252
CLUSTERS_KEEPER_COMPUTATIONAL_BACKEND_DEFAULT_CLUSTER_AUTH='{"type":"tls","tls_ca_file":"/home/scu/.dask/dask-crt.pem","tls_client_cert":"/home/scu/.dask/dask-crt.pem","tls_client_key":"/home/scu/.dask/dask-key.pem"}'
5353
CLUSTERS_KEEPER_COMPUTATIONAL_BACKEND_DOCKER_IMAGE_TAG=master-github-latest
@@ -61,7 +61,7 @@ CLUSTERS_KEEPER_MAX_MISSED_HEARTBEATS_BEFORE_CLUSTER_TERMINATION=5
6161
CLUSTERS_KEEPER_PRIMARY_EC2_INSTANCES=null
6262
CLUSTERS_KEEPER_TASK_INTERVAL=00:00:30
6363
CLUSTERS_KEEPER_WORKERS_EC2_INSTANCES=null
64-
CLUSTERS_KEEPER_TRACING={}
64+
CLUSTERS_KEEPER_TRACING=null
6565

6666
DASK_SCHEDULER_HOST=dask-scheduler
6767
DASK_SCHEDULER_PORT=8786
@@ -81,7 +81,7 @@ DIRECTOR_PUBLISHED_HOST_NAME="127.0.0.1:9081"
8181
DIRECTOR_REGISTRY_CACHING_TTL=00:15:00
8282
DIRECTOR_REGISTRY_CACHING=True
8383
DIRECTOR_SERVICES_CUSTOM_CONSTRAINTS=null
84-
DIRECTOR_TRACING={}
84+
DIRECTOR_TRACING=null
8585

8686
EFS_USER_ID=8006
8787
EFS_USER_NAME=efs
@@ -90,11 +90,11 @@ EFS_GROUP_NAME=efs-group
9090
EFS_DNS_NAME=fs-xxx.efs.us-east-1.amazonaws.com
9191
EFS_MOUNTED_PATH=/tmp/efs
9292
EFS_PROJECT_SPECIFIC_DATA_DIRECTORY=project-specific-data
93-
EFS_GUARDIAN_TRACING={}
93+
EFS_GUARDIAN_TRACING=null
9494
EFS_DEFAULT_USER_SERVICE_SIZE_BYTES=10000
9595

9696
# DATCORE_ADAPTER
97-
DATCORE_ADAPTER_TRACING={}
97+
DATCORE_ADAPTER_TRACING=null
9898

9999
# DIRECTOR_V2 ----
100100
COMPUTATIONAL_BACKEND_DEFAULT_CLUSTER_AUTH='{"type":"tls","tls_ca_file":"/home/scu/.dask/dask-crt.pem","tls_client_cert":"/home/scu/.dask/dask-crt.pem","tls_client_key":"/home/scu/.dask/dask-key.pem"}'
@@ -121,14 +121,14 @@ DYNAMIC_SIDECAR_LOG_LEVEL=DEBUG
121121
DYNAMIC_SIDECAR_PROMETHEUS_MONITORING_NETWORKS=[]
122122
DYNAMIC_SIDECAR_PROMETHEUS_SERVICE_LABELS={}
123123
DYNAMIC_SIDECAR_API_SAVE_RESTORE_STATE_TIMEOUT=01:00:00
124-
DIRECTOR_V2_TRACING={}
124+
DIRECTOR_V2_TRACING=null
125125

126126
# DYNAMIC_SCHEDULER ----
127127
DYNAMIC_SCHEDULER_LOGLEVEL=DEBUG
128128
DYNAMIC_SCHEDULER_PROFILING=1
129129
DYNAMIC_SCHEDULER_USE_INTERNAL_SCHEDULER=0
130130
DYNAMIC_SCHEDULER_STOP_SERVICE_TIMEOUT=01:00:00
131-
DYNAMIC_SCHEDULER_TRACING={}
131+
DYNAMIC_SCHEDULER_TRACING=null
132132
DYNAMIC_SCHEDULER_UI_STORAGE_SECRET=adminadmin
133133

134134
FUNCTION_SERVICES_AUTHORS='{"UN": {"name": "Unknown", "email": "[email protected]", "affiliation": "unknown"}}'
@@ -143,7 +143,7 @@ INVITATIONS_PORT=8000
143143
INVITATIONS_SECRET_KEY='REPLACE_ME_with_result__Fernet_generate_key='
144144
INVITATIONS_SWAGGER_API_DOC_ENABLED=1
145145
INVITATIONS_USERNAME=admin
146-
INVITATIONS_TRACING={}
146+
INVITATIONS_TRACING=null
147147

148148
LOG_FORMAT_LOCAL_DEV_ENABLED=1
149149
LOG_FILTER_MAPPING='{}'
@@ -168,7 +168,7 @@ PAYMENTS_STRIPE_API_SECRET='REPLACE_ME_with_api_secret'
168168
PAYMENTS_STRIPE_URL=https://api.stripe.com
169169
PAYMENTS_SWAGGER_API_DOC_ENABLED=1
170170
PAYMENTS_USERNAME=admin
171-
PAYMENTS_TRACING={}
171+
PAYMENTS_TRACING=null
172172

173173
POSTGRES_DB=simcoredb
174174
POSTGRES_ENDPOINT=postgres:5432
@@ -209,7 +209,7 @@ RESOURCE_USAGE_TRACKER_MISSED_HEARTBEAT_CHECK_ENABLED=1
209209
RESOURCE_USAGE_TRACKER_MISSED_HEARTBEAT_COUNTER_FAIL=6
210210
RESOURCE_USAGE_TRACKER_MISSED_HEARTBEAT_INTERVAL_SEC=300
211211
RESOURCE_USAGE_TRACKER_S3=null
212-
RESOURCE_USAGE_TRACKER_TRACING={}
212+
RESOURCE_USAGE_TRACKER_TRACING=null
213213

214214
# NOTE: 172.17.0.1 is the docker0 interface, which redirect from inside a container onto the host network interface.
215215
R_CLONE_OPTION_BUFFER_SIZE=16M
@@ -243,7 +243,7 @@ STORAGE_HOST=storage
243243
STORAGE_LOGLEVEL=INFO
244244
STORAGE_PORT=8080
245245
STORAGE_PROFILING=1
246-
STORAGE_TRACING={}
246+
STORAGE_TRACING=null
247247
# STORAGE ----
248248

249249
SWARM_STACK_NAME=master-simcore
@@ -389,6 +389,6 @@ WEBSERVER_SOCKETIO=1
389389
WEBSERVER_STATICWEB={}
390390
WEBSERVER_STUDIES_DISPATCHER={}
391391
WEBSERVER_TAGS=1
392-
WEBSERVER_TRACING={}
392+
WEBSERVER_TRACING=null
393393
WEBSERVER_USERS={}
394394
WEBSERVER_VERSION_CONTROL=1

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,9 @@ or from https://gitmoji.dev/
2222

2323
## What do these changes do?
2424

25+
<!-- Badge to openapi specs
26+
[![ReDoc](https://img.shields.io/badge/OpenAPI-ReDoc-85ea2d?logo=openapiinitiative)](https://redocly.github.io/redoc/?url=HERE-URL-TO-RAW-FILE)
27+
-->
2528

2629

2730
## Related issue/s
@@ -31,9 +34,6 @@ or from https://gitmoji.dev/
3134
3235
- resolves ITISFoundation/osparc-issues#428
3336
- fixes #26
34-
35-
If openapi changes are provided, optionally point to the swagger editor with new changes
36-
Example [openapi.json specs](https://editor.swagger.io/?url=https://raw.githubusercontent.com/<github-username>/osparc-simcore/is1133/create-api-for-creation-of-pricing-plan/services/web/server/src/simcore_service_webserver/api/v0/openapi.yaml)
3737
-->
3838

3939

0 commit comments

Comments
 (0)