Merge pull request #316 from ethpandaops/feat/docker-compose-volumes

Feat/docker compose volumes
ethpandaops · May 7, 2024 · 2e075a7 · 2e075a7
2 parents 57f6663 + ba5b246
commit 2e075a7
Show file tree

Hide file tree

Showing 7 changed files with 147 additions and 90 deletions.
diff --git a/README.md b/README.md
@@ -151,6 +151,22 @@ You can start up the clickhouse cluster only with migrations automatically appli
 docker compose --profile clickhouse up --detach
 ```
 
+### Building xatu changes
+
+When making changes to the xatu codebase, you can build the docker image with the following command:
+
+```bash
+docker compose up -d --build
+```
+
+### Cleaning up docker volumes
+
+We use docker volumes to store data between restarts. If you would like to clean up the volumes, you can do so with the following command:
+
+```bash
+docker compose down -v
+```
+
 ## Contributing
 
 Contributions are greatly appreciated! Pull requests will be reviewed and merged promptly if you're interested in improving Xatu!

diff --git a/...y/local/docker-compose/clickhouse/clickhouse-01/etc/clickhouse-server/config.d/config.xml b/...y/local/docker-compose/clickhouse/clickhouse-01/etc/clickhouse-server/config.d/config.xml
@@ -22,29 +22,29 @@
         <cluster_2S_1R>
             <shard>
                 <replica>
-                    <host>clickhouse-01</host>
+                    <host>xatu-clickhouse-01</host>
                     <port>9000</port>
                 </replica>
             </shard>
             <shard>
                 <replica>
-                    <host>clickhouse-02</host>
+                    <host>xatu-clickhouse-02</host>
                     <port>9000</port>
                 </replica>
             </shard>
         </cluster_2S_1R>
     </remote_servers>
     <zookeeper>
         <node>
-            <host>zookeeper-01</host>
+            <host>xatu-clickhouse-zookeeper-01</host>
             <port>2181</port>
         </node>
         <node>
-            <host>zookeeper-02</host>
+            <host>xatu-clickhouse-zookeeper-02</host>
             <port>2181</port>
         </node>
         <node>
-            <host>zookeeper-03</host>
+            <host>xatu-clickhouse-zookeeper-03</host>
             <port>2181</port>
         </node>
     </zookeeper>

diff --git a/...y/local/docker-compose/clickhouse/clickhouse-02/etc/clickhouse-server/config.d/config.xml b/...y/local/docker-compose/clickhouse/clickhouse-02/etc/clickhouse-server/config.d/config.xml
@@ -22,29 +22,29 @@
         <cluster_2S_1R>
             <shard>
                 <replica>
-                    <host>clickhouse-01</host>
+                    <host>xatu-clickhouse-01</host>
                     <port>9000</port>
                 </replica>
             </shard>
             <shard>
                 <replica>
-                    <host>clickhouse-02</host>
+                    <host>xatu-clickhouse-02</host>
                     <port>9000</port>
                 </replica>
             </shard>
         </cluster_2S_1R>
     </remote_servers>
     <zookeeper>
         <node>
-            <host>zookeeper-01</host>
+            <host>xatu-clickhouse-zookeeper-01</host>
             <port>2181</port>
         </node>
         <node>
-            <host>zookeeper-02</host>
+            <host>xatu-clickhouse-zookeeper-02</host>
             <port>2181</port>
         </node>
         <node>
-            <host>zookeeper-03</host>
+            <host>xatu-clickhouse-zookeeper-03</host>
             <port>2181</port>
         </node>
     </zookeeper>

diff --git a/deploy/local/docker-compose/grafana/datasources/datasources.yaml b/deploy/local/docker-compose/grafana/datasources/datasources.yaml
@@ -4,25 +4,25 @@ datasources:
   - name: Prometheus
     type: prometheus
     access: proxy
-    url: http://prometheus:9090
+    url: http://xatu-prometheus:9090
 
   - name: ClickHouse-official
     type: grafana-clickhouse-datasource
     jsonData:
       defaultDatabase: default
       port: 9000
-      server: clickhouse-01
+      server: xatu-clickhouse-01
       tlsSkipVerify: true
 
   - name: ClickHouse-vert
     type: vertamedia-clickhouse-datasource
     access: proxy
-    url: http://clickhouse-01:8123
+    url: http://xatu-clickhouse-01:8123
 
   - name: postgres
     type: postgres
     access: proxy
-    url: postgres:5432
+    url: xatu-postgres:5432
     user: user
     secureJsonData:
       password: password

diff --git a/deploy/local/docker-compose/prometheus.yaml b/deploy/local/docker-compose/prometheus.yaml
@@ -4,10 +4,10 @@ scrape_configs:
       - targets: ['xatu-server:9090']
   - job_name: 'vector-kafka-clickhouse'
     static_configs:
-      - targets: ['vector-kafka-clickhouse:9598']
+      - targets: ['xatu-vector-kafka-clickhouse:9598']
   - job_name: 'vector-kafka-clickhouse-libp2p'
     static_configs:
-      - targets: ['vector-kafka-clickhouse-libp2p:9598']
+      - targets: ['xatu-vector-kafka-clickhouse-libp2p:9598']
   - job_name: 'vector-http-kafka'
     static_configs:
-      - targets: ['vector-http-kafka:9598']
+      - targets: ['xatu-vector-http-kafka:9598']
diff --git a/deploy/local/docker-compose/xatu-server.yaml b/deploy/local/docker-compose/xatu-server.yaml
@@ -16,7 +16,7 @@ ntpServer: time.google.com
 persistence:
   enabled: true
   driverName: postgres
-  connectionString: postgres://user:password@postgres:5432/xatu?sslmode=disable
+  connectionString: postgres://user:password@xatu-postgres:5432/xatu?sslmode=disable
   maxIdleConns: 2
   maxOpenConns: 5
 
@@ -40,7 +40,7 @@ services:
     - name: general
       type: http
       config:
-        address: http://vector-http-kafka:9005
+        address: http://xatu-vector-http-kafka:9005
         maxQueueSize: 102400
         batchTimeout: 3s
         exportTimeout: 30s