From a7138cb3b7d93f4c9462e8233a8fd9f52a5245bb Mon Sep 17 00:00:00 2001
From: xuexihuang <1339326187@qq.com>
Date: Sat, 30 Dec 2023 10:40:42 +0800
Subject: [PATCH] feature:grafana web inside (#1636)

* feature:grafana web inside

* fix: using protocal v0.0.42

* fix: review values(but not use)
---
 config/templates/config.yaml.template | 2 +-
 deployments/templates/openim.yaml     | 2 +-
 docker-compose.yml                    | 6 ++++++
 internal/api/third.go                 | 2 +-
 pkg/common/config/config.go           | 2 +-
 scripts/install/environment.sh        | 3 +--
 6 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/config/templates/config.yaml.template b/config/templates/config.yaml.template
index 89f11f359..9954a8863 100644
--- a/config/templates/config.yaml.template
+++ b/config/templates/config.yaml.template
@@ -506,7 +506,7 @@ callback:
 # The number of ports needs to be consistent with msg_transfer_service_num in script/path_info.sh
 prometheus:
   enable: false
-  prometheusUrl: 172.28.0.1:13000
+  grafanaUrl: 172.28.0.1:13000
   apiPrometheusPort: [20100]
   userPrometheusPort: [ 20110 ]
   friendPrometheusPort: [ 20120 ]
diff --git a/deployments/templates/openim.yaml b/deployments/templates/openim.yaml
index cbb4a8c6e..96d867e10 100644
--- a/deployments/templates/openim.yaml
+++ b/deployments/templates/openim.yaml
@@ -506,7 +506,7 @@ callback:
 # The number of ports needs to be consistent with msg_transfer_service_num in script/path_info.sh
 prometheus:
   enable: ${PROMETHEUS_ENABLE}
-  prometheusUrl: ${PROMETHEUS_URL}
+  grafanaUrl: ${GRAFANA_URL}
   apiPrometheusPort: [${API_PROM_PORT}]
   userPrometheusPort: [ ${USER_PROM_PORT} ]
   friendPrometheusPort: [ ${FRIEND_PROM_PORT} ]
diff --git a/docker-compose.yml b/docker-compose.yml
index bdfee3748..5b1e11d4e 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -167,6 +167,12 @@ services:
   #   hostname: grafana
   #   user: root
   #   restart: always
+  #   environment:
+  #     - GF_SECURITY_ALLOW_EMBEDDING=true
+  #     - GF_SESSION_COOKIE_SAMESITE=none
+  #     - GF_SESSION_COOKIE_SECURE=true
+  #     - GF_AUTH_ANONYMOUS_ENABLED=true
+  #     - GF_AUTH_ANONYMOUS_ORG_ROLE=Admin
   #   ports:
   #     - "${GRAFANA_PORT:-13000}:3000"
   #   volumes:
diff --git a/internal/api/third.go b/internal/api/third.go
index 37ec55098..0a1ef0fbe 100644
--- a/internal/api/third.go
+++ b/internal/api/third.go
@@ -130,5 +130,5 @@ func (o *ThirdApi) SearchLogs(c *gin.Context) {
 }
 
 func GetPrometheus(c *gin.Context) {
-	c.Redirect(http.StatusFound, config2.Config.Prometheus.PrometheusUrl)
+	c.Redirect(http.StatusFound, config2.Config.Prometheus.GrafanaUrl)
 }
diff --git a/pkg/common/config/config.go b/pkg/common/config/config.go
index ea26ca677..88e87e709 100644
--- a/pkg/common/config/config.go
+++ b/pkg/common/config/config.go
@@ -314,7 +314,7 @@ type configStruct struct {
 
 	Prometheus struct {
 		Enable                        bool   `yaml:"enable"`
-		PrometheusUrl                 string `yaml:"prometheusUrl"`
+		GrafanaUrl                    string `yaml:"grafanaUrl"`
 		ApiPrometheusPort             []int  `yaml:"apiPrometheusPort"`
 		UserPrometheusPort            []int  `yaml:"userPrometheusPort"`
 		FriendPrometheusPort          []int  `yaml:"friendPrometheusPort"`
diff --git a/scripts/install/environment.sh b/scripts/install/environment.sh
index 0e3a428e8..22a0996fc 100755
--- a/scripts/install/environment.sh
+++ b/scripts/install/environment.sh
@@ -285,7 +285,6 @@ readonly ALERTMANAGER_SEND_RESOLVED=${ALERTMANAGER_SEND_RESOLVED:-"{SEND_RESOLVE
 ###################### Grafana 配置信息 ######################
 def "GRAFANA_PORT" "13000"                        # Grafana的端口
 def "GRAFANA_ADDRESS" "${DOCKER_BRIDGE_GATEWAY}" # Grafana的地址
-
 ###################### RPC Port Configuration Variables ######################
 # For launching multiple programs, just fill in multiple ports separated by commas
 # For example:
@@ -379,7 +378,7 @@ def "CALLBACK_FAILED_CONTINUE" "true" # 失败后是否继续
 ###################### Prometheus 配置信息 ######################
 # 是否启用 Prometheus
 readonly PROMETHEUS_ENABLE=${PROMETHEUS_ENABLE:-'true'}
-def "PROMETHEUS_URL" "${GRAFANA_ADDRESS}:${GRAFANA_PORT}"
+readonly GRAFANA_URL=${GRAFANA_URL:-"http://${OPENIM_IP}:${GRAFANA_PORT}/"}
 # Api 服务的 Prometheus 端口
 readonly API_PROM_PORT=${API_PROM_PORT:-'20100'}
 # User 服务的 Prometheus 端口