Add dimensions managedmetrics

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"`

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

@@ -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

internal/orchestrator/managedhandler.go

@@ -59,25 +59,48 @@ 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)
-		if err != nil {
-			return "", err
+		// Preserve old logic so that if custom dimensions are not set, we use status.conditions
+		// as default dimensions
+		if h.metric.Spec.Dimensions == nil {
+			gv, err := schema.ParseGroupVersion(cr.MangedResource.APIVersion)
+			if err != nil {
+				return "", err
+			}
+
+			dataPoint.AddDimension(KIND, cr.MangedResource.Kind)
+			dataPoint.AddDimension(GROUP, gv.Group)
+			dataPoint.AddDimension(VERSION, gv.Version)
+
+			for typ, state := range cr.Status {
+				t := strings.ToLower(typ)
+				if t == "ready" || t == "synced" {
+					dataPoint.AddDimension(t, strconv.FormatBool(state))
+				}
+			}
+
+		} else {
+			objMap, err := runtime.DefaultUnstructuredConverter.ToUnstructured(&cr.MangedResource)
+			if err != nil {
+				return "", err
+			}
+
+			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)
+			}
 		}
-		dataPoint.AddDimension(KIND, cr.MangedResource.Kind)
-		dataPoint.AddDimension(GROUP, gv.Group)
-		dataPoint.AddDimension(VERSION, gv.Version)
 
 		// 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)