blackteay/open-im-server
1
0
Fork 0
mirror of https://github.com/openimsdk/open-im-server.git synced 2025-04-06 04:15:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' of github.com:OpenIMSDK/Open-IM-Server

Browse Source 
# Conflicts:
#	.env
#	config/config.yaml
#	script/.env
This commit is contained in:
wangchuxiao 2022-11-11 11:03:02 +08:00
parent 8ec4f2e814
commit db5f9572b1
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
docker-compose.yaml
View File

@ -143,8 +143,8 @@ services:
- ${DATA_DIR}/docker-compose_cfg/prometheus-compose.yml:/etc/prometheus/prometheus.yml - ${DATA_DIR}/docker-compose_cfg/prometheus-compose.yml:/etc/prometheus/prometheus.yml
# - ${DATA_DIR}/components/prometheus_data:/prometheus # - ${DATA_DIR}/components/prometheus_data:/prometheus
container_name: prometheus container_name: prometheus
ports: # ports:
- 9091:9091 # - 9091:9091
depends_on: depends_on:
- open_im_server - open_im_server
command: --web.listen-address=:9091 --config.file="/etc/prometheus/prometheus.yml" command: --web.listen-address=:9091 --config.file="/etc/prometheus/prometheus.yml"
@ -159,8 +159,8 @@ services:
- ${DATA_DIR}/docker-compose_cfg/grafana.ini:/etc/grafana/grafana.ini - ${DATA_DIR}/docker-compose_cfg/grafana.ini:/etc/grafana/grafana.ini
- ${DATA_DIR}/docker-compose_cfg/node-exporter-full_rev1.json:/var/lib/grafana/dashboards/node-exporter-full_rev1.json - ${DATA_DIR}/docker-compose_cfg/node-exporter-full_rev1.json:/var/lib/grafana/dashboards/node-exporter-full_rev1.json
container_name: grafana container_name: grafana
ports: # ports:
- 10007:10007 # - 10007:10007
depends_on: depends_on:
- prometheus - prometheus
network_mode: "host" network_mode: "host"
@ -171,4 +171,3 @@ services:
restart: always restart: always
ports: ports:
- "9100:9100" - "9100:9100"
# command: --collector.ENTER-THE-NAME-OF-COLLECTOR