LOG-9356: Implement Collector ServiceMontitor Changes

Author: Clee2691

internal/metrics/service_monitor.go

@@ -30,17 +30,22 @@ func newServiceMonitor(namespace, name string, owner metav1.OwnerReference, sele
 					ServerName: fmt.Sprintf("%s.%s.svc", name, namespace),
 				},
 			},
-			// Replaces labels that have `-` with `_`
-			// Example:
-			// app_kubernetes_io_part-of -> app_kubernetes_io_part_of
 			MetricRelabelConfigs: []*monitoringv1.RelabelConfig{
 				{
-					SourceLabels: []monitoringv1.LabelName{
-						"__name__",
-					},
-					TargetLabel: "__name__",
-					Regex:       "(.*)-(.*)",
-					Replacement: "${1}_${2}",
+					SourceLabels: []monitoringv1.LabelName{"__name__"},
+					TargetLabel:  "__name__",
+					Regex:        "(.*)-(.*)",
+					Replacement:  "${1}_${2}",
+				},
+				{
+					Action:       "keep",
+					SourceLabels: []monitoringv1.LabelName{"__name__"},
+					Regex:        "logcollector_component_event_unmatched_count|vector_buffer_byte_size|vector_buffer_discarded_events_total|vector_buffer_events|vector_buffer_sent_events_total|vector_component_discarded_events_total|vector_component_errors_total|vector_component_received_bytes_total|vector_component_received_event_bytes_total|vector_component_received_events_total|vector_component_sent_bytes_total|vector_events_in_total|vector_http_client_errors_total|vector_http_client_requests_sent_total|vector_http_client_responses_total|vector_open_files",
+				},
+				{
+					Action:       "drop",
+					SourceLabels: []monitoringv1.LabelName{"component_kind", "__name__"},
+					Regex:        `transform;(vector_component_received_bytes_total|vector_component_received_event_bytes_total|vector_component_received_events_total|vector_component_sent_bytes_total)`,
 				},
 			},
 		},

internal/metrics/service_monitor_test.go

@@ -72,5 +72,19 @@ var _ = Describe("Reconcile ServiceMonitor", func() {
 
 		Expect(smInstance.Spec.Endpoints[0].BearerTokenFile).
 			To(Equal("/var/run/secrets/kubernetes.io/serviceaccount/token"))
+
+		By("verifying MetricRelabelConfigs")
+		relabelConfigs := smInstance.Spec.Endpoints[0].MetricRelabelConfigs
+		Expect(relabelConfigs).To(HaveLen(3))
+
+		Expect(relabelConfigs[0].Regex).To(Equal("(.*)-(.*)"))
+		Expect(relabelConfigs[0].TargetLabel).To(Equal("__name__"))
+
+		Expect(string(relabelConfigs[1].Action)).To(Equal("keep"))
+		Expect(relabelConfigs[1].SourceLabels).To(Equal([]monitoringv1.LabelName{"__name__"}))
+
+		Expect(string(relabelConfigs[2].Action)).To(Equal("drop"))
+		Expect(relabelConfigs[2].SourceLabels).To(Equal([]monitoringv1.LabelName{"component_kind", "__name__"}))
+		Expect(relabelConfigs[2].Regex).To(Equal(`transform;(vector_component_received_bytes_total|vector_component_received_event_bytes_total|vector_component_received_events_total|vector_component_sent_bytes_total)`))
 	})
 })