improve quota (auto detection for apiversions)

Signed-off-by: Markus Blaschke <mblaschke82@gmail.com>

Author: mblaschke

.gitignore

@@ -1,4 +1,5 @@
 /vendor/
 /azure-resourcemanager-exporter*
 /release-assets
-/.vscode
+/.vscode
+/example.dev.yaml

config/config_quota.go

@@ -1,5 +1,9 @@
 package config
 
+import (
+	"encoding/json"
+)
+
 type (
 	CollectorQuota struct {
 		*CollectorBase `yaml:",inline"`
@@ -12,3 +16,29 @@ type (
 		ApiVersion string `json:"apiVersion"`
 	}
 )
+
+func (rp *CollectorQuotaResourceProvider) UnmarshalJSON(data []byte) error {
+	var (
+		valString           string
+		valResourceProvider struct {
+			Provider   string `json:"provider"`
+			ApiVersion string `json:"apiVersion"`
+		}
+	)
+
+	// try string first
+	if err := json.Unmarshal(data, &valString); err == nil {
+		rp.Provider = valString
+		rp.ApiVersion = "auto"
+		return nil
+	}
+
+	// try full version
+	err := json.Unmarshal(data, &valResourceProvider)
+	if err != nil {
+		return err
+	}
+	rp.Provider = valResourceProvider.Provider
+	rp.ApiVersion = valResourceProvider.ApiVersion
+	return nil
+}

example.yaml

@@ -35,11 +35,11 @@ collectors:
     scrapeTime: 5m
 
     resourceProviders:
-      - {provider: Microsoft.App, apiVersion: "2025-06-01"}
-      - {provider: Microsoft.Compute, apiVersion: "2025-04-01"}
-      - {provider: Microsoft.Network, apiVersion: "2025-05-01"}
-      - {provider: Microsoft.Storage, apiVersion: "2025-06-01"}
-      - {provider: Microsoft.MachineLearningServices, apiVersion: "2025-06-01"}
+      - Microsoft.App # simple version, uses auto detected apiVersion
+      - {provider: Microsoft.Compute, apiVersion: "auto"} # full version
+      - {provider: Microsoft.Network, apiVersion: "auto"}
+      - {provider: Microsoft.Storage, apiVersion: "auto"}
+      - {provider: Microsoft.MachineLearningServices, apiVersion: "2025-06-01"} # use specific apiVersion
 
   # Azure Advisor recommendations
   advisor:

main.go

@@ -102,7 +102,7 @@ func initArgparser() {
 func initConfig() {
 	var err error
 
-	err = yaml.UnmarshalWithOptions(defaultConfig, &Config, yaml.Strict())
+	err = yaml.UnmarshalWithOptions(defaultConfig, &Config, yaml.Strict(), yaml.UseJSONUnmarshaler())
 	if err != nil {
 		logger.Fatal(err.Error())
 	}
@@ -114,7 +114,7 @@ func initConfig() {
 		logger.Fatal(err.Error())
 	}
 
-	err = yaml.UnmarshalWithOptions(content, &Config, yaml.Strict())
+	err = yaml.UnmarshalWithOptions(content, &Config, yaml.Strict(), yaml.UseJSONUnmarshaler())
 	if err != nil {
 		logger.Fatal(err.Error())
 	}

metrics_azurerm_quota.go

@@ -2,7 +2,6 @@ package main
 
 import (
 	"errors"
-	"fmt"
 	"io"
 	"log/slog"
 	"net/http"
@@ -198,6 +197,33 @@ func (m *MetricsCollectorAzureRmQuota) collectQuotaUsage(subscription *armsubscr
 	quotaLimitMetric := m.Collector.GetMetricList("quotaLimit")
 	quotaUsageMetric := m.Collector.GetMetricList("quotaUsage")
 
+	if provider.ApiVersion == "" || strings.EqualFold(provider.ApiVersion, "auto") {
+		provider.ApiVersion = ""
+
+		// lookup api version
+		providerInfo, err := AzureClient.GetResourceProvider(m.Context(), *subscription.SubscriptionID, provider.Provider)
+		if err != nil {
+			logger.Error("failed to lookup Azure resource provider", slog.Any("error", err))
+			panic(err)
+		}
+
+		if providerInfo != nil {
+			for _, providerResource := range providerInfo.ResourceTypes {
+				if to.String(providerResource.DefaultAPIVersion) != "" {
+					provider.ApiVersion = to.String(providerResource.DefaultAPIVersion)
+					break
+				}
+			}
+		}
+
+		if provider.ApiVersion == "" {
+			logger.Error("failed to lookup Azure resource provider apiVersion")
+			panic("failed to lookup Azure resource provider apiVersion")
+		}
+	}
+
+	logger = logger.With(slog.String("apiVersion", provider.ApiVersion))
+
 	options := AzureClient.NewArmClientOptions()
 	ep := cloud.AzurePublic.Services[cloud.ResourceManager].Endpoint
 	if c, ok := options.Cloud.Services[cloud.ResourceManager]; ok {
@@ -215,8 +241,8 @@ func (m *MetricsCollectorAzureRmQuota) collectQuotaUsage(subscription *armsubscr
 	urlPath = strings.ReplaceAll(urlPath, "{provider}", url.PathEscape(provider.Provider))
 	urlPath = strings.ReplaceAll(urlPath, "{location}", url.PathEscape(location))
 
+	logger.Info("fetch resource usage and quota")
 	requestUrl := runtime.JoinPaths(ep, urlPath)
-	fmt.Println(requestUrl)
 	for {
 		req, err := runtime.NewRequest(m.Context(), http.MethodGet, requestUrl)
 		if err != nil {