Skip to content

Commit 0db653d

Browse files
committed
feat(metrics): ServiceMonitors for arango/redpanda
1 parent aeaf116 commit 0db653d

File tree

4 files changed

+26
-1
lines changed

4 files changed

+26
-1
lines changed

charts/oada/templates/_helpers.tpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ app.kubernetes.io/part-of: oada
5050
{{ .Values.kafka.brokers | join "," | default $brokers }}
5151
{{- end -}}
5252

53-
{{/* Whether add Prometheus monitors */}}
53+
{{/* Whether to add Prometheus monitors */}}
5454
{{- define "oada.prometheus" -}}
5555
{{ .Values.prometheus | default (.Capabilities.APIVersions.Has "monitoring.coreos.com/v1") }}
5656
{{- end -}}

charts/oada/templates/arangodb.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ spec:
1212
image: {{ .Values.arangodb.image }}:{{ .Values.arangodb.tag }}
1313
mode: Single
1414
environment: {{ .Values.global.development | ternary "Development" "Production" }}
15+
metrics:
16+
enabled: {{ include "oada.prometheus" . }}
1517
externalAccess:
1618
{{/* Disable external access for Production */}}
1719
type: {{ .Values.global.development | ternary "Auto" "None" }}

charts/oada/templates/deployment.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,8 @@ spec:
154154
app.kubernetes.io/instance: {{ $.Release.Name }}
155155
podMetricsEndpoints:
156156
- port: prometheus
157+
namespaceSelector:
158+
any: false
157159
{{- end }}
158160
---
159161
{{ end -}}

charts/oada/templates/redpanda.yaml

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,4 +42,25 @@ spec:
4242
enabled: true
4343
{{- end }}
4444
developerMode: {{ .Values.global.development }}
45+
{{- if eq (include "oada.prometheus" $) "true" }}
46+
---
47+
apiVersion: monitoring.coreos.com/v1
48+
kind: ServiceMonitor
49+
metadata:
50+
namespace: {{ .Release.Namespace }}
51+
name: redpanda-{{ .Release.Name }}
52+
labels:
53+
app.kubernetes.io/name: redpanda
54+
app.kubernetes.io/instance: {{ .Release.Name }}
55+
{{- include "oada.chart.labels" . | nindent 4 }}
56+
spec:
57+
selector:
58+
matchLabels:
59+
app.kubernetes.io/name: redpanda
60+
app.kubernetes.io/instance: {{ .Release.Name }}
61+
endpoints:
62+
- port: admin
63+
namespaceSelector:
64+
any: false
65+
{{- end }}
4566
{{- end }}

0 commit comments

Comments
 (0)