Skip to content

Fix order of vCPU vs Instances in Traits exporter #6

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
cloucs merged 2 commits into from
Jan 17, 2025
Merged

Fix order of vCPU vs Instances in Traits exporter #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
42b27b8
Fix order of vCPU vs Instances in Traits exporter
fzakfeld Jan 15, 2025
19ab763
Fix tests
fzakfeld Jan 16, 2025
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
2 changes: 1 addition & 1 deletion exporters/nova_trait.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down
4 changes: 2 additions & 2 deletions exporters/nova_trait_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

`
Expand Down
Loading