Restructure Deployments (new folder)

Author: ppcano

.github/workflows/build_and_test_no_docker.yaml

@@ -54,16 +54,16 @@ jobs:
         uses: dcarbone/install-jq-action@e397bd87438d72198f81efd21f876461183d383a # v3.0.1
 
       - name: Run k6 foundations tests
-        run: ./scripts/run-tests.sh -t **/k6/foundations/*.js -u http://localhost:3333
+        run: ./k6/run-tests.sh -t **/k6/foundations/*.js -u http://localhost:3333
 
       - name: Run k6 foundations TS tests
-        run: ./scripts/run-tests.sh -t **/k6/foundations/*.ts -u http://localhost:3333
+        run: ./k6/run-tests.sh -t **/k6/foundations/*.ts -u http://localhost:3333
 
       - name: Run k6 internal tests
-        run: ./scripts/run-tests.sh -t **/k6/internal/*.js -u http://localhost:3333
+        run: ./k6/run-tests.sh -t **/k6/internal/*.js -u http://localhost:3333
 
       - name: Run k6 browser tests
-        run: ./scripts/run-tests.sh -t **/k6/browser/*.js -u http://localhost:3333
+        run: ./k6/run-tests.sh -t **/k6/browser/*.js -u http://localhost:3333
 
       - name: Stop Server
         run: pkill -9 quickpizza

CLAUDE.md

@@ -17,7 +17,7 @@ services:
     labels:
       - "service.type=instrumentation"
     volumes:
-      - "./alloy/${ALLOY_FILE_NAME:-cloud.alloy}:/config.alloy:Z"
+      - "./deployments/docker-compose/grafana-cloud/${ALLOY_FILE_NAME:-config.alloy}:/config.alloy:Z"
       - "${DOCKER_SOCKET:-/var/run/docker.sock}:/var/run/docker.sock"
     command:
       - run
@@ -157,7 +157,7 @@ services:
       DB_O11Y_DATABASES: quickpizza_db
     volumes:
       - postgres_data:/var/lib/postgresql
-      - ./scripts/init-db-observability.sh:/docker-entrypoint-initdb.d/init-db-observability.sh:Z
+      - ./deployments/init-db-observability.sh:/docker-entrypoint-initdb.d/init-db-observability.sh:Z
     command:
       - "postgres"
       - "-c"

compose.grafana-cloud.microservices.yaml

@@ -5,7 +5,7 @@ services:
     labels:
       - "service.type=instrumentation"
     volumes:
-      - "./alloy/${ALLOY_FILE_NAME:-cloud.alloy}:/config.alloy:Z"
+      - "./deployments/docker-compose/grafana-cloud/${ALLOY_FILE_NAME:-config.alloy}:/config.alloy:Z"
       - "${DOCKER_SOCKET:-/var/run/docker.sock}:/var/run/docker.sock"
     command:
       - run
@@ -75,7 +75,7 @@ services:
       DB_O11Y_DATABASES: quickpizza_db
     volumes:
       - postgres_data:/var/lib/postgresql
-      - ./scripts/init-db-observability.sh:/docker-entrypoint-initdb.d/init-db-observability.sh:Z
+      - ./deployments/init-db-observability.sh:/docker-entrypoint-initdb.d/init-db-observability.sh:Z
     command:
       - "postgres"
       - "-c"

compose.grafana-cloud.monolithic.yaml

@@ -17,7 +17,7 @@ services:
     labels:
       - "service.type=instrumentation"
     volumes:
-      - "./alloy/${ALLOY_FILE_NAME:-local.alloy}:/config.alloy:Z"
+      - "./deployments/docker-compose/grafana-local-stack/${ALLOY_FILE_NAME:-config.alloy}:/config.alloy:Z"
       - "${DOCKER_SOCKET:-/var/run/docker.sock}:/var/run/docker.sock"
     command:
       - run
@@ -177,7 +177,7 @@ services:
       - "9090:9090"
 
   pyroscope:
-    image: grafana/pyroscope:1.16.0@sha256:58e49fa3443195c7b95f5c9821ce8920a8627f215c2ccdf955a9cd78c76a3468
+    image: grafana/pyroscope:1.16.0
     container_name: pyroscope
     labels:
       - "service.type=instrumentation"
@@ -191,7 +191,7 @@ services:
       - "service.type=instrumentation"
     command: ["-config.file=/etc/tempo.yaml"]
     volumes:
-      - ./alloy/local-tempo.yaml:/etc/tempo.yaml
+      - ./deployments/docker-compose/grafana-local-stack/tempo.yaml:/etc/tempo.yaml
     ports:
       - "3200:3200" # Tempo API/UI
     depends_on:
@@ -210,7 +210,7 @@ services:
       - GF_AUTH_BASIC_ENABLED=false
       - GF_FEATURE_TOGGLES_ENABLE=tempoAlerting
     volumes:
-      - ./grafana:/etc/grafana/provisioning/
+      - ./deployments/docker-compose/grafana-local-stack/grafana:/etc/grafana/provisioning/
 
 volumes:
   postgres_data:

compose.grafana-local-stack.microservices.yaml

@@ -5,7 +5,7 @@ services:
     labels:
       - "service.type=instrumentation"
     volumes:
-      - "./alloy/${ALLOY_FILE_NAME:-local.alloy}:/config.alloy:Z"
+      - "./deployments/docker-compose/grafana-local-stack/${ALLOY_FILE_NAME:-config.alloy}:/config.alloy:Z"
       - "${DOCKER_SOCKET:-/var/run/docker.sock}:/var/run/docker.sock"
     command:
       - run
@@ -114,7 +114,7 @@ services:
       - "service.type=instrumentation"
     command: ["-config.file=/etc/tempo.yaml"]
     volumes:
-      - ./alloy/local-tempo.yaml:/etc/tempo.yaml
+      - ./deployments/docker-compose/grafana-local-stack/tempo.yaml:/etc/tempo.yaml
     ports:
       - "3200:3200" # Tempo API/UI
     depends_on:
@@ -133,7 +133,7 @@ services:
       - GF_AUTH_BASIC_ENABLED=false
       - GF_FEATURE_TOGGLES_ENABLE=tempoAlerting
     volumes:
-      - ./grafana:/etc/grafana/provisioning/
+      - ./deployments/docker-compose/grafana-local-stack/grafana:/etc/grafana/provisioning/
 
 volumes:
   postgres_data: