From c55e37f023020b9a3d2192c35bbaa73db6a31a5d Mon Sep 17 00:00:00 2001
From: "lin.huang" <lin.huang@apulis.com>
Date: Mon, 13 Nov 2023 14:18:19 +0800
Subject: [PATCH] fix docker-compose.yml

---
 deployments/templates/env_template.yaml |  4 ++++
 docker-compose.yml                      | 27 ++++++++++++++-----------
 scripts/install/environment.sh          |  3 ++-
 3 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/deployments/templates/env_template.yaml b/deployments/templates/env_template.yaml
index 352d81e02..3d52d3ee6 100644
--- a/deployments/templates/env_template.yaml
+++ b/deployments/templates/env_template.yaml
@@ -98,6 +98,10 @@ PROMETHEUS_NETWORK_ADDRESS=${PROMETHEUS_NETWORK_ADDRESS}
 # Address or hostname for the Grafana network.
 # Default: GRAFANA_NETWORK_ADDRESS=172.28.0.12
 GRAFANA_NETWORK_ADDRESS=${GRAFANA_NETWORK_ADDRESS}
+  
+# Address or hostname for the node_exporter network.
+# Default: NODE_EXPORTER_NETWORK_ADDRESS=172.28.0.13
+NODE_EXPORTER_NETWORK_ADDRESS=${NODE_EXPORTER_NETWORK_ADDRESS}
 
 
 # ===============================================
diff --git a/docker-compose.yml b/docker-compose.yml
index 0de2b5ffa..54a1d5032 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -152,17 +152,8 @@ services:
     ports:
       - "${PROMETHEUS_PORT}:9090"
     networks:
-      - server
-
-  node-exporter:
-    image: quay.io/prometheus/node-exporter
-    container_name: node-exporter
-    hostname: node-exporter
-    restart: always
-    ports:
-      - "${NODE_EXPORTER_PORT}:9100"
-    networks:
-      - server
+      server:
+        ipv4_address: ${PROMETHEUS_NETWORK_ADDRESS}
 
   grafana:
     image: grafana/grafana
@@ -174,4 +165,16 @@ services:
     volumes:
       - ${DATA_DIR}/components/grafana:/var/lib/grafana
     networks:
-      - server
+      server:
+        ipv4_address: ${GRAFANA_NETWORK_ADDRESS}
+
+  node-exporter:
+    image: quay.io/prometheus/node-exporter
+    container_name: node-exporter
+    hostname: node-exporter
+    restart: always
+    ports:
+      - "${NODE_EXPORTER_PORT}:9100"
+    networks:
+      server:
+        ipv4_address: ${NODE_EXPORTER_NETWORK_ADDRESS}
\ No newline at end of file
diff --git a/scripts/install/environment.sh b/scripts/install/environment.sh
index c86ef675e..169b45e54 100755
--- a/scripts/install/environment.sh
+++ b/scripts/install/environment.sh
@@ -116,7 +116,8 @@ LAST_OCTET=$((LAST_OCTET + 1))
 PROMETHEUS_NETWORK_ADDRESS=$(generate_ip)
 LAST_OCTET=$((LAST_OCTET + 1))
 GRAFANA_NETWORK_ADDRESS=$(generate_ip)
-
+LAST_OCTET=$((LAST_OCTET + 1))
+NODE_EXPORTER_NETWORK_ADDRESS=$(generate_ip)
 ###################### openim 配置 ######################
 # read: https://github.com/openimsdk/open-im-server/blob/main/deployment/README.md
 def "OPENIM_DATA_DIR" "/data/openim"