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

2 years ago · f7de02cd98
parent c9268170bc 34aa95a24e
commit f7de02cd98
11 changed files with 18 additions and 121 deletions
--- a/config/openim-api.yml
+++ b/config/openim-api.yml
@ -4,4 +4,4 @@ api:
 prometheus:
  enable: true
  grafanaUrl: http://127.0.0.1:13000/
-  apiPrometheusPort: [20100]
+  prometheusPort: [20100]
--- a/config/openim-msggateway.yml
+++ b/config/openim-msggateway.yml
@ -7,16 +7,6 @@ longConnSvr:
 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
+  prometheusPort: [ 20140 ]
+

--- a/config/openim-msgtransfer.yml
+++ b/config/openim-msgtransfer.yml
@ -2,15 +2,4 @@
 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
+  prometheusPort: [ 21400, 21401, 21402, 21403 ] # List of ports
--- a/config/openim-push.yml
+++ b/config/openim-push.yml
@ -17,15 +17,5 @@ push:
 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
+  prometheusPort: [ 20170 ]
+
--- a/config/openim-rpc-auth.yml
+++ b/config/openim-rpc-auth.yml
@ -8,15 +8,4 @@ rpcRegisterName:
 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
+  prometheusPort: [20160]
--- a/config/openim-rpc-conversation.yml
+++ b/config/openim-rpc-conversation.yml
@ -8,15 +8,5 @@ rpcRegisterName:
 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
+  prometheusPort: [ 20230 ]
+
--- a/config/openim-rpc-friend.yml
+++ b/config/openim-rpc-friend.yml
@ -8,15 +8,4 @@ rpcRegisterName:
 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
+  prometheusPort: [ 20120 ]
--- a/config/openim-rpc-group.yml
+++ b/config/openim-rpc-group.yml
@ -8,15 +8,5 @@ rpcRegisterName:
 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
+  prometheusPort: [ 20150 ]
+
--- a/config/openim-rpc-msg.yml
+++ b/config/openim-rpc-msg.yml
@ -8,15 +8,5 @@ rpcRegisterName:
 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
+  prometheusPort: [ 20130 ]
+
--- a/config/openim-rpc-third.yml
+++ b/config/openim-rpc-third.yml
@ -9,15 +9,5 @@ rpcRegisterName:
 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
+  prometheusPort: [ 21301 ]
+
--- a/config/openim-rpc-user.yml
+++ b/config/openim-rpc-user.yml
@ -9,15 +9,5 @@ rpcRegisterName:
 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
+  prometheusPort: [ 20110 ]
+