Rounded cpu and memory resources (#685)

equinor · Oct 2, 2024 · 02f2e2d · 02f2e2d
1 parent 4ce43bb
commit 02f2e2d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/api/metrics/prometheus_handler.go b/api/metrics/prometheus_handler.go
@@ -2,6 +2,7 @@ package metrics
 
 import (
 	"context"
+	"math"
 	"regexp"
 	"time"
 
@@ -97,14 +98,14 @@ func parseQueryDuration(duration string, defaultValue string) (time.Duration, st
 
 func getCpuMetricValue(ctx context.Context, queryResults map[internal.QueryName]prometheusModel.Value, queryName internal.QueryName) *float64 {
 	if value, ok := getMetricsValue(ctx, queryResults, queryName); ok {
-		return pointers.Ptr(value)
+		return pointers.Ptr(math.Round(value*1e6) / 1e6)
 	}
 	return nil
 }
 
 func getMemoryMetricValue(ctx context.Context, queryResults map[internal.QueryName]prometheusModel.Value, queryName internal.QueryName) *float64 {
 	if value, ok := getMetricsValue(ctx, queryResults, queryName); ok {
-		return pointers.Ptr(value)
+		return pointers.Ptr(math.Round(value))
 	}
 	return nil
 }

diff --git a/api/metrics/prometheus_handler_test.go b/api/metrics/prometheus_handler_test.go
@@ -160,14 +160,14 @@ func getExpectedUsedResources(warnings ...string) *applicationModels.UsedResourc
 	return &applicationModels.UsedResources{
 		Warnings: warnings,
 		CPU: &applicationModels.UsedResource{
-			Min: pointers.Ptr(0.02520196),
-			Avg: pointers.Ptr(0.0498679316),
-			Max: pointers.Ptr(0.134699898),
+			Min: pointers.Ptr(0.025202),
+			Avg: pointers.Ptr(0.049868),
+			Max: pointers.Ptr(0.1347),
 		},
 		Memory: &applicationModels.UsedResource{
-			Min: pointers.Ptr(168965.6892544),
-			Avg: pointers.Ptr(241308.93398770998),
-			Max: pointers.Ptr(358023.69331542),
+			Min: pointers.Ptr(168966.0),
+			Avg: pointers.Ptr(241309.0),
+			Max: pointers.Ptr(358024.0),
 		},
 	}
 }