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

exporter: applying labels from monitoring section to ceph-exporter (backport #13902)
This commit is contained in:
Travis Nielsen authored and GitHub committed 2024-03-13 15:17:34 -06:00
commit b79cc91040
2 files changed
+3

No files matched your search

+2
View File
@@ -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:
@@ -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{