From 06d5e944eed1243c8aab06a538c7d9458e36d38c Mon Sep 17 00:00:00 2001 From: icey-yu <1186114839@qq.com> Date: Sat, 7 Sep 2024 15:27:55 +0800 Subject: [PATCH] feat: change port --- config/openim-api.yml | 2 +- config/openim-msggateway.yml | 7 +-- config/openim-msgtransfer.yml | 2 +- config/openim-push.yml | 9 +--- config/openim-rpc-auth.yml | 4 +- config/openim-rpc-conversation.yml | 4 +- config/openim-rpc-friend.yml | 4 +- config/openim-rpc-group.yml | 4 +- config/openim-rpc-msg.yml | 7 +-- config/openim-rpc-third.yml | 4 +- config/openim-rpc-user.yml | 8 +--- config/prometheus.yml | 77 +++++++++++++++++------------- 12 files changed, 64 insertions(+), 68 deletions(-) diff --git a/config/openim-api.yml b/config/openim-api.yml index 9f53038d88..3c05753ae9 100644 --- a/config/openim-api.yml +++ b/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: [ 20502 ] + ports: [ 10012 ] # This address can be accessed via a browser grafanaURL: http://127.0.0.1:13000/ diff --git a/config/openim-msggateway.yml b/config/openim-msggateway.yml index 63332740ff..eebc33c6a2 100644 --- a/config/openim-msggateway.yml +++ b/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: [ 10140 ] + ports: [ 6000, 6001, 6002, 6003, 6004, 6005, 6006, 6007 ] 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: [ 20640 ] + ports: [ 8000, 8001, 8002, 8003, 8004, 8005, 8006, 8007 ] # 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,6 +25,3 @@ longConnSvr: # 1: For Android, iOS, Windows, Mac, and web platforms, only one instance can be online at a time multiLoginPolicy: 1 - - - diff --git a/config/openim-msgtransfer.yml b/config/openim-msgtransfer.yml index e71a218edf..49bff2f918 100644 --- a/config/openim-msgtransfer.yml +++ b/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: [ 20600, 20601, 20602, 20603 ] + ports: [ 8100, 8101, 8102, 8103, 8104, 8105, 8106, 8107, 8108, 8109, 8110, 8111, 8112, 8113, 8114, 8115 ] diff --git a/config/openim-push.yml b/config/openim-push.yml index 5cc1592319..7876027724 100644 --- a/config/openim-push.yml +++ b/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: [ 10170, 10171, 10172, 10173, 10174, 10175, 10176, 10177, 10178, 10179, 11170, 11171, 11172, 11173, 11174, 11175 ] + ports: [ 6050, 6051, 6052, 6053, 6054, 6055, 6056, 6057, 6058, 6059, 6060, 6061, 6062, 6063, 6064, 6065 ] 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: [ 20670, 20671, 20672, 20673, 20674, 20675, 20676, 20677, 20678, 20679, 21670, 21671, 21672, 21673, 21674, 21675 ] + ports: [ 8050, 8051, 8052, 8053, 8054, 8055, 8056, 8057, 8058, 8059, 8060, 8061, 8062, 8063, 8064, 8065 ] maxConcurrentWorkers: 3 #Use geTui for offline push notifications, or choose fcm or jpns; corresponding configuration settings must be specified. @@ -39,8 +39,3 @@ iosPush: production: false fullUserCache: true - - - - - diff --git a/config/openim-rpc-auth.yml b/config/openim-rpc-auth.yml index c55c745b6c..68ef8a285e 100644 --- a/config/openim-rpc-auth.yml +++ b/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: [ 10160 ] + ports: [ 7000 ] 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: [ 20660 ] + ports: [ 9000 ] tokenPolicy: # Token validity period, in days diff --git a/config/openim-rpc-conversation.yml b/config/openim-rpc-conversation.yml index 00c9c5aab9..877e514ed8 100644 --- a/config/openim-rpc-conversation.yml +++ b/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: [ 10180 ] + ports: [ 7020 ] 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: [ 20680 ] + ports: [ 9020 ] diff --git a/config/openim-rpc-friend.yml b/config/openim-rpc-friend.yml index afac3c5db9..090401263a 100644 --- a/config/openim-rpc-friend.yml +++ b/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: [ 10120 ] + ports: [ 7040, 7041, 7042, 7043, 7044, 7045, 7046, 7047, 7048, 7049, 7050, 7051, 7052, 7053, 7054, 7055 ] 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: [ 20620 ] + ports: [ 9040, 9041, 9042, 9043, 9044, 9045, 9046, 9047, 9048, 9049, 9050, 9051, 9052, 9053, 9054, 9055 ] diff --git a/config/openim-rpc-group.yml b/config/openim-rpc-group.yml index d0243b5fbb..cc5516caf7 100644 --- a/config/openim-rpc-group.yml +++ b/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: [ 10150 ] + ports: [ 7060, 7061, 7062, 7063, 7064, 7065, 7066, 7067, 7068, 7069, 7070, 7071, 7072, 7073, 7074, 7075 ] 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: [ 20650 ] + ports: [ 9060, 9061, 9062, 9063, 9064, 9065, 9066, 9067, 9068, 9069, 9070, 9071, 9072, 9073, 9074, 9075 ] enableHistoryForNewMembers: true \ No newline at end of file diff --git a/config/openim-rpc-msg.yml b/config/openim-rpc-msg.yml index 15840c7f3b..6105bf9fd5 100644 --- a/config/openim-rpc-msg.yml +++ b/config/openim-rpc-msg.yml @@ -4,17 +4,14 @@ 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: [ 10130 ] + ports: [ 7080, 7081, 7082, 7083, 7084, 7085, 7086, 7087, 7088, 7089, 7090, 7091, 7092, 7093, 7094, 7095 ] 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: [ 20630 ] + ports: [ 9080, 9081, 9082, 9083, 9084, 9085, 9086, 9087, 9088, 9089, 9090, 9091, 9092, 9093, 9094, 9095 ] # Does sending messages require friend verification friendVerify: false - - - diff --git a/config/openim-rpc-third.yml b/config/openim-rpc-third.yml index 512ca391fa..57fd278f24 100644 --- a/config/openim-rpc-third.yml +++ b/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: [ 10190 ] + ports: [ 7100, 7101, 7102, 7103, 7104, 7105, 7106, 7107, 7108, 7109, 7110, 7111, 7112, 7113, 7114, 7115 ] 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: [ 20690 ] + ports: [ 9100, 9101, 9102, 9103, 9104, 9105, 9106, 9107, 9108, 9109, 9110, 9111, 9112, 9113, 9114, 9115 ] object: diff --git a/config/openim-rpc-user.yml b/config/openim-rpc-user.yml index 1958bbc6ab..72773debcf 100644 --- a/config/openim-rpc-user.yml +++ b/config/openim-rpc-user.yml @@ -4,14 +4,10 @@ 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: [ 10110 ] + ports: [ 7120, 7121, 7122, 7123, 7124, 7125, 7126, 7127, 7128, 7129, 7130, 7131, 7132, 7133, 7134, 7135 ] prometheus: # Whether to enable prometheus enable: true # Prometheus listening ports, must be consistent with the number of rpc.ports - ports: [ 20610 ] - - - - + ports: [ 9120, 9121, 9122, 9123, 9124, 9125, 9126, 9127, 9128, 9129, 9130, 9131, 9132, 9133, 9134, 9135 ] diff --git a/config/prometheus.yml b/config/prometheus.yml index 627cf94114..e4c1f9da02 100644 --- a/config/prometheus.yml +++ b/config/prometheus.yml @@ -26,58 +26,69 @@ scrape_configs: - job_name: node_exporter static_configs: - targets: [ internal_ip:20500 ] - - job_name: openimserver-openim-api + + - job_name: 'openimserver-openim-api' static_configs: - - targets: [ internal_ip:20502 ] + - targets: ['internal_ip:10012'] labels: - namespace: default - - job_name: openimserver-openim-msggateway + namespace: 'default' + + - job_name: 'openimserver-openim-msggateway' static_configs: - - 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 + namespace: 'default' + + - job_name: 'openimserver-openim-msgtransfer' static_configs: - - 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 + namespace: 'default' + + - job_name: 'openimserver-openim-push' static_configs: - - 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 + namespace: 'default' + + - job_name: 'openimserver-openim-rpc-auth' static_configs: - - targets: [ internal_ip:20600 ] + - targets: ['internal_ip:9000'] labels: - namespace: default - - job_name: openimserver-openim-rpc-conversation + namespace: 'default' + + - job_name: 'openimserver-openim-rpc-conversation' static_configs: - - targets: [ internal_ip:20680 ] + - targets: ['internal_ip:9020'] labels: - namespace: default - - job_name: openimserver-openim-rpc-friend + namespace: 'default' + + - job_name: 'openimserver-openim-rpc-friend' static_configs: - - 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 + namespace: 'default' + + - job_name: 'openimserver-openim-rpc-group' static_configs: - - 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 + namespace: 'default' + + - job_name: 'openimserver-openim-rpc-msg' static_configs: - - 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 + namespace: 'default' + + - job_name: 'openimserver-openim-rpc-third' static_configs: - - 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 + namespace: 'default' + + - job_name: 'openimserver-openim-rpc-user' static_configs: - - 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 \ No newline at end of file + namespace: 'default'