Merge pull request #1060 from ioito/hotfix/qx-aws-metric-value

fix(aws): metric value
yunionio · Sep 13, 2024 · ec4262b · ec4262b
2 parents 81a4213 + c9605c0
commit ec4262b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/pkg/multicloud/aws/monitor.go b/pkg/multicloud/aws/monitor.go
@@ -95,7 +95,7 @@ type Datapoint struct {
 }
 
 func (self Datapoint) GetValue() float64 {
-	return self.Average + self.Average + self.Minimum + self.Sum
+	return self.Average + self.Minimum + self.Sum
 }
 
 type Datapoints struct {

diff --git a/pkg/multicloud/google/monitor.go b/pkg/multicloud/google/monitor.go
@@ -111,6 +111,9 @@ func (self *SGoogleClient) GetEcsMetrics(opts *cloudprovider.MetricListOptions)
 			metricValue := cloudprovider.MetricValue{}
 			metricValue.Timestamp = data[i].Points[j].Interval.StartTime
 			metricValue.Value = data[i].Points[j].Value.GetValue()
+			if opts.MetricType == cloudprovider.VM_METRIC_TYPE_CPU_USAGE {
+				metricValue.Value *= 100
+			}
 			value.Values = append(value.Values, metricValue)
 		}
 		ret = append(ret, value)