Fixed selectorMatchLabels

Signed-off-by: Yuri Sa <[email protected]>

Author: yuriolisa

internal/manifests/collector/servicemonitor_test.go

@@ -40,7 +40,7 @@ func TestDesiredServiceMonitors(t *testing.T) {
 		"app.kubernetes.io/instance":   fmt.Sprintf("%s.%s", params.OtelCol.Namespace, params.OtelCol.Name),
 		"app.kubernetes.io/managed-by": "opentelemetry-operator",
 		"app.kubernetes.io/part-of":    "opentelemetry",
-		"app.kubernetes.io/name":       fmt.Sprintf("%s-monitoring", params.OtelCol.Name),
+		"app.kubernetes.io/name":       fmt.Sprintf("%s-collector-monitoring", params.OtelCol.Name),
 	}
 	assert.Equal(t, expectedSelectorLabels, actual.Spec.Selector.MatchLabels)
 }
@@ -62,7 +62,7 @@ func TestDesiredServiceMonitorsWithPrometheus(t *testing.T) {
 		"app.kubernetes.io/instance":   fmt.Sprintf("%s.%s", params.OtelCol.Namespace, params.OtelCol.Name),
 		"app.kubernetes.io/managed-by": "opentelemetry-operator",
 		"app.kubernetes.io/part-of":    "opentelemetry",
-		"app.kubernetes.io/name":       fmt.Sprintf("%s-monitoring", params.OtelCol.Name),
+		"app.kubernetes.io/name":       fmt.Sprintf("%s-collector-monitoring", params.OtelCol.Name),
 	}
 	assert.Equal(t, expectedSelectorLabels, actual.Spec.Selector.MatchLabels)
 }

internal/naming/main.go

@@ -159,9 +159,10 @@ func ServiceAccount(otelcol string) string {
 func ServiceMonitor(otelcol string) string {
 	return DNSName(Truncate("%s-collector", 63, otelcol))
 }
+
 // ServiceMonitorSelectorName builds the service Monitor name based on the instance.
 func ServiceMonitorSelectorName(otelcol string) string {
-	return DNSName(Truncate("%s-monitoring", 63, otelcol))
+	return DNSName(Truncate("%s-monitoring", 63, checkCollectorPrefix(otelcol)))
 }
 
 // PodMonitor builds the pod Monitor name based on the instance.

internal/naming/triming.go

@@ -20,6 +20,7 @@ package naming
 import (
 	"fmt"
 	"regexp"
+	"strings"
 )
 
 var regexpEndReplace, regexpBeginReplace *regexp.Regexp
@@ -72,3 +73,13 @@ func trimNonAlphaNumeric(text string) string {
 	newText := regexpEndReplace.ReplaceAllString(text, "")
 	return regexpBeginReplace.ReplaceAllString(newText, "")
 }
+
+// checkCollectorPrefix adds -collecto suffix in case the ObjectName doesn't contain it
+// used on ServiceMonitor selector labels to filter the monitoring service out.
+func checkCollectorPrefix(text string) string {
+	if !strings.Contains(text, "-collector") {
+		var newText = text + "-collector"
+		return newText
+	}
+	return text
+}