Extend Azure Monitor scaler to support custom metrics (#1883)

Signed-off-by: amirschw <[email protected]>

CHANGELOG.md

@@ -21,6 +21,7 @@
 
 ### New
 
+- Extend Azure Monitor scaler to support custom metrics ([#1883](https://github.com/kedacore/keda/pull/1883))
 - Support non-public cloud environments in the Azure Storage Queue and Azure Storage Blob scalers ([#1863](https://github.com/kedacore/keda/pull/1863))
 - Show HashiCorp Vault Address when using `kubectl get ta` or `kubectl get cta` ([#1862](https://github.com/kedacore/keda/pull/1862))
 

pkg/scalers/azure/azure_monitor.go

@@ -20,6 +20,7 @@ import (
 
 type azureExternalMetricRequest struct {
 	MetricName                string
+	MetricNamespace           string
 	SubscriptionID            string
 	ResourceName              string
 	ResourceProviderNamespace string
@@ -37,6 +38,7 @@ type MonitorInfo struct {
 	SubscriptionID      string
 	ResourceGroupName   string
 	Name                string
+	Namespace           string
 	Filter              string
 	AggregationInterval string
 	AggregationType     string
@@ -79,11 +81,12 @@ func createMetricsClient(info MonitorInfo, podIdentityEnabled bool) insights.Met
 
 func createMetricsRequest(info MonitorInfo) (*azureExternalMetricRequest, error) {
 	metricRequest := azureExternalMetricRequest{
-		MetricName:     info.Name,
-		SubscriptionID: info.SubscriptionID,
-		Aggregation:    info.AggregationType,
-		Filter:         info.Filter,
-		ResourceGroup:  info.ResourceGroupName,
+		MetricName:      info.Name,
+		MetricNamespace: info.Namespace,
+		SubscriptionID:  info.SubscriptionID,
+		Aggregation:     info.AggregationType,
+		Filter:          info.Filter,
+		ResourceGroup:   info.ResourceGroupName,
 	}
 
 	resourceInfo := strings.Split(info.ResourceURI, "/")
@@ -126,7 +129,7 @@ func getAzureMetric(ctx context.Context, client insights.MetricsClient, azMetric
 	metricResult, err := client.List(ctx, metricResourceURI,
 		azMetricRequest.Timespan, nil,
 		azMetricRequest.MetricName, azMetricRequest.Aggregation, nil,
-		"", azMetricRequest.Filter, "", "")
+		"", azMetricRequest.Filter, "", azMetricRequest.MetricNamespace)
 	if err != nil {
 		return -1, err
 	}

pkg/scalers/azure_monitor_scaler.go

@@ -119,6 +119,10 @@ func parseAzureMonitorMetadata(config *ScalerConfig) (*azureMonitorMetadata, err
 		return nil, fmt.Errorf("no tenantId given")
 	}
 
+	if val, ok := config.TriggerMetadata["metricNamespace"]; ok {
+		meta.azureMonitorInfo.Namespace = val
+	}
+
 	clientID, clientPassword, err := parseAzurePodIdentityParams(config)
 	if err != nil {
 		return nil, err

pkg/scalers/azure_monitor_scaler_test.go

@@ -28,7 +28,7 @@ var testParseAzMonitorMetadata = []parseAzMonitorMetadataTestData{
 	// nothing passed
 	{map[string]string{}, true, map[string]string{}, map[string]string{}, ""},
 	// properly formed
-	{map[string]string{"resourceURI": "test/resource/uri", "tenantId": "123", "subscriptionId": "456", "resourceGroupName": "test", "metricName": "metric", "metricAggregationInterval": "0:15:0", "metricAggregationType": "Average", "activeDirectoryClientId": "CLIENT_ID", "activeDirectoryClientPasswordFromEnv": "CLIENT_PASSWORD", "targetValue": "5"}, false, testAzMonitorResolvedEnv, map[string]string{}, ""},
+	{map[string]string{"resourceURI": "test/resource/uri", "tenantId": "123", "subscriptionId": "456", "resourceGroupName": "test", "metricName": "metric", "metricAggregationInterval": "0:15:0", "metricAggregationType": "Average", "activeDirectoryClientId": "CLIENT_ID", "activeDirectoryClientPasswordFromEnv": "CLIENT_PASSWORD", "targetValue": "5", "metricNamespace": "namespace"}, false, testAzMonitorResolvedEnv, map[string]string{}, ""},
 	// no optional parameters
 	{map[string]string{"resourceURI": "test/resource/uri", "tenantId": "123", "subscriptionId": "456", "resourceGroupName": "test", "metricName": "metric", "metricAggregationType": "Average", "activeDirectoryClientId": "CLIENT_ID", "activeDirectoryClientPasswordFromEnv": "CLIENT_PASSWORD", "targetValue": "5"}, false, testAzMonitorResolvedEnv, map[string]string{}, ""},
 	// incorrectly formatted resourceURI