Merge branch '3.6.1-code-conventions' of https://github.com/FGadvancer/Open-IM-Server into 3.6.1-code-conventions

config/object-storage-config.yaml

@@ -1,13 +1,13 @@
 object:
   enable: "minio"
-  apiURL: "http://240e:47e:3060:8cc:f664:1fee:9c86:9455:10002"
+  apiURL: "http://127.0.0.1:10002"
   minio:
     bucket: "openim"
     endpoint: "http://172.28.0.1:10005"
     accessKeyID: "root"
     secretAccessKey: "openIM123"
     sessionToken: ''
-    signEndpoint: "http://240e:47e:3060:8cc:f664:1fee:9c86:9455:10005"
+    signEndpoint: "http://127.0.0.1:10005"
     publicRead: false
   cos:
     bucketURL: https://temp-1252357374.cos.ap-chengdu.myqcloud.com

config/openim-api.yml

@@ -1,3 +1,7 @@
 api:
   openImApiPort: [ 10002 ]
   listenIP: 0.0.0.0
+prometheus:
+  enable: true
+  grafanaUrl: http://127.0.0.1:13000/
+  apiPrometheusPort: [20100]

config/openim-msggateway.yml

@@ -0,0 +1,22 @@
+longConnSvr:
+  openImWsPort: [ 10001 ]
+  websocketMaxConnNum: 100000
+  openImMessageGatewayPort: [ 10140 ]
+  websocketMaxMsgLen: 4096
+  websocketTimeout: 10
+prometheus:
+  enable: true
+  grafanaUrl: http://127.0.0.1:13000/
+  apiPrometheusPort: [20100]
+  userPrometheusPort: [ 20110 ]
+  friendPrometheusPort: [ 20120 ]
+  messagePrometheusPort: [ 20130 ]
+  messageGatewayPrometheusPort: [ 20140 ]
+  groupPrometheusPort: [ 20150 ]
+  authPrometheusPort: [ 20160 ]
+  pushPrometheusPort: [ 20170 ]
+  conversationPrometheusPort: [ 20230 ]
+  rtcPrometheusPort: [ 21300 ]
+  thirdPrometheusPort: [ 21301 ]
+  messageTransferPrometheusPort: [ 21400, 21401, 21402, 21403 ] # List of ports
+

config/openim-msgtransfer.yml

@@ -0,0 +1,16 @@
+# msgtransfer
+prometheus:
+  enable: true
+  grafanaUrl: http://127.0.0.1:13000/
+  apiPrometheusPort: [20100]
+  userPrometheusPort: [ 20110 ]
+  friendPrometheusPort: [ 20120 ]
+  messagePrometheusPort: [ 20130 ]
+  messageGatewayPrometheusPort: [ 20140 ]
+  groupPrometheusPort: [ 20150 ]
+  authPrometheusPort: [ 20160 ]
+  pushPrometheusPort: [ 20170 ]
+  conversationPrometheusPort: [ 20230 ]
+  rtcPrometheusPort: [ 21300 ]
+  thirdPrometheusPort: [ 21301 ]
+  messageTransferPrometheusPort: [ 21400, 21401, 21402, 21403 ] # List of ports

config/openim-push.yml

@@ -14,3 +14,18 @@ push:
     masterSecret: ''
     pushUrl: ''
     pushIntent: ''
+prometheus:
+  enable: true
+  grafanaUrl: http://127.0.0.1:13000/
+  apiPrometheusPort: [20100]
+  userPrometheusPort: [ 20110 ]
+  friendPrometheusPort: [ 20120 ]
+  messagePrometheusPort: [ 20130 ]
+  messageGatewayPrometheusPort: [ 20140 ]
+  groupPrometheusPort: [ 20150 ]
+  authPrometheusPort: [ 20160 ]
+  pushPrometheusPort: [ 20170 ]
+  conversationPrometheusPort: [ 20230 ]
+  rtcPrometheusPort: [ 21300 ]
+  thirdPrometheusPort: [ 21301 ]
+  messageTransferPrometheusPort: [ 21400, 21401, 21402, 21403 ] # List of ports

config/openim-rpc-auth.yml

@@ -5,3 +5,18 @@ rpcPort:
   openImAuthPort: [ 10160 ]
 rpcRegisterName:
   openImAuthName: Auth
