From 63cbd8e240b2ee7911b10b980bc8f74a3e4ada47 Mon Sep 17 00:00:00 2001
From: zhaoxiangchun <1422928955@qq.com>
Date: Thu, 21 Apr 2022 20:24:23 +0800
Subject: [PATCH] fix(cloudmon): add apsarea diskusage metric

---
 .../collectors/apsaramon/apsarautils.go       | 23 +++++++++++--------
 pkg/cloudmon/collectors/common/constant.go    |  1 +
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/pkg/cloudmon/collectors/apsaramon/apsarautils.go b/pkg/cloudmon/collectors/apsaramon/apsarautils.go
index 950dda3a55..cf230c1fc1 100644
--- a/pkg/cloudmon/collectors/apsaramon/apsarautils.go
+++ b/pkg/cloudmon/collectors/apsaramon/apsarautils.go
@@ -14,6 +14,8 @@
 
 package apsaramon
 
+import "yunion.io/x/onecloud/pkg/cloudmon/collectors/common"
+
 const (
 	PERIOD             = 60
 	UNIT_AVERAGE       = "Average"
@@ -132,16 +134,17 @@ var aliMetricSpecs = map[string][]string{
 	"DiskWriteIOPS":   {DEFAULT_STATISTICS, UNIT_CPS, INFLUXDB_FIELD_DISK_WRITE_IOPS},
 }
 var apsaraMetricSpecs = map[string][]string{
-	"vm.MemoryUtilization": {DEFAULT_STATISTICS, UNIT_PERCENT, INFLUXDB_FIELD_MEM_USAGE},
-	"vm.CPUUtilization":    {DEFAULT_STATISTICS, UNIT_PERCENT, INFLUXDB_FIELD_CPU_USAGE},
-	"InternetInRate":       {DEFAULT_STATISTICS, UNIT_BPS, INFLUXDB_FIELD_NET_BPS_RX_INTERNET},
-	"IntranetInRate":       {DEFAULT_STATISTICS, UNIT_BPS, INFLUXDB_FIELD_NET_BPS_RX_INTRANET},
-	"InternetOutRate":      {DEFAULT_STATISTICS, UNIT_BPS, INFLUXDB_FIELD_NET_BPS_TX_INTERNET},
-	"IntranetOutRate":      {DEFAULT_STATISTICS, UNIT_BPS, INFLUXDB_FIELD_NET_BPS_TX_INTRANET},
-	"DiskReadBPS":          {DEFAULT_STATISTICS, UNIT_BYTEPS, INFLUXDB_FIELD_DISK_READ_BPS},
-	"DiskWriteBPS":         {DEFAULT_STATISTICS, UNIT_BYTEPS, INFLUXDB_FIELD_DISK_WRITE_BPS},
-	"DiskReadIOPS":         {DEFAULT_STATISTICS, UNIT_CPS, INFLUXDB_FIELD_DISK_READ_IOPS},
-	"DiskWriteIOPS":        {DEFAULT_STATISTICS, UNIT_CPS, INFLUXDB_FIELD_DISK_WRITE_IOPS},
+	"vm.MemoryUtilization":  {DEFAULT_STATISTICS, UNIT_PERCENT, INFLUXDB_FIELD_MEM_USAGE},
+	"vm.CPUUtilization":     {DEFAULT_STATISTICS, UNIT_PERCENT, INFLUXDB_FIELD_CPU_USAGE},
+	"diskusage_utilization": {DEFAULT_STATISTICS, UNIT_PERCENT, common.INFLUXDB_FIELD_DISK_USAGE},
+	"InternetInRate":        {DEFAULT_STATISTICS, UNIT_BPS, INFLUXDB_FIELD_NET_BPS_RX_INTERNET},
+	"IntranetInRate":        {DEFAULT_STATISTICS, UNIT_BPS, INFLUXDB_FIELD_NET_BPS_RX_INTRANET},
+	"InternetOutRate":       {DEFAULT_STATISTICS, UNIT_BPS, INFLUXDB_FIELD_NET_BPS_TX_INTERNET},
+	"IntranetOutRate":       {DEFAULT_STATISTICS, UNIT_BPS, INFLUXDB_FIELD_NET_BPS_TX_INTRANET},
+	"DiskReadBPS":           {DEFAULT_STATISTICS, UNIT_BYTEPS, INFLUXDB_FIELD_DISK_READ_BPS},
+	"DiskWriteBPS":          {DEFAULT_STATISTICS, UNIT_BYTEPS, INFLUXDB_FIELD_DISK_WRITE_BPS},
+	"DiskReadIOPS":          {DEFAULT_STATISTICS, UNIT_CPS, INFLUXDB_FIELD_DISK_READ_IOPS},
+	"DiskWriteIOPS":         {DEFAULT_STATISTICS, UNIT_CPS, INFLUXDB_FIELD_DISK_WRITE_IOPS},
 }
 var aliRdsMetricSpecs = map[string][]string{
 	"CpuUsage":                {DEFAULT_STATISTICS, UNIT_PERCENT, INFLUXDB_FIELD_RDS_CPU_USAGE},
diff --git a/pkg/cloudmon/collectors/common/constant.go b/pkg/cloudmon/collectors/common/constant.go
index 90131564ad..18b1958051 100644
--- a/pkg/cloudmon/collectors/common/constant.go
+++ b/pkg/cloudmon/collectors/common/constant.go
@@ -22,6 +22,7 @@ const (
 	//ESC监控指标
 	INFLUXDB_FIELD_CPU_USAGE           = "vm_cpu.usage_active"
 	INFLUXDB_FIELD_MEM_USAGE           = "vm_mem.used_percent"
+	INFLUXDB_FIELD_DISK_USAGE          = "vm_disk.used_percent"
 	INFLUXDB_FIELD_DISK_READ_BPS       = "vm_diskio.read_bps"
 	INFLUXDB_FIELD_DISK_WRITE_BPS      = "vm_diskio.write_bps"
 	INFLUXDB_FIELD_DISK_READ_IOPS      = "vm_diskio.read_iops"