Merge pull request #2546 from machine424/tellmore

MON-4107: chore: add logs (at v=3 level) regarding the deactivation of components

Author: openshift-merge-bot[bot]

pkg/tasks/alertmanager.go

@@ -19,6 +19,7 @@ import (
 	"fmt"
 
 	"k8s.io/apimachinery/pkg/types"
+	"k8s.io/klog/v2"
 
 	"github.com/openshift/cluster-monitoring-operator/pkg/client"
 	"github.com/openshift/cluster-monitoring-operator/pkg/manifests"
@@ -47,6 +48,7 @@ func (t *AlertmanagerTask) Run(ctx context.Context) error {
 		return t.create(ctx)
 	}
 
+	klog.V(3).Infof("Main alertmanager is disabled, existing related resources are to be destroyed.")
 	return t.destroy(ctx)
 }
 

pkg/tasks/alertmanager_user_workload.go

@@ -19,6 +19,7 @@ import (
 	"fmt"
 
 	"k8s.io/apimachinery/pkg/types"
+	"k8s.io/klog/v2"
 
 	"github.com/openshift/cluster-monitoring-operator/pkg/client"
 	"github.com/openshift/cluster-monitoring-operator/pkg/manifests"
@@ -47,6 +48,7 @@ func (t *AlertmanagerUserWorkloadTask) Run(ctx context.Context) error {
 		return t.create(ctx)
 	}
 
+	klog.V(3).Infof("UWM alertmanager is disabled, existing related resources are to be destroyed.")
 	return t.destroy(ctx)
 }
 

pkg/tasks/prometheus_user_workload.go

@@ -44,6 +44,7 @@ func (t *PrometheusUserWorkloadTask) Run(ctx context.Context) error {
 		return t.create(ctx)
 	}
 
+	klog.V(3).Infof("UWM prometheus is disabled (because UWM is disabled), existing related resources are to be destroyed.")
 	return t.destroy(ctx)
 }
 

pkg/tasks/prometheusoperator_user_workload.go

@@ -18,6 +18,8 @@ import (
 	"context"
 	"fmt"
 
+	"k8s.io/klog/v2"
+
 	"github.com/openshift/cluster-monitoring-operator/pkg/client"
 	"github.com/openshift/cluster-monitoring-operator/pkg/manifests"
 )
@@ -41,6 +43,7 @@ func (t *PrometheusOperatorUserWorkloadTask) Run(ctx context.Context) error {
 		return t.create(ctx)
 	}
 
+	klog.V(3).Infof("UWM prometheus operator is disabled (because UWM is disabled), existing related resources are to be destroyed.")
 	return t.destroy(ctx)
 }
 

pkg/tasks/telemeter.go

@@ -19,6 +19,7 @@ import (
 	"fmt"
 
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
+	"k8s.io/klog/v2"
 
 	"github.com/openshift/cluster-monitoring-operator/pkg/client"
 	"github.com/openshift/cluster-monitoring-operator/pkg/manifests"
@@ -43,7 +44,16 @@ func (t *TelemeterClientTask) Run(ctx context.Context) error {
 		return t.create(ctx)
 	}
 
-	if !t.config.ClusterMonitoringConfiguration.TelemeterClientConfig.IsEnabled() || t.config.ClusterMonitoringConfiguration.TelemeterClientConfig.IsEnabled() && t.config.RemoteWrite {
+	var reason string
+	switch {
+	case !t.config.ClusterMonitoringConfiguration.TelemeterClientConfig.IsEnabled():
+		reason = "telemetry is explicitly disabled"
+	case t.config.ClusterMonitoringConfiguration.TelemeterClientConfig.IsEnabled() && t.config.RemoteWrite:
+		reason = "remote-write is enabled instead"
+	}
+
+	if reason != "" {
+		klog.V(3).Infof("Telemeter client is disabled (because %s), existing related resources are to be destroyed.", reason)
 		return t.destroy(ctx)
 	}
 

pkg/tasks/thanos_ruler_user_workload.go

@@ -18,6 +18,8 @@ import (
 	"context"
 	"fmt"
 
+	"k8s.io/klog/v2"
+
 	"github.com/openshift/cluster-monitoring-operator/pkg/client"
 	"github.com/openshift/cluster-monitoring-operator/pkg/manifests"
 )
@@ -41,6 +43,7 @@ func (t *ThanosRulerUserWorkloadTask) Run(ctx context.Context) error {
 		return t.create(ctx)
 	}
 
+	klog.V(3).Infof("UWM thanos ruler is disabled (because UWM is disabled), existing related resources are to be destroyed.")
 	return t.destroy(ctx)
 }