diff --git a/go.mod b/go.mod index 0c8ef71de0..5cfdb4c9aa 100644 --- a/go.mod +++ b/go.mod @@ -84,7 +84,7 @@ require ( k8s.io/client-go v0.19.3 k8s.io/cluster-bootstrap v0.19.3 moul.io/http2curl/v2 v2.3.0 - yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20221207133409-773feb6995bb + yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20221208070107-269b6ee5ad79 yunion.io/x/executor v0.0.0-20211018100936-39a2cd966656 yunion.io/x/jsonutils v1.0.1-0.20220819091305-3bab322ab4fd yunion.io/x/log v1.0.0 diff --git a/go.sum b/go.sum index ec0f433847..ad38f94201 100644 --- a/go.sum +++ b/go.sum @@ -1176,8 +1176,8 @@ sigs.k8s.io/structured-merge-diff/v4 v4.0.1/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o= sigs.k8s.io/yaml v1.2.0 h1:kr/MCeFWJWTwyaHoR9c8EjH9OumOmoF9YGiZd7lFm/Q= sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc= -yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20221207133409-773feb6995bb h1:cNbCa1nIgeOuDmFW1c5WOGIKkpnKHuu9otBW1olrB/g= -yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20221207133409-773feb6995bb/go.mod h1:drc/WDD65r6wI1tSejk19xcl9QwmzZlgJGXN7a9o2KQ= +yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20221208070107-269b6ee5ad79 h1:9GSawOA+wPD5wWaF0hbHJWyiaYMf5wNJwO4FzMGT5bA= +yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20221208070107-269b6ee5ad79/go.mod h1:drc/WDD65r6wI1tSejk19xcl9QwmzZlgJGXN7a9o2KQ= yunion.io/x/executor v0.0.0-20211018100936-39a2cd966656 h1:0zlZD5uhZoIHgLVAWCz2aHaYk2ZrNsACCYD7R6EIBII= yunion.io/x/executor v0.0.0-20211018100936-39a2cd966656/go.mod h1:Uxuou9WQIeJXNpy7t2fPLL0BYLvLiMvGQwY7Qc6aSws= yunion.io/x/jsonutils v0.0.0-20190625054549-a964e1e8a051/go.mod h1:4N0/RVzsYL3kH3WE/H1BjUQdFiWu50JGCFQuuy+Z634= diff --git a/pkg/cloudmon/providerdriver/cloudpods.go b/pkg/cloudmon/providerdriver/cloudpods.go index c62e6abc22..7bd1cefa2a 100644 --- a/pkg/cloudmon/providerdriver/cloudpods.go +++ b/pkg/cloudmon/providerdriver/cloudpods.go @@ -15,6 +15,8 @@ package providerdriver import ( + "time" + api "yunion.io/x/onecloud/pkg/apis/compute" ) @@ -33,3 +35,7 @@ func (collect *CloudpodsCollect) IsSupportMetrics() bool { func init() { Register(&CloudpodsCollect{}) } + +func (self *CloudpodsCollect) GetDelayDuration() time.Duration { + return time.Minute * 9 +} diff --git a/vendor/modules.txt b/vendor/modules.txt index 3e68f73a89..2ba807491d 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1439,7 +1439,7 @@ sigs.k8s.io/structured-merge-diff/v4/value # sigs.k8s.io/yaml v1.2.0 ## explicit; go 1.12 sigs.k8s.io/yaml -# yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20221207133409-773feb6995bb +# yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20221208070107-269b6ee5ad79 ## explicit; go 1.18 yunion.io/x/cloudmux/pkg/apis yunion.io/x/cloudmux/pkg/apis/billing diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/cloudpods/instance.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/cloudpods/instance.go index ac9a629612..83c1b4af5e 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/cloudpods/instance.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/cloudpods/instance.go @@ -529,10 +529,17 @@ type SMetricData struct { func (cli *SCloudpodsClient) GetMetrics(opts *cloudprovider.MetricListOptions) ([]cloudprovider.MetricValues, error) { brandArr := []string{"OneCloud", "VMware"} metrics := []SMetricData{} + usefulResourceType := []cloudprovider.TResourceType{cloudprovider.METRIC_RESOURCE_TYPE_HOST, cloudprovider.METRIC_RESOURCE_TYPE_SERVER} + isUse, _ := utils.InArray(opts.ResourceType, usefulResourceType) + if !isUse { + return nil, nil + } for i := 0; i < len(brandArr); i++ { params := map[string]interface{}{ "metric_name": opts.MetricType, - "tags": map[string]interface{}{ + "start_time": opts.StartTime, + "end_time": opts.EndTime, + "tag_pairs": map[string]interface{}{ "brand": brandArr[i], }, }