Merge remote-tracking branch 'origin/master' into pydantic_v2_migration_do_not_squash_updates

Author: sanderegg

.env-devel

@@ -25,6 +25,8 @@ TRAEFIK_API_SERVER_INFLIGHTREQ_AMOUNT=25
 
 AUTOSCALING_DASK=null
 AUTOSCALING_DRAIN_NODES_WITH_LABELS=False
+AUTOSCALING_DOCKER_JOIN_DRAINED=True
+AUTOSCALING_WAIT_FOR_CLOUD_INIT_BEFORE_WARM_BUFFER_ACTIVATION=False
 AUTOSCALING_EC2_ACCESS=null
 AUTOSCALING_EC2_INSTANCES=null
 AUTOSCALING_LOGLEVEL=WARNING
@@ -48,6 +50,7 @@ CLUSTERS_KEEPER_COMPUTATIONAL_BACKEND_DOCKER_IMAGE_TAG=master-github-latest
 CLUSTERS_KEEPER_DASK_NTHREADS=0
 CLUSTERS_KEEPER_DASK_WORKER_SATURATION=inf
 CLUSTERS_KEEPER_EC2_ACCESS=null
+CLUSTERS_KEEPER_SSM_ACCESS=null
 CLUSTERS_KEEPER_EC2_INSTANCES_PREFIX=""
 CLUSTERS_KEEPER_LOGLEVEL=WARNING
 CLUSTERS_KEEPER_MAX_MISSED_HEARTBEATS_BEFORE_CLUSTER_TERMINATION=5
@@ -101,8 +104,9 @@ DYNAMIC_SIDECAR_IMAGE=${DOCKER_REGISTRY:-itisfoundation}/dynamic-sidecar:${DOCKE
 DYNAMIC_SIDECAR_LOG_LEVEL=DEBUG
 DYNAMIC_SIDECAR_PROMETHEUS_MONITORING_NETWORKS=[]
 DYNAMIC_SIDECAR_PROMETHEUS_SERVICE_LABELS={}
+DYNAMIC_SIDECAR_API_SAVE_RESTORE_STATE_TIMEOUT=3600
 # DIRECTOR_V2 ----
-
+DYNAMIC_SCHEDULER_LOGLEVEL=DEBUG
 DYNAMIC_SCHEDULER_PROFILING=1
 DYNAMIC_SCHEDULER_STOP_SERVICE_TIMEOUT=3600
 
@@ -149,6 +153,10 @@ POSTGRES_PASSWORD=adminadmin
 POSTGRES_PORT=5432
 POSTGRES_USER=scu
 
+POSTGRES_READONLY_PASSWORD=readonly
+POSTGRES_READONLY_USER=postgres_readonly
+
+
 RABBIT_HOST=rabbit
 RABBIT_PASSWORD=adminadmin
 RABBIT_PORT=5672
@@ -158,6 +166,8 @@ RABBIT_USER=admin
 REDIS_HOST=redis
 REDIS_PORT=6379
 REDIS_PASSWORD=adminadmin
+REDIS_SECURE=false
+REDIS_USER=null
 
 REGISTRY_AUTH=True
 REGISTRY_PW=adminadminadmin
@@ -211,6 +221,13 @@ STORAGE_PROFILING=1
 
 SWARM_STACK_NAME=master-simcore
 
+## VENDOR DEVELOPMENT SERVICES ---
+VENDOR_DEV_MANUAL_IMAGE=containous/whoami
+VENDOR_DEV_MANUAL_REPLICAS=1
+VENDOR_DEV_MANUAL_SUBDOMAIN=manual
+
+## VENDOR DEVELOPMENT SERVICES ---
+
 WB_API_WEBSERVER_HOST=wb-api-server
 WB_API_WEBSERVER_PORT=8080
 
@@ -282,6 +299,7 @@ WB_DB_EL_WALLETS=0
 
 # WEBSERVER ----
 AIODEBUG_SLOW_DURATION_SECS=0
+DIAGNOSTICS_HEALTHCHECK_ENABLED=False
 DIAGNOSTICS_MAX_AVG_LATENCY=10
 DIAGNOSTICS_MAX_TASK_DELAY=30
 DIAGNOSTICS_SLOW_DURATION_SECS=1
@@ -303,9 +321,11 @@ SESSION_COOKIE_SECURE=False
 SIMCORE_VCS_RELEASE_TAG=latest
 STUDIES_ACCESS_ANONYMOUS_ALLOWED=0
 STUDIES_DEFAULT_SERVICE_THUMBNAIL=https://via.placeholder.com/170x120.png
-TRACING_ENABLED=1
-TRACING_THRIFT_COMPACT_ENDPOINT=http://jaeger:5775
-TRACING_ZIPKIN_ENDPOINT=http://jaeger:9411
+TRACING_OPENTELEMETRY_COLLECTOR_BATCH_SIZE=2
+TRACING_OPENTELEMETRY_COLLECTOR_PORT=4318
+TRACING_OPENTELEMETRY_COLLECTOR_ENDPOINT=http://opentelemetry-collector
+TRACING_OPENTELEMETRY_COLLECTOR_SAMPLING_PERCENTAGE=100
+TRACING_OPENTELEMETRY_COLLECTOR_EXPORTER_ENDPOINT=http://jaeger:4318
 TRAEFIK_SIMCORE_ZONE=internal_simcore_stack
 TWILIO_ACCOUNT_SID=DUMMY
 TWILIO_AUTH_TOKEN=DUMMY

.github/dependabot.yml

@@ -12,9 +12,6 @@ updates:
     assignees:
       - pcrespov
     ignore:
-      - dependency-name: aiozipkin
-        versions:
-          - ">= 1.a, < 2"
       - dependency-name: docker-compose
         versions:
           - 1.28.2
@@ -41,9 +38,6 @@ updates:
     assignees:
       - pcrespov
     ignore:
-      - dependency-name: aiozipkin
-        versions:
-          - ">= 1.a, < 2"
       - dependency-name: openapi-core
         versions:
           - "> 0.12.0, < 1"