Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: update log format #7519

Merged
merged 1 commit into from
Jul 29, 2024
Merged

feat: update log format #7519

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
44 changes: 22 additions & 22 deletions server/controller/cloud/aliyun/aliyun.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,16 +24,16 @@ import (

"github.com/aliyun/alibaba-cloud-sdk-go/sdk"
simplejson "github.com/bitly/go-simplejson"
logging "github.com/op/go-logging"

cloudcommon "github.com/deepflowio/deepflow/server/controller/cloud/common"
cloudconfig "github.com/deepflowio/deepflow/server/controller/cloud/config"
"github.com/deepflowio/deepflow/server/controller/cloud/model"
"github.com/deepflowio/deepflow/server/controller/common"
"github.com/deepflowio/deepflow/server/controller/db/mysql"
"github.com/deepflowio/deepflow/server/controller/logger"
)

var log = logging.MustGetLogger("cloud.aliyun")
var log = logger.MustGetLogger("cloud.aliyun")

type Aliyun struct {
orgID int
Expand All @@ -59,24 +59,24 @@ type Aliyun struct {
func NewAliyun(orgID int, domain mysql.Domain, cfg cloudconfig.CloudConfig) (*Aliyun, error) {
config, err := simplejson.NewJson([]byte(domain.Config))
if err != nil {
log.Error(err)
log.Error(err, logger.NewORGPrefix(orgID))
return nil, err
}

secretID, err := config.Get("secret_id").String()
if err != nil {
log.Error("secret_id must be specified")
log.Error("secret_id must be specified", logger.NewORGPrefix(orgID))
return nil, err
}

secretKey, err := config.Get("secret_key").String()
if err != nil {
log.Error("secret_key must be specified")
log.Error("secret_key must be specified", logger.NewORGPrefix(orgID))
return nil, err
}
decryptSecretKey, err := common.DecryptSecretKey(secretKey)
if err != nil {
log.Error("decrypt secret_key failed (%s)", err.Error())
log.Error("decrypt secret_key failed (%s)", err.Error(), logger.NewORGPrefix(orgID))
return nil, err
}

Expand Down Expand Up @@ -137,7 +137,7 @@ func (a *Aliyun) getRegionLcuuid(lcuuid string) string {
func (a *Aliyun) checkRequiredAttributes(json *simplejson.Json, attributes []string) error {
for _, attribute := range attributes {
if _, ok := json.CheckGet(attribute); !ok {
log.Infof("get attribute (%s) failed", attribute)
log.Infof("get attribute (%s) failed", attribute, logger.NewORGPrefix(a.orgID))
return errors.New(fmt.Sprintf("get attribute (%s) failed", attribute))
}
}
Expand Down Expand Up @@ -168,33 +168,33 @@ func (a *Aliyun) GetCloudData() (model.Resource, error) {

regions, err := a.getRegions()
if err != nil {
log.Error("get region data failed")
log.Error("get region data failed", logger.NewORGPrefix(a.orgID))
return resource, err
}
for _, region := range regions {
log.Infof("get region (%s) data starting", region.Name)
log.Infof("get region (%s) data starting", region.Name, logger.NewORGPrefix(a.orgID))
a.vpcIDToLcuuids = map[string]string{}

// 可用区
tmpAZs, err := a.getAZs(region)
if err != nil {
log.Errorf("get region (%s) az data failed", region.Name)
log.Errorf("get region (%s) az data failed", region.Name, logger.NewORGPrefix(a.orgID))
return resource, err
}
azs = append(azs, tmpAZs...)

// VPC
tmpVPCs, err := a.getVPCs(region)
if err != nil {
log.Errorf("get region (%s) vpc data failed", region.Name)
log.Errorf("get region (%s) vpc data failed", region.Name, logger.NewORGPrefix(a.orgID))
return resource, err
}
vpcs = append(vpcs, tmpVPCs...)

// 子网及网段
tmpNetworks, tmpSubnets, err := a.getNetworks(region)
if err != nil {
log.Errorf("get region (%s) vpc data failed", region.Name)
log.Errorf("get region (%s) vpc data failed", region.Name, logger.NewORGPrefix(a.orgID))
return resource, err
}
networks = append(networks, tmpNetworks...)
Expand All @@ -203,7 +203,7 @@ func (a *Aliyun) GetCloudData() (model.Resource, error) {
// VM及相关资源
tmpVMs, tmpVInterfaces, tmpIPs, tmpFloatingIPs, vmLcuuidToVPCLcuuid, err := a.getVMs(region)
if err != nil {
log.Errorf("get region (%s) vm data failed", region.Name)
log.Errorf("get region (%s) vm data failed", region.Name, logger.NewORGPrefix(a.orgID))
return resource, err
}
vms = append(vms, tmpVMs...)
Expand All @@ -214,7 +214,7 @@ func (a *Aliyun) GetCloudData() (model.Resource, error) {
// VM接口信息
tmpVInterfaces, tmpIPs, tmpFloatingIPs, tmpNATRules, err := a.getVMPorts(region)
if err != nil {
log.Errorf("get region (%s) port data failed", region.Name)
log.Errorf("get region (%s) port data failed", region.Name, logger.NewORGPrefix(a.orgID))
return resource, err
}
vinterfaces = append(vinterfaces, tmpVInterfaces...)
Expand All @@ -225,7 +225,7 @@ func (a *Aliyun) GetCloudData() (model.Resource, error) {
// 路由表及规则
tmpVRouters, tmpRoutingTables, err := a.getRouterAndTables(region)
if err != nil {
log.Errorf("get region (%s) router data failed", region.Name)
log.Errorf("get region (%s) router data failed", region.Name, logger.NewORGPrefix(a.orgID))
return resource, err
}
vrouters = append(vrouters, tmpVRouters...)
Expand All @@ -234,7 +234,7 @@ func (a *Aliyun) GetCloudData() (model.Resource, error) {
// NAT网关及规则
tmpNATGateways, tmpNATRules, tmpVInterfaces, tmpIPs, err := a.getNatGateways(region)
if err != nil {
log.Errorf("get region (%s) nat_gateway data failed", region.Name)
log.Errorf("get region (%s) nat_gateway data failed", region.Name, logger.NewORGPrefix(a.orgID))
return resource, err
}
natGateways = append(natGateways, tmpNATGateways...)
Expand All @@ -245,7 +245,7 @@ func (a *Aliyun) GetCloudData() (model.Resource, error) {
// 负载均衡器及规则
tmpLBs, tmpLBListeners, tmpLBTargetServers, tmpVInterfaces, tmpIPs, err := a.getLoadBalances(region, vmLcuuidToVPCLcuuid)
if err != nil {
log.Errorf("get region (%s) load_balance data failed", region.Label)
log.Errorf("get region (%s) load_balance data failed", region.Label, logger.NewORGPrefix(a.orgID))
return resource, err
}
lbs = append(lbs, tmpLBs...)
Expand All @@ -257,14 +257,14 @@ func (a *Aliyun) GetCloudData() (model.Resource, error) {
// 云企业网
cens, err = a.getCens(region)
if err != nil {
log.Errorf("get region (%s) cen data failed", region.Label)
log.Errorf("get region (%s) cen data failed", region.Label, logger.NewORGPrefix(a.orgID))
return resource, err
}

// Redis
tmpRedisInstances, tmpVInterfaces, tmpIPs, err := a.getRedisInstances(region)
if err != nil {
log.Errorf("get region (%s) redis data failed", region.Name)
log.Errorf("get region (%s) redis data failed", region.Name, logger.NewORGPrefix(a.orgID))
return resource, err
}
redisInstances = append(redisInstances, tmpRedisInstances...)
Expand All @@ -274,7 +274,7 @@ func (a *Aliyun) GetCloudData() (model.Resource, error) {
// RDS
tmpRDSInstances, tmpVInterfaces, tmpIPs, err := a.getRDSInstances(region)
if err != nil {
log.Errorf("get region (%s) rds data failed", region.Name)
log.Errorf("get region (%s) rds data failed", region.Name, logger.NewORGPrefix(a.orgID))
return resource, err
}
rdsInstances = append(rdsInstances, tmpRDSInstances...)
Expand All @@ -284,12 +284,12 @@ func (a *Aliyun) GetCloudData() (model.Resource, error) {
// 附属容器集群
sDomains, err := a.getSubDomains(region)
if err != nil {
log.Error("get sub_domain data failed")
log.Error("get sub_domain data failed", logger.NewORGPrefix(a.orgID))
return resource, err
}
subDomains = append(subDomains, sDomains...)

log.Infof("get region (%s) data completed", region.Name)
log.Infof("get region (%s) data completed", region.Name, logger.NewORGPrefix(a.orgID))
}

resource.Regions = cloudcommon.EliminateEmptyRegions(regions, a.regionLcuuidToResourceNum)
Expand Down
7 changes: 4 additions & 3 deletions server/controller/cloud/aliyun/az.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,16 +20,17 @@ import (
vpc "github.com/aliyun/alibaba-cloud-sdk-go/services/vpc"
"github.com/deepflowio/deepflow/server/controller/cloud/model"
"github.com/deepflowio/deepflow/server/controller/common"
"github.com/deepflowio/deepflow/server/controller/logger"
)

func (a *Aliyun) getAZs(region model.Region) ([]model.AZ, error) {
var retAZs []model.AZ

log.Debug("get azs starting")
log.Debug("get azs starting", logger.NewORGPrefix(a.orgID))
request := vpc.CreateDescribeZonesRequest()
response, err := a.getAZResponse(region.Label, request)
if err != nil {
log.Error(err)
log.Error(err, logger.NewORGPrefix(a.orgID))
return retAZs, err
}

Expand All @@ -48,6 +49,6 @@ func (a *Aliyun) getAZs(region model.Region) ([]model.AZ, error) {
retAZs = append(retAZs, retAZ)
}
}
log.Debug("get azs complete")
log.Debug("get azs complete", logger.NewORGPrefix(a.orgID))
return retAZs, nil
}
9 changes: 5 additions & 4 deletions server/controller/cloud/aliyun/cen.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,16 +20,17 @@ import (
cbn "github.com/aliyun/alibaba-cloud-sdk-go/services/cbn"
"github.com/deepflowio/deepflow/server/controller/cloud/model"
"github.com/deepflowio/deepflow/server/controller/common"
"github.com/deepflowio/deepflow/server/controller/logger"
)

func (a *Aliyun) getCens(region model.Region) ([]model.CEN, error) {
var retCens []model.CEN

log.Debug("get cens starting")
log.Debug("get cens starting", logger.NewORGPrefix(a.orgID))
request := cbn.CreateDescribeCensRequest()
response, err := a.getCenResponse(region.Label, request)
if err != nil {
log.Error(err)
log.Error(err, logger.NewORGPrefix(a.orgID))
return nil, err
}

Expand All @@ -51,7 +52,7 @@ func (a *Aliyun) getCens(region model.Region) ([]model.CEN, error) {
childRequest.CenId = cenId
childResponse, err := a.getCenAttributeResponse(region.Label, childRequest)
if err != nil {
log.Error(err)
log.Error(err, logger.NewORGPrefix(a.orgID))
return nil, err
}

Expand Down Expand Up @@ -81,6 +82,6 @@ func (a *Aliyun) getCens(region model.Region) ([]model.CEN, error) {
}
}

log.Debug("get cens complete")
log.Debug("get cens complete", logger.NewORGPrefix(a.orgID))
return retCens, nil
}
21 changes: 11 additions & 10 deletions server/controller/cloud/aliyun/lb.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import (
slb "github.com/aliyun/alibaba-cloud-sdk-go/services/slb"
"github.com/deepflowio/deepflow/server/controller/cloud/model"
"github.com/deepflowio/deepflow/server/controller/common"
"github.com/deepflowio/deepflow/server/controller/logger"
)

func (a *Aliyun) getLoadBalances(region model.Region, vmLcuuidToVPCLcuuid map[string]string) (
Expand All @@ -38,11 +39,11 @@ func (a *Aliyun) getLoadBalances(region model.Region, vmLcuuidToVPCLcuuid map[st
return retLBs, retLBListeners, retLBTargetServers, retVInterfaces, retIPs, nil
}

log.Debug("get lbs starting")
log.Debug("get lbs starting", logger.NewORGPrefix(a.orgID))
request := slb.CreateDescribeLoadBalancersRequest()
response, err := a.getLBResponse(region.Label, request)
if err != nil {
log.Error(err)
log.Error(err, logger.NewORGPrefix(a.orgID))
return retLBs, retLBListeners, retLBTargetServers, retVInterfaces, retIPs, err
}

Expand All @@ -56,7 +57,7 @@ func (a *Aliyun) getLoadBalances(region model.Region, vmLcuuidToVPCLcuuid map[st
[]string{"LoadBalancerId", "LoadBalancerName", "Address", "AddressType"},
)
if err != nil {
log.Info(err)
log.Info(err, logger.NewORGPrefix(a.orgID))
continue
}

Expand Down Expand Up @@ -85,7 +86,7 @@ func (a *Aliyun) getLoadBalances(region model.Region, vmLcuuidToVPCLcuuid map[st
// lb API本身没有返回vpc信息且后端主机无法补充时，跳过该lb
if vpcLcuuid == "" {
if tmpVPCLcuuid == "" {
log.Infof("get lb (%s) vpc info failed", lbId)
log.Infof("get lb (%s) vpc info failed", lbId, logger.NewORGPrefix(a.orgID))
continue
}
vpcLcuuid = tmpVPCLcuuid
Expand Down Expand Up @@ -141,7 +142,7 @@ func (a *Aliyun) getLoadBalances(region model.Region, vmLcuuidToVPCLcuuid map[st
retIPs = append(retIPs, retIP)
}
}
log.Debug("get lbs complete")
log.Debug("get lbs complete", logger.NewORGPrefix(a.orgID))
return retLBs, retLBListeners, retLBTargetServers, retVInterfaces, retIPs, nil
}

Expand All @@ -152,7 +153,7 @@ func (a *Aliyun) getLBListeners(region model.Region, lbId, lbIP string) ([]model
request.LoadBalancerId = lbId
response, err := a.getLBListenerResponse(region.Label, request)
if err != nil {
log.Error(err)
log.Error(err, logger.NewORGPrefix(a.orgID))
return []model.LBListener{}, err
}

Expand All @@ -164,12 +165,12 @@ func (a *Aliyun) getLBListeners(region model.Region, lbId, lbIP string) ([]model

protocol := attr.Get("ListenerProtocal").MustString()
if protocol == "" {
log.Debug("no ListenerProtocal in %v", attr)
log.Debug("no ListenerProtocal in %v", attr, logger.NewORGPrefix(a.orgID))
continue
}
listenerPort := attr.Get("ListenerPort").MustInt()
if listenerPort == 0 {
log.Debug("no ListenerPort in %v", attr)
log.Debug("no ListenerPort in %v", attr, logger.NewORGPrefix(a.orgID))
continue
}
key := protocol + ":" + strconv.Itoa(listenerPort)
Expand Down Expand Up @@ -198,7 +199,7 @@ func (a *Aliyun) getLBTargetServers(region model.Region, lbId string, vmLcuuidTo
request.LoadBalancerId = lbId
response, err := a.getLBTargetServerResponse(region.Label, request)
if err != nil {
log.Error(err)
log.Error(err, logger.NewORGPrefix(a.orgID))
return []model.LBTargetServer{}, "", err
}

Expand All @@ -213,7 +214,7 @@ func (a *Aliyun) getLBTargetServers(region model.Region, lbId string, vmLcuuidTo
[]string{"ServerId", "Port", "Protocol", "ListenerPort", "ServerIp"},
)
if err != nil {
log.Info(err)
log.Info(err, logger.NewORGPrefix(a.orgID))
continue
}

Expand Down
13 changes: 7 additions & 6 deletions server/controller/cloud/aliyun/nat_gateway.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import (

"github.com/deepflowio/deepflow/server/controller/cloud/model"
"github.com/deepflowio/deepflow/server/controller/common"
"github.com/deepflowio/deepflow/server/controller/logger"

vpc "github.com/aliyun/alibaba-cloud-sdk-go/services/vpc"
)
Expand All @@ -34,11 +35,11 @@ func (a *Aliyun) getNatGateways(region model.Region) (
var retVInterfaces []model.VInterface
var retIPs []model.IP

log.Debug("get nat_gateways starting")
log.Debug("get nat_gateways starting", logger.NewORGPrefix(a.orgID))
request := vpc.CreateDescribeNatGatewaysRequest()
response, err := a.getNatGatewayResponse(region.Label, request)
if err != nil {
log.Error(err)
log.Error(err, logger.NewORGPrefix(a.orgID))
return retNATGateways, retNATRules, retVInterfaces, retIPs, err
}

Expand All @@ -48,7 +49,7 @@ func (a *Aliyun) getNatGateways(region model.Region) (

err := a.checkRequiredAttributes(natGateway, []string{"NatGatewayId", "Name", "VpcId"})
if err != nil {
log.Info(err)
log.Info(err, logger.NewORGPrefix(a.orgID))
continue
}

Expand Down Expand Up @@ -124,7 +125,7 @@ func (a *Aliyun) getNatGateways(region model.Region) (
retNATRules = append(retNATRules, tmpRules...)
}
}
log.Debug("get nat_gateways complete")
log.Debug("get nat_gateways complete", logger.NewORGPrefix(a.orgID))
return retNATGateways, retNATRules, retVInterfaces, retIPs, nil
}

Expand All @@ -136,7 +137,7 @@ func (a *Aliyun) getSNATRules(region model.Region, natGatewayId string, snatTabl
request.SnatTableId = snatTableId
response, err := a.getSNatRuleResponse(region.Label, request)
if err != nil {
log.Error(err)
log.Error(err, logger.NewORGPrefix(a.orgID))
return []model.NATRule{}, err
}
for _, s := range response {
Expand Down Expand Up @@ -172,7 +173,7 @@ func (a *Aliyun) getDNATRules(region model.Region, natGatewayId string, dnatTabl
request.ForwardTableId = dnatTableId
response, err := a.getDNatRuleResponse(region.Label, request)
if err != nil {
log.Error(err)
log.Error(err, logger.NewORGPrefix(a.orgID))
return []model.NATRule{}, err
}
for _, f := range response {
Expand Down