Skip to content

Commit cb12b1a

Browse files
authored
feat: add servicemonitor for fluent-operator to helm chart (#1677)
* feat: add servicemonitor for fluent-operator to helm chart Signed-off-by: Dennis Geiselmann <[email protected]> * disable service monitor Signed-off-by: Dennis Geiselmann <[email protected]> --------- Signed-off-by: Dennis Geiselmann <[email protected]>
1 parent 669a0d8 commit cb12b1a

File tree

4 files changed

+86
-0
lines changed

4 files changed

+86
-0
lines changed

charts/fluent-operator/templates/fluent-operator-deployment.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,9 @@ spec:
110110
volumeMounts:
111111
- name: env
112112
mountPath: /fluent-operator
113+
ports:
114+
- containerPort: {{ .Values.operator.service.port }}
115+
name: {{ .Values.operator.service.portName }}
113116
serviceAccountName: fluent-operator
114117
{{- with .Values.operator.priorityClassName }}
115118
priorityClassName: {{ . | quote }}
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
{{- if .Values.operator.enable }}
2+
{{- if .Values.operator.service.enable }}
3+
apiVersion: v1
4+
kind: Service
5+
metadata:
6+
name: fluent-operator
7+
namespace: {{ .Release.Namespace | quote }}
8+
labels:
9+
app.kubernetes.io/component: operator
10+
app.kubernetes.io/name: fluent-operator
11+
{{- if .Values.operator.service.labels }}
12+
{{ toYaml .Values.operator.service.labels | indent 4 }}
13+
{{- end }}
14+
{{- if .Values.operator.service.annotations }}
15+
annotations:
16+
{{ toYaml .Values.operator.service.annotations | indent 4 }}
17+
{{- end }}
18+
spec:
19+
type: {{ .Values.operator.service.type }}
20+
selector:
21+
app.kubernetes.io/component: operator
22+
app.kubernetes.io/name: fluent-operator
23+
ports:
24+
- name: {{ .Values.operator.service.portName }}
25+
port: {{ .Values.operator.service.port }}
26+
{{- end }}
27+
{{- end }}
Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
{{- if .Values.operator.enable }}
2+
{{- if .Values.operator.serviceMonitor.enable }}
3+
apiVersion: monitoring.coreos.com/v1
4+
kind: ServiceMonitor
5+
metadata:
6+
name: fluent-operator
7+
namespace: {{ .Release.Namespace | quote }}
8+
labels:
9+
app.kubernetes.io/component: operator
10+
app.kubernetes.io/name: fluent-operator
11+
spec:
12+
endpoints:
13+
- port: {{ .Values.operator.service.portName }}
14+
path: {{ .Values.operator.serviceMonitor.path }}
15+
interval: {{ .Values.operator.serviceMonitor.interval }}
16+
{{- if .Values.operator.serviceMonitor.secure }}
17+
scheme: https
18+
tlsConfig:
19+
{{- toYaml .Values.operator.serviceMonitor.tlsConfig | nindent 8 }}
20+
{{- end }}
21+
scrapeTimeout: {{ .Values.operator.serviceMonitor.scrapeTimeout }}
22+
{{- with .Values.operator.serviceMonitor.relabelings }}
23+
relabelings:
24+
{{- toYaml . | nindent 8 }}
25+
{{- end }}
26+
{{- with .Values.operator.serviceMonitor.metricRelabelings }}
27+
metricRelabelings:
28+
{{- toYaml . | nindent 8 }}
29+
{{- end }}
30+
selector:
31+
matchLabels:
32+
app.kubernetes.io/component: operator
33+
app.kubernetes.io/name: fluent-operator
34+
namespaceSelector:
35+
matchNames:
36+
- {{ template "fluent-operator.namespace" . }}
37+
{{- end }}
38+
{{- end }}

charts/fluent-operator/values.yaml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,24 @@ operator:
8080
[]
8181
# - --watch-namespaces=logging
8282

83+
service:
84+
enable: true
85+
type: ClusterIP
86+
portName: metrics
87+
port: 8080
88+
annotations: {}
89+
labels: {}
90+
91+
serviceMonitor:
92+
enable: false
93+
interval: 30s
94+
path: /metrics
95+
scrapeTimeout: 10s
96+
secure: false
97+
tlsConfig: {}
98+
relabelings: []
99+
metricRelabelings: []
100+
83101
fluentbit:
84102
# Installs a sub chart carrying the CRDs for the fluent-bit controller. The sub chart is enabled by default.
85103
crdsEnable: true

0 commit comments

Comments
 (0)