Skip to content

Commit ff29a2f

Browse files
authored
Rename service monitor templates to include env (#728)
1 parent ae4aa0d commit ff29a2f

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

magefiles/lib.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ func postProcessServiceMonitor(serviceMonitor *monv1.ServiceMonitor, namespaceSe
146146
serviceMonitor.Spec.NamespaceSelector.MatchNames = []string{namespaceSelector}
147147
serviceMonitor.ObjectMeta.Labels[openshiftCustomerMonitoringLabel] = openShiftClusterMonitoringLabelValue
148148

149-
name := serviceMonitor.Name + "-service-monitor"
149+
name := serviceMonitor.Name + "-service-monitor-" + namespaceSelector
150150

151151
template := openshift.WrapInTemplate([]runtime.Object{serviceMonitor}, metav1.ObjectMeta{
152152
Name: name,

resources/services/alertmanager/production/service-monitor-template.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: template.openshift.io/v1
22
kind: Template
33
metadata:
44
creationTimestamp: null
5-
name: alertmanager-service-monitor
5+
name: alertmanager-service-monitor-rhobs-production
66
objects:
77
- apiVersion: monitoring.coreos.com/v1
88
kind: ServiceMonitor

resources/services/alertmanager/staging/service-monitor-template.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: template.openshift.io/v1
22
kind: Template
33
metadata:
44
creationTimestamp: null
5-
name: alertmanager-service-monitor
5+
name: alertmanager-service-monitor-rhobs-stage
66
objects:
77
- apiVersion: monitoring.coreos.com/v1
88
kind: ServiceMonitor

0 commit comments

Comments
 (0)