Skip to content

Commit

Permalink
feat(telemetry): collect deploy mode in telemetry (#17392) (#17499)
Browse files Browse the repository at this point in the history
Signed-off-by: tabVersion <[email protected]>
Co-authored-by: Bohan Zhang <[email protected]>
Co-authored-by: tabVersion <[email protected]>
  • Loading branch information
3 people authored Aug 6, 2024
1 parent 0974b9c commit 446036c
Show file tree
Hide file tree
Showing 16 changed files with 136 additions and 66 deletions.
25 changes: 13 additions & 12 deletions docker/docker-compose-distributed-etcd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ services:
expose:
- "6660"
- "1260"
ports: []
ports: [ ]
depends_on:
- meta-node-0
# - minio-0
Expand Down Expand Up @@ -62,7 +62,7 @@ services:
expose:
- "5688"
- "1222"
ports: []
ports: [ ]
depends_on:
- meta-node-0
# - minio-0
Expand Down Expand Up @@ -120,10 +120,10 @@ services:
ports:
- "2388:2388"
- "2389:2389"
depends_on: []
depends_on: [ ]
volumes:
- "etcd-0:/etcd-data"
environment: {}
environment: { }
container_name: etcd-0
healthcheck:
test:
Expand Down Expand Up @@ -179,19 +179,19 @@ services:
memory: 1G
grafana-0:
image: "grafana/grafana-oss:latest"
command: []
command: [ ]
expose:
- "3001"
ports:
- "3001:3001"
depends_on: []
depends_on: [ ]
volumes:
- "grafana-0:/var/lib/grafana"
- "./grafana.ini:/etc/grafana/grafana.ini"
- "./grafana-risedev-datasource.yml:/etc/grafana/provisioning/datasources/grafana-risedev-datasource.yml"
- "./grafana-risedev-dashboard.yml:/etc/grafana/provisioning/dashboards/grafana-risedev-dashboard.yml"
- "./dashboards:/dashboards"
environment: {}
environment: { }
container_name: grafana-0
healthcheck:
test:
Expand Down Expand Up @@ -240,6 +240,7 @@ services:
RUST_BACKTRACE: "1"
# If ENABLE_TELEMETRY is not set, telemetry will start by default
ENABLE_TELEMETRY: ${ENABLE_TELEMETRY:-true}
RW_TELEMETRY_TYPE: ${RW_TELEMETRY_TYPE:-"docker-compose"}
container_name: meta-node-0
healthcheck:
test:
Expand Down Expand Up @@ -270,7 +271,7 @@ services:
ports:
- "9301:9301"
- "9400:9400"
depends_on: []
depends_on: [ ]
volumes:
- "minio-0:/data"
entrypoint: "
Expand Down Expand Up @@ -313,11 +314,11 @@ services:
- "9500"
ports:
- "9500:9500"
depends_on: []
depends_on: [ ]
volumes:
- "prometheus-0:/prometheus"
- "./prometheus.yaml:/etc/prometheus/prometheus.yml"
environment: {}
environment: { }
container_name: prometheus-0
healthcheck:
test:
Expand Down Expand Up @@ -355,10 +356,10 @@ services:
- "9092:9092"
- "9644:9644"
- "8081:8081"
depends_on: []
depends_on: [ ]
volumes:
- "message_queue:/var/lib/redpanda/data"
environment: {}
environment: { }
container_name: message_queue
healthcheck:
test: curl -f localhost:9644/v1/status/ready
Expand Down
15 changes: 8 additions & 7 deletions docker/docker-compose-distributed.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ services:
expose:
- "6660"
- "1260"
ports: []
ports: [ ]
depends_on:
- meta-node-0
# - minio-0
Expand Down Expand Up @@ -61,7 +61,7 @@ services:
expose:
- "5688"
- "1222"
ports: []
ports: [ ]
depends_on:
- meta-node-0
# - minio-0
Expand Down Expand Up @@ -148,12 +148,12 @@ services:
memory: 1G
grafana-0:
image: "grafana/grafana-oss:latest"
command: []
command: [ ]
expose:
- "3001"
ports:
- "3001:3001"
depends_on: []
depends_on: [ ]
volumes:
- "grafana-0:/var/lib/grafana"
- "./grafana.ini:/etc/grafana/grafana.ini"
Expand Down Expand Up @@ -210,6 +210,7 @@ services:
RUST_BACKTRACE: "1"
# If ENABLE_TELEMETRY is not set, telemetry will start by default
ENABLE_TELEMETRY: ${ENABLE_TELEMETRY:-true}
RW_TELEMETRY_TYPE: ${RW_TELEMETRY_TYPE:-"docker-compose"}
container_name: meta-node-0
healthcheck:
test:
Expand Down Expand Up @@ -240,7 +241,7 @@ services:
ports:
- "9301:9301"
- "9400:9400"
depends_on: []
depends_on: [ ]
volumes:
- "minio-0:/data"
entrypoint: "
Expand Down Expand Up @@ -283,7 +284,7 @@ services:
- "9500"
ports:
- "9500:9500"
depends_on: []
depends_on: [ ]
volumes:
- "prometheus-0:/prometheus"
- "./prometheus.yaml:/etc/prometheus/prometheus.yml"
Expand Down Expand Up @@ -325,7 +326,7 @@ services:
- "9092:9092"
- "9644:9644"
- "8081:8081"
depends_on: []
depends_on: [ ]
volumes:
- "message_queue:/var/lib/redpanda/data"
environment: {}
Expand Down
21 changes: 11 additions & 10 deletions docker/docker-compose-etcd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ services:
RUST_BACKTRACE: "1"
# If ENABLE_TELEMETRY is not set, telemetry will start by default
ENABLE_TELEMETRY: ${ENABLE_TELEMETRY:-true}
RW_TELEMETRY_TYPE: ${RW_TELEMETRY_TYPE:-"docker-compose"}
container_name: risingwave-standalone
healthcheck:
test:
Expand Down Expand Up @@ -110,10 +111,10 @@ services:
ports:
- "2388:2388"
- "2389:2389"
depends_on: []
depends_on: [ ]
volumes:
- "etcd-0:/etcd-data"
environment: {}
environment: { }
container_name: etcd-0
healthcheck:
test:
Expand All @@ -129,19 +130,19 @@ services:

grafana-0:
image: "grafana/grafana-oss:latest"
command: []
command: [ ]
expose:
- "3001"
ports:
- "3001:3001"
depends_on: []
depends_on: [ ]
volumes:
- "grafana-0:/var/lib/grafana"
- "./grafana.ini:/etc/grafana/grafana.ini"
- "./grafana-risedev-datasource.yml:/etc/grafana/provisioning/datasources/grafana-risedev-datasource.yml"
- "./grafana-risedev-dashboard.yml:/etc/grafana/provisioning/dashboards/grafana-risedev-dashboard.yml"
- "./dashboards:/dashboards"
environment: {}
environment: { }
container_name: grafana-0
healthcheck:
test:
Expand All @@ -167,7 +168,7 @@ services:
ports:
- "9301:9301"
- "9400:9400"
depends_on: []
depends_on: [ ]
volumes:
- "minio-0:/data"
entrypoint: "
Expand Down Expand Up @@ -211,11 +212,11 @@ services:
- "9500"
ports:
- "9500:9500"
depends_on: []
depends_on: [ ]
volumes:
- "prometheus-0:/prometheus"
- "./prometheus.yaml:/etc/prometheus/prometheus.yml"
environment: {}
environment: { }
container_name: prometheus-0
healthcheck:
test:
Expand Down Expand Up @@ -254,10 +255,10 @@ services:
- "9092:9092"
- "9644:9644"
- "8081:8081"
depends_on: []
depends_on: [ ]
volumes:
- "message_queue:/var/lib/redpanda/data"
environment: {}
environment: { }
container_name: message_queue
healthcheck:
test: curl -f localhost:9644/v1/status/ready
Expand Down
1 change: 1 addition & 0 deletions docker/docker-compose-with-azblob.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ services:
RUST_BACKTRACE: "1"
# If ENABLE_TELEMETRY is not set, telemetry will start by default
ENABLE_TELEMETRY: ${ENABLE_TELEMETRY:-true}
RW_TELEMETRY_TYPE: ${RW_TELEMETRY_TYPE:-"docker-compose"}
container_name: risingwave-standalone
healthcheck:
test:
Expand Down
1 change: 1 addition & 0 deletions docker/docker-compose-with-gcs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ services:
RUST_BACKTRACE: "1"
# If ENABLE_TELEMETRY is not set, telemetry will start by default
ENABLE_TELEMETRY: ${ENABLE_TELEMETRY:-true}
RW_TELEMETRY_TYPE: ${RW_TELEMETRY_TYPE:-"docker-compose"}
container_name: risingwave-standalone
healthcheck:
test:
Expand Down
21 changes: 11 additions & 10 deletions docker/docker-compose-with-hdfs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ services:
expose:
- "6660"
- "1260"
ports: []
ports: [ ]
depends_on:
- meta-node-0
volumes:
Expand Down Expand Up @@ -57,7 +57,7 @@ services:
expose:
- "5688"
- "1222"
ports: []
ports: [ ]
depends_on:
- meta-node-0
volumes:
Expand Down Expand Up @@ -113,7 +113,7 @@ services:
ports:
- "2388:2388"
- "2389:2389"
depends_on: []
depends_on: [ ]
volumes:
- "etcd-0:/etcd-data"
environment:
Expand Down Expand Up @@ -171,19 +171,19 @@ services:
memory: 1G
grafana-0:
image: "grafana/grafana-oss:latest"
command: []
command: [ ]
expose:
- "3001"
ports:
- "3001:3001"
depends_on: []
depends_on: [ ]
volumes:
- "grafana-0:/var/lib/grafana"
- "./grafana.ini:/etc/grafana/grafana.ini"
- "./grafana-risedev-datasource.yml:/etc/grafana/provisioning/datasources/grafana-risedev-datasource.yml"
- "./grafana-risedev-dashboard.yml:/etc/grafana/provisioning/dashboards/grafana-risedev-dashboard.yml"
- "./dashboards:/dashboards"
environment: {}
environment: { }
container_name: grafana-0
healthcheck:
test:
Expand Down Expand Up @@ -231,6 +231,7 @@ services:
- "<HADOOP_HOME>:/opt/hadoop"
environment:
- HADOOP_HOME=/opt/hadoop/
- RW_TELEMETRY_TYPE: ${RW_TELEMETRY_TYPE:-"docker-compose"}
container_name: meta-node-0
healthcheck:
test:
Expand Down Expand Up @@ -259,11 +260,11 @@ services:
- "9500"
ports:
- "9500:9500"
depends_on: []
depends_on: [ ]
volumes:
- "prometheus-0:/prometheus"
- "./prometheus.yaml:/etc/prometheus/prometheus.yml"
environment: {}
environment: { }
container_name: prometheus-0
healthcheck:
test:
Expand Down Expand Up @@ -301,10 +302,10 @@ services:
- "9092:9092"
- "9644:9644"
- "8081:8081"
depends_on: []
depends_on: [ ]
volumes:
- "message_queue:/var/lib/redpanda/data"
environment: {}
environment: { }
container_name: message_queue
healthcheck:
test: curl -f localhost:9644/v1/status/ready
Expand Down
1 change: 1 addition & 0 deletions docker/docker-compose-with-local-fs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ services:
RUST_BACKTRACE: "1"
# If ENABLE_TELEMETRY is not set, telemetry will start by default
ENABLE_TELEMETRY: ${ENABLE_TELEMETRY:-true}
RW_TELEMETRY_TYPE: ${RW_TELEMETRY_TYPE:-"docker-compose"}
container_name: risingwave-standalone
healthcheck:
test:
Expand Down
1 change: 1 addition & 0 deletions docker/docker-compose-with-obs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ services:
RUST_BACKTRACE: "1"
# If ENABLE_TELEMETRY is not set, telemetry will start by default
ENABLE_TELEMETRY: ${ENABLE_TELEMETRY:-true}
RW_TELEMETRY_TYPE: ${RW_TELEMETRY_TYPE:-"docker-compose"}
container_name: risingwave-standalone
healthcheck:
test:
Expand Down
1 change: 1 addition & 0 deletions docker/docker-compose-with-oss.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ services:
RUST_BACKTRACE: "1"
# If ENABLE_TELEMETRY is not set, telemetry will start by default
ENABLE_TELEMETRY: ${ENABLE_TELEMETRY:-true}
RW_TELEMETRY_TYPE: ${RW_TELEMETRY_TYPE:-"docker-compose"}
container_name: risingwave-standalone
healthcheck:
test:
Expand Down
1 change: 1 addition & 0 deletions docker/docker-compose-with-s3.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ services:
RUST_BACKTRACE: "1"
# If ENABLE_TELEMETRY is not set, telemetry will start by default
ENABLE_TELEMETRY: ${ENABLE_TELEMETRY:-true}
RW_TELEMETRY_TYPE: ${RW_TELEMETRY_TYPE:-"docker-compose"}
container_name: risingwave-standalone
healthcheck:
test:
Expand Down
Loading

0 comments on commit 446036c

Please sign in to comment.