Revert "feat: change port"

This reverts commit 06d5e944

config/minio.yml

@@ -9,7 +9,7 @@ sessionToken:
 # Internal address of the MinIO server
 internalAddress: localhost:10005
 # External address of the MinIO server, accessible from outside. Supports both HTTP and HTTPS using a domain name
-externalAddress: http://external_ip:10005
+externalAddress: http://192.168.2.19:10005
 # Flag to enable or disable public read access to the bucket
 publicRead: false
 

config/openim-api.yml

@@ -8,6 +8,6 @@ prometheus:
   # Whether to enable prometheus
   enable: true
   # Prometheus listening ports, must match the number of api.ports
-  ports: [ 10012 ]
+  ports: [ 20502 ]
   # This address can be accessed via a browser
   grafanaURL: http://127.0.0.1:13000/

config/openim-msggateway.yml

@@ -2,13 +2,13 @@ rpc:
   # The IP address where this RPC service registers itself; if left blank, it defaults to the internal network IP
   registerIP: 
   # List of ports that the RPC service listens on; configuring multiple ports will launch multiple instances. These must match the number of configured prometheus ports
-  ports: [ 6000, 6001, 6002, 6003, 6004, 6005, 6006, 6007 ]
+  ports: [ 10140 ]
 
 prometheus:
   # Enable or disable Prometheus monitoring
   enable: true
   # List of ports that Prometheus listens on; these must match the number of rpc.ports to ensure correct monitoring setup
-  ports: [ 8000, 8001, 8002, 8003, 8004, 8005, 8006, 8007 ]
+  ports: [ 20640 ]
 
 # IP address that the RPC/WebSocket service listens on; setting to 0.0.0.0 listens on both internal and external IPs. If left blank, it automatically uses the internal network IP
 listenIP: 0.0.0.0
@@ -25,3 +25,6 @@ longConnSvr:
 
 # 1: For Android, iOS, Windows, Mac, and web platforms, only one instance can be online at a time
 multiLoginPolicy: 1
+
+
+

config/openim-msgtransfer.yml

@@ -3,4 +3,4 @@ prometheus:
   enable: true
   # List of ports that Prometheus listens on; each port corresponds to an instance of monitoring. Ensure these are managed accordingly
   # Because four instances have been launched, four ports need to be specified
-  ports: [ 8100, 8101, 8102, 8103, 8104, 8105, 8106, 8107, 8108, 8109, 8110, 8111, 8112, 8113, 8114, 8115 ]
+  ports: [ 20600, 20601, 20602, 20603 ]

config/openim-push.yml

@@ -4,13 +4,13 @@ rpc:
   # IP address that the RPC service listens on; setting to 0.0.0.0 listens on both internal and external IPs. If left blank, it automatically uses the internal network IP
   listenIP: 0.0.0.0
   # List of ports that the RPC service listens on; configuring multiple ports will launch multiple instances. These must match the number of configured prometheus ports
-  ports: [ 6050, 6051, 6052, 6053, 6054, 6055, 6056, 6057, 6058, 6059, 6060, 6061, 6062, 6063, 6064, 6065 ]
+  ports: [ 10170, 10171, 10172, 10173, 10174, 10175, 10176, 10177, 10178, 10179, 11170, 11171, 11172, 11173, 11174, 11175 ]
 
 prometheus:
   # Enable or disable Prometheus monitoring
   enable: true
   # List of ports that Prometheus listens on; these must match the number of rpc.ports to ensure correct monitoring setup
-  ports: [ 8050, 8051, 8052, 8053, 8054, 8055, 8056, 8057, 8058, 8059, 8060, 8061, 8062, 8063, 8064, 8065 ]
+  ports: [ 20670, 20671, 20672, 20673, 20674, 20675, 20676, 20677, 20678, 20679, 21670, 21671, 21672, 21673, 21674, 21675 ]
 
 maxConcurrentWorkers: 3
 #Use geTui for offline push notifications, or choose fcm or jpns; corresponding configuration settings must be specified.
