fix: fix docker compose standalone prome (#13921)

risingwavelabs · Dec 11, 2023 · 1d4cac8 · 1d4cac8
1 parent 2fffc13
commit 1d4cac8
Show file tree

Hide file tree

Showing 8 changed files with 53 additions and 7 deletions.
diff --git a/README.md b/README.md
@@ -77,8 +77,8 @@ risingwave playground
 ```
 **Ubuntu**
 ```
-wget https://github.com/risingwavelabs/risingwave/releases/download/v1.4.0/risingwave-v1.4.0-x86_64-unknown-linux-all-in-one.tar.gz
-tar xvf risingwave-v1.4.0-x86_64-unknown-linux-all-in-one.tar.gz
+wget https://github.com/risingwavelabs/risingwave/releases/download/v1.5.0/risingwave-v1.5.0-x86_64-unknown-linux-all-in-one.tar.gz
+tar xvf risingwave-v1.5.0-x86_64-unknown-linux-all-in-one.tar.gz
 ./risingwave playground
 ```
 Now connect to RisingWave using `psql`:

diff --git a/docker/docker-compose-with-azblob.yml b/docker/docker-compose-with-azblob.yml
@@ -1,7 +1,7 @@
 ---
 version: "3"
 x-image: &image
-  image: ${RW_IMAGE:-risingwavelabs/risingwave:v1.4.0}
+  image: ${RW_IMAGE:-risingwavelabs/risingwave:v1.5.0}
 services:
   risingwave-standalone:
     <<: *image
@@ -48,10 +48,15 @@ services:
       - "5690"
       - "1250"
       - "5691"
+      - "2222"
     ports:
       - "4566:4566"
       - "5690:5690"
       - "5691:5691"
+      - "1222:1222"
+      - "1250:1250"
+      - "1260:1260"
+      - "2222:2222"
     depends_on:
       - etcd-0
     env_file: multiple_object_storage.env

diff --git a/docker/docker-compose-with-gcs.yml b/docker/docker-compose-with-gcs.yml
@@ -1,7 +1,7 @@
 ---
 version: "3"
 x-image: &image
-  image: ${RW_IMAGE:-risingwavelabs/risingwave:v1.4.0}
+  image: ${RW_IMAGE:-risingwavelabs/risingwave:v1.5.0}
 services:
   risingwave-standalone:
     <<: *image
@@ -48,10 +48,15 @@ services:
       - "5690"
       - "1250"
       - "5691"
+      - "2222"
     ports:
       - "4566:4566"
       - "5690:5690"
       - "5691:5691"
+      - "1222:1222"
+      - "1250:1250"
+      - "1260:1260"
+      - "2222:2222"
     depends_on:
       - etcd-0
     env_file: multiple_object_storage.env

diff --git a/docker/docker-compose-with-obs.yml b/docker/docker-compose-with-obs.yml
@@ -48,10 +48,15 @@ services:
       - "5690"
       - "1250"
       - "5691"
+      - "2222"
     ports:
       - "4566:4566"
       - "5690:5690"
       - "5691:5691"
+      - "1222:1222"
+      - "1250:1250"
+      - "1260:1260"
+      - "2222:2222"
     depends_on:
       - etcd-0
     env_file: multiple_object_storage.env

diff --git a/docker/docker-compose-with-oss.yml b/docker/docker-compose-with-oss.yml
@@ -1,7 +1,7 @@
 ---
 version: "3"
 x-image: &image
-  image: ${RW_IMAGE:-risingwavelabs/risingwave:v1.4.0}
+  image: ${RW_IMAGE:-risingwavelabs/risingwave:v1.5.0}
 services:
   risingwave-standalone:
     <<: *image
@@ -48,10 +48,15 @@ services:
       - "5690"
       - "1250"
       - "5691"
+      - "2222"
     ports:
       - "4566:4566"
       - "5690:5690"
       - "5691:5691"
+      - "1222:1222"
+      - "1250:1250"
+      - "1260:1260"
+      - "2222:2222"
     depends_on:
       - etcd-0
     env_file: multiple_object_storage.env

diff --git a/docker/docker-compose-with-s3.yml b/docker/docker-compose-with-s3.yml
@@ -1,7 +1,7 @@
 ---
 version: "3"
 x-image: &image
-  image: ${RW_IMAGE:-risingwavelabs/risingwave:v1.4.0}
+  image: ${RW_IMAGE:-risingwavelabs/risingwave:v1.5.0}
 services:
   risingwave-standalone:
     <<: *image
@@ -48,10 +48,15 @@ services:
       - "5690"
       - "1250"
       - "5691"
+      - "2222"
     ports:
       - "4566:4566"
       - "5690:5690"
       - "5691:5691"
+      - "1222:1222"
+      - "1250:1250"
+      - "1260:1260"
+      - "2222:2222"
     depends_on:
       - etcd-0
     env_file: multiple_object_storage.env

diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
@@ -1,7 +1,7 @@
 ---
 version: "3"
 x-image: &image
-  image: ${RW_IMAGE:-risingwavelabs/risingwave:v1.4.0}
+  image: ${RW_IMAGE:-risingwavelabs/risingwave:v1.5.0}
 services:
   risingwave-standalone:
     <<: *image
@@ -48,10 +48,15 @@ services:
       - "5690"
       - "1250"
       - "5691"
+      - "2222"
     ports:
       - "4566:4566"
       - "5690:5690"
       - "5691:5691"
+      - "1222:1222"
+      - "1250:1250"
+      - "1260:1260"
+      - "2222:2222"
     depends_on:
       - etcd-0
       - minio-0

diff --git a/docker/prometheus.yaml b/docker/prometheus.yaml
@@ -36,3 +36,19 @@ scrape_configs:
   - job_name: redpanda
     static_configs:
       - targets: ["message_queue:9644"]
+
+  - job_name: standalone-compute
+    static_configs:
+      - targets: ["risingwave-standalone:1222"]
+
+  - job_name: standalone-meta
+    static_configs:
+      - targets: ["risingwave-standalone:1250"]
+
+  - job_name: standalone-compactor
+    static_configs:
+      - targets: ["risingwave-standalone:1260"]
+
+  - job_name: standalone-frontend
+    static_configs:
+      - targets: ["risingwave-standalone:2222"]