Skip to content

feat: add cortex evalution kpis #1057

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

Draft
SoWieMarkus wants to merge 1 commit into
base: main
Choose a base branch
from
+36 −27
Draft

feat: add cortex evalution kpis #1057

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 10 additions & 6 deletions internal/knowledge/kpis/plugins/infrastructure/shared.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import (
"fmt"
"regexp"
"strconv"
"strings"

"github.com/cobaltcore-dev/cortex/internal/knowledge/extractor/plugins/compute"
hv1 "github.com/cobaltcore-dev/openstack-hypervisor-operator/api/v1"
Expand Down Expand Up @@ -69,6 +68,7 @@ var vmwareHostLabels = []string{

var kvmHostLabels = []string{
"compute_host",
"compute_cluster",
"availability_zone",
"building_block",
"cpu_architecture",
Expand All @@ -95,11 +95,14 @@ func (h kvmHost) getHostLabels() []string {
availabilityZone = "unknown"
}

buildingBlock := "unknown"
// Assuming hypervisor names are in the format nodeXXX-bbYY
parts := strings.Split(h.Name, "-")
if len(parts) > 1 {
buildingBlock = parts[1]
buildingBlock := h.Labels["kubernetes.metal.cloud.sap/bb"]
if buildingBlock == "" {
buildingBlock = "unknown"
}

computeCluster := h.Labels["kubernetes.metal.cloud.sap/cluster"]
if computeCluster == "" {
computeCluster = "unknown"
}

osVersion := h.Status.OperatingSystem.Version
Expand All @@ -124,6 +127,7 @@ func (h kvmHost) getHostLabels() []string {

return []string{
h.Name,
computeCluster,
availabilityZone,
buildingBlock,
cpuArchitecture,
Expand Down
47 changes: 26 additions & 21 deletions internal/knowledge/kpis/plugins/infrastructure/shared_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
package infrastructure

import (
"strings"
"testing"

"github.com/cobaltcore-dev/cortex/internal/knowledge/extractor/plugins/compute"
Expand All @@ -13,15 +12,11 @@ import (
)

func mockKVMHostLabels(host, az string) map[string]string {
bb := "unknown"
parts := strings.Split(host, "-")
if len(parts) > 1 {
bb = parts[1]
}
return map[string]string{
"compute_host": host,
"compute_cluster": "unknown",
"availability_zone": az,
"building_block": bb,
"building_block": "unknown",
"cpu_architecture": "cascade-lake",
"workload_type": "general-purpose",
"enabled": "true",
Expand Down Expand Up @@ -126,7 +121,7 @@ func TestKVMHost_GetHostLabels(t *testing.T) {
host: kvmHost{hv1.Hypervisor{
ObjectMeta: metav1.ObjectMeta{Name: "node001-bb01"},
}},
want: []string{"node001-bb01", "unknown", "bb01", "cascade-lake", "general-purpose", "true", "false", "false", "false"},
want: []string{"node001-bb01", "unknown", "unknown", "unknown", "cascade-lake", "general-purpose", "true", "false", "false", "false", "unknown"},
},
{
name: "availability zone from label",
Expand All @@ -136,61 +131,71 @@ func TestKVMHost_GetHostLabels(t *testing.T) {
Labels: map[string]string{"topology.kubernetes.io/zone": "az1"},
},
}},
want: []string{"node001-bb01", "az1", "bb01", "cascade-lake", "general-purpose", "true", "false", "false", "false"},
want: []string{"node001-bb01", "unknown", "az1", "unknown", "cascade-lake", "general-purpose", "true", "false", "false", "false", "unknown"},
},
{
name: "name without dash results in unknown building block",
name: "bb and cluster from labels",
host: kvmHost{hv1.Hypervisor{
ObjectMeta: metav1.ObjectMeta{Name: "nodewithoutdash"},
ObjectMeta: metav1.ObjectMeta{
Name: "node001-bb01",
Labels: map[string]string{
"kubernetes.metal.cloud.sap/bb": "bb01",
"kubernetes.metal.cloud.sap/cluster": "cluster-a",
},
},
}},
want: []string{"nodewithoutdash", "unknown", "unknown", "cascade-lake", "general-purpose", "true", "false", "false", "false"},
want: []string{"node001-bb01", "cluster-a", "unknown", "bb01", "cascade-lake", "general-purpose", "true", "false", "false", "false", "unknown"},
},
{
name: "sapphire rapids trait",
host: kvmHost{hv1.Hypervisor{
ObjectMeta: metav1.ObjectMeta{Name: "node001-bb01"},
Status: hv1.HypervisorStatus{Traits: []string{"CUSTOM_HW_SAPPHIRE_RAPIDS"}},
}},
want: []string{"node001-bb01", "unknown", "bb01", "sapphire-rapids", "general-purpose", "true", "false", "false", "false"},
want: []string{"node001-bb01", "unknown", "unknown", "unknown", "sapphire-rapids", "general-purpose", "true", "false", "false", "false", "unknown"},
},
{
name: "hana exclusive host trait",
host: kvmHost{hv1.Hypervisor{
ObjectMeta: metav1.ObjectMeta{Name: "node001-bb01"},
Status: hv1.HypervisorStatus{Traits: []string{"CUSTOM_HANA_EXCLUSIVE_HOST"}},
}},
want: []string{"node001-bb01", "unknown", "bb01", "cascade-lake", "hana", "true", "false", "false", "false"},
want: []string{"node001-bb01", "unknown", "unknown", "unknown", "cascade-lake", "hana", "true", "false", "false", "false", "unknown"},
},
{
name: "decommissioning trait",
host: kvmHost{hv1.Hypervisor{
ObjectMeta: metav1.ObjectMeta{Name: "node001-bb01"},
Status: hv1.HypervisorStatus{Traits: []string{"CUSTOM_DECOMMISSIONING"}},
}},
want: []string{"node001-bb01", "unknown", "bb01", "cascade-lake", "general-purpose", "true", "true", "false", "false"},
want: []string{"node001-bb01", "unknown", "unknown", "unknown", "cascade-lake", "general-purpose", "true", "true", "false", "false", "unknown"},
},
{
name: "external customer exclusive trait",
host: kvmHost{hv1.Hypervisor{
ObjectMeta: metav1.ObjectMeta{Name: "node001-bb01"},
Status: hv1.HypervisorStatus{Traits: []string{"CUSTOM_EXTERNAL_CUSTOMER_EXCLUSIVE"}},
}},
want: []string{"node001-bb01", "unknown", "bb01", "cascade-lake", "general-purpose", "true", "false", "true", "false"},
want: []string{"node001-bb01", "unknown", "unknown", "unknown", "cascade-lake", "general-purpose", "true", "false", "true", "false", "unknown"},
},
{
name: "maintenance set",
host: kvmHost{hv1.Hypervisor{
ObjectMeta: metav1.ObjectMeta{Name: "node001-bb01"},
Spec: hv1.HypervisorSpec{Maintenance: hv1.MaintenanceManual},
}},
want: []string{"node001-bb01", "unknown", "bb01", "cascade-lake", "general-purpose", "true", "false", "false", "true"},
want: []string{"node001-bb01", "unknown", "unknown", "unknown", "cascade-lake", "general-purpose", "true", "false", "false", "true", "unknown"},
},
{
name: "all traits and maintenance set",
host: kvmHost{hv1.Hypervisor{
ObjectMeta: metav1.ObjectMeta{
Name: "node001-bb42",
Labels: map[string]string{"topology.kubernetes.io/zone": "az3"},
Name: "node001-bb42",
Labels: map[string]string{
"topology.kubernetes.io/zone": "az3",
"kubernetes.metal.cloud.sap/bb": "bb42",
"kubernetes.metal.cloud.sap/cluster": "cluster-b",
},
},
Spec: hv1.HypervisorSpec{Maintenance: hv1.MaintenanceAuto},
Status: hv1.HypervisorStatus{Traits: []string{
Expand All @@ -200,15 +205,15 @@ func TestKVMHost_GetHostLabels(t *testing.T) {
"CUSTOM_EXTERNAL_CUSTOMER_EXCLUSIVE",
}},
}},
want: []string{"node001-bb42", "az3", "bb42", "sapphire-rapids", "hana", "true", "true", "true", "true"},
want: []string{"node001-bb42", "cluster-b", "az3", "bb42", "sapphire-rapids", "hana", "true", "true", "true", "true", "unknown"},
},
{
name: "os version set",
host: kvmHost{hv1.Hypervisor{
ObjectMeta: metav1.ObjectMeta{Name: "node001-bb01"},
Status: hv1.HypervisorStatus{OperatingSystem: hv1.OperatingSystemStatus{Version: "1.1.1"}},
}},
want: []string{"node001-bb01", "unknown", "bb01", "cascade-lake", "general-purpose", "true", "false", "false", "false", "1.1.1"},
want: []string{"node001-bb01", "unknown", "unknown", "unknown", "cascade-lake", "general-purpose", "true", "false", "false", "false", "1.1.1"},
},
}

Expand Down