server: feature, add clear hosts

chriskaliX · Mar 3, 2024 · f3bb46c · f3bb46c
1 parent c5b3d58
commit f3bb46c
Show file tree

Hide file tree

Showing 9 changed files with 40 additions and 217 deletions.
diff --git a/server/webconsole/api/grpc/conn.go b/server/webconsole/api/grpc/conn.go
@@ -122,9 +122,11 @@ func AgentBasic(c *gin.Context) {
 			continue
 		}
 		detail := as.AgentDetail
-		var cpu, rss float64
-		cpu = detail["cpu"].(float64)
-		rss = detail["rss"].(float64)
+		cpu, ok1 := detail["cpu"].(float64)
+		rss, ok2 := detail["rss"].(float64)
+		if !ok1 || !ok2 {
+			continue
+		}
 
 		tmp := AgentBasicResp{
 			AgentID:  as.AgentID,
@@ -144,5 +146,20 @@ func AgentBasic(c *gin.Context) {
 
 // clear the agent plugins
 func AgentClear(c *gin.Context) {
-
-}
+	filter := bson.M{}
+	// delete specific agent id
+	if agentId, ok := c.GetQuery("agent_id"); ok {
+		filter["agent_id"] = agentId
+	} else {
+		// clear the agent by it's heartbeat
+		filter["last_heartbeat_time"] = bson.M{
+			"$lt": time.Now().AddDate(0, 0, -7).Unix(),
+		}
+	}
+	deleteResult, err := mongo.MongoProxyImpl.StatusC.DeleteMany(context.TODO(), filter)
+	if err != nil {
+		common.Response(c, common.ErrorCode, err)
+	}
+	fmt.Printf("Deleted %d documents\n", deleteResult.DeletedCount)
+	common.Response(c, common.SuccessCode, deleteResult.DeletedCount)
+}
diff --git a/server/webconsole/api/host/application/container.go b/server/webconsole/api/host/application/container.go
@@ -56,16 +56,16 @@ func ContainerTop(c *gin.Context) {
 	if req.State == "" {
 		match = bson.M{"$match": bson.M{
 			"$and": []bson.M{
-				bson.M{"data_type": 3018},
-				bson.M{"update_time": bson.M{"$gt": time.Now().Unix() - 24*60*60}},
+				{"data_type": 3018},
+				{"update_time": bson.M{"$gt": time.Now().Unix() - 24*60*60}},
 			},
 		}}
 	} else {
 		match = bson.M{"$match": bson.M{
 			"$and": []bson.M{
-				bson.M{"data_type": 3018},
-				bson.M{"state": req.State},
-				bson.M{"update_time": bson.M{"$gt": time.Now().Unix() - 24*60*60}},
+				{"data_type": 3018},
+				{"state": req.State},
+				{"update_time": bson.M{"$gt": time.Now().Unix() - 24*60*60}},
 			},
 		}}
 	}
@@ -90,6 +90,10 @@ func ContainerTop(c *gin.Context) {
 		cur.Decode(&temp)
 		resp.Top = append(resp.Top, temp)
 	}
+	// fullfill the top
+	if len(resp.Top) < 3 {
+		resp.Top = append(resp.Top, make([]top, 3-len(resp.Top))...)
+	}
 
 	common.Response(c, common.SuccessCode, resp)
 }
diff --git a/server/webconsole/api/router.go b/server/webconsole/api/router.go
@@ -110,6 +110,7 @@ func RunGrpcServer(port int) {
 		rGroup.GET("/conn/count", gApi.AgentCount)
 		rGroup.GET("/conn/stat", gApi.AgentStat)
 		rGroup.GET("/conn/basic", gApi.AgentBasic)
+		rGroup.GET("/conn/delete", gApi.AgentClear)
 	}
 	{
 		gGroup := apiv1Router.Group("/plugin")

diff --git a/server/webconsole/api/static/frontend/index.html b/server/webconsole/api/static/frontend/index.html
@@ -6,6 +6,6 @@
 </head>
 <body>
 <div id="root"></div>
-<script src="/umi.c652ca09.js"></script>
+<script src="/umi.c02565f4.js"></script>
 
 </body></html>
diff --git a/server/webconsole/api/static/frontend/p__AssetCenter__Application.6f636396.async.js b/server/webconsole/api/static/frontend/p__AssetCenter__Application.6f636396.async.js
diff --git a/server/webconsole/api/static/frontend/p__AssetCenter__HostCenter.70bed00d.async.js b/server/webconsole/api/static/frontend/p__AssetCenter__HostCenter.70bed00d.async.js
diff --git a/server/webconsole/api/static/frontend/p__AssetCenter__HostDetail.56f1a5cb.chunk.css b/server/webconsole/api/static/frontend/p__AssetCenter__HostDetail.56f1a5cb.chunk.css
diff --git a/server/webconsole/api/static/frontend/umi.c652ca09.js b/server/webconsole/api/static/frontend/umi.c652ca09.js
diff --git a/server/webconsole/grpc/transfer/handler/handler.go b/server/webconsole/grpc/transfer/handler/handler.go
@@ -22,12 +22,11 @@ import (
 type TransferHandler struct{}
 
 func (h *TransferHandler) Transfer(stream pb.Transfer_TransferServer) (err error) {
-	var agentID string
-	var addr string
+	var agentID, addr string
+	var data *pb.RawData
 
-	// Receive the very first package once grpc established
-	data, err := stream.Recv()
-	if err != nil {
+	// receive the very first package once grpc established
+	if data, err = stream.Recv(); err != nil {
 		return err
 	}
 
@@ -40,7 +39,7 @@ func (h *TransferHandler) Transfer(stream pb.Transfer_TransferServer) (err error
 	addr = p.Addr.String()
 	fmt.Printf("Get connection %s from %s\n", agentID, addr)
 
-	// Initialize the connection
+	// initialize the connection
 	ctx, cancelFunc := context.WithCancel(context.Background())
 	conn := pool.Connection{
 		AgentID:     agentID,
@@ -50,6 +49,8 @@ func (h *TransferHandler) Transfer(stream pb.Transfer_TransferServer) (err error
 		Ctx:         ctx,
 		CancelFunc:  cancelFunc,
 	}
+
+	// add into the grpc pool
 	if err = pool.GlobalGRPCPool.Add(agentID, &conn); err != nil {
 		return err
 	}