From 42b27b8b6cd7b4b159dedde007d9eca71d21d123 Mon Sep 17 00:00:00 2001 From: Freerk-Ole Zakfeld Date: Wed, 15 Jan 2025 18:49:55 +0100 Subject: [PATCH 1/2] Fix order of vCPU vs Instances in Traits exporter Signed-off-by: Freerk-Ole Zakfeld --- exporters/nova_trait.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/exporters/nova_trait.go b/exporters/nova_trait.go index c30a76f..4a7c276 100644 --- a/exporters/nova_trait.go +++ b/exporters/nova_trait.go @@ -53,7 +53,7 @@ func (e *NovaTraitUsageExporter) collectMetrics(ch chan<- prometheus.Metric) { var projectID string var totalVcpus float64 var totalInstances float64 - if err := rows.Scan(&projectID, &totalVcpus, &totalInstances); err != nil { + if err := rows.Scan(&projectID, &totalInstances, &totalVcpus); err != nil { log.Println("Error scanning Nova row:", err) continue } From 19ab763f2aefc99e7ff0bda8fe6ea7835606052d Mon Sep 17 00:00:00 2001 From: Freerk-Ole Zakfeld Date: Thu, 16 Jan 2025 21:43:15 +0100 Subject: [PATCH 2/2] Fix tests Signed-off-by: Freerk-Ole Zakfeld --- exporters/nova_trait_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/exporters/nova_trait_test.go b/exporters/nova_trait_test.go index 2795039..bd206e9 100644 --- a/exporters/nova_trait_test.go +++ b/exporters/nova_trait_test.go @@ -28,11 +28,11 @@ func TestNovaTraitUsageExporter(t *testing.T) { expectedMetrics := ` # HELP openstack_project_instances_trait__custom_trait Total number of instances per OpenStack project with image trait CUSTOM_TRAIT # TYPE openstack_project_instances_trait__custom_trait gauge - openstack_project_instances_trait__custom_trait{project_id="6ee08ba2-2ca1-4c91-b139-4bf0dbaa4096"} 5 + openstack_project_instances_trait__custom_trait{project_id="6ee08ba2-2ca1-4c91-b139-4bf0dbaa4096"} 4 openstack_project_instances_trait__custom_trait{project_id="c352b0ed-30ca-4634-9c2d-1947efc29096"} 0 # HELP openstack_project_vcpus_trait__custom_trait Total number of vcpus per OpenStack project for instances with image trait CUSTOM_TRAIT # TYPE openstack_project_vcpus_trait__custom_trait gauge - openstack_project_vcpus_trait__custom_trait{project_id="6ee08ba2-2ca1-4c91-b139-4bf0dbaa4096"} 4 + openstack_project_vcpus_trait__custom_trait{project_id="6ee08ba2-2ca1-4c91-b139-4bf0dbaa4096"} 5 openstack_project_vcpus_trait__custom_trait{project_id="c352b0ed-30ca-4634-9c2d-1947efc29096"} 0 `