From 1e8e4005736671392f00a745f608b966d93a22cf Mon Sep 17 00:00:00 2001
From: Wangjunqi123 <wangjunqi@kylinos.cn>
Date: Tue, 11 Jun 2024 09:16:05 +0800
Subject: [PATCH] elk/handler: add https server

---
 elk/conf/meta.go                             |  5 ++++-
 elk/{elk.yaml.templete => elk.yaml.template} |  7 +++++--
 elk/handler/router.go                        | 18 +++++++++++++-----
 3 files changed, 22 insertions(+), 8 deletions(-)
 rename elk/{elk.yaml.templete => elk.yaml.template} (71%)

diff --git a/elk/conf/meta.go b/elk/conf/meta.go
index 1ed19bfd..5c7d3389 100644
--- a/elk/conf/meta.go
+++ b/elk/conf/meta.go
@@ -1,7 +1,10 @@
 package conf
 
 type ElkConf struct {
-	Addr string `yaml:"http_addr"`
+	Https_enabled      bool   `yaml:"https_enabled"`
+	Public_certificate string `yaml:"public_certificate"`
+	Private_key        string `yaml:"private_key"`
+	Addr               string `yaml:"addr"`
 }
 
 type PilotGoConf struct {
diff --git a/elk/elk.yaml.templete b/elk/elk.yaml.template
similarity index 71%
rename from elk/elk.yaml.templete
rename to elk/elk.yaml.template
index 3eca47ed..ce3917c6 100644
--- a/elk/elk.yaml.templete
+++ b/elk/elk.yaml.template
@@ -1,11 +1,14 @@
 elk:
-  http_addr: "localhost:9993"
+  https_enabled: false
+  public_certificate: ""
+  private_key: ""
+  addr: "localhost:9993"
 PilotGo:
   http_addr: "localhost:8888"
 log:
   level: debug
   driver: file # 可选stdout和file。stdout：输出到终端控制台；file：输出到path下的指定文件。
-  path: /opt/PilotGo/plugin/topology/server/log/toposerver.log
+  path: /opt/PilotGo/plugin/elk/log/elk.log
   max_file: 1
   max_size: 10485760
 elasticsearch:
diff --git a/elk/handler/router.go b/elk/handler/router.go
index c7af1ce8..9fcc79dc 100644
--- a/elk/handler/router.go
+++ b/elk/handler/router.go
@@ -28,10 +28,18 @@ func InitWebServer() {
 		InitRouter(engine)
 		StaticRouter(engine)
 
-		err := engine.Run(conf.Global_Config.Elk.Addr)
-		if err != nil {
-			err = errors.Errorf("%s **errstackfatal**2", err.Error()) // err top
-			errormanager.ErrorTransmit(pluginclient.Global_Context, err, true)
+		if conf.Global_Config.Elk.Https_enabled {
+			err := engine.RunTLS(conf.Global_Config.Elk.Addr, conf.Global_Config.Elk.Public_certificate, conf.Global_Config.Elk.Private_key)
+			if err != nil {
+				err = errors.Errorf("%s **errstackfatal**2", err.Error()) // err top
+				errormanager.ErrorTransmit(pluginclient.Global_Context, err, true)
+			}
+		} else {
+			err := engine.Run(conf.Global_Config.Elk.Addr)
+			if err != nil {
+				err = errors.Errorf("%s **errstackfatal**2", err.Error()) // err top
+				errormanager.ErrorTransmit(pluginclient.Global_Context, err, true)
+			}
 		}
 	}()
 }
@@ -42,7 +50,7 @@ func InitRouter(router *gin.Engine) {
 		api.POST("/create_policy", CreatePolicyHandle)
 	}
 
-	timeoutapi := router.Group("/plugin/topology/api")
+	timeoutapi := router.Group("/plugin/elk/api")
 	timeoutapi.Use(TimeoutMiddleware2(15 * time.Second))
 	{
 
-- 
Gitee