Skip to content

feat: add domain_id and name to vmware project capacity metrics #802

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 4 commits into from
May 6, 2026
Merged

feat: add domain_id and name to vmware project capacity metrics #802

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a55dc0e
feat: add domain_id and name to vmware project capacity metrics
SoWieMarkus May 6, 2026
4d1b219
fix: update domain_id extraction in VMware project utilization tests
SoWieMarkus May 6, 2026
d8d5c1e
fix: update GROUP BY clause to include domain_id in VMware project in…
SoWieMarkus May 6, 2026
eab5db5
fix: correct domain_id extraction in project capacity usage query
SoWieMarkus May 6, 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
22 changes: 16 additions & 6 deletions internal/knowledge/kpis/plugins/infrastructure/vmware_project_utilization.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ import (
type vmwareProjectInstanceCount struct {
ProjectID string `db:"project_id"`
ProjectName string `db:"project_name"`
DomainID string `db:"domain_id"`
DomainName string `db:"domain_name"`
ComputeHost string `db:"compute_host"`
FlavorName string `db:"flavor_name"`
AvailabilityZone string `db:"availability_zone"`
Expand All @@ -30,6 +32,8 @@ type vmwareProjectInstanceCount struct {
type vmwareProjectCapacityUsage struct {
ProjectID string `db:"project_id"`
ProjectName string `db:"project_name"`
DomainID string `db:"domain_id"`
DomainName string `db:"domain_name"`
ComputeHost string `db:"compute_host"`
AvailabilityZone string `db:"availability_zone"`
TotalVCPUs float64 `db:"total_vcpus"`
Expand Down Expand Up @@ -60,12 +64,12 @@ func (k *VMwareProjectUtilizationKPI) Init(dbConn *db.DB, c client.Client, opts
k.instanceCountPerProjectAndHostAndFlavor = prometheus.NewDesc(
"cortex_vmware_project_instances",
"Number of running instances per project, hypervisor, and flavor on VMware.",
append(vmwareHostLabels, "project_id", "project_name", "flavor_name"), nil,
append(vmwareHostLabels, "project_id", "project_name", "domain_id", "domain_name", "flavor_name"), nil,
)
k.capacityUsagePerProjectAndHost = prometheus.NewDesc(
"cortex_vmware_project_capacity_usage",
"Resource capacity used by a project per VMware hypervisor and flavor. CPU in vCPUs, memory and disk in bytes.",
append(vmwareHostLabels, "project_id", "project_name", "resource"), nil,
append(vmwareHostLabels, "project_id", "project_name", "domain_id", "domain_name", "resource"), nil,
)
return nil
}
Expand Down Expand Up @@ -96,7 +100,7 @@ func (k *VMwareProjectUtilizationKPI) Collect(ch chan<- prometheus.Metric) {
continue
}
hostLabels := host.getHostLabels()
hostLabels = append(hostLabels, projectInstanceCount.ProjectID, projectInstanceCount.ProjectName, projectInstanceCount.FlavorName)
hostLabels = append(hostLabels, projectInstanceCount.ProjectID, projectInstanceCount.ProjectName, projectInstanceCount.DomainID, projectInstanceCount.DomainName, projectInstanceCount.FlavorName)
ch <- prometheus.MustNewConstMetric(k.instanceCountPerProjectAndHostAndFlavor, prometheus.GaugeValue, projectInstanceCount.InstanceCount, hostLabels...)
}

Expand All @@ -113,7 +117,7 @@ func (k *VMwareProjectUtilizationKPI) Collect(ch chan<- prometheus.Metric) {
continue
}
hostLabels := host.getHostLabels()
hostLabels = append(hostLabels, projectCapacityUsage.ProjectID, projectCapacityUsage.ProjectName)
hostLabels = append(hostLabels, projectCapacityUsage.ProjectID, projectCapacityUsage.ProjectName, projectCapacityUsage.DomainID, projectCapacityUsage.DomainName)

memoryUsageBytes, err := bytesFromUnit(projectCapacityUsage.TotalRAMMB, "MB")
if err != nil {
Expand Down Expand Up @@ -167,6 +171,8 @@ func (k *VMwareProjectUtilizationKPI) queryProjectCapacityUsage() ([]vmwareProje
SELECT
s.tenant_id AS project_id,
COALESCE(p.name, '') AS project_name,
COALESCE(p.domain_id, '') AS domain_id,
COALESCE(d.name, '') AS domain_name,
s.os_ext_srv_attr_host AS compute_host,
s.os_ext_az_availability_zone AS availability_zone,
COALESCE(SUM(f.vcpus), 0) AS total_vcpus,
Expand All @@ -175,10 +181,11 @@ func (k *VMwareProjectUtilizationKPI) queryProjectCapacityUsage() ([]vmwareProje
FROM ` + nova.Server{}.TableName() + ` s
LEFT JOIN ` + nova.Flavor{}.TableName() + ` f ON s.flavor_name = f.name
LEFT JOIN ` + identity.Project{}.TableName() + ` p ON p.id = s.tenant_id
LEFT JOIN ` + identity.Domain{}.TableName() + ` d ON d.id = p.domain_id
WHERE s.status NOT IN ('DELETED', 'ERROR')
AND s.os_ext_srv_attr_host LIKE '` + vmwareComputeHostPattern + `'
AND s.os_ext_srv_attr_host NOT LIKE '` + vmwareIronicComputeHostPattern + `'
GROUP BY s.tenant_id, p.name, s.os_ext_srv_attr_host, s.os_ext_az_availability_zone
GROUP BY s.tenant_id, p.name, p.domain_id, d.name, s.os_ext_srv_attr_host, s.os_ext_az_availability_zone
`
var usages []vmwareProjectCapacityUsage
if _, err := k.DB.Select(&usages, query); err != nil {
Expand All @@ -198,16 +205,19 @@ func (k *VMwareProjectUtilizationKPI) queryProjectInstanceCount() ([]vmwareProje
SELECT
s.tenant_id AS project_id,
COALESCE(p.name, '') AS project_name,
COALESCE(p.domain_id, '') AS domain_id,
COALESCE(d.name, '') AS domain_name,
s.os_ext_srv_attr_host AS compute_host,
s.os_ext_az_availability_zone AS availability_zone,
s.flavor_name,
COUNT(*) AS instance_count
FROM ` + nova.Server{}.TableName() + ` s
LEFT JOIN ` + identity.Project{}.TableName() + ` p ON p.id = s.tenant_id
LEFT JOIN ` + identity.Domain{}.TableName() + ` d ON d.id = p.domain_id
WHERE s.status NOT IN ('DELETED', 'ERROR')
AND s.os_ext_srv_attr_host LIKE '` + vmwareComputeHostPattern + `'
AND s.os_ext_srv_attr_host NOT LIKE '` + vmwareIronicComputeHostPattern + `'
GROUP BY s.tenant_id, p.name, s.os_ext_srv_attr_host, s.flavor_name, s.os_ext_az_availability_zone
GROUP BY s.tenant_id, p.name, p.domain_id, d.name, s.os_ext_srv_attr_host, s.flavor_name, s.os_ext_az_availability_zone
`
var usages []vmwareProjectInstanceCount
if _, err := k.DB.Select(&usages, query); err != nil {
Expand Down
Loading