chore: update manual e2e test for regions

docker/dev-full/docker-compose.yml

@@ -26,8 +26,8 @@ services:
         condition: service_healthy
       nats:
         condition: service_healthy
-      seaweedfs:
-        condition: service_healthy
+      # seaweedfs:
+      #   condition: service_healthy
       vector-server:
         condition: service_started
     volumes:
@@ -134,10 +134,15 @@ services:
       retries: 10
 
   seaweedfs:
-    image: bitnami/seaweedfs:3.78.0
+    image: chrislusf/seaweedfs:3.79
     # TODO: Remove root user
     user: root
-    command: server -dir /var/lib/seaweedfs -s3 -s3.config /etc/seaweedfs/s3.json -s3.port=9000 -s3.allowEmptyFolder=false -s3.allowDeleteBucketNotEmpty=false
+    # `raftHashicorp` speeds up initial leader election
+    command: |
+      server \
+        -dir /var/lib/seaweedfs \
+        -master.raftHashicorp \
+        -s3 -s3.config /etc/seaweedfs/s3.json -s3.port=9000 -s3.allowEmptyFolder=false -s3.allowDeleteBucketNotEmpty=false
     volumes:
       - ./seaweedfs:/etc/seaweedfs:ro
       - seaweedfs-data:/var/lib/seaweedfs
@@ -147,11 +152,9 @@ services:
     networks:
       - rivet-network
     healthcheck:
-      test: ["CMD", "bash", "-c", ">/dev/tcp/127.0.0.1/9000"]
+      test: ["CMD", "nc", "-z", "127.0.0.1", "9000"]
       interval: 2s
       timeout: 10s
-      # SeaweedFS takes a long time to start
-      retries: 30
 
   vector-client:
     image: timberio/vector:0.42.0-distroless-static

docker/dev-full/vector-client/vector.yaml

@@ -8,7 +8,7 @@ sources:
   prometheus_pegboard:
     type: prometheus_scrape
     endpoints:
-      - http://rivet-client:6000
+      - http://rivet-client:7090
     scrape_interval_secs: 15
 
   pegboard_manager:

docker/dev-monolith/Dockerfile

@@ -66,11 +66,14 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \
     postgresql-client \
     gpg \
     xz-utils \
+	unzip \
     apt-transport-https \
     dirmngr \
 	netcat-openbsd && \
     (curl -L https://github.com/golang-migrate/migrate/releases/download/v4.18.1/migrate.linux-$(cat /tmp/arch).tar.gz | tar xvz) && \
-    mv migrate /usr/local/bin/migrate
+    mv migrate /usr/local/bin/migrate && \
+    curl -fsSL https://deno.land/x/install/install.sh | sh && \
+    ln -s /root/.deno/bin/deno /usr/local/bin/deno
 
 # === CockroachDB ===
 RUN useradd -m -s /bin/bash cockroachdb && \
@@ -116,7 +119,10 @@ RUN curl -sSLf https://github.com/just-containers/s6-overlay/releases/download/v
     tar -C / -Jxpf /tmp/s6-overlay-noarch.tar.xz && \
     curl -sSLf https://github.com/just-containers/s6-overlay/releases/download/v${S6_OVERLAY_VERSION}/s6-overlay-$(uname -m).tar.xz -o /tmp/s6-overlay-$(uname -m).tar.xz && \
     tar -C / -Jxpf /tmp/s6-overlay-$(uname -m).tar.xz
-COPY ./docker/dev-monolith/s6-overlay /etc/s6-overlay
+
+# Setup S6
+COPY ./docker/dev-monolith/scripts /tmp/scripts
+RUN deno run --allow-read --allow-write /tmp/scripts/setup_s6.ts
 
 # === Rivet Server ===
 RUN useradd -m -s /bin/bash rivet-server

docker/dev-monolith/README.md

@@ -46,10 +46,24 @@ You can read the logs by running:
 docker exec mycontainer cat /var/log/rivet-server/current
 ```
 
+## Monitoring Vector
+
+Monitor `vector-server`:
+
+```bash
+vector top --url http://0.0.0.0:9500/graphql
+```
+
+Monitor `vector-client`:
+
+```bash
+vector top --url http://0.0.0.0:9510/graphql
+```
+
 ## Testing
 
 ```bash
-./scripts/docker/template.ts && docker build -f docker/dev-monolith/Dockerfile -t rivet . && docker run --name rivet --rm -v "/tmp/rivet-data:/data" -p 8080:8080 -p 9000:9000 -p 20000-20100:20000-20100 --privileged rivet
+docker build -f docker/dev-monolith/Dockerfile -t rivet . && docker run --name rivet --rm -v "/tmp/rivet-data:/data" -p 8080:8080 -p 9000:9000 -p 20000-20100:20000-20100 --privileged rivet
 ```
 
 ## Port collisions

docker/dev-monolith/rivet-client/config.yaml

@@ -26,8 +26,6 @@ client:
     memory: 0
   logs:
     redirect_logs: false
-  metrics:
-    port: 6001
   vector:
     address: vector-server:6100