From 0d212f34fc0cb89d4c0cc394ad1845127f32f732 Mon Sep 17 00:00:00 2001 From: Gordon <1432970085@qq.com> Date: Tue, 21 Nov 2023 11:48:49 +0800 Subject: [PATCH 1/2] fix deployments/templates/alertmanager.yml --- .env | 23 +++++++++++++++-------- config/alertmanager.yml | 2 +- config/config.yaml | 23 ++++++++++------------- deployments/templates/alertmanager.yml | 4 ++-- 4 files changed, 28 insertions(+), 24 deletions(-) diff --git a/.env b/.env index ae76a0440..6e7c337be 100644 --- a/.env +++ b/.env @@ -30,11 +30,11 @@ MINIO_ENDPOINT=http://172.28.0.1:10005 # Base URL for the application programming interface (API). # Default: API_URL=http://172.28.0.1:10002 -API_URL=http://172.28.0.1:10002 +API_URL=http://125.124.195.201:10002 # Directory path for storing data files or related information. # Default: DATA_DIR=./ -DATA_DIR=./ +DATA_DIR=/root/open-im-server # Choose the appropriate image address, the default is GITHUB image, # you can choose docker hub, for Chinese users can choose Ali Cloud @@ -94,7 +94,7 @@ OPENIM_CHAT_NETWORK_ADDRESS=172.28.0.10 # Address or hostname for the Prometheus network. # Default: PROMETHEUS_NETWORK_ADDRESS=172.28.0.11 PROMETHEUS_NETWORK_ADDRESS=172.28.0.11 - + # Address or hostname for the Grafana network. # Default: GRAFANA_NETWORK_ADDRESS=172.28.0.12 GRAFANA_NETWORK_ADDRESS=172.28.0.12 @@ -106,7 +106,10 @@ NODE_EXPORTER_NETWORK_ADDRESS=172.28.0.13 # Address or hostname for the OpenIM admin network. # Default: OPENIM_ADMIN_NETWORK_ADDRESS=172.28.0.14 OPENIM_ADMIN_FRONT_NETWORK_ADDRESS=172.28.0.14 - + +# Address or hostname for the alertmanager network. +# Default: ALERT_MANAGER_NETWORK_ADDRESS=172.28.0.15 +ALERT_MANAGER_NETWORK_ADDRESS=172.28.0.15 # =============================================== # = Component Extension Configuration = # =============================================== @@ -222,8 +225,8 @@ PROMETHEUS_PORT=19090 GRAFANA_ADDRESS=172.28.0.12 # Port on which Grafana service is running. -# Default: GRAFANA_PORT=3000 -GRAFANA_PORT=3000 +# Default: GRAFANA_PORT=13000 +GRAFANA_PORT=13000 # ====================================== # ============ OpenIM Web =============== @@ -300,9 +303,13 @@ NODE_EXPORTER_PORT=19100 PROMETHEUS_PORT=19090 # Port for the grafana. -# Default: GRAFANA_PORT=3000 -GRAFANA_PORT=3000 +# Default: GRAFANA_PORT=13000 +GRAFANA_PORT=13000 # Port for the admin front. # Default: OPENIM_ADMIN_FRONT_PORT=11002 OPENIM_ADMIN_FRONT_PORT=11002 + +# Port for the alertmanager. +# Default: ALERT_MANAGER_PORT=19093 +ALERT_MANAGER_PORT=19093 diff --git a/config/alertmanager.yml b/config/alertmanager.yml index 71cdd2b8f..ee14b6464 100644 --- a/config/alertmanager.yml +++ b/config/alertmanager.yml @@ -26,7 +26,7 @@ route: receivers: - name: email email_configs: - - to: {EMAIL_TO:-'alert@example.com'} + - to: '{EMAIL_TO:-'alert@example.com'}' html: '{{ template "email.to.html" . }}' headers: { Subject: "[OPENIM-SERVER]Alarm" } send_resolved: true diff --git a/config/config.yaml b/config/config.yaml index c67b5bc11..7a2349b02 100644 --- a/config/config.yaml +++ b/config/config.yaml @@ -135,14 +135,14 @@ api: # minio.signEndpoint is minio public network address object: enable: "minio" - apiURL: "http://127.0.0.1:10002" + apiURL: "http://125.124.195.201:10002" minio: bucket: "openim" endpoint: "http://172.28.0.1:10005" accessKeyID: "root" secretAccessKey: "openIM123" sessionToken: '' - signEndpoint: "http://127.0.0.1:10005" + signEndpoint: "http://125.124.195.201:10005" publicRead: false cos: bucketURL: https://temp-1252357374.cos.ap-chengdu.myqcloud.com @@ -198,7 +198,7 @@ rpcRegisterName: # Whether to output in json format # Whether to include stack trace in logs log: - storageLocation: ../logs/ + storageLocation: /root/open-im-server/logs/ rotationTime: 24 remainRotationCount: 2 remainLogLevel: 6 @@ -312,7 +312,7 @@ iosPush: # Timeout in seconds # Whether to continue execution if callback fails callback: - url: + url: "http://125.124.195.201:8080/sdkName/callbackBeforeInviteJoinGroupCommand" beforeSendSingleMsg: enable: false timeout: 5 @@ -368,13 +368,6 @@ callback: enable: false timeout: 5 failedContinue: true - - ##TODO CALLBACK/ - beforeInviteUserToGroup: - enable: true - timeout: 5 - failedContinue: true - beforeSetGroupMemberInfo: enable: false timeout: 5 @@ -383,14 +376,18 @@ callback: enable: false timeout: 5 failedContinue: true - + ##TODO CALLBACK/ + beforeInviteUserToGroup: + enable: true + timeout: 5 + failedContinue: true ###################### Prometheus ###################### # Prometheus configuration for various services # The number of Prometheus ports per service needs to correspond to rpcPort # The number of ports needs to be consistent with msg_transfer_service_num in script/path_info.sh prometheus: enable: false - prometheusUrl: "https://openim.prometheus" + prometheusUrl: 172.28.0.1:13000 apiPrometheusPort: [20100] userPrometheusPort: [ 20110 ] friendPrometheusPort: [ 20120 ] diff --git a/deployments/templates/alertmanager.yml b/deployments/templates/alertmanager.yml index 95e96571d..a6cd02fc7 100644 --- a/deployments/templates/alertmanager.yml +++ b/deployments/templates/alertmanager.yml @@ -26,7 +26,7 @@ route: receivers: - name: email email_configs: - - to: ${ALERTMANAGER_EMAIL_TO} + - to: '${ALERTMANAGER_EMAIL_TO}' html: '{{ template "email.to.html" . }}' headers: { Subject: "[OPENIM-SERVER]Alarm" } - send_resolved: true \ No newline at end of file + send_resolved: true From d1b142a807ba18a315f2036eba3894a371fbe000 Mon Sep 17 00:00:00 2001 From: Gordon <1432970085@qq.com> Date: Tue, 21 Nov 2023 16:20:36 +0800 Subject: [PATCH 2/2] fix bug --- config/config.yaml | 2 +- deployments/templates/openim.yaml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/config/config.yaml b/config/config.yaml index 7a2349b02..affcff9e8 100644 --- a/config/config.yaml +++ b/config/config.yaml @@ -312,7 +312,7 @@ iosPush: # Timeout in seconds # Whether to continue execution if callback fails callback: - url: "http://125.124.195.201:8080/sdkName/callbackBeforeInviteJoinGroupCommand" + url: "http://125.124.195.201:18889/sdkName/callbackBeforeInviteJoinGroupCommand" beforeSendSingleMsg: enable: false timeout: 5 diff --git a/deployments/templates/openim.yaml b/deployments/templates/openim.yaml index d050315c7..6032a58a9 100644 --- a/deployments/templates/openim.yaml +++ b/deployments/templates/openim.yaml @@ -312,7 +312,7 @@ iosPush: # Timeout in seconds # Whether to continue execution if callback fails callback: - url: "http://125.124.195.201:8080/sdkName/callbackBeforeInviteJoinGroupCommand" + url: "http://125.124.195.201:18889/sdkName/callbackBeforeInviteJoinGroupCommand" beforeSendSingleMsg: enable: false timeout: 5 @@ -399,4 +399,4 @@ prometheus: conversationPrometheusPort: [ ${CONVERSATION_PROM_PORT} ] rtcPrometheusPort: [ ${RTC_PROM_PORT} ] thirdPrometheusPort: [ ${THIRD_PROM_PORT} ] - messageTransferPrometheusPort: [ ${MSG_TRANSFER_PROM_PORT} ] # List of ports \ No newline at end of file + messageTransferPrometheusPort: [ ${MSG_TRANSFER_PROM_PORT} ] # List of ports