Skip to content

Commit c9e7153

Browse files
authored
Add app-sre labels to servicemonitors (#767)
1 parent 2fc8959 commit c9e7153

File tree

2 files changed

+15
-3
lines changed

2 files changed

+15
-3
lines changed

magefiles/servicemonitors.go

+5-3
Original file line numberDiff line numberDiff line change
@@ -83,9 +83,7 @@ func serviceMonitor(namespace string) []runtime.Object {
8383
func createServiceMonitors(namespace string) []runtime.Object {
8484
interval30s := monitoringv1.Duration("30s")
8585
metricsPath := "/metrics"
86-
87-
// Create ServiceMonitors
88-
return []runtime.Object{
86+
objs := []runtime.Object{
8987
&monitoringv1.ServiceMonitor{
9088
TypeMeta: metav1.TypeMeta{
9189
APIVersion: "monitoring.coreos.com/v1",
@@ -505,4 +503,8 @@ func createServiceMonitors(namespace string) []runtime.Object {
505503
},
506504
},
507505
}
506+
for _, obj := range objs {
507+
obj.(*monitoringv1.ServiceMonitor).ObjectMeta.Labels["prometheus"] = "app-sre"
508+
}
509+
return objs
508510
}

resources/services/servicemonitors/staging/servicemonitors.yaml

+10
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ objects:
1515
app.kubernetes.io/name: thanos-compact
1616
app.kubernetes.io/part-of: thanos
1717
operator.thanos.io/owner: rhobs
18+
prometheus: app-sre
1819
name: thanos-compact-rhobs
1920
namespace: openshift-customer-monitoring
2021
spec:
@@ -44,6 +45,7 @@ objects:
4445
app.kubernetes.io/name: thanos-compact
4546
app.kubernetes.io/part-of: thanos
4647
operator.thanos.io/owner: telemeter
48+
prometheus: app-sre
4749
name: thanos-compact-telemeter
4850
namespace: openshift-customer-monitoring
4951
spec:
@@ -104,6 +106,7 @@ objects:
104106
app.kubernetes.io/part-of: thanos
105107
operator.thanos.io/owner: rhobs
106108
operator.thanos.io/query-api: "true"
109+
prometheus: app-sre
107110
name: thanos-query-rhobs
108111
namespace: openshift-customer-monitoring
109112
spec:
@@ -135,6 +138,7 @@ objects:
135138
app.kubernetes.io/part-of: thanos
136139
operator.thanos.io/owner: rhobs
137140
operator.thanos.io/store-api: "true"
141+
prometheus: app-sre
138142
name: thanos-receive-ingester-rhobs-default
139143
namespace: openshift-customer-monitoring
140144
spec:
@@ -166,6 +170,7 @@ objects:
166170
app.kubernetes.io/part-of: thanos
167171
operator.thanos.io/owner: rhobs
168172
operator.thanos.io/store-api: "true"
173+
prometheus: app-sre
169174
name: thanos-receive-ingester-rhobs-telemeter
170175
namespace: openshift-customer-monitoring
171176
spec:
@@ -196,6 +201,7 @@ objects:
196201
app.kubernetes.io/name: thanos-receive
197202
app.kubernetes.io/part-of: thanos
198203
operator.thanos.io/owner: rhobs
204+
prometheus: app-sre
199205
name: thanos-receive-router-rhobs
200206
namespace: openshift-customer-monitoring
201207
spec:
@@ -227,6 +233,7 @@ objects:
227233
operator.thanos.io/endpoint-group: "true"
228234
operator.thanos.io/owner: default
229235
operator.thanos.io/store-api: "true"
236+
prometheus: app-sre
230237
name: thanos-store-default
231238
namespace: openshift-customer-monitoring
232239
spec:
@@ -259,6 +266,7 @@ objects:
259266
operator.thanos.io/endpoint-group: "true"
260267
operator.thanos.io/owner: telemeter-0to2w
261268
operator.thanos.io/store-api: "true"
269+
prometheus: app-sre
262270
name: thanos-store-telemeter-0to2w
263271
namespace: openshift-customer-monitoring
264272
spec:
@@ -291,6 +299,7 @@ objects:
291299
operator.thanos.io/endpoint-group: "true"
292300
operator.thanos.io/owner: telemeter-2wto90d
293301
operator.thanos.io/store-api: "true"
302+
prometheus: app-sre
294303
name: thanos-store-telemeter-2wto90d
295304
namespace: openshift-customer-monitoring
296305
spec:
@@ -323,6 +332,7 @@ objects:
323332
operator.thanos.io/endpoint-group: "true"
324333
operator.thanos.io/owner: telemeter-90dplus
325334
operator.thanos.io/store-api: "true"
335+
prometheus: app-sre
326336
name: thanos-store-telemeter-90dplus
327337
namespace: openshift-customer-monitoring
328338
spec:

0 commit comments

Comments
 (0)