Skip to content

Commit

Permalink
Merge pull request #2433 from aruniiird/add-managedBy-label-to-rook-c…
Browse files Browse the repository at this point in the history
…eph-exporter-metrics

Add 'managedBy' label to rook-ceph-exporter metrics
  • Loading branch information
openshift-merge-bot[bot] authored Jan 31, 2024
2 parents 1639f12 + 15e9f49 commit f8deb54
Showing 1 changed file with 7 additions and 5 deletions.
12 changes: 7 additions & 5 deletions controllers/storagecluster/cephcluster.go
Original file line number Diff line number Diff line change
Expand Up @@ -478,10 +478,11 @@ func newCephCluster(sc *ocsv1.StorageCluster, cephImage string, serverVersion *v
ContinueUpgradeAfterChecksEvenIfNotHealthy: sc.Spec.ResourceProfile == sc.Status.LastAppliedResourceProfile,
LogCollector: logCollector,
Labels: rookCephv1.LabelsSpec{
rookCephv1.KeyMgr: rookCephv1.Labels{defaults.ODFResourceProfileKey: sc.Spec.ResourceProfile},
rookCephv1.KeyMon: rookCephv1.Labels{defaults.ODFResourceProfileKey: sc.Spec.ResourceProfile},
rookCephv1.KeyOSD: rookCephv1.Labels{defaults.ODFResourceProfileKey: sc.Spec.ResourceProfile},
rookCephv1.KeyMonitoring: getCephClusterMonitoringLabels(*sc),
rookCephv1.KeyMgr: rookCephv1.Labels{defaults.ODFResourceProfileKey: sc.Spec.ResourceProfile},
rookCephv1.KeyMon: rookCephv1.Labels{defaults.ODFResourceProfileKey: sc.Spec.ResourceProfile},
rookCephv1.KeyOSD: rookCephv1.Labels{defaults.ODFResourceProfileKey: sc.Spec.ResourceProfile},
rookCephv1.KeyMonitoring: getCephClusterMonitoringLabels(*sc),
rookCephv1.KeyCephExporter: getCephClusterMonitoringLabels(*sc),
},
CSI: rookCephv1.CSIDriverSpec{
ReadAffinity: getReadAffinityOptions(sc),
Expand Down Expand Up @@ -640,7 +641,8 @@ func newExternalCephCluster(sc *ocsv1.StorageCluster, monitoringIP, monitoringPo
Monitoring: monitoringSpec,
Network: getNetworkSpec(*sc),
Labels: rookCephv1.LabelsSpec{
rookCephv1.KeyMonitoring: getCephClusterMonitoringLabels(*sc),
rookCephv1.KeyMonitoring: getCephClusterMonitoringLabels(*sc),
rookCephv1.KeyCephExporter: getCephClusterMonitoringLabels(*sc),
},
CSI: rookCephv1.CSIDriverSpec{
ReadAffinity: getReadAffinityOptions(sc),
Expand Down

0 comments on commit f8deb54

Please sign in to comment.