diff --git a/internal/web/actions/default/servers/index.go b/internal/web/actions/default/servers/index.go index b491ff10..b3a2a00e 100644 --- a/internal/web/actions/default/servers/index.go +++ b/internal/web/actions/default/servers/index.go @@ -5,6 +5,7 @@ import ( "github.com/TeaOSLab/EdgeAdmin/internal/configloaders" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" "github.com/TeaOSLab/EdgeCommon/pkg/configutils" + "github.com/TeaOSLab/EdgeCommon/pkg/nodeconfigs" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs" "github.com/iwind/TeaGo/maps" @@ -255,10 +256,10 @@ func (this *IndexAction) RunGet(params struct { // 显示服务相关的日志 errorLogsResp, err := this.RPC().NodeLogRPC().ListNodeLogs(this.AdminContext(), &pb.ListNodeLogsRequest{ NodeId: 0, - Role: "node", + Role: nodeconfigs.NodeRoleNode, Offset: 0, Size: 10, - Level: "error", + Level: "", FixedState: int32(configutils.BoolStateNo), AllServers: true, }) @@ -290,6 +291,7 @@ func (this *IndexAction) RunGet(params struct { "description": errorLog.Description, "createdTime": timeutil.FormatTime("Y-m-d H:i:s", errorLog.CreatedAt), "serverId": errorLog.ServerId, + "level": errorLog.Level, "serverName": server.Name, }) } diff --git a/web/public/js/components/common/node-log-row.js b/web/public/js/components/common/node-log-row.js index e74671a1..fbfaf741 100644 --- a/web/public/js/components/common/node-log-row.js +++ b/web/public/js/components/common/node-log-row.js @@ -7,6 +7,6 @@ Vue.component("node-log-row", { } }, template: `
-
[{{log.createdTime}}][{{log.createdTime}}][{{log.tag}}]{{log.description}}   共{{log.count}}条
+
[{{log.createdTime}}][{{log.createdTime}}][{{log.tag}}]{{log.description}}   共{{log.count}}条
` }) \ No newline at end of file diff --git a/web/views/@default/api/node/logs.html b/web/views/@default/api/node/logs.html index 7f707a75..fc858ded 100644 --- a/web/views/@default/api/node/logs.html +++ b/web/views/@default/api/node/logs.html @@ -18,6 +18,7 @@ +
diff --git a/web/views/@default/clusters/cluster/node/logs.html b/web/views/@default/clusters/cluster/node/logs.html index d7a6ca07..51428a27 100644 --- a/web/views/@default/clusters/cluster/node/logs.html +++ b/web/views/@default/clusters/cluster/node/logs.html @@ -18,6 +18,7 @@ +
diff --git a/web/views/@default/clusters/logs/index.html b/web/views/@default/clusters/logs/index.html index 1de3b983..53a650a4 100644 --- a/web/views/@default/clusters/logs/index.html +++ b/web/views/@default/clusters/logs/index.html @@ -17,6 +17,7 @@ +
diff --git a/web/views/@default/ns/clusters/cluster/node/logs.html b/web/views/@default/ns/clusters/cluster/node/logs.html index c9e90089..13fd8d38 100644 --- a/web/views/@default/ns/clusters/cluster/node/logs.html +++ b/web/views/@default/ns/clusters/cluster/node/logs.html @@ -18,6 +18,7 @@ +
diff --git a/web/views/@default/ns/clusters/logs/index.html b/web/views/@default/ns/clusters/logs/index.html index 7ddc77d2..54cdca0e 100644 --- a/web/views/@default/ns/clusters/logs/index.html +++ b/web/views/@default/ns/clusters/logs/index.html @@ -18,6 +18,7 @@ +
diff --git a/web/views/@default/servers/index.html b/web/views/@default/servers/index.html index 5e928d63..3721c82e 100644 --- a/web/views/@default/servers/index.html +++ b/web/views/@default/servers/index.html @@ -8,9 +8,11 @@ 需要修复的错误
-
+
[{{log.createdTime}}] [{{log.serverName}}][服务] + [错误] + [成功] {{log.description}}
diff --git a/web/views/@default/settings/authority/nodes/node/logs.html b/web/views/@default/settings/authority/nodes/node/logs.html index d94e8904..97182154 100644 --- a/web/views/@default/settings/authority/nodes/node/logs.html +++ b/web/views/@default/settings/authority/nodes/node/logs.html @@ -18,6 +18,7 @@ +
diff --git a/web/views/@default/settings/monitor-nodes/node/logs.html b/web/views/@default/settings/monitor-nodes/node/logs.html index 8c7371f1..bc53e349 100644 --- a/web/views/@default/settings/monitor-nodes/node/logs.html +++ b/web/views/@default/settings/monitor-nodes/node/logs.html @@ -18,6 +18,7 @@ +
diff --git a/web/views/@default/settings/user-nodes/node/logs.html b/web/views/@default/settings/user-nodes/node/logs.html index 79634e52..f95dc530 100644 --- a/web/views/@default/settings/user-nodes/node/logs.html +++ b/web/views/@default/settings/user-nodes/node/logs.html @@ -18,6 +18,7 @@ +