@@ -39,3 +39,8 @@ iosPush:
       production: false
 
 fullUserCache: true
+
+
+
+
+

config/openim-rpc-auth.yml

@@ -4,13 +4,13 @@ rpc:
   # IP address that the RPC service listens on; setting to 0.0.0.0 listens on both internal and external IPs. If left blank, it automatically uses the internal network IP
   listenIP: 0.0.0.0
   # List of ports that the RPC service listens on; configuring multiple ports will launch multiple instances. These must match the number of configured prometheus ports
-  ports: [ 7000 ]
+  ports: [ 10160 ]
 
 prometheus:
   # Enable or disable Prometheus monitoring
   enable: true
   # List of ports that Prometheus listens on; these must match the number of rpc.ports to ensure correct monitoring setup
-  ports: [ 9000 ]
+  ports: [ 20660 ]
 
 tokenPolicy:
   # Token validity period, in days

config/openim-rpc-conversation.yml

@@ -4,10 +4,10 @@ rpc:
   # IP address that the RPC service listens on; setting to 0.0.0.0 listens on both internal and external IPs. If left blank, it automatically uses the internal network IP
   listenIP: 0.0.0.0
   # List of ports that the RPC service listens on; configuring multiple ports will launch multiple instances. These must match the number of configured prometheus ports
-  ports: [ 7020 ]
+  ports: [ 10180 ]
 
 prometheus:
   # Enable or disable Prometheus monitoring
   enable: true
   # List of ports that Prometheus listens on; these must match the number of rpc.ports to ensure correct monitoring setup
-  ports: [ 9020 ]
+  ports: [ 20680 ]

config/openim-rpc-friend.yml

@@ -4,10 +4,10 @@ rpc:
   # IP address that the RPC service listens on; setting to 0.0.0.0 listens on both internal and external IPs. If left blank, it automatically uses the internal network IP
   listenIP: 0.0.0.0
   # List of ports that the RPC service listens on; configuring multiple ports will launch multiple instances. These must match the number of configured prometheus ports
-  ports: [ 7040, 7041, 7042, 7043, 7044, 7045, 7046, 7047, 7048, 7049, 7050, 7051, 7052, 7053, 7054, 7055 ]
+  ports: [ 10120 ]
 
 prometheus:
   # Enable or disable Prometheus monitoring
   enable: true
   # List of ports that Prometheus listens on; these must match the number of rpc.ports to ensure correct monitoring setup
-  ports: [ 9040, 9041, 9042, 9043, 9044, 9045, 9046, 9047, 9048, 9049, 9050, 9051, 9052, 9053, 9054, 9055 ]
+  ports: [ 20620 ]

config/openim-rpc-group.yml

@@ -4,13 +4,13 @@ rpc:
   # IP address that the RPC service listens on; setting to 0.0.0.0 listens on both internal and external IPs. If left blank, it automatically uses the internal network IP
   listenIP: 0.0.0.0
   # List of ports that the RPC service listens on; configuring multiple ports will launch multiple instances. These must match the number of configured prometheus ports
-  ports: [ 7060, 7061, 7062, 7063, 7064, 7065, 7066, 7067, 7068, 7069, 7070, 7071, 7072, 7073, 7074, 7075 ]
+  ports: [ 10150 ]
 
 prometheus:
   # Enable or disable Prometheus monitoring
   enable: true
   # List of ports that Prometheus listens on; these must match the number of rpc.ports to ensure correct monitoring setup
-  ports: [ 9060, 9061, 9062, 9063, 9064, 9065, 9066, 9067, 9068, 9069, 9070, 9071, 9072, 9073, 9074, 9075 ]
+  ports: [ 20650 ]
 
 
 enableHistoryForNewMembers: true

config/openim-rpc-msg.yml

@@ -4,14 +4,17 @@ rpc:
   # IP address that the RPC service listens on; setting to 0.0.0.0 listens on both internal and external IPs. If left blank, it automatically uses the internal network IP
   listenIP: 0.0.0.0
   # List of ports that the RPC service listens on; configuring multiple ports will launch multiple instances. These must match the number of configured prometheus ports
