feedc0de/my-rook-config
1
0 Fork 0
forked from rook/rook
Code Pull Requests Activity

Merge pull request #12222 from rook/mergify/bp/release-1.11/pr-12216

Browse Source 
monitoring: Skip creating the service monitor for the exporter if monitoring is not enabled (backport #12216)
This commit is contained in:
Travis Nielsen authored and GitHub committed 2023-05-10 15:49:45 -06:00
2 parents 21c50bc423 eac19b36d3
commit 6bcb53749d
1 file changed
+5 -3
Download Patch File Download Diff File Expand all files Collapse all files
pkg/operator/ceph/cluster/nodedaemon/reconcile.go
+5 -3
View File
@@ -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")
}
}