Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release

cmd/open_im_msg_transfer/main.go

@@ -2,8 +2,10 @@ package main
 
 import (
 	"Open_IM/internal/msg_transfer/logic"
+	"Open_IM/pkg/common/config"
 	"Open_IM/pkg/common/constant"
 	"Open_IM/pkg/common/log"
+	"flag"
 	"fmt"
 	"sync"
 )
@@ -11,9 +13,10 @@ import (
 func main() {
 	var wg sync.WaitGroup
 	wg.Add(1)
+	rpcPort := flag.Int("port", config.Config.Prometheus.MessageTransferPrometheusPort[0], "MessageTransferPrometheusPort default listen port")
 	log.NewPrivateLog(constant.LogFileName)
 	logic.Init()
 	fmt.Println("start msg_transfer server")
-	logic.Run()
+	logic.Run(*rpcPort)
 	wg.Wait()
 }

config/config.yaml

@@ -88,9 +88,7 @@ endpoints:
   rpc_group: openim_rpc_group
   rpc_msg: openim_rpc_msg
   rpc_user: openim_rpc_user
-  rpc_statistic: openim_rpc_statistic
   rpc_admin_cms: openim_rpc_admin_cms
-  rpc_message_cms: openim_rpc_admin_cms
   rpc_office: openim_rpc_office
 
 api:
@@ -155,8 +153,6 @@ rpcport: #rpc服务端口 默认即可
   openImGroupPort: [ 10150 ]
   openImAuthPort: [ 10160 ]
   openImPushPort: [ 10170 ]
-  openImStatisticsPort: [ 10180 ]
-  openImMessageCmsPort: [ 10190 ]
   openImAdminCmsPort: [ 10200 ]
   openImOfficePort: [ 10210 ]
   openImOrganizationPort: [ 10220 ]
@@ -181,8 +177,6 @@ rpcregistername: #rpc注册服务名，默认即可
   openImRelayName: Relay
   openImGroupName: Group
   openImAuthName: Auth
-  openImStatisticsName: Statistics
-  openImMessageCMSName: MessageCMS
   openImAdminCMSName: AdminCMS
   openImOfficeName: Office
   openImOrganizationName: Organization
@@ -757,3 +751,20 @@ demo:
 
 rtc:
   signalTimeout: 35
+
+prometheus:
+  enable: false
+  userPrometheusPort: [ 20110 ]
+  friendPrometheusPort: [ 20120 ]
+  messagePrometheusPort: [ 20130 ]
+  messageGatewayPrometheusPort: [ 20140 ]
+  groupPrometheusPort: [ 20150 ]
+  authPrometheusPort: [ 20160 ]
+  pushPrometheusPort: [ 20170 ]
+  adminCmsPrometheusPort: [ 20200 ]
+  officePrometheusPort: [ 20210 ]
+  organizationPrometheusPort: [ 20220 ]
+  conversationPrometheusPort: [ 20230 ]
+  cachePrometheusPort: [ 20240 ]
+  realTimeCommPrometheusPort: [ 21300 ]
+  messageTransferPrometheusPort: [ 21400 ]

docker-compose.yaml

@@ -112,18 +112,7 @@ services:
       MINIO_ROOT_PASSWORD: key12345
     restart: always
     command: minio server /data --console-address ':9090'
-  #
+
-  #  dtm:
-  #    image: yedf/dtm
-  #    ports:
-  #      - 36789:36789
-  #      - 36790:36790
-  #    environment:
-  #      STORE_DRIVER: mysql
-  #      STORE_HOST: localhost
-  #      STORE_USER: root
-  #      STORE_PASSWORD: ''
-  #      STORE_PORT: 3306
 
   open_im_server:
     image: openim/open_im_server:v2.3.1
@@ -147,3 +136,39 @@ services:
       options:
         max-size: "1g"
         max-file: "2"
+
+  prometheus:
+    image: prom/prometheus
+    volumes:
+      - ./docker-compose_cfg/prometheus-compose.yml:/etc/prometheus/prometheus.yml
+      # - ./components/prometheus_data:/prometheus
+    container_name: prometheus
+    ports:
+    - 9091:9091
+    depends_on:
+    - open_im_server
+    command: --web.listen-address=:9091 --config.file="/etc/prometheus/prometheus.yml"
+    network_mode: "host" 
+
+  grafana:
+    image: grafana/grafana
+    volumes:
+    # - ./grafana/dashboards/dashboard.json:/var/lib/grafana/dashboards/dashboard.json
+    # - ./grafana/provisioning/dashboard.yaml:/etc/grafana/provisioning/dashboards/dashboard.yaml
+    - ./docker-compose_cfg/datasource-compose.yaml:/etc/grafana/provisioning/datasources/datasource.yaml
+    - ./docker-compose_cfg/grafana.ini:/etc/grafana/grafana.ini
+    - ./docker-compose_cfg/node-exporter-full_rev1.json:/var/lib/grafana/dashboards/node-exporter-full_rev1.json
+    container_name: grafana
+    ports:
+    - 10007:10007
+    depends_on:
+    - prometheus
+    network_mode: "host" 
+
+  node-exporter:
+    image: quay.io/prometheus/node-exporter
+    container_name: node-exporter
+    restart: always
+    ports:
+      - "9100:9100"
+    # command: --collector.ENTER-THE-NAME-OF-COLLECTOR

docker-compose_cfg/datasource-compose.yaml

@@ -0,0 +1,13 @@
+#more datasource-compose.yaml 
+apiVersion: 1
+
+datasources:
+- name: Prometheus
+  type: prometheus
+  access: proxy
+  orgId: 1
+  url: http://127.0.0.1:9091
+  basicAuth: false
+  isDefault: true
+  version: 1
+  editable: true

docker-compose_cfg/prometheus-compose.yml

@@ -0,0 +1,28 @@
+#more prometheus-compose.yml 
+global:
+  scrape_interval:     15s 
+  evaluation_interval: 15s 
+  external_labels:
+    monitor: 'openIM-monitor'
+
+scrape_configs:
+    - job_name: 'prometheus'
+      static_configs:
+      - targets: ['localhost:9091']
+
+    - job_name: 'openIM-server'
+      metrics_path: /metrics
+      static_configs:
+      - targets: ['localhost:10006']
+        labels:
+          group: 'cms-api'
+      - targets: ['localhost:21400']
+        labels:
+          group: 'msg-transfer'
+
+
+    - job_name: 'node'  
+      scrape_interval: 8s
+      static_configs:
+      - targets: ['localhost:9100']
+     

internal/api/auth/auth.go

@@ -3,6 +3,7 @@ package apiAuth
 import (
 	api "Open_IM/pkg/base_info"
 	"Open_IM/pkg/common/config"
+	"Open_IM/pkg/common/constant"
 	"Open_IM/pkg/common/log"
 	"Open_IM/pkg/common/token_verify"
 	"Open_IM/pkg/grpc-etcdv3/getcdv3"
@@ -66,7 +67,13 @@ func UserRegister(c *gin.Context) {
 	if reply.CommonResp.ErrCode != 0 {
 		errMsg := req.OperationID + " " + " UserRegister failed " + reply.CommonResp.ErrMsg + req.String()
 		log.NewError(req.OperationID, errMsg)
-		c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg})
+		if reply.CommonResp.ErrCode == constant.RegisterLimit {
+			c.JSON(http.StatusOK, gin.H{"errCode": constant.RegisterLimit, "errMsg": "用户注册被限制"})
+		} else if reply.CommonResp.ErrCode == constant.InvitationError {
+			c.JSON(http.StatusOK, gin.H{"errCode": constant.InvitationError, "errMsg": "邀请码错误"})
+		} else {
+			c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg})
+		}
 		return
 	}
 

