From 215ed123fa00b1ed92d2dbc4fd78b797cea8011f Mon Sep 17 00:00:00 2001 From: GoEdgeLab Date: Mon, 3 Jan 2022 11:08:59 +0800 Subject: [PATCH] =?UTF-8?q?=E8=8A=82=E7=82=B9=E8=BF=90=E8=A1=8C=E6=97=A5?= =?UTF-8?q?=E5=BF=97=E5=A2=9E=E5=8A=A0=E6=A0=87=E7=AD=BE=E7=AD=9B=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- internal/utils/nodelogutils/utils.go | 27 +++++++++++++++++++ .../default/clusters/cluster/node/logs.go | 7 +++++ .../actions/default/clusters/logs/index.go | 8 ++++++ internal/web/actions/default/servers/index.go | 2 +- .../@default/clusters/cluster/node/logs.html | 8 +++++- web/views/@default/clusters/logs/index.html | 8 +++++- 6 files changed, 57 insertions(+), 3 deletions(-) create mode 100644 internal/utils/nodelogutils/utils.go diff --git a/internal/utils/nodelogutils/utils.go b/internal/utils/nodelogutils/utils.go new file mode 100644 index 00000000..813a8072 --- /dev/null +++ b/internal/utils/nodelogutils/utils.go @@ -0,0 +1,27 @@ +// Copyright 2022 Liuxiangchao iwind.liu@gmail.com. All rights reserved. +//go:build community +// +build community + +package nodelogutils + +import ( + "github.com/iwind/TeaGo/maps" +) + +// FindCommonTags 查找常用的标签 +func FindNodeCommonTags() []maps.Map { + return []maps.Map{ + { + "name": "端口监听", + "code": "LISTENER", + }, + { + "name": "WAF", + "code": "WAF", + }, + { + "name": "访问日志", + "code": "ACCESS_LOG", + }, + } +} diff --git a/internal/web/actions/default/clusters/cluster/node/logs.go b/internal/web/actions/default/clusters/cluster/node/logs.go index 45fd34b6..dc301c56 100644 --- a/internal/web/actions/default/clusters/cluster/node/logs.go +++ b/internal/web/actions/default/clusters/cluster/node/logs.go @@ -1,6 +1,7 @@ package node import ( + "github.com/TeaOSLab/EdgeAdmin/internal/utils/nodelogutils" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/clusters/cluster/node/nodeutils" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" @@ -23,6 +24,7 @@ func (this *LogsAction) RunGet(params struct { DayTo string Keyword string Level string + Tag string }) { // 初始化节点信息（用于菜单） _, err := nodeutils.InitNodeInfo(this.Parent(), params.NodeId) @@ -31,11 +33,14 @@ func (this *LogsAction) RunGet(params struct { return } + this.Data["tags"] = nodelogutils.FindNodeCommonTags() + this.Data["nodeId"] = params.NodeId this.Data["dayFrom"] = params.DayFrom this.Data["dayTo"] = params.DayTo this.Data["keyword"] = params.Keyword this.Data["level"] = params.Level + this.Data["tag"] = params.Tag countResp, err := this.RPC().NodeLogRPC().CountNodeLogs(this.AdminContext(), &pb.CountNodeLogsRequest{ Role: "node", @@ -44,6 +49,7 @@ func (this *LogsAction) RunGet(params struct { DayTo: params.DayTo, Keyword: params.Keyword, Level: params.Level, + Tag: params.Tag, }) if err != nil { this.ErrorPage(err) @@ -59,6 +65,7 @@ func (this *LogsAction) RunGet(params struct { DayTo: params.DayTo, Keyword: params.Keyword, Level: params.Level, + Tag: params.Tag, Offset: page.Offset, Size: page.Size, }) diff --git a/internal/web/actions/default/clusters/logs/index.go b/internal/web/actions/default/clusters/logs/index.go index 599069d9..670aeb88 100644 --- a/internal/web/actions/default/clusters/logs/index.go +++ b/internal/web/actions/default/clusters/logs/index.go @@ -1,6 +1,7 @@ package logs import ( + "github.com/TeaOSLab/EdgeAdmin/internal/utils/nodelogutils" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" "github.com/TeaOSLab/EdgeCommon/pkg/nodeconfigs" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" @@ -26,12 +27,17 @@ func (this *IndexAction) RunGet(params struct { Keyword string Level string Type string + Tag string }) { this.Data["dayFrom"] = params.DayFrom this.Data["dayTo"] = params.DayTo this.Data["keyword"] = params.Keyword this.Data["level"] = params.Level this.Data["type"] = params.Type + this.Data["tag"] = params.Tag + + // 常见标签 + this.Data["tags"] = nodelogutils.FindNodeCommonTags() // 未读数量 countUnreadResp, err := this.RPC().NodeLogRPC().CountNodeLogs(this.AdminContext(), &pb.CountNodeLogsRequest{ @@ -53,6 +59,7 @@ func (this *IndexAction) RunGet(params struct { Keyword: params.Keyword, Level: params.Level, IsUnread: params.Type == "unread", + Tag: params.Tag, }) if err != nil { this.ErrorPage(err) @@ -70,6 +77,7 @@ func (this *IndexAction) RunGet(params struct { Keyword: params.Keyword, Level: params.Level, IsUnread: params.Type == "unread", + Tag: params.Tag, Offset: page.Offset, Size: page.Size, }) diff --git a/internal/web/actions/default/servers/index.go b/internal/web/actions/default/servers/index.go index 83c77f7a..c34bb6b0 100644 --- a/internal/web/actions/default/servers/index.go +++ b/internal/web/actions/default/servers/index.go @@ -266,7 +266,7 @@ func (this *IndexAction) RunGet(params struct { Role: nodeconfigs.NodeRoleNode, Offset: 0, Size: 20, - Level: "", + Level: "error,success,warning", FixedState: int32(configutils.BoolStateNo), AllServers: true, }) diff --git a/web/views/@default/clusters/cluster/node/logs.html b/web/views/@default/clusters/cluster/node/logs.html index 51428a27..3a90ba4d 100644 --- a/web/views/@default/clusters/cluster/node/logs.html +++ b/web/views/@default/clusters/cluster/node/logs.html @@ -21,13 +21,19 @@ +
+ +
-
+
[清除条件]
diff --git a/web/views/@default/clusters/logs/index.html b/web/views/@default/clusters/logs/index.html index 7040e01e..f0a19f16 100644 --- a/web/views/@default/clusters/logs/index.html +++ b/web/views/@default/clusters/logs/index.html @@ -22,13 +22,19 @@ +
+ +
-
+
[清除条件]