+prometheus:
+  enable: true
+  grafanaUrl: http://127.0.0.1:13000/
+  apiPrometheusPort: [20100]
+  userPrometheusPort: [ 20110 ]
+  friendPrometheusPort: [ 20120 ]
+  messagePrometheusPort: [ 20130 ]
+  messageGatewayPrometheusPort: [ 20140 ]
+  groupPrometheusPort: [ 20150 ]
+  authPrometheusPort: [ 20160 ]
+  pushPrometheusPort: [ 20170 ]
+  conversationPrometheusPort: [ 20230 ]
+  rtcPrometheusPort: [ 21300 ]
+  thirdPrometheusPort: [ 21301 ]
+  messageTransferPrometheusPort: [ 21400, 21401, 21402, 21403 ] # List of ports

config/openim-rpc-conversation.yml

@@ -5,3 +5,18 @@ rpcPort:
   openImConversationPort: [ 10180 ]
 rpcRegisterName:
   openImConversationName: Conversation
+prometheus:
+  enable: true
+  grafanaUrl: http://127.0.0.1:13000/
+  apiPrometheusPort: [20100]
+  userPrometheusPort: [ 20110 ]
+  friendPrometheusPort: [ 20120 ]
+  messagePrometheusPort: [ 20130 ]
+  messageGatewayPrometheusPort: [ 20140 ]
+  groupPrometheusPort: [ 20150 ]
+  authPrometheusPort: [ 20160 ]
+  pushPrometheusPort: [ 20170 ]
+  conversationPrometheusPort: [ 20230 ]
+  rtcPrometheusPort: [ 21300 ]
+  thirdPrometheusPort: [ 21301 ]
+  messageTransferPrometheusPort: [ 21400, 21401, 21402, 21403 ] # List of ports

config/openim-rpc-friend.yml

@@ -5,3 +5,18 @@ rpcPort:
   openImFriendPort: [ 10120 ]
 rpcRegisterName:
   openImFriendName: Friend
+prometheus:
+  enable: true
+  grafanaUrl: http://127.0.0.1:13000/
+  apiPrometheusPort: [20100]
+  userPrometheusPort: [ 20110 ]
+  friendPrometheusPort: [ 20120 ]
+  messagePrometheusPort: [ 20130 ]
+  messageGatewayPrometheusPort: [ 20140 ]
+  groupPrometheusPort: [ 20150 ]
+  authPrometheusPort: [ 20160 ]
+  pushPrometheusPort: [ 20170 ]
+  conversationPrometheusPort: [ 20230 ]
+  rtcPrometheusPort: [ 21300 ]
+  thirdPrometheusPort: [ 21301 ]
+  messageTransferPrometheusPort: [ 21400, 21401, 21402, 21403 ] # List of ports

config/openim-rpc-group.yml

@@ -5,3 +5,18 @@ rpcPort:
   openImGroupPort: [ 10150 ]
 rpcRegisterName:
   openImGroupName: Group
+prometheus:
+  enable: true
+  grafanaUrl: http://127.0.0.1:13000/
+  apiPrometheusPort: [20100]
+  userPrometheusPort: [ 20110 ]
+  friendPrometheusPort: [ 20120 ]
+  messagePrometheusPort: [ 20130 ]
+  messageGatewayPrometheusPort: [ 20140 ]
+  groupPrometheusPort: [ 20150 ]
+  authPrometheusPort: [ 20160 ]
+  pushPrometheusPort: [ 20170 ]
+  conversationPrometheusPort: [ 20230 ]
+  rtcPrometheusPort: [ 21300 ]
+  thirdPrometheusPort: [ 21301 ]
+  messageTransferPrometheusPort: [ 21400, 21401, 21402, 21403 ] # List of ports

config/openim-rpc-msg.yml

@@ -5,3 +5,18 @@ rpcPort:
   openImMessagePort: [ 10130 ]
 rpcRegisterName:
   openImMsgName: Msg
