opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-10-29 17:58:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(cloudmon): add apsara eip metric

Browse Source
This commit is contained in:
ioito
2023-03-23 14:22:33 +08:00
parent c86e0b5e37
commit 4cec034fc1
11 changed files with 497 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/cloudmon/providerdriver/apsara.go
+77
View File
@@ -15,7 +15,17 @@
package providerdriver
import (
"context"
"strconv"
"sync"
"time"
"yunion.io/x/cloudmux/pkg/cloudprovider"
"yunion.io/x/log"
"yunion.io/x/pkg/errors"
api "yunion.io/x/onecloud/pkg/apis/compute"
"yunion.io/x/onecloud/pkg/util/influxdb"
)
type ApsaraCollect struct {
@@ -33,3 +43,70 @@ func (self *ApsaraCollect) IsSupportMetrics() bool {
func init() {
Register(&ApsaraCollect{})
}
func (self *ApsaraCollect) CollectEipMetrics(ctx context.Context, manager api.CloudproviderDetails, provider cloudprovider.ICloudProvider, res map[string]api.ElasticipDetails, start, end time.Time) error {
metrics := []influxdb.SMetricData{}
var wg sync.WaitGroup
var mu sync.Mutex
for _, _metricType := range cloudprovider.ALL_EIP_TYPES {
wg.Add(1)
go func(metricType cloudprovider.TMetricType) {
defer func() {
wg.Done()
}()
opts := &cloudprovider.MetricListOptions{
ResourceType: cloudprovider.METRIC_RESOURCE_TYPE_EIP,
MetricType: metricType,
StartTime: start,
EndTime: end,
}
data, err := provider.GetMetrics(opts)
if err != nil {
if errors.Cause(err) != cloudprovider.ErrNotImplemented && errors.Cause(err) != cloudprovider.ErrNotSupported {
log.Errorf("get eip %s(%s) %s error: %v", manager.Name, manager.Id, metricType, err)
return
}
return
}
for _, value := range data {
eip, ok := res[value.Id]
if !ok {
continue
}
tags := []influxdb.SKeyValue{}
for k, v := range eip.GetMetricTags() {
tags = append(tags, influxdb.SKeyValue{
Key: k,
Value: v,
})
}
for _, v := range value.Values {
metric := influxdb.SMetricData{
Name: value.MetricType.Name(),
Timestamp: v.Timestamp,
Tags: []influxdb.SKeyValue{},
Metrics: []influxdb.SKeyValue{
{
Key: value.MetricType.Key(),
Value: strconv.FormatFloat(v.Value, 'E', -1, 64),
},
},
}
for k, v := range v.Tags {
metric.Tags = append(metric.Tags, influxdb.SKeyValue{
Key: k,
Value: v,
})
}
metric.Tags = append(metric.Tags, tags...)
mu.Lock()
metrics = append(metrics, metric)
mu.Unlock()
}
}
}(_metricType)
}
wg.Wait()
return self.sendMetrics(ctx, manager, "elasticip", len(res), metrics)
}
pkg/cloudmon/providerdriver/base.go
+4
View File
@@ -62,6 +62,10 @@ func (self *SBaseCollectDriver) CollectWireMetrics(ctx context.Context, manager
return cloudprovider.ErrNotImplemented
}
func (self *SBaseCollectDriver) CollectEipMetrics(ctx context.Context, manager api.CloudproviderDetails, provider cloudprovider.ICloudProvider, res map[string]api.ElasticipDetails, start, end time.Time) error {
return cloudprovider.ErrNotImplemented
}
func (self *SBaseCollectDriver) CollectStorageMetrics(ctx context.Context, manager api.CloudproviderDetails, provider cloudprovider.ICloudProvider, res map[string]api.StorageDetails, start, end time.Time) error {
metrics := []influxdb.SMetricData{}
for _, storage := range res {
pkg/cloudmon/providerdriver/driver.go
+1
View File
@@ -42,6 +42,7 @@ type ICollectDriver interface {
CollectK8sMetrics(ctx context.Context, manager api.CloudproviderDetails, provider cloudprovider.ICloudProvider, res map[string]api.KubeClusterDetails, start, end time.Time) error
CollectModelartsPoolMetrics(ctx context.Context, manager api.CloudproviderDetails, provider cloudprovider.ICloudProvider, res map[string]api.ModelartsPoolDetails, start, end time.Time) error
CollectWireMetrics(ctx context.Context, manager api.CloudproviderDetails, provider cloudprovider.ICloudProvider, res map[string]api.WireDetails, start, end time.Time) error
CollectEipMetrics(ctx context.Context, manager api.CloudproviderDetails, provider cloudprovider.ICloudProvider, res map[string]api.ElasticipDetails, start, end time.Time) error
}
func GetDriver(name string) (ICollectDriver, error) {
pkg/cloudmon/resources/resources.go
+26
View File
@@ -386,6 +386,7 @@ type SResources struct {
ModelartsPool TResource
Wires TResource
Projects TResource
ElasticIps TResource
}
func (self *SResources) IsInit() bool {
@@ -407,6 +408,7 @@ func NewResources() *SResources {
ModelartsPool: NewBaseResources(&compute.ModelartsPools),
Wires: NewBaseResources(&compute.Wires),
Projects: NewBaseResources(&identity.Projects),
ElasticIps: NewBaseResources(&compute.Elasticips),
}
}
@@ -462,6 +464,10 @@ func (self *SResources) Init(ctx context.Context, userCred mcclient.TokenCredent
if err != nil {
errs = append(errs, errors.Wrapf(err, "ModelartsPool.init"))
}
err = self.ElasticIps.init(ctx)
if err != nil {
errs = append(errs, errors.Wrapf(err, "ElasticIps.init"))
}
err = self.Wires.init(ctx)
if err != nil {
errs = append(errs, errors.Wrapf(err, "Wires.init"))
@@ -529,6 +535,10 @@ func (self *SResources) IncrementSync(ctx context.Context, userCred mcclient.Tok
if err != nil {
errs = append(errs, errors.Wrapf(err, "ModelartsPool.increment"))
}
err = self.ElasticIps.increment(ctx)
if err != nil {
errs = append(errs, errors.Wrapf(err, "Elasticips.increment"))
}
err = self.Wires.increment(ctx)
if err != nil {
errs = append(errs, errors.Wrapf(err, "Wires.increment"))
@@ -594,6 +604,10 @@ func (self *SResources) DecrementSync(ctx context.Context, userCred mcclient.Tok
if err != nil {
errs = append(errs, errors.Wrapf(err, "ModelartsPool.decrement"))
}
err = self.ElasticIps.decrement(ctx)
if err != nil {
errs = append(errs, errors.Wrapf(err, "ElasticIps.decrement"))
}
err = self.Projects.decrement(ctx)
if err != nil {
errs = append(errs, errors.Wrapf(err, "Projects.decrement"))
@@ -827,6 +841,18 @@ func (self *SResources) CollectMetrics(ctx context.Context, userCred mcclient.To
log.Errorf("CollectWireMetrics for %s(%s) error: %v", manager.Name, manager.Provider, err)
}
resources = self.ElasticIps.getResources(ctx, manager.Id)
eips := map[string]api.ElasticipDetails{}
err = jsonutils.Update(&eips, resources)
if err != nil {
log.Errorf("unmarsha eips resources error: %v", err)
}
err = driver.CollectEipMetrics(ctx, manager, provider, eips, startTime, endTime)
if err != nil && errors.Cause(err) != cloudprovider.ErrNotImplemented && errors.Cause(err) != cloudprovider.ErrNotSupported {
log.Errorf("CollectEipMetrics for %s(%s) error: %v", manager.Name, manager.Provider, err)
}
}(cloudproviders[i])
}
wg.Wait()