frontend: trivial patch

chriskaliX · Oct 27, 2024 · afdc6fc · afdc6fc
1 parent 3b1bd9e
commit afdc6fc
Show file tree

Hide file tree

Showing 10 changed files with 32 additions and 11 deletions.
diff --git a/server/webconsole/api/common/common.go b/server/webconsole/api/common/common.go
@@ -0,0 +1,5 @@
+package common
+
+var AssetAllowList = []string{
+	"plugins", "users", "sockets", "processes", "crons", "apps", "kmods", "iptables", "net_interfaces", "containers",
+}
diff --git a/server/webconsole/api/grpc/conn.go b/server/webconsole/api/grpc/conn.go
@@ -4,6 +4,7 @@ import (
 	"context"
 	"fmt"
 	"hboat/api/common"
+	"hboat/grpc/handler"
 	"hboat/pkg/basic/mongo"
 	"hboat/pkg/conf"
 	"time"
@@ -50,6 +51,7 @@ type ConnStatRsp struct {
 	AgentInfo   map[string]interface{}   `json:"agent_info"`
 	PluginsInfo []map[string]interface{} `json:"plugins_info"`
 	Tags        []string                 `json:"tags"`
+	AppOverview map[string]int64       `json:"app_overview"`
 }
 
 func AgentStat(c *gin.Context) {
@@ -79,10 +81,14 @@ func AgentStat(c *gin.Context) {
 		pluginList = append(pluginList, as.PluginDetail[k])
 	}
 
+	// app overview
+	overview, _ := handleAppOverview(agentid)
+
 	res := ConnStatRsp{
 		AgentInfo:   agentInfo,
 		PluginsInfo: pluginList,
 		Tags:        as.Tags,
+		AppOverview: overview,
 	}
 
 	common.Response(c, common.SuccessCode, res)
@@ -163,3 +169,17 @@ func AgentClear(c *gin.Context) {
 	fmt.Printf("Deleted %d documents\n", deleteResult.DeletedCount)
 	common.Response(c, common.SuccessCode, deleteResult.DeletedCount)
 }
+
+
+func handleAppOverview(agent_id string) (map[string]int64, error) {
+	var pageReq common.PageReq
+	res := map[string]int64{}
+	for _, t := range common.AssetAllowList {
+		respCommon, err := common.DBPageSearch(context.TODO(), mongo.MongoProxyImpl.AssetC, &pageReq, bson.M{"agent_id": agent_id, "data_type": handler.EventNameCache[t].ID()})
+		if err != nil {
+			continue
+		}
+		res[t] = respCommon.Total
+	}
+	return res, nil
+}
diff --git a/server/webconsole/api/host/asset.go b/server/webconsole/api/host/asset.go
@@ -15,10 +15,6 @@ import (
 	"go.mongodb.org/mongo-driver/bson"
 )
 
-var typeAllowlist = []string{
-	"plugins", "users", "sockets", "processes", "crons", "apps", "kmods", "iptables", "net_interfaces", "containers",
-}
-
 // agentAssetResp represents the response structure for agent assets
 type agentAssetResp struct {
 	Total  int32                    `json:"total"`
@@ -80,7 +76,7 @@ func bindRequests(c *gin.Context, pageReq *common.PageReq, assetReq *agentAssetR
 
 // validateAssetType checks if the provided asset type is allowed
 func validateAssetType(assetType string) error {
-	if !slices.Contains(typeAllowlist, assetType) {
+	if !slices.Contains(common.AssetAllowList, assetType) {
 		return fmt.Errorf("type %s is not supported", assetType)
 	}
 	if _, ok := handler.EventNameCache[assetType]; !ok {

diff --git a/server/webconsole/api/static/frontend/index.html b/server/webconsole/api/static/frontend/index.html
@@ -7,10 +7,10 @@
 <title>Hades</title>
 <link rel="stylesheet" href="/umi.46830b22.css">
 <script async src="/scripts/loading.js"></script>
-<script src="/preload_helper.2295b86c.js"></script>
+<script src="/preload_helper.cb40182c.js"></script>
 </head>
 <body>
 <div id="root"></div>
-<script src="/umi.f0312187.js"></script>
+<script src="/umi.3ed3b2d3.js"></script>
 </body>
 </html>
diff --git a/server/webconsole/api/static/frontend/p__AssetCenter__HostDetail.1103c732.async.js b/server/webconsole/api/static/frontend/p__AssetCenter__HostDetail.1103c732.async.js
diff --git a/server/webconsole/api/static/frontend/p__AssetCenter__HostDetail.b407656e.async.js b/server/webconsole/api/static/frontend/p__AssetCenter__HostDetail.b407656e.async.js
diff --git a/server/webconsole/api/static/frontend/p__PluginCenter.94ecab6f.async.js b/server/webconsole/api/static/frontend/p__PluginCenter.94ecab6f.async.js
diff --git a/server/webconsole/api/static/frontend/p__PluginCenter.9d273f2e.async.js b/server/webconsole/api/static/frontend/p__PluginCenter.9d273f2e.async.js