chore: cleanup and use latest

Informatievlaanderen · Nov 8, 2024 · 223a12d · 223a12d
1 parent 6d1b1a5
commit 223a12d
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 86 deletions.
diff --git a/load-testing/docker-compose.yml b/load-testing/docker-compose.yml
@@ -21,25 +21,25 @@ services:
       - performance_testing
 
 
-  pyroscope:
-    container_name: performance_testing_pyroscope
-    image: grafana/pyroscope:${PYROSCOPE_TAG:-latest}
-    ports:
-      - ${PYROSCOPE_PORT:-4040}:4040
-    networks:
-      - performance_testing
-    # healthcheck:
-    #   test: ["CMD", "wget", "-qO-", "http://pyroscope:4040/ready"]
-    #   interval: 12s
-    #   timeout: 3s
-    #   retries: 20
+  # pyroscope:
+  #   container_name: performance_testing_pyroscope
+  #   image: grafana/pyroscope:${PYROSCOPE_TAG:-latest}
+  #   ports:
+  #     - ${PYROSCOPE_PORT:-4040}:4040
+  #   networks:
+  #     - performance_testing
+  #   # healthcheck:
+  #   #   test: ["CMD", "wget", "-qO-", "http://pyroscope:4040/ready"]
+  #   #   interval: 12s
+  #   #   timeout: 3s
+  #   #   retries: 20
 
 
   grafana:
     container_name: performance_testing_grafana
     image: grafana/grafana:${GRAFANA_TAG:-main}
     environment:
-    - GF_FEATURE_TOGGLES_ENABLE=flameGraph
+    # - GF_FEATURE_TOGGLES_ENABLE=flameGraph
     - GF_SECURITY_ADMIN_USER=${GRAFANA_USER}
     - GF_SECURITY_ADMIN_PASSWORD=${GRAFANA_PWD}
     ports:
@@ -90,10 +90,11 @@ services:
           cpus: '0.1'
           memory: '0.25GB'
 
+
   load-testing-ldio-workbench-workbench:
     container_name: performance_testing_ldio-workbench
-    # image: ldes/ldi-orchestrator:${LDI_ORCHESTRATOR_TAG:-2.9.0-SNAPSHOT}
-    image: ghcr.io/informatievlaanderen/ldi-orchestrator:20241021180535
+    # image: ldes/ldi-orchestrator:${LDI_ORCHESTRATOR_TAG:-2.10.0-SNAPSHOT}
+    image: ghcr.io/informatievlaanderen/ldi-orchestrator:20241021180535 # TODO: use 2.10
     networks:
       - performance_testing
     ports:
@@ -124,6 +125,7 @@ services:
           cpus: '0.10'
           memory: '0.25GB'
 
+
   ldes-postgres:
     container_name: performance_testing_ldes-postgres
     image: postgres:latest
@@ -150,15 +152,15 @@ services:
           cpus: '0.50'
           memory: '0.5GB'
 
+
   ldes-server:
     container_name: performance_testing_ldes-server
     # image: ghcr.io/informatievlaanderen/ldes-server:latest
     # image: ldes/ldes-server:${LDES_SERVER_TAG:-2.3.0-SNAPSHOT} # CrowdScan
     # image: ldes/ldes-server:${LDES_SERVER_TAG:-2.4.1-SNAPSHOT} # Geomobility
     # image: ldes/ldes-server:${LDES_SERVER_TAG:-2.10.0-SNAPSHOT} # Telraam
     # image: ldes/ldes-server:${LDES_SERVER_TAG:-3.4.0-SNAPSHOT}
-    # image: ldes/ldes-server:${LDES_SERVER_TAG:-3.5.0-SNAPSHOT}
-    image: ghcr.io/informatievlaanderen/ldes-server:20241031101101
+    image: ldes/ldes-server:${LDES_SERVER_TAG:-3.5.0-SNAPSHOT}
     networks:
       - performance_testing
     ports:
@@ -185,10 +187,10 @@ services:
       - LDESSERVER_HOSTNAME=http://ldes-server:${LDES_SERVER_PORT:-8080}
       - SERVER_PORT=8080
       - LDESSERVER_MAINTENANCECRON=-
-      - PYROSCOPE_AGENT_ENABLED=true
-      - PYROSCOPE_APPLICATION_NAME=ldes-server
-      - PYROSCOPE_SERVER_ADDRESS=http://pyroscope:4040
-      - PYROSCOPE_FORMAT=jfr
+      # - PYROSCOPE_AGENT_ENABLED=true
+      # - PYROSCOPE_APPLICATION_NAME=ldes-server
+      # - PYROSCOPE_SERVER_ADDRESS=http://pyroscope:4040
+      # - PYROSCOPE_FORMAT=jfr
     deploy:
       resources:
         limits:

diff --git a/load-testing/server/database.log b/load-testing/server/database.log