-  ports: [ 7080, 7081, 7082, 7083, 7084, 7085, 7086, 7087, 7088, 7089, 7090, 7091, 7092, 7093, 7094, 7095 ]
+  ports: [ 10130 ]
 
 prometheus:
   # Enable or disable Prometheus monitoring
   enable: true
   # List of ports that Prometheus listens on; these must match the number of rpc.ports to ensure correct monitoring setup
-  ports: [ 9080, 9081, 9082, 9083, 9084, 9085, 9086, 9087, 9088, 9089, 9090, 9091, 9092, 9093, 9094, 9095 ]
+  ports: [ 20630 ]
 
 
 # Does sending messages require friend verification
 friendVerify: false
+
+
+

config/openim-rpc-third.yml

@@ -4,13 +4,13 @@ rpc:
   # IP address that the RPC service listens on; setting to 0.0.0.0 listens on both internal and external IPs. If left blank, it automatically uses the internal network IP
   listenIP: 0.0.0.0
   # List of ports that the RPC service listens on; configuring multiple ports will launch multiple instances. These must match the number of configured prometheus ports
-  ports: [ 7100, 7101, 7102, 7103, 7104, 7105, 7106, 7107, 7108, 7109, 7110, 7111, 7112, 7113, 7114, 7115 ]
+  ports: [ 10190 ]
 
 prometheus:
   # Enable or disable Prometheus monitoring
   enable: true
   # List of ports that Prometheus listens on; these must match the number of rpc.ports to ensure correct monitoring setup
-  ports: [ 9100, 9101, 9102, 9103, 9104, 9105, 9106, 9107, 9108, 9109, 9110, 9111, 9112, 9113, 9114, 9115 ]
+  ports: [ 20690 ]
 
 
 object:

config/openim-rpc-user.yml

@@ -4,10 +4,14 @@ rpc:
   # Listening IP; 0.0.0.0 means both internal and external IPs are listened to, if blank, the internal network IP is automatically obtained by default
   listenIP: 0.0.0.0
   # Listening ports; if multiple are configured, multiple instances will be launched, and must be consistent with the number of prometheus.ports
-  ports: [ 7120, 7121, 7122, 7123, 7124, 7125, 7126, 7127, 7128, 7129, 7130, 7131, 7132, 7133, 7134, 7135 ]
+  ports: [ 10110 ]
 
 prometheus:
   # Whether to enable prometheus
   enable: true
   # Prometheus listening ports, must be consistent with the number of rpc.ports
-  ports: [ 9120, 9121, 9122, 9123, 9124, 9125, 9126, 9127, 9128, 9129, 9130, 9131, 9132, 9133, 9134, 9135 ]
+  ports: [ 20610 ]
+
+
+
+

config/prometheus.yml

@@ -26,77 +26,58 @@ scrape_configs:
   - job_name: node_exporter
     static_configs:
       - targets: [ internal_ip:20500 ]
-
   - job_name: openimserver-openim-api
     static_configs:
-      - targets: [internal_ip:10012]
+      - targets: [ internal_ip:20502 ]
         labels:
           namespace: default
-
   - job_name: openimserver-openim-msggateway
     static_configs:
-      - targets: [ internal_ip:8000 ]
+      - targets: [ internal_ip:20640 ]
-#      - targets: [ internal_ip:8000, internal_ip:8001, internal_ip:8002, internal_ip:8003, internal_ip:8004, internal_ip:8005, internal_ip:8006, internal_ip:8007 ]
         labels:
           namespace: default
-
   - job_name: openimserver-openim-msgtransfer
     static_configs:
-      - targets: [ internal_ip:8100, internal_ip:8101, internal_ip:8102, internal_ip:8103, internal_ip:8104, internal_ip:8105, internal_ip:8106, internal_ip:8107 ]
+      - targets: [ internal_ip:20600, internal_ip:20601, internal_ip:20602, internal_ip:20603 ]
-#      - targets: [ internal_ip:8100, internal_ip:8101, internal_ip:8102, internal_ip:8103, internal_ip:8104, internal_ip:8105, internal_ip:8106, internal_ip:8107, internal_ip:8108, internal_ip:8109, internal_ip:8110, internal_ip:8111, internal_ip:8112, internal_ip:8113, internal_ip:8114, internal_ip:8115 ]
         labels:
           namespace: default
