add multi dimensions for managed metrics

Author: jpraychev

api/v1alpha1/managedmetric_types.go

@@ -31,6 +31,10 @@ type ManagedMetricSpec struct {
 	// Defines which managed resources to observe
 	// +optional
 	Target *GroupVersionKind `json:"target,omitempty"`
+	// Defines dimensions of the metric. All specified fields must be nested strings. Nested slices are not supported.
+	// If not specified, only status.conditions of the CR will be used as dimension.
+	// +optional
+	Dimensions map[string]string `json:"dimensions,omitempty"`
 	// Define labels of your object to adapt filters of the query
 	// +optional
 	LabelSelector string `json:"labelSelector,omitempty"`

api/v1alpha1/zz_generated.deepcopy.go

@@ -65,6 +65,13 @@ spec:
                 description: Sets the description that will be used to identify the
                   metric in Dynatrace(or other providers)
                 type: string
+              dimensions:
+                additionalProperties:
+                  type: string
+                description: |-
+                  Defines dimensions of the metric. All specified fields must be nested strings. Nested slices are not supported.
+                  If not specified, only status.conditions of the CR will be used as dimension.
+                type: object
               fieldSelector:
                 description: Define fields of your object to adapt filters of the
                   query

cmd/metrics-operator/embedded/crds/metrics.openmcp.cloud_managedmetrics.yaml

@@ -89,6 +89,12 @@ func (d *DataSinkCredentialsRetriever) GetDataSinkCredentials(ctx context.Contex
 		return common.DataSinkCredentials{}, err
 	}
 
+	localEnp := os.Getenv("LOCAL_DATASINK")
+	if localEnp != "" {
+		l.Info("Using LOCAL_DATASINK environment variable for DataSink endpoint.", "endpoint", localEnp)
+		dataSink.Spec.Connection.Endpoint = localEnp
+	}
+
 	// Extract endpoint from DataSink
 	endpoint := dataSink.Spec.Connection.Endpoint
 

internal/controller/datasink_utils.go

@@ -20,7 +20,6 @@ import (
 	"context"
 	"fmt"
 	"net/url"
-	"strings"
 	"time"
 
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
@@ -309,11 +308,7 @@ func getClusterInfo(config *rest.Config) (string, error) {
 		return "localhost", nil
 	}
 
-	// Remove any prefix (like "kubernetes" or "kubernetes.default.svc")
-	parts := strings.Split(hostname, ".")
-	clusterName := parts[0]
-
-	return clusterName, nil
+	return hostname, nil
 }
 
 // OrchestratorFactory is a function type for creating orchestrators

internal/controller/managedmetric_controller.go

@@ -45,22 +45,22 @@ func TestGetClusterInfo(t *testing.T) {
 		{
 			name:         "KubernetesService",
 			host:         "https://kubernetes.default.svc:6443",
-			expectedName: "kubernetes",
+			expectedName: "kubernetes.default.svc",
 		},
 		{
 			name:         "CustomClusterName",
 			host:         "https://my-cluster-api.example.com:6443",
-			expectedName: "my-cluster-api",
+			expectedName: "my-cluster-api.example.com",
 		},
 		{
 			name:         "IPAddress",
 			host:         "https://192.168.1.1:6443",
-			expectedName: "192", // The function only extracts the first part of the IP address
+			expectedName: "192.168.1.1", // The function only extracts the first part of the IP address
 		},
 		{
 			name:         "WithPath",
 			host:         "https://kubernetes.default.svc:6443/api",
-			expectedName: "kubernetes",
+			expectedName: "kubernetes.default.svc",
 		},
 	}
 

internal/controller/metric_controller_helpers_test.go

@@ -5,7 +5,6 @@ import (
 	"fmt"
 	"slices"
 	"strconv"
-	"strings"
 
 	apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -59,25 +58,27 @@ func (h *ManagedHandler) sendStatusBasedMetricValue(ctx context.Context) (string
 		// Create a new data point for each resource
 		dataPoint := clientoptl.NewDataPoint()
 
-		// Add GVK dimensions from resource
-		gv, err := schema.ParseGroupVersion(cr.MangedResource.APIVersion)
+		objMap, err := runtime.DefaultUnstructuredConverter.ToUnstructured(&cr.MangedResource)
 		if err != nil {
 			return "", err
 		}
-		dataPoint.AddDimension(KIND, cr.MangedResource.Kind)
-		dataPoint.AddDimension(GROUP, gv.Group)
-		dataPoint.AddDimension(VERSION, gv.Version)
+
+		u := &unstructured.Unstructured{Object: objMap}
+
+		for key, expr := range h.metric.Spec.Dimensions {
+			s, _, err := nestedPrimitiveValue(*u, expr)
+			if err != nil {
+				fmt.Printf("WARN: Could not parse expression '%s' for dimension field '%s'. Error: %v\n", key, expr, err)
+				continue
+			}
+			dataPoint.AddDimension(key, s)
+		}
 
 		// Add cluster dimension if available
 		if h.clusterName != nil {
 			dataPoint.AddDimension(CLUSTER, *h.clusterName)
 		}
 
-		// Add status conditions as dimensions
-		for typ, state := range cr.Status {
-			dataPoint.AddDimension(strings.ToLower(typ), strconv.FormatBool(state))
-		}
-
 		// Set the value to 1 for each resource
 		dataPoint.SetValue(1)
 

internal/orchestrator/managedhandler.go

@@ -29,6 +29,9 @@ const (
 
 	// APIVERSION Constant for k8s resource fields
 	APIVERSION string = "apiVersion"
+
+	// NAME Constant for k8s resource fields
+	CR_NAME string = "crName"
 )
 
 // GenericHandler is used to monitor the metric