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(region): vendor update for oracle monitor (#20044)

Browse Source
This commit is contained in:
屈轩
2024-04-17 18:30:50 +08:00
committed by GitHub
parent 7a2c092548
commit c0822a43d6
5 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
go.mod
+1 -1
View File
@@ -88,7 +88,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.20240417061814-6a1fe9ae3c31
yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20240417101514-d88d11cd5545
yunion.io/x/executor v0.0.0-20230705125604-c5ac3141db32
yunion.io/x/jsonutils v1.0.1-0.20240203102553-4096f103b401
yunion.io/x/log v1.0.1-0.20240305175729-7cf2d6cd5a91
go.sum
+2 -2
View File
@@ -1204,8 +1204,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.20240417061814-6a1fe9ae3c31 h1:rSADiPVCxHz6yoTrQgYoJAS6RNz8sg51x/oL9ykUNnQ=
yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20240417061814-6a1fe9ae3c31/go.mod h1:dsUESXIbXJ+/ywbNClhldOrbPOiBi2udrgOnB/ffoWk=
yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20240417101514-d88d11cd5545 h1:WrvD7v1C0P95NmqgqN0z55Rr7g5UcyfKh299Qxd++7o=
yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20240417101514-d88d11cd5545/go.mod h1:dsUESXIbXJ+/ywbNClhldOrbPOiBi2udrgOnB/ffoWk=
yunion.io/x/executor v0.0.0-20230705125604-c5ac3141db32 h1:v7POYkQwo1XzOxBoIoRVr/k0V9Y5JyjpshlIFa9raug=
yunion.io/x/executor v0.0.0-20230705125604-c5ac3141db32/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
@@ -1472,7 +1472,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.20240417061814-6a1fe9ae3c31
# yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20240417101514-d88d11cd5545
## explicit; go 1.18
yunion.io/x/cloudmux/pkg/apis
yunion.io/x/cloudmux/pkg/apis/billing
vendor/yunion.io/x/cloudmux/pkg/multicloud/oracle/monitor.go
Generated Vendored
+2 -2
View File
@@ -50,8 +50,8 @@ func (self *SOracleClient) GetEcsMetrics(opts *cloudprovider.MetricListOptions)
} {
params := map[string]interface{}{
"namespace": "oci_computeagent",
"startTime": opts.StartTime,
"endTime": opts.EndTime,
"startTime": opts.StartTime.UTC().Format(time.RFC3339),
"endTime": opts.EndTime.UTC().Format(time.RFC3339),
"query": queryStr,
}
resp, err := self.post(SERVICE_TELEMETRY, opts.RegionExtId, "metrics/actions/summarizeMetricsData", query, params)
vendor/yunion.io/x/cloudmux/pkg/multicloud/oracle/oracle.go
Generated Vendored
+1 -1
View File
@@ -212,7 +212,7 @@ func (cli *SOracleClient) getDefaultClient() *http.Client {
ts.TLSClientConfig = &tls.Config{InsecureSkipVerify: true}
cli.client.Transport = cloudprovider.GetCheckTransport(ts, func(req *http.Request) (func(resp *http.Response) error, error) {
if cli.cpcfg.ReadOnly {
if req.Method == "GET" {
if req.Method == "GET" || strings.Contains(req.URL.Path, "metrics/actions/summarizeMetricsData") {
return nil, nil
}
return nil, errors.Wrapf(cloudprovider.ErrAccountReadOnly, "%s %s", req.Method, req.URL.Path)