+prometheus:
+  enable: true
+  grafanaUrl: http://127.0.0.1:13000/
+  apiPrometheusPort: [20100]
+  userPrometheusPort: [ 20110 ]
+  friendPrometheusPort: [ 20120 ]
+  messagePrometheusPort: [ 20130 ]
+  messageGatewayPrometheusPort: [ 20140 ]
+  groupPrometheusPort: [ 20150 ]
+  authPrometheusPort: [ 20160 ]
+  pushPrometheusPort: [ 20170 ]
+  conversationPrometheusPort: [ 20230 ]
+  rtcPrometheusPort: [ 21300 ]
+  thirdPrometheusPort: [ 21301 ]
+  messageTransferPrometheusPort: [ 21400, 21401, 21402, 21403 ] # List of ports

config/openim-rpc-third.yml

@@ -5,3 +5,19 @@ rpcPort:
   openImThirdPort: [ 10190 ]
 rpcRegisterName:
   openImThirdName: Third
+
+prometheus:
+  enable: true
+  grafanaUrl: http://127.0.0.1:13000/
+  apiPrometheusPort: [20100]
+  userPrometheusPort: [ 20110 ]
+  friendPrometheusPort: [ 20120 ]
+  messagePrometheusPort: [ 20130 ]
+  messageGatewayPrometheusPort: [ 20140 ]
+  groupPrometheusPort: [ 20150 ]
+  authPrometheusPort: [ 20160 ]
+  pushPrometheusPort: [ 20170 ]
+  conversationPrometheusPort: [ 20230 ]
+  rtcPrometheusPort: [ 21300 ]
+  thirdPrometheusPort: [ 21301 ]
+  messageTransferPrometheusPort: [ 21400, 21401, 21402, 21403 ] # List of ports

config/openim-rpc-user.yml

@@ -5,3 +5,19 @@ rpcPort:
   openImUserPort: [ 10110 ]
 rpcRegisterName:
   openImUserName: User
+
+prometheus:
+  enable: true
+  grafanaUrl: http://127.0.0.1:13000/
+  apiPrometheusPort: [20100]
+  userPrometheusPort: [ 20110 ]
+  friendPrometheusPort: [ 20120 ]
+  messagePrometheusPort: [ 20130 ]
+  messageGatewayPrometheusPort: [ 20140 ]
+  groupPrometheusPort: [ 20150 ]
+  authPrometheusPort: [ 20160 ]
+  pushPrometheusPort: [ 20170 ]
+  conversationPrometheusPort: [ 20230 ]
+  rtcPrometheusPort: [ 21300 ]
+  thirdPrometheusPort: [ 21301 ]
+  messageTransferPrometheusPort: [ 21400, 21401, 21402, 21403 ] # List of ports

config/templates/config.yaml.template

@@ -101,14 +101,14 @@ api:
 # minio.signEndpoint is minio public network address
 object:
   enable: "minio"
-  apiURL: "http://240e:47e:3060:8cc:f664:1fee:9c86:9455:10002"
+  apiURL: "http://127.0.0.1:10002"
   minio:
     bucket: "openim"
     endpoint: "http://172.28.0.1:10005"
     accessKeyID: "root"
     secretAccessKey: "openIM123"
     sessionToken: ''
-    signEndpoint: "http://240e:47e:3060:8cc:f664:1fee:9c86:9455:10005"
+    signEndpoint: "http://127.0.0.1:10005"
     publicRead: false
   cos:
     bucketURL: https://temp-1252357374.cos.ap-chengdu.myqcloud.com
@@ -501,7 +501,7 @@ callback:
 # The number of ports needs to be consistent with msg_transfer_service_num in script/path_info.sh
 prometheus:
   enable: true
-  grafanaUrl: http://240e:47e:3060:8cc:f664:1fee:9c86:9455:13000/
+  grafanaUrl: http://127.0.0.1:13000/
   apiPrometheusPort: [20100]
   userPrometheusPort: [ 20110 ]
   friendPrometheusPort: [ 20120 ]

config/templates/env.template

@@ -91,7 +91,7 @@ ALERT_MANAGER_NETWORK_ADDRESS=172.28.0.14
 # ==============================================================================
 # Local IP address of the service. Modify if necessary.
 # Example: OPENIM_IP=172.28.0.1，
-OPENIM_IP=240e:47e:3060:8cc:f664:1fee:9c86:9455
+OPENIM_IP=127.0.0.1
 
 # ----- ZooKeeper Configuration -----
 # Port for ZooKeeper service.