Skip to content

Commit ede4f95

Browse files
committed
standardize podmonitor/prometheusrule
1 parent 93b0fea commit ede4f95

File tree

4 files changed

+39
-33
lines changed

4 files changed

+39
-33
lines changed

chart/templates/monitoring.yaml

-28
This file was deleted.

chart/templates/podmonitor.yaml

+17
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
{{- if .Values.metrics.podMonitor.enabled }}
2+
apiVersion: monitoring.coreos.com/v1
3+
kind: PodMonitor
4+
metadata:
5+
name: {{ include "project-operator.fullname" . }}
6+
labels:
7+
{{- include "project-operator.labels" . | nindent 4 }}
8+
spec:
9+
namespaceSelector:
10+
matchNames:
11+
- {{ .Release.Namespace }}
12+
selector:
13+
matchLabels:
14+
{{- include "project-operator.selectorLabels" . | nindent 6 }}
15+
podMetricsEndpoints:
16+
- port: metrics
17+
{{- end }}

chart/templates/prometheusrule.yaml

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
{{- if and .Values.metrics.prometheusRule.enabled .Values.metrics.prometheusRule.rules }}
2+
apiVersion: monitoring.coreos.com/v1
3+
kind: PrometheusRule
4+
metadata:
5+
name: {{ include "project-operator.fullname" . }}
6+
labels:
7+
{{- include "project-operator.labels" . | nindent 4 }}
8+
spec:
9+
groups:
10+
- name: {{ include "project-operator.name" . }}-alerts
11+
rules:
12+
{{- toYaml .Values.metrics.prometheusRule.rules | nindent 4 }}
13+
{{- end }}

chart/values.yaml

+9-5
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,12 @@ adminClusterRole: ""
6666
viewerClusterRole: ""
6767
# -- Automatically grant cluster view privileges to all members of the project
6868
enableClusterView: false
69-
monitoring:
70-
# -- Enable montoring (requires prometheus-operator)
71-
enabled: false
72-
# -- Prometheus operator (record or alert) rules
73-
rules: []
69+
metrics:
70+
podMonitor:
71+
# -- Whether to create a PodMonitor resource
72+
enabled: false
73+
prometheusRule:
74+
# -- Whether to create a PrometheusRule resource
75+
enabled: false
76+
# -- PrometheusRule rules
77+
rules: []

0 commit comments

Comments
 (0)