From b6244d7aac8212782361596f669bbbe057d78f92 Mon Sep 17 00:00:00 2001
From: Eric Fu <eric@singularity-data.com>
Date: Fri, 10 Mar 2023 13:43:09 +0800
Subject: [PATCH] chore: update and add connector-node to docker-compose.yml
 (#8427)

---
 docker/docker-compose.yml | 33 +++++++++++++++++++++++++++------
 docker/prometheus.yaml    | 14 +++++++++++---
 2 files changed, 38 insertions(+), 9 deletions(-)

diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index 48e38a1ac591..734c313b821e 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -7,6 +7,8 @@ services:
       - compactor-node
       - "--listen-addr"
       - "0.0.0.0:6660"
+      - "--advertise-addr"
+      - "compactor-0:6660"
       - "--prometheus-listener-addr"
       - "0.0.0.0:1260"
       - "--metrics-level"
@@ -44,16 +46,18 @@ services:
       - compute-node
       - "--listen-addr"
       - "0.0.0.0:5688"
-      - "--prometheus-listener-addr"
-      - "0.0.0.0:1222"
       - "--advertise-addr"
       - "compute-node-0:5688"
+      - "--prometheus-listener-addr"
+      - "0.0.0.0:1222"
       - "--metrics-level"
       - "1"
       - "--state-store"
       - "hummock+minio://hummockadmin:hummockadmin@minio-0:9301/hummock001"
       - "--meta-address"
       - "http://meta-node-0:5690"
+      - "--connector-rpc-endpoint"
+      - "connector-node:50051"
       - "--config-path"
       - /risingwave.toml
     expose:
@@ -128,8 +132,14 @@ services:
       - "0.0.0.0:4566"
       - "--meta-addr"
       - "http://meta-node-0:5690"
+      - "--advertise-addr"
+      - "frontend-node-0:4566"
       - "--config-path"
       - /risingwave.toml
+      - "--prometheus-listener-addr"
+      - "0.0.0.0:2222"
+      - "--metrics-level"
+      - "1"
     expose:
       - "4566"
     ports:
@@ -191,6 +201,8 @@ services:
       - etcd
       - "--etcd-endpoints"
       - "etcd-0:2388"
+      - "--connector-rpc-endpoint"
+      - "connector-node:50051"
       - "--config-path"
       - /risingwave.toml
     expose:
@@ -279,13 +291,20 @@ services:
       interval: 1s
       timeout: 5s
       retries: 5
-  redpanda:
+  connector-node:
+    image: ghcr.io/risingwavelabs/risingwave:latest
+    entrypoint: "/risingwave/bin/connector-node/start-service.sh"
+    ports:
+      - 50051
+      - 50052
+    container_name: connector-node
+  message_queue:
     image: "docker.vectorized.io/vectorized/redpanda:latest"
     command:
       - redpanda
       - start
       - "--smp"
-      - "4"
+      - "1"
       - "--reserve-memory"
       - 0M
       - "--memory"
@@ -297,18 +316,20 @@ services:
       - "--kafka-addr"
       - "PLAINTEXT://0.0.0.0:29092,OUTSIDE://0.0.0.0:9092"
       - "--advertise-kafka-addr"
-      - "PLAINTEXT://redpanda:29092,OUTSIDE://localhost:9092"
+      - "PLAINTEXT://message_queue:29092,OUTSIDE://localhost:9092"
     expose:
       - "29092"
       - "9092"
+      - "9644"
     ports:
+      - "29092:29092"
       - "9092:9092"
       - "9644:9644"
     depends_on: []
     volumes:
       - "redpanda:/var/lib/redpanda/data"
     environment: {}
-    container_name: redpanda
+    container_name: message_queue
     healthcheck:
       test:
         - CMD
diff --git a/docker/prometheus.yaml b/docker/prometheus.yaml
index eb75b54d02bc..f91984782883 100644
--- a/docker/prometheus.yaml
+++ b/docker/prometheus.yaml
@@ -15,11 +15,11 @@ scrape_configs:
   - job_name: meta
     static_configs:
       - targets: ["meta-node-0:1250"]
-  
+
   - job_name: minio
     metrics_path: /minio/v2/metrics/cluster
     static_configs:
-    - targets: ["minio-0:9301"]
+      - targets: ["minio-0:9301"]
 
   - job_name: compactor
     static_configs:
@@ -29,6 +29,14 @@ scrape_configs:
     static_configs:
       - targets: ["etcd-0:2379"]
 
+  - job_name: frontend
+    static_configs:
+      - targets: ["frontend-node-0:2222"]
+
   - job_name: redpanda
     static_configs:
-      - targets: ["redpanda:9644"]
+      - targets: ["message_queue:9644"]
+
+  - job_name: connector-node
+    static_configs:
+      - targets: ["connector-node:50052"]
\ No newline at end of file