Merge pull request #1743 from ioito/automated-cherry-pick-of-#1742-upstream-release-4.0

Automated cherry pick of #1742: fix(meter): vm out metric

Author: ioito

pkg/cloudprovider/metrics.go

@@ -150,6 +150,9 @@ const (
 	// 虚拟机网络出速率
 	// 支持平台: huawei, aliyun, apsara, azure, esxi, google, bingocloud, aws, jdcloud, ecloud, zstack, qcloud, volcengine
 	VM_METRIC_TYPE_NET_BPS_TX TMetricType = "vm_netio.bps_sent"
+	// 虚拟机外网出带宽使用率
+	// 支持平台: qcloud, aliyun
+	VM_METRIC_TYPE_NET_OUT_BANDWIDTH_USAGE TMetricType = "vm_netio.out_bandwidth_usage"
 
 	// 虚拟机TCP连接数
 	// 支持平台: aliyun, apsara, volcengine
@@ -291,8 +294,10 @@ const (
 	METRIC_TAG_REQUST_4XX  = "4xx"
 	METRIC_TAG_REQUST_5XX  = "5xx"
 
-	METRIC_TAG_NET_TYPE          = "net_type"
+	METRIC_TAG_NET_TYPE = "net_type"
+	// 外网
 	METRIC_TAG_NET_TYPE_INTERNET = "internet"
+	// 内网
 	METRIC_TAG_NET_TYPE_INTRANET = "intranet"
 
 	METRIC_TAG_TYPE_DISK_TYPE     = "disk_type"
@@ -391,6 +396,7 @@ var (
 
 		VM_METRIC_TYPE_NET_BPS_RX,
 		VM_METRIC_TYPE_NET_BPS_TX,
+		VM_METRIC_TYPE_NET_OUT_BANDWIDTH_USAGE,
 		VM_METRIC_TYPE_NET_TCP_CONNECTION,
 
 		VM_METRIC_TYPE_PROCESS_NUMBER,

pkg/multicloud/aliyun/monitor.go

@@ -345,6 +345,11 @@ func (self *SAliyunClient) GetEcsMetrics(opts *cloudprovider.MetricListOptions)
 			"IntranetOutRate": cloudprovider.METRIC_TAG_NET_TYPE_INTRANET,
 		}
 		tagKey = cloudprovider.METRIC_TAG_NET_TYPE
+	case cloudprovider.VM_METRIC_TYPE_NET_OUT_BANDWIDTH_USAGE:
+		metricTags = map[string]string{
+			"VPC_PublicIP_InternetOutRate_Percent": cloudprovider.METRIC_TAG_NET_TYPE_INTERNET,
+		}
+		tagKey = cloudprovider.METRIC_TAG_NET_TYPE
 	case cloudprovider.VM_METRIC_TYPE_DISK_IO_READ_BPS:
 		metricTags = map[string]string{
 			"DiskReadBPS": "",

pkg/multicloud/aliyun/shell/monitor.go

@@ -50,6 +50,12 @@ func init() {
 	})
 
 	shellutils.R(&cloudprovider.MetricListOptions{}, "metric-list", "List metrics in a namespace", func(cli *aliyun.SRegion, args *cloudprovider.MetricListOptions) error {
+		if args.StartTime.IsZero() {
+			args.StartTime = time.Now().Add(-time.Minute * 20)
+		}
+		if args.EndTime.IsZero() {
+			args.EndTime = time.Now()
+		}
 		metrics, err := cli.GetClient().GetMetrics(args)
 		if err != nil {
 			return err
@@ -75,13 +81,17 @@ func init() {
 			if err != nil {
 				return err
 			}
+		} else {
+			since = time.Now().Add(-time.Minute * 20)
 		}
 		var until time.Time
 		if len(args.Until) > 0 {
 			until, err = timeutils.ParseTimeStr(args.Until)
 			if err != nil {
 				return err
 			}
+		} else {
+			until = time.Now().Add(-time.Minute * 10)
 		}
 		data, err := cli.FetchMetricData(args.METRIC, args.NAMESPACE, since, until)
 		if err != nil {

pkg/multicloud/qcloud/monitor.go

@@ -166,6 +166,9 @@ func (self *SQcloudClient) GetEcsMetrics(opts *cloudprovider.MetricListOptions)
 			"lanIntraffic": cloudprovider.METRIC_TAG_NET_TYPE + ":" + cloudprovider.METRIC_TAG_NET_TYPE_INTRANET,
 			"WanIntraffic": cloudprovider.METRIC_TAG_NET_TYPE + ":" + cloudprovider.METRIC_TAG_NET_TYPE_INTERNET,
 		},
+		cloudprovider.VM_METRIC_TYPE_NET_OUT_BANDWIDTH_USAGE: {
+			"Outratio": cloudprovider.METRIC_TAG_NET_TYPE + ":" + cloudprovider.METRIC_TAG_NET_TYPE_INTERNET,
+		},
 	} {
 		for metricName, tag := range metricNames {
 			metrics, err := self.GetMonitorData("QCE/CVM", metricName, 60, opts.StartTime, opts.EndTime, opts.RegionExtId, "InstanceId", opts.ResourceIds)