From facb29dd5a58d0f1e6b3893226c5ecf1f4058d8c Mon Sep 17 00:00:00 2001
From: zhanghan <zhanghan@kylinos.cn>
Date: Wed, 4 Dec 2024 19:52:44 +0800
Subject: [PATCH] format log output and publish event for add host

---
 cmd/server/app/agentmanager/agentmanager.go | 24 +++++++++++++++++++++
 cmd/server/app/network/httpserver.go        |  1 -
 sdk/logger/logger.go                        |  4 ++--
 3 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/cmd/server/app/agentmanager/agentmanager.go b/cmd/server/app/agentmanager/agentmanager.go
index 2f190f81..a0d21e37 100644
--- a/cmd/server/app/agentmanager/agentmanager.go
+++ b/cmd/server/app/agentmanager/agentmanager.go
@@ -10,9 +10,13 @@ package agentmanager
 import (
 	"net"
 	"sync"
+	"time"
 
+	eventSDK "gitee.com/openeuler/PilotGo-plugins/event/sdk"
 	machineservice "gitee.com/openeuler/PilotGo/cmd/server/app/service/machine"
+	"gitee.com/openeuler/PilotGo/cmd/server/app/service/plugin"
 	"gitee.com/openeuler/PilotGo/pkg/global"
+	commonSDK "gitee.com/openeuler/PilotGo/sdk/common"
 	"gitee.com/openeuler/PilotGo/sdk/logger"
 )
 
@@ -149,4 +153,24 @@ func AddAgents2DB(a *Agent) {
 		logger.Error(err.Error())
 		return
 	}
+	// 发布“平台新增主机”事件
+	msgData := commonSDK.MessageData{
+		MsgType:     eventSDK.MsgHostAdd,
+		MessageType: eventSDK.GetMessageTypeString(eventSDK.MsgHostAdd),
+		TimeStamp:   time.Now(),
+		Data: eventSDK.MDHostChange{
+			IP:         agent_os.IP,
+			OS:         agent_os.Platform,
+			OSVersion:  agent_os.PlatformVersion,
+			PrettyName: agent_os.PrettyName,
+			CPU:        agent_os.ModelName,
+			Status:     machineservice.OnlineStatus,
+		},
+	}
+	msgDataString, _ := msgData.ToMessageDataString()
+	ms := commonSDK.EventMessage{
+		MessageType: eventSDK.MsgHostAdd,
+		MessageData: msgDataString,
+	}
+	plugin.PublishEvent(ms)
 }
diff --git a/cmd/server/app/network/httpserver.go b/cmd/server/app/network/httpserver.go
index 9b6d9ad8..3992c3b5 100644
--- a/cmd/server/app/network/httpserver.go
+++ b/cmd/server/app/network/httpserver.go
@@ -107,7 +107,6 @@ func setupRouter() *gin.Engine {
 	router.GET("/swagger/*any", ginSwagger.WrapHandler(swaggerFiles.Handler))
 	router.Use(logger.RequestLogger([]string{
 		"/api/v1/pluginapi/heartbeat",
-		"/plugin/prometheus/target",
 	}))
 	router.Use(middleware.Recover)
 
diff --git a/sdk/logger/logger.go b/sdk/logger/logger.go
index 021ad4c1..aad3575b 100644
--- a/sdk/logger/logger.go
+++ b/sdk/logger/logger.go
@@ -144,7 +144,7 @@ func RequestLogger(_skipPaths []string) gin.HandlerFunc {
 				latency = latency.Truncate(time.Second)
 			}
 
-			Debug("%s|%3d|%-13v|%-15s|%-7s %#v\n%s",
+			Debug("%s  status_code:%3d  latency_time:%-13v client_ip:%-15s  method:%-7s req_uri:%#v\n%s",
 				start.Format("2006-01-02 15:04:05"),
 				statusCode,
 				latency,
@@ -154,4 +154,4 @@ func RequestLogger(_skipPaths []string) gin.HandlerFunc {
 				errorMessage)
 		}
 	}
-}
\ No newline at end of file
+}
-- 
Gitee