Skip to content

Refactor kvm resource capacity kpi to use effective capacity #585

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
SoWieMarkus merged 2 commits into from
Mar 17, 2026
Merged

Refactor kvm resource capacity kpi to use effective capacity #585

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8b6871b
Refactor kvm resource capacity kpi to use effective capacity
SoWieMarkus Mar 17, 2026
ce1fbf9
Feedback
SoWieMarkus Mar 17, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 14 additions & 4 deletions internal/knowledge/kpis/plugins/compute/resource_capacity_kvm.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,20 +154,30 @@ func (k *KVMResourceCapacityKPI) Collect(ch chan<- prometheus.Metric) {
}

for _, hypervisor := range hvs.Items {
cpuTotal, hasCPUTotal := hypervisor.Status.Capacity["cpu"]
ramTotal, hasRAMTotal := hypervisor.Status.Capacity["memory"]
if hypervisor.Status.EffectiveCapacity == nil {
slog.Warn("hypervisor with nil effective capacity, skipping", "host", hypervisor.Name)
continue
}

cpuTotal, hasCPUTotal := hypervisor.Status.EffectiveCapacity[hv1.ResourceCPU]
ramTotal, hasRAMTotal := hypervisor.Status.EffectiveCapacity[hv1.ResourceMemory]

if !hasCPUTotal || !hasRAMTotal {
slog.Error("hypervisor missing cpu or ram total capacity", "hypervisor", hypervisor.Name)
continue
}

cpuUsed, hasCPUUtilized := hypervisor.Status.Allocation["cpu"]
if cpuTotal.IsZero() || ramTotal.IsZero() {
slog.Warn("hypervisor with zero cpu or ram total capacity, skipping", "host", hypervisor.Name)
continue
}

cpuUsed, hasCPUUtilized := hypervisor.Status.Allocation[hv1.ResourceCPU]
if !hasCPUUtilized {
cpuUsed = resource.MustParse("0")
}

ramUsed, hasRAMUtilized := hypervisor.Status.Allocation["memory"]
ramUsed, hasRAMUtilized := hypervisor.Status.Allocation[hv1.ResourceMemory]
if !hasRAMUtilized {
ramUsed = resource.MustParse("0")
}
Expand Down
12 changes: 6 additions & 6 deletions internal/knowledge/kpis/plugins/compute/resource_capacity_kvm_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ func TestKVMResourceCapacityKPI_Collect(t *testing.T) {
},
},
Status: hv1.HypervisorStatus{
Capacity: map[hv1.ResourceName]resource.Quantity{
EffectiveCapacity: map[hv1.ResourceName]resource.Quantity{
hv1.ResourceCPU: resource.MustParse("128"),
hv1.ResourceMemory: resource.MustParse("512Gi"),
},
Expand Down Expand Up @@ -148,7 +148,7 @@ func TestKVMResourceCapacityKPI_Collect(t *testing.T) {
},
},
Status: hv1.HypervisorStatus{
Capacity: map[hv1.ResourceName]resource.Quantity{
EffectiveCapacity: map[hv1.ResourceName]resource.Quantity{
hv1.ResourceCPU: resource.MustParse("256"),
hv1.ResourceMemory: resource.MustParse("1Ti"),
},
Expand Down Expand Up @@ -209,7 +209,7 @@ func TestKVMResourceCapacityKPI_Collect(t *testing.T) {
},
},
Status: hv1.HypervisorStatus{
Capacity: map[hv1.ResourceName]resource.Quantity{
EffectiveCapacity: map[hv1.ResourceName]resource.Quantity{
hv1.ResourceCPU: resource.MustParse("64"),
hv1.ResourceMemory: resource.MustParse("256Gi"),
},
Expand Down Expand Up @@ -255,7 +255,7 @@ func TestKVMResourceCapacityKPI_Collect(t *testing.T) {
},
},
Status: hv1.HypervisorStatus{
Capacity: map[hv1.ResourceName]resource.Quantity{
EffectiveCapacity: map[hv1.ResourceName]resource.Quantity{
hv1.ResourceCPU: resource.MustParse("100"),
hv1.ResourceMemory: resource.MustParse("200Gi"),
},
Expand All @@ -274,7 +274,7 @@ func TestKVMResourceCapacityKPI_Collect(t *testing.T) {
},
},
Status: hv1.HypervisorStatus{
Capacity: map[hv1.ResourceName]resource.Quantity{
EffectiveCapacity: map[hv1.ResourceName]resource.Quantity{
hv1.ResourceCPU: resource.MustParse("200"),
hv1.ResourceMemory: resource.MustParse("400Gi"),
},
Expand Down Expand Up @@ -332,7 +332,7 @@ func TestKVMResourceCapacityKPI_Collect(t *testing.T) {
},
},
Status: hv1.HypervisorStatus{
Capacity: map[hv1.ResourceName]resource.Quantity{
EffectiveCapacity: map[hv1.ResourceName]resource.Quantity{
hv1.ResourceCPU: resource.MustParse("96"),
hv1.ResourceMemory: resource.MustParse("384Gi"),
},
Expand Down
Loading