服务访问日志增加今天和历史的访问日志查看

internal/web/actions/default/clusters/cluster/node/node.go

@@ -142,13 +142,14 @@ func (this *NodeAction) RunGet(params struct {
 		"isOn":        node.IsOn,
 
 		"status": maps.Map{
-			"isActive":     status.IsActive,
+			"isActive":        status.IsActive,
-			"updatedAt":    status.UpdatedAt,
+			"updatedAt":       status.UpdatedAt,
-			"hostname":     status.Hostname,
+			"hostname":        status.Hostname,
-			"cpuUsage":     status.CPUUsage,
+			"cpuUsage":        status.CPUUsage,
-			"cpuUsageText": fmt.Sprintf("%.2f%%", status.CPUUsage*100),
+			"cpuUsageText":    fmt.Sprintf("%.2f%%", status.CPUUsage*100),
-			"memUsage":     status.MemoryUsage,
+			"memUsage":        status.MemoryUsage,
-			"memUsageText": fmt.Sprintf("%.2f%%", status.MemoryUsage*100),
+			"memUsageText":    fmt.Sprintf("%.2f%%", status.MemoryUsage*100),
+			"connectionCount": status.ConnectionCount,
 		},
 
 		"group": groupMap,

internal/web/actions/default/servers/components/index.go

@@ -9,7 +9,7 @@ import (
 )
 
 const (
-	SettingCodeGlobalConfig = "globalConfig"
+	SettingCodeServerGlobalConfig = "serverGlobalConfig"
 )
 
 type IndexAction struct {
@@ -22,7 +22,7 @@ func (this *IndexAction) Init() {
 }
 
 func (this *IndexAction) RunGet(params struct{}) {
-	valueJSONResp, err := this.RPC().SysSettingRPC().ReadSysSetting(this.AdminContext(), &pb.ReadSysSettingRequest{Code: SettingCodeGlobalConfig})
+	valueJSONResp, err := this.RPC().SysSettingRPC().ReadSysSetting(this.AdminContext(), &pb.ReadSysSettingRequest{Code: SettingCodeServerGlobalConfig})
 	if err != nil {
 		this.ErrorPage(err)
 		return
@@ -57,7 +57,7 @@ func (this *IndexAction) RunPost(params struct {
 
 	// 修改配置
 	_, err = this.RPC().SysSettingRPC().UpdateSysSetting(this.AdminContext(), &pb.UpdateSysSettingRequest{
-		Code:      SettingCodeGlobalConfig,
+		Code:      SettingCodeServerGlobalConfig,
 		ValueJSON: params.GlobalConfigJSON,
 	})
 	if err != nil {

internal/web/actions/default/servers/server/log/history.go

@@ -0,0 +1,87 @@
+package log
+
+import (
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
+	timeutil "github.com/iwind/TeaGo/utils/time"
+	"regexp"
+	"strings"
+)
+
+type HistoryAction struct {
+	actionutils.ParentAction
+}
+
+func (this *HistoryAction) Init() {
+	this.Nav("", "log", "")
+	this.SecondMenu("history")
+}
+
+func (this *HistoryAction) RunGet(params struct {
+	ServerId int64
+	Day      string
+
+	RequestId string
+	HasError  int
+}) {
+	if len(params.Day) == 0 {
+		params.Day = timeutil.Format("Y-m-d")
+	}
+
+	this.Data["path"] = this.Request.URL.Path
+	this.Data["day"] = params.Day
+	this.Data["accessLogs"] = []interface{}{}
+	this.Data["hasError"] = params.HasError
+
+	day := params.Day
+	if len(day) > 0 && regexp.MustCompile(`\d{4}-\d{2}-\d{2}`).MatchString(day) {
+		day = strings.ReplaceAll(day, "-", "")
+		size := int64(10)
+
+		this.Data["hasError"] = params.HasError
+
+		resp, err := this.RPC().HTTPAccessLogRPC().ListHTTPAccessLogs(this.AdminContext(), &pb.ListHTTPAccessLogsRequest{
+			RequestId: params.RequestId,
+			ServerId:  params.ServerId,
+			HasError:  params.HasError > 0,
+			Day:       day,
+			Size:      size,
+		})
+		if err != nil {
+			this.ErrorPage(err)
+			return
+		}
+
+		if len(resp.AccessLogs) == 0 {
+			this.Data["accessLogs"] = []interface{}{}
+		} else {
+			this.Data["accessLogs"] = resp.AccessLogs
+		}
+		this.Data["hasMore"] = resp.HasMore
+		this.Data["nextRequestId"] = resp.RequestId
+
+		// 上一个requestId
+		this.Data["hasPrev"] = false
+		this.Data["lastRequestId"] = ""
+		if len(params.RequestId) > 0 {
+			this.Data["hasPrev"] = true
+			prevResp, err := this.RPC().HTTPAccessLogRPC().ListHTTPAccessLogs(this.AdminContext(), &pb.ListHTTPAccessLogsRequest{
+				RequestId: params.RequestId,
+				ServerId:  params.ServerId,
+				HasError:  params.HasError > 0,
+				Day:       day,
+				Size:      size,
+				Reverse:   true,
+			})
+			if err != nil {
+				this.ErrorPage(err)
+				return
+			}
+			if int64(len(prevResp.AccessLogs)) == size {
+				this.Data["lastRequestId"] = prevResp.RequestId
+			}
+		}
+	}
+
+	this.Show()
+}

internal/web/actions/default/servers/server/log/init.go

@@ -13,6 +13,8 @@ func init() {
 			Helper(serverutils.NewServerHelper()).
 			Prefix("/servers/server/log").
 			GetPost("", new(IndexAction)).
+			GetPost("/today", new(TodayAction)).
+			GetPost("/history", new(HistoryAction)).
 			EndAll()
 	})
 }

internal/web/actions/default/servers/server/log/today.go

@@ -0,0 +1,71 @@
+package log
+
+import (
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
+	timeutil "github.com/iwind/TeaGo/utils/time"
+)
+
+type TodayAction struct {
+	actionutils.ParentAction
+}
+
+func (this *TodayAction) Init() {
+	this.Nav("", "log", "")
+	this.SecondMenu("today")
+}
+
+func (this *TodayAction) RunGet(params struct {
+	RequestId string
+	ServerId  int64
+	HasError  int
+}) {
+	size := int64(10)
+
+	this.Data["path"] = this.Request.URL.Path
+	this.Data["hasError"] = params.HasError
+
+	resp, err := this.RPC().HTTPAccessLogRPC().ListHTTPAccessLogs(this.AdminContext(), &pb.ListHTTPAccessLogsRequest{
+		RequestId: params.RequestId,
+		ServerId:  params.ServerId,
+		HasError:  params.HasError > 0,
+		Day:       timeutil.Format("Ymd"),
+		Size:      size,
+	})
+	if err != nil {
+		this.ErrorPage(err)
+		return
+	}
+
+	if len(resp.AccessLogs) == 0 {
+		this.Data["accessLogs"] = []interface{}{}
+	} else {
+		this.Data["accessLogs"] = resp.AccessLogs
+	}
+	this.Data["hasMore"] = resp.HasMore
+	this.Data["nextRequestId"] = resp.RequestId
+
+	// 上一个requestId
+	this.Data["hasPrev"] = false
+	this.Data["lastRequestId"] = ""
+	if len(params.RequestId) > 0 {
+		this.Data["hasPrev"] = true
+		prevResp, err := this.RPC().HTTPAccessLogRPC().ListHTTPAccessLogs(this.AdminContext(), &pb.ListHTTPAccessLogsRequest{
+			RequestId: params.RequestId,
+			ServerId:  params.ServerId,
+			HasError:  params.HasError > 0,
+			Day:       timeutil.Format("Ymd"),
+			Size:      size,
+			Reverse:   true,
+		})
+		if err != nil {
+			this.ErrorPage(err)
+			return
+		}
+		if int64(len(prevResp.AccessLogs)) == size {
+			this.Data["lastRequestId"] = prevResp.RequestId
+		}
+	}
+
+	this.Show()
+}

internal/web/actions/default/servers/serverutils/server_helper.go

@@ -125,6 +125,16 @@ func (this *ServerHelper) createLogMenu(secondMenuItem string, serverIdString st
 		"url":      "/servers/server/log?serverId=" + serverIdString,
 		"isActive": secondMenuItem == "index",
 	})
+	menuItems = append(menuItems, maps.Map{
+		"name":     "今天",
+		"url":      "/servers/server/log/today?serverId=" + serverIdString,
+		"isActive": secondMenuItem == "today",
+	})
+	menuItems = append(menuItems, maps.Map{
+		"name":     "历史",
+		"url":      "/servers/server/log/history?serverId=" + serverIdString,
+		"isActive": secondMenuItem == "history",
+	})
 	return menuItems
 }
 

web/public/js/components/server/http-access-log-box.js

@@ -17,6 +17,6 @@ Vue.component("http-access-log-box", {
 		}
 	},
 	template: `<div :style="{'color': (accessLog.status >= 400) ? '#dc143c' : ''}">
-	{{accessLog.remoteAddr}} [{{accessLog.timeLocal}}] <em>&quot;{{accessLog.requestMethod}} {{accessLog.requestScheme}}://{{accessLog.host}}{{accessLog.requestURI}} <a :href="accessLog.scheme + '://' + accessLog.host + accessLog.requestURI" target="_blank" title="新窗口打开" class="disabled"><i class="external icon tiny"></i> </a> {{accessLog.proto}}&quot; </em> {{accessLog.status}} <span v-if="accessLog.attrs != null && accessLog.attrs['cache_cached'] == '1'">[cached]</span> <span v-if="accessLog.attrs != null && accessLog.attrs['waf_action'] != null && accessLog.attrs['waf_action'].length > 0">[waf {{accessLog.attrs['waf_action']}}]</span> - 耗时:{{formatCost(accessLog.requestTime)}} ms
+	{{accessLog.remoteAddr}} [{{accessLog.timeLocal}}] <em>&quot;{{accessLog.requestMethod}} {{accessLog.scheme}}://{{accessLog.host}}{{accessLog.requestURI}} <a :href="accessLog.scheme + '://' + accessLog.host + accessLog.requestURI" target="_blank" title="新窗口打开" class="disabled"><i class="external icon tiny"></i> </a> {{accessLog.proto}}&quot; </em> {{accessLog.status}} <span v-if="accessLog.attrs != null && accessLog.attrs['cache_cached'] == '1'">[cached]</span> <span v-if="accessLog.attrs != null && accessLog.attrs['waf_action'] != null && accessLog.attrs['waf_action'].length > 0">[waf {{accessLog.attrs['waf_action']}}]</span> - 耗时:{{formatCost(accessLog.requestTime)}} ms
 </div>`
 })

web/views/@default/clusters/cluster/node/node.html

@@ -104,15 +104,22 @@
 				</div>
 			</td>
 		</tr>
-		<tr v-show="node.status.isActive">
+		<tbody v-show="node.status.isActive">
-			<td>CPU</td>
+			<tr>
-			<td>{{node.status.cpuUsageText}}</td>
+				<td>CPU</td>
-		</tr>
+				<td>{{node.status.cpuUsageText}}</td>
-		<tr v-show="node.status.isActive">
+			</tr>
-			<td>内存</td>
+			<tr>
-			<td>{{node.status.memUsageText}}</td>
+				<td>内存</td>
-		</tr>
+				<td>{{node.status.memUsageText}}</td>
+			</tr>
+			<tr>
+				<td>连接数</td>
+				<td>{{node.status.connectionCount}}</td>
+			</tr>
+		</tbody>
 	</table>
+	<p class="comment" v-if="node.status.isActive">每隔30秒钟更新一次运行状态。</p>
 
 	<div class="ui divider"></div>
 	<h3>安装信息</h3>

web/views/@default/servers/server/log/history.html

@@ -0,0 +1,49 @@
+{$layout}
+
+{$var "header"}
+<!-- datepicker -->
+<script type="text/javascript" src="/js/moment.min.js"></script>
+<script type="text/javascript" src="/js/pikaday.js"></script>
+<link rel="stylesheet" href="/js/pikaday.css"/>
+<link rel="stylesheet" href="/js/pikaday.theme.css"/>
+<link rel="stylesheet" href="/js/pikaday.triangle.css"/>
+{$end}
+
+{$template "/left_menu"}
+
+<div class="right-box">
+	<first-menu>
+		<menu-item :href="path + '?serverId=' + serverId + '&day=' + day" :active="hasError == 0">所有日志</menu-item>
+		<menu-item :href="path + '?serverId=' + serverId + '&day=' + day + '&hasError=1'" :active="hasError > 0">错误日志</menu-item>
+		<div class="item right">
+			<form class="ui form" :action="path" autocomplete="off">
+				<input type="hidden" name="serverId" :value="serverId"/>
+				<div class="ui fields inline">
+					<div class="ui field">
+						<input type="text" name="day" maxlength="10" placeholder="选择日期" style="width:7.8em" id="day-input" v-model="day"/>
+					</div>
+					<div class="ui field">
+						<button class="ui button" type="submit">查找</button>
+					</div>
+				</div>
+			</form>
+		</div>
+	</first-menu>
+
+	<p class="comment" v-if="accessLogs.length == 0">暂时还没有访问日志。</p>
+
+	<table class="ui table selectable" v-if="accessLogs.length > 0">
+		<!-- 这里之所以需要添加 :key，是因为要不然不会刷新显示 -->
+		<tr v-for="accessLog in accessLogs" :key="accessLog.requestId">
+			<td><http-access-log-box :v-access-log="accessLog"></http-access-log-box></td>
+		</tr>
+	</table>
+
+	<div v-if="accessLogs.length > 0">
+		<a :href="path + '?serverId=' + serverId + '&requestId=' + lastRequestId + '&day=' + day + '&hasError=' + hasError" v-if="hasPrev">上一页</a>
+		<span v-else class="disabled">上一页</span>
+		<span class="disabled">&nbsp; | &nbsp;</span>
+		<a :href="path + '?serverId=' + serverId + '&requestId=' + nextRequestId + '&day=' + day + '&hasError=' + hasError" v-if="hasMore">下一页</a>
+		<span v-else class="disabled">下一页</span>
+	</div>
+</div>

web/views/@default/servers/server/log/history.js

@@ -0,0 +1,8 @@
+Tea.context(function () {
+	this.$delay(function () {
+		let that = this
+		teaweb.datepicker("day-input", function (day) {
+			that.day = day
+		})
+	})
+})

web/views/@default/servers/server/log/index.css.map

@@ -1 +0,0 @@
-undefined

web/views/@default/servers/server/log/today.html

@@ -0,0 +1,26 @@
+{$layout}
+
+{$template "/left_menu"}
+<div class="right-box">
+	<first-menu>
+		<menu-item :href="path + '?serverId=' + serverId" :active="hasError == 0">所有日志</menu-item>
+		<menu-item :href="path + '?serverId=' + serverId + '&hasError=1'" :active="hasError > 0">错误日志</menu-item>
+	</first-menu>
+
+	<p class="comment" v-if="accessLogs.length == 0">今天暂时还没有访问日志。</p>
+
+	<table class="ui table selectable" v-if="accessLogs.length > 0">
+		<!-- 这里之所以需要添加 :key，是因为要不然不会刷新显示 -->
+		<tr v-for="accessLog in accessLogs" :key="accessLog.requestId">
+			<td><http-access-log-box :v-access-log="accessLog"></http-access-log-box></td>
+		</tr>
+	</table>
+
+	<div v-if="accessLogs.length > 0">
+		<a :href="path + '?serverId=' + serverId + '&requestId=' + lastRequestId + '&hasError=' + hasError" v-if="hasPrev">上一页</a>
+		<span v-else class="disabled">上一页</span>
+		<span class="disabled">&nbsp; | &nbsp;</span>
+		<a :href="path + '?serverId=' + serverId + '&requestId=' + nextRequestId + '&hasError=' + hasError" v-if="hasMore">下一页</a>
+		<span v-else class="disabled">下一页</span>
+	</div>
+</div>