实现基础的统计指标

2025-12-31 02:26:35 +08:00 · 2021-06-30 19:59:49 +08:00
parent 799aa13e37
commit d04e3e4f39
22 changed files with 429 additions and 117 deletions
--- a/internal/rpc/services/service_base.go
+++ b/internal/rpc/services/service_base.go
@@ -207,6 +207,11 @@ func (this *BaseService) SuccessCount(count int64) (*pb.RPCCountResponse, error)
 	return &pb.RPCCountResponse{Count: count}, nil
 }

+// Exists 返回是否存在
+func (this *BaseService) Exists(b bool) (*pb.RPCExists, error) {
+	return &pb.RPCExists{Exists: b}, nil
+}
+
 // PermissionError 返回权限错误
 func (this *BaseService) PermissionError() error {
 	return errors.New("Permission Denied")
--- a/internal/rpc/services/service_metric_item.go
+++ b/internal/rpc/services/service_metric_item.go
@@ -4,7 +4,7 @@ package services

 import (
 	"context"
-	"github.com/TeaOSLab/EdgeAPI/internal/db/models/metrics"
+	"github.com/TeaOSLab/EdgeAPI/internal/db/models"
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 	"github.com/iwind/TeaGo/types"
 )
@@ -22,7 +22,7 @@ func (this *MetricItemService) CreateMetricItem(ctx context.Context, req *pb.Cre
 	}

 	var tx = this.NullTx()
-	itemId, err := metrics.SharedMetricItemDAO.CreateItem(tx, req.Code, req.Category, req.Name, req.Keys, req.Period, req.PeriodUnit, req.Value)
+	itemId, err := models.SharedMetricItemDAO.CreateItem(tx, req.Code, req.Category, req.Name, req.Keys, req.Period, req.PeriodUnit, req.Value)
 	if err != nil {
 		return nil, err
 	}
@@ -37,7 +37,7 @@ func (this *MetricItemService) UpdateMetricItem(ctx context.Context, req *pb.Upd
 	}

 	var tx = this.NullTx()
-	err = metrics.SharedMetricItemDAO.UpdateItem(tx, req.MetricItemId, req.Name, req.Keys, req.Period, req.PeriodUnit, req.Value, req.IsOn)
+	err = models.SharedMetricItemDAO.UpdateItem(tx, req.MetricItemId, req.Name, req.Keys, req.Period, req.PeriodUnit, req.Value, req.IsOn)
 	if err != nil {
 		return nil, err
 	}
@@ -52,7 +52,7 @@ func (this *MetricItemService) FindEnabledMetricItem(ctx context.Context, req *p
 	}

 	var tx = this.NullTx()
-	item, err := metrics.SharedMetricItemDAO.FindEnabledMetricItem(tx, req.MetricItemId)
+	item, err := models.SharedMetricItemDAO.FindEnabledMetricItem(tx, req.MetricItemId)
 	if err != nil {
 		return nil, err
 	}
@@ -80,7 +80,7 @@ func (this *MetricItemService) CountAllEnabledMetricItems(ctx context.Context, r
 	}

 	var tx = this.NullTx()
-	count, err := metrics.SharedMetricItemDAO.CountEnabledItems(tx, req.Category)
+	count, err := models.SharedMetricItemDAO.CountEnabledItems(tx, req.Category)
 	if err != nil {
 		return nil, err
 	}
@@ -95,7 +95,7 @@ func (this *MetricItemService) ListEnabledMetricItems(ctx context.Context, req *
 	}

 	var tx = this.NullTx()
-	items, err := metrics.SharedMetricItemDAO.ListEnabledItems(tx, req.Category, req.Offset, req.Size)
+	items, err := models.SharedMetricItemDAO.ListEnabledItems(tx, req.Category, req.Offset, req.Size)
 	if err != nil {
 		return nil, err
 	}
@@ -124,7 +124,7 @@ func (this *MetricItemService) DeleteMetricItem(ctx context.Context, req *pb.Del
 	}

 	var tx = this.NullTx()
-	err = metrics.SharedMetricItemDAO.DisableMetricItem(tx, req.MetricItemId)
+	err = models.SharedMetricItemDAO.DisableMetricItem(tx, req.MetricItemId)
 	if err != nil {
 		return nil, err
 	}
--- a/internal/rpc/services/service_metric_stat.go
+++ b/internal/rpc/services/service_metric_stat.go
@@ -0,0 +1,108 @@
+// 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"
+)
+
+// MetricStatService 指标统计数据相关服务
+type MetricStatService struct {
+	BaseService
+}
+
+// UploadMetricStats 上传统计数据
+func (this *MetricStatService) UploadMetricStats(ctx context.Context, req *pb.UploadMetricStatsRequest) (*pb.RPCSuccess, error) {
+	nodeId, err := this.ValidateNode(ctx)
+	if err != nil {
+		return nil, err
+	}
+
+	var tx = this.NullTx()
+	clusterId, err := models.SharedNodeDAO.FindNodeClusterId(tx, nodeId)
+	if err != nil {
+		return nil, err
+	}
+
+	for _, stat := range req.MetricStats {
+		err := models.SharedMetricStatDAO.CreateStat(tx, stat.Hash, clusterId, nodeId, stat.ServerId, stat.ItemId, stat.Keys, float64(stat.Value), stat.Time, int(stat.Version))
+		if err != nil {
+			return nil, err
+		}
+	}
+
+	return this.Success()
+}
+
+// CountMetricStats 计算指标数据数量
+func (this *MetricStatService) CountMetricStats(ctx context.Context, req *pb.CountMetricStatsRequest) (*pb.RPCCountResponse, error) {
+	_, err := this.ValidateAdmin(ctx, 0)
+	if err != nil {
+		return nil, err
+	}
+	var tx = this.NullTx()
+	version, err := models.SharedMetricItemDAO.FindItemVersion(tx, req.MetricItemId)
+	if err != nil {
+		return nil, err
+	}
+	count, err := models.SharedMetricStatDAO.CountItemStats(tx, req.MetricItemId, version)
+	if err != nil {
+		return nil, err
+	}
+	return this.SuccessCount(count)
+}
+
+// ListMetricStats 读取单页指标数据
+func (this *MetricStatService) ListMetricStats(ctx context.Context, req *pb.ListMetricStatsRequest) (*pb.ListMetricStatsResponse, error) {
+	_, err := this.ValidateAdmin(ctx, 0)
+	if err != nil {
+		return nil, err
+	}
+	var tx = this.NullTx()
+	version, err := models.SharedMetricItemDAO.FindItemVersion(tx, req.MetricItemId)
+	if err != nil {
+		return nil, err
+	}
+	stats, err := models.SharedMetricStatDAO.ListItemStats(tx, req.MetricItemId, version, req.Offset, req.Size)
+	if err != nil {
+		return nil, err
+	}
+	var pbStats []*pb.MetricStat
+	for _, stat := range stats {
+		// cluster
+		clusterName, err := models.SharedNodeClusterDAO.FindNodeClusterName(tx, int64(stat.ClusterId))
+		if err != nil {
+			return nil, err
+		}
+
+		// node
+		nodeName, err := models.SharedNodeDAO.FindNodeName(tx, int64(stat.NodeId))
+		if err != nil {
+			return nil, err
+		}
+
+		// server
+		serverName, err := models.SharedServerDAO.FindEnabledServerName(tx, int64(stat.ServerId))
+		if err != nil {
+			return nil, err
+		}
+
+		pbStats = append(pbStats, &pb.MetricStat{
+			Id:          int64(stat.Id),
+			Hash:        stat.Hash,
+			ServerId:    int64(stat.ServerId),
+			ItemId:      int64(stat.ItemId),
+			Keys:        stat.DecodeKeys(),
+			Value:       float32(stat.Value),
+			Time:        stat.Time,
+			Version:     types.Int32(stat.Version),
+			NodeCluster: &pb.NodeCluster{Id: int64(stat.ClusterId), Name: clusterName},
+			Node:        &pb.Node{Id: int64(stat.NodeId), Name: nodeName},
+			Server:      &pb.Server{Id: int64(stat.ServerId), Name: serverName},
+		})
+	}
+	return &pb.ListMetricStatsResponse{MetricStats: pbStats}, nil
+}
--- a/internal/rpc/services/service_node_cluster_metric_item.go
+++ b/internal/rpc/services/service_node_cluster_metric_item.go
@@ -5,7 +5,6 @@ package services
 import (
 	"context"
 	"github.com/TeaOSLab/EdgeAPI/internal/db/models"
-	"github.com/TeaOSLab/EdgeAPI/internal/db/models/metrics"
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 	"github.com/iwind/TeaGo/types"
 )
@@ -59,13 +58,13 @@ func (this *NodeClusterMetricItemService) FindAllNodeClusterMetricItems(ctx cont
 	}

 	var tx = this.NullTx()
-	clusterItems, err := models.SharedNodeClusterMetricItemDAO.FindAllClusterItems(tx, req.NodeClusterId,  req.Category)
+	clusterItems, err := models.SharedNodeClusterMetricItemDAO.FindAllClusterItems(tx, req.NodeClusterId, req.Category)
 	if err != nil {
 		return nil, err
 	}
 	var pbItems = []*pb.MetricItem{}
 	for _, clusterItem := range clusterItems {
-		item, err := metrics.SharedMetricItemDAO.FindEnabledMetricItem(tx, int64(clusterItem.ItemId))
+		item, err := models.SharedMetricItemDAO.FindEnabledMetricItem(tx, int64(clusterItem.ItemId))
 		if err != nil {
 			return nil, err
 		}