prometheus: Remove cardinality-analysis sidecar (#397)

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

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

Author: ArthurSens

installer/pkg/components/prometheus/prometheus.go

@@ -40,9 +40,6 @@ func prometheus(ctx *common.RenderContext) ([]runtime.Object, error) {
 			},
 			RuleSelector: &metav1.LabelSelector{},
 			CommonPrometheusFields: monitoringv1.CommonPrometheusFields{
-				Containers: []corev1.Container{
-					cardinalityExporterSideCar(),
-				},
 				Image: pointer.String(fmt.Sprintf("%s:v%s", ImageURL, Version)),
 				PodMetadata: &monitoringv1.EmbeddedObjectMetadata{
 					Labels: common.Labels(Name, Component, App, Version),
@@ -116,16 +113,3 @@ func remoteWriteSpecs(ctx *common.RenderContext) []monitoringv1.RemoteWriteSpec
 
 	return specs
 }
-
-func cardinalityExporterSideCar() corev1.Container {
-	return corev1.Container{
-		Name:  "cardinality-exporter",
-		Image: "ghcr.io/arthursens/cardinality-exporter:main",
-		Ports: []corev1.ContainerPort{
-			{
-				Name:          "cardinality",
-				ContainerPort: 9091,
-			},
-		},
-	}
-}

installer/pkg/components/prometheus/service.go

@@ -33,11 +33,6 @@ func service(ctx *common.RenderContext) ([]runtime.Object, error) {
 						Port:       8080,
 						TargetPort: intstr.FromString("reloader-web"),
 					},
-					{
-						Name:       "cardinality",
-						Port:       9091,
-						TargetPort: intstr.FromString("cardinality"),
-					},
 				},
 				Selector: map[string]string{
 					"app.kubernetes.io/name": "prometheus",

installer/pkg/components/prometheus/serviceMonitor.go

@@ -40,17 +40,6 @@ func serviceMonitor(ctx *common.RenderContext) ([]runtime.Object, error) {
 							},
 						},
 					},
-					{
-						Port:     "cardinality",
-						Interval: "5m",
-						MetricRelabelConfigs: []*monitoringv1.RelabelConfig{
-							{
-								SourceLabels: []monitoringv1.LabelName{"__name__"},
-								Regex:        strings.Join(ctx.Config.Prometheus.MetricsToDrop, "|"),
-								Action:       "drop",
-							},
-						},
-					},
 				},
 				Selector: metav1.LabelSelector{
 					MatchLabels: common.Labels(Name, Component, App, Version),

tests/e2e/main_test.go

@@ -142,7 +142,7 @@ func TestQueryPrometheus(t *testing.T) {
 			expectN: 2,
 		}, {
 			query:   `up{job="prometheus-k8s"} == 1`,
-			expectN: 3,
+			expectN: 2,
 		}, {
 			query:   `up{job="prometheus-operator"} == 1`,
 			expectN: 1,