-
   - job_name: openimserver-openim-push
     static_configs:
-      - targets: [ internal_ip:8050, internal_ip:8051, internal_ip:8052, internal_ip:8053, internal_ip:8054, internal_ip:8055, internal_ip:8056, internal_ip:8057 ]
+      - targets: [ internal_ip:20670, internal_ip:20671, internal_ip:20672, internal_ip:20673]
-#      - targets: [ internal_ip:8050, internal_ip:8051, internal_ip:8052, internal_ip:8053, internal_ip:8054, internal_ip:8055, internal_ip:8056, internal_ip:8057, internal_ip:8058, internal_ip:8059, internal_ip:8060, internal_ip:8061, internal_ip:8062, internal_ip:8063, internal_ip:8064, internal_ip:8065 ]
         labels:
           namespace: default
-
   - job_name: openimserver-openim-rpc-auth
     static_configs:
-      - targets: [ internal_ip:9000 ]
+      - targets: [ internal_ip:20600 ]
         labels:
           namespace: default
-
   - job_name: openimserver-openim-rpc-conversation
     static_configs:
-      - targets: [ internal_ip:9020]
+      - targets: [ internal_ip:20680 ]
         labels:
           namespace: default
-
   - job_name: openimserver-openim-rpc-friend
     static_configs:
-      - targets: [ internal_ip:9040 ]
+      - targets: [ internal_ip:20620 ]
-#      - targets: [ internal_ip:9040, internal_ip:9041, internal_ip:9042, internal_ip:9043, internal_ip:9044, internal_ip:9045, internal_ip:9046, internal_ip:9047, internal_ip:9048, internal_ip:9049, internal_ip:9050, internal_ip:9051, internal_ip:9052, internal_ip:9053, internal_ip:9054, internal_ip:9055 ]
         labels:
           namespace: default
-
   - job_name: openimserver-openim-rpc-group
     static_configs:
-      - targets: [ internal_ip:9060 ]
+      - targets: [ internal_ip:20650 ]
-#      - targets: [ internal_ip:9060, internal_ip:9061, internal_ip:9062, internal_ip:9063, internal_ip:9064, internal_ip:9065, internal_ip:9066, internal_ip:9067, internal_ip:9068, internal_ip:9069, internal_ip:9070, internal_ip:9071, internal_ip:9072, internal_ip:9073, internal_ip:9074, internal_ip:9075 ]
         labels:
           namespace: default
-
   - job_name: openimserver-openim-rpc-msg
     static_configs:
-      - targets: [ internal_ip:9080 ]
+      - targets: [ internal_ip:20630 ]
-#      - targets: [ internal_ip:9080, internal_ip:9081, internal_ip:9082, internal_ip:9083, internal_ip:9084, internal_ip:9085, internal_ip:9086, internal_ip:9087, internal_ip:9088, internal_ip:9089, internal_ip:9090, internal_ip:9091, internal_ip:9092, internal_ip:9093, internal_ip:9094, internal_ip:9095 ]
         labels:
           namespace: default
-
   - job_name: openimserver-openim-rpc-third
     static_configs:
-      - targets: [ internal_ip:9100 ]
+      - targets: [ internal_ip:20690 ]
-#      - targets: [ internal_ip:9100, internal_ip:9101, internal_ip:9102, internal_ip:9103, internal_ip:9104, internal_ip:9105, internal_ip:9106, internal_ip:9107, internal_ip:9108, internal_ip:9109, internal_ip:9110, internal_ip:9111, internal_ip:9112, internal_ip:9113, internal_ip:9114, internal_ip:9115 ]
         labels:
           namespace: default
-
   - job_name: openimserver-openim-rpc-user
     static_configs:
