Skip to content

Commit 85776e9

Browse files
author
Jeff Peeler
committed
fix(metrics): add service monitor config
1 parent d8996f1 commit 85776e9

File tree

2 files changed

+122
-0
lines changed

2 files changed

+122
-0
lines changed

deploy/chart/templates/0000_50_olm_00-namespace.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ metadata:
44
name: {{ .Values.namespace }}
55
labels:
66
openshift.io/run-level: "1"
7+
openshift.io/cluster-monitoring: "true"
78
---
89
apiVersion: v1
910
kind: Namespace
Lines changed: 121 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,121 @@
1+
apiVersion: monitoring.coreos.com/v1
2+
kind: ServiceMonitor
3+
metadata:
4+
name: olm-operator
5+
namespace: {{ .Values.namespace }}
6+
labels:
7+
app: olm-operator
8+
spec:
9+
endpoints:
10+
- bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token
11+
interval: 30s
12+
metricRelabelings:
13+
- action: drop
14+
regex: etcd_(debugging|disk|request|server).*
15+
sourceLabels:
16+
- __name__
17+
port: https-metrics
18+
scheme: https
19+
tlsConfig:
20+
caFile: /etc/prometheus/configmaps/serving-certs-ca-bundle/service-ca.crt
21+
serverName: olm-operator-metrics.{{ .Values.namespace }}.svc
22+
jobLabel: component
23+
namespaceSelector:
24+
matchNames:
25+
- {{ .Values.namespace }}
26+
selector:
27+
matchLabels:
28+
app: olm-operator
29+
---
30+
apiVersion: v1
31+
kind: Service
32+
metadata:
33+
name: olm-operator
34+
namespace: {{ .Values.namespace }}
35+
labels:
36+
app: olm-operator
37+
spec:
38+
ports:
39+
- name: http-metrics
40+
port: 8081
41+
protocol: TCP
42+
targetPort: http
43+
selector:
44+
app: olm-operator
45+
---
46+
apiVersion: monitoring.coreos.com/v1
47+
kind: ServiceMonitor
48+
metadata:
49+
name: catalog-operator
50+
namespace: {{ .Values.namespace }}
51+
labels:
52+
app: catalog-operator
53+
spec:
54+
jobLabel: k8s-app
55+
endpoints:
56+
- bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token
57+
interval: 30s
58+
metricRelabelings:
59+
- action: drop
60+
regex: etcd_(debugging|disk|request|server).*
61+
sourceLabels:
62+
- __name__
63+
port: https-metrics
64+
scheme: https
65+
tlsConfig:
66+
caFile: /etc/prometheus/configmaps/serving-certs-ca-bundle/service-ca.crt
67+
serverName: catalog-operator-metrics.{{ .Values.namespace }}.svc
68+
jobLabel: component
69+
namespaceSelector:
70+
matchNames:
71+
- {{ .Values.namespace }}
72+
selector:
73+
matchLabels:
74+
app: catalog-operator
75+
---
76+
apiVersion: v1
77+
kind: Service
78+
metadata:
79+
name: catalog-operator
80+
namespace: {{ .Values.namespace }}
81+
labels:
82+
app: catalog-operator
83+
spec:
84+
ports:
85+
- name: http-metrics
86+
port: 8081
87+
protocol: TCP
88+
targetPort: http
89+
selector:
90+
app: catalog-operator
91+
---
92+
apiVersion: rbac.authorization.k8s.io/v1
93+
kind: RoleBinding
94+
metadata:
95+
name: operator-lifecycle-manager-metrics
96+
namespace: {{ .Values.namespace }}
97+
roleRef:
98+
apiGroup: rbac.authorization.k8s.io
99+
kind: Role
100+
name: operator-lifecycle-manager-metrics
101+
subjects:
102+
- kind: ServiceAccount
103+
name: prometheus-k8s
104+
namespace: openshift-monitoring
105+
---
106+
apiVersion: rbac.authorization.k8s.io/v1
107+
kind: Role
108+
metadata:
109+
name: operator-lifecycle-manager-metrics
110+
namespace: {{ .Values.namespace }}
111+
rules:
112+
- apiGroups:
113+
- ""
114+
resources:
115+
- services
116+
- endpoints
117+
- pods
118+
verbs:
119+
- get
120+
- list
121+
- watch

0 commit comments

Comments
 (0)