实现集群看板

internal/rpc/services/service_admin.go

@@ -493,7 +493,7 @@ func (this *AdminService) ComposeAdminDashboard(ctx context.Context, req *pb.Com
 	resp.CountServers = countServers
 
 	// 用户数
-	countUsers, err := models.SharedUserDAO.CountAllEnabledUsers(tx, "")
+	countUsers, err := models.SharedUserDAO.CountAllEnabledUsers(tx, 0, "")
 	if err != nil {
 		return nil, err
 	}

internal/rpc/services/service_base.go

@@ -163,6 +163,7 @@ func (this *BaseService) ValidateNodeId(ctx context.Context, roles ...rpcutils.U
 		return rpcutils.UserTypeNone, 0, errors.New("authenticate timeout, please check your system clock")
 	}
 
+	role = apiToken.Role
 	switch apiToken.Role {
 	case rpcutils.UserTypeNode:
 		nodeIntId, err = models.SharedNodeDAO.FindEnabledNodeIdWithUniqueId(nil, nodeId)

internal/rpc/services/service_node_value.go

@@ -5,6 +5,7 @@ package services
 import (
 	"context"
 	"github.com/TeaOSLab/EdgeAPI/internal/db/models"
+	"github.com/TeaOSLab/EdgeAPI/internal/db/models/nameservers"
 	rpcutils "github.com/TeaOSLab/EdgeAPI/internal/rpc/utils"
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 )
@@ -15,13 +16,25 @@ type NodeValueService struct {
 
 // CreateNodeValue 记录数据
 func (this *NodeValueService) CreateNodeValue(ctx context.Context, req *pb.CreateNodeValueRequest) (*pb.RPCSuccess, error) {
-	role, nodeId, err := rpcutils.ValidateRequest(ctx, rpcutils.UserTypeNode)
+	role, nodeId, err := rpcutils.ValidateRequest(ctx, rpcutils.UserTypeNode, rpcutils.UserTypeDNS)
 	if err != nil {
 		return nil, err
 	}
 
 	var tx = this.NullTx()
-	err = models.SharedNodeValueDAO.CreateValue(tx, role, nodeId, req.Item, req.ValueJSON, req.CreatedAt)
+
+	var clusterId int64
+	switch role {
+	case rpcutils.UserTypeNode:
+		clusterId, err = models.SharedNodeDAO.FindNodeClusterId(tx, nodeId)
+	case rpcutils.UserTypeDNS:
+		clusterId, err = nameservers.SharedNSNodeDAO.FindNodeClusterId(tx, nodeId)
+	}
+	if err != nil {
+		return nil, err
+	}
+
+	err = models.SharedNodeValueDAO.CreateValue(tx, clusterId, role, nodeId, req.Item, req.ValueJSON, req.CreatedAt)
 	if err != nil {
 		return nil, err
 	}

internal/rpc/services/service_server_daily_stat.go

@@ -3,7 +3,9 @@ package services
 import (
 	"context"
 	"github.com/TeaOSLab/EdgeAPI/internal/db/models"
+	"github.com/TeaOSLab/EdgeAPI/internal/db/models/nameservers"
 	"github.com/TeaOSLab/EdgeAPI/internal/db/models/stats"
+	rpcutils "github.com/TeaOSLab/EdgeAPI/internal/rpc/utils"
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 	timeutil "github.com/iwind/TeaGo/utils/time"
 	"math"
@@ -17,7 +19,7 @@ type ServerDailyStatService struct {
 
 // UploadServerDailyStats 上传统计
 func (this *ServerDailyStatService) UploadServerDailyStats(ctx context.Context, req *pb.UploadServerDailyStatsRequest) (*pb.RPCSuccess, error) {
-	nodeId, err := this.ValidateNode(ctx)
+	role, nodeId, err := this.ValidateNodeId(ctx, rpcutils.UserTypeNode, rpcutils.UserTypeDNS)
 	if err != nil {
 		return nil, err
 	}
@@ -29,35 +31,50 @@ func (this *ServerDailyStatService) UploadServerDailyStats(ctx context.Context,
 		return nil, err
 	}
 
+	var clusterId int64
+	switch role {
+	case rpcutils.UserTypeNode:
+		clusterId, err = models.SharedNodeDAO.FindNodeClusterId(tx, nodeId)
+		if err != nil {
+			return nil, err
+		}
+	case rpcutils.UserTypeDNS:
+		clusterId, err = nameservers.SharedNSNodeDAO.FindNodeClusterId(tx, nodeId)
+		if err != nil {
+			return nil, err
+		}
+	}
+
 	// 写入其他统计表
 	// TODO 将来改成每小时入库一次
 	for _, stat := range req.Stats {
 		// 总体流量（按天）
-		err = stats.SharedTrafficDailyStatDAO.IncreaseDailyBytes(tx, timeutil.FormatTime("Ymd", stat.CreatedAt), stat.Bytes)
+		err = stats.SharedTrafficDailyStatDAO.IncreaseDailyStat(tx, timeutil.FormatTime("Ymd", stat.CreatedAt), stat.Bytes, stat.CachedBytes, stat.CountRequests, stat.CountCachedRequests)
 		if err != nil {
 			return nil, err
 		}
 
 		// 总体统计（按小时）
-		err = stats.SharedTrafficHourlyStatDAO.IncreaseHourlyBytes(tx, timeutil.FormatTime("YmdH", stat.CreatedAt), stat.Bytes)
+		err = stats.SharedTrafficHourlyStatDAO.IncreaseHourlyStat(tx, timeutil.FormatTime("YmdH", stat.CreatedAt), stat.Bytes, stat.CachedBytes, stat.CountRequests, stat.CountCachedRequests)
 		if err != nil {
 			return nil, err
 		}
 
 		// 节点流量
 		if nodeId > 0 {
-			err = stats.SharedNodeTrafficDailyStatDAO.IncreaseDailyBytes(tx, nodeId, timeutil.FormatTime("Ymd", stat.CreatedAt), stat.Bytes)
+			err = stats.SharedNodeTrafficDailyStatDAO.IncreaseDailyStat(tx, clusterId, role, nodeId, timeutil.FormatTime("Ymd", stat.CreatedAt), stat.Bytes, stat.CachedBytes, stat.CountRequests, stat.CountCachedRequests)
+			if err != nil {
+				return nil, err
+			}
+
+			err = stats.SharedNodeTrafficHourlyStatDAO.IncreaseHourlyStat(tx, clusterId, role, nodeId, timeutil.FormatTime("YmdH", stat.CreatedAt), stat.Bytes, stat.CachedBytes, stat.CountRequests, stat.CountCachedRequests)
 			if err != nil {
 				return nil, err
 			}
 
 			// 集群流量
-			clusterId, err := models.SharedNodeDAO.FindNodeClusterId(tx, nodeId)
-			if err != nil {
-				return nil, err
-			}
 			if clusterId > 0 {
-				err = stats.SharedNodeClusterTrafficDailyStatDAO.IncreaseDailyBytes(tx, clusterId, timeutil.FormatTime("Ymd", stat.CreatedAt), stat.Bytes)
+				err = stats.SharedNodeClusterTrafficDailyStatDAO.IncreaseDailyStat(tx, clusterId, timeutil.FormatTime("Ymd", stat.CreatedAt), stat.Bytes, stat.CachedBytes, stat.CountRequests, stat.CountCachedRequests)
 				if err != nil {
 					return nil, err
 				}
@@ -65,6 +82,14 @@ func (this *ServerDailyStatService) UploadServerDailyStats(ctx context.Context,
 		}
 	}
 
+	// 域名统计
+	for _, stat := range req.DomainStats {
+		err := stats.SharedServerDomainHourlyStatDAO.IncreaseHourlyStat(tx, clusterId, nodeId, stat.ServerId, stat.Domain, timeutil.FormatTime("YmdH", stat.CreatedAt), stat.Bytes, stat.CachedBytes, stat.CountRequests, stat.CountCachedRequests)
+		if err != nil {
+			return nil, err
+		}
+	}
+
 	return this.Success()
 }
 

internal/rpc/services/service_server_stat_board.go

@@ -0,0 +1,199 @@
+// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
+
+package services
+
+import (
+	"context"
+	"encoding/json"
+	"github.com/TeaOSLab/EdgeAPI/internal/db/models"
+	"github.com/TeaOSLab/EdgeAPI/internal/db/models/stats"
+	"github.com/TeaOSLab/EdgeCommon/pkg/configutils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/nodeconfigs"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
+	"github.com/iwind/TeaGo/types"
+	timeutil "github.com/iwind/TeaGo/utils/time"
+	"time"
+)
+
+// ServerStatBoardService 统计看板条目
+type ServerStatBoardService struct {
+	BaseService
+}
+
+// FindAllEnabledServerStatBoards 读取所有看板
+func (this *ServerStatBoardService) FindAllEnabledServerStatBoards(ctx context.Context, req *pb.FindAllEnabledServerStatBoardsRequest) (*pb.FindAllEnabledServerStatBoardsResponse, error) {
+	_, err := this.ValidateAdmin(ctx, 0)
+	if err != nil {
+		return nil, err
+	}
+
+	var tx = this.NullTx()
+	boards, err := models.SharedServerStatBoardDAO.FindAllEnabledBoards(tx, req.NodeClusterId)
+	if err != nil {
+		return nil, err
+	}
+	var pbBoards = []*pb.ServerStatBoard{}
+	for _, board := range boards {
+		pbBoards = append(pbBoards, &pb.ServerStatBoard{
+			Id:   int64(board.Id),
+			Name: board.Name,
+			IsOn: board.IsOn == 1,
+		})
+	}
+
+	return &pb.FindAllEnabledServerStatBoardsResponse{
+		ServerStatBoards: pbBoards,
+	}, nil
+}
+
+// ComposeServerStatNodeClusterBoard 组合看板数据
+func (this *ServerStatBoardService) ComposeServerStatNodeClusterBoard(ctx context.Context, req *pb.ComposeServerStatNodeClusterBoardRequest) (*pb.ComposeServerStatNodeClusterBoardResponse, error) {
+	_, err := this.ValidateAdmin(ctx, 0)
+	if err != nil {
+		return nil, err
+	}
+
+	var tx = this.NullTx()
+	var result = &pb.ComposeServerStatNodeClusterBoardResponse{}
+
+	// 统计数字
+	countActiveNodes, err := models.SharedNodeDAO.CountAllEnabledNodesMatch(tx, req.NodeClusterId, configutils.BoolStateAll, configutils.BoolStateYes, "", 0, 0)
+	if err != nil {
+		return nil, err
+	}
+	result.CountActiveNodes = countActiveNodes
+
+	countInactiveNodes, err := models.SharedNodeDAO.CountAllEnabledNodesMatch(tx, req.NodeClusterId, configutils.BoolStateAll, configutils.BoolStateNo, "", 0, 0)
+	if err != nil {
+		return nil, err
+	}
+	result.CountInactiveNodes = countInactiveNodes
+
+	countUsers, err := models.SharedUserDAO.CountAllEnabledUsers(tx, req.NodeClusterId, "")
+	if err != nil {
+		return nil, err
+	}
+	result.CountUsers = countUsers
+
+	countServers, err := models.SharedServerDAO.CountAllEnabledServersWithNodeClusterId(tx, req.NodeClusterId)
+	if err != nil {
+		return nil, err
+	}
+	result.CountServers = countServers
+
+	// 按日流量统计
+	dayFrom := timeutil.Format("Ymd", time.Now().AddDate(0, 0, -14))
+	dailyTrafficStats, err := stats.SharedNodeClusterTrafficDailyStatDAO.FindDailyStats(tx, req.NodeClusterId, dayFrom, timeutil.Format("Ymd"))
+	if err != nil {
+		return nil, err
+	}
+	for _, stat := range dailyTrafficStats {
+		result.DailyTrafficStats = append(result.DailyTrafficStats, &pb.ComposeServerStatNodeClusterBoardResponse_DailyTrafficStat{
+			Day:                 stat.Day,
+			Bytes:               int64(stat.Bytes),
+			CachedBytes:         int64(stat.CachedBytes),
+			CountRequests:       int64(stat.CountRequests),
+			CountCachedRequests: int64(stat.CountCachedRequests),
+		})
+	}
+
+	// 小时流量统计
+	hourFrom := timeutil.Format("YmdH", time.Now().Add(-23*time.Hour))
+	hourTo := timeutil.Format("YmdH")
+	hourlyTrafficStats, err := stats.SharedNodeTrafficHourlyStatDAO.FindHourlyStatsWithClusterId(tx, req.NodeClusterId, hourFrom, hourTo)
+	if err != nil {
+		return nil, err
+	}
+	for _, stat := range hourlyTrafficStats {
+		result.HourlyTrafficStats = append(result.HourlyTrafficStats, &pb.ComposeServerStatNodeClusterBoardResponse_HourlyTrafficStat{
+			Hour:                stat.Hour,
+			Bytes:               int64(stat.Bytes),
+			CachedBytes:         int64(stat.CachedBytes),
+			CountRequests:       int64(stat.CountRequests),
+			CountCachedRequests: int64(stat.CountCachedRequests),
+		})
+	}
+
+	// 节点排行
+	topNodeStats, err := stats.SharedNodeTrafficHourlyStatDAO.FindTopNodeStatsWithClusterId(tx, req.NodeClusterId, hourFrom, hourTo)
+	if err != nil {
+		return nil, err
+	}
+	for _, stat := range topNodeStats {
+		nodeName, err := models.SharedNodeDAO.FindNodeName(tx, int64(stat.NodeId))
+		if err != nil {
+			return nil, err
+		}
+		if len(nodeName) == 0 {
+			continue
+		}
+		result.TopNodeStats = append(result.TopNodeStats, &pb.ComposeServerStatNodeClusterBoardResponse_NodeStat{
+			NodeId:        int64(stat.NodeId),
+			NodeName:      nodeName,
+			CountRequests: int64(stat.CountRequests),
+			Bytes:         int64(stat.Bytes),
+		})
+	}
+
+	// 域名排行
+	topDomainStats, err := stats.SharedServerDomainHourlyStatDAO.FindTopDomainStatsWithClusterId(tx, req.NodeClusterId, hourFrom, hourTo)
+	if err != nil {
+		return nil, err
+	}
+	for _, stat := range topDomainStats {
+		result.TopDomainStats = append(result.TopDomainStats, &pb.ComposeServerStatNodeClusterBoardResponse_DomainStat{
+			ServerId:      int64(stat.ServerId),
+			Domain:        stat.Domain,
+			CountRequests: int64(stat.CountRequests),
+			Bytes:         int64(stat.Bytes),
+		})
+	}
+
+	// CPU、内存、负载
+	cpuValues, err := models.SharedNodeValueDAO.ListValuesWithClusterId(tx, req.NodeClusterId, "node", nodeconfigs.NodeValueItemCPU, "usage", nodeconfigs.NodeValueRangeMinute)
+	if err != nil {
+		return nil, err
+	}
+	for _, v := range cpuValues {
+		valueJSON, err := json.Marshal(types.Float32(v.Value))
+		if err != nil {
+			return nil, err
+		}
+		result.CpuNodeValues = append(result.CpuNodeValues, &pb.NodeValue{
+			ValueJSON: valueJSON,
+			CreatedAt: int64(v.CreatedAt),
+		})
+	}
+
+	memoryValues, err := models.SharedNodeValueDAO.ListValuesWithClusterId(tx, req.NodeClusterId, "node", nodeconfigs.NodeValueItemMemory, "usage", nodeconfigs.NodeValueRangeMinute)
+	if err != nil {
+		return nil, err
+	}
+	for _, v := range memoryValues {
+		valueJSON, err := json.Marshal(types.Float32(v.Value))
+		if err != nil {
+			return nil, err
+		}
+		result.MemoryNodeValues = append(result.MemoryNodeValues, &pb.NodeValue{
+			ValueJSON: valueJSON,
+			CreatedAt: int64(v.CreatedAt),
+		})
+	}
+
+	loadValues, err := models.SharedNodeValueDAO.ListValuesWithClusterId(tx, req.NodeClusterId, "node", nodeconfigs.NodeValueItemLoad, "load5m", nodeconfigs.NodeValueRangeMinute)
+	if err != nil {
+		return nil, err
+	}
+	for _, v := range loadValues {
+		valueJSON, err := json.Marshal(types.Float32(v.Value))
+		if err != nil {
+			return nil, err
+		}
+		result.LoadNodeValues = append(result.LoadNodeValues, &pb.NodeValue{
+			ValueJSON: valueJSON,
+			CreatedAt: int64(v.CreatedAt),
+		})
+	}
+
+	return result, nil
+}

internal/rpc/services/service_server_stat_board_chart.go

@@ -0,0 +1,107 @@
+// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
+
+package services
+
+import (
+	"context"
+	"github.com/TeaOSLab/EdgeAPI/internal/db/models"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
+	"github.com/iwind/TeaGo/types"
+)
+
+// ServerStatBoardChartService 统计看板条目
+type ServerStatBoardChartService struct {
+	BaseService
+}
+
+// EnableServerStatBoardChart 添加图表
+func (this *ServerStatBoardChartService) EnableServerStatBoardChart(ctx context.Context, req *pb.EnableServerStatBoardChartRequest) (*pb.RPCSuccess, error) {
+	_, err := this.ValidateAdmin(ctx, 0)
+	if err != nil {
+		return nil, err
+	}
+
+	var tx = this.NullTx()
+	err = models.SharedServerStatBoardChartDAO.EnableChart(tx, req.ServerStatBoardId, req.MetricChartId)
+	if err != nil {
+		return nil, err
+	}
+
+	return this.Success()
+}
+
+// DisableServerStatBoardChart 取消图表
+func (this *ServerStatBoardChartService) DisableServerStatBoardChart(ctx context.Context, req *pb.DisableServerStatBoardChartRequest) (*pb.RPCSuccess, error) {
+	_, err := this.ValidateAdmin(ctx, 0)
+	if err != nil {
+		return nil, err
+	}
+
+	var tx = this.NullTx()
+	err = models.SharedServerStatBoardChartDAO.DisableChart(tx, req.ServerStatBoardId, req.MetricChartId)
+	if err != nil {
+		return nil, err
+	}
+
+	return this.Success()
+}
+
+// FindAllEnabledServerStatBoardCharts 读取看板中的图表
+func (this *ServerStatBoardChartService) FindAllEnabledServerStatBoardCharts(ctx context.Context, req *pb.FindAllEnabledServerStatBoardChartsRequest) (*pb.FindAllEnabledServerStatBoardChartsResponse, error) {
+	_, err := this.ValidateAdmin(ctx, 0)
+	if err != nil {
+		return nil, err
+	}
+
+	var tx = this.NullTx()
+	charts, err := models.SharedServerStatBoardChartDAO.FindAllEnabledCharts(tx, req.ServerStatBoardId)
+	if err != nil {
+		return nil, err
+	}
+	var pbCharts []*pb.ServerStatBoardChart
+	for _, chart := range charts {
+		// 指标图表
+		metricChart, err := models.SharedMetricChartDAO.FindEnabledMetricChart(tx, int64(chart.ChartId))
+		if err != nil {
+			return nil, err
+		}
+		if metricChart == nil {
+			continue
+		}
+
+		// 指标
+		metricItem, err := models.SharedMetricItemDAO.FindEnabledMetricItem(tx, int64(chart.ItemId))
+		if err != nil {
+			return nil, err
+		}
+		if metricItem == nil {
+			continue
+		}
+
+		pbCharts = append(pbCharts, &pb.ServerStatBoardChart{
+			Id: int64(chart.Id),
+			MetricChart: &pb.MetricChart{
+				Id:         int64(metricChart.Id),
+				Name:       metricChart.Name,
+				Type:       metricChart.Type,
+				WidthDiv:   types.Int32(metricChart.WidthDiv),
+				ParamsJSON: nil,
+				IsOn:       metricChart.IsOn == 1,
+				MaxItems:   types.Int32(metricChart.MaxItems),
+				MetricItem: &pb.MetricItem{
+					Id:         int64(metricItem.Id),
+					IsOn:       metricItem.IsOn == 1,
+					Code:       metricItem.Code,
+					Category:   metricItem.Category,
+					Name:       metricItem.Name,
+					Keys:       metricItem.DecodeKeys(),
+					Period:     types.Int32(metricItem.Period),
+					PeriodUnit: metricItem.PeriodUnit,
+					Value:      metricItem.Value,
+				},
+			},
+		})
+	}
+
+	return &pb.FindAllEnabledServerStatBoardChartsResponse{ServerStatBoardCharts: pbCharts}, nil
+}

internal/rpc/services/service_user.go

@@ -99,7 +99,7 @@ func (this *UserService) CountAllEnabledUsers(ctx context.Context, req *pb.Count
 
 	tx := this.NullTx()
 
-	count, err := models.SharedUserDAO.CountAllEnabledUsers(tx, req.Keyword)
+	count, err := models.SharedUserDAO.CountAllEnabledUsers(tx, 0, req.Keyword)
 	if err != nil {
 		return nil, err
 	}
@@ -115,7 +115,7 @@ func (this *UserService) ListEnabledUsers(ctx context.Context, req *pb.ListEnabl
 
 	tx := this.NullTx()
 
-	users, err := models.SharedUserDAO.ListEnabledUsers(tx, req.Keyword, req.Offset, req.Size)
+	users, err := models.SharedUserDAO.ListEnabledUsers(tx, 0, req.Keyword, req.Offset, req.Size)
 	if err != nil {
 		return nil, err
 	}