fix: e2e-tests

Signed-off-by: Bence Csati <bence.csati@axoflow.com>

Author: csatib02

e2e/logging_metrics_monitoring/logging_metrics_monitoring_test.go

@@ -25,6 +25,7 @@ import (
 	"testing"
 	"time"
 
+	"github.com/cisco-open/operator-tools/pkg/utils"
 	v1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1"
 	"github.com/stretchr/testify/require"
 	appsv1 "k8s.io/api/apps/v1"
@@ -128,9 +129,11 @@ func TestLoggingMetrics_Monitoring(t *testing.T) {
 				ControlNamespace: ns,
 				FluentbitSpec: &v1beta1.FluentbitSpec{
 					Metrics: &v1beta1.Metrics{
+						Enabled:        utils.BoolPointer(true),
 						ServiceMonitor: true,
 					},
 					BufferVolumeMetrics: &v1beta1.Metrics{
+						Enabled:        utils.BoolPointer(true),
 						ServiceMonitor: true,
 					},
 					ConfigHotReload: &v1beta1.HotReload{
@@ -154,10 +157,12 @@ func TestLoggingMetrics_Monitoring(t *testing.T) {
 						Tag:        common.NodeExporterTag,
 					},
 					Metrics: &v1beta1.Metrics{
+						Enabled:        utils.BoolPointer(true),
 						ServiceMonitor: true,
 					},
 					BufferVolumeMetrics: &v1beta1.BufferMetrics{
 						Metrics: v1beta1.Metrics{
+							Enabled:        utils.BoolPointer(true),
 							ServiceMonitor: true,
 						},
 					},
@@ -214,9 +219,11 @@ func TestLoggingMetrics_Monitoring(t *testing.T) {
 				ControlNamespace: ns,
 				FluentbitSpec: &v1beta1.FluentbitSpec{
 					Metrics: &v1beta1.Metrics{
+						Enabled:        utils.BoolPointer(true),
 						ServiceMonitor: true,
 					},
 					BufferVolumeMetrics: &v1beta1.Metrics{
+						Enabled:        utils.BoolPointer(true),
 						ServiceMonitor: true,
 					},
 					ConfigHotReload: &v1beta1.HotReload{
@@ -244,9 +251,11 @@ func TestLoggingMetrics_Monitoring(t *testing.T) {
 						Tag:        common.NodeExporterTag,
 					},
 					Metrics: &v1beta1.Metrics{
+						Enabled:        utils.BoolPointer(true),
 						ServiceMonitor: true,
 					},
 					BufferVolumeMetrics: &v1beta1.Metrics{
+						Enabled:        utils.BoolPointer(true),
 						ServiceMonitor: true,
 					},
 				},

e2e/volumedrain/volumedrain_test.go

@@ -120,7 +120,9 @@ func TestVolumeDrain_Downscale(t *testing.T) {
 							corev1.ResourceMemory: resource.MustParse("50M"),
 						},
 					},
-					BufferVolumeMetrics: &v1beta1.Metrics{},
+					BufferVolumeMetrics: &v1beta1.Metrics{
+						Enabled: utils.BoolPointer(true),
+					},
 					Scaling: &v1beta1.FluentdScaling{
 						Replicas: 2,
 						Drain: v1beta1.FluentdDrainConfig{
@@ -365,7 +367,9 @@ func TestVolumeDrain_Downscale_DeleteVolume(t *testing.T) {
 							corev1.ResourceMemory: resource.MustParse("50M"),
 						},
 					},
-					BufferVolumeMetrics: &v1beta1.Metrics{},
+					BufferVolumeMetrics: &v1beta1.Metrics{
+						Enabled: utils.BoolPointer(true),
+					},
 					Scaling: &v1beta1.FluentdScaling{
 						Replicas: 2,
 						Drain: v1beta1.FluentdDrainConfig{