Merge pull request #97 from SOF3/fix-monitor-metrics

fix(generator): use more user-friendly units in monitor
kubewharf · Feb 20, 2025 · 4dde521 · 4dde521
2 parents 30fe843 + 33cac67
commit 4dde521
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/generator/monitor/monitor.go b/generator/monitor/monitor.go
@@ -36,7 +36,7 @@ import (
 	"github.com/kubewharf/podseidon/generator/observer"
 )
 
-const ProportionPpmUnits = 1000000
+const ProportionPpmUnits = observer.ProportionPpmUnits
 
 var New = component.Declare[Args, Options, Deps, State, util.Empty](
 	func(Args) string { return "generator-monitor" },

diff --git a/generator/observer/metrics.go b/generator/observer/metrics.go
@@ -209,7 +209,7 @@ func appendCountFields(fields *[]metrics.AnyField[MonitorWorkloads], name string
 			},
 		),
 		metrics.NewField(
-			fmt.Sprintf("current_aggregated_%s_workloads", name),
+			fmt.Sprintf("current_aggregated_%s_pods", name),
 			fmt.Sprintf("Current aggregated sum of %s replicas in workloads managed by this generator.", name),
 			metrics.Int64Gauge(),
 			func(status MonitorWorkloads) int64 { return field(status).AggregatedReplicas },
@@ -223,14 +223,16 @@ func appendCountFields(fields *[]metrics.AnyField[MonitorWorkloads], name string
 			},
 		),
 		metrics.NewField(
-			fmt.Sprintf("sum_%s_proportion_ppm", name),
+			fmt.Sprintf("sum_%s_proportion", name),
 			fmt.Sprintf(
 				"Sum of the proportion of %s replicas, saturated at 1 for each non-zero workload, "+
 					"rounded to nearest ppm (parts-per-million).",
 				name,
 			),
-			metrics.Int64Gauge(),
-			func(status MonitorWorkloads) int64 { return field(status).SumProportionPpm },
+			metrics.FloatGauge(),
+			func(status MonitorWorkloads) float64 {
+				return float64(field(status).SumProportionPpm) / float64(ProportionPpmUnits)
+			},
 		),
 		metrics.NewField(
 			fmt.Sprintf("avg_%s_proportion_ppm", name),
@@ -241,7 +243,7 @@ func appendCountFields(fields *[]metrics.AnyField[MonitorWorkloads], name string
 			),
 			metrics.FloatGauge(),
 			func(status MonitorWorkloads) float64 {
-				return float64(field(status).SumProportionPpm) / float64(status.NumNonZeroWorkloads)
+				return float64(field(status).SumProportionPpm) / float64(status.NumNonZeroWorkloads) / float64(ProportionPpmUnits)
 			},
 		),
 	)

diff --git a/generator/observer/observer.go b/generator/observer/observer.go
@@ -24,6 +24,8 @@ import (
 	"github.com/kubewharf/podseidon/generator/resource"
 )
 
+const ProportionPpmUnits = 1000000
+
 var Provide = component.RequireDeps(
 	component.RequireDep(ProvideLogging()),
 	component.RequireDep(ProvideMetrics()),