阶段性提交

This commit is contained in:
GoEdgeLab
2021-06-27 21:59:37 +08:00
parent 572fc6a20b
commit 8ba4c9e774
26 changed files with 794 additions and 14 deletions

View File

@@ -0,0 +1,132 @@
// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
package services
import (
"context"
"github.com/TeaOSLab/EdgeAPI/internal/db/models/metrics"
"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
"github.com/iwind/TeaGo/types"
)
// MetricItemService 指标相关服务
type MetricItemService struct {
BaseService
}
// CreateMetricItem 创建指标
func (this *MetricItemService) CreateMetricItem(ctx context.Context, req *pb.CreateMetricItemRequest) (*pb.CreateMetricItemResponse, error) {
_, err := this.ValidateAdmin(ctx, 0)
if err != nil {
return nil, err
}
var tx = this.NullTx()
itemId, err := metrics.SharedMetricItemDAO.CreateItem(tx, req.Code, req.Category, req.Name, req.Keys, req.Period, req.PeriodUnit, req.Value)
if err != nil {
return nil, err
}
return &pb.CreateMetricItemResponse{MetricItemId: itemId}, nil
}
// UpdateMetricItem 修改指标
func (this *MetricItemService) UpdateMetricItem(ctx context.Context, req *pb.UpdateMetricItemRequest) (*pb.RPCSuccess, error) {
_, err := this.ValidateAdmin(ctx, 0)
if err != nil {
return nil, err
}
var tx = this.NullTx()
err = metrics.SharedMetricItemDAO.UpdateItem(tx, req.MetricItemId, req.Name, req.Keys, req.Period, req.PeriodUnit, req.Value, req.IsOn)
if err != nil {
return nil, err
}
return this.Success()
}
// FindEnabledMetricItem 查找单个指标信息
func (this *MetricItemService) FindEnabledMetricItem(ctx context.Context, req *pb.FindEnabledMetricItemRequest) (*pb.FindEnabledMetricItemResponse, error) {
_, err := this.ValidateAdmin(ctx, 0)
if err != nil {
return nil, err
}
var tx = this.NullTx()
item, err := metrics.SharedMetricItemDAO.FindEnabledMetricItem(tx, req.MetricItemId)
if err != nil {
return nil, err
}
if item == nil {
return &pb.FindEnabledMetricItemResponse{MetricItem: nil}, nil
}
return &pb.FindEnabledMetricItemResponse{MetricItem: &pb.MetricItem{
Id: int64(item.Id),
IsOn: item.IsOn == 1,
Code: item.Code,
Category: item.Category,
Name: item.Name,
Keys: item.DecodeKeys(),
Period: types.Int32(item.Period),
PeriodUnit: item.PeriodUnit,
Value: item.Value,
}}, nil
}
// CountAllEnabledMetricItems 计算指标数量
func (this *MetricItemService) CountAllEnabledMetricItems(ctx context.Context, req *pb.CountAllEnabledMetricItemsRequest) (*pb.RPCCountResponse, error) {
_, err := this.ValidateAdmin(ctx, 0)
if err != nil {
return nil, err
}
var tx = this.NullTx()
count, err := metrics.SharedMetricItemDAO.CountEnabledItems(tx, req.Category)
if err != nil {
return nil, err
}
return this.SuccessCount(count)
}
// ListEnabledMetricItems 列出单页指标
func (this *MetricItemService) ListEnabledMetricItems(ctx context.Context, req *pb.ListEnabledMetricItemsRequest) (*pb.ListEnabledMetricItemsResponse, error) {
_, err := this.ValidateAdmin(ctx, 0)
if err != nil {
return nil, err
}
var tx = this.NullTx()
items, err := metrics.SharedMetricItemDAO.ListEnabledItems(tx, req.Category, req.Offset, req.Size)
if err != nil {
return nil, err
}
var pbItems = []*pb.MetricItem{}
for _, item := range items {
pbItems = append(pbItems, &pb.MetricItem{
Id: int64(item.Id),
IsOn: item.IsOn == 1,
Code: item.Code,
Category: item.Category,
Name: item.Name,
Keys: item.DecodeKeys(),
Period: types.Int32(item.Period),
PeriodUnit: item.PeriodUnit,
Value: item.Value,
})
}
return &pb.ListEnabledMetricItemsResponse{MetricItems: pbItems}, nil
}
// DeleteMetricItem 删除指标
func (this *MetricItemService) DeleteMetricItem(ctx context.Context, req *pb.DeleteMetricItemRequest) (*pb.RPCSuccess, error) {
_, err := this.ValidateAdmin(ctx, 0)
if err != nil {
return nil, err
}
var tx = this.NullTx()
err = metrics.SharedMetricItemDAO.DisableMetricItem(tx, req.MetricItemId)
if err != nil {
return nil, err
}
return this.Success()
}

View File