-      - targets: [ internal_ip:9120 ]
+      - targets: [ internal_ip:20610 ]
-#      - targets: [ internal_ip:9120, internal_ip:9121, internal_ip:9122, internal_ip:9123, internal_ip:9124, internal_ip:9125, internal_ip:9126, internal_ip:9127, internal_ip:9128, internal_ip:9129, internal_ip:9130, internal_ip:9131, internal_ip:9132, internal_ip:9133, internal_ip:9134, internal_ip:9135 ]
         labels:
-          namespace: default
+          namespace: default

docker-compose.yml

@@ -140,50 +140,50 @@ services:
     networks:
       - openim
 
-#  prometheus:
+  prometheus:
-#    image: ${PROMETHEUS_IMAGE}
+    image: ${PROMETHEUS_IMAGE}
-#    container_name: prometheus
+    container_name: prometheus
-#    restart: always
+    restart: always
-#    volumes:
+    volumes:
-#      - ./config/prometheus.yml:/etc/prometheus/prometheus.yml
+      - ./config/prometheus.yml:/etc/prometheus/prometheus.yml
-#      - ./config/instance-down-rules.yml:/etc/prometheus/instance-down-rules.yml
+      - ./config/instance-down-rules.yml:/etc/prometheus/instance-down-rules.yml
-#      - ${DATA_DIR}/components/prometheus/data:/prometheus
+      - ${DATA_DIR}/components/prometheus/data:/prometheus
-#    command:
+    command:
-#      - '--config.file=/etc/prometheus/prometheus.yml'
+      - '--config.file=/etc/prometheus/prometheus.yml'
-#      - '--storage.tsdb.path=/prometheus'
+      - '--storage.tsdb.path=/prometheus'
-#    ports:
+    ports:
-#      - "19091:9090"
+      - "19091:9090"
-#    networks:
+    networks:
-#      - openim
+      - openim
-#
+
-#  alertmanager:
+  alertmanager:
-#    image: ${ALERTMANAGER_IMAGE}
+    image: ${ALERTMANAGER_IMAGE}
-#    container_name: alertmanager
+    container_name: alertmanager
-#    restart: always
+    restart: always
-#    volumes:
+    volumes:
-#      - ./config/alertmanager.yml:/etc/alertmanager/alertmanager.yml
+      - ./config/alertmanager.yml:/etc/alertmanager/alertmanager.yml
-#      - ./config/email.tmpl:/etc/alertmanager/email.tmpl
+      - ./config/email.tmpl:/etc/alertmanager/email.tmpl
-#    ports:
+    ports:
-#      - "19093:9093"
+      - "19093:9093"
-#    networks:
+    networks:
-#      - openim
+      - openim
-#
+
-#  grafana:
+  grafana:
-#    image: ${GRAFANA_IMAGE}
+    image: ${GRAFANA_IMAGE}
-#    container_name: grafana
+    container_name: grafana
-#    user: root
+    user: root
-#    restart: always
+    restart: always
-#    environment:
+    environment:
-#      - GF_SECURITY_ALLOW_EMBEDDING=true
+      - GF_SECURITY_ALLOW_EMBEDDING=true
-#      - GF_SESSION_COOKIE_SAMESITE=none
+      - GF_SESSION_COOKIE_SAMESITE=none
-#      - GF_SESSION_COOKIE_SECURE=true
+      - GF_SESSION_COOKIE_SECURE=true
-#      - GF_AUTH_ANONYMOUS_ENABLED=true
+      - GF_AUTH_ANONYMOUS_ENABLED=true
-#      - GF_AUTH_ANONYMOUS_ORG_ROLE=Admin
+      - GF_AUTH_ANONYMOUS_ORG_ROLE=Admin
-#    ports:
+    ports:
-#      - "13000:3000"
+      - "13000:3000"
-#    volumes:
+    volumes:
-#      - ${DATA_DIR:-./}/components/grafana:/var/lib/grafana
+      - ${DATA_DIR:-./}/components/grafana:/var/lib/grafana
-#    networks:
+    networks:
-#      - openim
+      - openim