diff --git a/go.mod b/go.mod index 6e07342848..c58cf66e98 100644 --- a/go.mod +++ b/go.mod @@ -87,7 +87,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.20250228072316-743196d82cd7 + yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20250313094508-c236d94eecef yunion.io/x/executor v0.0.0-20241205080005-48f5b1212256 yunion.io/x/jsonutils v1.0.1-0.20240930100528-1671a2d0d22f yunion.io/x/log v1.0.1-0.20240305175729-7cf2d6cd5a91 diff --git a/go.sum b/go.sum index cd23ded79f..1669dbc246 100644 --- a/go.sum +++ b/go.sum @@ -1274,8 +1274,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.20250228072316-743196d82cd7 h1:pjEo31gyoR7don2lJs4bAXK6J5fRfjpmP/72zwV/crY= -yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20250228072316-743196d82cd7/go.mod h1:KQ/jWx7bZlmjCE711KEWuvHW/dzpdr/UTlBjjutkj0Y= +yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20250313094508-c236d94eecef h1:Qd+jyLWWaDNal5c11m1UZ2VMB9NDAEFxGfi+sjbT63A= +yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20250313094508-c236d94eecef/go.mod h1:KQ/jWx7bZlmjCE711KEWuvHW/dzpdr/UTlBjjutkj0Y= yunion.io/x/executor v0.0.0-20241205080005-48f5b1212256 h1:kLKQ6zbgPDQflRwoHFAjxNChcbhXIFgsUVLkJwiXu/8= yunion.io/x/executor v0.0.0-20241205080005-48f5b1212256/go.mod h1:Uxuou9WQIeJXNpy7t2fPLL0BYLvLiMvGQwY7Qc6aSws= yunion.io/x/jsonutils v0.0.0-20190625054549-a964e1e8a051/go.mod h1:4N0/RVzsYL3kH3WE/H1BjUQdFiWu50JGCFQuuy+Z634= diff --git a/vendor/modules.txt b/vendor/modules.txt index f444b936f5..2020e47346 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1576,7 +1576,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.20250228072316-743196d82cd7 +# yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20250313094508-c236d94eecef ## explicit; go 1.21 yunion.io/x/cloudmux/pkg/apis yunion.io/x/cloudmux/pkg/apis/billing diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/zstack/instance.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/zstack/instance.go index fd6c721bb3..75551fd213 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/zstack/instance.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/zstack/instance.go @@ -338,7 +338,7 @@ func (instance *SInstance) GetVNCInfo(input *cloudprovider.ServerVncInput) (*clo url := fmt.Sprintf("%s://%s:5000/thirdparty/vnc_auto.html?host=%s&port=%d&token=%s&title=%s", info.Scheme, authURL.Hostname(), info.Hostname, info.Port, info.Token, instance.Name) if ver, _ := instance.host.zone.region.client.GetVersion(); ver != nil { if version.GE(ver.Version, "4.0.0") { - url = fmt.Sprintf("%s://%s:5000/novnc/index.html?host=%s&port=%d&token=%s&title=%s&language=zh-CN&lowVersion=false", info.Scheme, authURL.Hostname(), info.Hostname, info.Port, info.Token, instance.Name) + url = fmt.Sprintf("%s://%s:5000/novnc?host=%s&port=%d&token=%s&title=%s&language=zh-CN&lowVersion=false", info.Scheme, authURL.Hostname(), info.Hostname, info.Port, info.Token, instance.Name) } } password, _ := instance.host.zone.region.GetInstanceConsolePassword(instance.UUID) diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/zstack/monitor.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/zstack/monitor.go index 341b309fe5..78f95d1bc5 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/zstack/monitor.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/zstack/monitor.go @@ -18,6 +18,7 @@ import ( "time" "yunion.io/x/jsonutils" + "yunion.io/x/log" "yunion.io/x/pkg/errors" "yunion.io/x/cloudmux/pkg/cloudprovider" @@ -54,6 +55,7 @@ func (self *SZStackClient) GetMonitorData(name string, namespace string, since t } func (self *SZStackClient) GetMetrics(opts *cloudprovider.MetricListOptions) ([]cloudprovider.MetricValues, error) { + log.Infof("GetMetrics %s %s %s %s %s", opts.ResourceType, opts.MetricType, opts.ResourceId, opts.StartTime, opts.EndTime) switch opts.ResourceType { case cloudprovider.METRIC_RESOURCE_TYPE_SERVER: return self.GetEcsMetrics(opts) @@ -67,19 +69,21 @@ func (self *SZStackClient) GetMetrics(opts *cloudprovider.MetricListOptions) ([] func (self *SZStackClient) GetHostMetrics(opts *cloudprovider.MetricListOptions) ([]cloudprovider.MetricValues, error) { ns, metricName := "ZStack/Host", "" switch opts.MetricType { - case cloudprovider.VM_METRIC_TYPE_CPU_USAGE: - metricName = "CPUAverageUsedUtilization" - case cloudprovider.VM_METRIC_TYPE_DISK_IO_READ_BPS: + case cloudprovider.HOST_METRIC_TYPE_CPU_USAGE: + metricName = "CPUUsedUtilization" + case cloudprovider.HOST_METRIC_TYPE_MEM_USAGE: + metricName = "MemoryUsedInPercent" + case cloudprovider.HOST_METRIC_TYPE_DISK_IO_READ_BPS: metricName = "DiskReadBytes" - case cloudprovider.VM_METRIC_TYPE_DISK_IO_WRITE_BPS: + case cloudprovider.HOST_METRIC_TYPE_DISK_IO_WRITE_BPS: metricName = "DiskWriteBytes" - case cloudprovider.VM_METRIC_TYPE_NET_BPS_RX: + case cloudprovider.HOST_METRIC_TYPE_NET_BPS_RX: metricName = "NetworkInBytes" - case cloudprovider.VM_METRIC_TYPE_NET_BPS_TX: + case cloudprovider.HOST_METRIC_TYPE_NET_BPS_TX: metricName = "NetworkOutBytes" - case cloudprovider.VM_METRIC_TYPE_DISK_IO_READ_IOPS: + case cloudprovider.HOST_METRIC_TYPE_DISK_IO_READ_IOPS: metricName = "DiskReadOps" - case cloudprovider.VM_METRIC_TYPE_DISK_IO_WRITE_IOPS: + case cloudprovider.HOST_METRIC_TYPE_DISK_IO_WRITE_IOPS: metricName = "DiskWriteOps" default: return nil, errors.Wrapf(cloudprovider.ErrNotSupported, "%s", opts.MetricType) @@ -107,6 +111,8 @@ func (self *SZStackClient) GetEcsMetrics(opts *cloudprovider.MetricListOptions) switch opts.MetricType { case cloudprovider.VM_METRIC_TYPE_CPU_USAGE: metricName = "CPUAverageUsedUtilization" + case cloudprovider.VM_METRIC_TYPE_MEM_USAGE: + metricName = "MemoryUsedInPercent" case cloudprovider.VM_METRIC_TYPE_DISK_IO_READ_BPS: metricName = "DiskReadBytes" case cloudprovider.VM_METRIC_TYPE_DISK_IO_WRITE_BPS: diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/zstack/provider/provider.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/zstack/provider/provider.go index dc6b95664f..e1882022a8 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/zstack/provider/provider.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/zstack/provider/provider.go @@ -165,5 +165,5 @@ func (self *SZStackProvider) GetCapabilities() []string { } func (self *SZStackProvider) GetMetrics(opts *cloudprovider.MetricListOptions) ([]cloudprovider.MetricValues, error) { - return self.client.GetEcsMetrics(opts) + return self.client.GetMetrics(opts) }