internal/cms_api/router.go

@@ -9,6 +9,7 @@ import (
 	"Open_IM/internal/cms_api/statistics"
 	"Open_IM/internal/cms_api/user"
 	"Open_IM/internal/demo/register"
+	"Open_IM/pkg/common/config"
 
 	"github.com/gin-gonic/gin"
 )
@@ -16,6 +17,9 @@ import (
 func NewGinRouter() *gin.Engine {
 	gin.SetMode(gin.ReleaseMode)
 	baseRouter := gin.Default()
+	if config.Config.Prometheus.Enable {
+		baseRouter.GET("/metrics", prometheusHandler())
+	}
 	router := baseRouter.Group("/cms")
 	router.Use(middleware.CorsHandler())
 	adminRouterGroup := router.Group("/admin")
@@ -69,9 +73,5 @@ func NewGinRouter() *gin.Engine {
 		friendCMSRouterGroup.POST("/get_friends", friend.GetUserFriends)
 	}
 
-	prometheusRouterGroup := r2.Group("/prometheus")
-	{
-		prometheusRouterGroup.GET("/metrics", prometheusHandler())
-	}
 	return baseRouter
 }

internal/msg_transfer/logic/init.go

@@ -6,7 +6,11 @@ import (
 	"Open_IM/pkg/common/kafka"
 	"Open_IM/pkg/statistics"
 	"fmt"
+	"net/http"
+	"strconv"
 	"sync"
+
+	"github.com/prometheus/client_golang/prometheus/promhttp"
 )
 
 const OnlineTopicBusy = 1
@@ -46,7 +50,7 @@ func Init() {
 	producer = kafka.NewKafkaProducer(config.Config.Kafka.Ms2pschat.Addr, config.Config.Kafka.Ms2pschat.Topic)
 	producerToMongo = kafka.NewKafkaProducer(config.Config.Kafka.MsgToMongo.Addr, config.Config.Kafka.MsgToMongo.Topic)
 }
-func Run() {
+func Run(promethuesPort int) {
 	//register mysqlConsumerHandler to
 	if config.Config.ChatPersistenceMysql {
 		go persistentCH.persistentConsumerGroup.RegisterHandleAndConsumer(&persistentCH)
@@ -56,6 +60,10 @@ func Run() {
 	go historyCH.historyConsumerGroup.RegisterHandleAndConsumer(&historyCH)
 	go historyMongoCH.historyConsumerGroup.RegisterHandleAndConsumer(&historyMongoCH)
 	//go offlineHistoryCH.historyConsumerGroup.RegisterHandleAndConsumer(&offlineHistoryCH)
+	if config.Config.Prometheus.Enable {
+		http.Handle("/metrics", promhttp.Handler())
+		http.ListenAndServe(":"+strconv.Itoa(promethuesPort), nil)
+	}
 }
 func SetOnlineTopicStatus(status int) {
 	w.Lock()

internal/msg_transfer/logic/persistent_msg_handler.go

@@ -14,8 +14,16 @@ import (
 	"Open_IM/pkg/common/log"
 	pbMsg "Open_IM/pkg/proto/msg"
 	"Open_IM/pkg/utils"
+
 	"github.com/Shopify/sarama"
 	"github.com/golang/protobuf/proto"
+
+	"github.com/prometheus/client_golang/prometheus"
+	"github.com/prometheus/client_golang/prometheus/promauto"
+)
+
+var (
+	msgInsertMysqlProcessed prometheus.Counter
 )
 
 type PersistentConsumerHandler struct {
@@ -29,7 +37,13 @@ func (pc *PersistentConsumerHandler) Init() {
 	pc.persistentConsumerGroup = kfk.NewMConsumerGroup(&kfk.MConsumerGroupConfig{KafkaVersion: sarama.V2_0_0_0,
 		OffsetsInitial: sarama.OffsetNewest, IsReturnErr: false}, []string{config.Config.Kafka.Ws2mschat.Topic},
 		config.Config.Kafka.Ws2mschat.Addr, config.Config.Kafka.ConsumerGroupID.MsgToMySql)
-
+	if config.Config.Prometheus.Enable {
+		msgInsertMysqlProcessed = promauto.NewCounter(prometheus.CounterOpts{
+			Name: "insert_mysql_msg_total",
+			Help: "The total number of msg insert mysql events",
+		})
+		prometheus.MustRegister(msgInsertMysqlProcessed)
+	}
 }
 
 func (pc *PersistentConsumerHandler) handleChatWs2Mysql(cMsg *sarama.ConsumerMessage, msgKey string, _ sarama.ConsumerGroupSession) {
@@ -65,6 +79,10 @@ func (pc *PersistentConsumerHandler) handleChatWs2Mysql(cMsg *sarama.ConsumerMes
 				log.NewError(msgFromMQ.OperationID, "Message insert failed", "err", err.Error(), "msg", msgFromMQ.String())
 				return
 			}
+			if config.Config.Prometheus.Enable {
+				log.NewDebug(msgFromMQ.OperationID, utils.GetSelfFuncName(), "inc msgInsertMysqlProcessed")
+				msgInsertMysqlProcessed.Inc()
+			}
 		}
 
 	}

pkg/common/config/config.go

@@ -131,8 +131,6 @@ type config struct {
 		OpenImGroupPort          []int `yaml:"openImGroupPort"`
 		OpenImAuthPort           []int `yaml:"openImAuthPort"`
 		OpenImPushPort           []int `yaml:"openImPushPort"`
-		OpenImStatisticsPort     []int `yaml:"openImStatisticsPort"`
-		OpenImMessageCmsPort     []int `yaml:"openImMessageCmsPort"`
 		OpenImAdminCmsPort       []int `yaml:"openImAdminCmsPort"`
 		OpenImOfficePort         []int `yaml:"openImOfficePort"`
 		OpenImOrganizationPort   []int `yaml:"openImOrganizationPort"`
@@ -141,16 +139,14 @@ type config struct {
 		OpenImRealTimeCommPort   []int `yaml:"openImRealTimeCommPort"`
 	}
 	RpcRegisterName struct {
-		OpenImStatisticsName string `yaml:"openImStatisticsName"`
+		OpenImUserName   string `yaml:"openImUserName"`
-		OpenImUserName       string `yaml:"openImUserName"`
+		OpenImFriendName string `yaml:"openImFriendName"`
-		OpenImFriendName     string `yaml:"openImFriendName"`
 		//	OpenImOfflineMessageName     string `yaml:"openImOfflineMessageName"`
 		OpenImMsgName          string `yaml:"openImMsgName"`
 		OpenImPushName         string `yaml:"openImPushName"`
 		OpenImRelayName        string `yaml:"openImRelayName"`
 		OpenImGroupName        string `yaml:"openImGroupName"`
 		OpenImAuthName         string `yaml:"openImAuthName"`
-		OpenImMessageCMSName   string `yaml:"openImMessageCMSName"`
 		OpenImAdminCMSName     string `yaml:"openImAdminCMSName"`
 		OpenImOfficeName       string `yaml:"openImOfficeName"`
 		OpenImOrganizationName string `yaml:"openImOrganizationName"`
@@ -513,6 +509,24 @@ type config struct {
 	Rtc struct {
 		SignalTimeout string `yaml:"signalTimeout"`
 	} `yaml:"rtc"`
+
+	Prometheus struct {
+		Enable                        bool  `yaml:"enable"`
+		UserPrometheusPort            []int `yaml:"userPrometheusPort"`
+		FriendPrometheusPort          []int `yaml:"friendPrometheusPort"`
+		MessagePrometheusPort         []int `yaml:"messagePrometheusPort"`
+		MessageGatewayPrometheusPort  []int `yaml:"messageGatewayPrometheusPort"`
+		GroupPrometheusPort           []int `yaml:"groupPrometheusPort"`
+		AuthPrometheusPort            []int `yaml:"authPrometheusPort"`
+		PushPrometheusPort            []int `yaml:"pushPrometheusPort"`
+		AdminCmsPrometheusPort        []int `yaml:"adminCmsPrometheusPort"`
+		OfficePrometheusPort          []int `yaml:"officePrometheusPort"`
+		OrganizationPrometheusPort    []int `yaml:"organizationPrometheusPort"`
+		ConversationPrometheusPort    []int `yaml:"conversationPrometheusPort"`
+		CachePrometheusPort           []int `yaml:"cachePrometheusPort"`
+		RealTimeCommPrometheusPort    []int `yaml:"realTimeCommPrometheusPort"`
+		MessageTransferPrometheusPort []int `yaml:"messageTransferPrometheusPort"`
+	} `yaml:"prometheus"`
 }
 type PConversation struct {
 	ReliabilityLevel int  `yaml:"reliabilityLevel"`

pkg/common/db/mysql.go

@@ -56,7 +56,7 @@ func initMysqlDB() {
 		Writer{},
 		logger.Config{
 			SlowThreshold:             200 * time.Millisecond, // Slow SQL threshold
-			LogLevel:                  logger.Info,            // Log level
+			LogLevel:                  logger.Warn,            // Log level
 			IgnoreRecordNotFoundError: true,                   // Ignore ErrRecordNotFound error for logger
 			Colorful:                  true,                   // Disable color
 		},

pkg/grpc-etcdv3/getcdv3/resolver.go

@@ -139,14 +139,6 @@ func GetConfigConn(serviceName string, operationID string) *grpc.ClientConn {
 	if config.Config.RpcRegisterName.OpenImAuthName == serviceName {
 		configPortList = config.Config.RpcPort.OpenImAuthPort
 	}
-	//8
-	if config.Config.RpcRegisterName.OpenImMessageCMSName == serviceName {
-		configPortList = config.Config.RpcPort.OpenImMessageCmsPort
-	}
-	//9
-	if config.Config.RpcRegisterName.OpenImAdminCMSName == serviceName {
-		configPortList = config.Config.RpcPort.OpenImAdminCmsPort
-	}
 	//10
 	if config.Config.RpcRegisterName.OpenImOfficeName == serviceName {
 		configPortList = config.Config.RpcPort.OpenImOfficePort