From b315997f11ac6a94997894ffde5999bea5fe0ffa Mon Sep 17 00:00:00 2001 From: Paula Julve Date: Thu, 11 Apr 2024 15:45:03 +0200 Subject: [PATCH] Fixup region label for GPC --- cmd/unused-exporter/exporter.go | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/cmd/unused-exporter/exporter.go b/cmd/unused-exporter/exporter.go index 96f2800..a51ef2a 100644 --- a/cmd/unused-exporter/exporter.go +++ b/cmd/unused-exporter/exporter.go @@ -12,7 +12,12 @@ import ( "github.com/prometheus/client_golang/prometheus" ) -const namespace = "unused" +const ( + namespace = "unused" + providerGCP = "GCP" + providerAWS = "AWS" + providerAzure = "Azure" +) type metric struct { desc *prometheus.Desc @@ -261,7 +266,7 @@ func getDiskLabels(d unused.Disk, v bool) []any { } func getNamespace(d unused.Disk, p unused.Provider) string { - if strings.ToLower(p.Name()) == "azure" { + if p.Name() == providerAzure { return d.Meta()["kubernetes.io-created-for-pvc-namespace"] } @@ -286,10 +291,12 @@ func lastUsedTS(d unused.Disk) float64 { } func getRegionFromZone(p unused.Provider, z string) string { - if strings.ToLower(p.Name()) == "azure" { + switch p.Name() { + case providerAWS : + return z[:len(z)-1] + case providerGCP: + return z[:len(z)-2] + default: return z } - - // Drop the last character to get the region from the zone for GCP and AWS - return z[:len(z)-1] }