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 e3e00d3c2..c67b5bc11 100644 --- a/config/config.yaml +++ b/config/config.yaml @@ -369,6 +369,7 @@ callback: timeout: 5 failedContinue: true + ##TODO CALLBACK/ beforeInviteUserToGroup: enable: true timeout: 5 diff --git a/deployments/templates/alertmanager.yml b/deployments/templates/alertmanager.yml index 95e96571d..7c215269b 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 diff --git a/deployments/templates/openim.yaml b/deployments/templates/openim.yaml index 774701710..b7d12c168 100644 --- a/deployments/templates/openim.yaml +++ b/deployments/templates/openim.yaml @@ -423,4 +423,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