Merge pull request #13924 from rook/mergify/bp/release-1.13/pr-13902

exporter: applying labels from monitoring section to ceph-exporter (backport #13902)
rook · Mar 13, 2024 · b79cc91 · b79cc91
2 parents 1c8abbe + 6cc8ef7
commit b79cc91
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/deploy/examples/cluster.yaml b/deploy/examples/cluster.yaml
@@ -206,6 +206,8 @@ spec:
   #   cleanup:
   #   mgr:
   #   prepareosd:
+  # These labels are applied to ceph-exporter servicemonitor only
+  #   exporter:
   # monitoring is a list of key-value pairs. It is injected into all the monitoring resources created by operator.
   # These labels can be passed as LabelSelector to Prometheus
   #   monitoring:

diff --git a/pkg/operator/ceph/cluster/nodedaemon/exporter.go b/pkg/operator/ceph/cluster/nodedaemon/exporter.go
@@ -261,6 +261,7 @@ func EnableCephExporterServiceMonitor(context *clusterd.Context, cephCluster cep
 
 func applyCephExporterLabels(cephCluster cephv1.CephCluster, serviceMonitor *monitoringv1.ServiceMonitor) {
 	if cephCluster.Spec.Labels != nil {
+		cephv1.GetMonitoringLabels(cephCluster.Spec.Labels).OverwriteApplyToObjectMeta(&serviceMonitor.ObjectMeta)
 		if cephExporterLabels, ok := cephCluster.Spec.Labels["exporter"]; ok {
 			if managedBy, ok := cephExporterLabels["rook.io/managedBy"]; ok {
 				relabelConfig := monitoringv1.RelabelConfig{