From eac19b36d3d9ed6c5ea4d262d89e305d1af07497 Mon Sep 17 00:00:00 2001 From: travisn Date: Tue, 9 May 2023 14:52:40 -0600 Subject: [PATCH] monitoring: no service monitor by default for exporter The exporter is enabled by default, but the service monitor can only be enabled if prometheus CRDs are available. The monitoring.enabled must be set to true as the flag that prometheus is available and the service monitor should be created. Signed-off-by: travisn (cherry picked from commit 1b80767877ecff1772d5c733367ecd16b0f1a29e) --- pkg/operator/ceph/cluster/nodedaemon/reconcile.go | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkg/operator/ceph/cluster/nodedaemon/reconcile.go b/pkg/operator/ceph/cluster/nodedaemon/reconcile.go index 4d02a5156..a25c0f7e8 100644 --- a/pkg/operator/ceph/cluster/nodedaemon/reconcile.go +++ b/pkg/operator/ceph/cluster/nodedaemon/reconcile.go @@ -240,10 +240,12 @@ func (r *ReconcileNode) createOrUpdateNodeDaemons(node corev1.Node, tolerations return errors.Wrap(err, "failed to create ceph-exporter metrics service") } - if err := EnableCephExporterServiceMonitor(cephCluster, r.scheme, r.opManagerContext); err != nil { - return errors.Wrap(err, "failed to enable service monitor") + if cephCluster.Spec.Monitoring.Enabled { + if err := EnableCephExporterServiceMonitor(cephCluster, r.scheme, r.opManagerContext); err != nil { + return errors.Wrap(err, "failed to enable service monitor") + } + logger.Debug("service monitor for ceph exporter was enabled successfully") } - logger.Debug("service monitor for ceph exporter was enabled successfully") } }