opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-24 16:03:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(cloudmon): remotefile metrice bugfix

Browse Source
This commit is contained in:
mhf
2022-12-15 10:43:53 +08:00
parent e465a65dcc
commit d3e2999ef4
5 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
go.mod
+1 -1
View File
@@ -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.20221212022832-4b47149c8131
yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20221214123921-87b816428b1e
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
go.sum
+2 -2
View File
@@ -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.20221212022832-4b47149c8131 h1:al86HmU7ITd7zAV6cyQU9mRHzdbo/EKHsLlEpGSaGog=
yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20221212022832-4b47149c8131/go.mod h1:drc/WDD65r6wI1tSejk19xcl9QwmzZlgJGXN7a9o2KQ=
yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20221214123921-87b816428b1e h1:drZgFMUCXgQ3wvnrhwKleSh2KtfiemIk2m4k+pkG4ck=
yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20221214123921-87b816428b1e/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=
vendor/modules.txt
Vendored
+1 -1
View File
@@ -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.20221212022832-4b47149c8131
# yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20221214123921-87b816428b1e
## explicit; go 1.18
yunion.io/x/cloudmux/pkg/apis
yunion.io/x/cloudmux/pkg/apis/billing
vendor/yunion.io/x/cloudmux/pkg/multicloud/aws/aws.go
Generated Vendored
+4
View File
@@ -280,6 +280,10 @@ func (client *SAwsClient) getAwsSession(regionId string, assumeRole bool) (*sess
}
return nil, errors.Wrapf(cloudprovider.ErrAccountReadOnly, action)
}
// organization
if service == "organizations" {
return respCheck, nil
}
// s3
if req.Method == "GET" || req.Method == "HEAD" {
return respCheck, nil
vendor/yunion.io/x/cloudmux/pkg/multicloud/remotefile/remotefile.go
Generated Vendored
+3 -2
View File
@@ -288,9 +288,10 @@ func (self *SRemoteFileClient) GetStorages() ([]SStorage, error) {
func (self *SRemoteFileClient) getMetrics(resourceType cloudprovider.TResourceType, metricType cloudprovider.TMetricType) ([]cloudprovider.MetricValues, error) {
ret := []cloudprovider.MetricValues{}
self.lock.Lock()
defer self.lock.Unlock()
if self.metrics == nil {
self.lock.Lock()
defer self.lock.Unlock()
self.metrics = []map[cloudprovider.TMetricType]map[string]interface{}{}
resp, err := self.get("metrics")
if err != nil {