@@ -9,7 +9,9 @@ import (
"github.com/TeaOSLab/EdgeAPI/internal/errors"
rpcutils "github.com/TeaOSLab/EdgeAPI/internal/rpc/utils"
"github.com/TeaOSLab/EdgeAPI/internal/tasks"
"github.com/TeaOSLab/EdgeCommon/pkg/nodeconfigs"
"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs"
"github.com/iwind/TeaGo/dbs"
"github.com/iwind/TeaGo/lists"
"github.com/iwind/TeaGo/maps"
@@ -887,3 +889,74 @@ func (this *NodeClusterService) FindLatestNodeClusters(ctx context.Context, req
}
return &pb.FindLatestNodeClustersResponse{NodeClusters: pbClusters}, nil
}
// FindEnabledNodeClusterConfigInfo 取得集群的配置概要信息
func (this *NodeClusterService) FindEnabledNodeClusterConfigInfo(ctx context.Context, req *pb.FindEnabledNodeClusterConfigInfoRequest) (*pb.FindEnabledNodeClusterConfigInfoResponse, error) {
_, err := this.ValidateAdmin(ctx, 0)
if err != nil {
return nil, err
}
var tx = this.NullTx()
cluster, err := models.SharedNodeClusterDAO.FindEnabledNodeCluster(tx, req.NodeClusterId)
if err != nil {
return nil, err
}
if cluster == nil {
return &pb.FindEnabledNodeClusterConfigInfoResponse{}, nil
}
var result = &pb.FindEnabledNodeClusterConfigInfoResponse{}
// health check
if len(cluster.HealthCheck) > 0 {
healthCheckConfig := &serverconfigs.HealthCheckConfig{}
err = json.Unmarshal([]byte(cluster.HealthCheck), healthCheckConfig)
if err != nil {
return nil, err
}
result.HealthCheckIsOn = healthCheckConfig.IsOn
}
// firewall actions
countFirewallActions, err := models.SharedNodeClusterFirewallActionDAO.CountAllEnabledFirewallActions(tx, req.NodeClusterId)
if err != nil {
return nil, err
}
result.HasFirewallActions = countFirewallActions > 0
// thresholds
countThresholds, err := models.SharedNodeThresholdDAO.CountAllEnabledThresholds(tx, "node", req.NodeClusterId, 0)
if err != nil {
return nil, err
}
result.HasThresholds = countThresholds > 0
// message receivers
countReceivers, err := models.SharedMessageReceiverDAO.CountAllEnabledReceivers(tx, models.MessageTaskTarget{
ClusterId: req.NodeClusterId,
}, "")
if err != nil {
return nil, err
}
result.HasMessageReceivers = countReceivers > 0
// toa
if len(cluster.Toa) > 0 {
var toaConfig = &nodeconfigs.TOAConfig{}
err = json.Unmarshal([]byte(cluster.Toa), toaConfig)
if err != nil {
return nil, err
}
result.IsTOAEnabled = toaConfig.IsOn
}
// metric items
countMetricItems, err := models.SharedNodeClusterMetricItemDAO.CountAllClusterItems(tx, req.NodeClusterId)
if err != nil {
return nil, err
}
result.HasMetricItems = countMetricItems > 0
return result, nil
}

View File

@@ -0,0 +1,81 @@
// Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
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"
)
// NodeClusterMetricItemService 集群指标
type NodeClusterMetricItemService struct {
BaseService
}
// EnableNodeClusterMetricItem 启用某个指标
func (this *NodeClusterMetricItemService) EnableNodeClusterMetricItem(ctx context.Context, req *pb.EnableNodeClusterMetricItemRequest) (*pb.RPCSuccess, error) {
_, err := this.ValidateAdmin(ctx, 0)
if err != nil {
return nil, err
}
var tx = this.NullTx()
err = models.SharedNodeClusterMetricItemDAO.EnableClusterItem(tx, req.NodeClusterId, req.MetricItemId)
if err != nil {
return nil, err
}
return this.Success()
}
// DisableNodeClusterMetricItem 禁用某个指标
func (this *NodeClusterMetricItemService) DisableNodeClusterMetricItem(ctx context.Context, req *pb.DisableNodeClusterMetricItemRequest) (*pb.RPCSuccess, error) {
_, err := this.ValidateAdmin(ctx, 0)
if err != nil {
return nil, err
}
var tx = this.NullTx()
err = models.SharedNodeClusterMetricItemDAO.DisableClusterItem(tx, req.NodeClusterId, req.MetricItemId)
if err != nil {
return nil, err
}
return this.Success()
}
// FindAllNodeClusterMetricItems 查找集群中所有指标
func (this *NodeClusterMetricItemService) FindAllNodeClusterMetricItems(ctx context.Context, req *pb.FindAllNodeClusterMetricItemsRequest) (*pb.FindAllNodeClusterMetricItemsResponse, error) {
_, err := this.ValidateAdmin(ctx, 0)
if err != nil {
return nil, err
}
var tx = this.NullTx()
clusterItems, err := models.SharedNodeClusterMetricItemDAO.FindAllClusterItems(tx, req.NodeClusterId)
if err != nil {
return nil, err
}
var pbItems = []*pb.MetricItem{}
for _, clusterItem := range clusterItems {
item, err := metrics.SharedMetricItemDAO.FindEnabledMetricItem(tx, int64(clusterItem.ItemId))
if err != nil {
return nil, err
}
if item != nil {
pbItems = append(pbItems, &pb.MetricItem{
Id: int64(item.Id),
IsOn: item.IsOn == 1,
Code: item.Code,
Category: item.Category,
Name: item.Name,
Keys: item.DecodeKeys(),
Period: types.Int32(item.Period),
PeriodUnit: item.PeriodUnit,
Value: item.Value,
})
}
}
return &pb.FindAllNodeClusterMetricItemsResponse{MetricItems: pbItems}, nil
}

View File

@@ -114,7 +114,7 @@ func (this *NodeThresholdService) CountAllEnabledNodeThresholds(ctx context.Cont
}
var tx = this.NullTx()
count, err := models.SharedNodeThresholdDAO.CountAllEnabledThresholds(tx, req.NodeClusterId, req.NodeId)
count, err := models.SharedNodeThresholdDAO.CountAllEnabledThresholds(tx, req.Role, req.NodeClusterId, req.NodeId)
if err != nil {
return nil, err
}